Move Annotation Position from RefinedVariable to PlacementInCode

Also remove `isParameter` field.

Author: rcosta358

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

@@ -106,7 +106,7 @@ public void addVarToContext(RefinedVariable var) {
 
     public RefinedVariable addVarToContext(String simpleName, CtTypeReference<?> type, Predicate c, CtElement element) {
         RefinedVariable vi = new Variable(simpleName, type, c);
-        vi.addPlacementInCode(element);
+        vi.setPlacementInCode(element);
         vi.addSuperTypes(type.getSuperclass(), type.getSuperInterfaces());
         addVarToContext(vi);
         return vi;
@@ -115,7 +115,7 @@ public RefinedVariable addVarToContext(String simpleName, CtTypeReference<?> typ
     public RefinedVariable addInstanceToContext(String simpleName, CtTypeReference<?> type, Predicate c,
             CtElement element) {
         RefinedVariable vi = new VariableInstance(simpleName, type, c);
-        vi.addPlacementInCode(element);
+        vi.setPlacementInCode(element);
         if (!ctxInstanceVars.contains(vi))
             addInstanceVariable(vi);
         return vi;
@@ -126,7 +126,7 @@ public void addRefinementToVariableInContext(String name, CtTypeReference<?> typ
         if (hasVariable(name)) {
             RefinedVariable vi = getVariableByName(name);
             vi.setRefinement(et);
-            vi.addPlacementInCode(element);
+            vi.setPlacementInCode(element);
         } else {
             addVarToContext(name, type, et, element);
         }

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

@@ -1,6 +1,8 @@
 package liquidjava.processor.context;
 
 import java.lang.annotation.Annotation;
+
+import liquidjava.utils.Utils;
 import spoon.reflect.code.CtComment;
 import spoon.reflect.cu.SourcePosition;
 import spoon.reflect.declaration.CtAnnotation;
@@ -9,10 +11,12 @@
 public class PlacementInCode {
     private final String text;
     private final SourcePosition position;
+    private final SourcePosition annotationPosition;
 
-    private PlacementInCode(String text, SourcePosition pos) {
+    private PlacementInCode(String text, SourcePosition pos, SourcePosition annotationPosition) {
         this.text = text;
         this.position = pos;
+        this.annotationPosition = annotationPosition;
     }
 
     public String getText() {
@@ -23,6 +27,10 @@ public SourcePosition getPosition() {
         return position;
     }
 
+    public SourcePosition getAnnotationPosition() {
+        return annotationPosition;
+    }
+
     public static PlacementInCode createPlacement(CtElement elem) {
         CtElement elemCopy = elem.clone();
         // cleanup annotations
@@ -38,7 +46,8 @@ public static PlacementInCode createPlacement(CtElement elem) {
             }
         }
         String elemText = elemCopy.toString();
-        return new PlacementInCode(elemText, elem.getPosition());
+        SourcePosition annotationPosition = Utils.getFirstLJAnnotationPosition(elem);
+        return new PlacementInCode(elemText, elem.getPosition(), annotationPosition);
     }
 
     public String toString() {

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

@@ -4,21 +4,16 @@
 import java.util.List;
 import java.util.Set;
 import liquidjava.rj_language.Predicate;
-import liquidjava.utils.Utils;
-import spoon.reflect.cu.SourcePosition;
 import spoon.reflect.declaration.CtElement;
 import spoon.reflect.reference.CtTypeReference;
 
 public abstract class RefinedVariable extends Refined {
     private final List<CtTypeReference<?>> supertypes;
     private PlacementInCode placementInCode;
-    private boolean isParameter;
-    private SourcePosition annPosition;
 
     public RefinedVariable(String name, CtTypeReference<?> type, Predicate c) {
         super(name, type, c);
         supertypes = new ArrayList<>();
-        isParameter = false;
     }
 
     public abstract Predicate getMainRefinement();
@@ -40,23 +35,18 @@ public void addSuperTypes(CtTypeReference<?> ts, Set<CtTypeReference<?>> sts) {
                 supertypes.add(ct);
     }
 
-    public void addPlacementInCode(CtElement element) {
+    public void setPlacementInCode(CtElement element) {
         placementInCode = PlacementInCode.createPlacement(element);
-        annPosition = Utils.getFirstLJAnnotationPosition(element);
     }
 
-    public void addPlacementInCode(PlacementInCode placement) {
+    public void setPlacementInScope(PlacementInCode placement) {
         placementInCode = placement;
     }
 
     public PlacementInCode getPlacementInCode() {
         return placementInCode;
     }
 
-    public SourcePosition getAnnPosition() {
-        return annPosition;
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -80,12 +70,4 @@ public boolean equals(Object obj) {
             return supertypes.equals(other.supertypes);
         }
     }
-
-    public void setIsParameter(boolean b) {
-        isParameter = b;
-    }
-
-    public boolean isParameter() {
-        return isParameter;
-    }
 }

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

@@ -148,7 +148,7 @@ else if (has(ifbeforeIndex)) // value before and in else
                 ref = createITEConstraint(nName, cond.negate(), get(ifelseIndex));
         }
         VariableInstance jointReturn = new VariableInstance(nName, super.getType(), ref, this);
-        jointReturn.addPlacementInCode(getPlacementInCode());
+        jointReturn.setPlacementInScope(getPlacementInCode());
         return Optional.of(jointReturn);
     }
 

liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/general_checkers/MethodsFunctionsChecker.java

@@ -154,7 +154,6 @@ private Predicate handleFunctionRefinements(RefinedFunction f, CtElement method,
                 c = oc.get().substituteVariable(Keys.WILDCARD, paramName);
             param.putMetadata(Keys.REFINEMENT, c);
             RefinedVariable v = rtc.getContext().addVarToContext(param.getSimpleName(), param.getType(), c, param);
-            v.setIsParameter(true);
             rtc.getMessageFromAnnotation(param).ifPresent(v::setMessage);
             if (v instanceof Variable)
                 f.addArgRefinements((Variable) v);