diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-07-01 14:08:22 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-07-01 14:08:22 (GMT) |
| commit | dc9d79ca409ce43c255fbf0d12b742bdd795a1f7 (patch) | |
| tree | 52c1cf340bfd8288c36fbf6f4d80cc6a5f4124f9 /generic/tclNamesp.c | |
| parent | 433b92a00d44b96abae641511c035fdb9e21f75d (diff) | |
| download | tcl-dc9d79ca409ce43c255fbf0d12b742bdd795a1f7.zip tcl-dc9d79ca409ce43c255fbf0d12b742bdd795a1f7.tar.gz tcl-dc9d79ca409ce43c255fbf0d12b742bdd795a1f7.tar.bz2 | |
Encapsulate the fetching of the ensemble rewrite root, used by [namespace].
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 58a86d9..2c50a60 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -3354,14 +3354,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) { /* @@ -3768,7 +3761,6 @@ NRNamespaceInscopeCmd( { Tcl_Namespace *namespacePtr; CallFrame *framePtr, **framePtrPtr; - register Interp *iPtr = (Interp *) interp; int i; Tcl_Obj *cmdObjPtr; @@ -3794,14 +3786,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 |