ScopeInfo: getter for explicitNonlocalVariables

Author: cosminbasca

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

@@ -72,6 +72,7 @@ public class ScopeEnvironment implements CellFrameSlotSupplier {
 
     public static String CLASS_VAR_PREFIX = "<>class";
     public static String LAMBDA_NAME = "lambda";
+    public static int CLASS_VAR_PREFIX_IDX = CLASS_VAR_PREFIX.length();
 
     private final NodeFactory factory;
 
@@ -116,21 +117,21 @@ public ScopeInfo popScope() {
                 String name = identifier instanceof String ? (String) identifier : identifier.toString();
 
                 if (localySeenVars != null) {
-                    // remove the localy declared variable
+                    // remove the locally declared variable
                     if (definingScopeKind == ScopeInfo.ScopeKind.Class && name.startsWith(CLASS_VAR_PREFIX)) {
-                        localySeenVars.remove(name.substring(7));
+                        localySeenVars.remove(name.substring(CLASS_VAR_PREFIX_IDX));
                     } else {
                         localySeenVars.remove(name);
                     }
                 }
 
                 List<ScopeInfo> usedInScopes = unresolvedVars.get(name);
-                // was the declared varibale seen before?
+                // was the declared variable seen before?
                 if (usedInScopes != null && !(definingScopeKind == ScopeInfo.ScopeKind.Module && definingScope.findFrameSlot(name) != null)) {
-                    // make the varible freevar and cellvar in scopes, where is used
+                    // make the variable freevar and cellvar in scopes, where is used
                     List<ScopeInfo> copy = new ArrayList<>(usedInScopes);
                     for (ScopeInfo scope : copy) {
-                        // we need to find out, whether the scope is a under the defing scope
+                        // we need to find out, whether the scope is a under the defining scope
                         ScopeInfo tmpScope = scope;
                         ScopeInfo parentDefiningScope = definingScope.getParent();
                         while (tmpScope != null && tmpScope != definingScope && tmpScope != parentDefiningScope) {
@@ -177,13 +178,13 @@ public ScopeInfo popScope() {
                 String name = (String) identifier;
                 if (name.startsWith(CLASS_VAR_PREFIX)) {
                     definingScope.getFrameDescriptor().removeFrameSlot(identifier);
-                    name = name.substring(7);
+                    name = name.substring(CLASS_VAR_PREFIX_IDX);
                     definingScope.createSlotIfNotPresent(name);
                     copy = true;
                 }
             }
             if (copy) {
-                // we copy it because the idexes are now wrong due the issue GR-17984
+                // we copy it because the indexes are now wrong due the issue GR-17984
                 definingScope.setFrameDescriptor(definingScope.getFrameDescriptor().copy());
             }
         }

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

@@ -204,6 +204,10 @@ public boolean isExplicitNonlocalVariable(String identifier) {
         return explicitNonlocalVariables != null && explicitNonlocalVariables.contains(identifier);
     }
 
+    public Set<String> getExplicitNonlocalVariables() {
+        return explicitNonlocalVariables;
+    }
+
     public void addCellVar(String identifier) {
         addCellVar(identifier, false);
     }
@@ -218,10 +222,6 @@ public void addCellVar(String identifier, boolean createFrameSlot) {
         }
     }
 
-    public void addFreeVar(String identifier) {
-        addFreeVar(identifier, false);
-    }
-
     public void addFreeVar(String identifier, boolean createFrameSlot) {
         if (freeVars == null) {
             freeVars = new TreeSet<>();