Removed all usages of customConversion

Author: otethal

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

@@ -126,8 +126,8 @@ public void initialize(PythonCore core) {
 
     // bytearray([source[, encoding[, errors]]])
     @Builtin(name = __INIT__, minNumOfPositionalArgs = 1, parameterNames = {"$self", "source", "encoding", "errors"})
-    @ArgumentClinic(name = "encoding", customConversion = "createExpectStringNodeEncoding")
-    @ArgumentClinic(name = "errors", customConversion = "createExpectStringNodeErrors")
+    @ArgumentClinic(name = "encoding", conversionClass = BytesNodes.ExpectStringNode.class, args = "\"bytearray()\"")
+    @ArgumentClinic(name = "errors", conversionClass = BytesNodes.ExpectStringNode.class, args = "\"bytearray()\"")
     @GenerateNodeFactory
     public abstract static class InitNode extends PythonQuaternaryClinicBuiltinNode {
 
@@ -136,14 +136,6 @@ protected ArgumentClinicProvider getArgumentClinic() {
             return ByteArrayBuiltinsClinicProviders.InitNodeClinicProviderGen.INSTANCE;
         }
 
-        public static BytesNodes.ExpectStringNode createExpectStringNodeEncoding() {
-            return BytesNodesFactory.ExpectStringNodeGen.create(2, "bytearray()");
-        }
-
-        public static BytesNodes.ExpectStringNode createExpectStringNodeErrors() {
-            return BytesNodesFactory.ExpectStringNodeGen.create(3, "bytearray()");
-        }
-
         @Specialization(guards = "!isNone(source)")
         public static PNone doInit(VirtualFrame frame, PByteArray self, Object source, Object encoding, Object errors,
                         @Cached BytesNodes.BytesInitNode toBytesNode) {

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

@@ -69,6 +69,7 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.annotations.ArgumentClinic;
+import com.oracle.graal.python.annotations.ClinicConverterFactory;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
@@ -1210,11 +1211,16 @@ private byte check(byte b) {
             }
             return b;
         }
+
+        @ClinicConverterFactory
+        public static SepExpectByteNode create(@ClinicConverterFactory.DefaultValue Object defaultValue) {
+            return BytesBuiltinsFactory.SepExpectByteNodeGen.create(defaultValue);
+        }
     }
 
     @Builtin(name = "hex", minNumOfPositionalArgs = 1, parameterNames = {"$self", "sep", "bytes_per_sep_group"})
-    @ArgumentClinic(name = "sep", customConversion = "createSepExpectByteNode")
-    @ArgumentClinic(name = "bytes_per_sep_group", customConversion = "createExpectIntNode", shortCircuitPrimitive = ArgumentClinic.PrimitiveType.Int)
+    @ArgumentClinic(name = "sep", conversionClass = SepExpectByteNode.class, defaultValue = "PNone.NO_VALUE")
+    @ArgumentClinic(name = "bytes_per_sep_group", conversionClass = ExpectIntNode.class, defaultValue = "1")
     @GenerateNodeFactory
     abstract static class HexNode extends PythonTernaryClinicBuiltinNode {
 
@@ -1223,14 +1229,6 @@ protected ArgumentClinicProvider getArgumentClinic() {
             return BytesBuiltinsClinicProviders.HexNodeClinicProviderGen.INSTANCE;
         }
 
-        public static SepExpectByteNode createSepExpectByteNode() {
-            return BytesBuiltinsFactory.SepExpectByteNodeGen.create(PNone.NO_VALUE);
-        }
-
-        public static ExpectIntNode createExpectIntNode() {
-            return BytesBuiltinsFactory.ExpectIntNodeGen.create(1);
-        }
-
         @Specialization
         String none(PBytesLike self, @SuppressWarnings("unused") PNone sep, @SuppressWarnings("unused") int bytesPerSepGroup,
                         @Cached.Shared("p") @Cached ConditionProfile earlyExit,
@@ -1603,7 +1601,7 @@ protected byte[] make(byte[] self, int len, int width, byte fill) {
     }
 
     @Builtin(name = "replace", minNumOfPositionalArgs = 3, parameterNames = {"$self", "old", "replacement", "count"})
-    @ArgumentClinic(name = "count", customConversion = "createExpectIntNode", shortCircuitPrimitive = ArgumentClinic.PrimitiveType.Int)
+    @ArgumentClinic(name = "count", conversionClass = ExpectIntNode.class, defaultValue = "Integer.MAX_VALUE")
     @GenerateNodeFactory
     abstract static class ReplaceNode extends PythonQuaternaryClinicBuiltinNode {
 
@@ -1612,10 +1610,6 @@ protected ArgumentClinicProvider getArgumentClinic() {
             return BytesBuiltinsClinicProviders.ReplaceNodeClinicProviderGen.INSTANCE;
         }
 
-        public static ExpectIntNode createExpectIntNode() {
-            return BytesBuiltinsFactory.ExpectIntNodeGen.create(Integer.MAX_VALUE);
-        }
-
         @Specialization
         PBytesLike replace(VirtualFrame frame, PBytesLike self, PBytesLike substr, PBytesLike replacement, int count,
                         @Cached SequenceStorageNodes.GetInternalByteArrayNode toInternalBytes,
@@ -1799,6 +1793,11 @@ int doOthers(VirtualFrame frame, Object value,
         protected ExpectIntNode createRec() {
             return BytesBuiltinsFactory.ExpectIntNodeGen.create(defaultValue);
         }
+
+        @ClinicConverterFactory(shortCircuitPrimitive = ArgumentClinic.PrimitiveType.Int)
+        public static ExpectIntNode create(@ClinicConverterFactory.DefaultValue int defaultValue) {
+            return BytesBuiltinsFactory.ExpectIntNodeGen.create(defaultValue);
+        }
     }
 
     public abstract static class ExpectByteLikeNode extends ArgumentCastNode.ArgumentCastNodeWithRaise {
@@ -1832,6 +1831,11 @@ static byte[] doMemView(VirtualFrame frame, PMemoryView bytesLike,
         byte[] error(@SuppressWarnings("unused") VirtualFrame frame, Object value) {
             throw raise(TypeError, ErrorMessages.BYTESLIKE_OBJ_REQUIRED, value);
         }
+
+        @ClinicConverterFactory
+        public static ExpectByteLikeNode create(@ClinicConverterFactory.DefaultValue byte[] defaultValue) {
+            return BytesBuiltinsFactory.ExpectByteLikeNodeGen.create(defaultValue);
+        }
     }
 
     abstract static class AbstractSplitNode extends PythonTernaryClinicBuiltinNode {
@@ -1938,8 +1942,8 @@ protected static Object asIndex(VirtualFrame frame, Object maxsplit, PythonObjec
     }
 
     @Builtin(name = "split", minNumOfPositionalArgs = 1, parameterNames = {"$self", "sep", "maxsplit"})
-    @ArgumentClinic(name = "sep", customConversion = "createExpectByteLikeNode")
-    @ArgumentClinic(name = "maxsplit", customConversion = "createExpectIntNode", shortCircuitPrimitive = ArgumentClinic.PrimitiveType.Int)
+    @ArgumentClinic(name = "sep", conversionClass = ExpectByteLikeNode.class, defaultValue = "BytesBuiltins.AbstractSplitNode.WHITESPACE")
+    @ArgumentClinic(name = "maxsplit", conversionClass = ExpectIntNode.class, defaultValue = "Integer.MAX_VALUE")
     @GenerateNodeFactory
     @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class SplitNode extends AbstractSplitNode {
@@ -1955,14 +1959,6 @@ protected ArgumentClinicProvider getArgumentClinic() {
             return BytesBuiltinsClinicProviders.SplitNodeClinicProviderGen.INSTANCE;
         }
 
-        public static ExpectByteLikeNode createExpectByteLikeNode() {
-            return BytesBuiltinsFactory.ExpectByteLikeNodeGen.create(WHITESPACE);
-        }
-
-        public static ExpectIntNode createExpectIntNode() {
-            return BytesBuiltinsFactory.ExpectIntNodeGen.create(Integer.MAX_VALUE);
-        }
-
         @Override
         protected List<byte[]> splitWhitespace(byte[] bytes, int len, int maxsplit) {
             int i, j, maxcount = maxsplit;
@@ -2042,8 +2038,8 @@ protected List<byte[]> splitDelimiter(byte[] bytes, int len, byte[] sep, int max
     }
 
     @Builtin(name = "rsplit", minNumOfPositionalArgs = 1, parameterNames = {"self", "sep", "maxsplit"})
-    @ArgumentClinic(name = "sep", customConversion = "createExpectByteLikeNode")
-    @ArgumentClinic(name = "maxsplit", customConversion = "createExpectIntNode", shortCircuitPrimitive = ArgumentClinic.PrimitiveType.Int)
+    @ArgumentClinic(name = "sep", conversionClass = ExpectByteLikeNode.class, defaultValue = "BytesBuiltins.AbstractSplitNode.WHITESPACE")
+    @ArgumentClinic(name = "maxsplit", conversionClass = ExpectIntNode.class, defaultValue = "Integer.MAX_VALUE")
     @GenerateNodeFactory
     @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class RSplitNode extends AbstractSplitNode {
@@ -2059,14 +2055,6 @@ protected ArgumentClinicProvider getArgumentClinic() {
             return BytesBuiltinsClinicProviders.RSplitNodeClinicProviderGen.INSTANCE;
         }
 
-        public static ExpectByteLikeNode createExpectByteLikeNode() {
-            return BytesBuiltinsFactory.ExpectByteLikeNodeGen.create(WHITESPACE);
-        }
-
-        public static ExpectIntNode createExpectIntNode() {
-            return BytesBuiltinsFactory.ExpectIntNodeGen.create(Integer.MAX_VALUE);
-        }
-
         @CompilerDirectives.TruffleBoundary
         private static void reverseList(ArrayList<byte[]> list) {
             Collections.reverse(list);