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

Kodkod: added univ to grammar

parent e1230900
No related branches found
No related tags found
No related merge requests found
...@@ -107,6 +107,7 @@ import de.stups.probkodkod.parser.node.ATuple; ...@@ -107,6 +107,7 @@ import de.stups.probkodkod.parser.node.ATuple;
import de.stups.probkodkod.parser.node.ATupleset; import de.stups.probkodkod.parser.node.ATupleset;
import de.stups.probkodkod.parser.node.AUnaryInnerexpression; import de.stups.probkodkod.parser.node.AUnaryInnerexpression;
import de.stups.probkodkod.parser.node.AUnionExprMultop; import de.stups.probkodkod.parser.node.AUnionExprMultop;
import de.stups.probkodkod.parser.node.AUnivExprConst;
import de.stups.probkodkod.parser.node.AVarrefInnerexpression; import de.stups.probkodkod.parser.node.AVarrefInnerexpression;
import de.stups.probkodkod.parser.node.PArgument; import de.stups.probkodkod.parser.node.PArgument;
import de.stups.probkodkod.parser.node.PDecls; import de.stups.probkodkod.parser.node.PDecls;
...@@ -190,6 +191,7 @@ public class KodkodAnalysis extends DepthFirstAdapter { ...@@ -190,6 +191,7 @@ public class KodkodAnalysis extends DepthFirstAdapter {
.put(ASomeMultiplicity.class.getName(), Multiplicity.SOME); .put(ASomeMultiplicity.class.getName(), Multiplicity.SOME);
CONSTEXPR.put(AEmptyExprConst.class.getName(), Expression.NONE); CONSTEXPR.put(AEmptyExprConst.class.getName(), Expression.NONE);
CONSTEXPR.put(AIdenExprConst.class.getName(), Expression.IDEN); CONSTEXPR.put(AIdenExprConst.class.getName(), Expression.IDEN);
CONSTEXPR.put(AUnivExprConst.class.getName(), Expression.UNIV);
BININTEXPROPS.put(AAddIntexprBinop.class.getName(), IntOperator.PLUS); BININTEXPROPS.put(AAddIntexprBinop.class.getName(), IntOperator.PLUS);
BININTEXPROPS.put(ASubIntexprBinop.class.getName(), IntOperator.MINUS); BININTEXPROPS.put(ASubIntexprBinop.class.getName(), IntOperator.MINUS);
......
...@@ -53,6 +53,7 @@ Tokens ...@@ -53,6 +53,7 @@ Tokens
keyword_comprehension = 'comp'; keyword_comprehension = 'comp';
keyword_empty = 'empty'; keyword_empty = 'empty';
keyword_iden = 'iden'; keyword_iden = 'iden';
keyword_univ = 'univ';
keyword_ranges = 'ranges'; keyword_ranges = 'ranges';
keyword_ext = 'ext'; keyword_ext = 'ext';
keyword_relref = 'relref'; keyword_relref = 'relref';
...@@ -170,7 +171,8 @@ Productions ...@@ -170,7 +171,8 @@ Productions
expr_cast = {pow2} keyword_int2pow2 | {intset} keyword_int2intset; expr_cast = {pow2} keyword_int2pow2 | {intset} keyword_int2intset;
expr_const = expr_const =
{empty} keyword_empty {empty} keyword_empty
| {iden} keyword_iden; | {iden} keyword_iden
| {univ} keyword_univ;
expr_multop = expr_multop =
{union} keyword_union {union} keyword_union
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment