TupleGetter: split single specialization into multiple specializations

- minor fixes

Author: cosminbasca

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

@@ -3023,7 +3023,7 @@ Object methodGeneric(@SuppressWarnings("unused") Object cls, Object func, Object
             if (callableCheck.execute(func)) {
                 return factory().createMethod(self, func);
             } else {
-                throw raise(TypeError, ErrorMessages.FIRST_ARG_MUST_BE_CALLABLE, "");
+                throw raise(TypeError, ErrorMessages.FIRST_ARG_MUST_BE_CALLABLE_S, "");
             }
         }
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/dict/DefaultDictBuiltins.java

@@ -40,7 +40,7 @@
  */
 package com.oracle.graal.python.builtins.objects.dict;
 
-import static com.oracle.graal.python.nodes.ErrorMessages.FIRST_ARG_MUST_BE_CALLABLE;
+import static com.oracle.graal.python.nodes.ErrorMessages.FIRST_ARG_MUST_BE_CALLABLE_S;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INIT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__MISSING__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REDUCE__;
@@ -163,7 +163,7 @@ Object doInit(VirtualFrame frame, PDefaultDict self, Object[] args, PKeyword[] k
             if (newArgs.length > 0) {
                 newDefault = newArgs[0];
                 if (newDefault != PNone.NONE && !callableCheckNode.execute(newDefault)) {
-                    throw raise(PythonBuiltinClassType.TypeError, FIRST_ARG_MUST_BE_CALLABLE, " or None");
+                    throw raise(PythonBuiltinClassType.TypeError, FIRST_ARG_MUST_BE_CALLABLE_S, " or None");
                 }
                 newArgs = PythonUtils.arrayCopyOfRange(args, 1, args.length);
             }

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

@@ -43,7 +43,7 @@
 import com.oracle.graal.python.builtins.objects.object.PythonBuiltinObject;
 import com.oracle.truffle.api.object.Shape;
 
-public class PTupleGetter extends PythonBuiltinObject {
+public final class PTupleGetter extends PythonBuiltinObject {
     private final int index;
     private Object doc;
 

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

@@ -58,7 +58,6 @@
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.lib.PyObjectSizeNode;
-import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonBinaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonTernaryBuiltinNode;
@@ -91,24 +90,29 @@ Object reduce(PTupleGetter self,
     @Builtin(name = __GET__, minNumOfPositionalArgs = 2, maxNumOfPositionalArgs = 3)
     @GenerateNodeFactory
     abstract static class TupleGetterGetNode extends PythonTernaryBuiltinNode {
-        @Specialization
-        Object get(VirtualFrame frame, PTupleGetter self, Object instance, @SuppressWarnings("unused") Object owner,
+        @Specialization()
+        Object getTuple(VirtualFrame frame, PTupleGetter self, PTuple instance, @SuppressWarnings("unused") Object owner,
                         @Cached PyObjectSizeNode sizeNode,
                         @Cached TupleBuiltins.GetItemNode getItemNode) {
             final int index = self.getIndex();
-            if (!PGuards.isPTuple(instance)) {
-                if (instance == PNone.NONE) {
-                    return self;
-                }
-                throw raise(PythonBuiltinClassType.TypeError, DESC_FOR_INDEX_S_FOR_S_DOESNT_APPLY_TO_P,
-                                index, "tuple subclasses", instance);
-            }
             if (index >= sizeNode.execute(frame, instance)) {
                 throw raise(PythonBuiltinClassType.IndexError, TUPLE_OUT_OF_BOUNDS);
             }
 
             return getItemNode.execute(frame, instance, index);
         }
+
+        @Specialization
+        Object getNone(@SuppressWarnings("unused") VirtualFrame frame, PTupleGetter self, @SuppressWarnings("unused") PNone instance, @SuppressWarnings("unused") Object owner) {
+            return self;
+        }
+
+        @Specialization(guards = {"!isPTuple(instance)", "!isNone(instance)"})
+        Object getOthers(@SuppressWarnings("unused") VirtualFrame frame, PTupleGetter self, Object instance, @SuppressWarnings("unused") Object owner) {
+            final int index = self.getIndex();
+            throw raise(PythonBuiltinClassType.TypeError, DESC_FOR_INDEX_S_FOR_S_DOESNT_APPLY_TO_P,
+                            index, "tuple subclasses", instance);
+        }
     }
 
     @Builtin(name = __SET__, minNumOfPositionalArgs = 3)
@@ -135,14 +139,12 @@ Object delete(PTupleGetter self, Object instance) {
     @GenerateNodeFactory
     abstract static class TupleGetterDocNode extends PythonBinaryBuiltinNode {
         @Specialization(guards = "!isNoValue(value)")
-        @SuppressWarnings("unused")
         Object set(PTupleGetter self, Object value) {
             self.setDoc(value);
             return PNone.NONE;
         }
 
         @Specialization(guards = "isNoValue(value)")
-        @SuppressWarnings("unused")
         Object get(PTupleGetter self, @SuppressWarnings("unused") PNone value) {
             return self.getDoc();
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java

@@ -260,7 +260,7 @@ public abstract class ErrorMessages {
     public static final String FILL_CHAR_MUST_BE_LENGTH_1 = "The fill character must be exactly one character long";
     public static final String FILTER_SPEC_MUST_BE_DICT = "Filter specifier must be a dict or dict-like object";
     public static final String FILTER_SPECIFIER_MUST_HAVE = "Filter specifier must have an \"id\" entry";
-    public static final String FIRST_ARG_MUST_BE_CALLABLE = "first argument must be callable%s";
+    public static final String FIRST_ARG_MUST_BE_CALLABLE_S = "first argument must be callable%s";
     public static final String FIRST_ARG_MUST_BE_S_OR_TUPLE_NOT_P = "%s first arg must be %s or a tuple of str, not %p";
     public static final String FIRST_TWO_MAKETRANS_ARGS_MUST_HAVE_EQ_LENGTH = "the first two maketrans arguments must have equal length";
     public static final String FLOAT_ARG_REQUIRED = "float argument required, not %p";