| summaryrefslogtreecommitdiff |
path: root/instr-to-kodkod
diff options
Diffstat (limited to 'instr-to-kodkod')
| -rw-r--r-- | instr-to-kodkod/Makefile | 4 | ||||
| -rw-r--r-- | instr-to-kodkod/parser/PropertyParser.g4 | 32 |
2 files changed, 30 insertions, 6 deletions
diff --git a/instr-to-kodkod/Makefile b/instr-to-kodkod/Makefile index a2b8992..7aa82ce 100644 --- a/instr-to-kodkod/Makefile +++ b/instr-to-kodkod/Makefile @@ -2,9 +2,9 @@ #MODEL_FILES = $(wildcard ../data/instructions/*.mod) MODEL_FILES = ../instr-scripts/structural.mod $(wildcard ../instr-scripts/pfp_*.mod) $(wildcard ../cfg-to-paths/pfp_*.mod) LEVEL_DIR = $(wildcard ../data/level/*.lvl) -PROPERTY_FILE = ../data/property/unread_waveforms.pro +#PROPERTY_FILE = ../data/property/unread_waveforms.pro #PROPERTY_FILE = ../data/property/impossible_processes.pro -#PROPERTY_FILE = ../data/property/combinational_processes.pro +PROPERTY_FILE = ../data/property/combinational_processes.pro VAR_PREFIX = "_anon_" ## Executables ################################################################# diff --git a/instr-to-kodkod/parser/PropertyParser.g4 b/instr-to-kodkod/parser/PropertyParser.g4 index 0bcb6a9..f117077 100644 --- a/instr-to-kodkod/parser/PropertyParser.g4 +++ b/instr-to-kodkod/parser/PropertyParser.g4 @@ -176,7 +176,13 @@ sl_and_operator { /* TODO */ - $result = ($sl_formula.result).and(($sl_non_empty_formula_list.list)); + $result = + ( + ($sl_formula.result) + ).and + ( + Formula.and(($sl_non_empty_formula_list.list)) + ); } ; @@ -190,7 +196,13 @@ sl_or_operator { /* TODO */ - $result = ($sl_formula.result).or(($sl_non_empty_formula_list.list)); + $result = + ( + ($sl_formula.result) + ).or + ( + Formula.or(($sl_non_empty_formula_list.list)) + ); } ; @@ -411,7 +423,13 @@ bl_and_operator [Variable current_node] { /* TODO */ - $result = ($bl_formula.result).and(($bl_formula_list.list)); + $result = + ( + ($bl_formula.result) + ).and + ( + Formula.and(($bl_formula_list.list)) + ); } ; @@ -425,7 +443,13 @@ bl_or_operator [Variable current_node] { /* TODO */ - $result = ($bl_formula.result).or(($bl_formula_list.list)); + $result = + ( + ($bl_formula.result) + ).or + ( + Formula.or(($bl_formula_list.list)) + ); } ; |