Clean up guts of hidden command invoking to shorten code paths; TclObjInvoke remains for stubs compat only

Author: dkfellows

generic/tclBasic.c

@@ -6619,61 +6619,14 @@ Tcl_ExprBooleanObj(
     return result;
 }
 
-/*
- *----------------------------------------------------------------------
- *
- * TclObjInvokeNamespace --
- *
- *	Object version: Invokes a Tcl command, given an objv/objc, from either
- *	the exposed or hidden set of commands in the given interpreter.
- *
- *	NOTE: The command is invoked in the global stack frame of the
- *	interpreter or namespace, thus it cannot see any current state on the
- *	stack of that interpreter.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	Whatever the command does.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TclObjInvokeNamespace(
-    Tcl_Interp *interp,		/* Interpreter in which command is to be
-				 * invoked. */
-    Tcl_Size objc,		/* Count of arguments. */
-    Tcl_Obj *const objv[],	/* Argument objects; objv[0] points to the
-				 * name of the command to invoke. */
-    Tcl_Namespace *nsPtr,	/* The namespace to use. */
-    int flags)			/* Combination of flags controlling the call:
-				 * TCL_INVOKE_HIDDEN, TCL_INVOKE_NO_UNKNOWN,
-				 * or TCL_INVOKE_NO_TRACEBACK. */
-{
-    int result;
-    Tcl_CallFrame *framePtr;
-
-    /*
-     * Make the specified namespace the current namespace and invoke the
-     * command.
-     */
-
-    (void) TclPushStackFrame(interp, &framePtr, nsPtr, /*isProcFrame*/0);
-    result = TclObjInvoke(interp, objc, objv, flags);
-
-    TclPopStackFrame(interp);
-    return result;
-}
-
 /*
  *----------------------------------------------------------------------
  *
  * TclObjInvoke --
  *
- *	Invokes a Tcl command, given an objv/objc, from either the exposed or
- *	the hidden sets of commands in the given interpreter.
+ *	Invokes a Tcl command, given an objv/objc, from the hidden set of
+ *	commands in the given interpreter. Only supported for calls via
+ *	"internal" stub table.
  *
  * Results:
  *	A standard Tcl object result.
@@ -6693,7 +6646,9 @@ TclObjInvoke(
 				 * name of the command to invoke. */
     int flags)			/* Combination of flags controlling the call:
 				 * TCL_INVOKE_HIDDEN, TCL_INVOKE_NO_UNKNOWN,
-				 * or TCL_INVOKE_NO_TRACEBACK. */
+				 * or TCL_INVOKE_NO_TRACEBACK. Only
+				 * TCL_INVOKE_HIDDEN is now supported, and
+				 * must be supplied. */
 {
     if (interp == NULL) {
 	return TCL_ERROR;
@@ -6703,8 +6658,8 @@ TclObjInvoke(
 		"illegal argument vector", TCL_INDEX_NONE));
 	return TCL_ERROR;
     }
-    if ((flags & TCL_INVOKE_HIDDEN) == 0) {
-	Tcl_Panic("TclObjInvoke: called without TCL_INVOKE_HIDDEN");
+    if (flags != TCL_INVOKE_HIDDEN) {
+	Tcl_Panic("TclObjInvoke: called without just TCL_INVOKE_HIDDEN");
     }
     return Tcl_NRCallObjProc(interp, TclNRInvoke, NULL, objc, objv);
 }

generic/tclEvent.c

