Index: generic/xotcl.c =================================================================== diff -u -r21544fe1eafcab9afcd83f516ab2759cd309f3ed -rf30ceced09ff0ac4fa96660291e254fdd92b1675 --- generic/xotcl.c (.../xotcl.c) (revision 21544fe1eafcab9afcd83f516ab2759cd309f3ed) +++ generic/xotcl.c (.../xotcl.c) (revision f30ceced09ff0ac4fa96660291e254fdd92b1675) @@ -740,22 +740,22 @@ /*fprintf(stderr, "GetSelfObj interp has frame %p and varframe %p\n", Tcl_Interp_framePtr(interp),Tcl_Interp_varFramePtr(interp));*/ for (; varFramePtr; varFramePtr = Tcl_CallFrame_callerPtr(varFramePtr)) { -#if defined(TCL85STACKTRACE) +#if defined(TCL85STACK_TRACE) fprintf(stderr, "GetSelfObj check frame %p flags %.6x cd %p objv[0] %s\n", varFramePtr, Tcl_CallFrame_isProcCallFrame(varFramePtr), Tcl_CallFrame_clientData(varFramePtr), Tcl_CallFrame_objc(varFramePtr) ? ObjStr(Tcl_CallFrame_objv(varFramePtr)[0]) : "(null)"); #endif if (Tcl_CallFrame_isProcCallFrame(varFramePtr) & FRAME_IS_XOTCL_OBJECT) { -#if defined(TCL85STACKTRACE) +#if defined(TCL85STACK_TRACE) fprintf(stderr, "... self returns %s\n", objectName(((XOTclObject*)Tcl_CallFrame_clientData(varFramePtr)))); #endif return (XOTclObject *)Tcl_CallFrame_clientData(varFramePtr); } if (Tcl_CallFrame_isProcCallFrame(varFramePtr) & FRAME_IS_XOTCL_METHOD) { XOTclCallStackContent *csc = (XOTclCallStackContent *)Tcl_CallFrame_clientData(varFramePtr); -#if defined(TCL85STACKTRACE) +#if defined(TCL85STACK_TRACE) fprintf(stderr, "... self returns %s\n",objectName(csc->self)); #endif return csc->self; @@ -2489,7 +2489,7 @@ active = XOTclCallStackFindActiveFrame(interp, 0); #if defined(TCL85STACK) -# if defined(TCL85STACKTRACE) +# if defined(TCL85STACK_TRACE) for (varFramePtr = inFramePtr; varFramePtr; varFramePtr = Tcl_CallFrame_callerPtr(varFramePtr)) { fprintf(stderr, "check frame %p flags %.6x cd %p objv[0] %s\n", varFramePtr, Tcl_CallFrame_isProcCallFrame(varFramePtr), @@ -2601,7 +2601,7 @@ csc->filterStackEntry = obj->filterStack; else csc->filterStackEntry = NULL; -#if defined(TCL85STACKTRACE) +#if defined(TCL85STACK_TRACE) fprintf(stderr, "PUSH obj %s, self=%p cmd=%p (%s) objc=%d id=%p (%s) csc=%p type %d, frame %p\n", objectName(obj), obj, cmd, (char *) Tcl_GetCommandName(interp, cmd), @@ -2632,7 +2632,7 @@ assert(cs->top > cs->content); csc = cs->top; -#if defined(TCL85STACKTRACE) +#if defined(TCL85STACK_TRACE) fprintf(stderr, "POP csc=%p, frame %p\n", csc, Tcl_Interp_framePtr(interp)); #endif @@ -5350,7 +5350,7 @@ * namespace to another. */ -#if defined(TCL85STACKTRACE) +#if defined(TCL85STACK_TRACE) fprintf(stderr,"PUSH METHOD_FRAME (PushProcCallFrame) frame %p csc %p %s\n", *framePtrPtr,csc, csc? Tcl_GetCommandName(interp, csc->cmdPtr) : NULL); #endif @@ -5439,7 +5439,7 @@ XOTclCallStackDump(interp); #endif -#if defined(TCL85STACKTRACE) +#if defined(TCL85STACK_TRACE) fprintf(stderr, "+++ callProcCheck teardown %p, method=%s, isTclProc %d csc %p\n",obj->teardown,methodName,isTclProc,csc); #endif @@ -5627,7 +5627,7 @@ #else result = (*Tcl_Command_objProc(cmd))(cp, interp, objc, objv); -#if defined(TCL85STACKTRACE) +#if defined(TCL85STACK_TRACE) fprintf(stderr,"POP OBJECT_FRAME (implicit) frame %p csc %p\n", NULL, csc); #endif #endif @@ -6417,8 +6417,8 @@ nonposArg->slotObj = NULL; nonposArg->ifd = interface; nonposArg->ifdSize = ifPtr-interface; - fprintf(stderr, "method %s ifsize %d, possible unknowns = %d,\n", - procName,ifPtr-interface,possibleUnknowns); + /*fprintf(stderr, "method %s ifsize %d, possible unknowns = %d,\n", + procName,ifPtr-interface,possibleUnknowns);*/ parsedIfPtr->ifd = interface; /* TODO only necessary for CANONICAL_ARGS */ parsedIfPtr->possibleUnknowns = possibleUnknowns; /* TODO only necessary for CANONICAL_ARGS */ Tcl_SetHashValue(hPtr, (ClientData)nonposArg); Index: generic/xotcl.h =================================================================== diff -u -r21544fe1eafcab9afcd83f516ab2759cd309f3ed -rf30ceced09ff0ac4fa96660291e254fdd92b1675 --- generic/xotcl.h (.../xotcl.h) (revision 21544fe1eafcab9afcd83f516ab2759cd309f3ed) +++ generic/xotcl.h (.../xotcl.h) (revision f30ceced09ff0ac4fa96660291e254fdd92b1675) @@ -84,9 +84,9 @@ /* #define CANONICAL_ARGS 1 -#define TCL85STACKTRACE 1 +#define TCL85STACK_TRACE 1 */ -#define CANONICAL_ARGS 1 + #define TCL85STACK 1