[GR-13548] Allow 'NotImplemented' to be returned in a subscript operation.

PullRequest: graalpython/381

Author: fangerer

graalpython/com.oracle.graal.python.test/src/tests/test_tuple.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2019, Oracle and/or its affiliates.
 # Copyright (C) 1996-2017 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -219,6 +219,10 @@ def __index__(self):
                 return 1.0;
 
         raiseTypeError(t, IndexF())
+        
+        t = (NotImplemented,)
+        self.assertEqual(t[0], NotImplemented)
+
 
 # Tests for Truffle specializations
     def test_lying_tuple(self):

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/call/special/LookupAndCallBinaryNode.java

@@ -270,20 +270,14 @@ boolean callBoolean(double left, double right,
     Object callObject(Object left, Object right,
                     @Cached("create(name)") LookupInheritedAttributeNode getattr) {
         Object leftCallable = getattr.execute(left);
-        Object result;
         if (leftCallable == PNone.NO_VALUE) {
-            result = PNotImplemented.NOT_IMPLEMENTED;
-        } else {
-            result = ensureDispatch().executeObject(leftCallable, left, right);
-        }
-        if (handlerFactory != null && result == PNotImplemented.NOT_IMPLEMENTED) {
-            if (handler == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                handler = insert(handlerFactory.get());
+            if (handlerFactory != null) {
+                return runErrorHandler(left, right);
+            } else {
+                return PNotImplemented.NOT_IMPLEMENTED;
             }
-            return handler.execute(left, right);
         }
-        return result;
+        return ensureDispatch().executeObject(leftCallable, left, right);
     }
 
     @Specialization(guards = "isReversible()")
@@ -319,12 +313,16 @@ Object callObject(Object left, Object right,
             result = ensureReverseDispatch().executeObject(rightCallable, right, left);
         }
         if (handlerFactory != null && result == PNotImplemented.NOT_IMPLEMENTED) {
-            if (handler == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                handler = insert(handlerFactory.get());
-            }
-            return handler.execute(left, right);
+            return runErrorHandler(left, right);
         }
         return result;
     }
+
+    private Object runErrorHandler(Object left, Object right) {
+        if (handler == null) {
+            CompilerDirectives.transferToInterpreterAndInvalidate();
+            handler = insert(handlerFactory.get());
+        }
+        return handler.execute(left, right);
+    }
 }