summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'instr-to-kodkod')
-rw-r--r--instr-to-kodkod/cfg-to-paths/Makefile2
-rw-r--r--instr-to-kodkod/parser/PropertyLexer.g44
2 files changed, 3 insertions, 3 deletions
diff --git a/instr-to-kodkod/cfg-to-paths/Makefile b/instr-to-kodkod/cfg-to-paths/Makefile
index 1f6d6e2..49c1e83 100644
--- a/instr-to-kodkod/cfg-to-paths/Makefile
+++ b/instr-to-kodkod/cfg-to-paths/Makefile
@@ -26,7 +26,7 @@ $(error No MODEL_DIR defined as parameter.)
endif
ifeq ($(strip $(PATH_MODEL_DIR)),)
-$(error No CFG_MODEL_DIR defined as parameter.)
+$(error No PATH_MODEL_DIR defined as parameter.)
endif
ifeq ($(strip $(JAVA)),)
diff --git a/instr-to-kodkod/parser/PropertyLexer.g4 b/instr-to-kodkod/parser/PropertyLexer.g4
index b538794..3b6011d 100644
--- a/instr-to-kodkod/parser/PropertyLexer.g4
+++ b/instr-to-kodkod/parser/PropertyLexer.g4
@@ -32,8 +32,8 @@ EF_OPERATOR_KW: '(EF' SEP;
AU_OPERATOR_KW: '(AU' SEP;
EU_OPERATOR_KW: '(EU' SEP;
-DEPTH_NO_PARENT_OPERATOR_KW: '(does_not_reach_parent_before' SEP;
-DEPTH_NO_CHANGE_OPERATOR_KW: '(does_not_change_depth_before' SEP;
+DEPTH_NO_PARENT_OPERATOR_KW: ('(NPB' | '(does_not_reach_parent_before') SEP;
+DEPTH_NO_CHANGE_OPERATOR_KW: ('(NDCB' | '(does_not_change_depth_before') SEP;
WS: SEP;