Rename Variables

Author: rcosta358

liquidjava-verifier/src/main/java/liquidjava/processor/context/Context.java

@@ -12,7 +12,7 @@ public class Context {
     private final List<RefinedVariable> ctxGlobalVars;
 
     private List<GhostFunction> ghosts;
-    private Map<String, List<GhostState>> states;
+    private Map<String, List<GhostState>> classStates;
     private List<AliasWrapper> aliases;
 
     private int counter;
@@ -27,7 +27,7 @@ private Context() {
 
         aliases = new ArrayList<>();
         ghosts = new ArrayList<>();
-        states = new HashMap<>();
+        classStates = new HashMap<>();
         counter = 0;
     }
 
@@ -48,7 +48,7 @@ public void reinitializeAllContext() {
         ctxFunctions = new ArrayList<>();
         aliases = new ArrayList<>();
         ghosts = new ArrayList<>();
-        states = new HashMap<>();
+        classStates = new HashMap<>();
         counter = 0;
     }
 
@@ -323,23 +323,23 @@ public List<GhostFunction> getGhosts() {
     }
 
     public void addGhostClass(String klass) {
-        if (!states.containsKey(klass))
-            states.put(klass, new ArrayList<>());
+        if (!classStates.containsKey(klass))
+            classStates.put(klass, new ArrayList<>());
     }
 
     public void addToGhostClass(String klass, GhostState gs) {
-        List<GhostState> l = states.get(klass);
+        List<GhostState> l = classStates.get(klass);
         if (!l.contains(gs))
             l.add(gs);
     }
 
     public List<GhostState> getGhostState(String s) {
-        return states.get(s);
+        return classStates.get(s);
     }
 
     public List<GhostState> getGhostStates() {
         List<GhostState> lgs = new ArrayList<>();
-        for (List<GhostState> l : states.values())
+        for (List<GhostState> l : classStates.values())
             lgs.addAll(l);
         return lgs;
     }

liquidjava-verifier/src/main/java/liquidjava/processor/context/ContextHistory.java

@@ -12,14 +12,14 @@
 public class ContextHistory {
     private static ContextHistory instance;
 
-    private Map<String, Map<String, Set<RefinedVariable>>> vars; // file -> (scope -> variables in scope)
+    private Map<String, Map<String, Set<RefinedVariable>>> fileScopeVars; // file -> (scope -> variables in scope)
     private Set<RefinedVariable> instanceVars;
     private Set<RefinedVariable> globalVars;
     private Set<GhostState> ghosts;
     private Set<AliasWrapper> aliases;
 
     private ContextHistory() {
-        vars = new HashMap<>();
+        fileScopeVars = new HashMap<>();
         instanceVars = new HashSet<>();
         globalVars = new HashSet<>();
         ghosts = new HashSet<>();
@@ -33,7 +33,7 @@ public static ContextHistory getInstance() {
     }
 
     public void clearHistory() {
-        vars.clear();
+        fileScopeVars.clear();
         instanceVars.clear();
         globalVars.clear();
         ghosts.clear();
@@ -48,8 +48,8 @@ public void saveContext(CtElement element, Context context) {
         // add variables in scope for this position
         String file = pos.getFile().getAbsolutePath();
         String scope = getScopePosition(element);
-        vars.putIfAbsent(file, new HashMap<>());
-        vars.get(file).put(scope, new HashSet<>(context.getCtxVars()));
+        fileScopeVars.putIfAbsent(file, new HashMap<>());
+        fileScopeVars.get(file).put(scope, new HashSet<>(context.getCtxVars()));
 
         // add other elements in context
         instanceVars.addAll(context.getCtxInstanceVars());
@@ -69,8 +69,8 @@ public String getScopePosition(CtElement element) {
                 pos.getEndColumn());
     }
 
-    public Map<String, Map<String, Set<RefinedVariable>>> getVars() {
-        return vars;
+    public Map<String, Map<String, Set<RefinedVariable>>> getFileScopeVars() {
+        return fileScopeVars;
     }
 
     public Set<RefinedVariable> getInstanceVars() {