Refactor configs

fintarin · Nov 29, 2023 · fa05cdd · fa05cdd
1 parent 386dec5
commit fa05cdd
Show file tree

Hide file tree

Showing 17 changed files with 77 additions and 110 deletions.
diff --git a/include/fintamath/core/Converter.hpp b/include/fintamath/core/Converter.hpp
@@ -27,7 +27,10 @@ class Converter {
   }
 
 private:
-  static MultiMethod<std::unique_ptr<IMathObject>(const IMathObject &, const IMathObject &)> &getConverter();
+  static MultiMethod<std::unique_ptr<IMathObject>(const IMathObject &, const IMathObject &)> &getConverter() {
+    static MultiMethod<std::unique_ptr<IMathObject>(const IMathObject &, const IMathObject &)> converter;
+    return converter;
+  }
 };
 
 template <std::derived_from<IMathObject> To, std::derived_from<IMathObject> From>

diff --git a/include/fintamath/core/IArithmetic.hpp b/include/fintamath/core/IArithmetic.hpp
@@ -62,7 +62,10 @@ class IArithmetic : public IMathObject {
   virtual std::unique_ptr<IArithmetic> negateAbstract() const = 0;
 
 private:
-  static Parser::Vector<std::unique_ptr<IArithmetic>, const std::string &> &getParser();
+  static Parser::Vector<std::unique_ptr<IArithmetic>, const std::string &> &getParser() {
+    static Parser::Vector<std::unique_ptr<IArithmetic>, const std::string &> parser;
+    return parser;
+  }
 };
 
 template <typename Derived>

diff --git a/include/fintamath/core/IComparable.hpp b/include/fintamath/core/IComparable.hpp
@@ -29,7 +29,10 @@ class IComparable : public IArithmetic {
   virtual std::strong_ordering compareAbstract(const IComparable &rhs) const = 0;
 
 private:
-  static Parser::Vector<std::unique_ptr<IComparable>, const std::string &> &getParser();
+  static Parser::Vector<std::unique_ptr<IComparable>, const std::string &> &getParser() {
+    static Parser::Vector<std::unique_ptr<IComparable>, const std::string &> parser;
+    return parser;
+  }
 };
 
 template <typename Derived>

diff --git a/include/fintamath/core/IMathObject.hpp b/include/fintamath/core/IMathObject.hpp
@@ -49,7 +49,10 @@ class IMathObject {
   virtual bool equalsAbstract(const IMathObject &rhs) const = 0;
 
 private:
-  static Parser::Vector<std::unique_ptr<IMathObject>, const std::string &> &getParser();
+  static Parser::Vector<std::unique_ptr<IMathObject>, const std::string &> &getParser() {
+    static Parser::Vector<std::unique_ptr<IMathObject>, const std::string &> parser;
+    return parser;
+  }
 };
 
 template <typename Derived>

diff --git a/include/fintamath/expressions/Expression.hpp b/include/fintamath/expressions/Expression.hpp
@@ -120,7 +120,10 @@ class Expression : public IExpressionCRTP<Expression> {
 
   friend std::unique_ptr<IMathObject> parseFintamath(const std::string &str);
 
-  static Parser::Vector<std::unique_ptr<Term>, const Token &> &getTermMakers();
+  static Parser::Vector<std::unique_ptr<Term>, const Token &> &getTermMakers() {
+    static Parser::Vector<std::unique_ptr<Term>, const Token &> maker;
+    return maker;
+  }
 
   static Parser::Map<std::unique_ptr<IMathObject>, ArgumentPtrVector &&> &getExpressionMakers();
 

diff --git a/include/fintamath/expressions/IExpression.hpp b/include/fintamath/expressions/IExpression.hpp
@@ -69,7 +69,10 @@ class IExpression : public IArithmetic {
   static ArgumentPtrVector convertToApproximatedNumbers(const ArgumentPtrVector &args);
 
 private:
-  static Parser::Vector<std::unique_ptr<IExpression>, const std::string &> &getParser();
+  static Parser::Vector<std::unique_ptr<IExpression>, const std::string &> &getParser() {
+    static Parser::Vector<std::unique_ptr<IExpression>, const std::string &> parser;
+    return parser;
+  }
 };
 
 template <typename Derived, bool isMultiFunction = false>

diff --git a/include/fintamath/functions/IFunction.hpp b/include/fintamath/functions/IFunction.hpp
@@ -77,7 +77,10 @@ class IFunction : public IMathObject {
   }
 
 private:
-  static Parser::Map<std::unique_ptr<IFunction>> &getParser();
+  static Parser::Map<std::unique_ptr<IFunction>> &getParser() {
+    static Parser::Map<std::unique_ptr<IFunction>> parser;
+    return parser;
+  }
 
   static std::unordered_map<std::string, size_t> &getFunctionOrderMutableMap() {
     static std::unordered_map<std::string, size_t> orderMap;

diff --git a/include/fintamath/functions/IOperator.hpp b/include/fintamath/functions/IOperator.hpp
@@ -48,7 +48,10 @@ class IOperator : public IFunction {
   }
 
 private:
-  static Parser::Map<std::unique_ptr<IOperator>> &getParser();
+  static Parser::Map<std::unique_ptr<IOperator>> &getParser() {
+    static Parser::Map<std::unique_ptr<IOperator>> parser;
+    return parser;
+  }
 };
 
 template <typename Return, typename Derived, typename... Args>

diff --git a/include/fintamath/literals/ILiteral.hpp b/include/fintamath/literals/ILiteral.hpp
@@ -28,7 +28,10 @@ class ILiteral : public IMathObject {
   }
 
 private:
-  static Parser::Vector<std::unique_ptr<ILiteral>, const std::string &> &getParser();
+  static Parser::Vector<std::unique_ptr<ILiteral>, const std::string &> &getParser() {
+    static Parser::Vector<std::unique_ptr<ILiteral>, const std::string &> parser;
+    return parser;
+  }
 };
 
 template <typename Derived>

