fix rebase name conflict

cosminbasca · cosminbasca · commit c00d9cd2fa94 · 2018-07-04T18:32:33.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
@@ -228,7 +228,7 @@ public T visitNonlocal_stmt(Python3Parser.Nonlocal_stmtContext ctx) {
             String identifier = name.getText();
             environment.addNonlocal(identifier);
             if (trackCells) {
-                environment.registerCellVariable(identifier);
+                environment.registerCell(identifier);
             }
         }
         return super.visitNonlocal_stmt(ctx);

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ public T visitNonlocal_stmt(Python3Parser.Nonlocal_stmtContext ctx) {`
`228`	`228`	`String identifier = name.getText();`
`229`	`229`	`environment.addNonlocal(identifier);`
`230`	`230`	`if (trackCells) {`
`231`		`- environment.registerCellVariable(identifier);`
	`231`	`+ environment.registerCell(identifier);`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`	`return super.visitNonlocal_stmt(ctx);`