Rename Classes

Author: rcosta358

…ava/rj_language/opt/ConstantFolding.java …a/rj_language/opt/ExpressionFolding.javaliquidjava-verifier/src/main/java/liquidjava/rj_language/opt/ConstantFolding.java renamed to liquidjava-verifier/src/main/java/liquidjava/rj_language/opt/ExpressionFolding.java liquidjava-verifier/src/main/java/liquidjava/rj_language/opt/ConstantFolding.java renamed to liquidjava-verifier/src/main/java/liquidjava/rj_language/opt/ExpressionFolding.java

@@ -12,11 +12,11 @@
 import liquidjava.rj_language.opt.derivation_node.UnaryDerivationNode;
 import liquidjava.rj_language.opt.derivation_node.ValDerivationNode;
 
-public class ConstantFolding {
+public class ExpressionFolding {
 
     /**
-     * Performs constant folding on a derivation node by evaluating nodes with constant values. Returns a new derivation
-     * node representing the folding steps taken
+     * Performs expression folding on a derivation node by evaluating nodes when possible. Returns a new derivation node
+     * representing the folding steps taken
      */
     public static ValDerivationNode fold(ValDerivationNode node) {
         Expression exp = node.getValue();
@@ -35,7 +35,7 @@ public static ValDerivationNode fold(ValDerivationNode node) {
     }
 
     /**
-     * Folds a binary expression node if both children are constant values (e.g. 1 + 2 => 3)
+     * Folds a binary expression node (e.g. 1 + 2 => 3)
      */
     private static ValDerivationNode foldBinary(ValDerivationNode node) {
         BinaryExpression binExp = (BinaryExpression) node.getValue();
@@ -148,7 +148,7 @@ else if (left instanceof LiteralBoolean && right instanceof LiteralBoolean) {
     }
 
     /**
-     * Folds a unary expression node if the child (operand) is a constant value (e.g. !true => false)
+     * Folds a unary expression node (e.g. !true => false)
      */
     private static ValDerivationNode foldUnary(ValDerivationNode node) {
         UnaryExpression unaryExp = (UnaryExpression) node.getValue();

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

@@ -27,8 +27,8 @@ public static ValDerivationNode simplify(Expression exp) {
      */
     private static ValDerivationNode simplifyToFixedPoint(ValDerivationNode current, Expression prevExp) {
         // apply propagation and folding
-        ValDerivationNode prop = ConstantPropagation.propagate(prevExp, current);
-        ValDerivationNode fold = ConstantFolding.fold(prop);
+        ValDerivationNode prop = VariablePropagation.propagate(prevExp, current);
+        ValDerivationNode fold = ExpressionFolding.fold(prop);
         ValDerivationNode simplified = simplifyValDerivationNode(fold);
         Expression currExp = simplified.getValue();
 

…rj_language/opt/ConstantPropagation.java …rj_language/opt/VariablePropagation.javaliquidjava-verifier/src/main/java/liquidjava/rj_language/opt/ConstantPropagation.java renamed to liquidjava-verifier/src/main/java/liquidjava/rj_language/opt/VariablePropagation.java liquidjava-verifier/src/main/java/liquidjava/rj_language/opt/ConstantPropagation.java renamed to liquidjava-verifier/src/main/java/liquidjava/rj_language/opt/VariablePropagation.java

@@ -13,12 +13,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class ConstantPropagation {
+public class VariablePropagation {
 
     /**
-     * Performs constant propagation on an expression, by substituting variables with their constant values. Uses the
-     * VariableResolver to extract variable equalities from the expression first. Returns a derivation node representing
-     * the propagation steps taken.
+     * Performs constant and variable propagation on an expression, by substituting variables. Uses the VariableResolver
+     * to extract variable equalities from the expression first. Returns a derivation node representing the propagation
+     * steps taken.
      */
     public static ValDerivationNode propagate(Expression exp, ValDerivationNode previousOrigin) {
         Map<String, Expression> substitutions = VariableResolver.resolve(exp);
@@ -32,7 +32,7 @@ public static ValDerivationNode propagate(Expression exp, ValDerivationNode prev
     }
 
     /**
-     * Recursively performs constant propagation on an expression (e.g. x + y && x == 1 && y == 2 => 1 + 2)
+     * Recursively performs propagation on an expression (e.g. x + y && x == 1 && y == 2 => 1 + 2)
      */
     private static ValDerivationNode propagateRecursive(Expression exp, Map<String, Expression> subs,
             Map<String, DerivationNode> varOrigins) {

liquidjava-verifier/src/test/java/liquidjava/api/tests/TestExamples.java

@@ -11,8 +11,8 @@
 import java.util.stream.Stream;
 import liquidjava.api.CommandLineLauncher;
 import liquidjava.diagnostics.Diagnostics;
+import liquidjava.diagnostics.errors.*;
 
-import liquidjava.diagnostics.errors.LJError;
 import org.junit.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;