Fix missing comparisons between float and PInt

Add <= and >= comparisons between float and large integer.

Fixes #117.

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/test_binary_arithmetic.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2019, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2020, Oracle and/or its affiliates.
 # Copyright (c) 2013, Regents of the University of California
 #
 # All rights reserved.
@@ -181,3 +181,17 @@ def assert_exception(op, ex_type):
             raise e
         else:
             assert type(e) == ex_type, "expected exception %s but got %s" % (ex_type, type(e))
+
+
+def test_comparison_numeric_types():
+    large_int = 2 ** 65
+    numbers = [-large_int, -float(large_int), -1.4, -1, -1.0, -0.0, 0, 0.0, 1, 1.0, 1.4, large_int, float(large_int)]
+    indices = [1, 1, 2, 3, 3, 4, 4, 4, 5, 5, 6, 7, 7]
+    for i, a in zip(indices, numbers):
+        for j, b in zip(indices, numbers):
+            assert (a < b) == (i < j)
+            assert (a <= b) == (i <= j)
+            assert (a == b) == (i == j)
+            assert (a != b) == (i != j)
+            assert (a > b) == (i > j)
+            assert (a >= b) == (i >= j)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.
@@ -1118,6 +1118,11 @@ boolean doDL(double x, long y) {
             return x <= y;
         }
 
+        @Specialization
+        boolean doPI(double x, PInt y) {
+            return x <= y.doubleValue();
+        }
+
         @Specialization(guards = "fromNativeNode.isFloatSubtype(frame, y, getClass, isSubtype, context)", limit = "1")
         boolean doDN(VirtualFrame frame, double x, PythonNativeObject y,
                         @SuppressWarnings("unused") @CachedContext(PythonLanguage.class) PythonContext context,
@@ -1243,6 +1248,50 @@ boolean doDL(double x, long y) {
             return x >= y;
         }
 
+        @Specialization
+        boolean doPI(double x, PInt y) {
+            return x >= y.doubleValue();
+        }
+
+        @Specialization(guards = "fromNativeNode.isFloatSubtype(frame, y, getClass, isSubtype, context)", limit = "1")
+        boolean doDN(VirtualFrame frame, double x, PythonNativeObject y,
+                        @SuppressWarnings("unused") @CachedContext(PythonLanguage.class) PythonContext context,
+                        @SuppressWarnings("unused") @Cached GetClassNode getClass,
+                        @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtype,
+                        @Cached FromNativeSubclassNode fromNativeNode) {
+            return x >= fromNativeNode.execute(frame, y);
+        }
+
+        @Specialization(guards = {
+                        "nativeLeft.isFloatSubtype(frame, x, getClass, isSubtype, context)",
+                        "nativeRight.isFloatSubtype(frame, y, getClass, isSubtype, context)"}, limit = "1")
+        boolean doNN(VirtualFrame frame, PythonNativeObject x, PythonNativeObject y,
+                        @SuppressWarnings("unused") @CachedContext(PythonLanguage.class) PythonContext context,
+                        @SuppressWarnings("unused") @Cached GetClassNode getClass,
+                        @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtype,
+                        @Cached FromNativeSubclassNode nativeLeft,
+                        @Cached FromNativeSubclassNode nativeRight) {
+            return nativeLeft.execute(frame, x) >= nativeRight.execute(frame, y);
+        }
+
+        @Specialization(guards = "fromNativeNode.isFloatSubtype(frame, x, getClass, isSubtype, context)", limit = "1")
+        boolean doND(VirtualFrame frame, PythonNativeObject x, double y,
+                        @SuppressWarnings("unused") @CachedContext(PythonLanguage.class) PythonContext context,
+                        @SuppressWarnings("unused") @Cached GetClassNode getClass,
+                        @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtype,
+                        @Cached FromNativeSubclassNode fromNativeNode) {
+            return fromNativeNode.execute(frame, x) >= y;
+        }
+
+        @Specialization(guards = "fromNativeNode.isFloatSubtype(frame, x, getClass, isSubtype, context)", limit = "1")
+        boolean doNL(VirtualFrame frame, PythonNativeObject x, long y,
+                        @SuppressWarnings("unused") @CachedContext(PythonLanguage.class) PythonContext context,
+                        @SuppressWarnings("unused") @Cached GetClassNode getClass,
+                        @SuppressWarnings("unused") @Cached IsSubtypeNode isSubtype,
+                        @Cached FromNativeSubclassNode fromNativeNode) {
+            return fromNativeNode.execute(frame, x) >= y;
+        }
+
         @Fallback
         @SuppressWarnings("unused")
         PNotImplemented doGeneric(Object a, Object b) {