diff --git a/include/fintamath/literals/constants/IConstant.hpp b/include/fintamath/literals/constants/IConstant.hpp
@@ -29,7 +29,10 @@ class IConstant : public ILiteral {
   virtual std::unique_ptr<IMathObject> call() const = 0;
 
 private:
-  static Parser::Map<std::unique_ptr<IConstant>> &getParser();
+  static Parser::Map<std::unique_ptr<IConstant>> &getParser() {
+    static Parser::Map<std::unique_ptr<IConstant>> parser;
+    return parser;
+  }
 };
 
 template <typename Return, typename Derived>

diff --git a/include/fintamath/numbers/IInteger.hpp b/include/fintamath/numbers/IInteger.hpp
@@ -87,7 +87,10 @@ class IInteger : public INumber {
   virtual IInteger &decreaseAbstract() = 0;
 
 private:
-  static Parser::Vector<std::unique_ptr<IInteger>, const std::string &> &getParser();
+  static Parser::Vector<std::unique_ptr<IInteger>, const std::string &> &getParser() {
+    static Parser::Vector<std::unique_ptr<IInteger>, const std::string &> parser;
+    return parser;
+  }
 };
 
 template <typename Derived>

diff --git a/include/fintamath/numbers/INumber.hpp b/include/fintamath/numbers/INumber.hpp
@@ -35,7 +35,10 @@ class INumber : public IComparable {
   }
 
 private:
-  static Parser::Vector<std::unique_ptr<INumber>, const std::string &> &getParser();
+  static Parser::Vector<std::unique_ptr<INumber>, const std::string &> &getParser() {
+    static Parser::Vector<std::unique_ptr<INumber>, const std::string &> parser;
+    return parser;
+  }
 };
 
 inline std::unique_ptr<INumber> operator+(const INumber &lhs, const INumber &rhs) {

diff --git a/include/fintamath/parser/Tokenizer.hpp b/include/fintamath/parser/Tokenizer.hpp
@@ -25,7 +25,10 @@ class Tokenizer {
 
   static bool isSpace(char ch);
 
-  static TokenVector &getRegisteredTokens();
+  static TokenVector &getRegisteredTokens() {
+    static TokenVector registeredTokens;
+    return registeredTokens;
+  }
 };
 
 }
