Some minor touchup to preconditions and fix for minus.

AI-Planning · Dec 28, 2023 · e1227b5 · e1227b5
1 parent 7a0132d
commit e1227b5
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 6 deletions.
diff --git a/pddl/parser/domain.lark b/pddl/parser/domain.lark
@@ -67,17 +67,15 @@ constant: NAME
             | GREATER_EQUAL_OP
             | LESSER_EQUAL_OP
 
-?binary_op: multi_op
-          | MINUS
+?binary_op: MINUS
           | DIVIDE
 
 ?multi_op: TIMES
          | PLUS
 
 f_exp:      NUMBER
       |     LPAR binary_op f_exp f_exp RPAR
-      |     LPAR multi_op f_exp f_exp+ RPAR
-      |     LPAR MINUS f_exp RPAR
+      |     LPAR multi_op f_exp+ RPAR
       |     f_head
 
 f_head:     NAME

diff --git a/pddl/parser/domain.py b/pddl/parser/domain.py
@@ -462,8 +462,13 @@ def __init__(self):
 
     def __call__(self, text):
         """Call."""
+        def handle_debug(e):
+            print("\nLocation of parse error:")
+            print(e.get_context(text))
+            print(e.interactive_parser.pretty())
+            print()
         sys.tracebacklimit = 0  # noqa
-        tree = self._parser.parse(text)
+        tree = self._parser.parse(text, on_error=handle_debug)
         sys.tracebacklimit = None  # noqa
         formula = self._transformer.transform(tree)
         return formula
diff --git a/pddl/parser/problem.py b/pddl/parser/problem.py
@@ -244,8 +244,13 @@ def __init__(self):
 
     def __call__(self, text):
         """Call."""
+        def handle_debug(e):
+            print("\nLocation of parse error:")
+            print(e.get_context(text))
+            print(e.interactive_parser.pretty())
+            print()
         sys.tracebacklimit = 0  # noqa
-        tree = self._parser.parse(text)
+        tree = self._parser.parse(text, on_error=handle_debug)
         sys.tracebacklimit = None  # noqa
         formula = self._transformer.transform(tree)
         return formula
diff --git a/tests/test_parser/test_domain.py b/tests/test_parser/test_domain.py
@@ -317,3 +317,31 @@ def test_check_action_costs_requirement_with_total_cost() -> None:
         match=r"action costs requirement is not specified, but the total-cost function is specified.",
     ):
         DomainParser()(domain_str)
+
+
+def test_minus_in_precondition() -> None:
+    """Check minus in precondition."""
+    domain_str = dedent(
+        """
+    (define (domain cant-subtract-in-precondition)
+        (:requirements :strips :typing :numeric-fluents)
+
+        (:types
+            agent - object
+        )
+
+        (:functions
+            (x ?l - agent)
+        )
+
+        (:action move-south
+            :parameters (?ag - agent)
+            :precondition  (and
+                (< (- (x ?ag) 1) 1)
+            )
+            :effect (and (decrease (x ?ag) 1))
+        )
+    )
+    """
+    )
+    DomainParser()(domain_str)