From 886f24dcd003a5485ffa402adcf6963d8612afa8 Mon Sep 17 00:00:00 2001
From: Daniel Plagge <plagge@cs.uni-duesseldorf.de>
Date: Wed, 4 May 2011 18:55:07 +0000
Subject: [PATCH] Kodkod: added univ to grammar
git-svn-id: https://cobra.cs.uni-duesseldorf.de/prob/trunk/experimental/plagge/probkodkod@7809 7aec93f6-bc54-0410-ac70-7d7c9efa889a
---
src/de/stups/probkodkod/KodkodAnalysis.java | 2 ++
src/problem.grammar | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/de/stups/probkodkod/KodkodAnalysis.java b/src/de/stups/probkodkod/KodkodAnalysis.java
index cae49e6..ae12465 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 7a28d84..a0fd3ee 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
--
GitLab