Add missing specialization to 'float' constructor.

Author: fangerer

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

@@ -96,6 +96,8 @@ def __round__(x, n):
     def test_create(self):
         assert float(99) == 99
         assert float(999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999) == 1e+132
+        assert float(b"0.001") == 0.001
+        assert float("0.001") == 0.001
 
     def test_hex(self):
         data = [

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

@@ -66,6 +66,7 @@
 import com.oracle.graal.python.builtins.objects.PEllipsis;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PNotImplemented;
+import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
 import com.oracle.graal.python.builtins.objects.bytes.BytesUtils;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
@@ -557,6 +558,8 @@ public Object reversed(PythonClass cls, Object sequence,
     @Builtin(name = FLOAT, minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 2, constructsClass = PythonBuiltinClassType.PFloat)
     @GenerateNodeFactory
     public abstract static class FloatNode extends PythonBuiltinNode {
+        @Child private BytesNodes.ToBytesNode toByteArrayNode;
+
         private final ConditionProfile isPrimitiveProfile = ConditionProfile.createBinaryProfile();
 
         protected boolean isPrimitiveFloat(Object cls) {
@@ -616,6 +619,16 @@ public Object floatFromString(PythonClass cls, String arg) {
             return factory().createFloat(cls, value);
         }
 
+        @Specialization(guards = "!isNativeClass(cls)")
+        @TruffleBoundary
+        public Object floatFromBytes(PythonClass cls, PIBytesLike arg) {
+            double value = convertStringToDouble(new String(getByteArray(arg)));
+            if (isPrimitiveFloat(cls)) {
+                return value;
+            }
+            return factory().createFloat(cls, value);
+        }
+
         // Taken from Jython PyString's atof() method
         // The last statement throw Py.ValueError is modified
         @TruffleBoundary
@@ -721,6 +734,14 @@ Object doPythonObject(PythonNativeClass cls, Object obj,
         public Object floatFromObject(@SuppressWarnings("unused") Object cls, Object arg) {
             throw raise(TypeError, "can't convert %s to float", arg.getClass().getSimpleName());
         }
+
+        private byte[] getByteArray(PIBytesLike pByteArray) {
+            if (toByteArrayNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                toByteArrayNode = insert(BytesNodes.ToBytesNode.create());
+            }
+            return toByteArrayNode.execute(pByteArray);
+        }
     }
 
     // frozenset([iterable])
@@ -779,7 +800,7 @@ private HashingCollectionNodes.SetItemNode getSetItemNode() {
     @GenerateNodeFactory
     public abstract static class IntNode extends PythonBuiltinNode {
 
-        @Child private SequenceStorageNodes.ToByteArrayNode toByteArrayNode;
+        @Child private BytesNodes.ToBytesNode toByteArrayNode;
 
         @TruffleBoundary(transferToInterpreterOnException = false)
         private Object stringToInt(String num, int base) {
@@ -1126,9 +1147,9 @@ protected static boolean isHandledType(Object obj) {
         private byte[] getByteArray(PIBytesLike pByteArray) {
             if (toByteArrayNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                toByteArrayNode = insert(SequenceStorageNodes.ToByteArrayNode.create());
+                toByteArrayNode = insert(BytesNodes.ToBytesNode.create());
             }
-            return toByteArrayNode.execute(pByteArray.getSequenceStorage());
+            return toByteArrayNode.execute(pByteArray);
         }
 
     }

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

@@ -135,14 +135,19 @@ public abstract static class ToBytesNode extends PNodeWithContext {
 
         public abstract byte[] execute(Object obj);
 
-        @Specialization(rewriteOn = PException.class)
-        byte[] doBytes(PIBytesLike bytes) {
-            return getToByteArrayNode().execute(bytes.getSequenceStorage());
+        @Specialization
+        byte[] doBytes(PBytes bytes,
+                        @Cached("createBinaryProfile()") ConditionProfile exceptionProfile) {
+            return doBytesLike(bytes, exceptionProfile);
         }
 
-        @Specialization(replaces = "doBytes")
-        byte[] doBytesErro(PIBytesLike bytes,
+        @Specialization
+        byte[] doByteArray(PByteArray byteArray,
                         @Cached("createBinaryProfile()") ConditionProfile exceptionProfile) {
+            return doBytesLike(byteArray, exceptionProfile);
+        }
+
+        private byte[] doBytesLike(PIBytesLike bytes, ConditionProfile exceptionProfile) {
             try {
                 return getToByteArrayNode().execute(bytes.getSequenceStorage());
             } catch (PException e) {