Skip to content
Snippets Groups Projects
Commit 39670979 authored by Daniel Plagge's avatar Daniel Plagge
Browse files

using DIVIDE operation (added in a recent Kodkod version)

parent b2e237de
Branches
No related tags found
No related merge requests found
...@@ -48,6 +48,7 @@ import de.stups.probkodkod.parser.node.AConstInnerexpression; ...@@ -48,6 +48,7 @@ import de.stups.probkodkod.parser.node.AConstInnerexpression;
import de.stups.probkodkod.parser.node.AConstInnerformula; import de.stups.probkodkod.parser.node.AConstInnerformula;
import de.stups.probkodkod.parser.node.AConstInnerintexpression; import de.stups.probkodkod.parser.node.AConstInnerintexpression;
import de.stups.probkodkod.parser.node.ADiffExprBinop; import de.stups.probkodkod.parser.node.ADiffExprBinop;
import de.stups.probkodkod.parser.node.ADivIntexprBinop;
import de.stups.probkodkod.parser.node.AEmptyExprConst; import de.stups.probkodkod.parser.node.AEmptyExprConst;
import de.stups.probkodkod.parser.node.AEqualsIntCompOp; import de.stups.probkodkod.parser.node.AEqualsIntCompOp;
import de.stups.probkodkod.parser.node.AEqualsLogopRel; import de.stups.probkodkod.parser.node.AEqualsLogopRel;
...@@ -195,6 +196,7 @@ public class KodkodAnalysis extends DepthFirstAdapter { ...@@ -195,6 +196,7 @@ public class KodkodAnalysis extends DepthFirstAdapter {
BININTEXPROPS.put(ASubIntexprBinop.class.getName(), IntOperator.MINUS); BININTEXPROPS.put(ASubIntexprBinop.class.getName(), IntOperator.MINUS);
BININTEXPROPS.put(AMulIntexprBinop.class.getName(), BININTEXPROPS.put(AMulIntexprBinop.class.getName(),
IntOperator.MULTIPLY); IntOperator.MULTIPLY);
BININTEXPROPS.put(ADivIntexprBinop.class.getName(), IntOperator.DIVIDE);
BININTCOMPS.put(AEqualsIntCompOp.class.getName(), IntCompOperator.EQ); BININTCOMPS.put(AEqualsIntCompOp.class.getName(), IntCompOperator.EQ);
BININTCOMPS.put(AGreaterIntCompOp.class.getName(), IntCompOperator.GT); BININTCOMPS.put(AGreaterIntCompOp.class.getName(), IntCompOperator.GT);
......
...@@ -67,6 +67,7 @@ Tokens ...@@ -67,6 +67,7 @@ Tokens
keyword_addition = 'add'; keyword_addition = 'add';
keyword_subtraction = 'sub'; keyword_subtraction = 'sub';
keyword_multiplication = 'mul'; keyword_multiplication = 'mul';
keyword_division = 'div';
keyword_greater = 'gt'; keyword_greater = 'gt';
keyword_greater_equal = 'gte'; keyword_greater_equal = 'gte';
keyword_lesser = 'lt'; keyword_lesser = 'lt';
...@@ -199,7 +200,8 @@ Productions ...@@ -199,7 +200,8 @@ Productions
intexpr_binop = intexpr_binop =
{add} keyword_addition {add} keyword_addition
| {sub} keyword_subtraction | {sub} keyword_subtraction
| {mul} keyword_multiplication; | {mul} keyword_multiplication
| {div} keyword_division;
request = keyword_request [problem]:identifier [size]:number reqtype [al]:parenl [arguments]:argument* [ar]:parenr; request = keyword_request [problem]:identifier [size]:number reqtype [al]:parenl [arguments]:argument* [ar]:parenr;
argument = parenl identifier [tuples]:tuple* parenr; argument = parenl identifier [tuples]:tuple* parenr;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment