diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclExecute.c | 26 |
2 files changed, 18 insertions, 13 deletions
@@ -1,5 +1,10 @@ 2002-06-13 Miguel Sofer <msofer@users.sourceforge.net> + * generic/tclExecute.c (TclExecuteByteCode): fixed the previous + patch - wouldn't compile with TCL_COMPILE_DEBUG set. + +2002-06-13 Miguel Sofer <msofer@users.sourceforge.net> + * generic/tclExecute.c (TclExecuteByteCode): consolidated the handling of exception returns to INST_INVOKE and INST_EVAL, as well as most of the code for INST_CONTINUE and INST_BREAK, in the diff --git a/generic/tclExecute.c b/generic/tclExecute.c index e40a6d6..be1b51b 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.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: tclExecute.c,v 1.63 2002/06/13 21:07:26 msofer Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.64 2002/06/13 21:37:15 msofer Exp $ */ #include "tclInt.h" @@ -1004,6 +1004,7 @@ TclExecuteByteCode(interp, codePtr) int storeFlags; #ifdef TCL_COMPILE_DEBUG int traceInstructions = (tclTraceExec == 3); + char cmdNameBuf[21]; #endif Tcl_Obj *valuePtr, *value2Ptr, *objPtr, *elemPtr; char *bytes; @@ -1203,9 +1204,6 @@ TclExecuteByteCode(interp, codePtr) /* Reference to memory block containing * objv array (must be kept live throughout * trace and command invokations.) */ -#ifdef TCL_COMPILE_DEBUG - char cmdNameBuf[21]; -#endif objv = &(stackPtr[stackTop - (objc-1)]); #ifdef TCL_COMPILE_DEBUG @@ -3902,11 +3900,13 @@ TclExecuteByteCode(interp, codePtr) } #else /* TCL_COMPILE_DEBUG is set! */ + /* * Error messages depend on the instruction. */ - + switch(*pc) { + int newPcOffset; case INST_INVOKE_STK1: case INST_INVOKE_STK4: /* @@ -3929,34 +3929,34 @@ TclExecuteByteCode(interp, codePtr) codePtr); if (rangePtr == NULL) { TRACE(("%u => ... after \"%.20s\", no encl. loop or catch, returning %s\n", - objc, cmdNameBuf, + opnd, cmdNameBuf, StringForResultCode(result))); goto abnormalReturn; /* no catch exists to check */ } - newPcOffset = 0; switch (rangePtr->type) { case LOOP_EXCEPTION_RANGE: if (result == TCL_BREAK) { newPcOffset = rangePtr->breakOffset; } else if (rangePtr->continueOffset == -1) { TRACE(("%u => ... after \"%.20s\", %s, loop w/o continue, checking for catch\n", - objc, cmdNameBuf, + opnd, cmdNameBuf, StringForResultCode(result))); goto checkForCatch; } else { newPcOffset = rangePtr->continueOffset; } TRACE(("%u => ... after \"%.20s\", %s, range at %d, new pc %d\n", - objc, cmdNameBuf, + opnd, cmdNameBuf, StringForResultCode(result), rangePtr->codeOffset, newPcOffset)); break; case CATCH_EXCEPTION_RANGE: TRACE(("%u => ... after \"%.20s\", %s...\n", - objc, cmdNameBuf, + opnd, cmdNameBuf, StringForResultCode(result))); goto processCatch; /* it will use rangePtr */ default: + newPcOffset = 0; /* avoid compiler warning */ panic("TclExecuteByteCode: bad ExceptionRange type\n"); } result = TCL_OK; @@ -3969,7 +3969,7 @@ TclExecuteByteCode(interp, codePtr) * enclosing catch exception range, if any. */ TRACE_WITH_OBJ(("%u => ... after \"%.20s\", TCL_ERROR ", - objc, cmdNameBuf), Tcl_GetObjResult(interp)); + opnd, cmdNameBuf), Tcl_GetObjResult(interp)); goto checkForCatch; case TCL_RETURN: @@ -3979,12 +3979,12 @@ TclExecuteByteCode(interp, codePtr) * for an enclosing catch exception range, if any. */ TRACE(("%u => ... after \"%.20s\", TCL_RETURN\n", - objc, cmdNameBuf)); + opnd, cmdNameBuf)); goto checkForCatch; default: TRACE_WITH_OBJ(("%u => ... after \"%.20s\", OTHER RETURN CODE %d ", - objc, cmdNameBuf, result), + opnd, cmdNameBuf, result), Tcl_GetObjResult(interp)); goto checkForCatch; } |