summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tclBasic.c123
1 files changed, 62 insertions, 61 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 172c698..3f579d1 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -4197,80 +4197,81 @@ EvalObjvCore(
* necessary.
*/
- int traceCode = TCL_OK;
- int cmdEpoch = cmdPtr->cmdEpoch;
- int newEpoch;
- const char *command;
- int length, deleted;
+ int traceCode = TCL_OK;
+ int cmdEpoch = cmdPtr->cmdEpoch;
+ int newEpoch;
+ const char *command;
+ int length, deleted;
- Tcl_Obj *commandPtr = TclGetSourceFromFrame(
- flags & TCL_EVAL_SOURCE_IN_FRAME ? iPtr->cmdFramePtr : NULL,
- objc, objv);
+ Tcl_Obj *commandPtr = TclGetSourceFromFrame(
+ flags & TCL_EVAL_SOURCE_IN_FRAME ? iPtr->cmdFramePtr : NULL,
+ objc, objv);
- Tcl_IncrRefCount(commandPtr);
- command = Tcl_GetStringFromObj(commandPtr, &length);
+ Tcl_IncrRefCount(commandPtr);
+ command = Tcl_GetStringFromObj(commandPtr, &length);
- /*
- * Call trace functions.
- * Execute any command or execution traces. Note that we bump up the
- * command's reference count for the duration of the calling of the traces
- * so that the structure doesn't go away underneath our feet.
- */
+ /*
+ * Call trace functions.
+ * Execute any command or execution traces. Note that we bump up the
+ * command's reference count for the duration of the calling of the
+ * traces so that the structure doesn't go away underneath our feet.
+ */
- cmdPtr->refCount++;
- if (iPtr->tracePtr) {
- traceCode = TclCheckInterpTraces(interp, command, length,
- cmdPtr, TCL_OK, TCL_TRACE_ENTER_EXEC, objc, objv);
- }
- if ((cmdPtr->flags & CMD_HAS_EXEC_TRACES) && (traceCode == TCL_OK)) {
- traceCode = TclCheckExecutionTraces(interp, command, length,
- cmdPtr, TCL_OK, TCL_TRACE_ENTER_EXEC, objc, objv);
- }
- newEpoch = cmdPtr->cmdEpoch;
- deleted = cmdPtr->flags & CMD_IS_DELETED;
- TclCleanupCommandMacro(cmdPtr);
+ cmdPtr->refCount++;
+ if (iPtr->tracePtr) {
+ traceCode = TclCheckInterpTraces(interp, command, length,
+ cmdPtr, TCL_OK, TCL_TRACE_ENTER_EXEC, objc, objv);
+ }
+ if ((cmdPtr->flags & CMD_HAS_EXEC_TRACES) && (traceCode == TCL_OK)) {
+ traceCode = TclCheckExecutionTraces(interp, command, length,
+ cmdPtr, TCL_OK, TCL_TRACE_ENTER_EXEC, objc, objv);
+ }
+ newEpoch = cmdPtr->cmdEpoch;
+ deleted = cmdPtr->flags & CMD_IS_DELETED;
+ TclCleanupCommandMacro(cmdPtr);
- if (traceCode != TCL_OK) {
- Tcl_DecrRefCount(commandPtr);
- return traceCode;
- }
+ if (traceCode != TCL_OK) {
+ Tcl_DecrRefCount(commandPtr);
+ return traceCode;
+ }
- if (cmdEpoch != newEpoch) {
-
- /*
- * The traces did something to the traced command. How should
- * we respond?
- *
- * If we got the trace command by looking up a command name, we
- * should just look it up again.
- */
- if (weLookUp) {
- cmdPtr = TEOV_LookupCmdFromObj(interp, objv[0], lookupNsPtr);
- } else {
+ if (cmdEpoch != newEpoch) {
/*
- * If we did not look up a command name, we got the cmdPtr
- * from a caller. If that cmdPtr has been deleted, we need
- * to avoid a crash. Otherwise, press on. We don't have
- * any foundation to claim a better answer.
+ * The traces did something to the traced command. How should
+ * we respond?
+ *
+ * If we got the trace command by looking up a command name, we
+ * should just look it up again.
*/
- if (deleted) {
- cmdPtr = NULL;
+ if (weLookUp) {
+ cmdPtr = TEOV_LookupCmdFromObj(interp, objv[0], lookupNsPtr);
+ } else {
+
+ /*
+ * If we did not look up a command name, we got the cmdPtr
+ * from a caller. If that cmdPtr has been deleted, we need
+ * to avoid a crash. Otherwise, press on. We don't have
+ * any foundation to claim a better answer.
+ */
+ if (deleted) {
+ cmdPtr = NULL;
+ }
}
}
- }
- if (cmdPtr) {
- /*
- * Command was found: push a record to schedule the leave traces.
- */
+ if (cmdPtr) {
+ /*
+ * Command was found: push a record to schedule the leave traces.
+ */
+
+ TclNRAddCallback(interp, TEOV_RunLeaveTraces, INT2PTR(objc),
+ commandPtr, cmdPtr, objv);
+ cmdPtr->refCount++;
+ } else {
+ Tcl_DecrRefCount(commandPtr);
+ }
- TclNRAddCallback(interp, TEOV_RunLeaveTraces, INT2PTR(objc),
- commandPtr, cmdPtr, objv);
- cmdPtr->refCount++;
- } else {
- Tcl_DecrRefCount(commandPtr);
- }
if (cmdPtr == NULL) {
if (weLookUp) {
return TEOV_NotFound(interp, objc, objv, lookupNsPtr);