Index: generic/gentclAPI.tcl
===================================================================
diff -u -rdc0040a6ddddf73e61c2a7d733ad7e15127e6bc1 -rf209c50ea8cb651d0dea25206301e45202217797
--- generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision dc0040a6ddddf73e61c2a7d733ad7e15127e6bc1)
+++ generic/gentclAPI.tcl	(.../gentclAPI.tcl)	(revision f209c50ea8cb651d0dea25206301e45202217797)
@@ -13,39 +13,125 @@
   set l [list]
   foreach argDefinition $argDefinitions {
     array set "" $argDefinition
-    if {$(-type) eq ""} {set type NULL} {set type "\"$(-type)\""}
+    switch $(-type) {
+      "" {set type NULL}
+      default {set type "\"$(-type)\""}
+    }
     lappend l "{\"$(-argName)\", $(-required), $(-nrArgs), $type}"
   }
   join $l ",\n  "
 }
 
-proc genc {} {
+proc gencall {argDefinitions cDefsVar ifDefVar arglistVar preVar postVar} {
+  upvar $cDefsVar cDefs $ifDefVar ifDef $arglistVar arglist $preVar pre $postVar post
+  set c [list]
+  set a [list]
+  set i 0
+  set pre ""; set post ""
+  foreach argDefinition $argDefinitions {
+    array set "" $argDefinition
+    set ifSet 0
+    if {[regexp {^-(.*)$} $(-argName) _ switchName]} {
+      set varName with[string totitle $switchName]
+      set calledArg $varName
+      set type int
+    } else {
+      set varName $(-argName)
+      set calledArg $varName
+      switch $(-type) {
+        ""           {set type "char *"}
+        "class"      {set type "XOTclClass *"}
+        "tclobj"     {set type "Tcl_Obj *"}
+        "objpattern" {
+          set type "Tcl_Obj *"
+          lappend c "char *${varName}String = NULL;" "XOTclObject *${varName}Obj = NULL;"
+          set calledArg "${varName}String, ${varName}Obj"
+          lappend if "char *${varName}String" "XOTclObject *${varName}Obj"
+          set ifSet 1
+          append pre [subst -nocommands {
+    if (getMatchObject3(interp, ${varName},  &pc, &${varName}Obj, &${varName}String) == -1) {
+      return TCL_OK;
+    }
+          }]
+          append post [subst -nocommands {
+    if (${varName}Obj) {
+      Tcl_SetObjResult(interp, returnCode ? ${varName}Obj->cmdName : XOTclGlobalObjects[XOTE_EMPTY]);
+    }
+          }]
+        }
+      }
+    }
+    if {!$ifSet} {lappend if "$type $varName"}
+    lappend c [subst -nocommands {$type $varName = ($type)pc.clientData[$i];}]
+    lappend a $calledArg
+    incr i
+  }
+  set ifDef [join $if ", "]
+  set cDefs [join $c "\n    "]
+  set arglist [join $a ", "]
+}
+
+
+proc genifds {} {
   set decls ""
   set enums [list]
   set ifds [list]
   foreach key [lsort [array names ::definitions]] {
     array set d $::definitions($key)
-    append decls "static int $d(implementation)$::objCmdProc\n"
+    append decls "static int $d(stub)$::objCmdProc\n"
     lappend enums $d(idx)
-    lappend ifds "{\"$d(methodName)\", $d(implementation), {\n  [genifd $d(argDefintions)]}\n}"
+    lappend ifds "{\"$d(methodName)\", $d(stub), {\n  [genifd $d(argDefintions)]}\n}"
+
+    gencall $d(argDefintions) cDefs ifDef arglist pre post
+    append decls "static int $d(implementation)(Tcl_Interp *interp, $ifDef);\n"
+    if {$post ne ""} {
+      append cDefs "\n    int returnCode;"
+      set call "returnCode = $d(implementation)(interp, $arglist);"
+      set post [string trimright $post]
+      append post "\n    return TCL_OK;"
+    } else {
+      set call "return $d(implementation)(interp, $arglist);"
+    }
+    append fns [subst -nocommands {
+static int
+$d(stub)(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  parseContext pc;
+  if (parse2(clientData, interp, objc, objv, $d(idx), &pc) != TCL_OK) {
+    return TCL_ERROR;
+  } else {
+    $cDefs
+$pre
+    $call
+$post
   }
+}
+  }]
+  }
+
   puts {
 typedef struct {
   char *methodName;
   Tcl_ObjCmdProc *proc;
   interfaceDefinition ifd;
 } methodDefinition2;
+
+static int parse2(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[],
+                  int idx, parseContext *pc);
+static int getMatchObject3(Tcl_Interp *interp, Tcl_Obj *patternObj,  parseContext *pc,
+                           XOTclObject **matchObject, char **pattern);
   }
   puts $decls
   set enumString [join $enums ",\n "]
   puts "enum {\n $enumString\n} XOTclMethods;\n"
+  puts $fns
   set definitionString [join $ifds ",\n"]
   puts "static methodDefinition2 methodDefinitons\[\] = \{\n$definitionString\n\};\n"
 }
 
 proc methodDefinition {methodName methodType implementation argDefinitions} {
   set d(methodName) $methodName
   set d(implementation) $implementation
+  set d(stub) ${implementation}Stub
   set d(methodType) $methodType
   set d(idx) ${implementation}Idx
   set completed [list]
@@ -92,7 +178,7 @@
   {-argName "class"   -required 1 -nrargs 0 -type class}
   {-argName "methodName" -required 1}
   {-argName "arg" -required 1}
-  {-argName "var" -required 1}
+  {-argName "var" -required 1 -type tclobj}
 }
 
 infoClassMethod instfilter XOTclClassInfoInstfilterMethod {
@@ -108,4 +194,4 @@
 
 
 
-genc
\ No newline at end of file
+genifds
\ No newline at end of file