Index: generic/tclAPI.h
===================================================================
diff -u -rf209c50ea8cb651d0dea25206301e45202217797 -rce552d49dd2f135f21cefb4b88c9bf1357881c2e
--- generic/tclAPI.h	(.../tclAPI.h)	(revision f209c50ea8cb651d0dea25206301e45202217797)
+++ generic/tclAPI.h	(.../tclAPI.h)	(revision ce552d49dd2f135f21cefb4b88c9bf1357881c2e)
@@ -11,21 +11,32 @@
                            XOTclObject **matchObject, char **pattern);
   
 static int XOTclClassInfoHeritageMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
-static int XOTclClassInfoHeritageMethod(Tcl_Interp *interp, XOTclClass * class, char * pattern);
 static int XOTclClassInfoInstancesMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
-static int XOTclClassInfoInstancesMethod(Tcl_Interp *interp, XOTclClass * class, int withClosure, char *patternString, XOTclObject *patternObj);
 static int XOTclClassInfoInstargsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
-static int XOTclClassInfoInstargsMethod(Tcl_Interp *interp, XOTclClass * class, char * methodName);
 static int XOTclClassInfoInstbodyMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
-static int XOTclClassInfoInstbodyMethod(Tcl_Interp *interp, XOTclClass * class, char * methodName);
 static int XOTclClassInfoInstcommandsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
-static int XOTclClassInfoInstcommandsMethod(Tcl_Interp *interp, XOTclClass * class, char * pattern);
 static int XOTclClassInfoInstdefaultMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
-static int XOTclClassInfoInstdefaultMethod(Tcl_Interp *interp, XOTclClass * class, char * methodName, char * arg, Tcl_Obj * var);
 static int XOTclClassInfoInstfilterMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv []);
-static int XOTclClassInfoInstfilterMethod(Tcl_Interp *interp, XOTclClass * class, int withGuards, char * pattern);
 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 XOTclClassInfoHeritageMethod(Tcl_Interp *interp, XOTclClass * class, char * pattern);
+static int XOTclClassInfoInstancesMethod(Tcl_Interp *interp, XOTclClass * class, int withClosure, char *patternString, XOTclObject *patternObj);
+static int XOTclClassInfoInstargsMethod(Tcl_Interp *interp, XOTclClass * class, char * methodName);
+static int XOTclClassInfoInstbodyMethod(Tcl_Interp *interp, XOTclClass * class, char * methodName);
+static int XOTclClassInfoInstcommandsMethod(Tcl_Interp *interp, XOTclClass * class, char * pattern);
+static int XOTclClassInfoInstdefaultMethod(Tcl_Interp *interp, XOTclClass * class, char * methodName, char * arg, Tcl_Obj * var);
+static int XOTclClassInfoInstfilterMethod(Tcl_Interp *interp, XOTclClass * class, int withGuards, char * pattern);
 static int XOTclClassInfoInstfilterguardMethod(Tcl_Interp *interp, XOTclClass * class, char * filter);
+static int XOTclClassInfoInstforwardMethod(Tcl_Interp *interp, XOTclClass * class, int withDefinition, char * methodName);
+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);
 
 enum {
  XOTclClassInfoHeritageMethodIdx,
@@ -35,7 +46,12 @@
  XOTclClassInfoInstcommandsMethodIdx,
  XOTclClassInfoInstdefaultMethodIdx,
  XOTclClassInfoInstfilterMethodIdx,
- XOTclClassInfoInstfilterguardMethodIdx
+ XOTclClassInfoInstfilterguardMethodIdx,
+ XOTclClassInfoInstforwardMethodIdx,
+ XOTclClassInfoInstinvarMethodIdx,
+ XOTclClassInfoInstmixinMethodIdx,
+ XOTclClassInfoInstmixinguardMethodIdx,
+ XOTclClassInfoInstmixinofMethodIdx
 } XOTclMethods;
 
 
@@ -64,18 +80,13 @@
     char *patternString = NULL;
     XOTclObject *patternObj = NULL;
     Tcl_Obj * pattern = (Tcl_Obj *)pc.clientData[2];
-    int returnCode;
 
     if (getMatchObject3(interp, pattern,  &pc, &patternObj, &patternString) == -1) {
       return TCL_OK;
     }
           
-    returnCode = XOTclClassInfoInstancesMethod(interp, class, withClosure, patternString, patternObj);
+    return XOTclClassInfoInstancesMethod(interp, class, withClosure, patternString, patternObj);
 
