Use LookupAndCallBinaryNode with slots in BinaryComparisonNode

Author: steve-s

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallBinaryNode.java

@@ -140,15 +140,6 @@ public static LookupAndCallBinaryNode create(String name) {
         return LookupAndCallBinaryNodeGen.create(name, null, null, false, false);
     }
 
-    public static LookupAndCallBinaryNode createReversible(String name, String reverseName, Supplier<NotImplementedHandler> handlerFactory) {
-        assert name.startsWith("__") && reverseName.startsWith("__r");
-        return LookupAndCallBinaryNodeGen.create(name, reverseName, handlerFactory, false, false);
-    }
-
-    public static LookupAndCallBinaryNode create(String name, String rname, boolean alwaysCheckReverse, boolean ignoreDescriptorException) {
-        return LookupAndCallBinaryNodeGen.create(name, rname, null, alwaysCheckReverse, ignoreDescriptorException);
-    }
-
     public static LookupAndCallBinaryNode create(String name, Supplier<NotImplementedHandler> handlerFactory) {
         return LookupAndCallBinaryNodeGen.create(name, null, handlerFactory, false, false);
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryArithmetic.java

@@ -168,10 +168,6 @@ static LookupAndCallBinaryNode createCallNode(SpecialMethodSlot slot, Supplier<N
             return LookupAndCallBinaryNode.createReversible(slot, slot.getReverse(), handler);
         }
 
-        static LookupAndCallBinaryNode createCallNode(String name, Supplier<NotImplementedHandler> handler) {
-            return LookupAndCallBinaryNode.createReversible(name, "__r" + name.substring(2), handler);
-        }
-
     }
     /*
      *

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/BinaryComparisonNode.java

@@ -35,6 +35,7 @@
 
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
 import com.oracle.graal.python.builtins.objects.str.StringUtils;
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
@@ -46,6 +47,7 @@
 import com.oracle.graal.python.nodes.expression.BinaryComparisonNodeFactory.NeNodeGen;
 import com.oracle.graal.python.nodes.object.IsNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
+import com.oracle.graal.python.runtime.formatting.InternalFormat.Spec;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -155,7 +157,7 @@ protected final Object doGeneric(VirtualFrame frame, Object left, Object right,
         }
 
         protected static LookupAndCallBinaryNode createCallNode() {
-            return LookupAndCallBinaryNode.create(__LE__, __GE__, true, true);
+            return LookupAndCallBinaryNode.create(SpecialMethodSlot.Le, SpecialMethodSlot.Ge, true, true);
         }
 
         @Override
@@ -227,7 +229,7 @@ protected final Object doGeneric(VirtualFrame frame, Object left, Object right,
         }
 
         protected static LookupAndCallBinaryNode createCallNode() {
-            return LookupAndCallBinaryNode.create(__LT__, __GT__, true, true);
+            return LookupAndCallBinaryNode.create(SpecialMethodSlot.Lt, SpecialMethodSlot.Gt, true, true);
         }
 
         @Override
@@ -299,7 +301,7 @@ protected final Object doGeneric(VirtualFrame frame, Object left, Object right,
         }
 
         protected static LookupAndCallBinaryNode createCallNode() {
-            return LookupAndCallBinaryNode.create(__GE__, __LE__, true, true);
+            return LookupAndCallBinaryNode.create(SpecialMethodSlot.Ge, SpecialMethodSlot.Le, true, true);
         }
 
         @Override
@@ -371,7 +373,7 @@ protected final Object doGeneric(VirtualFrame frame, Object left, Object right,
         }
 
         protected static LookupAndCallBinaryNode createCallNode() {
-            return LookupAndCallBinaryNode.create(__GT__, __LT__, true, true);
+            return LookupAndCallBinaryNode.create(SpecialMethodSlot.Gt, SpecialMethodSlot.Lt, true, true);
         }
 
         @Override
@@ -445,7 +447,7 @@ protected final Object doGeneric(VirtualFrame frame, Object left, Object right,
         }
 
         protected static LookupAndCallBinaryNode createCallNode() {
-            return LookupAndCallBinaryNode.create(__EQ__, __EQ__, true, true);
+            return LookupAndCallBinaryNode.create(SpecialMethodSlot.Eq, SpecialMethodSlot.Eq, true, true);
         }
 
         public static EqNode create() {
@@ -514,7 +516,7 @@ protected final Object doGeneric(VirtualFrame frame, Object left, Object right,
         }
 
         protected static LookupAndCallBinaryNode createCallNode() {
-            return LookupAndCallBinaryNode.create(__NE__, __NE__, true, true);
+            return LookupAndCallBinaryNode.create(SpecialMethodSlot.Ne, SpecialMethodSlot.Ne, true, true);
         }
 
         public static NeNode create() {