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.

1 files changed, 28 insertions, 4 deletions

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))
+         );
    }
 ;