some more convenient parsing

rleap-project · Nov 27, 2023 · bcaed73 · bcaed73
1 parent 5ffd21d
commit bcaed73
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/include/dlplan/policy/parsers/syntactic/ast.hpp b/include/dlplan/policy/parsers/syntactic/ast.hpp
@@ -5,6 +5,7 @@
 
 #include <boost/spirit/home/x3/support/ast/position_tagged.hpp>
 #include <boost/spirit/home/x3/support/ast/variant.hpp>
+#include <boost/optional.hpp>
 
 #include <vector>
 
@@ -285,8 +286,10 @@ namespace dlplan::policy::ast
 
     /* Policy */
     struct Policy : x3::position_tagged {
-        Booleans booleans;
-        Numericals numericals;
+        boost::optional<Booleans> booleans;
+        boost::optional<Numericals> numericals;
+        boost::optional<Concepts> concepts;
+        boost::optional<Roles> roles;
         Rules rules;
     };
 }

diff --git a/src/policy/parsers/semantic/parser.cpp b/src/policy/parsers/semantic/parser.cpp
@@ -343,8 +343,12 @@ Rules parse(
 
 std::shared_ptr<const Policy> parse(
     const ast::Policy& node, const dlplan::error_handler_type& error_handler, Context& context) {
-    parse(node.booleans, error_handler, context);
-    parse(node.numericals, error_handler, context);
+    if (node.booleans.has_value()) {
+        parse(node.booleans.value(), error_handler, context);
+    }
+    if (node.numericals.has_value()) {
+        parse(node.numericals.value(), error_handler, context);
+    }
     return context.policy_factory.make_policy(parse(node.rules, error_handler, context));
 }
 

diff --git a/src/policy/parsers/syntactic/ast_adapted.hpp b/src/policy/parsers/syntactic/ast_adapted.hpp
@@ -58,6 +58,6 @@ BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::EqualConceptEffect, reference)
 
 BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::Rule, feature_conditions, feature_effects)
 BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::Rules, rules)
-BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::Policy, booleans, numericals, rules)
+BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::Policy, booleans, numericals, concepts, roles, rules)
 
 #endif
diff --git a/src/policy/parsers/syntactic/parser_def.hpp b/src/policy/parsers/syntactic/parser_def.hpp
@@ -165,8 +165,10 @@ namespace dlplan::policy::parser
     const auto rules_def = *rule;
 
     const auto policy_def = lit('(') > lit(":policy")
-        > booleans
-        > numericals
+        > -booleans
+        > -numericals
+        > -concepts
+        > -roles
         > rules
         > lit(')');
     const auto policy_root_def = policy;