Better handling exceptions.

Author: ppisl

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

@@ -646,3 +646,20 @@ def subclassTest(number):
         subclassTest(9.1)
         subclassTest(6227020800.2)
         subclassTest(9999992432902008176640000999999.33)
+
+    def test_trunc(self):
+        self.assertEqual(float(1).__trunc__(), 1)
+        self.assertEqual(float(1.99).__trunc__(), 1)
+        self.assertEqual(float(-1.99).__trunc__(), -1)
+
+        self.assertRaises(ValueError, float('nan').__trunc__)
+        self.assertRaises(OverflowError, float('inf').__trunc__)
+        self.assertRaises(OverflowError, float('-inf').__trunc__)
+
+        self.assertEqual(MyFloat(1).__trunc__(), 1)
+        self.assertEqual(MyFloat(1.99).__trunc__(), 1)
+        self.assertEqual(MyFloat(-1.99).__trunc__(), -1)
+
+        self.assertRaises(ValueError, MyFloat('nan').__trunc__)
+        self.assertRaises(OverflowError, MyFloat('inf').__trunc__)
+        self.assertRaises(OverflowError, MyFloat('-inf').__trunc__)

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

@@ -84,6 +84,7 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
+import com.oracle.truffle.api.profiles.ConditionProfile;
 
 @CoreFunctions(extendClasses = PFloat.class)
 public final class FloatBuiltins extends PythonBuiltins {
@@ -929,25 +930,38 @@ static abstract class ConjugateNode extends RealNode {
     @GenerateNodeFactory
     abstract static class TruncNode extends PythonUnaryBuiltinNode {
 
-        private int truncate(double value) {
+        @TruffleBoundary
+        protected static int truncate(double value) {
             return (int) (value < 0 ? Math.ceil(value) : Math.floor(value));
         }
 
         @Specialization
-        int trunc(double value) {
+        int trunc(double value,
+                        @Cached("createBinaryProfile()") ConditionProfile nanProfile,
+                        @Cached("createBinaryProfile()") ConditionProfile infProfile) {
+            if (nanProfile.profile(Double.isNaN(value))) {
+                throw raise(PythonErrorType.ValueError, "cannot convert float NaN to integer");
+            }
+            if (infProfile.profile(Double.isInfinite(value))) {
+                throw raise(PythonErrorType.OverflowError, "cannot convert float infinity to integer");
+            }
             return truncate(value);
         }
 
         @Specialization
-        int trunc(PFloat pValue) {
+        int trunc(PFloat pValue,
+                        @Cached("createBinaryProfile()") ConditionProfile nanProfile,
+                        @Cached("createBinaryProfile()") ConditionProfile infProfile) {
             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");
+            if (nanProfile.profile(Double.isNaN(value))) {
+                throw raise(PythonErrorType.ValueError, "cannot convert float NaN to integer");
+            }
+            if (infProfile.profile(Double.isInfinite(value))) {
+                throw raise(PythonErrorType.OverflowError, "cannot convert float infinity to integer");
             }
             return truncate(value);
         }
+
     }
 
     @Builtin(name = __GETFORMAT__, fixedNumOfArguments = 2)