fix blacklisted method

arvyy · Jun 15, 2024 · 44ed4ba · 44ed4ba
1 parent 254bc67
commit 44ed4ba
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 25 deletions.
diff --git a/language/src/main/java/com/github/arvyy/islisp/nodes/ISLISPGenericFunctionDispatchNode.java b/language/src/main/java/com/github/arvyy/islisp/nodes/ISLISPGenericFunctionDispatchNode.java
@@ -26,7 +26,7 @@ public abstract class ISLISPGenericFunctionDispatchNode extends Node {
 
     @ExplodeLoop
     @Specialization(
-        guards = { "applicableMethodsArg.equals(applicableMethods)" }
+        guards = { "applicableMethodsEqual(applicableMethodsArg, applicableMethods)" }
     )
     Object doCached(
         GenericMethodApplicableMethods applicableMethodsArg,
@@ -67,6 +67,25 @@ Object doCached(
         }
     }
 
+    boolean applicableMethodsEqual(GenericMethodApplicableMethods m1, GenericMethodApplicableMethods m2) {
+        return arraySliceEqual(m1.primaryMethods(), m2.primaryMethods())
+            && arraySliceEqual(m1.aroundMethods(), m2.aroundMethods())
+            && arraySliceEqual(m1.beforeMethods(), m2.beforeMethods())
+            && arraySliceEqual(m1.afterMethods(), m2.afterMethods());
+    }
+
+    boolean arraySliceEqual(ArraySlice s1, ArraySlice s2) {
+        if (s1.size() != s2.size()) {
+            return false;
+        }
+        for (var i = 0; i < s1.size(); i++) {
+            if (s1.get(i) != s2.get(i)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     @Specialization
     Object doUncached(
         GenericMethodApplicableMethods applicableMethods,

diff --git a/language/src/main/java/com/github/arvyy/islisp/runtime/ArraySlice.java b/language/src/main/java/com/github/arvyy/islisp/runtime/ArraySlice.java
@@ -82,28 +82,4 @@ public void forEach(Consumer<T> consumer) {
         }
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof ArraySlice o) {
-            if (end - start != o.end - o.start) {
-                return false;
-            }
-            for (var i = 0; i < end - start; i++) {
-                if (!get(i).equals(o.get(i))) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        var arr = new Object[size()];
-        for (int i = 0; i < size(); i++) {
-            arr[i] = get(i);
-        }
-        return Arrays.hashCode(arr);
-    }
 }