refactored Arity state storage class, track whether the function takes kwArgs or not

- in addition track if the function takes a fixed number of args

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -1347,7 +1347,7 @@ synchronized public Object doIt(PFunction func) {
                 String[] parameterIds = new String[arity.getParameterIds().length + 1];
                 parameterIds[0] = "self";
                 System.arraycopy(arity.getParameterIds(), 0, parameterIds, 1, parameterIds.length - 1);
-                Arity arityWithSelf = new Arity(name, arity.getMinNumOfArgs() + 1, arity.getMaxNumOfArgs() + 1, arity.takesKeywordArg(), arity.takesVarArgs(), parameterIds,
+                Arity arityWithSelf = new Arity(name, arity.getMinNumOfArgs() + 1, arity.getMaxNumOfArgs() + 1, arity.takesKeywordArgs(), arity.takesVarArgs(), parameterIds,
                                 arity.getKeywordNames());
                 FunctionRootNode functionRootNode = (FunctionRootNode) func.getFunctionRootNode();
                 if (!functionRootNode.isRewritten()) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/Arity.java

@@ -36,7 +36,7 @@ public class Arity {
     private final int minNumOfArgs;
     private final int maxNumOfArgs;
 
-    private final boolean takesKeywordArg;
+    private final boolean takesKeywordArgs;
     private final boolean takesVarArgs;
 
     @CompilationFinal(dimensions = 1) private final String[] parameterIds;
@@ -46,42 +46,50 @@ public Arity(String functionName, int minNumOfArgs, int maxNumOfArgs, List<Strin
         this.functionName = functionName;
         this.minNumOfArgs = minNumOfArgs;
         this.maxNumOfArgs = maxNumOfArgs;
-        this.takesKeywordArg = true;
+        this.takesKeywordArgs = true;
         this.takesVarArgs = false;
         this.parameterIds = parameterIds.toArray(new String[0]);
         this.keywordNames = keywordNames.toArray(new String[0]);
     }
 
-    public Arity(String functionName, int minNumOfArgs, int maxNumOfArgs, boolean takesKeywordArg, boolean takesVarArgs, List<String> parameterIds, List<String> keywordNames) {
+    public Arity(String functionName, int minNumOfArgs, int maxNumOfArgs, boolean takesKeywordArgs, boolean takesVarArgs, List<String> parameterIds, List<String> keywordNames) {
         this.functionName = functionName;
         this.minNumOfArgs = minNumOfArgs;
         this.maxNumOfArgs = maxNumOfArgs;
-        this.takesKeywordArg = takesKeywordArg;
+        this.takesKeywordArgs = takesKeywordArgs;
         this.takesVarArgs = takesVarArgs;
         this.parameterIds = parameterIds.toArray(new String[0]);
         this.keywordNames = keywordNames.toArray(new String[0]);
     }
 
-    public Arity(String functionName, int minNumOfArgs, int maxNumOfArgs, boolean takesKeywordArg, boolean takesVarArgs, String[] parameterIds, String[] keywordNames) {
+    public Arity(String functionName, int minNumOfArgs, int maxNumOfArgs, boolean takesKeywordArgs, boolean takesVarArgs, String[] parameterIds, String[] keywordNames) {
         this.functionName = functionName;
         this.minNumOfArgs = minNumOfArgs;
         this.maxNumOfArgs = maxNumOfArgs;
-        this.takesKeywordArg = takesKeywordArg;
+        this.takesKeywordArgs = takesKeywordArgs;
         this.takesVarArgs = takesVarArgs;
         this.parameterIds = parameterIds;
         this.keywordNames = keywordNames;
     }
 
+    public static Arity createOneArgument(String functionName) {
+        return new Arity(functionName, 1, 1, new ArrayList<String>(), new ArrayList<String>());
+    }
+
     public boolean takesVarArgs() {
         return takesVarArgs;
     }
 
-    public boolean takesKeywordArg() {
-        return takesKeywordArg;
+    public boolean takesKeywordArgs() {
+        return takesKeywordArgs;
     }
 
-    public static Arity createOneArgument(String functionName) {
-        return new Arity(functionName, 1, 1, new ArrayList<String>(), new ArrayList<String>());
+    public boolean takesFixedNumberOfArguments() {
+        if (takesVarArgs || takesKeywordArgs) {
+            return false;
+        } else {
+            return minNumOfArgs == maxNumOfArgs;
+        }
     }
 
     public int getMinNumOfArgs() {
@@ -104,7 +112,7 @@ public String[] getParameterIds() {
         return parameterIds;
     }
 
-    public int parametersSize() {
+    public int getNumberOfParameters() {
         return parameterIds.length;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonTreeTranslator.java

@@ -1631,7 +1631,11 @@ public Object visitLambdef_nocond(Python3Parser.Lambdef_nocondContext ctx) {
     }
 
     private static Arity createArity(String functionName, PNode argBlock) {
-        boolean takesFixedNumOfArgs = true;
+        boolean takesKeywordArgs = false;
+        int maxNumOfArgs = 0;
+        int minNumOfArgs = 0;
+        List<String> parameterIds = new ArrayList<>();
+        List<String> keywordNames = new ArrayList<>();
 
         PNode[] statements;
         if (argBlock instanceof BlockNode) {
@@ -1641,24 +1645,23 @@ private static Arity createArity(String functionName, PNode argBlock) {
         } else {
             statements = new PNode[]{argBlock};
         }
-        int maxNumOfArgs = 0;
-        int minNumOfArgs = 0;
-        List<String> parameterIds = new ArrayList<>();
-        List<String> keywordNames = new ArrayList<>();
+
         for (PNode writeLocal : statements) {
             WriteIdentifierNode writeNode = (WriteIdentifierNode) writeLocal;
             PNode rhs = writeNode.getRhs();
             if (rhs instanceof ReadVarArgsNode) {
                 maxNumOfArgs = -1;
             } else if (rhs instanceof ReadVarKeywordsNode) {
                 maxNumOfArgs = -1;
+                takesKeywordArgs = true;
             } else if (rhs instanceof ReadKeywordNode) {
                 if (((ReadKeywordNode) rhs).canBePositional()) {
                     // this default can be passed positionally
                     maxNumOfArgs++;
+                } else {
+                    takesKeywordArgs = true;
                 }
                 keywordNames.add((String) writeNode.getIdentifier());
-                takesFixedNumOfArgs = false;
             } else if (rhs instanceof ReadIndexedArgumentNode) {
                 minNumOfArgs++;
                 maxNumOfArgs++;
@@ -1668,11 +1671,9 @@ private static Arity createArity(String functionName, PNode argBlock) {
             }
         }
 
-        takesFixedNumOfArgs = takesFixedNumOfArgs && maxNumOfArgs == minNumOfArgs;
         boolean takesVarArgs = maxNumOfArgs == -1;
-        boolean takesKeywordArg = true;
 
-        return new Arity(functionName, minNumOfArgs, maxNumOfArgs, takesKeywordArg, takesVarArgs, parameterIds, keywordNames);
+        return new Arity(functionName, minNumOfArgs, maxNumOfArgs, takesKeywordArgs, takesVarArgs, parameterIds, keywordNames);
     }
 
     @Override