Move everything to matchers namespace

src/include/migraph/matcher.hpp

@@ -10,6 +10,8 @@
 
 namespace migraph {
 
+namespace matchers {
+
 struct matcher_context
 {
     matcher_context(instruction_ref i) : last(i) {}
@@ -156,7 +158,7 @@ basic_matcher<predicate_matcher<P>> make_basic_pred_matcher(P p)
     {                                                                 \
         instruction_ref match(__VA_ARGS__) const;                     \
     };                                                                \
-    const constexpr auto name = migraph::basic_matcher<name##_m>{{}}; \
+    const constexpr auto name = migraph::matchers::basic_matcher<name##_m>{{}}; \
     inline instruction_ref name##_m::match(__VA_ARGS__) const
 
 #define MIGRAPH_PRED_MATCHER(name, ...)                                                  \
@@ -164,7 +166,7 @@ basic_matcher<predicate_matcher<P>> make_basic_pred_matcher(P p)
     {                                                                                    \
         bool operator()(__VA_ARGS__) const;                                              \
     };                                                                                   \
-    const constexpr auto name = migraph::basic_matcher<predicate_matcher<name##_m>>{{}}; \
+    const constexpr auto name = migraph::matchers::basic_matcher<predicate_matcher<name##_m>>{{}}; \
     inline bool name##_m::operator()(__VA_ARGS__) const
 
 struct matcher_result
@@ -184,8 +186,6 @@ matcher_result match_instruction(program& p, instruction_ref ins, M&& m)
     return result;
 }
 
-namespace matchers {
-
 template <class... Ts>
 auto all_of(Ts... ms)
 {

test/matcher.cpp

@@ -6,12 +6,12 @@
 namespace matchers = migraph::matchers;
 
 template <class M>
-migraph::matcher_result find_match(migraph::program& p, M&& m)
+migraph::matchers::matcher_result find_match(migraph::program& p, M&& m)
 {
-    migraph::matcher_result result;
+    migraph::matchers::matcher_result result;
     for(auto ins : migraph::iterator_for(p))
     {
-        result = migraph::match_instruction(p, ins, m);
+        result = migraph::matchers::match_instruction(p, ins, m);
         if(result.result != p.end())
             return result;
     }