Index: generic/xotcl.c =================================================================== diff -u -r1ddb61a407f327672ce64aa1c1610e7043c10ec7 -rb385d44db9e33f36d1629fbb0b82cf94d8dffe72 --- generic/xotcl.c (.../xotcl.c) (revision 1ddb61a407f327672ce64aa1c1610e7043c10ec7) +++ generic/xotcl.c (.../xotcl.c) (revision b385d44db9e33f36d1629fbb0b82cf94d8dffe72) @@ -8475,36 +8475,7 @@ return TCL_OK; } -static int XOTclOInstVarMethod(Tcl_Interp *interp, XOTclObject *obj, int objc, Tcl_Obj *CONST objv[]); - extern int -XOTclInstVar(XOTcl_Object *obji, Tcl_Interp *interp, char *name, char *destName) { - XOTclObject *obj = (XOTclObject*) obji; - int result; - Tcl_Obj *alias = NULL; - ALLOC_ON_STACK(Tcl_Obj*, 2, objv); - - objv[0] = XOTclGlobalObjects[XOTE_INSTVAR]; - objv[1] = Tcl_NewStringObj(name, -1); - INCR_REF_COUNT(objv[1]); - - if (destName) { - alias = Tcl_NewStringObj(destName, -1); - INCR_REF_COUNT(alias); - Tcl_ListObjAppendElement(interp, objv[1], alias); - } - - result = XOTclOInstVarMethod(interp, obj, 2, objv); - - if (destName) { - DECR_REF_COUNT(alias); - } - DECR_REF_COUNT(objv[1]); - FREE_ON_STACK(objv); - return result; -} - -extern int XOTclRemovePMethod(Tcl_Interp *interp, XOTcl_Object *object, CONST char *methodName) { XOTclObject *obj = (XOTclObject*) object; Index: generic/xotcl.decls =================================================================== diff -u -rf6be3f63eadda89d7f419a090d86669c6be84c3b -rb385d44db9e33f36d1629fbb0b82cf94d8dffe72 --- generic/xotcl.decls (.../xotcl.decls) (revision f6be3f63eadda89d7f419a090d86669c6be84c3b) +++ generic/xotcl.decls (.../xotcl.decls) (revision b385d44db9e33f36d1629fbb0b82cf94d8dffe72) @@ -79,10 +79,10 @@ Tcl_Obj *XOTclOGetInstVar(struct XOTcl_Object *obj, Tcl_Interp *interp, Tcl_Obj *name, int flgs) } -declare 17 generic { - int XOTclInstVar(struct XOTcl_Object *obj, Tcl_Interp *interp, - char *name, char *destName) -} +#declare 17 generic { +# int XOTclInstVar(struct XOTcl_Object *obj, Tcl_Interp *interp, +# char *name, char *destName) +#} #declare 18 generic { # #} Index: generic/xotclDecls.h =================================================================== diff -u -rf6be3f63eadda89d7f419a090d86669c6be84c3b -rb385d44db9e33f36d1629fbb0b82cf94d8dffe72 --- generic/xotclDecls.h (.../xotclDecls.h) (revision f6be3f63eadda89d7f419a090d86669c6be84c3b) +++ generic/xotclDecls.h (.../xotclDecls.h) (revision b385d44db9e33f36d1629fbb0b82cf94d8dffe72) @@ -101,13 +101,7 @@ Tcl_Interp * interp, Tcl_Obj * name, int flgs); #endif -#ifndef XOTclInstVar_TCL_DECLARED -#define XOTclInstVar_TCL_DECLARED -/* 17 */ -EXTERN int XOTclInstVar (struct XOTcl_Object * obj, - Tcl_Interp * interp, char * name, - char * destName); -#endif +/* Slot 17 is reserved */ /* Slot 18 is reserved */ #ifndef XOTcl_ObjSetVar2_TCL_DECLARED #define XOTcl_ObjSetVar2_TCL_DECLARED @@ -277,7 +271,7 @@ int (*xOTclRemoveIMethod) (Tcl_Interp * interp, struct XOTcl_Class * cl, CONST char * nm); /* 14 */ Tcl_Obj * (*xOTclOSetInstVar) (struct XOTcl_Object * obj, Tcl_Interp * interp, Tcl_Obj * name, Tcl_Obj * value, int flgs); /* 15 */ Tcl_Obj * (*xOTclOGetInstVar) (struct XOTcl_Object * obj, Tcl_Interp * interp, Tcl_Obj * name, int flgs); /* 16 */ - int (*xOTclInstVar) (struct XOTcl_Object * obj, Tcl_Interp * interp, char * name, char * destName); /* 17 */ + void *reserved17; void *reserved18; Tcl_Obj * (*xOTcl_ObjSetVar2) (struct XOTcl_Object * obj, Tcl_Interp * interp, Tcl_Obj * name1, Tcl_Obj * name2, Tcl_Obj * value, int flgs); /* 19 */ Tcl_Obj * (*xOTcl_ObjGetVar2) (struct XOTcl_Object * obj, Tcl_Interp * interp, Tcl_Obj * name1, Tcl_Obj * name2, int flgs); /* 20 */ @@ -373,10 +367,7 @@ #define XOTclOGetInstVar \ (xotclStubsPtr->xOTclOGetInstVar) /* 16 */ #endif -#ifndef XOTclInstVar -#define XOTclInstVar \ - (xotclStubsPtr->xOTclInstVar) /* 17 */ -#endif +/* Slot 17 is reserved */ /* Slot 18 is reserved */ #ifndef XOTcl_ObjSetVar2 #define XOTcl_ObjSetVar2 \ Index: generic/xotclInt.h =================================================================== diff -u -r1ddb61a407f327672ce64aa1c1610e7043c10ec7 -rb385d44db9e33f36d1629fbb0b82cf94d8dffe72 --- generic/xotclInt.h (.../xotclInt.h) (revision 1ddb61a407f327672ce64aa1c1610e7043c10ec7) +++ generic/xotclInt.h (.../xotclInt.h) (revision b385d44db9e33f36d1629fbb0b82cf94d8dffe72) @@ -550,7 +550,7 @@ every time they are used; now they are built once in XOTcl_Init */ typedef enum { XOTE_EMPTY, XOTE_UNKNOWN, XOTE_CREATE, XOTE_DESTROY, XOTE_DEALLOC, - XOTE_ALLOC, XOTE_INIT, XOTE_INSTVAR, XOTE_INTERP, XOTE_AUTONAMES, + XOTE_ALLOC, XOTE_INIT, XOTE_INTERP, XOTE_AUTONAMES, XOTE_ZERO, XOTE_ONE, XOTE_MOVE, XOTE_SELF, XOTE_CLASS, XOTE_RECREATE, XOTE_SELF_CLASS, XOTE_SELF_PROC, XOTE_EXIT_HANDLER, XOTE_DEFAULTSUPERCLASS, XOTE_DEFAULTMETACLASS, @@ -571,7 +571,7 @@ #else char *XOTclGlobalStrings[] = { "", "unknown", "create", "destroy", "dealloc", - "alloc", "init", "instvar", "interp", "__autonames", + "alloc", "init", "interp", "__autonames", "0", "1", "move", "self", "class", "recreate", "self class", "self proc", "__exitHandler", "__default_superclass", "__default_metaclass", Index: generic/xotclStubInit.c =================================================================== diff -u -rcde16e9d87173d7ef9179ce40e10c2f1f708940e -rb385d44db9e33f36d1629fbb0b82cf94d8dffe72 --- generic/xotclStubInit.c (.../xotclStubInit.c) (revision cde16e9d87173d7ef9179ce40e10c2f1f708940e) +++ generic/xotclStubInit.c (.../xotclStubInit.c) (revision b385d44db9e33f36d1629fbb0b82cf94d8dffe72) @@ -53,7 +53,7 @@ XOTclRemoveIMethod, /* 14 */ XOTclOSetInstVar, /* 15 */ XOTclOGetInstVar, /* 16 */ - XOTclInstVar, /* 17 */ + NULL, /* 17 */ NULL, /* 18 */ XOTcl_ObjSetVar2, /* 19 */ XOTcl_ObjGetVar2, /* 20 */