diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-01-23 21:21:26 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-01-23 21:21:26 (GMT) |
| commit | 0631e4f3f4260d3fbc773676389783ec4d31c480 (patch) | |
| tree | a1b52e7723f15d31eb1d37d49c9cc69b7d9cf7cd /generic/tclExecute.c | |
| parent | f7f6ddb4ce3ce465107777a9a2c408dd8ab473dc (diff) | |
| download | tcl-0631e4f3f4260d3fbc773676389783ec4d31c480.zip tcl-0631e4f3f4260d3fbc773676389783ec4d31c480.tar.gz tcl-0631e4f3f4260d3fbc773676389783ec4d31c480.tar.bz2 | |
Reconcile coding style issues between branches
Diffstat (limited to 'generic/tclExecute.c')
| -rw-r--r-- | generic/tclExecute.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c index d28fd74..726b585 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -13,7 +13,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.360 2008/01/16 21:05:48 msofer Exp $ + * RCS: @(#) $Id: tclExecute.c,v 1.361 2008/01/23 21:21:31 dgp Exp $ */ #include "tclInt.h" @@ -1339,8 +1339,8 @@ TclCompEvalObj( iPtr->numLevels++; if (TclInterpReady(interp) == TCL_ERROR) { - iPtr->numLevels--; - return TCL_ERROR; + result = TCL_ERROR; + goto done; } namespacePtr = iPtr->varFramePtr->nsPtr; @@ -1404,8 +1404,7 @@ TclCompEvalObj( if (codePtr->refCount <= 0) { TclCleanupByteCode(codePtr); } - iPtr->numLevels--; - return result; + goto done; } recompileObj: @@ -1424,6 +1423,10 @@ TclCompEvalObj( iPtr->invokeCmdFramePtr = NULL; codePtr = (ByteCode *) objPtr->internalRep.otherValuePtr; goto runCompiledObj; + + done: + iPtr->numLevels--; + return result; } /* @@ -2404,7 +2407,7 @@ TclExecuteByteCode( * context. */ - result = TclCompEvalObj(interp, objPtr, NULL,0); + result = TclCompEvalObj(interp, objPtr, NULL, 0); CACHE_STACK_INFO(); if (result == TCL_OK) { /* |