Support native floats in more builtins

Author: msimacek

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_float.py

@@ -36,14 +36,15 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
+import math
+
+from . import CPyExtType, CPyExtTestCase, CPyExtFunction, CPyExtFunctionOutVars, unhandled_error_compare, \
+    is_native_object
 
-import sys
-from . import CPyExtType, CPyExtTestCase, CPyExtFunction, CPyExtFunctionOutVars, unhandled_error_compare, GRAALPYTHON
 __dir__ = __file__.rpartition("/")[0]
 
 
 def _float_compare(x, y):
-
     def isNan(x):
         return isinstance(x, float) and x != x
 
@@ -77,6 +78,17 @@ def __float__(self):
         return 2.71828
 
 
+NativeFloatSubclass = CPyExtType(
+    'NativeFloatSubclass',
+    '',
+    struct_base='PyFloatObject base',
+    tp_base="&PyFloat_Type",
+    tp_new='0',
+    tp_alloc='0',
+    tp_free='0',
+)
+
+
 class TestPyFloat(CPyExtTestCase):
 
     def compile_module(self, name):
@@ -185,39 +197,107 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare
     )
 
+
 class TestPyOSDouble:
     def test_PyOS_double_to_string(self):
-        TestPyOS_Double_To_String = CPyExtType("TestPyOS_Double_To_String",
-                                '''
-                                static PyObject* testPyOS_D_to_Str(PyObject* self, PyObject *pyval) {
-                                    double val = PyFloat_AsDouble(pyval);
-                                    char *str = PyOS_double_to_string(val, 'f', 6, 0x2, NULL);
-                                    return PyUnicode_FromString(str);
-                                }
-                                ''',
-                                tp_methods='{"PyOS_double_to_string_test", (PyCFunction)testPyOS_D_to_Str, METH_O, ""}',
-                                )
+        TestPyOS_Double_To_String = CPyExtType(
+            "TestPyOS_Double_To_String",
+            '''
+            static PyObject* testPyOS_D_to_Str(PyObject* self, PyObject *pyval) {
+                double val = PyFloat_AsDouble(pyval);
+                char *str = PyOS_double_to_string(val, 'f', 6, 0x2, NULL);
+                return PyUnicode_FromString(str);
+            }
+            ''',
+            tp_methods='{"PyOS_double_to_string_test", (PyCFunction)testPyOS_D_to_Str, METH_O, ""}',
+        )
         tester = TestPyOS_Double_To_String()
         assert tester.PyOS_double_to_string_test(150.604459) == '150.604459'
         assert tester.PyOS_double_to_string_test(174.426353) == '174.426353'
         assert tester.PyOS_double_to_string_test(151.074362) == '151.074362'
         assert tester.PyOS_double_to_string_test(190.08) == '190.080000'
 
     def test_PyOS_string_to_double(self):
-        TestPyOS_String_To_Double = CPyExtType("TestPyOS_String_To_Double",
-                                '''
-                                static PyObject* testPyOS_Str_to_D(PyObject* self, PyObject *str) {
-                                    char *endptr;
-                                    const char *s = (char *) PyUnicode_AsUTF8(str);
-                                    double ret = PyOS_string_to_double(s, &endptr, NULL);
-                                    if (PyErr_Occurred()) {
-                                        return NULL;
-                                    }
-                                    return PyFloat_FromDouble(ret);
-                                }
-                                ''',
-                                tp_methods='{"PyOS_string_to_double_test", (PyCFunction)testPyOS_Str_to_D, METH_O, ""}',
-                                )
+        TestPyOS_String_To_Double = CPyExtType(
+            "TestPyOS_String_To_Double",
+            '''
+            static PyObject* testPyOS_Str_to_D(PyObject* self, PyObject *str) {
+                char *endptr;
+                const char *s = (char *) PyUnicode_AsUTF8(str);
+                double ret = PyOS_string_to_double(s, &endptr, NULL);
+                if (PyErr_Occurred()) {
+                    return NULL;
+                }
+                return PyFloat_FromDouble(ret);
+            }
+            ''',
+            tp_methods='{"PyOS_string_to_double_test", (PyCFunction)testPyOS_Str_to_D, METH_O, ""}',
+        )
         tester = TestPyOS_String_To_Double()
         assert tester.PyOS_string_to_double_test('5') == float(5)
         assert tester.PyOS_string_to_double_test('150.604459') == float(150.604459)
