| itcl2TclOO.h | | itcl2TclOO.h | |
| | | | |
| skipping to change at line 34 | | skipping to change at line 34 | |
| Tcl_Class clsPtr, int objc, Tcl_Obj *const *objv); | | Tcl_Class clsPtr, int objc, Tcl_Obj *const *objv); | |
| MODULE_SCOPE Tcl_Method Itcl_NewForwardClassMethod(Tcl_Interp *interp, | | MODULE_SCOPE Tcl_Method Itcl_NewForwardClassMethod(Tcl_Interp *interp, | |
| Tcl_Class clsPtr, int flags, Tcl_Obj *nameObj, Tcl_Obj *prefixObj); | | Tcl_Class clsPtr, int flags, Tcl_Obj *nameObj, Tcl_Obj *prefixObj); | |
| MODULE_SCOPE int Itcl_SelfCmd(ClientData clientData, Tcl_Interp *interp, | | MODULE_SCOPE int Itcl_SelfCmd(ClientData clientData, Tcl_Interp *interp, | |
| int objc, Tcl_Obj *const *objv); | | int objc, Tcl_Obj *const *objv); | |
| MODULE_SCOPE int Itcl_IsMethodCallFrame(Tcl_Interp *interp); | | MODULE_SCOPE int Itcl_IsMethodCallFrame(Tcl_Interp *interp); | |
| MODULE_SCOPE int Itcl_InvokeEnsembleMethod(Tcl_Interp *interp, Tcl_Namespac
e *nsPtr, | | MODULE_SCOPE int Itcl_InvokeEnsembleMethod(Tcl_Interp *interp, Tcl_Namespac
e *nsPtr, | |
| Tcl_Obj *namePtr, Tcl_Proc *procPtr, int objc, Tcl_Obj *const *objv); | | Tcl_Obj *namePtr, Tcl_Proc *procPtr, int objc, Tcl_Obj *const *objv); | |
| MODULE_SCOPE int Itcl_InvokeProcedureMethod(ClientData clientData, Tcl_Inte
rp *interp, | | MODULE_SCOPE int Itcl_InvokeProcedureMethod(ClientData clientData, Tcl_Inte
rp *interp, | |
| int objc, Tcl_Obj *const *objv); | | int objc, Tcl_Obj *const *objv); | |
|
| | | MODULE_SCOPE void Itcl_IncrObjectRefCount(Tcl_Object ptr); | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 0 lines changed or added | |
|
| itclInt.h | | itclInt.h | |
| | | | |
| skipping to change at line 152 | | skipping to change at line 152 | |
| * ioPtr */ | | * ioPtr */ | |
| Tcl_HashTable objectCmds; /* list of known objects using accessCm
d */ | | Tcl_HashTable objectCmds; /* list of known objects using accessCm
d */ | |
| Tcl_HashTable objectNames; /* list of known objects using namePtr
*/ | | Tcl_HashTable objectNames; /* list of known objects using namePtr
*/ | |
| Tcl_HashTable classes; /* list of all known classes, | | Tcl_HashTable classes; /* list of all known classes, | |
| * key is iclsPtr */ | | * key is iclsPtr */ | |
| Tcl_HashTable nameClasses; /* maps from fullNamePtr to iclsPtr */ | | Tcl_HashTable nameClasses; /* maps from fullNamePtr to iclsPtr */ | |
| Tcl_HashTable namespaceClasses; /* maps from nsPtr to iclsPtr */ | | Tcl_HashTable namespaceClasses; /* maps from nsPtr to iclsPtr */ | |
| Tcl_HashTable procMethods; /* maps from procPtr to mFunc */ | | Tcl_HashTable procMethods; /* maps from procPtr to mFunc */ | |
| Tcl_HashTable instances; /* maps from instanceNumber to ioPtr */ | | Tcl_HashTable instances; /* maps from instanceNumber to ioPtr */ | |
| Tcl_HashTable objectInstances; /* maps from ioPtr to instanceNumber */ | | Tcl_HashTable objectInstances; /* maps from ioPtr to instanceNumber */ | |
|
| Tcl_HashTable myEnsembles; /* maps from ensemble name (::itcl::fin | | // Tcl_HashTable myEnsembles; /* maps from ensemble name (::itcl::f | |
| d) | | ind) | |
| * etc. to ensemble pathName */ | | // * etc. to ensemble pathName */ | |
| Tcl_HashTable classTypes; /* maps from class type i.e. "widget" | | Tcl_HashTable classTypes; /* maps from class type i.e. "widget" | |
| * to define value i.e. ITCL_WIDGET */ | | * to define value i.e. ITCL_WIDGET */ | |
| int protection; /* protection level currently in effect
*/ | | int protection; /* protection level currently in effect
*/ | |
| int useOldResolvers; /* whether to use the "old" style | | int useOldResolvers; /* whether to use the "old" style | |
| * resolvers or the CallFrame resolvers
*/ | | * resolvers or the CallFrame resolvers
*/ | |
| Itcl_Stack clsStack; /* stack of class definitions currently | | Itcl_Stack clsStack; /* stack of class definitions currently | |
| * being parsed */ | | * being parsed */ | |
| Itcl_Stack contextStack; /* stack of call contexts */ | | Itcl_Stack contextStack; /* stack of call contexts */ | |
| Itcl_Stack constructorStack; /* stack of constructor calls */ | | Itcl_Stack constructorStack; /* stack of constructor calls */ | |
| struct ItclObject *currIoPtr; /* object currently being constructed | | struct ItclObject *currIoPtr; /* object currently being constructed | |
| | | | |
| skipping to change at line 208 | | skipping to change at line 208 | |
| * been called | | * been called | |
| */ | | */ | |
| Tcl_Obj *unknownNamePtr; | | Tcl_Obj *unknownNamePtr; | |
| Tcl_Obj *unknownArgumentPtr; | | Tcl_Obj *unknownArgumentPtr; | |
| Tcl_Obj *unknownBodyPtr; | | Tcl_Obj *unknownBodyPtr; | |
| Tcl_Obj *infoVarsPtr; | | Tcl_Obj *infoVarsPtr; | |
| Tcl_Obj *infoVars2Ptr; | | Tcl_Obj *infoVars2Ptr; | |
| Tcl_Obj *infoVars3Ptr; | | Tcl_Obj *infoVars3Ptr; | |
| Tcl_Obj *infoVars4Ptr; | | Tcl_Obj *infoVars4Ptr; | |
| Tcl_Obj *typeDestructorArgumentPtr; | | Tcl_Obj *typeDestructorArgumentPtr; | |
|
| | | struct ItclObject *lastIoPtr; /* last object constructed */ | |
| } ItclObjectInfo; | | } ItclObjectInfo; | |
| | | | |
| typedef struct EnsembleInfo { | | typedef struct EnsembleInfo { | |
| Tcl_HashTable ensembles; /* list of all known ensembles */ | | Tcl_HashTable ensembles; /* list of all known ensembles */ | |
| Tcl_HashTable subEnsembles; /* list of all known subensembles */ | | Tcl_HashTable subEnsembles; /* list of all known subensembles */ | |
| int numEnsembles; | | int numEnsembles; | |
| Tcl_Namespace *ensembleNsPtr; | | Tcl_Namespace *ensembleNsPtr; | |
| } EnsembleInfo; | | } EnsembleInfo; | |
| /* | | /* | |
| * Representation for each [incr Tcl] class. | | * Representation for each [incr Tcl] class. | |
| | | | |
| skipping to change at line 822 | | skipping to change at line 823 | |
| MODULE_SCOPE int ItclAddClassComponentDictInfo(Tcl_Interp *interp, | | MODULE_SCOPE int ItclAddClassComponentDictInfo(Tcl_Interp *interp, | |
| ItclClass *iclsPtr, ItclComponent *icPtr); | | ItclClass *iclsPtr, ItclComponent *icPtr); | |
| MODULE_SCOPE int ItclAddClassVariableDictInfo(Tcl_Interp *interp, | | MODULE_SCOPE int ItclAddClassVariableDictInfo(Tcl_Interp *interp, | |
| ItclClass *iclsPtr, ItclVariable *ivPtr); | | ItclClass *iclsPtr, ItclVariable *ivPtr); | |
| MODULE_SCOPE int ItclAddClassFunctionDictInfo(Tcl_Interp *interp, | | MODULE_SCOPE int ItclAddClassFunctionDictInfo(Tcl_Interp *interp, | |
| ItclClass *iclsPtr, ItclMemberFunc *imPtr); | | ItclClass *iclsPtr, ItclMemberFunc *imPtr); | |
| MODULE_SCOPE int ItclAddClassDelegatedFunctionDictInfo(Tcl_Interp *interp, | | MODULE_SCOPE int ItclAddClassDelegatedFunctionDictInfo(Tcl_Interp *interp, | |
| ItclClass *iclsPtr, ItclDelegatedFunction *idmPtr); | | ItclClass *iclsPtr, ItclDelegatedFunction *idmPtr); | |
| MODULE_SCOPE ItclClass * GetClassFromClassName(Tcl_Interp *interp, | | MODULE_SCOPE ItclClass * GetClassFromClassName(Tcl_Interp *interp, | |
| const char *className, ItclClass *iclsPtr); | | const char *className, ItclClass *iclsPtr); | |
|
| | | MODULE_SCOPE int ItclClassCreateObject(ClientData clientData, Tcl_Interp *i | |
| | | nterp, | |
| | | int objc, Tcl_Obj *const objv[]); | |
| MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiMyProcCmd; | | MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiMyProcCmd; | |
| MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiInstallComponentCmd; | | MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiInstallComponentCmd; | |
| MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiCallInstanceCmd; | | MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiCallInstanceCmd; | |
| MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiGetInstanceVarCmd; | | MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiGetInstanceVarCmd; | |
| MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiMyTypeMethodCmd; | | MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiMyTypeMethodCmd; | |
| MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiMyMethodCmd; | | MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiMyMethodCmd; | |
| MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiMyTypeVarCmd; | | MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiMyTypeVarCmd; | |
| MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiMyVarCmd; | | MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiMyVarCmd; | |
| MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiItclHullCmd; | | MODULE_SCOPE Tcl_ObjCmdProc Itcl_BiItclHullCmd; | |
| MODULE_SCOPE Tcl_ObjCmdProc Itcl_ThisCmd; | | MODULE_SCOPE Tcl_ObjCmdProc Itcl_ThisCmd; | |
| | | | |
End of changes. 3 change blocks. |
| 3 lines changed or deleted | | 7 lines changed or added | |
|
| itclIntDecls.h | | itclIntDecls.h | |
| /* | | /* | |
| * This file is (mostly) automatically generated from itcl.decls. | | * This file is (mostly) automatically generated from itcl.decls. | |
| */ | | */ | |
| | | | |
| #ifndef _ITCLINTDECLS | | #ifndef _ITCLINTDECLS | |
| #define _ITCLINTDECLS | | #define _ITCLINTDECLS | |
| | | | |
| /* !BEGIN!: Do not edit below this line. */ | | /* !BEGIN!: Do not edit below this line. */ | |
| | | | |
| #define ITCLINT_STUBS_EPOCH 0 | | #define ITCLINT_STUBS_EPOCH 0 | |
|
| #define ITCLINT_STUBS_REVISION 144 | | #define ITCLINT_STUBS_REVISION 149 | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| extern "C" { | | extern "C" { | |
| #endif | | #endif | |
| | | | |
| /* | | /* | |
| * Exported function declarations: | | * Exported function declarations: | |
| */ | | */ | |
| | | | |
| /* 0 */ | | /* 0 */ | |
| | | | |
| skipping to change at line 141 | | skipping to change at line 141 | |
| ItclClass *iclsPtr, Tcl_Obj *name, | | ItclClass *iclsPtr, Tcl_Obj *name, | |
| char *init, char *config, | | char *init, char *config, | |
| ItclVariable **ivPtr); | | ItclVariable **ivPtr); | |
| /* 40 */ | | /* 40 */ | |
| ITCLAPI void Itcl_DeleteVariable(char *cdata); | | ITCLAPI void Itcl_DeleteVariable(char *cdata); | |
| /* 41 */ | | /* 41 */ | |
| ITCLAPI const char * Itcl_GetCommonVar(Tcl_Interp *interp, | | ITCLAPI const char * Itcl_GetCommonVar(Tcl_Interp *interp, | |
| const char *name, ItclClass *contextClass); | | const char *name, ItclClass *contextClass); | |
| /* Slot 42 is reserved */ | | /* Slot 42 is reserved */ | |
| /* Slot 43 is reserved */ | | /* Slot 43 is reserved */ | |
|
| /* Slot 44 is reserved */ | | /* 44 */ | |
| | | ITCLAPI int Itcl_CreateObject(Tcl_Interp *interp, | |
| | | const char*name, ItclClass *iclsPtr, | |
| | | int objc, Tcl_Obj *const objv[], | |
| | | ItclObject **rioPtr); | |
| /* 45 */ | | /* 45 */ | |
| ITCLAPI int Itcl_DeleteObject(Tcl_Interp *interp, | | ITCLAPI int Itcl_DeleteObject(Tcl_Interp *interp, | |
| ItclObject *contextObj); | | ItclObject *contextObj); | |
| /* 46 */ | | /* 46 */ | |
| ITCLAPI int Itcl_DestructObject(Tcl_Interp *interp, | | ITCLAPI int Itcl_DestructObject(Tcl_Interp *interp, | |
| ItclObject *contextObj, int flags); | | ItclObject *contextObj, int flags); | |
| /* Slot 47 is reserved */ | | /* Slot 47 is reserved */ | |
| /* 48 */ | | /* 48 */ | |
| ITCLAPI const char * Itcl_GetInstanceVar(Tcl_Interp *interp, | | ITCLAPI const char * Itcl_GetInstanceVar(Tcl_Interp *interp, | |
| const char *name, ItclObject *contextIoPtr, | | const char *name, ItclObject *contextIoPtr, | |
| | | | |
| skipping to change at line 569 | | skipping to change at line 573 | |
| int (*itcl_HandleClass) (ClientData clientData, Tcl_Interp *interp, int
objc, Tcl_Obj *const objv[]); /* 34 */ | | int (*itcl_HandleClass) (ClientData clientData, Tcl_Interp *interp, int
objc, Tcl_Obj *const objv[]); /* 34 */ | |
| void (*reserved35)(void); | | void (*reserved35)(void); | |
| void (*reserved36)(void); | | void (*reserved36)(void); | |
| void (*reserved37)(void); | | void (*reserved37)(void); | |
| void (*itcl_BuildVirtualTables) (ItclClass *iclsPtr); /* 38 */ | | void (*itcl_BuildVirtualTables) (ItclClass *iclsPtr); /* 38 */ | |
| int (*itcl_CreateVariable) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl
_Obj *name, char *init, char *config, ItclVariable **ivPtr); /* 39 */ | | int (*itcl_CreateVariable) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl
_Obj *name, char *init, char *config, ItclVariable **ivPtr); /* 39 */ | |
| void (*itcl_DeleteVariable) (char *cdata); /* 40 */ | | void (*itcl_DeleteVariable) (char *cdata); /* 40 */ | |
| const char * (*itcl_GetCommonVar) (Tcl_Interp *interp, const char *name
, ItclClass *contextClass); /* 41 */ | | const char * (*itcl_GetCommonVar) (Tcl_Interp *interp, const char *name
, ItclClass *contextClass); /* 41 */ | |
| void (*reserved42)(void); | | void (*reserved42)(void); | |
| void (*reserved43)(void); | | void (*reserved43)(void); | |
|
| void (*reserved44)(void); | | int (*itcl_CreateObject) (Tcl_Interp *interp, const char*name, ItclClas
s *iclsPtr, int objc, Tcl_Obj *const objv[], ItclObject **rioPtr); /* 44 */ | |
| int (*itcl_DeleteObject) (Tcl_Interp *interp, ItclObject *contextObj);
/* 45 */ | | int (*itcl_DeleteObject) (Tcl_Interp *interp, ItclObject *contextObj);
/* 45 */ | |
| int (*itcl_DestructObject) (Tcl_Interp *interp, ItclObject *contextObj,
int flags); /* 46 */ | | int (*itcl_DestructObject) (Tcl_Interp *interp, ItclObject *contextObj,
int flags); /* 46 */ | |
| void (*reserved47)(void); | | void (*reserved47)(void); | |
| const char * (*itcl_GetInstanceVar) (Tcl_Interp *interp, const char *na
me, ItclObject *contextIoPtr, ItclClass *contextIclsPtr); /* 48 */ | | const char * (*itcl_GetInstanceVar) (Tcl_Interp *interp, const char *na
me, ItclObject *contextIoPtr, ItclClass *contextIclsPtr); /* 48 */ | |
| void (*reserved49)(void); | | void (*reserved49)(void); | |
| int (*itcl_BodyCmd) (ClientData dummy, Tcl_Interp *interp, int objc, Tc
l_Obj *const objv[]); /* 50 */ | | int (*itcl_BodyCmd) (ClientData dummy, Tcl_Interp *interp, int objc, Tc
l_Obj *const objv[]); /* 50 */ | |
| int (*itcl_ConfigBodyCmd) (ClientData dummy, Tcl_Interp *interp, int ob
jc, Tcl_Obj *const objv[]); /* 51 */ | | int (*itcl_ConfigBodyCmd) (ClientData dummy, Tcl_Interp *interp, int ob
jc, Tcl_Obj *const objv[]); /* 51 */ | |
| int (*itcl_CreateMethod) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl_O
bj *namePtr, const char *arglist, const char *body); /* 52 */ | | int (*itcl_CreateMethod) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl_O
bj *namePtr, const char *arglist, const char *body); /* 52 */ | |
| int (*itcl_CreateProc) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl_Obj
*namePtr, const char *arglist, const char *body); /* 53 */ | | int (*itcl_CreateProc) (Tcl_Interp *interp, ItclClass *iclsPtr, Tcl_Obj
*namePtr, const char *arglist, const char *body); /* 53 */ | |
| int (*itcl_CreateMemberFunc) (Tcl_Interp *interp, ItclClass *iclsPtr, T
cl_Obj *name, const char *arglist, const char *body, ItclMemberFunc **mfunc
Ptr); /* 54 */ | | int (*itcl_CreateMemberFunc) (Tcl_Interp *interp, ItclClass *iclsPtr, T
cl_Obj *name, const char *arglist, const char *body, ItclMemberFunc **mfunc
Ptr); /* 54 */ | |
| | | | |
| skipping to change at line 800 | | skipping to change at line 804 | |
| #define Itcl_BuildVirtualTables \ | | #define Itcl_BuildVirtualTables \ | |
| (itclIntStubsPtr->itcl_BuildVirtualTables) /* 38 */ | | (itclIntStubsPtr->itcl_BuildVirtualTables) /* 38 */ | |
| #define Itcl_CreateVariable \ | | #define Itcl_CreateVariable \ | |
| (itclIntStubsPtr->itcl_CreateVariable) /* 39 */ | | (itclIntStubsPtr->itcl_CreateVariable) /* 39 */ | |
| #define Itcl_DeleteVariable \ | | #define Itcl_DeleteVariable \ | |
| (itclIntStubsPtr->itcl_DeleteVariable) /* 40 */ | | (itclIntStubsPtr->itcl_DeleteVariable) /* 40 */ | |
| #define Itcl_GetCommonVar \ | | #define Itcl_GetCommonVar \ | |
| (itclIntStubsPtr->itcl_GetCommonVar) /* 41 */ | | (itclIntStubsPtr->itcl_GetCommonVar) /* 41 */ | |
| /* Slot 42 is reserved */ | | /* Slot 42 is reserved */ | |
| /* Slot 43 is reserved */ | | /* Slot 43 is reserved */ | |
|
| /* Slot 44 is reserved */ | | #define Itcl_CreateObject \ | |
| | | (itclIntStubsPtr->itcl_CreateObject) /* 44 */ | |
| #define Itcl_DeleteObject \ | | #define Itcl_DeleteObject \ | |
| (itclIntStubsPtr->itcl_DeleteObject) /* 45 */ | | (itclIntStubsPtr->itcl_DeleteObject) /* 45 */ | |
| #define Itcl_DestructObject \ | | #define Itcl_DestructObject \ | |
| (itclIntStubsPtr->itcl_DestructObject) /* 46 */ | | (itclIntStubsPtr->itcl_DestructObject) /* 46 */ | |
| /* Slot 47 is reserved */ | | /* Slot 47 is reserved */ | |
| #define Itcl_GetInstanceVar \ | | #define Itcl_GetInstanceVar \ | |
| (itclIntStubsPtr->itcl_GetInstanceVar) /* 48 */ | | (itclIntStubsPtr->itcl_GetInstanceVar) /* 48 */ | |
| /* Slot 49 is reserved */ | | /* Slot 49 is reserved */ | |
| #define Itcl_BodyCmd \ | | #define Itcl_BodyCmd \ | |
| (itclIntStubsPtr->itcl_BodyCmd) /* 50 */ | | (itclIntStubsPtr->itcl_BodyCmd) /* 50 */ | |
| | | | |
End of changes. 4 change blocks. |
| 4 lines changed or deleted | | 9 lines changed or added | |
|