@@ -461,7 +461,7 @@ TclDefaultBgErrorHandlerObjCmd(
 
 	if (Tcl_IsSafe(interp)) {
 	    Tcl_RestoreInterpState(interp, saved);
-	    TclObjInvoke(interp, 2, tempObjv, TCL_INVOKE_HIDDEN);
+	    Tcl_NRCallObjProc(interp, TclNRInvoke, NULL, 2, tempObjv);
 	} else {
 	    Tcl_Channel errChannel = Tcl_GetStdChannel(TCL_STDERR);
 

generic/tclInt.h

@@ -2542,19 +2542,15 @@ typedef enum TclEolTranslation {
 } TclEolTranslation;
 
 /*
- * Flags for TclInvoke:
+ * Obsolete: flags for TclObjInvoke. Only TCL_INVOKE_HIDDEN was supported at
+ * all in 9.0, and then just as something to Tcl_Panic over if not given.
  */
 enum TclInvokeFlags {
-    TCL_INVOKE_HIDDEN = 1,	/* Invoke a hidden command; if not set, invokes
-				 * an exposed command. */
+    TCL_INVOKE_HIDDEN = 1,	/* Invoke a hidden command. */
     TCL_INVOKE_NO_UNKNOWN = 2,	/* "unknown" is not invoked if the command to
-				 * be invoked is not found. Only has an effect
-				 * if invoking an exposed command, i.e. if
-				 * TCL_INVOKE_HIDDEN is not also set. */
-    TCL_INVOKE_NO_TRACEBACK = 4	/* Does not record traceback information if the
-				 * invoked command returns an error. Used if the
-				 * caller plans on recording its own traceback
-				 * information. */
+				 * be invoked is not found. */
+    TCL_INVOKE_NO_TRACEBACK = 4	/* Do not record traceback information if the
+				 * invoked command returns an error. */
 };
 
 /*
@@ -3520,9 +3516,6 @@ MODULE_SCOPE int	TclNamespaceDeleted(Namespace *nsPtr);
 MODULE_SCOPE void	TclObjVarErrMsg(Tcl_Interp *interp, Tcl_Obj *part1Ptr,
 			    Tcl_Obj *part2Ptr, const char *operation,
 			    const char *reason, Tcl_Size index);
-MODULE_SCOPE int	TclObjInvokeNamespace(Tcl_Interp *interp,
-			    Tcl_Size objc, Tcl_Obj *const objv[],
-			    Tcl_Namespace *nsPtr, int flags);
 MODULE_SCOPE int	TclObjUnsetVar2(Tcl_Interp *interp,
 			    Tcl_Obj *part1Ptr, Tcl_Obj *part2Ptr, int flags);
 MODULE_SCOPE Tcl_Size TclParseBackslash(const char *src,

generic/tclInterp.c

@@ -3160,8 +3160,6 @@ ChildInvokeHidden(
     Tcl_Size objc,		/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    int result;
-
     if (Tcl_IsSafe(interp)) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"not allowed to invoke hidden commands from safe interpreter",
@@ -3170,33 +3168,35 @@ ChildInvokeHidden(
 		(char *)NULL);
 	return TCL_ERROR;
     }
+    if (objc < 1) {
+	Tcl_Panic("need at least one word: hidden command name");
+    }
 
     Tcl_Preserve(childInterp);
     Tcl_AllowExceptions(childInterp);
 
-    if (namespaceName == NULL) {
-	NRE_callback *rootPtr = TOP_CB(childInterp);
-
-	Tcl_NRAddCallback(interp, NRPostInvokeHidden, childInterp,
-		rootPtr, NULL, NULL);
-	return TclNRInvoke(NULL, childInterp, objc, objv);
-    } else {
+    // Push the namespace if one has been requested. 
+    Tcl_CallFrame *framePtr = NULL;
+    if (namespaceName != NULL) {
 	Namespace *nsPtr, *dummy1, *dummy2;
 	const char *tail;
 
-	result = TclGetNamespaceForQualName(childInterp, namespaceName, NULL,
+	int result = TclGetNamespaceForQualName(childInterp, namespaceName, NULL,
 		TCL_FIND_ONLY_NS | TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG
 		| TCL_CREATE_NS_IF_UNKNOWN, &nsPtr, &dummy1, &dummy2, &tail);
-	if (result == TCL_OK) {
-	    result = TclObjInvokeNamespace(childInterp, objc, objv,
-		    (Tcl_Namespace *) nsPtr, TCL_INVOKE_HIDDEN);
+	if (result != TCL_OK) {
+	    Tcl_TransferResult(childInterp, result, interp);
+	    Tcl_Release(childInterp);
+	    return result;
 	}
-    }
 
-    Tcl_TransferResult(childInterp, result, interp);
+	(void) TclPushStackFrame(childInterp, &framePtr, (Tcl_Namespace *) nsPtr,
+		/*isProcFrame*/ 0);
+    }
 
-    Tcl_Release(childInterp);
-    return result;
+    Tcl_NRAddCallback(interp, NRPostInvokeHidden, childInterp,
+	    TOP_CB(childInterp), framePtr, NULL);
+    return TclNRInvoke(NULL, childInterp, objc, objv);
 }
 
 static int
@@ -3207,11 +3207,15 @@ NRPostInvokeHidden(
 {
     Tcl_Interp *childInterp = (Tcl_Interp *) data[0];
     NRE_callback *rootPtr = (NRE_callback *) data[1];
+    CallFrame *framePtr = (CallFrame *) data[2];
 
     if (interp != childInterp) {
 	result = TclNRRunCallbacks(childInterp, result, rootPtr);
 	Tcl_TransferResult(childInterp, result, interp);
     }
+    if (framePtr) {
+	TclPopStackFrame(childInterp);
+    }
     Tcl_Release(childInterp);
     return result;
 }