Rename ConversionFactory and move to top level

Author: otethal

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

@@ -77,7 +77,7 @@
      * primitive values that are already boxed: those are always passed to the convertor.
      * 
      * It is not necessary to set this when using a builtin conversion or
-     * {@link #conversionClass()}. Built-in convertors and {@link ConversionFactory} provide their
+     * {@link #conversionClass()}. Built-in convertors 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 {};
@@ -97,7 +97,7 @@
 
     /**
      * Specifies the name of the conversion node class, which must include a static factory method
-     * annotated with {@link ConversionFactory}. Must not be used with {@link #customConversion()}.
+     * annotated with {@link ClinicConverterFactory}. Must not be used with {@link #customConversion()}.
      */
     Class<?> conversionClass() default void.class;
 
@@ -149,49 +149,4 @@ enum ClinicConversion {
          */
         Buffer,
     }
-
-    /**
-     * Annotates the factory method (which must be static) in the class specified by
-     * {@link #conversionClass()}.
-     */
-    @Target(ElementType.METHOD)
-    @interface ConversionFactory {
-
-        /**
-         * Specifies which arguments will be provided by the clinic. These are passed to the factory
-         * method before the argument supplied in {@link #args()}.
-         */
-        ClinicArgument[] clinicArgs() 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
-         * convertor.
-         */
-        PrimitiveType[] shortCircuitPrimitive() default {};
-
-        enum ClinicArgument {
-            /**
-             * The default value {@link #defaultValue()}.
-             */
-            DefaultValue,
-            /**
-             * The flag {@link #useDefaultForNone()}.
-             */
-            UseDefaultForNone,
-            /**
-             * The name of the builtin function.
-             */
-            BuiltinName,
-            /**
-             * The index of the argument.
-             */
-            ArgumentIndex,
-            /**
-             * The name of the argument.
-             */
-            ArgumentName,
-        }
-    }
 }

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

@@ -0,0 +1,49 @@
+package com.oracle.graal.python.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+/**
+ * Annotates the factory method (which must be static) in the class specified by
+ * {@link ArgumentClinic#conversionClass()}.
+ */
+@Target(ElementType.METHOD)
+public @interface ClinicConverterFactory {
+
+    /**
+     * Specifies which arguments will be provided by the clinic. These are passed to the factory
+     * method before the argument supplied in {@link ArgumentClinic#args()}.
+     */
+    ClinicArgument[] clinicArgs() 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
+     * convertor.
+     */
+    ArgumentClinic.PrimitiveType[] shortCircuitPrimitive() default {};
+
+    enum ClinicArgument {
+        /**
+         * The default value {@link ArgumentClinic#defaultValue()}.
+         */
+        DefaultValue,
+        /**
+         * The flag {@link ArgumentClinic#useDefaultForNone()}.
+         */
+        UseDefaultForNone,
+        /**
+         * The name of the builtin function.
+         */
+        BuiltinName,
+        /**
+         * The index of the argument.
+         */
+        ArgumentIndex,
+        /**
+         * The name of the argument.
+         */
+        ArgumentName,
+    }
+}

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

@@ -71,6 +71,7 @@
 import com.oracle.graal.python.annotations.ArgumentClinic;
 import com.oracle.graal.python.annotations.ArgumentClinic.PrimitiveType;
 import com.oracle.graal.python.annotations.ArgumentsClinic;
+import com.oracle.graal.python.annotations.ClinicConverterFactory;
 import com.oracle.graal.python.processor.ArgumentClinicModel.ArgumentClinicData;
 import com.oracle.graal.python.processor.ArgumentClinicModel.BuiltinAnnotation;
 import com.oracle.graal.python.processor.ArgumentClinicModel.BuiltinClinicData;
@@ -87,7 +88,7 @@ public Set<String> getSupportedAnnotationTypes() {
         HashSet<String> vals = new HashSet<>();
         vals.add(ArgumentClinic.class.getName());
         vals.add(ArgumentsClinic.class.getName());
-        vals.add(ArgumentClinic.ConversionFactory.class.getName());
+        vals.add(ClinicConverterFactory.class.getName());
         return vals;
     }
 

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

@@ -42,7 +42,8 @@
 
 import com.oracle.graal.python.annotations.ArgumentClinic;
 import com.oracle.graal.python.annotations.ArgumentClinic.PrimitiveType;
-import com.oracle.graal.python.annotations.ArgumentClinic.ConversionFactory.ClinicArgument;
+import com.oracle.graal.python.annotations.ClinicConverterFactory;
+import com.oracle.graal.python.annotations.ClinicConverterFactory.ClinicArgument;
 
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
@@ -137,7 +138,7 @@ public static ConverterFactory getForClass(TypeElement conversionClass) throws P
             return factory;
         }
         for (Element e : conversionClass.getEnclosedElements()) {
-            ArgumentClinic.ConversionFactory annot = e.getAnnotation(ArgumentClinic.ConversionFactory.class);
+            ClinicConverterFactory annot = e.getAnnotation(ClinicConverterFactory.class);
             if (annot != null) {
                 if (!e.getModifiers().contains(Modifier.STATIC) || e.getKind() != ElementKind.METHOD) {
                     throw new ProcessingError(conversionClass, "ConversionFactory annotation is applicable only to static methods.");

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

@@ -49,7 +49,7 @@
 import java.util.Arrays;
 
 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.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.modules.SysModuleBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
@@ -580,7 +580,7 @@ Object doOthers(@SuppressWarnings("unused") VirtualFrame frame, Object value) {
             throw raise(TypeError, ErrorMessages.ARG_D_MUST_BE_S_NOT_P, className(), argNum, PythonBuiltinClassType.PString, value);
         }
 
-        @ArgumentClinic.ConversionFactory(clinicArgs = {ArgumentClinic.ConversionFactory.ClinicArgument.ArgumentIndex})
+        @ClinicConverterFactory(clinicArgs = {ClinicConverterFactory.ClinicArgument.ArgumentIndex})
         public static ExpectStringNode create(int argNum, String className) {
             return BytesNodesFactory.ExpectStringNodeGen.create(argNum, className);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/TupleBuiltins.java

@@ -47,6 +47,7 @@
 
 import com.oracle.graal.python.annotations.ArgumentClinic;
 import com.oracle.graal.python.annotations.ArgumentClinic.PrimitiveType;
+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;
@@ -135,7 +136,7 @@ int doOthers(VirtualFrame frame, Object value,
             throw raise(TypeError, ErrorMessages.SLICE_INDICES_TYPE_ERROR);
         }
 
-        @ArgumentClinic.ConversionFactory(shortCircuitPrimitive = PrimitiveType.Int, clinicArgs = {ArgumentClinic.ConversionFactory.ClinicArgument.DefaultValue})
+        @ClinicConverterFactory(shortCircuitPrimitive = PrimitiveType.Int, clinicArgs = {ClinicConverterFactory.ClinicArgument.DefaultValue})
         public static SliceIndexNode create(int defaultValue) {
             return SliceIndexNodeGen.create(defaultValue);
         }