diff --git a/src/fintamath/config/Config.cpp b/src/fintamath/config/Config.cpp
@@ -0,0 +1,24 @@
+#include "fintamath/config/ConverterConfig.hpp"
+#include "fintamath/config/ExpressionConfig.hpp"
+#include "fintamath/config/ParserConfig.hpp"
+
+using namespace fintamath;
+
+namespace fintamath {
+
+Parser::Map<std::unique_ptr<IMathObject>, ArgumentPtrVector &&> &Expression::getExpressionMakers() {
+  static Parser::Map<std::unique_ptr<IMathObject>, ArgumentPtrVector &&> maker;
+  return maker;
+}
+
+}
+
+using namespace fintamath;
+
+namespace {
+
+const ParserConfig parserConfig;
+const ConverterConfig coverterConfig;
+const ExpressionConfig expressionConfig;
+
+}
diff --git a/src/fintamath/config/ConverterConfig.cpp → src/fintamath/config/ConverterConfig.hpp b/src/fintamath/config/ConverterConfig.cpp → src/fintamath/config/ConverterConfig.hpp
@@ -7,17 +7,6 @@
 
 namespace fintamath {
 
-MultiMethod<std::unique_ptr<IMathObject>(const IMathObject &, const IMathObject &)> &Converter::getConverter() {
-  static MultiMethod<std::unique_ptr<IMathObject>(const IMathObject &, const IMathObject &)> converter;
-  return converter;
-}
-
-}
-
-using namespace fintamath;
-
-namespace {
-
 struct ConverterConfig {
   ConverterConfig() {
     Converter::add<Integer, Integer>([](const Integer & /*type*/, const Integer &value) {
@@ -56,6 +45,4 @@ struct ConverterConfig {
   }
 };
 
-const ConverterConfig config;
-
 }
diff --git a/src/fintamath/config/ExpressionConfig.cpp → src/fintamath/config/ExpressionConfig.hpp b/src/fintamath/config/ExpressionConfig.cpp → src/fintamath/config/ExpressionConfig.hpp
@@ -90,22 +90,6 @@
 
 namespace fintamath {
 
-Parser::Vector<std::unique_ptr<Term>, const Token &> &Expression::getTermMakers() {
-  static Parser::Vector<std::unique_ptr<Term>, const Token &> maker;
-  return maker;
-}
-
-Parser::Map<std::unique_ptr<IMathObject>, ArgumentPtrVector &&> &Expression::getExpressionMakers() {
-  static Parser::Map<std::unique_ptr<IMathObject>, ArgumentPtrVector &&> maker;
-  return maker;
-}
-
-}
-
-using namespace fintamath;
-
-namespace {
-
 struct ExpressionConfig {
   ExpressionConfig() {
     registerTermsMakers();
@@ -459,6 +443,4 @@ struct ExpressionConfig {
   }
 };
 
-const ExpressionConfig config;
-
 }
diff --git a/src/fintamath/config/ParserConfig.cpp → src/fintamath/config/ParserConfig.hpp b/src/fintamath/config/ParserConfig.cpp → src/fintamath/config/ParserConfig.hpp
@@ -95,73 +95,10 @@
 
 namespace fintamath {
 
-TokenVector &Tokenizer::getRegisteredTokens() {
-  static TokenVector registeredTokens;
-  return registeredTokens;
-}
-
-Parser::Vector<std::unique_ptr<IMathObject>, const std::string &> &IMathObject::getParser() {
-  static Parser::Vector<std::unique_ptr<IMathObject>, const std::string &> parser;
-  return parser;
-}
-
-Parser::Vector<std::unique_ptr<IArithmetic>, const std::string &> &IArithmetic::getParser() {
-  static Parser::Vector<std::unique_ptr<IArithmetic>, const std::string &> parser;
-  return parser;
-}
-
-Parser::Vector<std::unique_ptr<IComparable>, const std::string &> &IComparable::getParser() {
-  static Parser::Vector<std::unique_ptr<IComparable>, const std::string &> parser;
-  return parser;
-}
-
-Parser::Vector<std::unique_ptr<INumber>, const std::string &> &INumber::getParser() {
-  static Parser::Vector<std::unique_ptr<INumber>, const std::string &> parser;
-  return parser;
-}
-
-Parser::Vector<std::unique_ptr<IInteger>, const std::string &> &IInteger::getParser() {
-  static Parser::Vector<std::unique_ptr<IInteger>, const std::string &> parser;
-  return parser;
-}
-
-Parser::Vector<std::unique_ptr<ILiteral>, const std::string &> &ILiteral::getParser() {
-  static Parser::Vector<std::unique_ptr<ILiteral>, const std::string &> parser;
-  return parser;
-}
-
-Parser::Map<std::unique_ptr<IConstant>> &IConstant::getParser() {
-  static Parser::Map<std::unique_ptr<IConstant>> parser;
-  return parser;
-}
-
-Parser::Map<std::unique_ptr<IFunction>> &IFunction::getParser() {
-  static Parser::Map<std::unique_ptr<IFunction>> parser;
-  return parser;
-}
-
-Parser::Map<std::unique_ptr<IOperator>> &IOperator::getParser() {
-  static Parser::Map<std::unique_ptr<IOperator>> parser;
-  return parser;
-}
-
-Parser::Vector<std::unique_ptr<IExpression>, const std::string &> &IExpression::getParser() {
-  static Parser::Vector<std::unique_ptr<IExpression>, const std::string &> parser;
-  return parser;
-}
-
-}
-
-using namespace fintamath;
-
-namespace {
-
 struct ParserConfig {
   ParserConfig() {
     IMathObject::registerType<ILiteral>(&ILiteral::parse);
-    IMathObject::registerType<IFunction>([](const std::string &str) {
-      return IFunction::parse(str);
-    });
+    IMathObject::registerType<IFunction>([](const std::string &str) { return IFunction::parse(str); });
     IMathObject::registerType<IArithmetic>(&IArithmetic::parse);
 
     IArithmetic::registerType<IComparable>(&IComparable::parse);
@@ -261,6 +198,4 @@ struct ParserConfig {
   }
 };
 
-const ParserConfig config;
-
 }