-    if (patternObj) {
-      Tcl_SetObjResult(interp, returnCode ? patternObj->cmdName : XOTclGlobalObjects[XOTE_EMPTY]);
-    }
-    return TCL_OK;
   }
 }
   
@@ -166,6 +177,91 @@
   }
 }
   
+static int
+XOTclClassInfoInstforwardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  parseContext pc;
+  if (parse2(clientData, interp, objc, objv, XOTclClassInfoInstforwardMethodIdx, &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    XOTclClass * class = (XOTclClass *)pc.clientData[0];
+    int withDefinition = (int)pc.clientData[1];
+    char * methodName = (char *)pc.clientData[2];
+
+    return XOTclClassInfoInstforwardMethod(interp, class, withDefinition, methodName);
+
+  }
+}
+  
+static int
+XOTclClassInfoInstinvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  parseContext pc;
+  if (parse2(clientData, interp, objc, objv, XOTclClassInfoInstinvarMethodIdx, &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    XOTclClass * class = (XOTclClass *)pc.clientData[0];
+
+    return XOTclClassInfoInstinvarMethod(interp, class);
+
+  }
+}
+  
+static int
+XOTclClassInfoInstmixinMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  parseContext pc;
+  if (parse2(clientData, interp, objc, objv, XOTclClassInfoInstmixinMethodIdx, &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];
+
+    if (getMatchObject3(interp, pattern,  &pc, &patternObj, &patternString) == -1) {
+      return TCL_OK;
+    }
+          
+    return XOTclClassInfoInstmixinMethod(interp, class, withClosure, withGuards, patternString, patternObj);
+
+  }
+}
+  
+static int
+XOTclClassInfoInstmixinguardMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  parseContext pc;
+  if (parse2(clientData, interp, objc, objv, XOTclClassInfoInstmixinguardMethodIdx, &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    XOTclClass * class = (XOTclClass *)pc.clientData[0];
+    char * mixin = (char *)pc.clientData[1];
+
+    return XOTclClassInfoInstmixinguardMethod(interp, class, mixin);
+
+  }
+}
+  
+static int
+XOTclClassInfoInstmixinofMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  parseContext pc;
+  if (parse2(clientData, interp, objc, objv, XOTclClassInfoInstmixinofMethodIdx, &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    XOTclClass * class = (XOTclClass *)pc.clientData[0];
+    int withClosure = (int)pc.clientData[1];
+    char *patternString = NULL;
+    XOTclObject *patternObj = NULL;
+    Tcl_Obj * pattern = (Tcl_Obj *)pc.clientData[2];
+
+    if (getMatchObject3(interp, pattern,  &pc, &patternObj, &patternString) == -1) {
+      return TCL_OK;
+    }
+          
+    return XOTclClassInfoInstmixinofMethod(interp, class, withClosure, patternString, patternObj);
+
+  }
+}
+  
 static methodDefinition2 methodDefinitons[] = {
 {"instances", XOTclClassInfoHeritageMethodStub, {
   {"class", 1, 0, "class"},
@@ -202,6 +298,29 @@
 {"instfilterguard", XOTclClassInfoInstfilterguardMethodStub, {
   {"class", 1, 0, "class"},
   {"filter", 1, 0, NULL}}
+},
+{"instforward", XOTclClassInfoInstforwardMethodStub, {
+  {"class", 1, 0, "class"},
+  {"-definition", 0, 0, NULL},
+  {"methodName", 1, 0, NULL}}
+},
+{"instinvar", XOTclClassInfoInstinvarMethodStub, {
+  {"class", 1, 0, "class"}}
+},
+{"instmixin", XOTclClassInfoInstmixinMethodStub, {
+  {"class", 1, 0, "class"},
+  {"-closure", 0, 0, NULL},
+  {"-guards", 0, 0, NULL},
+  {"pattern", 0, 0, "objpattern"}}
+},
+{"instmixinguard", XOTclClassInfoInstmixinguardMethodStub, {
+  {"class", 1, 0, "class"},
+  {"mixin", 1, 0, NULL}}
+},
+{"instmixinof", XOTclClassInfoInstmixinofMethodStub, {
+  {"class", 1, 0, "class"},
+  {"-closure", 0, 0, NULL},
+  {"pattern", 0, 0, "objpattern"}}
 }
 };