diff --git a/src/de/stups/probkodkod/KodkodAnalysis.java b/src/de/stups/probkodkod/KodkodAnalysis.java index cae49e62457db845aed13babc67f27143a0bda38..ae124657026e13a7a1f87fbfc919441df39443da 100644 --- a/src/de/stups/probkodkod/KodkodAnalysis.java +++ b/src/de/stups/probkodkod/KodkodAnalysis.java @@ -107,6 +107,7 @@ import de.stups.probkodkod.parser.node.ATuple; import de.stups.probkodkod.parser.node.ATupleset; import de.stups.probkodkod.parser.node.AUnaryInnerexpression; 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.PArgument; import de.stups.probkodkod.parser.node.PDecls; @@ -190,6 +191,7 @@ public class KodkodAnalysis extends DepthFirstAdapter { .put(ASomeMultiplicity.class.getName(), Multiplicity.SOME); CONSTEXPR.put(AEmptyExprConst.class.getName(), Expression.NONE); CONSTEXPR.put(AIdenExprConst.class.getName(), Expression.IDEN); + CONSTEXPR.put(AUnivExprConst.class.getName(), Expression.UNIV); BININTEXPROPS.put(AAddIntexprBinop.class.getName(), IntOperator.PLUS); BININTEXPROPS.put(ASubIntexprBinop.class.getName(), IntOperator.MINUS); diff --git a/src/problem.grammar b/src/problem.grammar index 7a28d84aa6b9b498b0d4afd650525857c4b2474c..a0fd3ee5f1a6e9b8331330ad09a005ee49a3974d 100644 --- a/src/problem.grammar +++ b/src/problem.grammar @@ -53,6 +53,7 @@ Tokens keyword_comprehension = 'comp'; keyword_empty = 'empty'; keyword_iden = 'iden'; + keyword_univ = 'univ'; keyword_ranges = 'ranges'; keyword_ext = 'ext'; keyword_relref = 'relref'; @@ -170,7 +171,8 @@ Productions expr_cast = {pow2} keyword_int2pow2 | {intset} keyword_int2intset; expr_const = {empty} keyword_empty - | {iden} keyword_iden; + | {iden} keyword_iden + | {univ} keyword_univ; expr_multop = {union} keyword_union