some work on parsing

rleap-project · Oct 16, 2023 · 05779a9 · 05779a9
1 parent 523c210
commit 05779a9
Show file tree

Hide file tree

Showing 8 changed files with 393 additions and 30 deletions.
diff --git a/include/dlplan/core.h b/include/dlplan/core.h
@@ -595,6 +595,9 @@ class VocabularyInfo {
     const Predicate& add_predicate(const std::string &name, int arity, bool is_static=false);
     const Constant& add_constant(const std::string& name);
 
+    const std::unordered_map<std::string, PredicateIndex> get_predicates_mapping() const;
+    const std::unordered_map<std::string, ConstantIndex> get_constants_mapping() const;
+
     const std::vector<Predicate>& get_predicates() const;
     const std::vector<Constant>& get_constants() const;
 

diff --git a/include/dlplan/core/parsers/elements/stage_1/ast.hpp b/include/dlplan/core/parsers/elements/stage_1/ast.hpp
@@ -40,9 +40,6 @@ namespace dlplan::core::parsers::elements::stage_1::ast
     struct SumConceptDistanceNumerical;
     struct SumRoleDistanceNumerical;
     struct AndRole;
-    struct Arg1Role;
-    struct Arg2Role;
-    struct Arg3Role;
     struct ComposeRole;
     struct DiffRole;
     struct IdentityRole;
@@ -171,7 +168,8 @@ namespace dlplan::core::parsers::elements::stage_1::ast
     };
 
     struct InclusionBoolean : x3::position_tagged {
-        ConceptOrRole element;
+        ConceptOrRole element_left;
+        ConceptOrRole element_right;
     };
 
     struct NullaryBoolean : x3::position_tagged {

diff --git a/include/dlplan/core/parsers/elements/stage_2/parser.hpp b/include/dlplan/core/parsers/elements/stage_2/parser.hpp
@@ -12,22 +12,22 @@
 
 namespace dlplan::core::parsers::elements::stage_2::parser {
 
-extern std::shared_ptr<const Boolean> parse_boolean(
+extern std::shared_ptr<const Boolean> parse(
     const stage_1::ast::Boolean& node,
     const error_handler_type& error_handler,
     SyntacticElementFactory& element_factory);
 
-extern std::shared_ptr<const Numerical> parse_numerical(
+extern std::shared_ptr<const Numerical> parse(
     const stage_1::ast::Numerical& node,
     const error_handler_type& error_handler,
     SyntacticElementFactory& element_factory);
 
-extern std::shared_ptr<const Concept> parse_concept(
+extern std::shared_ptr<const Concept> parse(
     const stage_1::ast::Concept& node,
     const error_handler_type& error_handler,
     SyntacticElementFactory& element_factory);
 
-extern std::shared_ptr<const Role> parse_role(
+extern std::shared_ptr<const Role> parse(
     const stage_1::ast::Role& node,
     const error_handler_type& error_handler,
     SyntacticElementFactory& element_factory);

diff --git a/src/core/element_factory.cpp b/src/core/element_factory.cpp
@@ -94,7 +94,7 @@ std::shared_ptr<const Concept> SyntacticElementFactoryImpl::parse_concept(Syntac
     }
 
     /* Stage 2 parse */
-    auto feature = parsers::elements::stage_2::parser::parse_concept(ast, error_handler, parent);
+    auto feature = parsers::elements::stage_2::parser::parse(ast, error_handler, parent);
 
     return feature;
 }
@@ -135,7 +135,7 @@ std::shared_ptr<const Role> SyntacticElementFactoryImpl::parse_role(SyntacticEle
     }
 
     /* Stage 2 parse */
-    auto feature = parsers::elements::stage_2::parser::parse_role(ast, error_handler, parent);
+    auto feature = parsers::elements::stage_2::parser::parse(ast, error_handler, parent);
 
     return feature;
 }
@@ -176,7 +176,7 @@ std::shared_ptr<const Boolean> SyntacticElementFactoryImpl::parse_boolean(Syntac
     }
 
     /* Stage 2 parse */
-    auto feature = parsers::elements::stage_2::parser::parse_boolean(ast, error_handler, parent);
+    auto feature = parsers::elements::stage_2::parser::parse(ast, error_handler, parent);
 
     return feature;
 }
@@ -217,7 +217,7 @@ std::shared_ptr<const Numerical> SyntacticElementFactoryImpl::parse_numerical(Sy
     }
 
     /* Stage 2 parse */
-    auto feature = parsers::elements::stage_2::parser::parse_numerical(ast, error_handler, parent);
+    auto feature = parsers::elements::stage_2::parser::parse(ast, error_handler, parent);
 
     return feature;
 }

diff --git a/src/core/parsers/elements/stage_1/ast_adapted.hpp b/src/core/parsers/elements/stage_1/ast_adapted.hpp
@@ -20,7 +20,7 @@ BOOST_FUSION_ADAPT_STRUCT(dlplan::core::parsers::elements::stage_1::ast::Role, r
 BOOST_FUSION_ADAPT_STRUCT(dlplan::core::parsers::elements::stage_1::ast::Element, element)
 BOOST_FUSION_ADAPT_STRUCT(dlplan::core::parsers::elements::stage_1::ast::ConceptOrRole, inner)
 BOOST_FUSION_ADAPT_STRUCT(dlplan::core::parsers::elements::stage_1::ast::EmptyBoolean, element)
-BOOST_FUSION_ADAPT_STRUCT(dlplan::core::parsers::elements::stage_1::ast::InclusionBoolean, element)
+BOOST_FUSION_ADAPT_STRUCT(dlplan::core::parsers::elements::stage_1::ast::InclusionBoolean, element_left, element_right)
 BOOST_FUSION_ADAPT_STRUCT(dlplan::core::parsers::elements::stage_1::ast::NullaryBoolean, predicate)
 BOOST_FUSION_ADAPT_STRUCT(dlplan::core::parsers::elements::stage_1::ast::AllConcept, role, concept_)
 BOOST_FUSION_ADAPT_STRUCT(dlplan::core::parsers::elements::stage_1::ast::AndConcept, concept_left, concept_right)

diff --git a/src/core/parsers/elements/stage_1/parser_def.hpp b/src/core/parsers/elements/stage_1/parser_def.hpp
@@ -239,7 +239,8 @@ namespace dlplan::core::parsers::elements::stage_1::parser
 
     const auto empty_boolean_def = lit("b_empty") > lit('(') > concept_or_role > lit(')');
 
-    const auto inclusion_boolean_def = lit("b_inclusion") > lit('(') > concept_or_role > lit(')');
+    // could change this to two_concept_or_two_role to produce more verbose error
+    const auto inclusion_boolean_def = lit("b_inclusion") > lit('(') > concept_or_role > lit(',') > concept_or_role > lit(')');
 
     const auto nullary_boolean_def = lit("b_nullary") > lit('(') > predicate > lit(')');