Skip to content
Snippets Groups Projects
Commit b3bd895a authored by hansen's avatar hansen
Browse files

Added precedence to cartesian product node (stem from Event-B)

parent 100b216c
No related branches found
No related tags found
No related merge requests found
...@@ -4,6 +4,7 @@ import java.util.HashSet; ...@@ -4,6 +4,7 @@ import java.util.HashSet;
import java.util.Hashtable; import java.util.Hashtable;
import de.be4.classicalb.core.parser.analysis.DepthFirstAdapter; 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.AConvertBoolExpression;
import de.be4.classicalb.core.parser.node.ADomainExpression; import de.be4.classicalb.core.parser.node.ADomainExpression;
import de.be4.classicalb.core.parser.node.AMinusOrSetSubtractExpression; import de.be4.classicalb.core.parser.node.AMinusOrSetSubtractExpression;
...@@ -58,6 +59,7 @@ public class PrecedenceCollector extends DepthFirstAdapter { ...@@ -58,6 +59,7 @@ public class PrecedenceCollector extends DepthFirstAdapter {
put("ASetSubtractionExpression", 8, 8, false); put("ASetSubtractionExpression", 8, 8, false);
put("AIntervalExpression", 9, 9, true); put("AIntervalExpression", 9, 9, true);
put("ACartesianProductExpression", 8, 13, false);
put("AAddExpression", 10, 10, true); put("AAddExpression", 10, 10, true);
......
...@@ -8,6 +8,7 @@ public class PrecedenceTest { ...@@ -8,6 +8,7 @@ public class PrecedenceTest {
@Test @Test
public void testSubsetVsTimes() throws Exception { public void testSubsetVsTimes() throws Exception {
String machine = "MACHINE test\n" String machine = "MACHINE test\n"
+ "PROPERTIES POW({1}) * {1} = POW({1}) * {1} \n" + "END"; + "PROPERTIES POW({1}) * {1} = POW({1}) * {1} \n" + "END";
String expected = "---- MODULE test----\n" + "EXTENDS Integers\n" String expected = "---- MODULE test----\n" + "EXTENDS Integers\n"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment