* generic/tclBasic.c: New redesign of [tailcall]: find

	* generic/tclExecute.c: errors early on, so that errorInfo
	* generic/tclInt.h:     contains the proper info [Bug 3047235]
	* generic/tclNamesp.c:

1 files changed, 14 insertions, 6 deletions

diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 401eea4..5bd3c24 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -22,7 +22,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclNamesp.c,v 1.210 2010/08/18 15:44:13 msofer Exp $
+ * RCS: @(#) $Id: tclNamesp.c,v 1.211 2010/08/18 22:33:27 msofer Exp $
  */
 
 #include "tclInt.h"
@@ -313,15 +313,27 @@ Tcl_PushCallFrame(
     framePtr->compiledLocals = NULL;
     framePtr->clientData = NULL;
     framePtr->localCachePtr = NULL;
-    framePtr->tailcallPtr = NULL;
 
     /*
+     * Record the top of the callback stack, so that tailcall can identify
+     * the spot where to splice the new command.
+     */
+
+    if (iPtr->execEnvPtr) {
+        framePtr->wherePtr = TOP_CB(interp);
+    } else {
+        framePtr->wherePtr = NULL;
+    }
+    
+    
+    /*
      * Push the new call frame onto the interpreter's stack of procedure call
      * frames making it the current frame.
      */
 
     iPtr->framePtr = framePtr;
     iPtr->varFramePtr = framePtr;
+
     return TCL_OK;
 }
 
@@ -391,10 +403,6 @@ Tcl_PopCallFrame(
 	Tcl_DeleteNamespace((Tcl_Namespace *) nsPtr);
     }
     framePtr->nsPtr = NULL;
-
-    if (framePtr->tailcallPtr) {
-        TclSpliceTailcall(interp, framePtr->tailcallPtr);
-    }
 }
 
 /*