Minor Improvements

Author: rcosta358

liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/RefinementTypeChecker.java

@@ -123,21 +123,19 @@ public <R> void visitCtMethod(CtMethod<R> method) {
     @Override
     public <T> void visitCtLocalVariable(CtLocalVariable<T> localVariable) {
         super.visitCtLocalVariable(localVariable);
-        // only declaration, no assignment
+        String varName = localVariable.getSimpleName();
         if (localVariable.getAssignment() == null) {
-            Optional<Predicate> a;
-            a = getRefinementFromAnnotation(localVariable);
-            context.addVarToContext(localVariable.getSimpleName(), localVariable.getType(), a.orElse(new Predicate()),
-                    localVariable);
+            // declaration with no assignment
+            Optional<Predicate> pred = getRefinementFromAnnotation(localVariable);
+            context.addVarToContext(varName, localVariable.getType(), pred.orElse(new Predicate()), localVariable);
         } else {
-            String varName = localVariable.getSimpleName();
+            // declaration with assignment
             CtExpression<?> e = localVariable.getAssignment();
-
             Predicate refinementFound = getRefinement(e);
             if (refinementFound == null) {
                 refinementFound = new Predicate();
             }
-            if (Utils.isBoxedType(localVariable.getType()) && !Utils.isNullLiteral(e)) {
+            if (!Utils.isPrimitiveType(localVariable.getType().getQualifiedName()) && !Utils.isNullLiteral(e)) {
                 refinementFound = Predicate.createConjunction(refinementFound, Predicate.createNonNullEq());
             }
             context.addVarToContext(varName, localVariable.getType(), new Predicate(), e);
@@ -402,7 +400,7 @@ private void checkAssignment(String name, CtTypeReference<?> type, CtExpression<
                 refinementFound = new Predicate();
             }
         }
-        if (Utils.isBoxedType(type) && !Utils.isNullLiteral(assignment)) {
+        if (!Utils.isPrimitiveType(type.getQualifiedName()) && !Utils.isNullLiteral(assignment)) {
             refinementFound = Predicate.createConjunction(refinementFound, Predicate.createNonNullEq());
         }
         Optional<VariableInstance> r = context.getLastVariableInstance(name);

liquidjava-verifier/src/main/java/liquidjava/utils/Utils.java

@@ -14,8 +14,6 @@ public class Utils {
 
     private static final Set<String> DEFAULT_NAMES = Set.of("old", "length", "addToIndex", "getFromIndex");
     private static final Set<String> PRIMITIVE_TYPES = Set.of("int", "boolean", "long", "short", "float", "double");
-    private static final Set<String> BOXED_TYPES = Set.of("java.lang.Integer", "java.lang.Boolean", "java.lang.Long",
-            "java.lang.Short", "java.lang.Float", "java.lang.Double");
 
     public static CtTypeReference<?> getType(String type, Factory factory) {
         // TODO: complete with other types
@@ -34,10 +32,6 @@ public static boolean isNullLiteral(CtExpression<?> assignment) {
         return assignment instanceof CtLiteral<?> lit && lit.getValue() == null;
     }
 
-    public static boolean isBoxedType(CtTypeReference<?> type) {
-        return BOXED_TYPES.contains(type.getQualifiedName());
-    }
-
     public static boolean isPrimitiveType(String type) {
         return PRIMITIVE_TYPES.contains(type);
     }