diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2010-09-27 20:33:37 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2010-09-27 20:33:37 (GMT) |
| commit | 768530eafd660ad22fb3fc0f067825039b9ad444 (patch) | |
| tree | 7230190020b96b7377c7a1e8d4bc809e6c6ccd15 /generic/tclCompExpr.c | |
| parent | 847aec8dadb5ae28f7ac1df2d3082c5b0ea8c096 (diff) | |
| download | tcl-768530eafd660ad22fb3fc0f067825039b9ad444.zip tcl-768530eafd660ad22fb3fc0f067825039b9ad444.tar.gz tcl-768530eafd660ad22fb3fc0f067825039b9ad444.tar.bz2 | |
Merged from HEAD.
Also replaced a funky NRCallTEBC with the new call TclNRExecuteByteCode.
Diffstat (limited to 'generic/tclCompExpr.c')
| -rw-r--r-- | generic/tclCompExpr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c index eb72a45..ead8f51 100644 --- a/generic/tclCompExpr.c +++ b/generic/tclCompExpr.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCompExpr.c,v 1.105 2010/04/29 23:39:32 msofer Exp $ + * RCS: @(#) $Id: tclCompExpr.c,v 1.105.2.1 2010/09/27 20:33:37 kennykb Exp $ */ #include "tclInt.h" @@ -2101,6 +2101,7 @@ ExecConstantExprTree( ByteCode *byteCodePtr; int code; Tcl_Obj *byteCodeObj = Tcl_NewObj(); + TEOV_callback *rootPtr = TOP_CB(interp); /* * Note we are compiling an expression with literal arguments. This means @@ -2118,7 +2119,8 @@ ExecConstantExprTree( TclFreeCompileEnv(envPtr); TclStackFree(interp, envPtr); byteCodePtr = (ByteCode *) byteCodeObj->internalRep.otherValuePtr; - code = TclExecuteByteCode(interp, byteCodePtr); + TclNRExecuteByteCode(interp, byteCodePtr); + code = TclNRRunCallbacks(interp, TCL_OK, rootPtr); Tcl_DecrRefCount(byteCodeObj); return code; } |