Index: generic/xotcl.c =================================================================== diff -u -rf35b43e489c5afc42555b65a729410aa6431b18f -r8b14212faee5566f20d31b1e22a00cd58088eee0 --- generic/xotcl.c (.../xotcl.c) (revision f35b43e489c5afc42555b65a729410aa6431b18f) +++ generic/xotcl.c (.../xotcl.c) (revision 8b14212faee5566f20d31b1e22a00cd58088eee0) @@ -8919,28 +8919,15 @@ int objc, Tcl_Obj *CONST objv[]) { forwardCmdClientData *tcd = (forwardCmdClientData *)clientData; int result, j, inputarg = 1, outputarg = 0; -#if TCL85STACK - XOTclCallStackContent *csc = NULL; - Tcl_CallFrame *varFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp); - - /*fprintf(stderr, "XOTclForwardMethod varFramePtr %p flags %.6x\n", - varFramePtr, Tcl_CallFrame_isProcCallFrame(varFramePtr));*/ - if (Tcl_CallFrame_isProcCallFrame(varFramePtr) & (FRAME_IS_XOTCL_METHOD|FRAME_IS_XOTCL_CMETHOD)) { - csc = (XOTclCallStackContent *)Tcl_CallFrame_clientData(varFramePtr); - } - if (csc == NULL) { - tcl85showStack(interp); - fprintf(stderr, "??? would set in csc %p to %p\n",RUNTIME_STATE(interp)->cs.top,Tcl_Interp_varFramePtr(interp)); - csc = RUNTIME_STATE(interp)->cs.top; - } +#if defined(TCL85STACK) /* no need to store varFramePtr in call frame for tcl85stack */ #else XOTclCallStackContent *csc = CallStackGetTopFrame(interp, NULL); csc->currentFramePtr = (Tcl_CallFrame *) Tcl_Interp_varFramePtr(interp); /*fprintf(stderr,"...setting currentFramePtr %p to %p (ForwardMethod)\n", - RUNTIME_STATE(interp)->cs.top->currentFramePtr, - (Tcl_CallFrame *) Tcl_Interp_varFramePtr(interp)); */ + RUNTIME_STATE(interp)->cs.top->currentFramePtr, (Tcl_CallFrame *) Tcl_Interp_varFramePtr(interp)); + */ #endif if (!tcd || !tcd->obj) return XOTclObjErrType(interp, objv[0], "Object"); Index: generic/xotcl.h =================================================================== diff -u -rf35b43e489c5afc42555b65a729410aa6431b18f -r8b14212faee5566f20d31b1e22a00cd58088eee0 --- generic/xotcl.h (.../xotcl.h) (revision f35b43e489c5afc42555b65a729410aa6431b18f) +++ generic/xotcl.h (.../xotcl.h) (revision 8b14212faee5566f20d31b1e22a00cd58088eee0) @@ -88,8 +88,8 @@ #define CANONICAL_ARGS 1 */ #define CANONICAL_ARGS 1 +#define TCL85STACK 1 - #if defined PARSE_TRACE_FULL # define PARSE_TRACE 1 #endif