Index: xotcl/ChangeLog =================================================================== diff -u -raf574e7e934986818f402ee382f7cdab57feed39 -r795e843bc1d4d68b002d9e2e3fffe8aa6e1945a8 --- xotcl/ChangeLog (.../ChangeLog) (revision af574e7e934986818f402ee382f7cdab57feed39) +++ xotcl/ChangeLog (.../ChangeLog) (revision 795e843bc1d4d68b002d9e2e3fffe8aa6e1945a8) @@ -1,6 +1,11 @@ 2004-08-26 Gustaf.Neumann@wu-wien.ac.at, Uwe Zdun * release of distribution XOTcl 1.3.1 +2004-08-26 Gustaf.Neumann@wu-wien.ac.at + * removed dependencies on TclGetInterpProc(), added define + USE_INTERP_PROC if someone needs this. If nobody complains, + we will remove this in the future + 2004-08-22 Gustaf.Neumann@wu-wien.ac.at * fixed nonposargs, when used with checker procs and spaces in arguments Index: xotcl/doc/xo-daemon.html =================================================================== diff -u -raf574e7e934986818f402ee382f7cdab57feed39 -r795e843bc1d4d68b002d9e2e3fffe8aa6e1945a8 --- xotcl/doc/xo-daemon.html (.../xo-daemon.html) (revision af574e7e934986818f402ee382f7cdab57feed39) +++ xotcl/doc/xo-daemon.html (.../xo-daemon.html) (revision 795e843bc1d4d68b002d9e2e3fffe8aa6e1945a8) @@ -75,7 +75,7 @@ Date: - [::xotcl::rcs date {$Date: 2004/08/25 09:45:23 $}] + [::xotcl::rcs date {$Date: 2004/08/26 19:42:52 $}] Index: xotcl/doc/xo-whichPkg.html =================================================================== diff -u -raf574e7e934986818f402ee382f7cdab57feed39 -r795e843bc1d4d68b002d9e2e3fffe8aa6e1945a8 --- xotcl/doc/xo-whichPkg.html (.../xo-whichPkg.html) (revision af574e7e934986818f402ee382f7cdab57feed39) +++ xotcl/doc/xo-whichPkg.html (.../xo-whichPkg.html) (revision 795e843bc1d4d68b002d9e2e3fffe8aa6e1945a8) @@ -51,7 +51,7 @@ Date: - [::xotcl::rcs date {$Date: 2004/08/25 09:45:23 $}] + [::xotcl::rcs date {$Date: 2004/08/26 19:42:52 $}] Index: xotcl/generic/xotcl.c =================================================================== diff -u -rae1fe95f685e06aa89b09e196cf421ce9ded5891 -r795e843bc1d4d68b002d9e2e3fffe8aa6e1945a8 --- xotcl/generic/xotcl.c (.../xotcl.c) (revision ae1fe95f685e06aa89b09e196cf421ce9ded5891) +++ xotcl/generic/xotcl.c (.../xotcl.c) (revision 795e843bc1d4d68b002d9e2e3fffe8aa6e1945a8) @@ -1,4 +1,4 @@ -/* $Id: xotcl.c,v 1.24 2004/08/22 10:00:19 neumann Exp $ +/* $Id: xotcl.c,v 1.25 2004/08/26 19:42:52 neumann Exp $ * * XOTcl - Extended OTcl * @@ -4901,8 +4901,10 @@ Tcl_ObjCmdProc *proc = Tcl_Command_objProc(cmd); if (proc == RUNTIME_STATE(in)->objInterpProc) return (Proc*) Tcl_Command_objClientData(cmd); +#if USE_INTERP_PROC else if ((Tcl_CmdProc*)proc == RUNTIME_STATE(in)->interpProc) return (Proc*) Tcl_Command_clientData(cmd); +#endif } return 0; } @@ -10065,14 +10067,14 @@ entryPtr = Tcl_FirstHashEntry(cmdTable, &search); while (entryPtr) { cmd = (Tcl_Command)Tcl_GetHashValue(entryPtr); - if (Tcl_Command_proc(cmd) == RUNTIME_STATE(in)->interpProc) { - /* - char *key = Tcl_GetHashKey(cmdTable, entryPtr); - fprintf(stderr, "cmdname = %s cmd %p proc %p objProc %p %d\n", - key,cmd,cmd->proc,cmd->objProc, - cmd->proc==RUNTIME_STATE(in)->interpProc); - - */ + + if (Tcl_Command_objProc(cmd) == RUNTIME_STATE(in)->objInterpProc) { + char *key = Tcl_GetHashKey(cmdTable, entryPtr); + + /*fprintf(stderr, "cmdname = %s cmd %p proc %p objProc %p %d\n", + key,cmd,Tcl_Command_proc(cmd),Tcl_Command_objProc(cmd), + Tcl_Command_proc(cmd)==RUNTIME_STATE(in)->objInterpProc);*/ + Tcl_DeleteCommandFromToken(in, cmd); } entryPtr = Tcl_NextHashEntry(&search); @@ -10464,7 +10466,9 @@ /* cache interpreters proc interpretation functions */ RUNTIME_STATE(in)->objInterpProc = TclGetObjInterpProc(); +#if USE_INTERP_PROC RUNTIME_STATE(in)->interpProc = TclGetInterpProc(); +#endif RUNTIME_STATE(in)->exitHandlerDestroyRound = XOTCL_EXITHANDLER_OFF; RegisterObjTypes(); Index: xotcl/generic/xotclInt.h =================================================================== diff -u -rae1fe95f685e06aa89b09e196cf421ce9ded5891 -r795e843bc1d4d68b002d9e2e3fffe8aa6e1945a8 --- xotcl/generic/xotclInt.h (.../xotclInt.h) (revision ae1fe95f685e06aa89b09e196cf421ce9ded5891) +++ xotcl/generic/xotclInt.h (.../xotclInt.h) (revision 795e843bc1d4d68b002d9e2e3fffe8aa6e1945a8) @@ -1,5 +1,5 @@ /* -*- Mode: c++ -*- - * $Id: xotclInt.h,v 1.7 2004/08/22 10:00:19 neumann Exp $ + * $Id: xotclInt.h,v 1.8 2004/08/26 19:42:52 neumann Exp $ * Extended Object Tcl (XOTcl) * * Copyright (C) 1999-2002 Gustaf Neumann, Uwe Zdun @@ -601,7 +601,9 @@ */ XOTclClass *theObject; XOTclClass *theClass; +#if USE_INTERP_PROC Tcl_CmdProc *interpProc; +#endif Tcl_ObjCmdProc *objInterpProc; Tcl_Obj **methodObjNames; struct XOTclShadowTclCommandInfo *tclCommands;