graph sample.

BowenFu · Oct 30, 2021 · 0099ebf · 0099ebf
1 parent 8c4fbf3
commit 0099ebf
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 2,075 deletions.
diff --git a/develop/matchit.h b/develop/matchit.h
@@ -0,0 +1,6 @@
+// Replace include/matchit.h with this file when developing.
+
+#include "../develop/matchit/core.h"
+#include "../develop/matchit/expression.h"
+#include "../develop/matchit/patterns.h"
+#include "../develop/matchit/utility.h"
diff --git a/develop/matchit/patterns.h b/develop/matchit/patterns.h
@@ -214,6 +214,22 @@ namespace matchit
         static_assert(std::is_same_v<decayArrayT<int32_t const[]>, int32_t const *>);
         static_assert(std::is_same_v<decayArrayT<int32_t const &>, int32_t const &>);
 
+        template <typename T>
+        struct AddConstToPointer
+        {
+            using type = std::conditional_t<
+                !std::is_pointer_v<T>, T,
+                std::add_pointer_t<std::add_const_t<std::remove_pointer_t<T>>>>;
+        };
+        template <typename T>
+        using AddConstToPointerT = typename AddConstToPointer<T>::type;
+
+        static_assert(std::is_same_v<AddConstToPointerT<void *>, void const *>);
+        static_assert(std::is_same_v<AddConstToPointerT<int32_t>, int32_t>);
+
+        template <typename Pattern>
+        using EscapeArrayT = AddConstToPointerT<decayArrayT<Pattern>>;
+
         template <typename Pattern>
         class PatternTraits;
 
@@ -310,7 +326,7 @@ namespace matchit
 
         private:
             Pattern const mPattern;
-            Func const mHandler;
+            std::conditional_t<std::is_function_v<Func>, Func const &, Func const> mHandler;
         };
 
         template <typename Pattern, typename Pred>
@@ -439,7 +455,7 @@ namespace matchit
             constexpr auto const &patterns() const { return mPatterns; }
 
         private:
-            std::tuple<Patterns...> mPatterns;
+            std::tuple<EscapeArrayT<Patterns>...> mPatterns;
         };
 
         template <typename... Patterns>
@@ -530,7 +546,7 @@ namespace matchit
 
         private:
             Unary const mUnary;
-            Pattern const mPattern;
+            EscapeArrayT<Pattern> const mPattern;
         };
 
         template <typename Unary, typename Pattern>
@@ -602,7 +618,7 @@ namespace matchit
             constexpr auto const &patterns() const { return mPatterns; }
 
         private:
-            std::tuple<Patterns...> mPatterns;
+            std::tuple<EscapeArrayT<Patterns>...> mPatterns;
         };
 
         template <typename... Patterns>
@@ -681,7 +697,7 @@ namespace matchit
             auto const &pattern() const { return mPattern; }
 
         private:
-            Pattern mPattern;
+            EscapeArrayT<Pattern> mPattern;
         };
 
         template <typename Pattern>
@@ -944,22 +960,7 @@ namespace matchit
             constexpr explicit Ds(Patterns const &...patterns) : mPatterns{patterns...} {}
             constexpr auto const &patterns() const { return mPatterns; }
 
-        private:
-            template <typename T>
-            struct AddConstToPointer
-            {
-                using type = std::conditional_t<
-                    !std::is_pointer_v<T>, T,
-                    std::add_pointer_t<std::add_const_t<std::remove_pointer_t<T>>>>;
-            };
-            template <typename T>
-            using AddConstToPointerT = typename AddConstToPointer<T>::type;
-
-            static_assert(std::is_same_v<AddConstToPointerT<void *>, void const *>);
-            static_assert(std::is_same_v<AddConstToPointerT<int32_t>, int32_t>);
-
-        public:
-            using Type = std::tuple<AddConstToPointerT<decayArrayT<Patterns>>...>;
+            using Type = std::tuple<EscapeArrayT<Patterns>...>;
 
         private:
             Type mPatterns;

diff --git a/develop/matchit/utility.h b/develop/matchit/utility.h
@@ -93,16 +93,16 @@ namespace matchit
 
     constexpr auto dsVia = [](auto &&...members)
     {
-      return [members...](auto &&...pats)
+      return [members...](auto ...pats)
       { return and_(app(members, pats)...); };
     };
 
     template <typename T>
     constexpr auto asDsVia = [](auto &&...members)
     {
-      return [members...](auto &&...pats)
+      return [members...](auto ...pats)
       {
-        return as<T>(and_(app(members, pats)...));
+        return as<T>(dsVia(members...)(pats...));
       };
     };