[GR-13750] Cells in the class scope should still end up in the namespace

PullRequest: graalpython/397

Author: timfel

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 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
@@ -906,3 +906,29 @@ def my_obj():
 
     assert set(my_obj.__code__.co_cellvars) == set()
     assert set(my_obj.__code__.co_freevars) == {'my_obj', 'y'}
+
+
+def test_classbody_scope():
+    class A():
+        ranges = [(1, 10)]
+
+        class B():
+            ranges = [(2, 12)]
+
+        class C():
+            ranges = [ ]
+
+            class CA():
+                ranges = [(3, 13)]
+
+        locs = locals()
+
+        class D(B, C):
+            pass
+
+
+    A.C.ranges = (A.C.CA.ranges)
+    assert A.C.ranges == A.C.CA.ranges == [(3, 13)]
+    locs = list(A.locs.keys())
+    for k in ["__module__", "__qualname__", "ranges", "B", "C", "locs", "D"]:
+        assert k in locs, locs

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/frame/FrameBuiltins.java

@@ -41,6 +41,7 @@
 import com.oracle.graal.python.builtins.objects.object.ObjectBuiltinsFactory.DictNodeFactory;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.traceback.PTraceback;
+import com.oracle.graal.python.nodes.function.ClassBodyRootNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
@@ -171,7 +172,13 @@ Object getFromFrame(Frame owner,
                         @Cached("create()") BranchProfile noFrameOnPFrame) {
             PFrame pFrame = PArguments.getPFrame(owner);
             if (noPFrame.profile(pFrame == null)) {
-                pFrame = factory().createPFrame(owner);
+                Object specialArgument = PArguments.getSpecialArgument(owner);
+                if (specialArgument instanceof ClassBodyRootNode) {
+                    // the namespace argument stores the locals
+                    pFrame = factory().createPFrame(owner, PArguments.getArgument(owner, 0));
+                } else {
+                    pFrame = factory().createPFrame(owner);
+                }
                 PArguments.setPFrame(owner, pFrame);
             } else if (!pFrame.hasFrame()) {
                 noFrameOnPFrame.enter();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/ClassDefinitionEpilogNode.java renamed to graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/ClassDefinitionPrologueNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -50,18 +50,18 @@
 import com.oracle.graal.python.nodes.subscript.SetItemIfNotPresentNode;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-public class ClassDefinitionEpilogNode extends StatementNode {
+public class ClassDefinitionPrologueNode extends StatementNode {
     @Child private ReadGlobalOrBuiltinNode readGlobalNameNode = ReadGlobalOrBuiltinNode.create(__NAME__);
     @Child private ReadIndexedArgumentNode readPrimaryArgNode = ReadIndexedArgumentNode.create(0);
     @Child private SetItemIfNotPresentNode setItemIfNotPresentNode = SetItemIfNotPresentNode.create();
 
     private final String qualName;
 
-    public ClassDefinitionEpilogNode() {
+    public ClassDefinitionPrologueNode() {
         this(null);
     }
 
-    public ClassDefinitionEpilogNode(String qualName) {
+    public ClassDefinitionPrologueNode(String qualName) {
         this.qualName = qualName;
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/classes/ReadClassAttributeNode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -47,6 +47,7 @@
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.nodes.frame.ReadLocalNode;
 import com.oracle.graal.python.nodes.frame.ReadNode;
+import com.oracle.graal.python.nodes.frame.WriteNode;
 import com.oracle.graal.python.nodes.statement.StatementNode;
 import com.oracle.graal.python.nodes.subscript.GetItemNode;
 import com.oracle.graal.python.runtime.exception.PException;
@@ -94,14 +95,12 @@ public StatementNode makeDeleteNode() {
 
     @Override
     public StatementNode makeWriteNode(ExpressionNode rhs) {
-        ExpressionNode right = rhs;
         // freevars pass through the special Class scope
         if (readCellLocal != null && !isFreeVar) {
-            // TODO (tfel): Is this what's intended?
-            return ((ReadNode) readCellLocal).makeWriteNode(rhs);
+            return new WriteClassAttributeCellNode((ReadNode) readCellLocal, (ReadNode) getNsItem, rhs);
         } else {
             // assignments always got to the innermost scope
-            return ((ReadNode) getNsItem).makeWriteNode(right);
+            return ((ReadNode) getNsItem).makeWriteNode(rhs);
         }
     }
 
@@ -132,4 +131,31 @@ Object read(VirtualFrame frame,
             return readGlobal.execute(frame);
         }
     }
+
+    private static class WriteClassAttributeCellNode extends StatementNode implements WriteNode {
+        @Child private WriteNode writeCellLocal;
+        @Child private WriteNode writeNsItem;
+        @Child private ExpressionNode right;
+
+        WriteClassAttributeCellNode(ReadNode readCellLocal, ReadNode getNsItem, ExpressionNode rhs) {
+            writeCellLocal = (WriteNode) readCellLocal.makeWriteNode(null);
+            writeNsItem = (WriteNode) getNsItem.makeWriteNode(null);
+            right = rhs;
+        }
+
+        public ExpressionNode getRhs() {
+            return right;
+        }
+
+        public void doWrite(VirtualFrame frame, Object value) {
+            writeCellLocal.doWrite(frame, value);
+            writeNsItem.doWrite(frame, value);
+        }
+
+        @Override
+        public void executeVoid(VirtualFrame frame) {
+            Object value = right.execute(frame);
+            doWrite(frame, value);
+        }
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/PythonTreeTranslator.java

@@ -59,7 +59,7 @@
 import com.oracle.graal.python.nodes.argument.ReadDefaultArgumentNode;
 import com.oracle.graal.python.nodes.attributes.GetAttributeNode;
 import com.oracle.graal.python.nodes.call.PythonCallNode;
-import com.oracle.graal.python.nodes.classes.ClassDefinitionEpilogNode;
+import com.oracle.graal.python.nodes.classes.ClassDefinitionPrologueNode;
 import com.oracle.graal.python.nodes.control.BlockNode;
 import com.oracle.graal.python.nodes.control.ForNode;
 import com.oracle.graal.python.nodes.control.GetIteratorNode;
@@ -1855,7 +1855,7 @@ protected ExpressionNode asClassBody(Object accept, String qualName) {
             environment.createLocal(__DOC__);
             body.set(0, environment.findVariable(__DOC__).makeWriteNode((ExpressionNode) body.get(0)));
         }
-        body.add(new ClassDefinitionEpilogNode(qualName));
+        body.add(0, new ClassDefinitionPrologueNode(qualName));
         return new ReturnTargetNode(asBlock(body), factory.createNullLiteral());
     }