diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2011-09-16 13:13:11 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2011-09-16 13:13:11 (GMT) |
| commit | 8dad1b8281811bab0d71588b3c59a7fa1d163642 (patch) | |
| tree | fa60ba1a0c33fd214cda7a1313d82633c445d112 /generic | |
| parent | 616ed3e2c84e9d0ece967a597357eb509fffccbd (diff) | |
| download | tcl-8dad1b8281811bab0d71588b3c59a7fa1d163642.zip tcl-8dad1b8281811bab0d71588b3c59a7fa1d163642.tar.gz tcl-8dad1b8281811bab0d71588b3c59a7fa1d163642.tar.bz2 | |
[Bug 3408830]: Use the _right_ fix for [Bug 3400658]!
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclOOMethod.c | 2 | ||||
| -rw-r--r-- | generic/tclProc.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c index 708295a..4e7edb8 100644 --- a/generic/tclOOMethod.c +++ b/generic/tclOOMethod.c @@ -1595,7 +1595,7 @@ InitEnsembleRewrite( if (isRootEnsemble) { iPtr->ensembleRewrite.sourceObjs = objv; iPtr->ensembleRewrite.numRemovedObjs = toRewrite; - iPtr->ensembleRewrite.numInsertedObjs = rewriteLength - 1; + iPtr->ensembleRewrite.numInsertedObjs = rewriteLength; } else { int numIns = iPtr->ensembleRewrite.numInsertedObjs; diff --git a/generic/tclProc.c b/generic/tclProc.c index 50cf0f7..d008217 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -1120,6 +1120,8 @@ ProcWrongNumArgs( if (framePtr->isProcCallFrame & FRAME_IS_LAMBDA) { desiredObjs[0] = Tcl_NewStringObj("lambdaExpr", -1); } else { + ((Interp *) interp)->ensembleRewrite.numInsertedObjs -= skip - 1; + #ifdef AVOID_HACKS_FOR_ITCL desiredObjs[0] = framePtr->objv[skip-1]; #else |