Fixed typos and style

Author: otethal

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

@@ -58,8 +58,8 @@
      * configuration for the conversion routine. Note that not all routines support all the
      * configuration options.
      * 
-     * Conversion routines are implemented in {@code ArgumentClinicModel#BuiltinConvertor}. It
-     * creates Java code snippets that instantiate the actual cast nodes, which should implement
+     * Conversion routines are implemented in {@code ConverterFactory}. It creates Java code
+     * snippets that instantiate the actual cast nodes, which should implement
      * {@code ArgumentCastNode}.
      */
     ClinicConversion conversion() default ClinicConversion.None;
@@ -74,11 +74,12 @@
     /**
      * 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.
+     * 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 convertors and {@link ClinicConverterFactory} provide their
-     * own list of short circuit types, which is applied if this field is set to its default value.
+     * {@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 {};
 
@@ -97,7 +98,8 @@
 
     /**
      * 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}. Must not be used with
+     * {@link #customConversion()}.
      */
     Class<?> conversionClass() default void.class;
 
@@ -116,36 +118,36 @@ enum PrimitiveType {
 
     enum ClinicConversion {
         /**
-         * No builtin convertor will be used.
+         * No builtin converter will be used.
          */
         None,
         /**
-         * Corresponds to CPython's {@code bool} convertor. Supports {@link #defaultValue()}.
+         * Corresponds to CPython's {@code bool} converter. Supports {@link #defaultValue()}.
          * {@code PNone.NONE} is, for now, always converted to {@code false}.
          */
         Boolean,
         /**
-         * GraalPython specific convertor that narrows any String representation to Java String.
+         * GraalPython specific converter that narrows any String representation to Java String.
          * Supports {@link #defaultValue()}, and {@link #useDefaultForNone()}.
          */
         String,
         /**
-         * Corresponds to CPython's {@code int} convertor. Supports {@link #defaultValue()}, and
+         * Corresponds to CPython's {@code int} converter. Supports {@link #defaultValue()}, and
          * {@link #useDefaultForNone()}.
          */
         Int,
         /**
-         * Corresponds to CPython's {@code Py_ssize_t} convertor. Supports {@link #defaultValue()},
+         * Corresponds to CPython's {@code Py_ssize_t} converter. Supports {@link #defaultValue()},
          * and {@link #useDefaultForNone()}.
          */
         Index,
         /**
-         * Corresponds to CPython's {@code int(accept={str})} convertor. Supports
+         * Corresponds to CPython's {@code int(accept={str})} converter. Supports
          * {@link #defaultValue()}, and {@link #useDefaultForNone()}.
          */
         CodePoint,
         /**
-         * Corresponds to CPython's {@code Py_buffer} convertor.
+         * Corresponds to CPython's {@code Py_buffer} converter.
          */
         Buffer,
     }

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

@@ -1,3 +1,43 @@
+/*
+ * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 package com.oracle.graal.python.annotations;
 
 import java.lang.annotation.ElementType;
@@ -11,43 +51,47 @@
 public @interface ClinicConverterFactory {
 
     /**
-     * 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.
+     * 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.
      */
     ArgumentClinic.PrimitiveType[] shortCircuitPrimitive() default {};
 
     /**
-     * Annotates parameter of the factory method which will receive the default value {@link ArgumentClinic#defaultValue()}.
+     * Annotates parameter of the factory method which will receive the default value
+     * {@link ArgumentClinic#defaultValue()}.
      */
     @Target(ElementType.PARAMETER)
     @interface DefaultValue {
     }
 
     /**
-     * Annotates parameter of the factory method which will receive the value of {@link ArgumentClinic#useDefaultForNone()}.
+     * Annotates parameter of the factory method which will receive the value of
+     * {@link ArgumentClinic#useDefaultForNone()}.
      */
     @Target(ElementType.PARAMETER)
     @interface UseDefaultForNone {
     }
 
     /**
-     * Annotates parameter of the factory method which will receive the name of the builtin function.
+     * Annotates parameter of the factory method which will receive the name of the builtin
+     * function.
      */
     @Target(ElementType.PARAMETER)
     @interface BuiltinName {
     }
 
     /**
-     * Annotates parameter of the factory method which will receive the index of the argument of the builtin functions.
+     * Annotates parameter of the factory method which will receive the index of the argument of the
+     * builtin functions.
      */
     @Target(ElementType.PARAMETER)
     @interface ArgumentIndex {
     }
 
     /**
-     * Annotates parameter of the factory method which will receive the name of the argument of the builtin functions.
+     * Annotates parameter of the factory method which will receive the name of the argument of the
+     * builtin functions.
      */
     @Target(ElementType.PARAMETER)
     @interface ArgumentName {

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

@@ -162,7 +162,7 @@ public static ArgumentClinicData create(ArgumentClinic annotation, TypeElement t
                         args[i] = String.valueOf(index);
                         break;
                     case ArgumentName:
-                        args[i] =  String.format("\"%s\"", builtinAnnotation.argumentNames[index]);
+                        args[i] = String.format("\"%s\"", builtinAnnotation.argumentNames[index]);
                         break;
                     case DefaultValue:
                         args[i] = annotation.defaultValue();

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

@@ -84,7 +84,6 @@ enum Param {
         Extra,
     }
 
-
     private static final Map<TypeElement, ConverterFactory> cache = new HashMap<>();
 
     public final String fullClassName;
@@ -107,15 +106,15 @@ private ConverterFactory(String className, Param[] params, PrimitiveType[] accep
         this(CLINIC_PACKAGE + "." + className, className, "create", 0, params, acceptedPrimitiveTypes);
     }
 
-    private static final ConverterFactory BuiltinBoolean = new ConverterFactory("JavaBooleanConvertorNodeGen",
+    private static final ConverterFactory BuiltinBoolean = new ConverterFactory("JavaBooleanConverterNodeGen",
                     new Param[]{Param.DefaultValue},
                     new PrimitiveType[]{PrimitiveType.Boolean});
 
-    private static final ConverterFactory BuiltinString = new ConverterFactory("JavaStringConvertorNodeGen",
+    private static final ConverterFactory BuiltinString = new ConverterFactory("JavaStringConverterNodeGen",
                     new Param[]{Param.BuiltinName},
                     new PrimitiveType[]{});
 
-    private static final ConverterFactory BuiltinStringWithDefault = new ConverterFactory("JavaStringConvertorWithDefaultValueNodeGen",
+    private static final ConverterFactory BuiltinStringWithDefault = new ConverterFactory("JavaStringConverterWithDefaultValueNodeGen",
                     new Param[]{Param.BuiltinName, Param.DefaultValue, Param.UseDefaultForNone},
                     new PrimitiveType[]{});
 

…ins/clinic/JavaBooleanConvertorNode.java …ins/clinic/JavaBooleanConverterNode.javagraalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaBooleanConvertorNode.java renamed to graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaBooleanConverterNode.java graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaBooleanConvertorNode.java renamed to graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaBooleanConverterNode.java

@@ -50,10 +50,10 @@
  * Implements the {@code bool} argument clinic conversion, which in CPython calls to
  * {@code PyObject_IsTrue}.
  */
-public abstract class JavaBooleanConvertorNode extends ArgumentCastNode {
+public abstract class JavaBooleanConverterNode extends ArgumentCastNode {
     private final boolean defaultValue;
 
-    protected JavaBooleanConvertorNode(boolean defaultValue) {
+    protected JavaBooleanConverterNode(boolean defaultValue) {
         this.defaultValue = defaultValue;
     }
 

…tins/clinic/JavaStringConvertorNode.java …tins/clinic/JavaStringConverterNode.javagraalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaStringConvertorNode.java renamed to graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaStringConverterNode.java graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaStringConvertorNode.java renamed to graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaStringConverterNode.java

@@ -48,10 +48,10 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
 
-public abstract class JavaStringConvertorNode extends ArgumentCastNodeWithRaise {
+public abstract class JavaStringConverterNode extends ArgumentCastNodeWithRaise {
     private final String builtinName;
 
-    public JavaStringConvertorNode(String builtinName) {
+    public JavaStringConverterNode(String builtinName) {
         this.builtinName = builtinName;
     }
 

…JavaStringConvertorWithDefaultValue.java …JavaStringConverterWithDefaultValue.javagraalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaStringConvertorWithDefaultValue.java renamed to graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaStringConverterWithDefaultValue.java graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaStringConvertorWithDefaultValue.java renamed to graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/builtins/clinic/JavaStringConverterWithDefaultValue.java

@@ -43,11 +43,11 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.truffle.api.dsl.Specialization;
 
-public abstract class JavaStringConvertorWithDefaultValue extends JavaStringConvertorNode {
+public abstract class JavaStringConverterWithDefaultValue extends JavaStringConverterNode {
     private final Object defaultValue;
     protected final boolean useDefaultForNone;
 
-    public JavaStringConvertorWithDefaultValue(String builtinName, Object defaultValue, boolean useDefaultForNone) {
+    public JavaStringConverterWithDefaultValue(String builtinName, Object defaultValue, boolean useDefaultForNone) {
         super(builtinName);
         this.defaultValue = defaultValue;
         this.useDefaultForNone = useDefaultForNone;