Index: generic/gentclAPI.decls
===================================================================
diff -u -r6458c13882afd52e8719ee0e0e054b42e9aee696 -radc4affd14701109f5d9b655dddf58d6b42cd781
--- generic/gentclAPI.decls	(.../gentclAPI.decls)	(revision 6458c13882afd52e8719ee0e0e054b42e9aee696)
+++ generic/gentclAPI.decls	(.../gentclAPI.decls)	(revision adc4affd14701109f5d9b655dddf58d6b42cd781)
@@ -222,82 +222,10 @@
   {-argName "varname" -required 1}
 }
 
-# # temporary xxx
-# #  TODO: remove me xxx
-# TODO mixinguard method
-# TODO instmixinguard method
-# TODO remove option -guard
-objectInfoMethod filtermethods XOTclObjInfoFiltermethodsMethod {
-  {-argName "-guards"}
-  {-argName "-order"}
-  {-argName "pattern"}
-}
-objectInfoMethod filterguard XOTclObjInfoFilterguardMethod {
-  {-argName "filter" -required 1}
-}
-objectInfoMethod vars XOTclOVarsMethod {
-  {-argName "pattern" -required 0}
-}
-
-classInfoMethod filtermethods XOTclClassInfoFiltermethodsMethod {
-  {-argName "-guards"}
-  {-argName "pattern"}
-}
-classInfoMethod filterguard XOTclClassInfoFilterguardMethod {
-  {-argName "filter" -required 1}
-}
-
 #
-# class methods
-#
-
-classMethod alloc XOTclCAllocMethod {
-  {-argName "name" -required 1 -type tclobj}
-}
-
-classMethod create XOTclCCreateMethod {
-  {-argName "name" -required 1}
-  {-argName "args" -type allargs}
-}
-
-classMethod dealloc XOTclCDeallocMethod {
-  {-argName "object" -required 1 -type tclobj}
-}
-
-classMethod new XOTclCNewMethod {
-  {-argName "-childof" -type object -nrargs 1}
-  {-argName "args" -required 0 -type args}
-}
-classMethod filterguard XOTclCFilterGuardMethod {
-  {-argName "filter" -required 1}
-  {-argName "guard" -required 1 -type tclobj}
-}
-classMethod mixinguard XOTclCMixinGuardMethod {
-  {-argName "mixin" -required 1}
-  {-argName "guard" -required 1 -type tclobj}
-}
-
-classMethod recreate XOTclCRecreateMethod {
-  {-argName "name" -required 1 -type tclobj}
-  {-argName "args" -type allargs}
-}
-#
-# check methods
-#
-# checkMethod required XOTclCheckRequiredArgs {
-#   {-argName "name" -required 1}
-#   {-argName "value" -required 0 -type tclobj}
-# }
-# checkMethod boolean XOTclCheckBooleanArgs {
-#   {-argName "name" -required 1}
-#   {-argName "value" -required 0 -type tclobj}
-# }
-
-#
 # info object methods
 #
