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 | 73af09db8344072e17d2f7bc453c67e899ae27d9 (patch) | |
| tree | 2197fdfe935e76e4b8dd4b78ccd3a79b7320603d /generic/tclNamesp.c | |
| parent | 6a69379d84c9476947605ac27eef9af88b0434c2 (diff) | |
| parent | 4bd6120473dd85fd3e91adc5d5d1fd2dcb88a694 (diff) | |
| download | tcl-73af09db8344072e17d2f7bc453c67e899ae27d9.zip tcl-73af09db8344072e17d2f7bc453c67e899ae27d9.tar.gz tcl-73af09db8344072e17d2f7bc453c67e899ae27d9.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclNamesp.c')
| -rw-r--r-- | generic/tclNamesp.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index c6a878a..679f60e 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -3374,14 +3374,7 @@ NRNamespaceEvalCmd( (void) TclPushStackFrame(interp, (Tcl_CallFrame **) framePtrPtr, namespacePtr, /*isProcCallFrame*/ 0); - if (iPtr->ensembleRewrite.sourceObjs == NULL) { - framePtr->objc = objc; - framePtr->objv = objv; - } else { - framePtr->objc = objc + iPtr->ensembleRewrite.numRemovedObjs - - iPtr->ensembleRewrite.numInsertedObjs; - framePtr->objv = iPtr->ensembleRewrite.sourceObjs; - } + framePtr->objv = TclFetchEnsembleRoot(interp, objv, objc, &framePtr->objc); if (objc == 3) { /* @@ -3788,7 +3781,6 @@ NRNamespaceInscopeCmd( { Tcl_Namespace *namespacePtr; CallFrame *framePtr, **framePtrPtr; - register Interp *iPtr = (Interp *) interp; int i; Tcl_Obj *cmdObjPtr; @@ -3814,14 +3806,7 @@ NRNamespaceInscopeCmd( (void) TclPushStackFrame(interp, (Tcl_CallFrame **) framePtrPtr, namespacePtr, /*isProcCallFrame*/ 0); - if (iPtr->ensembleRewrite.sourceObjs == NULL) { - framePtr->objc = objc; - framePtr->objv = objv; - } else { - framePtr->objc = objc + iPtr->ensembleRewrite.numRemovedObjs - - iPtr->ensembleRewrite.numInsertedObjs; - framePtr->objv = iPtr->ensembleRewrite.sourceObjs; - } + framePtr->objv = TclFetchEnsembleRoot(interp, objv, objc, &framePtr->objc); /* * Execute the command. If there is just one argument, just treat it as a |