diff --git a/include/dlplan/policy/condition.h b/include/dlplan/policy/condition.h index 627ae3f6..c343e865 100644 --- a/include/dlplan/policy/condition.h +++ b/include/dlplan/policy/condition.h @@ -110,7 +110,7 @@ class EqualNumericalCondition : public NamedElementCondition, pu class GreaterConceptCondition : public NamedElementCondition, public std::enable_shared_from_this { private: - GreaterConceptCondition(int identifier, std::shared_ptr concept_); + GreaterConceptCondition(int identifier, std::shared_ptr concept__); template friend class dlplan::ReferenceCountedObjectFactory; @@ -127,7 +127,7 @@ class GreaterConceptCondition : public NamedElementCondition, publ class EqualConceptCondition : public NamedElementCondition, public std::enable_shared_from_this { private: - EqualConceptCondition(int identifier, std::shared_ptr concept_); + EqualConceptCondition(int identifier, std::shared_ptr concept__); template friend class dlplan::ReferenceCountedObjectFactory; diff --git a/include/dlplan/policy/effect.h b/include/dlplan/policy/effect.h index c83294d8..d8eb3181 100644 --- a/include/dlplan/policy/effect.h +++ b/include/dlplan/policy/effect.h @@ -172,7 +172,7 @@ class EqualNumericalEffect : public NamedElementEffect, public s class IncrementConceptEffect : public NamedElementEffect, public std::enable_shared_from_this { private: - IncrementConceptEffect(int identifier, std::shared_ptr concept); + IncrementConceptEffect(int identifier, std::shared_ptr concept_); template friend class dlplan::ReferenceCountedObjectFactory; @@ -188,7 +188,7 @@ class IncrementConceptEffect : public NamedElementEffect, public s class DecrementConceptEffect : public NamedElementEffect, public std::enable_shared_from_this { private: - DecrementConceptEffect(int identifier, std::shared_ptr concept); + DecrementConceptEffect(int identifier, std::shared_ptr concept_); template friend class dlplan::ReferenceCountedObjectFactory; @@ -204,7 +204,7 @@ class DecrementConceptEffect : public NamedElementEffect, public s class UnchangedConceptEffect : public NamedElementEffect, public std::enable_shared_from_this { private: - UnchangedConceptEffect(int identifier, std::shared_ptr concept); + UnchangedConceptEffect(int identifier, std::shared_ptr concept_); template friend class dlplan::ReferenceCountedObjectFactory; @@ -221,7 +221,7 @@ class UnchangedConceptEffect : public NamedElementEffect, public s class GreaterConceptEffect : public NamedElementEffect, public std::enable_shared_from_this { private: - GreaterConceptEffect(int identifier, std::shared_ptr concept); + GreaterConceptEffect(int identifier, std::shared_ptr concept_); template friend class dlplan::ReferenceCountedObjectFactory; @@ -237,7 +237,7 @@ class GreaterConceptEffect : public NamedElementEffect, public std class EqualConceptEffect : public NamedElementEffect, public std::enable_shared_from_this { private: - EqualConceptEffect(int identifier, std::shared_ptr concept); + EqualConceptEffect(int identifier, std::shared_ptr concept_); template friend class dlplan::ReferenceCountedObjectFactory; diff --git a/include/dlplan/policy/parsers/syntactic/ast.hpp b/include/dlplan/policy/parsers/syntactic/ast.hpp index 408118ef..c3cab405 100644 --- a/include/dlplan/policy/parsers/syntactic/ast.hpp +++ b/include/dlplan/policy/parsers/syntactic/ast.hpp @@ -126,7 +126,7 @@ namespace dlplan::policy::ast }; struct ConceptImplementation { - core::ast::Concept concept; + core::ast::Concept concept_; }; struct Concept : x3::position_tagged { diff --git a/include/dlplan/policy/parsers/syntactic/parser.hpp b/include/dlplan/policy/parsers/syntactic/parser.hpp index d17d9100..a246848f 100644 --- a/include/dlplan/policy/parsers/syntactic/parser.hpp +++ b/include/dlplan/policy/parsers/syntactic/parser.hpp @@ -142,7 +142,7 @@ namespace dlplan::policy parser::concept_definition_type const& concept_definition(); parser::concept_implementation_type const& concept_implementation(); - parser::concept_type const& concept(); + parser::concept_type const& concept_(); parser::concept_reference_type const& concept_reference(); parser::concepts_type const& concepts(); diff --git a/src/policy/parsers/semantic/parser.cpp b/src/policy/parsers/semantic/parser.cpp index 972ec03d..822e6b0f 100644 --- a/src/policy/parsers/semantic/parser.cpp +++ b/src/policy/parsers/semantic/parser.cpp @@ -135,7 +135,7 @@ std::string parse( } std::shared_ptr parse( const ast::ConceptImplementation& node, const dlplan::error_handler_type& error_handler, Context& context) { - return dlplan::core::parse(node.concept, error_handler, *context.policy_factory.get_element_factory()); + return dlplan::core::parse(node.concept_, error_handler, *context.policy_factory.get_element_factory()); } std::pair> parse( diff --git a/src/policy/parsers/syntactic/ast_adapted.hpp b/src/policy/parsers/syntactic/ast_adapted.hpp index 906462fa..cdd3e541 100644 --- a/src/policy/parsers/syntactic/ast_adapted.hpp +++ b/src/policy/parsers/syntactic/ast_adapted.hpp @@ -24,7 +24,7 @@ BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::NumericalReference, key) BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::Numericals, definitions) BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::ConceptDefinition, key) -BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::ConceptImplementation, concept) +BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::ConceptImplementation, concept_) BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::Concept, definition, implementation) BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::ConceptReference, key) BOOST_FUSION_ADAPT_STRUCT(dlplan::policy::ast::Concepts, definitions) diff --git a/src/policy/parsers/syntactic/parser_def.hpp b/src/policy/parsers/syntactic/parser_def.hpp index 7661bb77..11f029ad 100644 --- a/src/policy/parsers/syntactic/parser_def.hpp +++ b/src/policy/parsers/syntactic/parser_def.hpp @@ -60,7 +60,7 @@ namespace dlplan::policy::parser concept_definition_type const concept_definition = "concept_definition"; concept_implementation_type const concept_implementation = "concept_implementation"; - concept_type const concept = "concept"; + concept_type const concept_ = "concept_"; concept_reference_type const concept_reference = "concept_reference"; concepts_type const concepts = "concepts"; @@ -119,9 +119,9 @@ namespace dlplan::policy::parser const auto concept_definition_def = name; const auto concept_implementation_def = dlplan::core::concept_(); - const auto concept_def = lit('(') > concept_definition > lit('"') > concept_implementation > lit('"') > lit(')'); + const auto concept__def = lit('(') > concept_definition > lit('"') > concept_implementation > lit('"') > lit(')'); const auto concept_reference_def = name; - const auto concepts_def = lit('(') >> lit(":concepts") > *concept > lit(')'); + const auto concepts_def = lit('(') >> lit(":concepts") > *concept_ > lit(')'); const auto role_definition_def = name; const auto role_implementation_def = dlplan::core::role(); @@ -177,7 +177,7 @@ namespace dlplan::policy::parser name, boolean_definition, boolean_implementation, boolean, boolean_reference, booleans, numerical_definition, numerical_implementation, numerical, numerical_reference, numericals, - concept_definition, concept_implementation, concept, concept_reference, concepts, + concept_definition, concept_implementation, concept_, concept_reference, concepts, role_definition, role_implementation, role, role_reference, roles, positive_boolean_condition, negative_boolean_condition, greater_numerical_condition, equal_numerical_condition, greater_concept_condition, equal_concept_condition, positive_boolean_effect, negative_boolean_effect, unchanged_boolean_effect, increment_numerical_effect, decrement_numerical_effect, unchanged_numerical_effect, greater_numerical_effect, equal_numerical_effect, increment_concept_effect, decrement_concept_effect, unchanged_concept_effect, greater_concept_effect, equal_concept_effect, @@ -270,8 +270,8 @@ namespace dlplan::policy parser::concept_implementation_type const& concept_implementation() { return parser::concept_implementation; } - parser::concept_type const& concept() { - return parser::concept; + parser::concept_type const& concept_() { + return parser::concept_; } parser::concept_reference_type const& concept_reference() { return parser::concept_reference;