Save Context History

Author: rcosta358

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

@@ -7,19 +7,18 @@
 
 import spoon.reflect.cu.SourcePosition;
 import spoon.reflect.declaration.CtElement;
-import spoon.reflect.declaration.CtExecutable;
 
 public class ContextHistory {
     private static ContextHistory instance;
-
-    private Map<String, Map<String, Set<RefinedVariable>>> fileScopeVars; // file -> (scope -> variables in scope)
+    
+    private Map<String, Set<RefinedVariable>> vars; // scope -> variables in scope
     private Set<RefinedVariable> instanceVars;
     private Set<RefinedVariable> globalVars;
     private Set<GhostState> ghosts;
     private Set<AliasWrapper> aliases;
 
     private ContextHistory() {
-        fileScopeVars = new HashMap<>();
+        vars = new HashMap<>();
         instanceVars = new HashSet<>();
         globalVars = new HashSet<>();
         ghosts = new HashSet<>();
@@ -33,7 +32,7 @@ public static ContextHistory getInstance() {
     }
 
     public void clearHistory() {
-        fileScopeVars.clear();
+        vars.clear();
         instanceVars.clear();
         globalVars.clear();
         ghosts.clear();
@@ -44,33 +43,17 @@ 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);
-        fileScopeVars.putIfAbsent(file, new HashMap<>());
-        fileScopeVars.get(file).put(scope, new HashSet<>(context.getCtxVars()));
-
-        // add other elements in context
+    
+        String scope = String.format("%s:%d:%d", pos.getFile().getName(), pos.getLine(), pos.getColumn());
+        vars.put(scope, new HashSet<>(context.getCtxVars()));
         instanceVars.addAll(context.getCtxInstanceVars());
         globalVars.addAll(context.getCtxGlobalVars());
         ghosts.addAll(context.getGhostStates());
         aliases.addAll(context.getAliases());
     }
 
-    public String getScopePosition(CtElement element) {
-        SourcePosition pos = element.getPosition();
-        SourcePosition innerPosition = pos;
-        if (element instanceof CtExecutable<?> executable) {
-            if (executable.getBody() != null)
-                innerPosition = executable.getBody().getPosition();
-        }
-        return String.format("%d:%d-%d:%d", innerPosition.getLine(), innerPosition.getColumn() + 1, pos.getEndLine(),
-                pos.getEndColumn());
-    }
-
-    public Map<String, Map<String, Set<RefinedVariable>>> getFileScopeVars() {
-        return fileScopeVars;
+    public Map<String, Set<RefinedVariable>> getVars() {
+        return vars;
     }
 
     public Set<RefinedVariable> getInstanceVars() {