Skip to content

Commit 79ca87d

Browse files
committed
Cleanup
1 parent 3f38abc commit 79ca87d

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import liquidjava.rj_language.ast.LiteralBoolean;
66
import liquidjava.rj_language.opt.derivation_node.BinaryDerivationNode;
77
import liquidjava.rj_language.opt.derivation_node.DerivationNode;
8-
import liquidjava.rj_language.opt.derivation_node.UnaryDerivationNode;
98
import liquidjava.rj_language.opt.derivation_node.ValDerivationNode;
109

1110
public class ExpressionSimplifier {
@@ -15,16 +14,15 @@ public class ExpressionSimplifier {
1514
* Returns a derivation node representing the tree of simplifications applied
1615
*/
1716
public static ValDerivationNode simplify(Expression exp) {
18-
ValDerivationNode fixedPoint = simplifyToFixedPoint(null, null, exp);
17+
ValDerivationNode fixedPoint = simplifyToFixedPoint(null, exp);
1918
return simplifyValDerivationNode(fixedPoint);
2019
}
2120

2221
/**
2322
* Recursively applies propagation and folding until the expression stops changing (fixed point) Stops early if the
2423
* expression simplifies to 'true', which means we've simplified too much
2524
*/
26-
private static ValDerivationNode simplifyToFixedPoint(ValDerivationNode current, ValDerivationNode previous,
27-
Expression prevExp) {
25+
private static ValDerivationNode simplifyToFixedPoint(ValDerivationNode current, Expression prevExp) {
2826
// apply propagation and folding
2927
ValDerivationNode prop = ConstantPropagation.propagate(prevExp, current);
3028
ValDerivationNode fold = ConstantFolding.fold(prop);
@@ -37,7 +35,7 @@ private static ValDerivationNode simplifyToFixedPoint(ValDerivationNode current,
3735
}
3836

3937
// continue simplifying
40-
return simplifyToFixedPoint(simplified, current, simplified.getValue());
38+
return simplifyToFixedPoint(simplified, simplified.getValue());
4139
}
4240

4341
/**

liquidjava-verifier/src/test/java/liquidjava/rj_language/opt/ExpressionSimplifierTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ void testComplexArithmeticWithMultipleOperations() {
308308
void testFixedPointSimplification() {
309309
// Given: x == -y && y == a / b && a == 6 && b == 3
310310
// Expected: x == -2
311-
311+
312312
Expression varX = new Var("x");
313313
Expression varY = new Var("y");
314314
Expression varA = new Var("a");

0 commit comments

Comments
 (0)