diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-04 14:15:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-02-04 14:15:14 (GMT) |
| commit | 7a6fd9ec654b050268e916845a1481725df1a22a (patch) | |
| tree | 83fd0fd111fd2b36ba1839c2c55a1b587d8f69e4 /generic/tclProc.c | |
| parent | 6b77853e6dcdec7566901f635b7298c8fa5dd349 (diff) | |
| parent | 586e53a4ac38b4a017a8be29a3832632ef62705a (diff) | |
| download | tcl-7a6fd9ec654b050268e916845a1481725df1a22a.zip tcl-7a6fd9ec654b050268e916845a1481725df1a22a.tar.gz tcl-7a6fd9ec654b050268e916845a1481725df1a22a.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclProc.c')
| -rw-r--r-- | generic/tclProc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/generic/tclProc.c b/generic/tclProc.c index 1791cd0..4309017 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -2095,7 +2095,7 @@ TclProcCompileProc( iPtr->invokeWord = 0; iPtr->invokeCmdFramePtr = (hePtr ? Tcl_GetHashValue(hePtr) : NULL); - tclByteCodeType.setFromAnyProc(interp, bodyPtr); + TclSetByteCodeFromAny(interp, bodyPtr, NULL, NULL); iPtr->invokeCmdFramePtr = NULL; TclPopStackFrame(interp); } else if (codePtr->nsEpoch != nsPtr->resolverEpoch) { @@ -2720,7 +2720,6 @@ TclNRApplyObjCmd( else { /* * Joe English's suggestion to allow cmdNames to function as lambdas. - * Also requires making tclCmdNameType non-static in tclObj.c */ Tcl_Obj *elemPtr; @@ -2961,10 +2960,9 @@ Tcl_DisassembleObjCmd( Tcl_WrongNumArgs(interp, 2, objv, "script"); return TCL_ERROR; } - if (objv[2]->typePtr != &tclByteCodeType) { - if (TclSetByteCodeFromAny(interp, objv[2], NULL, NULL) != TCL_OK){ - return TCL_ERROR; - } + if ((objv[2]->typePtr != &tclByteCodeType) + && (TclSetByteCodeFromAny(interp, objv[2], NULL, NULL) != TCL_OK)) { + return TCL_ERROR; } codeObjPtr = objv[2]; break; |