Minor Change

Author: rcosta358

liquidjava-verifier/src/main/java/liquidjava/rj_language/opt/VariablePropagation.java

@@ -24,7 +24,7 @@ public class VariablePropagation {
      */
     public static ValDerivationNode propagate(Expression exp, ValDerivationNode previousOrigin) {
         Map<String, Expression> substitutions = VariableResolver.resolve(exp);
-        Map<String, Expression> directSubstitutions = new HashMap<>(); // var == literal or var == var 
+        Map<String, Expression> directSubstitutions = new HashMap<>(); // var == literal or var == var
         Map<String, Expression> expressionSubstitutions = new HashMap<>(); // var == expression
         for (Map.Entry<String, Expression> entry : substitutions.entrySet()) {
             Expression value = entry.getValue();

liquidjava-verifier/src/main/java/liquidjava/rj_language/opt/VariableResolver.java

@@ -74,10 +74,9 @@ private static void resolveRecursive(Expression exp, Map<String, Expression> map
                 if (!isReturnVar(lowerVar) && !isFreshVar(higherVar))
                     map.putIfAbsent(lowerVar.getName(), higherVar.clone());
             }
-        } else if (left instanceof Var var && !(right instanceof Var) && canSubstitute(var, right)) {
+        } else if (left instanceof Var var && canSubstitute(var, right)) {
             map.put(var.getName(), right.clone());
-        } else if (left instanceof FunctionInvocation && !(right instanceof Var)
-                && !right.toString().contains(leftKey)) {
+        } else if (left instanceof FunctionInvocation && !right.toString().contains(leftKey)) {
             map.put(leftKey, right.clone());
         }
     }