[GR-10787][GR-10789] add dictview keys and items set operations

PullRequest: graalpython/113

Author: cosminbasca

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

@@ -119,6 +119,7 @@ def test_init():
 
     assert_raises(TypeError, dict.fromkeys, 10)
 
+
 def test_init1():
     try:
         dict([("a", 1), ("b", 2)], [("c", 3), ("d", 4)])
@@ -150,17 +151,22 @@ def test_init4():
     d = dict(pairs)
     assert len(d) == 100000, "invalid length, expected 100.000 but was %d".format(len(d))
 
+
 def test_init5():
     key_set = { 'a', 'b', 'c', 'd' }
+
     class CustomMappingObject:
         def __init__(self, keys):
             self.__keys = keys
+
         def keys(self):
             return self.__keys
+
         def __getitem__(self, key):
             if key in self.__keys:
                 return ord(key)
             raise KeyError(key)
+
         def __len__(self):
             return len(self.keys)
     d = dict(CustomMappingObject(key_set))
@@ -173,8 +179,10 @@ def test_custom_key_object0():
     class CollisionKey:
         def __init__(self, val):
             self.val = val
+
         def __hash__(self):
             return 1234
+
         def __eq__(self, other):
             if type(other) == type(self):
                 return self.val == other.val
@@ -240,6 +248,7 @@ def modifying(**kwargs):
         kwargs["a"] = 10
         kwargs["b"] = 20
         return kwargs
+
     def reading(**kwargs):
         assert kwargs["a"] == 1
         assert kwargs["b"] == 2
@@ -258,20 +267,20 @@ class Foo:
     obj = Foo()
     d = obj.__dict__
     for i in range(200):
-        attrName = "method" + str(i)
-        d[attrName] = lambda: attrName
+        attr_name = "method" + str(i)
+        d[attr_name] = lambda: attr_name
 
     for i in range(200):
-        attrName = "method" + str(i)
-        method_to_call = getattr(obj, attrName)
-        assert method_to_call() == attrName
+        attr_name = "method" + str(i)
+        method_to_call = getattr(obj, attr_name)
+        assert method_to_call() == attr_name
 
 
 def test_get_default():
     d = {"a": 1}
     assert d.get("a") == 1
     assert d.get("a", 2) == 1
-    assert d.get("b") == None
+    assert d.get("b") is None
     assert d.get("b", 2) == 2
 
 
@@ -289,3 +298,48 @@ 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)}
+
+
+def test_dictview_mixed_set_operations():
+    # Just a few for .keys()
+    assert {1: 1}.keys() == {1}
+    assert {1} == {1: 1}.keys()
+    assert {1: 1}.keys() | {2} == {1, 2}
+    assert {2} | {1: 1}.keys() == {1, 2}
+    # And a few for .items()
+    assert {1: 1}.items() == {(1, 1)}
+    assert {(1, 1)} == {1: 1}.items()
+    assert {1: 1}.items() | {2} == {(1, 1), 2}
+    assert {2} | {1: 1}.items() == {(1, 1), 2}

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

@@ -57,20 +57,32 @@ def check_pass_thru():
     yield 1
 
 
-def test_set_or():
+def test_set_or_union():
     s1 = {1, 2, 3}
     s2 = {4, 5, 6}
     s3 = {1, 2, 4}
     s4 = {1, 2, 3}
 
-    union = s1 | s2
-    assert union == {1, 2, 3, 4, 5, 6}
+    or_result = s1 | s2
+    union_result = s1.union(s2)
+    assert or_result == {1, 2, 3, 4, 5, 6}
+    assert union_result == {1, 2, 3, 4, 5, 6}
 
-    union = s1 | s3
-    assert union == {1, 2, 3, 4}
+    or_result = s1 | s3
+    union_result = s1.union(s3)
+    assert or_result == {1, 2, 3, 4}
+    assert union_result == {1, 2, 3, 4}
 
-    union = s1 | s4
-    assert union == {1, 2, 3}
+    or_result = s1 | s4
+    union_result = s1.union(s4)
+    assert or_result == {1, 2, 3}
+    assert union_result == {1, 2, 3}
+
+
+def test_set_union():
+    assert {1, 2, 3}.union({1: 'a', 2: 'b', 4: 'd'}) == {1, 2, 3, 4}
+    assert {1, 2, 3}.union([2, 3, 4, 5]) == {1, 2, 3, 4, 5}
+    assert {1, 2, 3}.union((3, 4, 5, 6)) == {1, 2, 3, 4, 5, 6}
 
 
 def test_set_remove():

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(),