Fix bug on typed list of types

Author: francescofuggitti

fond4ltlf/core.py

@@ -55,7 +55,7 @@ def check_symbols(symbols, parsed_domain):
     return True
 
 
-def execute(planning_domain, planning_problem, goal_formula, no_disj_preconds):
+def execute(planning_domain, planning_problem, goal_formula, no_disj_preconds=False):
     """Execute the compilation."""
     pddl_parser = PDDLParser()
     parsed_domain = pddl_parser(planning_domain)

fond4ltlf/parser/parser.py

@@ -138,11 +138,15 @@ def p_constants_def(self, p):
         p[0] = p[3]
 
     def p_typed_lst_name(self, p):
-        """typed_lst_name : names_lst"""
+        """typed_lst_name : names_lst HYPHEN type typed_lst_name
+        | names_lst HYPHEN NAME
+        | names_lst"""
         if len(p) == 2:
             p[0] = p[1]
-        # elif len(p) == 5:
-        #     p[0] = [Term.constant(value, p[3]) for value in p[1]] + p[4]
+        elif len(p) == 4:
+            p[0] = [Term.constant(value, p[3]) for value in p[1]]
+        elif len(p) == 5:
+            p[0] = [Term.constant(value, p[3]) for value in p[1]] + p[4]
 
     def p_names_lst(self, p):
         """names_lst : NAME names_lst
@@ -449,7 +453,7 @@ def p_error(self, p):
 
 if __name__ == "__main__":
     par = PDDLParser()
-    with open("../../tests/data/pddl-domains/triangle-tireworld/p01.pddl", "r") as f:
+    with open("../../tests/data/pddl-domains/robot-coffee/domain-fond.pddl", "r") as f:
         domain = f.read()
 
     result = par(domain)

tests/test_parsing.py

@@ -624,7 +624,6 @@ def test_robot_coffee():
         )
     ).read()
     pddl_parser = PDDLParser()
-    # tmp = list(planning_problem[400:])
     parsed_domain = pddl_parser(planning_domain)
     parsed_problem = pddl_parser(planning_problem)
     assert parsed_domain is not None