Move some classes and functions to detail namespace

fintarin · Feb 13, 2024 · 4c17822 · 4c17822
1 parent 176acd3
commit 4c17822
Show file tree

Hide file tree

Showing 102 changed files with 235 additions and 91 deletions.
diff --git a/include/fintamath/config/Config.hpp b/include/fintamath/config/Config.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace fintamath {
+namespace fintamath::detail {
 
 struct Config final {
   Config();

diff --git a/include/fintamath/core/Cache.hpp b/include/fintamath/core/Cache.hpp
@@ -3,7 +3,7 @@
 #include <functional>
 #include <unordered_map>
 
-namespace fintamath {
+namespace fintamath::detail {
 
 template <typename Key, typename Value>
 class Cache final {

diff --git a/include/fintamath/core/Converter.hpp b/include/fintamath/core/Converter.hpp
@@ -10,6 +10,8 @@ namespace fintamath {
 
 class IMathObject;
 
+namespace detail {
+
 class Converter final {
   template <std::derived_from<IMathObject> To, std::derived_from<IMathObject> From>
   using ConverterFunction = std::function<std::unique_ptr<IMathObject>(const To &to, const From &from)>;
@@ -34,9 +36,11 @@ class Converter final {
   static ConverterMultiMethod &getConverter();
 };
 
+}
+
 template <std::derived_from<IMathObject> To, std::derived_from<IMathObject> From>
 std::unique_ptr<To> convert(const To &to, const From &from) {
-  return cast<To>(Converter::convert(to, from));
+  return cast<To>(detail::Converter::convert(to, from));
 }
 
 template <std::derived_from<IMathObject> To, std::derived_from<IMathObject> From>
@@ -47,13 +51,13 @@ std::unique_ptr<To> convert(const From &from) {
 
 template <std::derived_from<IMathObject> To, std::derived_from<IMathObject> From>
 bool isConvertible(const To &to, const From &from) {
-  return Converter::isConvertible(to, from);
+  return detail::Converter::isConvertible(to, from);
 }
 
 template <std::derived_from<IMathObject> To, std::derived_from<IMathObject> From>
 bool isConvertible(const From &from) {
   static const To to;
-  return Converter::isConvertible(to, from);
+  return detail::Converter::isConvertible(to, from);
 }
 
 }
diff --git a/include/fintamath/core/IArithmetic.hpp b/include/fintamath/core/IArithmetic.hpp
@@ -13,7 +13,7 @@
 namespace fintamath {
 
 class IArithmetic : public IMathObject {
-  using ArithmeticParser = Parser<std::unique_ptr<IArithmetic>()>;
+  using ArithmeticParser = detail::Parser<std::unique_ptr<IArithmetic>()>;
 
 public:
   friend std::unique_ptr<IArithmetic> operator+(const IArithmetic &lhs, const IArithmetic &rhs) {

diff --git a/include/fintamath/core/IComparable.hpp b/include/fintamath/core/IComparable.hpp
@@ -14,7 +14,7 @@
 namespace fintamath {
 
 class IComparable : public IArithmetic {
-  using ComparableParser = Parser<std::unique_ptr<IComparable>()>;
+  using ComparableParser = detail::Parser<std::unique_ptr<IComparable>()>;
 
 public:
   friend std::strong_ordering operator<=>(const IComparable &lhs, const IComparable &rhs) {

diff --git a/include/fintamath/core/IMathObject.hpp b/include/fintamath/core/IMathObject.hpp
@@ -14,7 +14,7 @@
 namespace fintamath {
 
 class IMathObject {
-  using MathObjectParser = Parser<std::unique_ptr<IMathObject>()>;
+  using MathObjectParser = detail::Parser<std::unique_ptr<IMathObject>()>;
 
 public:
   virtual ~IMathObject() = default;

diff --git a/include/fintamath/core/MathObjectTypes.hpp b/include/fintamath/core/MathObjectTypes.hpp
@@ -194,34 +194,36 @@ class MathObjectType final {
   size_t id;
 
 private:
-  [[maybe_unused]] inline static const Config config;
+  [[maybe_unused]] inline static const detail::Config config;
 };
 
 inline size_t hash_value(const MathObjectType &rhs) noexcept {
   return boost::hash<size_t>{}(rhs);
 }
 
+namespace detail {
+
 class MathObjectBoundTypes final {
   using enum MathObjectType::Id;
 
   using TypeToTypeMap = std::unordered_map<MathObjectType, MathObjectType, boost::hash<MathObjectType>>;
 
   static TypeToTypeMap &getMutable() {
     static TypeToTypeMap ids{
-        {IMathObject, None},
-        {IArithmetic, ILiteral},
-        {IExpression, IComparable},
-        {IUnaryExpression, IBinaryExpression},
-        {IBinaryExpression, IPolynomExpression},
-        {IPolynomExpression, IComparable},
-        {IComparable, ILiteral},
-        {INumber, ILiteral},
-        {IInteger, ILiteral},
-        {ILiteral, IFunction},
-        {IConstant, IFunction},
-        {IFunction, None},
-        {IOperator, None},
-    };
+          {IMathObject, None},
+          {IArithmetic, ILiteral},
+          {IExpression, IComparable},
+          {IUnaryExpression, IBinaryExpression},
+          {IBinaryExpression, IPolynomExpression},
+          {IPolynomExpression, IComparable},
+          {IComparable, ILiteral},
+          {INumber, ILiteral},
+          {IInteger, ILiteral},
+          {ILiteral, IFunction},
+          {IConstant, IFunction},
+          {IFunction, None},
+          {IOperator, None},
+      };
 
     return ids;
   }
@@ -236,8 +238,10 @@ class MathObjectBoundTypes final {
   }
 };
 
+}
+
 inline bool isBaseOf(const MathObjectType &toType, const MathObjectType &fromType) {
-  const auto &typeToTypeMap = MathObjectBoundTypes::get();
+  const auto &typeToTypeMap = detail::MathObjectBoundTypes::get();
 
   if (const auto toTypeBoundaries = typeToTypeMap.find(toType); toTypeBoundaries != typeToTypeMap.end()) {
     return fromType >= toTypeBoundaries->first && fromType < toTypeBoundaries->second;

diff --git a/include/fintamath/core/MultiMethod.hpp b/include/fintamath/core/MultiMethod.hpp
@@ -9,7 +9,7 @@
 #include "fintamath/core/CoreUtils.hpp"
 #include "fintamath/core/MathObjectTypes.hpp"
 
-namespace fintamath {
+namespace fintamath::detail {
 
 template <typename Signature>
 class MultiMethod;

diff --git a/include/fintamath/core/Parser.hpp b/include/fintamath/core/Parser.hpp
@@ -12,7 +12,7 @@
 #include "fintamath/core/Tokenizer.hpp"
 #include "fintamath/exceptions/InvalidInputException.hpp"
 
-namespace fintamath {
+namespace fintamath::detail {
 
 template <typename T, typename... Args>
 concept StringConstructable = requires(const std::string &str, Args &&...args) {

diff --git a/include/fintamath/core/Tokenizer.hpp b/include/fintamath/core/Tokenizer.hpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 
-namespace fintamath {
+namespace fintamath::detail {
 
 using Token = std::string;
 using TokenVector = std::vector<Token>;

diff --git a/include/fintamath/expressions/Expression.hpp b/include/fintamath/expressions/Expression.hpp
@@ -20,6 +20,8 @@
 
 namespace fintamath {
 
+namespace detail {
+
 struct Term final {
   Token name;
 
@@ -34,12 +36,14 @@ struct Term final {
   }
 };
 
-using TermVector = std::vector<std::unique_ptr<Term>>;
+using TermVector = std::vector<std::unique_ptr<detail::Term>>;
 using OperandStack = std::stack<std::unique_ptr<IMathObject>>;
 
+}
+
 class Expression final : public IExpressionCRTP<Expression> {
-  using TermParser = Parser<std::unique_ptr<Term>()>;
-  using ExpressionParser = Parser<std::unique_ptr<IMathObject>(ArgumentPtrVector &&)>;
+  using TermParser = detail::Parser<std::unique_ptr<detail::Term>()>;
+  using ExpressionParser = detail::Parser<std::unique_ptr<IMathObject>(ArgumentPtrVector &&)>;
   using ExpressionMaker = std::function<std::unique_ptr<IMathObject>(ArgumentPtrVector &&)>;
 
 public:
@@ -94,23 +98,23 @@ class Expression final : public IExpressionCRTP<Expression> {
 
   void updateStringMutable() const;
 
-  static TermVector tokensToTerms(const TokenVector &tokens);
+  static detail::TermVector tokensToTerms(const detail::TokenVector &tokens);
 
-  static OperandStack termsToOperands(TermVector &terms);
+  static detail::OperandStack termsToOperands(detail::TermVector &terms);
 
-  static std::unique_ptr<IMathObject> operandsToObject(OperandStack &operands);
+  static std::unique_ptr<IMathObject> operandsToObject(detail::OperandStack &operands);
 
   static ArgumentPtrVector unwrapComma(const ArgumentPtr &child);
 
-  static void insertMultiplications(TermVector &terms);
+  static void insertMultiplications(detail::TermVector &terms);
 
-  static void fixOperatorTypes(const TermVector &terms);
+  static void fixOperatorTypes(const detail::TermVector &terms);
 
-  static void collapseFactorials(TermVector &terms);
+  static void collapseFactorials(detail::TermVector &terms);
 
-  static bool canNextTermBeBinaryOperator(const Term &term);
+  static bool canNextTermBeBinaryOperator(const detail::Term &term);
 
-  static bool canPrevTermBeBinaryOperator(const Term &term);
+  static bool canPrevTermBeBinaryOperator(const detail::Term &term);
 
   static bool isBinaryOperator(const IMathObject *val);
 
@@ -126,7 +130,7 @@ class Expression final : public IExpressionCRTP<Expression> {
 
   static ArgumentPtr compress(const ArgumentPtr &child);
 
-  friend std::unique_ptr<IMathObject> makeExpr(const IFunction &func, ArgumentPtrVector args);
+  friend std::unique_ptr<IMathObject> detail::makeExpr(const IFunction &func, ArgumentPtrVector args);
 
   friend std::unique_ptr<IMathObject> parseFintamath(const std::string &str);
 

diff --git a/include/fintamath/expressions/ExpressionComparator.hpp b/include/fintamath/expressions/ExpressionComparator.hpp
@@ -4,7 +4,7 @@
 
 #include "fintamath/functions/FunctionArguments.hpp"
 
-namespace fintamath {
+namespace fintamath::detail {
 
 struct ComparatorOptions final {
   bool constantGreaterThanVariable = false;

diff --git a/include/fintamath/expressions/ExpressionUtils.hpp b/include/fintamath/expressions/ExpressionUtils.hpp
@@ -13,7 +13,7 @@
 #include "fintamath/literals/Variable.hpp"
 #include "fintamath/literals/constants/Undefined.hpp"
 
-namespace fintamath {
+namespace fintamath::detail {
 
 template <std::same_as<ArgumentPtr>... Args, std::invocable<IFunction, Args...> SimplifyFunction>
 ArgumentPtr useSimplifyFunctions(const std::vector<SimplifyFunction> &simplFuncs,
@@ -98,4 +98,4 @@ std::string prefixUnaryOperatorToString(const IOperator &oper, const ArgumentPtr
 
 std::string postfixUnaryOperatorToString(const IOperator &oper, const ArgumentPtr &rhs);
 
-}
+}
diff --git a/include/fintamath/expressions/IExpression.hpp b/include/fintamath/expressions/IExpression.hpp
@@ -19,7 +19,7 @@
 namespace fintamath {
 
 class IExpression : public IArithmetic {
-  using ExpressionParser = Parser<std::unique_ptr<IExpression>()>;
+  using ExpressionParser = detail::Parser<std::unique_ptr<IExpression>()>;
 
 public:
   virtual const std::shared_ptr<IFunction> &getFunction() const = 0;

diff --git a/include/fintamath/functions/FunctionUtils.hpp b/include/fintamath/functions/FunctionUtils.hpp
@@ -6,16 +6,17 @@
 #include "fintamath/core/IMathObject.hpp"
 #include "fintamath/functions/FunctionArguments.hpp"
 
-#define FINTAMATH_FUNCTION_EXPRESSION(Function, name)          \
-  std::unique_ptr<IMathObject> name(auto &&...args) {          \
-    static const Function f;                                   \
-    return makeExpr(f, std::forward<decltype(args)>(args)...); \
+#define FINTAMATH_FUNCTION_EXPRESSION(Function, name)                  \
+  std::unique_ptr<IMathObject> name(auto &&...args) {                  \
+    static const Function f;                                           \
+    return detail::makeExpr(f, std::forward<decltype(args)>(args)...); \
   }
 
 namespace fintamath {
-
 class IFunction;
 
+namespace detail {
+
 extern bool isExpression(const IMathObject &arg);
 
 extern std::unique_ptr<IMathObject> makeExpr(const IFunction &func, ArgumentPtrVector args);
@@ -31,3 +32,5 @@ std::unique_ptr<IMathObject> makeExpr(const IFunction &func, std::convertible_to
 }
 
 }
+
+}
diff --git a/include/fintamath/functions/IFunction.hpp b/include/fintamath/functions/IFunction.hpp
@@ -18,7 +18,7 @@ namespace fintamath {
 class IFunction : public IMathObject {
   using FunctionOrderMap = std::unordered_map<std::string, size_t>;
 
-  using FunctionParser = Parser<std::unique_ptr<IFunction>()>;
+  using FunctionParser = detail::Parser<std::unique_ptr<IFunction>()>;
 
 public:
   virtual const ArgumentTypeVector &getArgumentTypes() const = 0;

diff --git a/include/fintamath/functions/IFunctionCRTP.hpp b/include/fintamath/functions/IFunctionCRTP.hpp
@@ -68,20 +68,20 @@ class IFunctionCRTP_ : public IFunction {
           return res;
         }
 
-        return makeExpr(*this, argVect);
+        return detail::makeExpr(*this, argVect);
       }
       catch (const UndefinedException &) {
-        return makeExpr(*this, argVect);
+        return detail::makeExpr(*this, argVect);
       }
     }
 
-    return makeExpr(*this, argVect)->toMinimalObject();
+    return detail::makeExpr(*this, argVect)->toMinimalObject();
   }
 
 private:
   template <size_t i, typename Head, typename... Tail>
   bool doArgsMatch(const ArgumentRefVector &argVect) const {
-    if (!is<Head>(argVect[i]) || isExpression(argVect[i])) {
+    if (!is<Head>(argVect[i]) || detail::isExpression(argVect[i])) {
       return false;
     }
 

diff --git a/include/fintamath/functions/IOperator.hpp b/include/fintamath/functions/IOperator.hpp
@@ -13,7 +13,7 @@
 namespace fintamath {
 
 class IOperator : public IFunction {
-  using OperatorParser = Parser<std::unique_ptr<IOperator>()>;
+  using OperatorParser = detail::Parser<std::unique_ptr<IOperator>()>;
 
 public:
   enum class Priority : uint8_t {

diff --git a/include/fintamath/literals/ILiteral.hpp b/include/fintamath/literals/ILiteral.hpp
@@ -12,7 +12,7 @@
 namespace fintamath {
 
 class ILiteral : public IMathObject {
-  using LiteralParser = Parser<std::unique_ptr<ILiteral>()>;
+  using LiteralParser = detail::Parser<std::unique_ptr<ILiteral>()>;
 
 public:
   static std::unique_ptr<ILiteral> parse(const std::string &str) {

diff --git a/include/fintamath/literals/constants/IConstant.hpp b/include/fintamath/literals/constants/IConstant.hpp
@@ -12,7 +12,7 @@
 namespace fintamath {
 
 class IConstant : public ILiteral {
-  using ConstantParser = Parser<std::unique_ptr<IConstant>()>;
+  using ConstantParser = detail::Parser<std::unique_ptr<IConstant>()>;
 
 public:
   virtual MathObjectType getReturnType() const = 0;

diff --git a/include/fintamath/numbers/IInteger.hpp b/include/fintamath/numbers/IInteger.hpp
@@ -12,7 +12,7 @@
 namespace fintamath {
 
 class IInteger : public INumber {
-  using IntegerParser = Parser<std::unique_ptr<IInteger>()>;
+  using IntegerParser = detail::Parser<std::unique_ptr<IInteger>()>;
 
 public:
   friend std::unique_ptr<IInteger> operator%(const IInteger &lhs, const IInteger &rhs) {

diff --git a/include/fintamath/numbers/INumber.hpp b/include/fintamath/numbers/INumber.hpp
@@ -14,7 +14,7 @@
 namespace fintamath {
 
 class INumber : public IComparable {
-  using NumberParser = Parser<std::unique_ptr<INumber>()>;
+  using NumberParser = detail::Parser<std::unique_ptr<INumber>()>;
 
 public:
   virtual bool isPrecise() const {

diff --git a/include/fintamath/numbers/NumberUtils.hpp b/include/fintamath/numbers/NumberUtils.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-namespace fintamath {
+namespace fintamath::detail {
 
 std::string removeLeadingZeroes(std::string str);