Save Context Vars by File and Scope

Author: rcosta358

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

@@ -7,11 +7,13 @@
 
 import spoon.reflect.cu.SourcePosition;
 import spoon.reflect.declaration.CtElement;
+import spoon.reflect.declaration.CtExecutable;
+import spoon.reflect.declaration.CtMethod;
 
 public class ContextHistory {
     private static ContextHistory instance;
 
-    private Map<String, Set<RefinedVariable>> vars; // scope -> variables in scope
+    private Map<String, Map<String, Set<RefinedVariable>>> vars; // file -> (scope -> variables in scope)
     private Set<RefinedVariable> instanceVars;
     private Set<RefinedVariable> globalVars;
     private Set<GhostState> ghosts;
@@ -43,16 +45,28 @@ public void saveContext(CtElement element, Context context) {
         SourcePosition pos = element.getPosition();
         if (pos == null || pos.getFile() == null)
             return;
+
+        // add variables in scope for this position
+        String file = pos.getFile().getAbsolutePath();
+        String scope = getScopePosition(element);
+        System.out.println("Saving context for " + file + " in scope " + scope);
+        vars.putIfAbsent(file, new HashMap<>());
+        vars.get(file).put(scope, new HashSet<>(context.getCtxVars()));
 
-        String scope = String.format("%s:%d:%d", pos.getFile().getName(), pos.getLine(), pos.getColumn());
-        vars.put(scope, new HashSet<>(context.getCtxVars()));
+        // add other elements in context
         instanceVars.addAll(context.getCtxInstanceVars());
         globalVars.addAll(context.getCtxGlobalVars());
         ghosts.addAll(context.getGhostStates());
         aliases.addAll(context.getAliases());
     }
 
-    public Map<String, Set<RefinedVariable>> getVars() {
+    public String getScopePosition(CtElement element) {
+        SourcePosition pos = element.getPosition();
+        SourcePosition innerPosition = element instanceof CtExecutable ? ((CtExecutable<?>) element).getBody().getPosition() : pos;
+        return String.format("%d:%d-%d:%d", innerPosition.getLine(), innerPosition.getColumn() + 1, pos.getEndLine(), pos.getEndColumn());
+    }
+
+    public Map<String, Map<String, Set<RefinedVariable>>> getVars() {
         return vars;
     }