Merge branch 'main' into debug-flag

liquid-java · rcosta358 · Apr 7, 2026 · Mar 19, 2026 · Mar 19, 2026 · Mar 19, 2026
commit 4d5cc0ca54aacb538a8af7f553940219f1b90384
diff --git a/liquidjava-verifier/src/main/java/liquidjava/rj_language/Predicate.java b/liquidjava-verifier/src/main/java/liquidjava/rj_language/Predicate.java
@@ -202,11 +202,17 @@ public Expression getExpression() {
         return exp;
     }
 
-    public ValDerivationNode simplify() {
+    public ValDerivationNode simplify(Context context) {
+        // collect aliases from context
+        Map<String, AliasDTO> aliases = new HashMap<>();
+        for (AliasWrapper aw : context.getAliases()) {
+            aliases.put(aw.getName(), aw.createAliasDTO());
+        }
         if (CommandLineLauncher.cmdArgs.debugMode) {
             return new ValDerivationNode(exp.clone(), null);
         }
-        return ExpressionSimplifier.simplify(exp.clone());
+        // simplify expression
+        return ExpressionSimplifier.simplify(exp.clone(), aliases);
     }
 
     private static boolean isBooleanLiteral(Expression expr, boolean value) {

diff --git a/liquidjava-verifier/src/main/java/liquidjava/rj_language/opt/ExpressionSimplifier.java b/liquidjava-verifier/src/main/java/liquidjava/rj_language/opt/ExpressionSimplifier.java
@@ -1,6 +1,10 @@
 package liquidjava.rj_language.opt;
 
-import liquidjava.diagnostics.Diagnostics;
+import liquidjava.processor.context.Context;
+import liquidjava.rj_language.Predicate;
+import java.util.Map;
+
+import liquidjava.processor.facade.AliasDTO;
 import liquidjava.rj_language.ast.BinaryExpression;
 import liquidjava.rj_language.ast.Expression;
 import liquidjava.rj_language.ast.LiteralBoolean;