Index: TODO
===================================================================
diff -u -re548a952433b4d26794f535995c9ed1ababe8807 -rd8d920f2976691dcf8e2a68b336eb253385030f6
--- TODO	(.../TODO)	(revision e548a952433b4d26794f535995c9ed1ababe8807)
+++ TODO	(.../TODO)	(revision d8d920f2976691dcf8e2a68b336eb253385030f6)
@@ -1059,6 +1059,10 @@
 - renamed "info callable -which ..." into "info callable method ..."
 - updated regression test to reflect the changes
 
+- changed "info method filter ...." into "info callable filter ..."
+- fixed "o info callable method" in some cases with mixins
+- extended regression test
+- updated migration guide
 
 TODO: 
 - nameing
Index: doc/next-migration.html
===================================================================
diff -u -rcf6d3e49135f07d35079b7ee25a02d394031a746 -rd8d920f2976691dcf8e2a68b336eb253385030f6
--- doc/next-migration.html	(.../next-migration.html)	(revision cf6d3e49135f07d35079b7ee25a02d394031a746)
+++ doc/next-migration.html	(.../next-migration.html)	(revision d8d920f2976691dcf8e2a68b336eb253385030f6)
@@ -954,13 +954,36 @@
   <tr><th>XOTcl</th><th>Next Scripting Language</th></tr>
   <tr>
     <td><code><i>obj</i> info methods <i>?pattern?</i></code></td>
-    <td><code><i>obj</i> info callable <i>?pattern?</i></code></td>
+    <td><code><i>obj</i> info callable methods <i>... ?pattern?</i><br>
+      <i class='comment'># Returns list of method names</i>
+      </code></td>
   </tr>
   <tr>
     <td><i>n.a.</i></td>
-    <td><code><i># List only application specific methods</i></code><br>
-      <code><i>obj</i> info callable -application</code></td>
+    <td><code><i class='comment'># List only application specific methods</i></code><br>
+      <code><i>obj</i> info callable methods -application <i>... ?pattern?</i><br>
+      <i class='comment'># Returns list of method names</i>
+      </code></td>
   </tr>
+
+  <tr>
+    <td><code><i class='comment'># Options for 'info methods'<br>
+      #<br>
+      # -incontext<br>
+      # -nomixins <br>
+      </i>
+     </code></td>    
+    <td><code><i class='comment'># Options for 'info callable
+      methods'<br>
+      #<br>
+      # -application<br>
+      # -callprotection ...<br>
+      # -incontext<br>
+      # -methodtype ...<br>
+      # -nomixins <br>
+      </i>
+     </code></td>
+  </tr>
 </table>
 
 <h4>List object/class where some method is defined</h4>
@@ -969,11 +992,13 @@
   <tr><th>XOTcl</th><th>Next Scripting Language</th></tr>
   <tr>
     <td><code><i>obj</i> procsearch <i>methodName</i></code></td>
-    <td><code><i>obj</i> info callable -which <i>methodName</i></code></td>
+    <td><code><i>obj</i> info callable method <i>methodName</i><br>
+      <i class='comment'># Returns method-handle</i></code></td>
   </tr>
   <tr>
     <td><code><i>obj</i> filtersearch <i>methodName</i></code></td>
-    <td><code><i>obj</i> info method filter <i>methodName</i></code></td>
+    <td><code><i>obj</i> info callable filter <i>methodName</i><br>
+      <i class='comment'># Returns method-handle</i></code></td>
   </tr>  
 </table>
 
@@ -1053,8 +1078,7 @@
   <tr><th>XOTcl</th><th>Next Scripting Language</th></tr>
   <tr>
     <td><code><i>obj</i> info filter <i>?-order? ?-guards? ?pattern?</i></code></td>
-    <td><i class='comment'># ... info filter -order ... returns now
-      method-handles<br>
+    <td><i class='comment'># ... info filter -order ... returns method-handles<br>
       # instead of triples (applies to all three variants)</i><br><br>
       <code><i>obj</i> info filter <i>?-order? ?-guards? ?pattern?</i></code></td>
   </tr>
@@ -1249,12 +1273,12 @@
   </tr>
     <tr>
     <td><code>self next</code></td>
-    <td><i class='comment'># Returns now method-handle</i><br>
+    <td><i class='comment'># Returns method-handle</i><br>
       <code>current next</code></td>
   </tr>
   <tr>
     <td><code>self filterreg</code></td>
-    <td><i class='comment'># Returns now method-handle</i><br>
+    <td><i class='comment'># Returns method-handle</i><br>
       <code>current filterreg</code></td>
   </tr>
     <tr>
@@ -1371,6 +1395,6 @@
 
 <hr>
 <address></address>
-<!-- hhmts start --> Last modified: Wed Aug 18 14:45:57 CEST 2010 <!-- hhmts end -->
+<!-- hhmts start --> Last modified: Thu Aug 19 14:50:52 CEST 2010 <!-- hhmts end -->
 </body>
 </html>
