diff --git a/src/main/java/de/tlc4b/analysis/PrecedenceCollector.java b/src/main/java/de/tlc4b/analysis/PrecedenceCollector.java index b64dc5eae64d9cd9722ae58322fe2cc371b42f33..caabfa87be2ede1460e6f724ece6795ebbaf8a0e 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 9bd3f8eeeec383b931647878dc1d8aa7701b7e6a..5d6d480e0c8ac3b95ad1cfb9d5acebdfdd37c91c 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"