track nonlocals vars as cells

cosminbasca · cosminbasca · commit 91e116e85928 · 2018-07-04T18:29:31.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/ScopeTranslator.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/ScopeTranslator.java
@@ -225,7 +225,11 @@ public T visitGlobal_stmt(Python3Parser.Global_stmtContext ctx) {
     @Override
     public T visitNonlocal_stmt(Python3Parser.Nonlocal_stmtContext ctx) {
         for (TerminalNode name : ctx.NAME()) {
-            environment.addNonlocal(name.getText());
+            String identifier = name.getText();
+            environment.addNonlocal(identifier);
+            if (trackCells) {
+                environment.registerCellVariable(identifier);
+            }
         }
         return super.visitNonlocal_stmt(ctx);
     }

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,11 @@ public T visitGlobal_stmt(Python3Parser.Global_stmtContext ctx) {`
`225`	`225`	`@Override`
`226`	`226`	`public T visitNonlocal_stmt(Python3Parser.Nonlocal_stmtContext ctx) {`
`227`	`227`	`for (TerminalNode name : ctx.NAME()) {`
`228`		`- environment.addNonlocal(name.getText());`
	`228`	`+ String identifier = name.getText();`
	`229`	`+ environment.addNonlocal(identifier);`
	`230`	`+ if (trackCells) {`
	`231`	`+ environment.registerCellVariable(identifier);`
	`232`	`+ }`
`229`	`233`	`}`
`230`	`234`	`return super.visitNonlocal_stmt(ctx);`
`231`	`235`	`}`