Add operator.eq and operator.getitem method with test case. Change truffle.Loop.execute to Loop.executeLoop

Author: Franziska Geiger

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

@@ -0,0 +1,62 @@
+# Copyright (c) 2019, 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.
+import operator
+import unittest
+
+class OperatorTest(unittest.TestCase):
+
+    def test_eq(self):
+        class C(object):
+            def __eq__(self, other):
+                raise SyntaxError
+        self.assertRaises(TypeError, operator.eq)
+        self.assertRaises(SyntaxError, operator.eq, C(), C())
+        self.assertFalse(operator.eq(1, 0))
+        self.assertFalse(operator.eq(1, 0.0))
+        self.assertTrue(operator.eq(1, 1))
+        self.assertTrue(operator.eq(1, 1.0))
+        self.assertFalse(operator.eq(1, 2))
+        self.assertFalse(operator.eq(1, 2.0))
+
+
+    def test_getitem(self):
+        a = range(10)
+        self.assertRaises(TypeError, operator.getitem)
+        self.assertRaises(TypeError, operator.getitem, a, None)
+        self.assertEqual(operator.getitem(a, 2), 2)

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

@@ -48,15 +48,20 @@
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
+import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
+import com.oracle.graal.python.nodes.expression.BinaryComparisonNode;
 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.truffle.PythonArithmeticTypes;
+import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
+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.NodeFactory;
@@ -136,6 +141,79 @@ public boolean doObject(VirtualFrame frame, Object value) {
         }
     }
 
+    @Builtin(name = "eq", minNumOfPositionalArgs = 2)
+    @TypeSystemReference(PythonArithmeticTypes.class)
+    @GenerateNodeFactory
+    public abstract static class EqualsNode extends PythonBinaryBuiltinNode {
+
+        @Specialization
+        public boolean doBoolean(boolean value1, boolean value2) {
+            return value1 == value2;
+        }
+
+        @Specialization
+        public boolean doNone(@SuppressWarnings("unused") PNone value1, @SuppressWarnings("unused") PNone value2) {
+            return true;
+        }
+
+        @Specialization
+        public boolean doInt(long value1, long value2) {
+            return value1 == value2;
+        }
+
+        @Specialization
+        @TruffleBoundary
+        public boolean doPInt(PInt value1, PInt value2) {
+            return value1.getValue().equals(value2.getValue());
+        }
+
+        @Specialization
+        public boolean doDouble(double value1, double value2) {
+            return value1 == value2;
+        }
+
+        @Specialization
+        public boolean doString(String value1, String value2) {
+            return value1.equals(value2);
+        }
+
+        private @Child BinaryComparisonNode equalsNode;
+
+        @Fallback
+        public boolean doObject(VirtualFrame frame, Object value1, Object value2) {
+            if (value1 == value2) {
+                return true;
+            }
+            if (equalsNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                equalsNode = insert((BinaryComparisonNode.create(SpecialMethodNames.__EQ__, SpecialMethodNames.__EQ__, "==")));
+            }
+            return equalsNode.executeBool(frame, value1, value2);
+        }
+    }
+
+    @Builtin(name = "getitem", minNumOfPositionalArgs = 2)
+    @TypeSystemReference(PythonArithmeticTypes.class)
+    @GenerateNodeFactory
+    public abstract static class GetItemNode extends PythonBinaryBuiltinNode {
+
+        @Specialization
+        public Object doDict(PDict dict, Object item) {
+            return dict.getItem(item);
+        }
+
+        @Specialization
+        public Object doSequence(PSequence value, Object index,
+                        @Cached("create()") SequenceStorageNodes.GetItemNode getItemNode) {
+            return getItemNode.execute(value.getSequenceStorage(), index);
+        }
+
+        @Fallback
+        public Object doObject(@SuppressWarnings("unused") Object value, @SuppressWarnings("unused") Object index) {
+            return PNone.NONE;
+        }
+    }
+
     // _compare_digest
     @Builtin(name = "_compare_digest", minNumOfPositionalArgs = 2)
     @TypeSystemReference(PythonArithmeticTypes.class)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/ForNode.java

@@ -185,7 +185,7 @@ public void executeVoid(VirtualFrame frame) {
         }
         frame.setObject(iteratorSlot, iterator.execute(frame));
         try {
-            loopNode.execute(frame);
+            loopNode.executeLoop(frame);
         } finally {
             frame.setObject(iteratorSlot, null);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/control/WhileNode.java

@@ -81,6 +81,6 @@ public CastToBooleanNode getCondition() {
 
     @Override
     public void executeVoid(VirtualFrame frame) {
-        loopNode.execute(frame);
+        loopNode.executeLoop(frame);
     }
 }