Adding specializaiton for & and | operations between set, frozenset and a dictview.

Author: ppisl

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

@@ -80,6 +80,12 @@ def test_set_or_union():
     assert or_result == {1, 2, 3}
     assert union_result == {1, 2, 3}
 
+    assert frozenset((1,2)) | {1:2}.items() == {1, 2, (1, 2)}
+    assert frozenset((1,2)) | {1:2}.keys() == {1, 2}
+
+def test_set_and():
+    assert frozenset((1,2)) & {1:2}.items() == set()
+    assert frozenset((1,2)) & {1:2}.keys() == {1}
 
 def test_set_union():
     assert {1, 2, 3}.union({1: 'a', 2: 'b', 4: 'd'}) == {1, 2, 3, 4}

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/set/FrozenSetBuiltins.java

@@ -52,6 +52,7 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes;
 import com.oracle.graal.python.builtins.objects.common.HashingStorageNodes.PythonEquivalence;
 import com.oracle.graal.python.builtins.objects.common.PHashingCollection;
+import com.oracle.graal.python.builtins.objects.dict.PDictView;
 import com.oracle.graal.python.builtins.objects.set.FrozenSetBuiltinsFactory.BinaryUnionNodeGen;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.nodes.PNodeWithContext;
@@ -208,6 +209,22 @@ PBaseSet doPBaseSet(PFrozenSet left, PBaseSet right) {
             return factory().createFrozenSet(intersectedStorage);
         }
 
+        @Specialization
+        PBaseSet doPBaseSet(PSet left, PDictView right,
+                @Cached("create()") SetNodes.ConstructSetNode constructSetNode) {
+            PSet rightSet = constructSetNode.executeWith(right);
+            HashingStorage intersectedStorage = getIntersectNode().execute(left.getDictStorage(), rightSet.getDictStorage());
+            return factory().createSet(intersectedStorage);
+        }
+        
+        @Specialization
+        PBaseSet doPBaseSet(PFrozenSet left, PDictView right,
+                @Cached("create()") SetNodes.ConstructSetNode constructSetNode) {
+            PSet rightSet = constructSetNode.executeWith(right);
+            HashingStorage intersectedStorage = getIntersectNode().execute(left.getDictStorage(), rightSet.getDictStorage());
+            return factory().createSet(intersectedStorage);
+        }
+        
         @Fallback
         Object doAnd(Object self, Object other) {
             throw raise(PythonErrorType.TypeError, "unsupported operand type(s) for &: '%p' and '%p'", self, other);
@@ -267,9 +284,25 @@ PBaseSet doPBaseSet(PFrozenSet left, PBaseSet right) {
             HashingStorage intersectedStorage = getUnionNode().execute(left.getDictStorage(), right.getDictStorage());
             return factory().createFrozenSet(intersectedStorage);
         }
-
+        
+        @Specialization
+        PBaseSet doPBaseSet(PSet left, PDictView right,
+                @Cached("create()") SetNodes.ConstructSetNode constructSetNode) {
+            PSet rightSet = constructSetNode.executeWith(right);
+            HashingStorage intersectedStorage = getUnionNode().execute(left.getDictStorage(), rightSet.getDictStorage());
+            return factory().createSet(intersectedStorage);
+        }
+        
+        @Specialization
+        PBaseSet doPBaseSet(PFrozenSet left, PDictView right,
+                @Cached("create()") SetNodes.ConstructSetNode constructSetNode) {
+            PSet rightSet = constructSetNode.executeWith(right);
+            HashingStorage intersectedStorage = getUnionNode().execute(left.getDictStorage(), rightSet.getDictStorage());
+            return factory().createSet(intersectedStorage);
+        }
+        
         @Fallback
-        Object doAnd(Object self, Object other) {
+        Object doOr(Object self, Object other) {
             throw raise(PythonErrorType.TypeError, "unsupported operand type(s) for |: '%p' and '%p'", self, other);
         }
     }