+
+
+class TestNativeFloatSubclass:
+    def test_create(self):
+        f = NativeFloatSubclass(1.0)
+        assert is_native_object(f)
+
+        class ManagedSubclass(NativeFloatSubclass):
+            pass
+
+        f = ManagedSubclass(1.0)
+        assert is_native_object(f)
+
+    def test_methods(self):
+        f = NativeFloatSubclass(1.1)
+        zero = NativeFloatSubclass(0.0)
+        nan = NativeFloatSubclass('nan')
+
+        assert bool(f)
+        assert not bool(zero)
+
+        assert f == 1.1
+        assert nan != nan
+        assert f != zero
+        assert +f == 1.1
+        assert -f == -1.1
+        assert f > 0
+        assert f < 2
+        assert f >= 1.1
+        assert f <= 1.1
+        assert str(f) == '1.1'
+        assert repr(f) == '1.1'
+        assert int(f) == 1
+        assert format(f, 'f') == '1.100000'
+        assert abs(NativeFloatSubclass(-2.1)) == 2.1
+        assert round(f) == 1.0
+        assert f + 1.0 == 2.1
+        assert 1.0 + f == 2.1
+        assert f * 2 == 2.2
+        assert f - 1.6 == -0.5
+        assert f // 2 == 0.0
+        assert f % 2 == 1.1
+        assert f / 2.0 == 0.55
+        assert f ** 0 == 1.0
+        assert divmod(f, 2) == (0.0, 1.1)
+        assert hash(f) == hash(1.1)
+        assert f.hex() == (1.1).hex()
+        assert f.real == 1.1
+        assert f.imag == 0.0
+        assert f.conjugate() == 1.1
+        assert not f.is_integer()
+        assert f.as_integer_ratio() == (1.1).as_integer_ratio()
+        assert f.__getnewargs__() == (1.1,)
+
+    def test_math(self):
+        assert math.isnan(NativeFloatSubclass('nan'))
+        assert math.isinf(NativeFloatSubclass('inf'))
+        assert not math.isfinite(NativeFloatSubclass('inf'))
+        f = NativeFloatSubclass(0.9)
+        for fn in [math.ceil, math.floor, math.sqrt, math.exp, math.expm1, math.frexp, math.modf, math.sin, math.asin,
+                   math.cos, math.acos, math.tan, math.atan, math.log2, math.log10, math.log1p, math.fabs, math.trunc,
+                   math.degrees, math.radians, math.gamma, math.lgamma, math.sqrt]:
+            assert fn(f) == fn(0.9)
+
+        assert math.log(f, 10) == math.log(0.9, 10)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -826,7 +826,7 @@ public PTuple doDouble(double a, double b) {
                 throw raise(PythonErrorType.ZeroDivisionError, ErrorMessages.DIVISION_BY_ZERO);
             }
             double q = Math.floor(a / b);
-            return factory().createTuple(new Object[]{q, FloatBuiltins.ModNode.op(a, b)});
+            return factory().createTuple(new Object[]{q, FloatBuiltins.ModNode.mod(a, b)});
         }
 
         @Specialization

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/ByteArrayBuiltins.java

@@ -182,7 +182,7 @@ public PNone doInit(@SuppressWarnings("unused") PByteArray self, Object source,
 
         @Specialization(guards = "!isBytes(self)")
         public PNone doInit(Object self, @SuppressWarnings("unused") Object source, @SuppressWarnings("unused") Object encoding, @SuppressWarnings("unused") Object errors) {
-            throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, T___INIT__, "bytearray", self);
+            throw raise(TypeError, ErrorMessages.DESCRIPTOR_S_REQUIRES_S_OBJ_RECEIVED_P, T___INIT__, "bytearray", self);
         }
     }
 
@@ -534,7 +534,7 @@ protected PNone doGeneric(VirtualFrame frame, PByteArray self, Object key,
         @SuppressWarnings("unused")
         @Fallback
         protected Object doGeneric(Object self, Object idx) {
-            throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, "__delitem__", "bytearray", idx);
+            throw raise(TypeError, ErrorMessages.DESCRIPTOR_S_REQUIRES_S_OBJ_RECEIVED_P, "__delitem__", "bytearray", idx);
         }
     }
 
