[GR-10284] Math.trunc function is not implemented.

ppisl · ppisl · commit 40b6ae7f37e5 · 2018-06-11T16:44:58.000+02:00
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_int.py b/graalpython/com.oracle.graal.python.test/src/tests/test_int.py
@@ -249,3 +249,52 @@ def subclassTest(number):
     subclassTest(9)
     subclassTest(6227020800)
     subclassTest(9999992432902008176640000999999)
+
+class MyTrunc:
+    def __trunc__(self):
+        return 1972
+class MyIntTrunc:
+    def __trunc__(self):
+        return 1972
+    def __int__(self):
+        return 66
+
+def test_trunc():
+    def builtinTest(number):
+        a = int(number)
+        b = a.__trunc__()
+        assert a == b
+        assert a is b
+        assert type(a) == int
+        assert type(b) == int
+
+    builtinTest(-9)
+    builtinTest(0)
+    builtinTest(9)
+    builtinTest(6227020800)
+    builtinTest(9999992432902008176640000999999)
+    
+    assert True.__trunc__() == 1
+    assert False.__trunc__() == 0
+
+    assert int(MyTrunc()) == 1972
+    assert int(MyIntTrunc()) == 66
+
+def test_trunc_subclass():
+    def subclassTest(number):
+        a = MyInt(number)
+        b = a.__trunc__()
+        assert a == b
+        assert a is not b
+        assert type(a) == MyInt
+        assert type(b) == int
+
+    subclassTest(-9)
+    subclassTest(0)
+    subclassTest(9)
+    subclassTest(6227020800)
+    subclassTest(9999992432902008176640000999999)
+
+    assert MyInt(MyTrunc()) == 1972
+    assert MyInt(MyIntTrunc()) == 66
+
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/test_math.py b/graalpython/com.oracle.graal.python.test/src/tests/test_math.py
@@ -447,3 +447,29 @@ class II(int):
         self.assertEqual(math.ldexp(FF(10), II(12)), 40960.0)
         self.assertRaises(TypeError, math.ldexp, 'Hello', 1000000)
         self.assertRaises(TypeError, math.ldexp, 1, 'Hello')
