Index: TODO =================================================================== diff -u -rdcd56c07afd64a356db1a4672a35b4aaf4caf6ea -rac57ffc3be1f6ccef6ca5b2d5362cba07960fdc8 --- TODO (.../TODO) (revision dcd56c07afd64a356db1a4672a35b4aaf4caf6ea) +++ TODO (.../TODO) (revision ac57ffc3be1f6ccef6ca5b2d5362cba07960fdc8) @@ -1489,6 +1489,8 @@ - added tcl-cool as an additional sample-object-system for nsf - changed internal method name requireNamespace to "require_namespace" +- changed debug command __db_yield (unporable between various 8.6b* version) + into __db_show_stack TODO: - remove TCL85STACK_TRACE and TCL85STACK_TRACE Index: generic/gentclAPI.decls =================================================================== diff -u -rdcd56c07afd64a356db1a4672a35b4aaf4caf6ea -rac57ffc3be1f6ccef6ca5b2d5362cba07960fdc8 --- generic/gentclAPI.decls (.../gentclAPI.decls) (revision dcd56c07afd64a356db1a4672a35b4aaf4caf6ea) +++ generic/gentclAPI.decls (.../gentclAPI.decls) (revision ac57ffc3be1f6ccef6ca5b2d5362cba07960fdc8) @@ -17,7 +17,7 @@ # # Next Scripting commands # -nsfCmd __db_yield NsfDebugYiedCmd { +nsfCmd __db_show_stack NsfShowStackCmd { } nsfCmd __db_run_assertions NsfDebugRunAssertionsCmd { } Index: generic/nsf.c =================================================================== diff -u -r4f1c15063fb1597c9e8bd1e92a2f901cf3d73dfb -rac57ffc3be1f6ccef6ca5b2d5362cba07960fdc8 --- generic/nsf.c (.../nsf.c) (revision 4f1c15063fb1597c9e8bd1e92a2f901cf3d73dfb) +++ generic/nsf.c (.../nsf.c) (revision ac57ffc3be1f6ccef6ca5b2d5362cba07960fdc8) @@ -11705,18 +11705,12 @@ * Begin generated Next Scripting commands *******************************************/ /* -nsfCmd __db__yield NsfDebugYiedCmd { +nsfCmd __db_show_stack NsfShowStackCmd { } */ static int -NsfDebugYiedCmd(Tcl_Interp *interp) { -#if defined(NRE) - //Interp *iPtr = (Interp *)interp; - //CoroutineData *corPtr = iPtr->execEnvPtr->corPtr; - +NsfShowStackCmd(Tcl_Interp *interp) { TclShowStack(interp); - //fprintf(stderr, "stackLevel: %p %d\n", corPtr->stackLevel, *corPtr->stackLevel); -#endif return TCL_OK; } Index: generic/tclAPI.h =================================================================== diff -u -rdcd56c07afd64a356db1a4672a35b4aaf4caf6ea -rac57ffc3be1f6ccef6ca5b2d5362cba07960fdc8 --- generic/tclAPI.h (.../tclAPI.h) (revision dcd56c07afd64a356db1a4672a35b4aaf4caf6ea) +++ generic/tclAPI.h (.../tclAPI.h) (revision ac57ffc3be1f6ccef6ca5b2d5362cba07960fdc8) @@ -161,7 +161,6 @@ static int NsfCreateObjectSystemCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int NsfCurrentCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int NsfDebugRunAssertionsCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); -static int NsfDebugYiedCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int NsfDeprecatedCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int NsfDispatchCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int NsfExistsVarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); @@ -182,6 +181,7 @@ static int NsfRelationCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int NsfSetVarCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int NsfSetterCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); +static int NsfShowStackCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int NsfOAutonameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int NsfOCleanupMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int NsfOConfigureMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); @@ -244,7 +244,6 @@ static int NsfCreateObjectSystemCmd(Tcl_Interp *interp, Tcl_Obj *rootClass, Tcl_Obj *rootMetaClass, Tcl_Obj *systemMethods); static int NsfCurrentCmd(Tcl_Interp *interp, int currentoption); static int NsfDebugRunAssertionsCmd(Tcl_Interp *interp); -static int NsfDebugYiedCmd(Tcl_Interp *interp); static int NsfDeprecatedCmd(Tcl_Interp *interp, CONST char *what, CONST char *oldCmd, CONST char *newCmd); static int NsfDispatchCmd(Tcl_Interp *interp, NsfObject *object, int withObjscope, Tcl_Obj *command, int nobjc, Tcl_Obj *CONST nobjv[]); static int NsfExistsVarCmd(Tcl_Interp *interp, NsfObject *object, CONST char *var); @@ -265,6 +264,7 @@ static int NsfRelationCmd(Tcl_Interp *interp, NsfObject *object, int relationtype, Tcl_Obj *value); static int NsfSetVarCmd(Tcl_Interp *interp, NsfObject *object, Tcl_Obj *variable, Tcl_Obj *value); static int NsfSetterCmd(Tcl_Interp *interp, NsfObject *object, int withPer_object, Tcl_Obj *parameter); +static int NsfShowStackCmd(Tcl_Interp *interp); static int NsfOAutonameMethod(Tcl_Interp *interp, NsfObject *obj, int withInstance, int withReset, Tcl_Obj *name); static int NsfOCleanupMethod(Tcl_Interp *interp, NsfObject *obj); static int NsfOConfigureMethod(Tcl_Interp *interp, NsfObject *obj, int objc, Tcl_Obj *CONST objv[]); @@ -328,7 +328,6 @@ NsfCreateObjectSystemCmdIdx, NsfCurrentCmdIdx, NsfDebugRunAssertionsCmdIdx, - NsfDebugYiedCmdIdx, NsfDeprecatedCmdIdx, NsfDispatchCmdIdx, NsfExistsVarCmdIdx, @@ -349,6 +348,7 @@ NsfRelationCmdIdx, NsfSetVarCmdIdx, NsfSetterCmdIdx, + NsfShowStackCmdIdx, NsfOAutonameMethodIdx, NsfOCleanupMethodIdx, NsfOConfigureMethodIdx, @@ -948,24 +948,6 @@ } static int -NsfDebugYiedCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { - ParseContext pc; - - if (ArgumentParse(interp, objc, objv, NULL, objv[0], - method_definitions[NsfDebugYiedCmdIdx].paramDefs, - method_definitions[NsfDebugYiedCmdIdx].nrParameters, 1, - &pc) != TCL_OK) { - return TCL_ERROR; - } else { - - - ParseContextRelease(&pc); - return NsfDebugYiedCmd(interp); - - } -} - -static int NsfDeprecatedCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { ParseContext pc; @@ -1363,6 +1345,24 @@ } static int +NsfShowStackCmdStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { + ParseContext pc; + + if (ArgumentParse(interp, objc, objv, NULL, objv[0], + method_definitions[NsfShowStackCmdIdx].paramDefs, + method_definitions[NsfShowStackCmdIdx].nrParameters, 1, + &pc) != TCL_OK) { + return TCL_ERROR; + } else { + + + ParseContextRelease(&pc); + return NsfShowStackCmd(interp); + + } +} + +static int NsfOAutonameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { ParseContext pc; NsfObject *obj = (NsfObject *)clientData; @@ -2125,9 +2125,6 @@ {"::nsf::__db_run_assertions", NsfDebugRunAssertionsCmdStub, 0, { } }, -{"::nsf::__db_yield", NsfDebugYiedCmdStub, 0, { - } -}, {"::nsf::deprecated", NsfDeprecatedCmdStub, 3, { {"what", 1, 0, ConvertToString}, {"oldCmd", 1, 0, ConvertToString}, @@ -2230,6 +2227,9 @@ {"-per-object", 0, 0, ConvertToString}, {"parameter", 0, 0, ConvertToTclobj}} }, +{"::nsf::__db_show_stack", NsfShowStackCmdStub, 0, { + } +}, {"::nsf::cmd::Object::autoname", NsfOAutonameMethodStub, 3, { {"-instance", 0, 0, ConvertToString}, {"-reset", 0, 0, ConvertToString},