diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2011-09-16 13:22:39 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2011-09-16 13:22:39 (GMT) |
commit | 9028e5825b7fb7395e842ac60486fc7b54d30f4e (patch) | |
tree | 5898505848d2fd5a25dd43f302f76adfff855b8b | |
parent | 5607dedaa88b132947328b366d78dc0f79cdd5f6 (diff) | |
download | tcl-9028e5825b7fb7395e842ac60486fc7b54d30f4e.zip tcl-9028e5825b7fb7395e842ac60486fc7b54d30f4e.tar.gz tcl-9028e5825b7fb7395e842ac60486fc7b54d30f4e.tar.bz2 |
* generic/tclProc.c (ProcWrongNumArgs): [Bugs 3400658,3408830]:
Corrected the handling of procedure error messages (found by TclOO).
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | generic/tclProc.c | 2 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2011-09-16 Donal K. Fellows <dkf@users.sf.net> + + * generic/tclProc.c (ProcWrongNumArgs): [Bugs 3400658,3408830]: + Corrected the handling of procedure error messages (found by TclOO). + 2011-09-16 Jan Nijtmans <nijtmans@users.sf.net> * generic/tcl.h: Don't change Tcl_UniChar type when diff --git a/generic/tclProc.c b/generic/tclProc.c index 89bd0b9..43e88c6 100644 --- a/generic/tclProc.c +++ b/generic/tclProc.c @@ -1092,6 +1092,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 |