From b3bd895ab1a52c30699e51023e45329e3b986eae Mon Sep 17 00:00:00 2001
From: hansen <dominik_hansen@web.de>
Date: Fri, 2 May 2014 12:45:49 +0200
Subject: [PATCH] Added precedence to cartesian product node (stem from
Event-B)
---
src/main/java/de/tlc4b/analysis/PrecedenceCollector.java | 4 +++-
src/test/java/de/tlc4b/prettyprint/PrecedenceTest.java | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/de/tlc4b/analysis/PrecedenceCollector.java b/src/main/java/de/tlc4b/analysis/PrecedenceCollector.java
index b64dc5e..caabfa8 100644
--- a/src/main/java/de/tlc4b/analysis/PrecedenceCollector.java
+++ b/src/main/java/de/tlc4b/analysis/PrecedenceCollector.java
@@ -4,6 +4,7 @@ import java.util.HashSet;
import java.util.Hashtable;
import de.be4.classicalb.core.parser.analysis.DepthFirstAdapter;
+import de.be4.classicalb.core.parser.node.ACartesianProductExpression;
import de.be4.classicalb.core.parser.node.AConvertBoolExpression;
import de.be4.classicalb.core.parser.node.ADomainExpression;
import de.be4.classicalb.core.parser.node.AMinusOrSetSubtractExpression;
@@ -58,7 +59,8 @@ public class PrecedenceCollector extends DepthFirstAdapter {
put("ASetSubtractionExpression", 8, 8, false);
put("AIntervalExpression", 9, 9, true);
-
+ put("ACartesianProductExpression", 8, 13, false);
+
put("AAddExpression", 10, 10, true);
diff --git a/src/test/java/de/tlc4b/prettyprint/PrecedenceTest.java b/src/test/java/de/tlc4b/prettyprint/PrecedenceTest.java
index 9bd3f8e..5d6d480 100644
--- a/src/test/java/de/tlc4b/prettyprint/PrecedenceTest.java
+++ b/src/test/java/de/tlc4b/prettyprint/PrecedenceTest.java
@@ -8,6 +8,7 @@ public class PrecedenceTest {
@Test
public void testSubsetVsTimes() throws Exception {
+
String machine = "MACHINE test\n"
+ "PROPERTIES POW({1}) * {1} = POW({1}) * {1} \n" + "END";
String expected = "---- MODULE test----\n" + "EXTENDS Integers\n"
--
GitLab