Avoid method dispatch calling Sub subclasses

sorear · Sep 13, 2010 · e0c8d34 · e0c8d34
1 parent 88f2d4b
commit e0c8d34
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/lib/Kernel.cs b/lib/Kernel.cs
@@ -63,15 +63,17 @@ public abstract class IP6 {
 
         public virtual Frame Invoke(Frame c, Variable[] p,
                 Dictionary<string, Variable> n) {
-            DynMetaObject.InvokeHandler ih = GetMO().OnInvoke;
-            if (ih != null) {
-                return ih(this, c, p, n);
-            } else {
-                Variable[] np = new Variable[p.Length + 1];
-                Array.Copy(p, 0, np, 1, p.Length);
-                np[0] = Kernel.NewROScalar(this);
-                return InvokeMethod(c, "INVOKE", np, n);
+            foreach (DynMetaObject k in GetMO().mro) {
+                DynMetaObject.InvokeHandler ih = k.OnInvoke;;
+                if (ih != null) {
+                    return ih(this, c, p, n);
+                }
             }
+
+            Variable[] np = new Variable[p.Length + 1];
+            Array.Copy(p, 0, np, 1, p.Length);
+            np[0] = Kernel.NewROScalar(this);
+            return InvokeMethod(c, "INVOKE", np, n);
         }
 
         public virtual Frame Fetch(Frame c) {