Move helper to contrib

taocpp · Feb 17, 2018 · 9d4989b · 9d4989b
1 parent c1ace23
commit 9d4989b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/include/tao/pegtl/contrib/parse_tree.hpp b/include/tao/pegtl/contrib/parse_tree.hpp
@@ -218,6 +218,17 @@ namespace tao
 
          }  // namespace internal
 
+         // some nodes don't need to store their content,
+         // use this helper as a base class to derive your specialization from.
+         struct remove_content : std::true_type
+         {
+            template< typename Node >
+            static void transform( std::unique_ptr< Node >& n ) noexcept( noexcept( n->remove_content() ) )
+            {
+               n->remove_content();
+            }
+         };
+
          template< typename Rule, typename Node, template< typename > class S = internal::store_all, typename Input >
          std::unique_ptr< Node > parse( Input& in )
          {

diff --git a/src/example/pegtl/parse_tree.cpp b/src/example/pegtl/parse_tree.cpp
@@ -46,21 +46,10 @@ namespace example
    template<> struct store< integer > : std::true_type {};
    template<> struct store< variable > : std::true_type {};
 
-   // some nodes don't need to store their content,
-   // the existance (and the type-id) are sufficient.
-   struct remove_content : std::true_type
-   {
-      // we simply reset the end iterator as a marker.
-      static void transform( std::unique_ptr< parse_tree::node >& n ) noexcept
-      {
-         n->remove_content();
-      }
-   };
-
-   template<> struct store< plus > : remove_content {};
-   template<> struct store< minus > : remove_content {};
-   template<> struct store< multiply > : remove_content {};
-   template<> struct store< divide > : remove_content {};
+   template<> struct store< plus > : parse_tree::remove_content {};
+   template<> struct store< minus > : parse_tree::remove_content {};
+   template<> struct store< multiply > : parse_tree::remove_content {};
+   template<> struct store< divide > : parse_tree::remove_content {};
    // clang-format on
 
    // after a node is stored successfully, you can add an optional transformer like this: