| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-08-28 15:25:39 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-08-28 15:25:39 +0200 |
| commit | 688d3be723b19655edcd1fc1de413b54630d4589 (patch) | |
| tree | c0b95459b6b3f885a865110afa05ea709e5ccb57 | |
| parent | d1d9293f2654e297654f67b5bb0ba43fad7448d7 (diff) | |
Small changes? Forgot to commit.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | ast-to-instr/src/Expressions.java | 2 | ||||
| -rw-r--r-- | data/level/structural_level.lvl | 3 | ||||
| -rw-r--r-- | instr-to-kodkod/cfg-to-paths/Makefile | 2 | ||||
| -rw-r--r-- | instr-to-kodkod/parser/PropertyLexer.g4 | 4 |
5 files changed, 9 insertions, 5 deletions
@@ -3,7 +3,8 @@ LEVEL_FILES = $(wildcard ${CURDIR}/data/level/*.lvl) PROPERTY_FILES = \ $(wildcard ${CURDIR}/data/property/*.pro) \ $(wildcard ${CURDIR}/data/property/cnes/*.pro) -AST_FILE = ${CURDIR}/data/ast/best_chronometer_ever.xml +#AST_FILE = ${CURDIR}/data/ast/best_chronometer_ever.xml +AST_FILE = ${CURDIR}/data/ast/pong.xml TMP_DIR = /tmp/tabellion MODEL_DIR = $(TMP_DIR)/mod diff --git a/ast-to-instr/src/Expressions.java b/ast-to-instr/src/Expressions.java index c6037d6..ec352a0 100644 --- a/ast-to-instr/src/Expressions.java +++ b/ast-to-instr/src/Expressions.java @@ -200,7 +200,7 @@ public class Expressions ) ); - structure.append(")"); /* TODO */ + structure.append(")"); } else { diff --git a/data/level/structural_level.lvl b/data/level/structural_level.lvl index dab377b..8d2ca0a 100644 --- a/data/level/structural_level.lvl +++ b/data/level/structural_level.lvl @@ -52,6 +52,9 @@ (add_function column port string) (add_function identifier port string) +(add_predicate is_a_clock port) +(add_predicate is_a_reset port) + ;;;; Generic ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (add_predicate is_generic_of generic entity) (add_predicate has_class generic) 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; |