refactoring move factory methods to beginning of FrozenSetBuiltins nodes

- add dict_items view unittest

Author: cosminbasca

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

@@ -322,11 +322,11 @@ def test_dictview_set_operations_on_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)}
+    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/objects/set/FrozenSetBuiltins.java

@@ -133,6 +133,14 @@ Object run(PBaseSet self, PBaseSet other) {
     abstract static class AndNode extends PythonBinaryBuiltinNode {
         @Child private HashingStorageNodes.IntersectNode intersectNode;
 
+        private HashingStorageNodes.IntersectNode getIntersectNode() {
+            if (intersectNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                intersectNode = insert(HashingStorageNodes.IntersectNode.create());
+            }
+            return intersectNode;
+        }
+
         @Specialization
         PBaseSet doPBaseSet(PSet left, PBaseSet right) {
             HashingStorage intersectedStorage = getIntersectNode().execute(left.getDictStorage(), right.getDictStorage());
@@ -144,14 +152,6 @@ PBaseSet doPBaseSet(PFrozenSet left, PBaseSet right) {
             HashingStorage intersectedStorage = getIntersectNode().execute(left.getDictStorage(), right.getDictStorage());
             return factory().createFrozenSet(intersectedStorage);
         }
-
-        private HashingStorageNodes.IntersectNode getIntersectNode() {
-            if (intersectNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                intersectNode = insert(HashingStorageNodes.IntersectNode.create());
-            }
-            return intersectNode;
-        }
     }
 
     @Builtin(name = __SUB__, fixedNumOfArguments = 2)
@@ -198,6 +198,22 @@ abstract static class UnionNode extends PythonBuiltinNode {
 
         @CompilationFinal private ValueProfile setTypeProfile;
 
+        private BinaryUnionNode getBinaryUnionNode() {
+            if (binaryUnionNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                binaryUnionNode = insert(BinaryUnionNode.create());
+            }
+            return binaryUnionNode;
+        }
+
+        private ValueProfile getSetTypeProfile() {
+            if (setTypeProfile == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                setTypeProfile = ValueProfile.createClassProfile();
+            }
+            return setTypeProfile;
+        }
+
         @Specialization(guards = {"args.length == len", "args.length < 32"}, limit = "3")
         PBaseSet doCached(PBaseSet self, Object[] args,
                         @Cached("args.length") int len,
@@ -225,30 +241,21 @@ private PBaseSet create(PBaseSet left, HashingStorage storage) {
             }
             return factory().createSet(storage);
         }
-
-        private BinaryUnionNode getBinaryUnionNode() {
-            if (binaryUnionNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                binaryUnionNode = insert(BinaryUnionNode.create());
-            }
-            return binaryUnionNode;
-        }
-
-        private ValueProfile getSetTypeProfile() {
-            if (setTypeProfile == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                setTypeProfile = ValueProfile.createClassProfile();
-            }
-            return setTypeProfile;
-        }
-
     }
 
     abstract static class BinaryUnionNode extends PBaseNode {
         @Child private Equivalence equivalenceNode;
 
         public abstract PBaseSet execute(PBaseSet container, HashingStorage left, Object right);
 
+        protected Equivalence getEquivalence() {
+            if (equivalenceNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                equivalenceNode = insert(new PythonEquivalence());
+            }
+            return equivalenceNode;
+        }
+
         @Specialization
         PBaseSet doHashingCollection(PBaseSet container, EconomicMapStorage selfStorage, PHashingCollection other) {
             for (Object key : other.getDictStorage().keys()) {
@@ -277,14 +284,6 @@ PBaseSet doIterable(PBaseSet container, HashingStorage dictStorage, Object itera
             }
         }
 
-        protected Equivalence getEquivalence() {
-            if (equivalenceNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                equivalenceNode = insert(new PythonEquivalence());
-            }
-            return equivalenceNode;
-        }
-
         public static BinaryUnionNode create() {
             return BinaryUnionNodeGen.create();
         }