summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2003-02-07 01:07:04 (GMT)
committermdejong <mdejong>2003-02-07 01:07:04 (GMT)
commit17cd8602bc9bd0401d641d50893a409bc660c181 (patch)
treea295942df4133d8cf37c67326647dcf49538bc1d
parent8a99de882edc8565ff543a67a58e02f5f517ba7c (diff)
downloadtcl-17cd8602bc9bd0401d641d50893a409bc660c181.zip
tcl-17cd8602bc9bd0401d641d50893a409bc660c181.tar.gz
tcl-17cd8602bc9bd0401d641d50893a409bc660c181.tar.bz2
* generic/tclCompCmds.c (TclCompileIncrCmd):
* tests/incr.test: Don't include the text "(increment expression)" in the errorInfo generated by the compiled version of the incr command since it does not match the message generated by the non-compiled version of incr. It is also not possible to match this error output under Jacl, which does not support a compiler.
-rw-r--r--ChangeLog12
-rw-r--r--generic/tclCompCmds.c6
-rw-r--r--tests/incr.test3
3 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 8289c1e..bbdf2d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2003-02-06 Mo DeJong <mdejong@users.sourceforge.net>
+ * generic/tclCompCmds.c (TclCompileIncrCmd):
+ * tests/incr.test: Don't include the text
+ "(increment expression)" in the errorInfo
+ generated by the compiled version of the
+ incr command since it does not match the
+ message generated by the non-compiled version
+ of incr. It is also not possible to match
+ this error output under Jacl, which does
+ not support a compiler.
+
+2003-02-06 Mo DeJong <mdejong@users.sourceforge.net>
+
* generic/tclExecute.c (TclExecuteByteCode): When an
error is encountered reading the increment value during
a compiled call to incr, add a "(reading increment)"
diff --git a/generic/tclCompCmds.c b/generic/tclCompCmds.c
index f2df134..ae3bb31 100644
--- a/generic/tclCompCmds.c
+++ b/generic/tclCompCmds.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCompCmds.c,v 1.38 2003/02/01 23:49:20 kennykb Exp $
+ * RCS: @(#) $Id: tclCompCmds.c,v 1.39 2003/02/07 01:07:05 mdejong Exp $
*/
#include "tclInt.h"
@@ -1558,10 +1558,6 @@ TclCompileIncrCmd(interp, parsePtr, envPtr)
code = TclCompileTokens(interp, incrTokenPtr+1,
incrTokenPtr->numComponents, envPtr);
if (code != TCL_OK) {
- if (code == TCL_ERROR) {
- Tcl_AddObjErrorInfo(interp,
- "\n (increment expression)", -1);
- }
goto done;
}
}
diff --git a/tests/incr.test b/tests/incr.test
index 1aeea59..5f3a633 100644
--- a/tests/incr.test
+++ b/tests/incr.test
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: incr.test,v 1.7 2003/02/06 22:44:58 mdejong Exp $
+# RCS: @(#) $Id: incr.test,v 1.8 2003/02/07 01:07:05 mdejong Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest
@@ -181,7 +181,6 @@ test incr-1.19 {TclCompileIncrCmd: increment given, but erroneous} {
} {wrong # args: should be "set varName ?newValue?"
while compiling
"set"
- (increment expression)
while compiling
"incr i [set]"}
test incr-1.20 {TclCompileIncrCmd: increment given, in quotes} {