diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-18 12:10:26 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-18 12:10:26 (GMT) |
| commit | 450b6f46c96b96bec44fb0bc119e3d11f3434f4a (patch) | |
| tree | 5f4ccb4d3df569fcd06e804ff1b5ebd8a72505bb /generic/tclProc.c | |
| parent | 4d9fc11c2ffbcc95218111734c64397df0dfcf63 (diff) | |
| parent | edcac92c086fa48aff50db9763afecbed00c2a37 (diff) | |
| download | tcl-450b6f46c96b96bec44fb0bc119e3d11f3434f4a.zip tcl-450b6f46c96b96bec44fb0bc119e3d11f3434f4a.tar.gz tcl-450b6f46c96b96bec44fb0bc119e3d11f3434f4a.tar.bz2 | |
merge novem
Diffstat (limited to 'generic/tclProc.c')
| -rw-r--r-- | generic/tclProc.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/generic/tclProc.c b/generic/tclProc.c index 9c4fd1d..a9862d9 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -343,7 +343,7 @@ Tcl_ProcObjCmd( * The argument list is just "args"; check the body */ - procBody = Tcl_GetStringFromObj(objv[3], &numBytes); + procBody = TclGetStringFromObj(objv[3], &numBytes); if (TclParseAllWhiteSpace(procBody, numBytes) < numBytes) { goto done; } @@ -2079,7 +2079,7 @@ MakeProcError( * messages and trace information. */ { int overflow, limit = 60, nameLen; - const char *procName = Tcl_GetStringFromObj(procNameObj, &nameLen); + const char *procName = TclGetStringFromObj(procNameObj, &nameLen); overflow = (nameLen > limit); Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( @@ -2650,30 +2650,6 @@ TclNRApplyObjCmd( procPtr = lambdaPtr->internalRep.twoPtrValue.ptr1; } -#define JOE_EXTENSION 0 -/* - * Note: this code is NOT FUNCTIONAL due to the NR implementation; DO NOT - * ENABLE! Leaving here as reminder to (a) TIP the suggestion, and (b) adapt - * the code. (MS) - */ - -#if JOE_EXTENSION - else { - /* - * Joe English's suggestion to allow cmdNames to function as lambdas. - */ - - Tcl_Obj *elemPtr; - int numElem; - - if ((lambdaPtr->typePtr == &tclCmdNameType) || - (TclListObjGetElements(interp, lambdaPtr, &numElem, - &elemPtr) == TCL_OK && numElem == 1)) { - return Tcl_EvalObjv(interp, objc-1, objv+1, 0); - } - } -#endif - if ((procPtr == NULL) || (procPtr->iPtr != iPtr)) { result = SetLambdaFromAny(interp, lambdaPtr); if (result != TCL_OK) { @@ -2760,7 +2736,7 @@ MakeLambdaError( * messages and trace information. */ { int overflow, limit = 60, nameLen; - const char *procName = Tcl_GetStringFromObj(procNameObj, &nameLen); + const char *procName = TclGetStringFromObj(procNameObj, &nameLen); overflow = (nameLen > limit); Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf( |