-infoObjectMethod callable XOTclObjInfoCallableMethod {
-  {-argName "object" -type object}
+objectInfoMethod callable XOTclObjInfoCallableMethod {
   {-argName "infocallablesubcmd" -nrargs 1 -type "filter|method|methods" -required 1}
   {-argName "-methodtype" -nrargs 1 -type "all|scripted|builtin|alias|forwarder|object|setter"}
   {-argName "-callprotection" -nrargs 1 -type "all|protected|public" -default all}
@@ -306,114 +234,157 @@
   {-argName "-incontext"}
   {-argName "pattern" -required 0}
 }
-infoObjectMethod children XOTclObjInfoChildrenMethod {
-  {-argName "object" -required 1 -type object}
+objectInfoMethod children XOTclObjInfoChildrenMethod {
   {-argName "pattern" -required 0}
 }
-infoObjectMethod class XOTclObjInfoClassMethod {
-  {-argName "object" -required 1 -type object}
+objectInfoMethod class XOTclObjInfoClassMethod {
 }
-
-infoObjectMethod forward XOTclObjInfoForwardMethod {
-  {-argName "object" -required 1 -type object}
+objectInfoMethod filtermethods XOTclObjInfoFiltermethodsMethod {
+  {-argName "-guards"}
+  {-argName "-order"}
+  {-argName "pattern"}
+}
+objectInfoMethod filterguard XOTclObjInfoFilterguardMethod {
+  {-argName "filter" -required 1}
+}
+objectInfoMethod forward XOTclObjInfoForwardMethod {
   {-argName "-definition"}
   {-argName "name"}
 }
-infoObjectMethod hasnamespace XOTclObjInfoHasnamespaceMethod {
-  {-argName "object" -required 1 -type object}
+objectInfoMethod hasnamespace XOTclObjInfoHasnamespaceMethod {
 }
-infoObjectMethod method XOTclObjInfoMethodMethod {
-  {-argName "object" -type object}
+objectInfoMethod method XOTclObjInfoMethodMethod {
   {-argName "infomethodsubcmd" -type "args|body|definition|handle|parameter|parametersyntax|type|precondition|postcondition"}
   {-argName "name"}
 }
-infoObjectMethod methods XOTclObjInfoMethodsMethod {
-  {-argName "object" -type object}
+objectInfoMethod methods XOTclObjInfoMethodsMethod {
   {-argName "-methodtype" -nrargs 1 -type "all|scripted|builtin|alias|forwarder|object|setter"}
   {-argName "-callprotection" -nrargs 1 -type "all|protected|public" -default public}
   {-argName "-nomixins"}
   {-argName "-incontext"}
   {-argName "pattern"}
 }
-infoObjectMethod mixin XOTclObjInfoMixinMethod {
-  {-argName "object" -required 1 -type object}
-  {-argName "-guard"}
+
+objectInfoMethod mixinclasses XOTclObjInfoMixinclassesMethod {
   {-argName "-guards"}
   {-argName "-order"}
   {-argName "pattern" -type objpattern}
 }
-infoObjectMethod parent XOTclObjInfoParentMethod {
-  {-argName "object" -required 1 -type object}
+objectInfoMethod mixinguard XOTclObjInfoMixinguardMethod {
+  {-argName "mixin"  -required 1}
 }
-infoObjectMethod precedence XOTclObjInfoPrecedenceMethod {
-  {-argName "object" -required 1 -type object}
+objectInfoMethod parent XOTclObjInfoParentMethod {
+}
+objectInfoMethod precedence XOTclObjInfoPrecedenceMethod {
   {-argName "-intrinsic"}
   {-argName "pattern" -required 0}
 }
-infoObjectMethod slotobjects XOTclObjInfoSlotObjectsMethod {
-  {-argName "object" -required 1 -type object}
+objectInfoMethod slotobjects XOTclObjInfoSlotObjectsMethod {
   {-argName "pattern" -required 0}
 }
-infoObjectMethod vars XOTclObjInfoVarsMethod {
-  {-argName "object" -required 1 -type object}
+objectInfoMethod vars XOTclObjInfoVarsMethod {
   {-argName "pattern" -required 0}
 }
 
-
 #
 # info class methods
 #
-infoClassMethod heritage XOTclClassInfoHeritageMethod {
-  {-argName "class"   -required 1 -type class}
+classInfoMethod filtermethods XOTclClassInfoFiltermethodsMethod {
+  {-argName "-guards"}
   {-argName "pattern"}
 }
-infoClassMethod instances XOTclClassInfoInstancesMethod {
-  {-argName "class"   -required 1 -type class}
-  {-argName "-closure"}
-  {-argName "pattern" -type objpattern}
+classInfoMethod filterguard XOTclClassInfoFilterguardMethod {
+  {-argName "filter" -required 1}
 }
-infoClassMethod forward XOTclClassInfoForwardMethod {
-  {-argName "class"  -required 1 -type class}
+classInfoMethod forward XOTclClassInfoForwardMethod {
   {-argName "-definition"}
   {-argName "name"}
 }
-infoClassMethod method XOTclClassInfoMethodMethod {
-  {-argName "class" -type class}
+classInfoMethod heritage XOTclClassInfoHeritageMethod {
+  {-argName "pattern"}
+}
+classInfoMethod instances XOTclClassInfoInstancesMethod {
+  {-argName "-closure"}
+  {-argName "pattern" -type objpattern}
+}
+
+classInfoMethod method XOTclClassInfoMethodMethod {
   {-argName "infomethodsubcmd" -type "args|body|definition|handle|parameter|parametersyntax|type|precondition|postcondition"}
   {-argName "name"}
 }
-infoClassMethod methods XOTclClassInfoMethodsMethod {
-  {-argName "class" -type class}
+classInfoMethod methods XOTclClassInfoMethodsMethod {
   {-argName "-methodtype" -nrargs 1 -type "all|scripted|builtin|alias|forwarder|object|setter"}
   {-argName "-callprotection" -nrargs 1 -type "all|protected|public" -default public}
   {-argName "-nomixins"}
   {-argName "-incontext"}
   {-argName "pattern"}
 }
-infoClassMethod mixin XOTclClassInfoMixinMethod {
-  {-argName "class"  -required 1 -type class}
+classInfoMethod mixinclasses XOTclClassInfoMixinclassesMethod {
   {-argName "-closure"}
-  {-argName "-guard"}
   {-argName "-guards"}
   {-argName "pattern" -type objpattern}
 }
-infoClassMethod mixinof  XOTclClassInfoMixinOfMethod {
-  {-argName "class"  -required 1 -type class}
+classInfoMethod mixinguard XOTclClassInfoMixinguardMethod {
+  {-argName "mixin"  -required 1}
+}
+classInfoMethod mixinof  XOTclClassInfoMixinOfMethod {
   {-argName "-closure"}
   {-argName "-scope" -required 0 -nrargs 1 -type "all|class|object"}
   {-argName "pattern" -type objpattern}
 }
-infoClassMethod slots XOTclClassInfoSlotsMethod {
-  {-argName "class"  -required 1 -type class}
+classInfoMethod slots XOTclClassInfoSlotsMethod {
 }
-infoClassMethod subclass XOTclClassInfoSubclassMethod {
-  {-argName "class"  -required 1 -type class}
+classInfoMethod subclass XOTclClassInfoSubclassMethod {
   {-argName "-closure"}
   {-argName "pattern" -type objpattern}
 }
-infoClassMethod superclass XOTclClassInfoSuperclassMethod {
-  {-argName "class"  -required 1 -type class}
+classInfoMethod superclass XOTclClassInfoSuperclassMethod {
   {-argName "-closure"}
   {-argName "pattern" -type tclobj}
 }
 
+#
+# class methods
+#
+
+classMethod alloc XOTclCAllocMethod {
+  {-argName "name" -required 1 -type tclobj}
+}
+
+classMethod create XOTclCCreateMethod {
+  {-argName "name" -required 1}
+  {-argName "args" -type allargs}
+}
+
+classMethod dealloc XOTclCDeallocMethod {
+  {-argName "object" -required 1 -type tclobj}
+}
+
+classMethod new XOTclCNewMethod {
+  {-argName "-childof" -type object -nrargs 1}
+  {-argName "args" -required 0 -type args}
+}
+classMethod filterguard XOTclCFilterGuardMethod {
+  {-argName "filter" -required 1}
+  {-argName "guard" -required 1 -type tclobj}
+}
+classMethod mixinguard XOTclCMixinGuardMethod {
+  {-argName "mixin" -required 1}
+  {-argName "guard" -required 1 -type tclobj}
+}
+
+classMethod recreate XOTclCRecreateMethod {
+  {-argName "name" -required 1 -type tclobj}
+  {-argName "args" -type allargs}
+}
+#
+# check methods
+#
+# checkMethod required XOTclCheckRequiredArgs {
+#   {-argName "name" -required 1}
+#   {-argName "value" -required 0 -type tclobj}
+# }
+# checkMethod boolean XOTclCheckBooleanArgs {
+#   {-argName "name" -required 1}
+#   {-argName "value" -required 0 -type tclobj}
+# }