From ba887390ca2671ff03f8a1e6aa3e2868d8f5282b Mon Sep 17 00:00:00 2001
From: Michael Leuschel <leuschel@uni-duesseldorf.de>
Date: Fri, 5 Mar 2021 10:51:58 +0100
Subject: [PATCH] =?UTF-8?q?use=20ProB=E2=80=99s=20IF-THEN-ELSE=20rather=20?=
=?UTF-8?q?than=20lambda=20construction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/de/tla2b/output/ASTPrettyPrinter.java | 12 ++++++------
.../de/tla2b/expression/SimpleExpressionTest.java | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/de/tla2b/output/ASTPrettyPrinter.java b/src/main/java/de/tla2b/output/ASTPrettyPrinter.java
index 450e4cb..5ad97b0 100644
--- a/src/main/java/de/tla2b/output/ASTPrettyPrinter.java
+++ b/src/main/java/de/tla2b/output/ASTPrettyPrinter.java
@@ -685,15 +685,15 @@ public class ASTPrettyPrinter extends ExtendedDFAdapter {
@Override
public void caseAIfThenElseExpression(AIfThenElseExpression node) {
- sb.append("(%t_.( t_ = 0 & ");
+ sb.append("IF "); // (%t_.( t_ = 0 & ");
node.getCondition().apply(this);
- sb.append(" | ");
+ sb.append(" THEN "); // | ");
node.getThen().apply(this);
- sb.append(")\\/%t_.( t_ = 0 & not(");
- node.getCondition().apply(this);
- sb.append(") | ");
+ sb.append(" ELSE "); // )\\/%t_.( t_ = 0 & not(");
+ //node.getCondition().apply(this);
+ //sb.append(") | ");
node.getElse().apply(this);
- sb.append(" ))(0)");
+ sb.append(" END"); // "))(0)");
}
@Override
diff --git a/src/test/java/de/tla2b/expression/SimpleExpressionTest.java b/src/test/java/de/tla2b/expression/SimpleExpressionTest.java
index a914b2b..391b8cd 100644
--- a/src/test/java/de/tla2b/expression/SimpleExpressionTest.java
+++ b/src/test/java/de/tla2b/expression/SimpleExpressionTest.java
@@ -34,7 +34,7 @@ public class SimpleExpressionTest {
@Test
public void testIfThenElse() throws Exception {
compareExpr(
- "(%t_.( t_ = 0 & 1 = 1 | 1 )\\/%t_.( t_ = 0 & not(1 = 1) | 2 ))(0)",
+ "IF 1 = 1 THEN 1 ELSE 2 END", //"(%t_.( t_ = 0 & 1 = 1 | 1 )\\/%t_.( t_ = 0 & not(1 = 1) | 2 ))(0)",
"IF 1 = 1 THEN 1 ELSE 2");
}
--
GitLab