Removed support for customConversion

Author: otethal

graalpython/com.oracle.graal.python.annotations/src/com/oracle/graal/python/annotations/ArgumentClinic.java

@@ -64,25 +64,6 @@
      */
     ClinicConversion conversion() default ClinicConversion.None;
 
-    /**
-     * Overrides the {@link #conversion()} value. Name of a method of the builtin class that should
-     * be used as a factory to create the conversion node. When this value is set, then other
-     * conversion options are ignored.
-     */
-    String customConversion() default "";
-
-    /**
-     * The boxing optimized execute method variants will not attempt to cast the listed primitive
-     * types and will just pass them directly to the specializations. This does not apply to
-     * primitive values that are already boxed: those are always passed to the converter.
-     * 
-     * It is not necessary to set this when using a builtin conversion or
-     * {@link #conversionClass()}. Built-in converters and {@link ClinicConverterFactory} provide
-     * their own list of short circuit types, which is applied if this field is set to its default
-     * value.
-     */
-    PrimitiveType[] shortCircuitPrimitive() default {};
-
     /**
      * The string should contain valid Java constant value expression, for example, {@code true}, or
      * {@code \"some string\"}. You may have to update the annotation processor to include import of
@@ -98,14 +79,13 @@
 
     /**
      * Specifies the name of the conversion node class, which must include a static factory method
-     * annotated with {@link ClinicConverterFactory}. Must not be used with
-     * {@link #customConversion()}.
+     * annotated with {@link ClinicConverterFactory}.
      */
     Class<?> conversionClass() default void.class;
 
     /**
-     * Specifies arguments to the factory method, applicable only with {@link #conversionClass()}.
-     * String literals must be explicitly quoted: {@code args = "\"abc\""}
+     * Specifies arguments to the factory method. String literals must be explicitly quoted:
+     * {@code args = "\"abc\""}
      */
     String[] args() default {};
 

graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/ArgumentClinicModel.java

@@ -120,12 +120,6 @@ private static ConverterFactory getFactory(ArgumentClinic annotation, TypeElemen
             if (factory == null && annotation.args().length != 0) {
                 throw new ProcessingError(type, "No conversionClass specified but arguments were provided");
             }
-            if (!annotation.customConversion().isEmpty()) {
-                if (factory != null) {
-                    throw new ProcessingError(type, "Cannot specify both conversionClass and customConversion");
-                }
-                return ConverterFactory.forCustomConversion(type, annotation.customConversion());
-            }
             if (factory != null) {
                 return factory;
             }
@@ -135,22 +129,16 @@ private static ConverterFactory getFactory(ArgumentClinic annotation, TypeElemen
             return ConverterFactory.getBuiltin(annotation);
         }
 
-        public static ArgumentClinicData create(ArgumentClinic annotation, TypeElement type, BuiltinAnnotation builtinAnnotation, int index, ConverterFactory ofactory) throws ProcessingError {
+        public static ArgumentClinicData create(ArgumentClinic annotation, TypeElement type, BuiltinAnnotation builtinAnnotation, int index, ConverterFactory annotationFactory)
+                        throws ProcessingError {
             if (annotation == null) {
                 return new ArgumentClinicData(null, index, new HashSet<>(Arrays.asList(PrimitiveType.values())), null, Collections.emptySet());
             }
-            ConverterFactory factory = getFactory(annotation, type, ofactory);
+            ConverterFactory factory = getFactory(annotation, type, annotationFactory);
             if (annotation.args().length != factory.extraParamCount) {
                 throw new ProcessingError(type, "Conversion %s.%s expects %d arguments", factory.fullClassName, factory.methodName, factory.extraParamCount);
             }
 
-            PrimitiveType[] acceptedPrimitives;
-            if (annotation.shortCircuitPrimitive().length > 0) {
-                acceptedPrimitives = annotation.shortCircuitPrimitive();
-            } else {
-                acceptedPrimitives = factory.acceptedPrimitiveTypes;
-            }
-
             String[] args = new String[factory.params.length];
             int extraParamIndex = 0;
             for (int i = 0; i < args.length; ++i) {
@@ -184,7 +172,7 @@ public static ArgumentClinicData create(ArgumentClinic annotation, TypeElement t
                 imports.add("com.oracle.graal.python.builtins.objects.PNone");
             }
 
-            return new ArgumentClinicData(annotation, index, new HashSet<>(Arrays.asList(acceptedPrimitives)), castNodeFactory, imports);
+            return new ArgumentClinicData(annotation, index, new HashSet<>(Arrays.asList(factory.acceptedPrimitiveTypes)), castNodeFactory, imports);
         }
     }
 }

graalpython/com.oracle.graal.python.processor/src/com/oracle/graal/python/processor/ConverterFactory.java

@@ -184,12 +184,6 @@ public static ConverterFactory getForClass(TypeElement conversionClass) throws P
         return factory;
     }
 
-    public static ConverterFactory forCustomConversion(TypeElement type, String methodName) {
-        String fullClassName = type.getQualifiedName().toString();
-        String className = type.getSimpleName().toString();
-        return new ConverterFactory(fullClassName, className, methodName, 0, new Param[0], new PrimitiveType[0]);
-    }
-
     private static ConverterFactory forBuiltin(Elements elementUtils, String className) throws ProcessingError {
         TypeElement type = elementUtils.getTypeElement(CLINIC_PACKAGE + "." + className);
         if (type == null) {