Index: generic/gentclAPI.decls
===================================================================
diff -u -re548a952433b4d26794f535995c9ed1ababe8807 -rd8d920f2976691dcf8e2a68b336eb253385030f6
--- generic/gentclAPI.decls	(.../gentclAPI.decls)	(revision e548a952433b4d26794f535995c9ed1ababe8807)
+++ generic/gentclAPI.decls	(.../gentclAPI.decls)	(revision d8d920f2976691dcf8e2a68b336eb253385030f6)
@@ -780,7 +780,7 @@
 }
 infoObjectMethod method XOTclObjInfoMethodMethod {
   {-argName "object" -type object}
-  {-argName "infomethodsubcmd" -type "args|definition|filter|handle|parameter|parametersyntax|type|precondition|postcondition"}
+  {-argName "infomethodsubcmd" -type "args|body|definition|handle|parameter|parametersyntax|type|precondition|postcondition"}
   {-argName "name"}
 }
 infoObjectMethod methods XOTclObjInfoMethodsMethod {
@@ -847,7 +847,7 @@
 }
 infoClassMethod method XOTclClassInfoMethodMethod {
   {-argName "class" -type class}
-  {-argName "infomethodsubcmd" -type "args|body|definition|filter|handle|parameter|parametersyntax|type|precondition|postcondition"}
+  {-argName "infomethodsubcmd" -type "args|body|definition|handle|parameter|parametersyntax|type|precondition|postcondition"}
   {-argName "name"}
 }
 infoClassMethod methods XOTclClassInfoMethodsMethod {
Index: generic/tclAPI.h
===================================================================
diff -u -re548a952433b4d26794f535995c9ed1ababe8807 -rd8d920f2976691dcf8e2a68b336eb253385030f6
--- generic/tclAPI.h	(.../tclAPI.h)	(revision e548a952433b4d26794f535995c9ed1ababe8807)
+++ generic/tclAPI.h	(.../tclAPI.h)	(revision d8d920f2976691dcf8e2a68b336eb253385030f6)
@@ -2,13 +2,13 @@
 static int convertToInfomethodsubcmd(Tcl_Interp *interp, Tcl_Obj *objPtr, XOTclParam CONST *pPtr, 
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
-  static CONST char *opts[] = {"args", "body", "definition", "filter", "handle", "parameter", "parametersyntax", "type", "precondition", "postcondition", NULL};
+  static CONST char *opts[] = {"args", "body", "definition", "handle", "parameter", "parametersyntax", "type", "precondition", "postcondition", NULL};
   result = Tcl_GetIndexFromObj(interp, objPtr, opts, "infomethodsubcmd", 0, &index);
   *clientData = (ClientData) INT2PTR(index + 1);
   *outObjPtr = objPtr;
   return result;
 }
-enum InfomethodsubcmdIdx {InfomethodsubcmdNULL, InfomethodsubcmdArgsIdx, InfomethodsubcmdBodyIdx, InfomethodsubcmdDefinitionIdx, InfomethodsubcmdFilterIdx, InfomethodsubcmdHandleIdx, InfomethodsubcmdParameterIdx, InfomethodsubcmdParametersyntaxIdx, InfomethodsubcmdTypeIdx, InfomethodsubcmdPreconditionIdx, InfomethodsubcmdPostconditionIdx};
+enum InfomethodsubcmdIdx {InfomethodsubcmdNULL, InfomethodsubcmdArgsIdx, InfomethodsubcmdBodyIdx, InfomethodsubcmdDefinitionIdx, InfomethodsubcmdHandleIdx, InfomethodsubcmdParameterIdx, InfomethodsubcmdParametersyntaxIdx, InfomethodsubcmdTypeIdx, InfomethodsubcmdPreconditionIdx, InfomethodsubcmdPostconditionIdx};
   
 static int convertToMethodtype(Tcl_Interp *interp, Tcl_Obj *objPtr, XOTclParam CONST *pPtr, 
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
Index: generic/xotcl.c
===================================================================
diff -u -re548a952433b4d26794f535995c9ed1ababe8807 -rd8d920f2976691dcf8e2a68b336eb253385030f6
--- generic/xotcl.c	(.../xotcl.c)	(revision e548a952433b4d26794f535995c9ed1ababe8807)
+++ generic/xotcl.c	(.../xotcl.c)	(revision d8d920f2976691dcf8e2a68b336eb253385030f6)
@@ -1046,8 +1046,8 @@
   if (object->flags & XOTCL_MIXIN_ORDER_DEFINED_AND_VALID) {
     XOTclCmdList *mixinList;
     for (mixinList = object->mixinOrder; mixinList; mixinList = mixinList->nextPtr) {
-      XOTclClass *mcl = XOTclpGetClass(interp, (char *)Tcl_GetCommandName(interp, mixinList->cmdPtr));
-      if (mcl && (*pcl = SearchCMethod(mcl, name, &cmd))) {
+      XOTclClass *mixin = XOTclGetClassFromCmdPtr(mixinList->cmdPtr);
+      if (mixin && (*pcl = SearchCMethod(mixin, name, &cmd))) {
         break;
       }
     }
@@ -13896,7 +13896,7 @@
 /*
 infoObjectMethod method XOTclObjInfoMethodMethod {
   {-argName "object" -type object}
-  {-argName "infomethodsubcmd" -type "args|definition|filter|handle|parameter|parametersyntax|type|precondition|postcondition"}
+  {-argName "infomethodsubcmd" -type "args|definition|handle|parameter|parametersyntax|type|precondition|postcondition"}
   {-argName "name"}
 }
 */
@@ -13905,10 +13905,7 @@
   Tcl_Namespace *nsPtr = object->nsPtr;
   Tcl_Command cmd;
 
-  if (subcmd == InfomethodsubcmdFilterIdx) {
-    return FilterSearchMethod(interp, object, methodName);
-
-  } else if (*methodName == ':') {
+  if (*methodName == ':') {
     Tcl_Obj *methodObj = Tcl_NewStringObj(methodName, -1);
     cmd = Tcl_GetCommandFromObj(interp, methodObj);
   } else {
@@ -14153,7 +14150,7 @@
 /*
 infoClassMethod method XOTclClassInfoMethodMethod {
   {-argName "class" -type class}
-  {-argName "infomethodsubcmd" -type "args|body|definition|filter|name|parameter|type|precondition|postcondition"}
+  {-argName "infomethodsubcmd" -type "args|body|definition|handle|parameter|type|precondition|postcondition"}
   {-argName "name"}
 }
 */
@@ -14162,9 +14159,7 @@
   Tcl_Namespace *nsPtr = class->nsPtr;
   Tcl_Command cmd;
 
-  if (subcmd == InfomethodsubcmdFilterIdx) {
-    return FilterSearchMethod(interp, &class->object, methodName);
-  } else if (*methodName == ':') {
+  if (*methodName == ':') {
     Tcl_Obj *methodObj = Tcl_NewStringObj(methodName, -1);
     cmd = Tcl_GetCommandFromObj(interp, methodObj);
   } else {
Index: library/xotcl/library/xotcl2.tcl
===================================================================
diff -u -re548a952433b4d26794f535995c9ed1ababe8807 -rd8d920f2976691dcf8e2a68b336eb253385030f6
--- library/xotcl/library/xotcl2.tcl	(.../xotcl2.tcl)	(revision e548a952433b4d26794f535995c9ed1ababe8807)
+++ library/xotcl/library/xotcl2.tcl	(.../xotcl2.tcl)	(revision d8d920f2976691dcf8e2a68b336eb253385030f6)
@@ -542,31 +542,12 @@
     ::nsf::is [self] type $cl
   }
   Object instproc filtersearch {filter} {
-    set handle [::nsf::cmd::ObjectInfo::method [self] filter $filter]
+    set handle [::nsf::cmd::ObjectInfo::callable [self] filter $filter]
     return [method_handle_to_xotcl $handle]
   }
   Object instproc procsearch {name} {
     set handle [::nsf::cmd::ObjectInfo::callable [self] method $name]
     return [method_handle_to_xotcl $handle]
-
-    if {$definition ne ""} {
-      foreach {obj modifier kind} $definition break
-      if {$modifier ne "object"} {
-        set kind $modifier
-        set perClass [::nsf::is $obj class]
-      } else {
-        set perClass 0
-      }
-      switch $kind {
-        alias   {if {$perClass} {set kind "instcmd"} else {set kind "cmd"}}
-        forward {if {$perClass} {set kind "instforward"}}
-        method  {if {$perClass} {set kind "instproc"} else {set kind "proc"}}
-        setter  {if {$perClass} {set kind "instparametercmd"} else {set kind "parametercmd"}}
-        default {error "not handeled: $definition"}
-      }
-      #puts stderr "return: [list $obj $kind $name]"
-      return [list $obj $kind $name]
-    }
   }
   Class instproc allinstances {} {
     # TODO: mark it deprecated
Index: tests/info-method.tcl
===================================================================
diff -u -re548a952433b4d26794f535995c9ed1ababe8807 -rd8d920f2976691dcf8e2a68b336eb253385030f6
--- tests/info-method.tcl	(.../info-method.tcl)	(revision e548a952433b4d26794f535995c9ed1ababe8807)
+++ tests/info-method.tcl	(.../info-method.tcl)	(revision d8d920f2976691dcf8e2a68b336eb253385030f6)
@@ -67,3 +67,19 @@
 ? {::nx::Class info callable methods -application} ""
 ? {lsort [C info callable methods -application]} "add1 apo fpo mpo spo"
 ? {lsort [c1 info callable methods -application]} "a addOne foo m m-with-assertions s"
+
+Test case callable {
+    # define the same method for Object and Class
+    ::nx::Object method bar {} {return Object.bar}
+    ::nx::Class method bar {} {return Class.bar}
+
+    ::nx::Object create o
+    ? {o info callable method bar} "::nsf::classes::nx::Object::bar"
+    ? {o info callable methods bar} bar
+    ? {o bar} Object.bar
+
+    o mixin ::nx::Class
+    ? {o info callable method bar} "::nsf::classes::nx::Class::bar"
+    ? {o info callable methods bar} bar
+    ? {o bar} Class.bar
+}