rename concept in parser

rleap-project · Nov 9, 2023 · 3313e1e · 3313e1e
1 parent 9e25a8f
commit 3313e1e
Show file tree

Hide file tree

Showing 40 changed files with 234 additions and 234 deletions.
diff --git a/include/dlplan/core.h b/include/dlplan/core.h
@@ -1105,28 +1105,28 @@ class SyntacticElementFactory {
     std::shared_ptr<const Boolean> parse_boolean(
         iterator_type& iter, iterator_type end, const std::string& filename="");
 
-    std::shared_ptr<const Boolean> make_empty_boolean(const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Boolean> make_empty_boolean(const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Boolean> make_empty_boolean(const std::shared_ptr<const Role>& role);
     std::shared_ptr<const Boolean> make_inclusion_boolean(const std::shared_ptr<const Concept>& concept_left, const std::shared_ptr<const Concept>& concept_right);
     std::shared_ptr<const Boolean> make_inclusion_boolean(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
     std::shared_ptr<const Boolean> make_nullary_boolean(const Predicate& predicate);
 
-    std::shared_ptr<const Concept> make_all_concept(const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Concept> make_all_concept(const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Concept> make_and_concept(const std::shared_ptr<const Concept>& concept_left, const std::shared_ptr<const Concept>& concept_right);
     std::shared_ptr<const Concept> make_bot_concept();
     std::shared_ptr<const Concept> make_diff_concept(const std::shared_ptr<const Concept>& concept_left, const std::shared_ptr<const Concept>& concept_right);
     std::shared_ptr<const Concept> make_equal_concept(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
-    std::shared_ptr<const Concept> make_not_concept(const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Concept> make_not_concept(const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Concept> make_one_of_concept(const Constant& constant);
     std::shared_ptr<const Concept> make_or_concept(const std::shared_ptr<const Concept>& concept_left, const std::shared_ptr<const Concept>& concept_right);
     std::shared_ptr<const Concept> make_projection_concept(const std::shared_ptr<const Role>& role, int pos);
     std::shared_ptr<const Concept> make_primitive_concept(const Predicate& predicate, int pos);
-    std::shared_ptr<const Concept> make_some_concept(const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Concept> make_some_concept(const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Concept> make_subset_concept(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
     std::shared_ptr<const Concept> make_top_concept();
 
     std::shared_ptr<const Numerical> make_concept_distance_numerical(const std::shared_ptr<const Concept>& concept_from, const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept_to);
-    std::shared_ptr<const Numerical> make_count_numerical(const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Numerical> make_count_numerical(const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Numerical> make_count_numerical(const std::shared_ptr<const Role>& role);
     std::shared_ptr<const Numerical> make_role_distance_numerical(const std::shared_ptr<const Role>& role_from, const std::shared_ptr<const Role>& role, const std::shared_ptr<const Role>& role_to);
     std::shared_ptr<const Numerical> make_sum_concept_distance_numerical(const std::shared_ptr<const Concept>& concept_from, const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept_to);
@@ -1135,12 +1135,12 @@ class SyntacticElementFactory {
     std::shared_ptr<const Role> make_and_role(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
     std::shared_ptr<const Role> make_compose_role(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
     std::shared_ptr<const Role> make_diff_role(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
-    std::shared_ptr<const Role> make_identity_role(const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Role> make_identity_role(const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Role> make_inverse_role(const std::shared_ptr<const Role>& role);
     std::shared_ptr<const Role> make_not_role(const std::shared_ptr<const Role>& role);
     std::shared_ptr<const Role> make_or_role(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
     std::shared_ptr<const Role> make_primitive_role(const Predicate& predicate, int pos_1, int pos_2);
-    std::shared_ptr<const Role> make_restrict_role(const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Role> make_restrict_role(const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Role> make_top_role();
     std::shared_ptr<const Role> make_transitive_closure(const std::shared_ptr<const Role>& role);
     std::shared_ptr<const Role> make_transitive_reflexive_closure(const std::shared_ptr<const Role>& role);

diff --git a/include/dlplan/core/parsers/syntactic/parser.hpp b/include/dlplan/core/parsers/syntactic/parser.hpp
@@ -32,7 +32,7 @@ namespace dlplan::core
     parser::element_type const& element();
     parser::boolean_type const& boolean();
     parser::numerical_type const& numerical();
-    parser::concept_type const& concept();
+    parser::concept_type const& concept_();
     parser::role_type const& role();
 }
 

diff --git a/include/dlplan/policy.h b/include/dlplan/policy.h
@@ -485,7 +485,7 @@ class PolicyFactory {
      */
     std::shared_ptr<const NamedBoolean> make_boolean(const std::string& key, const std::shared_ptr<const core::Boolean>& boolean);
     std::shared_ptr<const NamedNumerical> make_numerical(const std::string& key, const std::shared_ptr<const core::Numerical>& numerical);
-    std::shared_ptr<const NamedConcept> make_concept(const std::string& key, const std::shared_ptr<const core::Concept>& concept);
+    std::shared_ptr<const NamedConcept> make_concept(const std::string& key, const std::shared_ptr<const core::Concept>& concept_);
     std::shared_ptr<const NamedRole> make_role(const std::string& key, const std::shared_ptr<const core::Role>& role);
 
     /**

diff --git a/src/core/element_factory.h b/src/core/element_factory.h
@@ -57,28 +57,28 @@ class SyntacticElementFactoryImpl {
     std::shared_ptr<const Boolean> parse_boolean(SyntacticElementFactory& parent,
         iterator_type& iter, iterator_type end, const std::string& filename);
 
-    std::shared_ptr<const Boolean> make_empty_boolean(const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Boolean> make_empty_boolean(const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Boolean> make_empty_boolean(const std::shared_ptr<const Role>& role);
     std::shared_ptr<const Boolean> make_inclusion_boolean(const std::shared_ptr<const Concept>& concept_left, const std::shared_ptr<const Concept>& concept_right);
     std::shared_ptr<const Boolean> make_inclusion_boolean(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
     std::shared_ptr<const Boolean> make_nullary_boolean(const Predicate& predicate);
 
-    std::shared_ptr<const Concept> make_all_concept(const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Concept> make_all_concept(const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Concept> make_and_concept(const std::shared_ptr<const Concept>& concept_left, const std::shared_ptr<const Concept>& concept_right);
     std::shared_ptr<const Concept> make_bot_concept();
     std::shared_ptr<const Concept> make_diff_concept(const std::shared_ptr<const Concept>& concept_left, const std::shared_ptr<const Concept>& concept_right);
     std::shared_ptr<const Concept> make_equal_concept(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
-    std::shared_ptr<const Concept> make_not_concept(const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Concept> make_not_concept(const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Concept> make_one_of_concept(const Constant& constant);
     std::shared_ptr<const Concept> make_or_concept(const std::shared_ptr<const Concept>& concept_left, const std::shared_ptr<const Concept>& concept_right);
     std::shared_ptr<const Concept> make_projection_concept(const std::shared_ptr<const Role>& role, int pos);
     std::shared_ptr<const Concept> make_primitive_concept(const Predicate& predicate, int pos);
-    std::shared_ptr<const Concept> make_some_concept(const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Concept> make_some_concept(const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Concept> make_subset_concept(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
     std::shared_ptr<const Concept> make_top_concept();
 
     std::shared_ptr<const Numerical> make_concept_distance_numerical(const std::shared_ptr<const Concept>& concept_from, const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept_to);
-    std::shared_ptr<const Numerical> make_count_numerical(const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Numerical> make_count_numerical(const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Numerical> make_count_numerical(const std::shared_ptr<const Role>& role);
     std::shared_ptr<const Numerical> make_role_distance_numerical(const std::shared_ptr<const Role>& role_from, const std::shared_ptr<const Role>& role, const std::shared_ptr<const Role>& role_to);
     std::shared_ptr<const Numerical> make_sum_concept_distance_numerical(const std::shared_ptr<const Concept>& concept_from, const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept_to);
@@ -87,12 +87,12 @@ class SyntacticElementFactoryImpl {
     std::shared_ptr<const Role> make_and_role(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
     std::shared_ptr<const Role> make_compose_role(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
     std::shared_ptr<const Role> make_diff_role(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
-    std::shared_ptr<const Role> make_identity_role(const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Role> make_identity_role(const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Role> make_inverse_role(const std::shared_ptr<const Role>& role);
     std::shared_ptr<const Role> make_not_role(const std::shared_ptr<const Role>& role);
     std::shared_ptr<const Role> make_or_role(const std::shared_ptr<const Role>& role_left, const std::shared_ptr<const Role>& role_right);
     std::shared_ptr<const Role> make_primitive_role(const Predicate& predicate, int pos_1, int pos_2);
-    std::shared_ptr<const Role> make_restrict_role(const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept);
+    std::shared_ptr<const Role> make_restrict_role(const std::shared_ptr<const Role>& role, const std::shared_ptr<const Concept>& concept_);
     std::shared_ptr<const Role> make_top_role();
     std::shared_ptr<const Role> make_transitive_closure(const std::shared_ptr<const Role>& role);
     std::shared_ptr<const Role> make_transitive_reflexive_closure(const std::shared_ptr<const Role>& role);

diff --git a/src/core/elements/booleans/empty.h b/src/core/elements/booleans/empty.h
@@ -24,11 +24,11 @@ class EmptyBoolean;
 
 namespace boost::serialization {
     template<typename Archive, typename T>
-    void serialize(Archive& ar, dlplan::core::EmptyBoolean<T>& boolean, const unsigned int version);
+    void serialize(Archive& ar, dlplan::core::EmptyBoolean<T>& t, const unsigned int version);
     template<class Archive, typename T>
-    void save_construct_data(Archive& ar, const dlplan::core::EmptyBoolean<T>* boolean, const unsigned int version);
+    void save_construct_data(Archive& ar, const dlplan::core::EmptyBoolean<T>* t, const unsigned int version);
     template<class Archive, typename T>
-    void load_construct_data(Archive& ar, dlplan::core::EmptyBoolean<T>* boolean, const unsigned int version);
+    void load_construct_data(Archive& ar, dlplan::core::EmptyBoolean<T>* t, const unsigned int version);
 }
 
 
@@ -65,11 +65,11 @@ class EmptyBoolean : public Boolean {
     }
 
     template<typename Archive, typename T_>
-    friend void boost::serialization::serialize(Archive& ar, EmptyBoolean<T_>& boolean, const unsigned int version);
+    friend void boost::serialization::serialize(Archive& ar, EmptyBoolean<T_>& t, const unsigned int version);
     template<class Archive, typename T_>
-    friend void boost::serialization::save_construct_data(Archive & ar, const EmptyBoolean<T_>* boolean, const unsigned int version);
+    friend void boost::serialization::save_construct_data(Archive & ar, const EmptyBoolean<T_>* t, const unsigned int version);
     template<class Archive, typename T_>
-    friend void boost::serialization::load_construct_data(Archive & ar, EmptyBoolean<T_>* boolean, const unsigned int version);
+    friend void boost::serialization::load_construct_data(Archive & ar, EmptyBoolean<T_>* t, const unsigned int version);
 
 protected:
     const std::shared_ptr<const T> m_element;

diff --git a/src/core/elements/booleans/inclusion.h b/src/core/elements/booleans/inclusion.h
@@ -24,11 +24,11 @@ class InclusionBoolean;
 
 namespace boost::serialization {
     template<typename Archive, typename T>
-    void serialize(Archive& ar, dlplan::core::InclusionBoolean<T>& boolean, const unsigned int version);
+    void serialize(Archive& ar, dlplan::core::InclusionBoolean<T>& t, const unsigned int version);
     template<class Archive, typename T>
-    void save_construct_data(Archive& ar, const dlplan::core::InclusionBoolean<T>* boolean, const unsigned int version);
+    void save_construct_data(Archive& ar, const dlplan::core::InclusionBoolean<T>* t, const unsigned int version);
     template<class Archive, typename T>
-    void load_construct_data(Archive& ar, dlplan::core::InclusionBoolean<T>* boolean, const unsigned int version);
+    void load_construct_data(Archive& ar, dlplan::core::InclusionBoolean<T>* t, const unsigned int version);
 }
 
 
@@ -68,11 +68,11 @@ class InclusionBoolean : public Boolean {
     }
 
     template<typename Archive, typename T_>
-    friend void boost::serialization::serialize(Archive& ar, InclusionBoolean<T_>& boolean, const unsigned int version);
+    friend void boost::serialization::serialize(Archive& ar, InclusionBoolean<T_>& t, const unsigned int version);
     template<class Archive, typename T_>
-    friend void boost::serialization::save_construct_data(Archive& ar, const InclusionBoolean<T_>* boolean, const unsigned int version);
+    friend void boost::serialization::save_construct_data(Archive& ar, const InclusionBoolean<T_>* t, const unsigned int version);
     template<class Archive, typename T_>
-    friend void boost::serialization::load_construct_data(Archive& ar, InclusionBoolean<T_>* boolean, const unsigned int version);
+    friend void boost::serialization::load_construct_data(Archive& ar, InclusionBoolean<T_>* t, const unsigned int version);
 
 protected:
     const std::shared_ptr<const T> m_element_left;

diff --git a/src/core/elements/booleans/nullary.h b/src/core/elements/booleans/nullary.h
@@ -23,11 +23,11 @@ class NullaryBoolean;
 
 namespace boost::serialization {
     template<typename Archive>
-    void serialize(Archive& ar, dlplan::core::NullaryBoolean& boolean, const unsigned int version);
+    void serialize(Archive& ar, dlplan::core::NullaryBoolean& t, const unsigned int version);
     template<class Archive>
-    void save_construct_data(Archive& ar, const dlplan::core::NullaryBoolean* boolean, const unsigned int version);
+    void save_construct_data(Archive& ar, const dlplan::core::NullaryBoolean* t, const unsigned int version);
     template<class Archive>
-    void load_construct_data(Archive& ar, dlplan::core::NullaryBoolean* boolean, const unsigned int version);
+    void load_construct_data(Archive& ar, dlplan::core::NullaryBoolean* t, const unsigned int version);
 }
 
 
@@ -66,11 +66,11 @@ class NullaryBoolean : public Boolean {
     }
 
     template<typename Archive>
-    friend void boost::serialization::serialize(Archive& ar, NullaryBoolean& boolean, const unsigned int version);
+    friend void boost::serialization::serialize(Archive& ar, NullaryBoolean& t, const unsigned int version);
     template<class Archive>
-    friend void boost::serialization::save_construct_data(Archive& ar, const NullaryBoolean* boolean, const unsigned int version);
+    friend void boost::serialization::save_construct_data(Archive& ar, const NullaryBoolean* t, const unsigned int version);
     template<class Archive>
-    friend void boost::serialization::load_construct_data(Archive& ar, NullaryBoolean* boolean, const unsigned int version);
+    friend void boost::serialization::load_construct_data(Archive& ar, NullaryBoolean* t, const unsigned int version);
 
 protected:
     const Predicate m_predicate;

diff --git a/src/core/elements/concepts/all.h b/src/core/elements/concepts/all.h
@@ -23,11 +23,11 @@ class AllConcept;
 
 namespace boost::serialization {
     template<typename Archive>
-    void serialize(Archive& ar, dlplan::core::AllConcept& concept, const unsigned int version);
+    void serialize(Archive& ar, dlplan::core::AllConcept& t, const unsigned int version);
     template<class Archive>
-    void save_construct_data(Archive& ar, const dlplan::core::AllConcept* concept, const unsigned int version);
+    void save_construct_data(Archive& ar, const dlplan::core::AllConcept* t, const unsigned int version);
     template<class Archive>
-    void load_construct_data(Archive& ar, dlplan::core::AllConcept* concept, const unsigned int version);
+    void load_construct_data(Archive& ar, dlplan::core::AllConcept* t, const unsigned int version);
 }
 
 
@@ -70,11 +70,11 @@ class AllConcept : public Concept {
     }
 
     template<typename Archive>
-    friend void boost::serialization::serialize(Archive& ar, AllConcept& concept, const unsigned int version);
+    friend void boost::serialization::serialize(Archive& ar, AllConcept& t, const unsigned int version);
     template<class Archive>
-    friend void boost::serialization::save_construct_data(Archive& ar, const AllConcept* concept, const unsigned int version);
+    friend void boost::serialization::save_construct_data(Archive& ar, const AllConcept* t, const unsigned int version);
     template<class Archive>
-    friend void boost::serialization::load_construct_data(Archive& ar, AllConcept* concept, const unsigned int version);
+    friend void boost::serialization::load_construct_data(Archive& ar, AllConcept* t, const unsigned int version);
 
 protected:
     const std::shared_ptr<const Role> m_role;