add support for dictview(keys / items) set operations

- consolidated DictView/Items builtins support

Author: cosminbasca

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

@@ -289,3 +289,35 @@ def test_create_seq_and_kw():
     d = dict(dict(a=1, b=2, c=3), d=4)
     for k in ['a', 'b', 'c', 'd']:
         assert k in d
+
+
+def test_dictview_set_operations_on_keys():
+    k1 = {1: 1, 2: 2}.keys()
+    k2 = {1: 1, 2: 2, 3: 3}.keys()
+    k3 = {4: 4}.keys()
+
+    assert k1 - k2 == set()
+    assert k1 - k3 == {1, 2}
+    assert k2 - k1 == {3}
+    assert k3 - k1 == {4}
+    assert k1 & k2 == {1, 2}
+    assert k1 & k3 == set()
+    assert k1 | k2 == {1, 2, 3}
+    assert k1 ^ k2 == {3}
+    assert k1 ^ k3 == {1, 2, 4}
+
+
+def test_dictview_set_operations_on_items():
+    k1 = {1: 1, 2: 2}.items()
+    k2 = {1: 1, 2: 2, 3: 3}.items()
+    k3 = {4: 4}.items()
+
+    assert k1 - k2 == set()
+    # assert k1 - k3 == {(1, 1), (2, 2)}
+    # assert k2 - k1 == {(3, 3)}
+    # assert k3 - k1 == {(4, 4)}
+    # assert k1 & k2 == {(1, 1), (2, 2)}
+    # assert k1 & k3 == set()
+    # assert k1 | k2 == {(1, 1), (2, 2), (3, 3)}
+    # assert k1 ^ k2 == {(3, 3)}
+    # assert k1 ^ k3 == {(1, 1), (2, 2), (4, 4)}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -82,12 +82,11 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorage.DictEntry;
 import com.oracle.graal.python.builtins.objects.complex.ComplexBuiltins;
 import com.oracle.graal.python.builtins.objects.dict.DictBuiltins;
-import com.oracle.graal.python.builtins.objects.dict.DictItemsBuiltins;
 import com.oracle.graal.python.builtins.objects.dict.DictItemsIteratorBuiltins;
-import com.oracle.graal.python.builtins.objects.dict.DictKeysBuiltins;
 import com.oracle.graal.python.builtins.objects.dict.DictKeysIteratorBuiltins;
 import com.oracle.graal.python.builtins.objects.dict.DictValuesBuiltins;
 import com.oracle.graal.python.builtins.objects.dict.DictValuesIteratorBuiltins;
+import com.oracle.graal.python.builtins.objects.dict.DictViewBuiltins;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.enumerate.EnumerateBuiltins;
 import com.oracle.graal.python.builtins.objects.exception.BaseExceptionBuiltins;
@@ -216,11 +215,10 @@ public final class Python3Core implements PythonCore {
                     new TruffleObjectBuiltins(),
                     new ListBuiltins(),
                     new DictBuiltins(),
-                    new DictKeysBuiltins(),
-                    new DictKeysIteratorBuiltins(),
+                    new DictViewBuiltins(),
                     new DictValuesBuiltins(),
+                    new DictKeysIteratorBuiltins(),
                     new DictValuesIteratorBuiltins(),
-                    new DictItemsBuiltins(),
                     new DictItemsIteratorBuiltins(),
                     new RangeBuiltins(),
                     new SliceBuiltins(),

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/HashingStorageNodes.java

@@ -1277,6 +1277,41 @@ public static UnionNode create() {
         }
     }
 
+    public static class ExclusiveOrNode extends Node {
+        @Child private ContainsKeyNode containsKeyNode;
+        @Child private SetItemNode setItemNode;
+
+        public HashingStorage execute(HashingStorage left, HashingStorage right) {
+            EconomicMapStorage newStorage = EconomicMapStorage.create(false);
+            if (left.length() != 0 && right.length() != 0) {
+                if (containsKeyNode == null) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    containsKeyNode = insert(ContainsKeyNode.create());
+                }
+                if (setItemNode == null) {
+                    CompilerDirectives.transferToInterpreterAndInvalidate();
+                    setItemNode = insert(SetItemNode.create());
+                }
+
+                for (Object leftKey : left.keys()) {
+                    if (!containsKeyNode.execute(right, leftKey)) {
+                        setItemNode.execute(null, newStorage, leftKey, PNone.NO_VALUE);
+                    }
+                }
+                for (Object rightKey : right.keys()) {
+                    if (!containsKeyNode.execute(left, rightKey)) {
+                        setItemNode.execute(null, newStorage, rightKey, PNone.NO_VALUE);
+                    }
+                }
+            }
+            return newStorage;
+        }
+
+        public static ExclusiveOrNode create() {
+            return new ExclusiveOrNode();
+        }
+    }
+
     public abstract static class DiffNode extends DictStorageBaseNode {
 
         public abstract HashingStorage execute(HashingStorage left, HashingStorage right);