Fixing problem with creating recursive node.

Author: ppisl

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

@@ -593,6 +593,17 @@ def test_empty_separator(self):
         self.assertRaises(ValueError, self.type2test(b'a b').split, b'')
         self.assertRaises(ValueError, self.type2test(b'a b').rsplit, b'')
 
+    def test_indexable_object(self):
+
+        class MyIndexable(object):
+            def __init__(self, value):
+                self.value = value
+            def __index__(self):
+                return self.value
+        
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').split(maxsplit=MyIndexable(1)), [b'ahoj', b'jak\tse\nmas'])
+        self.assertEqual(self.type2test(b'ahoj jak\tse\nmas').rsplit(maxsplit=MyIndexable(1)), [b'ahoj jak\tse', b'mas'])
+        
 class BytesSplitTest(BaseTestSplit, unittest.TestCase):
     type2test = bytes
 

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

@@ -49,6 +49,7 @@
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.list.ListBuiltins.ListAppendNode;
 import com.oracle.graal.python.builtins.objects.list.PList;
+import com.oracle.graal.python.nodes.argument.ReadArgumentNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
@@ -318,6 +319,10 @@ protected List<byte[]> splitDelimiter(byte[] bytes, byte[] sep, int maxsplit) {
             throw new RuntimeException();
         }
 
+        protected AbstractSplitNode createRecursiveNode() {
+            throw new RuntimeException();
+        }
+
         @CompilationFinal private ConditionProfile isEmptySepProfile;
         @CompilationFinal private ConditionProfile overflowProfile;
 
@@ -348,10 +353,6 @@ protected List<byte[]> splitDelimiter(byte[] bytes, byte[] sep, int maxsplit) {
             }
         }
 
-        public static AbstractSplitNode create() {
-            return AbstractBytesBuiltinsFactory.AbstractSplitNodeGen.create();
-        }
-
         private ConditionProfile getIsEmptyProfile() {
             if (isEmptySepProfile == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -403,7 +404,7 @@ private CastToIntegerFromIndexNode getCastIntNode() {
         private AbstractSplitNode getRecursiveNode() {
             if (recursiveNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                recursiveNode = insert(AbstractSplitNode.create());
+                recursiveNode = insert(createRecursiveNode());
             }
             return recursiveNode;
         }
@@ -661,6 +662,11 @@ protected List<byte[]> splitDelimiter(byte[] bytes, byte[] sep, int maxsplit) {
             }
             return result;
         }
+
+        @Override
+        protected AbstractSplitNode createRecursiveNode() {
+            return AbstractBytesBuiltinsFactory.SplitNodeFactory.create(new ReadArgumentNode[]{});
+        }
     }
 
     @Builtin(name = "rsplit", minNumOfPositionalArgs = 1, maxNumOfPositionalArgs = 3, keywordArguments = {"sep", "maxsplit"})
@@ -763,5 +769,10 @@ protected List<byte[]> splitDelimiter(byte[] bytes, byte[] sep, int maxsplit) {
             }
             return result;
         }
+
+        @Override
+        protected AbstractSplitNode createRecursiveNode() {
+            return AbstractBytesBuiltinsFactory.RSplitNodeFactory.create(new ReadArgumentNode[]{});
+        }
     }
 }