fix formatter

drexlerd · Aug 14, 2024 · cc112ca · cc112ca
1 parent 9a0c04d
commit cc112ca
Show file tree

Hide file tree

Showing 45 changed files with 388 additions and 381 deletions.
diff --git a/include/loki/details/ast/printer.hpp b/include/loki/details/ast/printer.hpp
@@ -19,7 +19,6 @@
 #define LOKI_INCLUDE_LOKI_AST_PRINTER_HPP_
 
 #include "loki/details/ast/ast.hpp"
-#include "loki/details/pddl/formatter.hpp"
 
 namespace loki
 {

diff --git a/include/loki/details/pddl/action.hpp b/include/loki/details/pddl/action.hpp
@@ -62,6 +62,8 @@ class ActionImpl
     const std::optional<Effect>& get_effect() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const ActionImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/atom.hpp b/include/loki/details/pddl/atom.hpp
@@ -49,6 +49,8 @@ class AtomImpl
     const TermList& get_terms() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const AtomImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/axiom.hpp b/include/loki/details/pddl/axiom.hpp
@@ -53,6 +53,8 @@ class AxiomImpl
     size_t get_num_parameters_to_ground_head() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const AxiomImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/conditions.hpp b/include/loki/details/pddl/conditions.hpp
@@ -199,6 +199,15 @@ class ConditionForallImpl
     const Condition& get_condition() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const ConditionLiteralImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const ConditionAndImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const ConditionOrImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const ConditionNotImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const ConditionImplyImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const ConditionExistsImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const ConditionForallImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const ConditionImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/domain.hpp b/include/loki/details/pddl/domain.hpp
@@ -75,6 +75,8 @@ class DomainImpl
     const AxiomList& get_axioms() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const DomainImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/effects.hpp b/include/loki/details/pddl/effects.hpp
@@ -164,6 +164,13 @@ class EffectConditionalWhenImpl
     const Effect& get_effect() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const EffectLiteralImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const EffectAndImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const EffectNumericImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const EffectConditionalForallImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const EffectConditionalWhenImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const EffectImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/function.hpp b/include/loki/details/pddl/function.hpp
@@ -49,6 +49,8 @@ class FunctionImpl
     const TermList& get_terms() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const FunctionImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/function_expressions.hpp b/include/loki/details/pddl/function_expressions.hpp
@@ -174,6 +174,13 @@ class FunctionExpressionFunctionImpl
     const Function& get_function() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const FunctionExpressionNumberImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const FunctionExpressionBinaryOperatorImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const FunctionExpressionMultiOperatorImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const FunctionExpressionMinusImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const FunctionExpressionFunctionImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const FunctionExpressionImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/function_skeleton.hpp b/include/loki/details/pddl/function_skeleton.hpp
@@ -51,6 +51,8 @@ class FunctionSkeletonImpl
     const Type& get_type() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const FunctionSkeletonImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/literal.hpp b/include/loki/details/pddl/literal.hpp
@@ -48,6 +48,8 @@ class LiteralImpl
     bool is_negated() const;
     const Atom& get_atom() const;
 };
+
+extern std::ostream& operator<<(std::ostream& out, const LiteralImpl& element);
 }
 
 #endif
diff --git a/include/loki/details/pddl/metric.hpp b/include/loki/details/pddl/metric.hpp
@@ -57,6 +57,8 @@ class OptimizationMetricImpl
     OptimizationMetricEnum get_optimization_metric() const;
     const FunctionExpression& get_function_expression() const;
 };
+
+extern std::ostream& operator<<(std::ostream& out, const OptimizationMetricImpl& element);
 }
 
 #endif
diff --git a/include/loki/details/pddl/numeric_fluent.hpp b/include/loki/details/pddl/numeric_fluent.hpp
@@ -49,6 +49,8 @@ class NumericFluentImpl
     double get_number() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const NumericFluentImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/parameter.hpp b/include/loki/details/pddl/parameter.hpp
