Index: generic/gentclAPI.decls =================================================================== diff -u -r033a6b832c7cc7d99894422d63d9ff944c09c35d -rae1f8003c9b771906e285970f31ff9f12ce40558 --- generic/gentclAPI.decls (.../gentclAPI.decls) (revision 033a6b832c7cc7d99894422d63d9ff944c09c35d) +++ generic/gentclAPI.decls (.../gentclAPI.decls) (revision ae1f8003c9b771906e285970f31ff9f12ce40558) @@ -408,12 +408,12 @@ {-argName "-guards"} {-argName "pattern" -type objpattern} } -infoClassMethod instmixin XOTclClassInfoInstmixinMethod { - {-argName "class" -required 1 -type class} - {-argName "-closure"} - {-argName "-guards"} - {-argName "pattern" -type objpattern} -} +# infoClassMethod instmixin XOTclClassInfoInstmixinMethod { +# {-argName "class" -required 1 -type class} +# {-argName "-closure"} +# {-argName "-guards"} +# {-argName "pattern" -type objpattern} +# } infoClassMethod instmixinguard XOTclClassInfoInstmixinguardMethod { {-argName "class" -required 1 -type class} {-argName "mixin" -required 1} Index: generic/tclAPI.h =================================================================== diff -u -r033a6b832c7cc7d99894422d63d9ff944c09c35d -rae1f8003c9b771906e285970f31ff9f12ce40558 --- generic/tclAPI.h (.../tclAPI.h) (revision 033a6b832c7cc7d99894422d63d9ff944c09c35d) +++ generic/tclAPI.h (.../tclAPI.h) (revision ae1f8003c9b771906e285970f31ff9f12ce40558) @@ -108,7 +108,6 @@ static int XOTclClassInfoInstfilterguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclClassInfoInstforwardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclClassInfoInstinvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); -static int XOTclClassInfoInstmixinMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclClassInfoInstmixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclClassInfoInstmixinofMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); static int XOTclClassInfoInstparamsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []); @@ -205,7 +204,6 @@ static int XOTclClassInfoInstfilterguardMethod(Tcl_Interp *interp, XOTclClass *class, char *filter); static int XOTclClassInfoInstforwardMethod(Tcl_Interp *interp, XOTclClass *class, int withDefinition, char *name); static int XOTclClassInfoInstinvarMethod(Tcl_Interp *interp, XOTclClass *class); -static int XOTclClassInfoInstmixinMethod(Tcl_Interp *interp, XOTclClass *class, int withClosure, int withGuards, char *patternString, XOTclObject *patternObj); static int XOTclClassInfoInstmixinguardMethod(Tcl_Interp *interp, XOTclClass *class, char *mixin); static int XOTclClassInfoInstmixinofMethod(Tcl_Interp *interp, XOTclClass *class, int withClosure, char *patternString, XOTclObject *patternObj); static int XOTclClassInfoInstparamsMethod(Tcl_Interp *interp, XOTclClass *class, char *methodName, int withVarnames); @@ -303,7 +301,6 @@ XOTclClassInfoInstfilterguardMethodIdx, XOTclClassInfoInstforwardMethodIdx, XOTclClassInfoInstinvarMethodIdx, - XOTclClassInfoInstmixinMethodIdx, XOTclClassInfoInstmixinguardMethodIdx, XOTclClassInfoInstmixinofMethodIdx, XOTclClassInfoInstparamsMethodIdx, @@ -817,41 +814,6 @@ } static int -XOTclClassInfoInstmixinMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { - parseContext pc; - - if (ArgumentParse(interp, objc, objv, NULL, objv[0], - method_definitions[XOTclClassInfoInstmixinMethodIdx].paramDefs, - method_definitions[XOTclClassInfoInstmixinMethodIdx].nrParameters, - &pc) != TCL_OK) { - return TCL_ERROR; - } else { - XOTclClass *class = (XOTclClass *)pc.clientData[0]; - int withClosure = (int )pc.clientData[1]; - int withGuards = (int )pc.clientData[2]; - char *patternString = NULL; - XOTclObject *patternObj = NULL; - Tcl_Obj *pattern = (Tcl_Obj *)pc.clientData[3]; - int returnCode; - - if (getMatchObject(interp, pattern, objv[3], &patternObj, &patternString) == -1) { - if (pattern) { - DECR_REF_COUNT(pattern); - } - return TCL_OK; - } - - parseContextRelease(&pc); - returnCode = XOTclClassInfoInstmixinMethod(interp, class, withClosure, withGuards, patternString, patternObj); - - if (pattern) { - DECR_REF_COUNT(pattern); - } - return returnCode; - } -} - -static int XOTclClassInfoInstmixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { parseContext pc; @@ -2405,12 +2367,6 @@ {"::xotcl::cmd::ClassInfo::instinvar", XOTclClassInfoInstinvarMethodStub, 1, { {"class", 1, 0, convertToClass}} }, -{"::xotcl::cmd::ClassInfo::instmixin", XOTclClassInfoInstmixinMethodStub, 4, { - {"class", 1, 0, convertToClass}, - {"-closure", 0, 0, convertToString}, - {"-guards", 0, 0, convertToString}, - {"pattern", 0, 0, convertToObjpattern}} -}, {"::xotcl::cmd::ClassInfo::instmixinguard", XOTclClassInfoInstmixinguardMethodStub, 2, { {"class", 1, 0, convertToClass}, {"mixin", 1, 0, convertToString}} Index: generic/xotcl.c =================================================================== diff -u -rf0260303acd3dd10018bbcbb28fc5d954dca2dc6 -rae1f8003c9b771906e285970f31ff9f12ce40558 --- generic/xotcl.c (.../xotcl.c) (revision f0260303acd3dd10018bbcbb28fc5d954dca2dc6) +++ generic/xotcl.c (.../xotcl.c) (revision ae1f8003c9b771906e285970f31ff9f12ce40558) @@ -12866,12 +12866,7 @@ /* TODO: this method should be removed, we should register XOTclClassInfoMixinMethod for xotcl1 under name ... instmxin ... */ -static int XOTclClassInfoInstmixinMethod(Tcl_Interp *interp, XOTclClass * class, int withClosure, int withGuards, - char *patternString, XOTclObject *patternObj) { - return XOTclClassInfoMixinMethod(interp, class, withClosure, withGuards, patternString, patternObj); -} - static int XOTclClassInfoInstmixinguardMethod(Tcl_Interp *interp, XOTclClass * class, char * mixin) { return class->opt ? GuardList(interp, class->opt->instmixins, mixin) : TCL_OK; } Index: library/lib/xotcl1.xotcl =================================================================== diff -u -r033a6b832c7cc7d99894422d63d9ff944c09c35d -rae1f8003c9b771906e285970f31ff9f12ce40558 --- library/lib/xotcl1.xotcl (.../xotcl1.xotcl) (revision 033a6b832c7cc7d99894422d63d9ff944c09c35d) +++ library/lib/xotcl1.xotcl (.../xotcl1.xotcl) (revision ae1f8003c9b771906e285970f31ff9f12ce40558) @@ -312,6 +312,7 @@ ::xotcl::alias ::xotcl::classInfo is ::xotcl::is ::xotcl::alias ::xotcl::classInfo classparent ::xotcl::cmd::ObjectInfo::parent ::xotcl::alias ::xotcl::classInfo classchildren ::xotcl::cmd::ObjectInfo::children + ::xotcl::alias ::xotcl::classInfo instmixin ::xotcl::cmd::ClassInfo::mixin # define info methods from objectInfo on classInfo as well ::xotcl::alias classInfo body objectInfo::body