Fix error handling in str.format_map

Author: msimacek

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

@@ -57,13 +57,17 @@
 import com.oracle.graal.python.builtins.objects.dict.DictBuiltins;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
+import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
 import com.oracle.graal.python.lib.PyNumberIndexNode;
+import com.oracle.graal.python.nodes.ErrorMessages;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
-import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
+import com.oracle.graal.python.nodes.call.special.CallBinaryMethodNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
+import com.oracle.graal.python.nodes.call.special.LookupSpecialMethodSlotNode;
 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.PythonUnaryBuiltinNode;
+import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.nodes.util.CannotCastException;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
@@ -73,6 +77,7 @@
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
@@ -152,8 +157,8 @@ public boolean doObject(VirtualFrame frame, Object value) {
     }
 
     @Builtin(name = "getitem", minNumOfPositionalArgs = 2)
-    @TypeSystemReference(PythonArithmeticTypes.class)
     @GenerateNodeFactory
+    @ImportStatic(SpecialMethodSlot.class)
     public abstract static class GetItemNode extends PythonBinaryBuiltinNode {
 
         @Specialization
@@ -162,17 +167,23 @@ public static Object doDict(VirtualFrame frame, PDict dict, Object item,
             return getItem.execute(frame, dict, item);
         }
 
-        @Specialization
+        @Specialization(guards = "!isPString(value)")
         public static Object doSequence(VirtualFrame frame, PSequence value, Object index,
                         @Cached SequenceNodes.GetSequenceStorageNode getStorage,
                         @Cached SequenceStorageNodes.GetItemNode getItemNode) {
             return getItemNode.execute(frame, getStorage.execute(value), index);
         }
 
         @Specialization
-        public static Object doObject(VirtualFrame frame, Object value, Object index,
-                        @Cached("create(__GETITEM__)") LookupAndCallBinaryNode getItemNode) {
-            return getItemNode.executeObject(frame, value, index);
+        public Object doObject(VirtualFrame frame, Object value, Object index,
+                        @Cached GetClassNode getClassNode,
+                        @Cached(parameters = "GetItem") LookupSpecialMethodSlotNode lookupGetItem,
+                        @Cached CallBinaryMethodNode callGetItem) {
+            Object method = lookupGetItem.execute(frame, getClassNode.execute(value), value);
+            if (method == PNone.NO_VALUE) {
+                throw raise(TypeError, ErrorMessages.OBJ_NOT_SUBSCRIPTABLE, value);
+            }
+            return callGetItem.executeObject(frame, method, value, index);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -29,8 +29,6 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.FORMAT;
 import static com.oracle.graal.python.nodes.BuiltinNames.FORMAT_MAP;
 import static com.oracle.graal.python.nodes.ErrorMessages.ENCODER_RETURNED_P_INSTEAD_OF_BYTES;
-import static com.oracle.graal.python.nodes.ErrorMessages.OBJ_NOT_SUBSCRIPTABLE;
-import static com.oracle.graal.python.nodes.ErrorMessages.TAKES_EXACTLY_S_ARGUMENTS_D_GIVEN;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ADD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__CONTAINS__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__EQ__;
@@ -107,7 +105,6 @@
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsSameTypeNode;
-import com.oracle.graal.python.lib.PyMappingCheckNode;
 import com.oracle.graal.python.lib.PyNumberAsSizeNode;
 import com.oracle.graal.python.lib.PyObjectHashNode;
 import com.oracle.graal.python.nodes.ErrorMessages;
@@ -260,7 +257,7 @@ String format(VirtualFrame frame, String self, Object[] args, PKeyword[] kwargs,
         }
     }
 
-    @Builtin(name = FORMAT_MAP, minNumOfPositionalArgs = 1, declaresExplicitSelf = true, parameterNames = {"self", "mapping"})
+    @Builtin(name = FORMAT_MAP, minNumOfPositionalArgs = 2, declaresExplicitSelf = true, parameterNames = {"self", "mapping"})
     @ArgumentClinic(name = "self", conversion = ArgumentClinic.ClinicConversion.String)
     @GenerateNodeFactory
     @ImportStatic(SpecialMethodNames.class)
@@ -270,11 +267,10 @@ protected ArgumentClinicProvider getArgumentClinic() {
             return StringBuiltinsClinicProviders.FormatMapNodeClinicProviderGen.INSTANCE;
         }
 
-        @Specialization(guards = "checkMapping.execute(mapping)", limit = "1")
+        @Specialization
         String format(VirtualFrame frame, String self, Object mapping,
                         @Cached BuiltinFunctions.FormatNode format,
-                        @Cached OperatorModuleBuiltins.GetItemNode getItem,
-                        @SuppressWarnings("unused") @Cached PyMappingCheckNode checkMapping) {
+                        @Cached OperatorModuleBuiltins.GetItemNode getItem) {
 
             TemplateFormatter template = new TemplateFormatter(self);
 
@@ -287,19 +283,6 @@ String format(VirtualFrame frame, String self, Object mapping,
                 IndirectCallContext.exit(frame, language, context, state);
             }
         }
-
-        @SuppressWarnings("unused")
-        @Specialization(guards = {"!checkMapping.execute(obj)", "!isNone(obj)"}, limit = "1")
-        String format(String self, Object obj,
-                        @SuppressWarnings("unused") @Cached PyMappingCheckNode checkMapping) {
-            throw raise(TypeError, OBJ_NOT_SUBSCRIPTABLE, obj);
-        }
-
-        @SuppressWarnings("unused")
-        @Specialization(guards = "isNone(obj)")
-        String format(String self, PNone obj) {
-            throw raise(TypeError, TAKES_EXACTLY_S_ARGUMENTS_D_GIVEN, "format_map", "one", 0);
-        }
     }
 
     @Builtin(name = __REPR__, minNumOfPositionalArgs = 1)