@@ -54,6 +54,7 @@ class ParameterImpl
 /// by checking whether the types are compatible
 extern bool is_specialized_parameter(const Parameter& specialized_parameter, const Parameter& generalized_parameter);
 
+extern std::ostream& operator<<(std::ostream& out, const ParameterImpl& element);
 }
 
 #endif
diff --git a/include/loki/details/pddl/predicate.hpp b/include/loki/details/pddl/predicate.hpp
@@ -51,6 +51,8 @@ class PredicateImpl
     const ParameterList& get_parameters() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const PredicateImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/problem.hpp b/include/loki/details/pddl/problem.hpp
@@ -80,6 +80,8 @@ class ProblemImpl
     const AxiomList& get_axioms() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const ProblemImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/requirements.hpp b/include/loki/details/pddl/requirements.hpp
@@ -80,6 +80,8 @@ class RequirementsImpl
     const RequirementEnumSet& get_requirements() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const RequirementsImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/term.hpp b/include/loki/details/pddl/term.hpp
@@ -75,6 +75,10 @@ class TermVariableImpl
     const Variable& get_variable() const;
 };
 
+extern std::ostream& operator<<(std::ostream& out, const TermObjectImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const TermVariableImpl& element);
+extern std::ostream& operator<<(std::ostream& out, const TermImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/type.hpp b/include/loki/details/pddl/type.hpp
@@ -55,6 +55,8 @@ extern TypeSet collect_types_from_hierarchy(const TypeList& types);
 /// @brief Return true iff type is a subtype of or equal to one of the types in parent_types
 extern bool is_subtype_or_equal(const Type& type, const TypeList& parent_types);
 
+extern std::ostream& operator<<(std::ostream& out, const TypeImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/details/pddl/variable.hpp b/include/loki/details/pddl/variable.hpp
@@ -49,6 +49,8 @@ class VariableImpl
 
 extern VariableSet collect_free_variables(const loki::ConditionImpl& condition);
 
+extern std::ostream& operator<<(std::ostream& out, const VariableImpl& element);
+
 }
 
 #endif
diff --git a/include/loki/loki.hpp b/include/loki/loki.hpp
@@ -34,7 +34,6 @@
 #include "loki/details/pddl/error_reporting.hpp"
 #include "loki/details/pddl/exceptions.hpp"
 #include "loki/details/pddl/factories.hpp"
-#include "loki/details/pddl/formatter.hpp"
 #include "loki/details/pddl/function.hpp"
 #include "loki/details/pddl/function_expressions.hpp"
 #include "loki/details/pddl/function_skeleton.hpp"

diff --git a/src/pddl/action.cpp b/src/pddl/action.cpp
@@ -17,6 +17,7 @@
 
 #include "loki/details/pddl/action.hpp"
 
+#include "formatter.hpp"
 #include "loki/details/pddl/conditions.hpp"
 #include "loki/details/pddl/effects.hpp"
 #include "loki/details/pddl/parameter.hpp"
@@ -50,4 +51,11 @@ const std::optional<Condition>& ActionImpl::get_condition() const { return m_con
 
 const std::optional<Effect>& ActionImpl::get_effect() const { return m_effect; }
 
+std::ostream& operator<<(std::ostream& out, const ActionImpl& element)
+{
+    auto formatter = PDDLFormatter();
+    formatter.write(element, out);
+    return out;
+}
+
 }
diff --git a/src/pddl/atom.cpp b/src/pddl/atom.cpp
@@ -17,6 +17,7 @@
 
 #include "loki/details/pddl/atom.hpp"
 
+#include "formatter.hpp"
 #include "loki/details/pddl/predicate.hpp"
 #include "loki/details/pddl/term.hpp"
 
@@ -30,4 +31,11 @@ const Predicate& AtomImpl::get_predicate() const { return m_predicate; }
 
 const TermList& AtomImpl::get_terms() const { return m_terms; }
 
+std::ostream& operator<<(std::ostream& out, const AtomImpl& element)
+{
+    auto formatter = PDDLFormatter();
+    formatter.write(element, out);
+    return out;
+}
+
 }
