Formula.and(Formula...) != a.and(Formula...)

Having both a static and a non-static function share a name does not
seem like a sane decision.

3 files changed, 37 insertions, 13 deletions

diff --git a/data/property/combinational_processes.pro b/data/property/combinational_processes.pro
index 7f8405f..5008a06 100644
--- a/data/property/combinational_processes.pro
+++ b/data/property/combinational_processes.pro
@@ -4,12 +4,6 @@
    )
    (forall sl1 waveform
       (and
-         (CTL_verifies ps
-            (implies
-               (EF (expr_writes sl1))
-               (AF (expr_writes sl1))
-            )
-         )
          (implies
             (exists target waveform
                (CTL_verifies ps
@@ -28,7 +22,13 @@
                   )
                )
             )
-            (is_in_sensitivity_list ps sl1)
+            (is_in_sensitivity_list sl1 ps)
+         )
+         (CTL_verifies ps
+            (implies
+               (EF (expr_writes sl1))
+               (AF (expr_writes sl1))
+            )
          )
       )
    )
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))
+         );
    }
 ;