* generic/tclTrace.c (TclCheckInterpTraces): The TIP 62

        * generic/tclTest.c (TestcmdtraceCmd):  implementation introduced a
        * tests/trace.test (trace-29.10):       bug by testing the CallFrame
        level instead of the iPtr->numLevels level when deciding what traces
        created by Tcl_Create(Obj)Trace to call.  Added test to expose the
        error, and made fix. [Request 462580]

4 files changed, 34 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 11173d2..fd68268 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-01  Don Porter  <dgp@users.sourceforge.net>
+
+        * generic/tclTrace.c (TclCheckInterpTraces):    The TIP 62
+        * generic/tclTest.c (TestcmdtraceCmd):  implementation introduced a
+        * tests/trace.test (trace-29.10):       bug by testing the CallFrame
+        level instead of the iPtr->numLevels level when deciding what traces
+        created by Tcl_Create(Obj)Trace to call.  Added test to expose the
+        error, and made fix. [Request 462580]
+
 2004-02-28  Vince Darley  <vincentdarley@users.sourceforge.net>
 
 	* tests/fileSystem.test: fix to Tcl Bug 905163.
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 7709bb9..473cb21 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclTest.c,v 1.76 2004/01/29 10:28:20 vincentdarley Exp $
+ * RCS: @(#) $Id: tclTest.c,v 1.77 2004/03/01 17:33:45 dgp Exp $
  */
 
 #define TCL_TEST
@@ -1200,6 +1200,18 @@ TestcmdtraceCmd(dummy, interp, argc, argv)
 	cmdTrace = Tcl_CreateTrace(interp, 50000,
 	        (Tcl_CmdTraceProc *) CmdTraceDeleteProc, (ClientData) NULL);
 	Tcl_Eval(interp, argv[2]);
+    } else if (strcmp(argv[1], "leveltest") == 0) {
+	Interp *iPtr = (Interp *) interp;
+	Tcl_DStringInit(&buffer);
+	cmdTrace = Tcl_CreateTrace(interp, iPtr->numLevels + 4,
+		(Tcl_CmdTraceProc *) CmdTraceProc, (ClientData) &buffer);
+	result = Tcl_Eval(interp, argv[2]);
+	if (result == TCL_OK) {
+	    Tcl_ResetResult(interp);
+	    Tcl_AppendResult(interp, Tcl_DStringValue(&buffer), NULL);
+	}
+	Tcl_DeleteTrace(interp, cmdTrace);
+	Tcl_DStringFree(&buffer);
     } else if ( strcmp(argv[1], "resulttest" ) == 0 ) {
 	/* Create an object-based trace, then eval a script. This is used
 	 * to test return codes other than TCL_OK from the trace engine.
diff --git a/generic/tclTrace.c b/generic/tclTrace.c
index dd2422a..66b9760 100644
--- a/generic/tclTrace.c
+++ b/generic/tclTrace.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: tclTrace.c,v 1.8 2004/02/17 04:56:01 hobbs Exp $
+ * RCS: @(#) $Id: tclTrace.c,v 1.9 2004/03/01 17:33:45 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -1529,7 +1529,7 @@ TclCheckInterpTraces(interp, command, numChars, cmdPtr, code,
 	return(traceCode);
     }
     
-    curLevel = ((iPtr->varFramePtr == NULL) ? 0 : iPtr->varFramePtr->level);
+    curLevel = iPtr->numLevels;
     
     active.nextPtr = iPtr->activeInterpTracePtr;
     iPtr->activeInterpTracePtr = &active;
diff --git a/tests/trace.test b/tests/trace.test
index 0325cef..d236421 100644
--- a/tests/trace.test
+++ b/tests/trace.test
@@ -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: trace.test,v 1.33 2003/11/14 20:44:47 dgp Exp $
+# RCS: @(#) $Id: trace.test,v 1.34 2004/03/01 17:33:45 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -2149,6 +2149,15 @@ test trace-29.9 {Tcl_CreateObjTrace, status return unknown} {testcmdtrace} {
     list [catch {testcmdtrace resulttest {OtherStatus $x}} result] [set result]
 } {6 {}}
 
+test trace-29.10 {Tcl_CreateTrace, correct level interpretation} {testcmdtrace} {
+    proc foo {} {uplevel 1 bar}
+    proc bar {} {uplevel 1 grok}
+    proc grok {} {uplevel 1 spock}
+    proc spock {} {uplevel 1 fascinating}
+    proc fascinating {} {}
+    testcmdtrace leveltest {foo}
+} {foo {foo} {uplevel 1 bar} {uplevel 1 bar} bar {bar} {uplevel 1 grok} {uplevel 1 grok}}
+
 test trace-30.1 {Tcl_DeleteTrace} {emptyTest} {
     # the above tests have tested Tcl_DeleteTrace
 } {}