diff options
author | dgp <dgp@users.sourceforge.net> | 2006-11-02 15:58:03 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2006-11-02 15:58:03 (GMT) |
commit | c35468e1cedfb102415aff618d0be65dd4c1d819 (patch) | |
tree | a0d484e9ff364f3de46b9d807276106b6236242c /generic/tclProc.c | |
parent | 8b2128ad1251acebbb373eaaa545f36d5a546c0a (diff) | |
download | tcl-c35468e1cedfb102415aff618d0be65dd4c1d819.zip tcl-c35468e1cedfb102415aff618d0be65dd4c1d819.tar.gz tcl-c35468e1cedfb102415aff618d0be65dd4c1d819.tar.bz2 |
* generic/tclBasic.c: Further revised TclAppendPrintToObj() and
* generic/tclCkalloc.c: TclObjPrintf() routines to panic when unable
* generic/tclCmdAH.c: to complete their formatting operations, rather
* generic/tclCmdIL.c: than report an error message. This means an
* generic/tclCmdMZ.c: interp argument for error message recording is
* generic/tclDictObj.c: no longer needed, further simplifying the
* generic/tclExecute.c: interface for callers.
* generic/tclIORChan.c:
* generic/tclIOUtil.c:
* generic/tclInt.h:
* generic/tclMain.c:
* generic/tclNamesp.c:
* generic/tclParseExpr.c:
* generic/tclPkg.c:
* generic/tclProc.c:
* generic/tclStringObj.c:
* generic/tclTimer.c:
* generic/tclUtil.c:
* unix/tclUnixFCmd.c:
Diffstat (limited to 'generic/tclProc.c')
-rw-r--r-- | generic/tclProc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/generic/tclProc.c b/generic/tclProc.c index 90e6970..ffdd121 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclProc.c,v 1.103 2006/10/31 20:19:45 dgp Exp $ + * RCS: @(#) $Id: tclProc.c,v 1.104 2006/11/02 15:58:08 dgp Exp $ */ #include "tclInt.h" @@ -369,7 +369,7 @@ TclCreateProc( if (precompiled) { if (numArgs > procPtr->numArgs) { - Tcl_SetObjResult(interp, TclObjPrintf(NULL, + Tcl_SetObjResult(interp, TclObjPrintf( "procedure \"%s\": arg list contains %d entries, " "precompiled header expects %d", procName, numArgs, procPtr->numArgs)); @@ -458,7 +458,7 @@ TclCreateProc( != (VAR_SCALAR | VAR_ARGUMENT)) || (localPtr->defValuePtr == NULL && fieldCount == 2) || (localPtr->defValuePtr != NULL && fieldCount != 2)) { - Tcl_SetObjResult(interp, TclObjPrintf(NULL, + Tcl_SetObjResult(interp, TclObjPrintf( "procedure \"%s\": formal parameter %d is " "inconsistent with precompiled body", procName, i)); ckfree((char *) fieldValues); @@ -475,7 +475,7 @@ TclCreateProc( &tmpLength); if ((valueLength != tmpLength) || strncmp(fieldValues[1], tmpPtr, (size_t) tmpLength)) { - Tcl_SetObjResult(interp, TclObjPrintf(NULL, + Tcl_SetObjResult(interp, TclObjPrintf( "procedure \"%s\": formal parameter \"%s\" has " "default value inconsistent with precompiled body", procName, fieldValues[0])); @@ -839,7 +839,7 @@ Tcl_UplevelObjCmd( result = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_DIRECT); } if (result == TCL_ERROR) { - TclAppendObjToErrorInfo(interp, TclObjPrintf(NULL, + TclAppendObjToErrorInfo(interp, TclObjPrintf( "\n (\"uplevel\" body line %d)", interp->errorLine)); } @@ -1692,7 +1692,7 @@ ProcCompileProc( int limit = 50; int overflow = (length > limit); - TclAppendObjToErrorInfo(interp, TclObjPrintf(NULL, + TclAppendObjToErrorInfo(interp, TclObjPrintf( "\n (compiling %s \"%.*s%s\", line %d)", description, (overflow ? limit : length), procName, (overflow ? "..." : ""), interp->errorLine)); @@ -1739,7 +1739,7 @@ MakeProcError( const char *procName = Tcl_GetStringFromObj(procNameObj, &nameLen); overflow = (nameLen > limit); - TclAppendObjToErrorInfo(interp, TclObjPrintf(NULL, + TclAppendObjToErrorInfo(interp, TclObjPrintf( "\n (procedure \"%.*s%s\" line %d)", (overflow ? limit : nameLen), procName, (overflow ? "..." : ""), interp->errorLine)); @@ -2077,7 +2077,7 @@ SetLambdaFromAny( if (TclCreateProc(interp, /*ignored nsPtr*/ NULL, name, argsPtr, bodyPtr, &procPtr) != TCL_OK) { - TclAppendObjToErrorInfo(interp, TclObjPrintf(NULL, + TclAppendObjToErrorInfo(interp, TclObjPrintf( "\n (parsing lambda expression \"%s\")", name)); return TCL_ERROR; } @@ -2267,7 +2267,7 @@ MakeLambdaError( const char *procName = Tcl_GetStringFromObj(procNameObj, &nameLen); overflow = (nameLen > limit); - TclAppendObjToErrorInfo(interp, TclObjPrintf(NULL, + TclAppendObjToErrorInfo(interp, TclObjPrintf( "\n (lambda term \"%.*s%s\" line %d)", (overflow ? limit : nameLen), procName, (overflow ? "..." : ""), interp->errorLine)); |