diff options
author | mig <mig> | 2013-01-10 02:38:55 (GMT) |
---|---|---|
committer | mig <mig> | 2013-01-10 02:38:55 (GMT) |
commit | 924eb49553971988b91d0a9cd73a4203455215e6 (patch) | |
tree | 1a305903e50566b04df9e353a015a10246f2a29d /generic/tclCompExpr.c | |
parent | d4ad619c97d45199c5143ca313cf4daffe18653f (diff) | |
parent | e97463a0fb4ada0093dbe69808351b2ccb643c6d (diff) | |
download | tcl-924eb49553971988b91d0a9cd73a4203455215e6.zip tcl-924eb49553971988b91d0a9cd73a4203455215e6.tar.gz tcl-924eb49553971988b91d0a9cd73a4203455215e6.tar.bz2 |
merge mig-nre-mods
Diffstat (limited to 'generic/tclCompExpr.c')
-rw-r--r-- | generic/tclCompExpr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c index 3afb3f6..976346f 100644 --- a/generic/tclCompExpr.c +++ b/generic/tclCompExpr.c @@ -2186,7 +2186,6 @@ ExecConstantExprTree( ByteCode *byteCodePtr; int code; Tcl_Obj *byteCodeObj = Tcl_NewObj(); - NRE_callback *rootPtr = TOP_CB(interp); /* * Note we are compiling an expression with literal arguments. This means @@ -2194,6 +2193,7 @@ ExecConstantExprTree( * bytecode, so there's no need to tend to TIP 280 issues. */ + TclNRSetRoot(interp); envPtr = ckalloc(sizeof(CompileEnv)); TclInitCompileEnv(interp, envPtr, NULL, 0); CompileExprTree(interp, nodes, index, litObjvPtr, NULL, NULL, envPtr, @@ -2205,7 +2205,7 @@ ExecConstantExprTree( ckfree(envPtr); byteCodePtr = byteCodeObj->internalRep.otherValuePtr; TclNRExecuteByteCode(interp, byteCodePtr); - code = TclNRRunCallbacks(interp, TCL_OK, rootPtr); + code = TclNRRunCallbacks(interp, TCL_OK); Tcl_DecrRefCount(byteCodeObj); return code; } |