@@ -841,7 +841,7 @@ static Object cmp(VirtualFrame frame, Object self, Object other,
         Object error(VirtualFrame frame, Object self, Object other,
                         @Bind("this") Node inliningTarget,
                         @Cached PyByteArrayCheckNode check) {
-            throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, J___EQ__, J_BYTEARRAY, self);
+            throw raise(TypeError, ErrorMessages.DESCRIPTOR_S_REQUIRES_S_OBJ_RECEIVED_P, J___EQ__, J_BYTEARRAY, self);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/BytesBuiltins.java

@@ -587,7 +587,7 @@ static Object cmp(Object self, Object other,
         Object error(Object self, Object other,
                         @Bind("this") Node inliningTarget,
                         @Shared @Cached PyBytesCheckNode check) {
-            throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, J___EQ__, J_BYTES, self);
+            throw raise(TypeError, ErrorMessages.DESCRIPTOR_S_REQUIRES_S_OBJ_RECEIVED_P, J___EQ__, J_BYTES, self);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cell/CellBuiltins.java

@@ -118,7 +118,7 @@ public Object eq(Object self, Object other) {
             if (self instanceof PCell) {
                 return PNotImplemented.NOT_IMPLEMENTED;
             }
-            throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, T___EQ__, "cell", self);
+            throw raise(TypeError, ErrorMessages.DESCRIPTOR_S_REQUIRES_S_OBJ_RECEIVED_P, T___EQ__, "cell", self);
         }
     }
 
@@ -146,7 +146,7 @@ public Object eq(Object self, Object other) {
             if (self instanceof PCell) {
                 return PNotImplemented.NOT_IMPLEMENTED;
             }
-            throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, T___NE__, "cell", self);
+            throw raise(TypeError, ErrorMessages.DESCRIPTOR_S_REQUIRES_S_OBJ_RECEIVED_P, T___NE__, "cell", self);
         }
     }
 
@@ -174,7 +174,7 @@ public Object notImplemented(Object self, Object other) {
             if (self instanceof PCell) {
                 return PNotImplemented.NOT_IMPLEMENTED;
             }
-            throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, T___LT__, "cell", self);
+            throw raise(TypeError, ErrorMessages.DESCRIPTOR_S_REQUIRES_S_OBJ_RECEIVED_P, T___LT__, "cell", self);
         }
     }
 
@@ -202,7 +202,7 @@ public Object notImplemented(Object self, Object other) {
             if (self instanceof PCell) {
                 return PNotImplemented.NOT_IMPLEMENTED;
             }
-            throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, T___LE__, "cell", self);
+            throw raise(TypeError, ErrorMessages.DESCRIPTOR_S_REQUIRES_S_OBJ_RECEIVED_P, T___LE__, "cell", self);
         }
     }
 
@@ -230,7 +230,7 @@ public Object notImplemented(Object self, Object other) {
             if (self instanceof PCell) {
                 return PNotImplemented.NOT_IMPLEMENTED;
             }
-            throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, T___GT__, "cell", self);
+            throw raise(TypeError, ErrorMessages.DESCRIPTOR_S_REQUIRES_S_OBJ_RECEIVED_P, T___GT__, "cell", self);
         }
     }
 
@@ -258,7 +258,7 @@ public Object notImplemented(Object self, Object other) {
             if (self instanceof PCell) {
                 return PNotImplemented.NOT_IMPLEMENTED;
             }
-            throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, T___GE__, "cell", self);
+            throw raise(TypeError, ErrorMessages.DESCRIPTOR_S_REQUIRES_S_OBJ_RECEIVED_P, T___GE__, "cell", self);
         }
     }
 
@@ -286,7 +286,7 @@ public Object eq(Object self) {
             if (self instanceof PCell) {
                 return PNotImplemented.NOT_IMPLEMENTED;
             }
-            throw raise(TypeError, ErrorMessages.DESCRIPTOR_REQUIRES_OBJ, "__repr__", "cell", self);
+            throw raise(TypeError, ErrorMessages.DESCRIPTOR_S_REQUIRES_S_OBJ_RECEIVED_P, "__repr__", "cell", self);
         }
     }