diff options
author | dgp <dgp@users.sourceforge.net> | 2016-07-02 20:43:16 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2016-07-02 20:43:16 (GMT) |
commit | 3f704efe4e8c1fc7b8eff04d4a7eb80c31c7f44e (patch) | |
tree | 2197fdfe935e76e4b8dd4b78ccd3a79b7320603d /generic/tclIndexObj.c | |
parent | 7add065e0f5720a2ee8d4d874931087e1ad246cc (diff) | |
parent | 8e39be1340c8878cb33ac4c219acb88d3521a7a0 (diff) | |
download | tcl-3f704efe4e8c1fc7b8eff04d4a7eb80c31c7f44e.zip tcl-3f704efe4e8c1fc7b8eff04d4a7eb80c31c7f44e.tar.gz tcl-3f704efe4e8c1fc7b8eff04d4a7eb80c31c7f44e.tar.bz2 |
merge trunk
Diffstat (limited to 'generic/tclIndexObj.c')
-rw-r--r-- | generic/tclIndexObj.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c index 836f60b..c2aa439 100644 --- a/generic/tclIndexObj.c +++ b/generic/tclIndexObj.c @@ -926,6 +926,14 @@ Tcl_WrongNumArgs( Tcl_Obj *const *origObjv = iPtr->ensembleRewrite.sourceObjs; /* + * Check for spelling fixes, and substitute the fixed values. + */ + + if (origObjv[0] == NULL) { + origObjv = (Tcl_Obj *const *)origObjv[2]; + } + + /* * We only know how to do rewriting if all the replaced objects are * actually arguments (in objv) to this function. Otherwise it just * gets too complicated and we'd be better off just giving a slightly @@ -958,12 +966,6 @@ Tcl_WrongNumArgs( elementStr = EXPAND_OF(indexRep); elemLen = strlen(elementStr); - } else if ((irPtr = - Tcl_FetchIntRep(origObjv[i], &tclEnsembleCmdType))) { - register EnsembleCmdRep *ecrPtr = irPtr->twoPtrValue.ptr1; - - elementStr = ecrPtr->fullSubcmdName; - elemLen = strlen(elementStr); } else { elementStr = TclGetStringFromObj(origObjv[i], &elemLen); } @@ -1013,10 +1015,6 @@ Tcl_WrongNumArgs( register IndexRep *indexRep = irPtr->twoPtrValue.ptr1; Tcl_AppendStringsToObj(objPtr, EXPAND_OF(indexRep), NULL); - } else if ((irPtr = Tcl_FetchIntRep(objv[i], &tclEnsembleCmdType))) { - register EnsembleCmdRep *ecrPtr = irPtr->twoPtrValue.ptr1; - - Tcl_AppendStringsToObj(objPtr, ecrPtr->fullSubcmdName, NULL); } else { /* * Quote the argument if it contains spaces (Bug 942757). |