[GR-12551] Enable custom locals and inheriting locals during exec

PullRequest: graalpython/285

Author: timfel

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/grammar/TestParserTranslator.java

@@ -76,12 +76,12 @@
 import com.oracle.graal.python.nodes.expression.OrNode;
 import com.oracle.graal.python.nodes.expression.TernaryArithmetic;
 import com.oracle.graal.python.nodes.expression.UnaryArithmetic;
-import com.oracle.graal.python.nodes.frame.DeleteGlobalNode;
+import com.oracle.graal.python.nodes.frame.DeleteNameNode;
 import com.oracle.graal.python.nodes.frame.DestructuringAssignmentNode;
 import com.oracle.graal.python.nodes.frame.FrameSlotIDs;
-import com.oracle.graal.python.nodes.frame.ReadGlobalOrBuiltinNode;
-import com.oracle.graal.python.nodes.frame.WriteGlobalNode;
+import com.oracle.graal.python.nodes.frame.ReadNameNode;
 import com.oracle.graal.python.nodes.frame.WriteLocalVariableNode;
+import com.oracle.graal.python.nodes.frame.WriteNameNode;
 import com.oracle.graal.python.nodes.frame.WriteNode;
 import com.oracle.graal.python.nodes.function.FunctionDefinitionNode;
 import com.oracle.graal.python.nodes.function.GeneratorExpressionNode;
@@ -265,21 +265,21 @@ public void parseLiteralString() {
 
     @Test
     public void parseGlobalVariable() {
-        parseAs("foobar13_ddsA", ReadGlobalOrBuiltinNode.class);
+        parseAs("foobar13_ddsA", ReadNameNode.class);
     }
 
     @Test
     public void parsePropertyAccess() {
         parseAs("foobar13_ddsA.property", GetAttributeNode.class);
         GetAttributeNode anotherProperty = parseAs("foobar13_ddsA.property.anotherProperty", GetAttributeNode.class);
         GetAttributeNode property = assertInstanceOf(anotherProperty.getObject(), GetAttributeNode.class);
-        assertInstanceOf(property.getObject(), ReadGlobalOrBuiltinNode.class);
+        assertInstanceOf(property.getObject(), ReadNameNode.class);
     }
 
     @Test
     public void parseSubscript() {
         GetItemNode node = parseAs("foobar[1]", GetItemNode.class);
-        assertInstanceOf(node.getLeftNode(), ReadGlobalOrBuiltinNode.class);
+        assertInstanceOf(node.getLeftNode(), ReadNameNode.class);
         parseAs("foobar[:]", GetItemNode.class);
         parseAs("foobar[::]", GetItemNode.class);
         parseAs("foobar[1:2:3]", GetItemNode.class);
@@ -312,22 +312,22 @@ public void parseLiteralSpecial() {
 
     @Test
     public void parseDelStatement() {
-        parseAs("del world", DeleteGlobalNode.class);
+        parseAs("del world", DeleteNameNode.class);
         parseAs("del world[0]", DeleteItemNode.class);
         parseAs("del world.field", DeleteAttributeNode.class);
     }
 
     @Test
     public void parseAssignments() {
-        WriteGlobalNode parseAs = parseAs("a = 1", WriteGlobalNode.class);
+        WriteNameNode parseAs = parseAs("a = 1", WriteNameNode.class);
         assertEquals("a", parseAs.getAttributeId());
 
         SetAttributeNode parseAsField = parseAs("a.b = 1", SetAttributeNode.class);
         assertEquals("b", parseAsField.getAttributeId());
 
         parseAs("a[1] = 1", SetItemNode.class);
 
-        parseAs = parseAs("a = 1,2", WriteGlobalNode.class);
+        parseAs = parseAs("a = 1,2", WriteNameNode.class);
         assert parseAs.getRhs() instanceof TupleLiteralNode;
 
         parseAs("a,b = 1,2", DestructuringAssignmentNode.class);
@@ -337,11 +337,11 @@ public void parseAssignments() {
 
     @Test
     public void parseImport() {
-        WriteGlobalNode importSet = parseAs("import foo", WriteGlobalNode.class);
+        WriteNameNode importSet = parseAs("import foo", WriteNameNode.class);
         assertEquals("foo", importSet.getAttributeId());
         assert importSet.getRhs() instanceof ImportNode.ImportExpression;
 
-        importSet = parseAs("import foo as bar", WriteGlobalNode.class);
+        importSet = parseAs("import foo as bar", WriteNameNode.class);
         assertEquals("bar", importSet.getAttributeId());
         assert importSet.getRhs() instanceof ImportNode.ImportExpression;
 
@@ -410,27 +410,27 @@ public void parseBinaryOp() {
 
     @Test
     public void parseFuncdef() {
-        WriteGlobalNode parseAs = parseAs("def fun(): pass", WriteGlobalNode.class);
+        WriteNameNode parseAs = parseAs("def fun(): pass", WriteNameNode.class);
         assertEquals("fun", parseAs.getAttributeId());
         assert parseAs.getRhs() instanceof FunctionDefinitionNode;
 
-        parseAs = parseAs("def fun(a): pass", WriteGlobalNode.class);
+        parseAs = parseAs("def fun(a): pass", WriteNameNode.class);
         assertEquals("fun", parseAs.getAttributeId());
         assert parseAs.getRhs() instanceof FunctionDefinitionNode;
 
-        parseAs = parseAs("def fun(a,b=1): pass", WriteGlobalNode.class);
+        parseAs = parseAs("def fun(a,b=1): pass", WriteNameNode.class);
         assertEquals("fun", parseAs.getAttributeId());
         assert parseAs.getRhs() instanceof FunctionDefinitionNode;
 
-        parseAs = parseAs("def fun(a,b=1,*c): pass", WriteGlobalNode.class);
+        parseAs = parseAs("def fun(a,b=1,*c): pass", WriteNameNode.class);
         assertEquals("fun", parseAs.getAttributeId());
         assert parseAs.getRhs() instanceof FunctionDefinitionNode;
 
-        parseAs = parseAs("def fun(a,b=1,*c,d=2): pass", WriteGlobalNode.class);
+        parseAs = parseAs("def fun(a,b=1,*c,d=2): pass", WriteNameNode.class);
         assertEquals("fun", parseAs.getAttributeId());
         assert parseAs.getRhs() instanceof FunctionDefinitionNode;
 
-        parseAs = parseAs("def fun(a,b=1,*c,d=2,**kwargs): pass", WriteGlobalNode.class);
+        parseAs = parseAs("def fun(a,b=1,*c,d=2,**kwargs): pass", WriteNameNode.class);
         assertEquals("fun", parseAs.getAttributeId());
         assert parseAs.getRhs() instanceof FunctionDefinitionNode;
     }