Remove matchit dependency for users. (#60)

* Remove matchit dependency for users. * Fix build. Co-authored-by: Bowen Fu <missing>
BowenFu · Jul 18, 2021 · 145f741 · 145f741
1 parent a8bc2b5
commit 145f741
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 71 deletions.
diff --git a/include/mathiu/core.h b/include/mathiu/core.h
@@ -1,7 +1,6 @@
 #ifndef CORE_H
 #define CORE_H
 
-#include "matchit.h"
 #include <variant>
 #include <memory>
 #include <string>
@@ -10,13 +9,7 @@
 #include <map>
 #include <set>
 #include <list>
-
-#define VERBOSE_DEBUG 0
-#define DEBUG 1
-
-#if DEBUG
-#include <iostream>
-#endif // DEBUG
+#include <array>
 
 namespace mathiu::impl
 {
@@ -27,48 +20,6 @@ namespace mathiu::impl
 
 } // namespace mathiu::impl
 
-namespace matchit::impl
-{
-    template <>
-    class PatternTraits<mathiu::impl::ExprPtr>
-    {
-        using Pattern = mathiu::impl::ExprPtr;
-    public:
-        template <typename Value>
-        using AppResultTuple = std::tuple<>;
-
-        constexpr static auto nbIdV = 0;
-
-        template <typename Value, typename ContextT>
-        constexpr static auto matchPatternImpl(Value &&value, Pattern const &pattern,
-                                               int32_t /* depth */,
-                                               ContextT & /*context*/)
-        {
-            return mathiu::impl::equal(pattern, std::forward<Value>(value));
-        }
-        constexpr static void processIdImpl(Pattern const &, int32_t /*depth*/,
-                                            IdProcess) {}
-    };
-
-    template <>
-    class IdTraits<mathiu::impl::ExprPtr>
-    {
-        using Type = mathiu::impl::ExprPtr;
-    public:
-        static auto
-#if defined(__has_feature)
-#if __has_feature(address_sanitizer)
-            __attribute__((no_sanitize_address))
-#endif
-#endif
-            equal(Type const &lhs, Type const &rhs)
-        {
-            return mathiu::impl::equal(lhs, rhs);
-        }
-    };
-
-} // namespace matchit::impl
-
 namespace mathiu
 {
     namespace impl
@@ -333,8 +284,6 @@ namespace mathiu
 
         double evald(ExprPtr const &ex);
 
-        inline constexpr auto isRational = matchit::or_(matchit::as<int>(matchit::_), matchit::as<Fraction>(matchit::_));
-
         // The <| order relation
         // for basic commutative transformation
         bool less(ExprPtr const &lhs, ExprPtr const &rhs);
@@ -414,18 +363,6 @@ namespace mathiu
             return substitute(substitute(ex, srcDstPairs), seqPairs...);
         }
 
-        inline auto const asDouble = matchit::meet([](auto&& e)
-        {
-            try{
-                evald(e);
-                return true;
-            }
-            catch (...)
-            {
-                return false;
-            }
-        });
-
         inline ExprPtr interval(ExprPtr const& l, bool const lClose, ExprPtr const& r, bool const rClose)
         {
             return std::make_shared<impl::Expr const>(impl::Interval{{l, lClose}, {r, rClose}});

diff --git a/src/core.cpp b/src/core.cpp
@@ -1,5 +1,5 @@
-#include "mathiu/core.h"
 #include "matchit.h"
+#include "internal.h"
 #include <numeric>
 
 namespace mathiu::impl

diff --git a/src/diff.cpp b/src/diff.cpp
@@ -1,5 +1,5 @@
 #include "matchit.h"
-#include "mathiu/core.h"
+#include "internal.h"
 #include "mathiu/diff.h"
 #include <numeric>
 

diff --git a/src/function_range.cpp b/src/function_range.cpp
@@ -1,5 +1,5 @@
 #include "matchit.h"
-#include "mathiu/core.h"
+#include "internal.h"
 #include "mathiu/solve.h"
 #include "mathiu/diff.h"
 #include "mathiu/inequation.h"

diff --git a/src/inequation.cpp b/src/inequation.cpp
@@ -1,5 +1,5 @@
 #include "matchit.h"
-#include "mathiu/core.h"
+#include "internal.h"
 #include "mathiu/inequation.h"
 #include "mathiu/diff.h"
 #include "mathiu/solve.h"

diff --git a/src/internal.h b/src/internal.h
@@ -0,0 +1,78 @@
+#ifndef INTERNAL_H
+#define INTERNAL_H
+
+#include "mathiu/core.h"
+#include "matchit.h"
+
+#define VERBOSE_DEBUG 0
+#define DEBUG 1
+
+#if DEBUG
+#include <iostream>
+#endif // DEBUG
+
+namespace matchit::impl
+{
+    template <>
+    class PatternTraits<mathiu::impl::ExprPtr>
+    {
+        using Pattern = mathiu::impl::ExprPtr;
+    public:
+        template <typename Value>
+        using AppResultTuple = std::tuple<>;
+
+        constexpr static auto nbIdV = 0;
+
+        template <typename Value, typename ContextT>
+        constexpr static auto matchPatternImpl(Value &&value, Pattern const &pattern,
+                                               int32_t /* depth */,
+                                               ContextT & /*context*/)
+        {
+            return mathiu::impl::equal(pattern, std::forward<Value>(value));
+        }
+        constexpr static void processIdImpl(Pattern const &, int32_t /*depth*/,
+                                            IdProcess) {}
+    };
+
+    template <>
+    class IdTraits<mathiu::impl::ExprPtr>
+    {
+        using Type = mathiu::impl::ExprPtr;
+    public:
+        static auto
+#if defined(__has_feature)
+#if __has_feature(address_sanitizer)
+            __attribute__((no_sanitize_address))
+#endif
+#endif
+            equal(Type const &lhs, Type const &rhs)
+        {
+            return mathiu::impl::equal(lhs, rhs);
+        }
+    };
+
+} // namespace matchit::impl
+
+namespace mathiu
+{
+    namespace impl
+    {
+        inline constexpr auto isRational = matchit::or_(matchit::as<int>(matchit::_), matchit::as<Fraction>(matchit::_));
+
+
+        inline auto const asDouble = matchit::meet([](auto&& e)
+        {
+            try{
+                evald(e);
+                return true;
+            }
+            catch (...)
+            {
+                return false;
+            }
+        });
+
+    } // namespace impl
+} // namespace mathiu
+
+#endif // INTERNAL_H
diff --git a/src/polynomial.cpp b/src/polynomial.cpp
@@ -1,5 +1,5 @@
 #include "matchit.h"
-#include "mathiu/core.h"
+#include "internal.h"
 #include "mathiu/diff.h"
 #include "mathiu/polynomial.h"
 #include <cmath>

diff --git a/src/setOp.cpp b/src/setOp.cpp
@@ -1,6 +1,6 @@
 #include <iterator>
 #include "matchit.h"
-#include "mathiu/core.h"
+#include "internal.h"
 #include "mathiu/setOp.h"
 
 namespace mathiu::impl

diff --git a/src/solve.cpp b/src/solve.cpp
@@ -1,6 +1,6 @@
 #include <iterator>
 #include "matchit.h"
-#include "mathiu/core.h"
+#include "internal.h"
 #include "mathiu/diff.h"
 #include "mathiu/polynomial.h"
 #include "mathiu/setOp.h"

diff --git a/test/mathiu/CMakeLists.txt b/test/mathiu/CMakeLists.txt
@@ -4,6 +4,8 @@ solve.cpp polynomial.cpp relational.cpp freeOf.cpp
 substitute.cpp functionRange.cpp inequation.cpp
 interval-comp.cpp
 )
+target_include_directories(unittests PRIVATE
+  ${PROJECT_SOURCE_DIR}/src PRIVATE matchit)
 target_compile_options(unittests PRIVATE ${BASE_COMPILE_FLAGS})
 target_link_libraries(unittests PRIVATE mathiu gtest_main matchit)
 set_target_properties(unittests PROPERTIES CXX_STANDARD_REQUIRED YES CXX_EXTENSIONS OFF)

diff --git a/test/mathiu/auto-simplification.cpp b/test/mathiu/auto-simplification.cpp
@@ -1,4 +1,6 @@
+#include "internal.h"
 #include "mathiu.h"
+#include "matchit.h"
 #include "gtest/gtest.h"
 #include <iostream>
 using namespace mathiu;

diff --git a/test/mathiu/expr.cpp b/test/mathiu/expr.cpp
@@ -1,4 +1,5 @@
 #include "mathiu.h"
+#include "matchit.h"
 #include "gtest/gtest.h"
 #include <string>
 using namespace mathiu;