+    
+    def test_trunc(self):
+        self.assertEqual(math.trunc(1), 1)
+        self.assertEqual(math.trunc(-1), -1)
+        self.assertEqual(type(math.trunc(1)), int)
+        self.assertEqual(type(math.trunc(1.5)), int)
+        self.assertEqual(math.trunc(1.5), 1)
+        self.assertEqual(math.trunc(-1.5), -1)
+        self.assertEqual(math.trunc(1.999999), 1)
+        self.assertEqual(math.trunc(-1.999999), -1)
+        self.assertEqual(math.trunc(-0.999999), -0)
+        self.assertEqual(math.trunc(-100.999), -100)
+
+        class TestTrunc(object):
+            def __trunc__(self):
+                return 23
+
+        class TestNoTrunc(object):
+            pass
+
+        self.assertEqual(math.trunc(TestTrunc()), 23)
+
+        self.assertRaises(TypeError, math.trunc)
+        self.assertRaises(TypeError, math.trunc, 1, 2)
+        self.assertRaises(TypeError, math.trunc, TestNoTrunc())
+
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java
@@ -698,11 +698,21 @@ Object fail(PythonClass cls, Object arg, Object keywordArg) {
         @Specialization(guards = "isNoValue(keywordArg)")
         public Object createInt(PythonClass cls, PythonObject obj, PNone keywordArg,
                         @Cached("create(__INT__)") LookupAndCallUnaryNode callIntNode,
+                        @Cached("create(__TRUNC__)") LookupAndCallUnaryNode callTruncNode,
                         @Cached("createBinaryProfile()") ConditionProfile isIntProfile) {
             try {
+                // at first try __int__ method
                 return createInt(cls, callIntNode.executeLong(obj), keywordArg, isIntProfile);
             } catch (UnexpectedResultException e) {
                 Object result = e.getResult();
+                if (result == PNone.NO_VALUE) {
+                    try {
+                        // now try __trunc__ method
+                        return createInt(cls, callTruncNode.executeLong(obj), keywordArg, isIntProfile);
+                    } catch (UnexpectedResultException ee) {
+                        result = ee.getResult();
+                    }
+                }
                 if (result == PNone.NO_VALUE) {
                     throw raise(TypeError, "an integer is required (got type %p)", obj);
                 } else if (result instanceof Integer) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MathModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MathModuleBuiltins.java
@@ -955,6 +955,21 @@ public abstract static class PowNode extends PythonBuiltinNode {
         }
     }
 
+    @Builtin(name = "trunc", fixedNumOfArguments = 1)
+    @GenerateNodeFactory
+    public abstract static class TruncNode extends PythonBuiltinNode {
+
+        @Specialization
+        Object trunc(Object obj,
+                        @Cached("create(__TRUNC__)") LookupAndCallUnaryNode callTrunc) {
+            Object result = callTrunc.executeObject(obj);
+            if (result == PNone.NO_VALUE) {
+                raise(TypeError, "type %p doesn't define __trunc__ method", obj);
+            }
+            return result;
+        }
+    }
+
     @Builtin(name = "atan2", fixedNumOfArguments = 2)
     @GenerateNodeFactory
     public abstract static class Atan2Node extends PythonBuiltinNode {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/FloatBuiltins.java
@@ -54,6 +54,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__STR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SUB__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__TRUEDIV__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__TRUNC__;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -924,6 +925,31 @@ static abstract class ConjugateNode extends RealNode {
 
     }
 
+    @Builtin(name = __TRUNC__, fixedNumOfArguments = 1)
+    @GenerateNodeFactory
+    abstract static class TruncNode extends PythonUnaryBuiltinNode {
+
+        private int truncate(double value) {
+            return (int) (value < 0 ? Math.ceil(value) : Math.floor(value));
+        }
+
+        @Specialization
+        int trunc(double value) {
+            return truncate(value);
+        }
+
+        @Specialization
+        int trunc(PFloat pValue) {
+            double value = pValue.getValue();
+            if (value == Double.NaN) {
+                raise(PythonErrorType.ValueError, "cannot convert float NaN to integer");
+            } else if (value == Double.NEGATIVE_INFINITY || value == Double.POSITIVE_INFINITY) {
+                raise(PythonErrorType.OverflowError, "cannot convert float infinity to integer");
+            }
+            return truncate(value);
+        }
+    }
+
     @Builtin(name = __GETFORMAT__, fixedNumOfArguments = 2)
     @GenerateNodeFactory
     abstract static class GetFormatNode extends PythonUnaryBuiltinNode {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java
@@ -1888,6 +1888,12 @@ int get(@SuppressWarnings("unused") Object self) {
         }
     }
 
+    @GenerateNodeFactory
+    @Builtin(name = SpecialMethodNames.__TRUNC__, fixedNumOfArguments = 1, doc = "Truncating an Integral returns itself.")
+    static abstract class TruncNode extends IntNode {
+
+    }
+
     @Builtin(name = SpecialMethodNames.__INT__, fixedNumOfArguments = 1)
     @GenerateNodeFactory
     abstract static class IntNode extends PythonBuiltinNode {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/SpecialMethodNames.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/SpecialMethodNames.java
@@ -89,6 +89,7 @@ public abstract class SpecialMethodNames {
     public static final String __DIV__ = "__div__";
     public static final String __MATMUL__ = "__matmul__";
     public static final String __TRUEDIV__ = "__truediv__";
+    public static final String __TRUNC__ = "__trunc__";
     public static final String __FLOORDIV__ = "__floordiv__";
     public static final String __MOD__ = "__mod__";
     public static final String __DIVMOD__ = "__divmod__";

Original file line number	Diff line number	Diff line change
`@@ -1888,6 +1888,12 @@ int get(@SuppressWarnings("unused") Object self) {`
`1888`	`1888`	`}`
`1889`	`1889`	`}`
`1890`	`1890`
	`1891`	`+ @GenerateNodeFactory`
	`1892`	`+ @Builtin(name = SpecialMethodNames.__TRUNC__, fixedNumOfArguments = 1, doc = "Truncating an Integral returns itself.")`
	`1893`	`+ static abstract class TruncNode extends IntNode {`
	`1894`	`+`
	`1895`	`+ }`
	`1896`	`+`
`1891`	`1897`	`@Builtin(name = SpecialMethodNames.__INT__, fixedNumOfArguments = 1)`
`1892`	`1898`	`@GenerateNodeFactory`
`1893`	`1899`	`abstract static class IntNode extends PythonBuiltinNode {`