summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-11-12 07:44:21 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-11-12 07:44:21 (GMT)
commitb869ccc2028bba15e252f9f8dafcd15c105a2da9 (patch)
tree683648254d8de90d4a072da4fb28d79c0827b26a
parent3bd3c81555c4dcf32b173945d8adb802a8f6b361 (diff)
parent3f954bc0d329901dedd9d5e2327bf1b616b3ed5f (diff)
downloadtcl-b869ccc2028bba15e252f9f8dafcd15c105a2da9.zip
tcl-b869ccc2028bba15e252f9f8dafcd15c105a2da9.tar.gz
tcl-b869ccc2028bba15e252f9f8dafcd15c105a2da9.tar.bz2
merge trunk
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclBasic.c2
-rw-r--r--generic/tclExecute.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e495cd..ad0bad1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-10 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclBasic.c: re-enable bcc-tailcall, after fixing an
+ * generic/tclExecute.c: infinite loop in the TCL_COMPILE_DEBUG mode
+
+
2012-11-07 Kevin B. Kenny <kennykb@acm.org>
* library/tzdata/Africa/Casablanca:
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index cbdbe87..bce6479 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -247,7 +247,7 @@ static const CmdInfo builtInCmds[] = {
{"split", Tcl_SplitObjCmd, NULL, NULL, 1},
{"subst", Tcl_SubstObjCmd, TclCompileSubstCmd, TclNRSubstObjCmd, 1},
{"switch", Tcl_SwitchObjCmd, TclCompileSwitchCmd, TclNRSwitchObjCmd, 1},
- {"tailcall", NULL, NULL, TclNRTailcallObjCmd, 1},
+ {"tailcall", NULL, TclCompileTailcallCmd, TclNRTailcallObjCmd, 1},
{"throw", Tcl_ThrowObjCmd, TclCompileThrowCmd, NULL, 1},
{"trace", Tcl_TraceObjCmd, NULL, NULL, 1},
{"try", Tcl_TryObjCmd, TclCompileTryCmd, TclNRTryObjCmd, 1},
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index caf35ba..cf8f9e7 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -2393,7 +2393,7 @@ TEBCresume(
register int i;
TRACE(("%d [", opnd));
- for (i=opnd-1 ; i>=0 ; i++) {
+ for (i=opnd-1 ; i>=0 ; i--) {
TRACE_APPEND(("\"%.30s\"", O2S(OBJ_AT_DEPTH(i))));
if (i > 0) {
TRACE_APPEND((" "));