diff --git a/src/pddl/axiom.cpp b/src/pddl/axiom.cpp
@@ -17,6 +17,7 @@
 
 #include "loki/details/pddl/axiom.hpp"
 
+#include "formatter.hpp"
 #include "loki/details/pddl/conditions.hpp"
 #include "loki/details/pddl/effects.hpp"
 #include "loki/details/pddl/literal.hpp"
@@ -44,4 +45,11 @@ const ParameterList& AxiomImpl::get_parameters() const { return m_parameters; }
 
 size_t AxiomImpl::get_num_parameters_to_ground_head() const { return m_num_parameters_to_ground_head; }
 
+std::ostream& operator<<(std::ostream& out, const AxiomImpl& element)
+{
+    auto formatter = PDDLFormatter();
+    formatter.write(element, out);
+    return out;
+}
+
 }
diff --git a/src/pddl/conditions.cpp b/src/pddl/conditions.cpp
@@ -17,6 +17,7 @@
 
 #include "loki/details/pddl/conditions.hpp"
 
+#include "formatter.hpp"
 #include "loki/details/pddl/literal.hpp"
 #include "loki/details/pddl/parameter.hpp"
 
@@ -93,4 +94,59 @@ const ParameterList& ConditionForallImpl::get_parameters() const { return m_para
 
 const Condition& ConditionForallImpl::get_condition() const { return m_condition; }
 
+std::ostream& operator<<(std::ostream& out, const ConditionLiteralImpl& element)
+{
+    auto formatter = PDDLFormatter();
+    formatter.write(element, out);
+    return out;
+}
+
+std::ostream& operator<<(std::ostream& out, const ConditionAndImpl& element)
+{
+    auto formatter = PDDLFormatter();
+    formatter.write(element, out);
+    return out;
+}
+
+std::ostream& operator<<(std::ostream& out, const ConditionOrImpl& element)
+{
+    auto formatter = PDDLFormatter();
+    formatter.write(element, out);
+    return out;
+}
+
+std::ostream& operator<<(std::ostream& out, const ConditionNotImpl& element)
+{
+    auto formatter = PDDLFormatter();
+    formatter.write(element, out);
+    return out;
+}
+
+std::ostream& operator<<(std::ostream& out, const ConditionImplyImpl& element)
+{
+    auto formatter = PDDLFormatter();
+    formatter.write(element, out);
+    return out;
+}
+
+std::ostream& operator<<(std::ostream& out, const ConditionExistsImpl& element)
+{
+    auto formatter = PDDLFormatter();
+    formatter.write(element, out);
+    return out;
+}
+
+std::ostream& operator<<(std::ostream& out, const ConditionForallImpl& element)
+{
+    auto formatter = PDDLFormatter();
+    formatter.write(element, out);
+    return out;
+}
+
+std::ostream& operator<<(std::ostream& out, const ConditionImpl& element)
+{
+    auto formatter = PDDLFormatter();
+    formatter.write(element, out);
+    return out;
+}
 }
diff --git a/src/pddl/domain.cpp b/src/pddl/domain.cpp
@@ -17,6 +17,7 @@
 
 #include "loki/details/pddl/domain.hpp"
 
+#include "formatter.hpp"
 #include "loki/details/pddl/action.hpp"
 #include "loki/details/pddl/axiom.hpp"
 #include "loki/details/pddl/function_skeleton.hpp"
@@ -76,4 +77,11 @@ const ActionList& DomainImpl::get_actions() const { return m_actions; }
 
 const AxiomList& DomainImpl::get_axioms() const { return m_axioms; }
 
+std::ostream& operator<<(std::ostream& out, const DomainImpl& element)
+{
+    auto formatter = PDDLFormatter();
+    formatter.write(element, out);
+    return out;
+}
+
 }