[Boost-commit] svn:boost r38763 - in branches/xpressive/nested_dynamic_regex/boost/xpressive: . detail/dynamic

From: andreas.pokorny_at_[hidden]
Date: 2007-08-19 13:51:37

Author: mumiee
Date: 2007-08-19 13:51:36 EDT (Sun, 19 Aug 2007)
New Revision: 38763
URL: http://svn.boost.org/trac/boost/changeset/38763

Log:
oops they should be public.. 

Text files modified: 
   branches/xpressive/nested_dynamic_regex/boost/xpressive/detail/dynamic/parser_traits.hpp |    33 ++++++++++++++++-----------------       
   branches/xpressive/nested_dynamic_regex/boost/xpressive/nested_dynamic_compiler.hpp      |     6 +++---                                  
   branches/xpressive/nested_dynamic_regex/boost/xpressive/xpressive_fwd.hpp                |     4 ++--                                    
   3 files changed, 21 insertions(+), 22 deletions(-)

Modified: branches/xpressive/nested_dynamic_regex/boost/xpressive/detail/dynamic/parser_traits.hpp
==============================================================================
--- branches/xpressive/nested_dynamic_regex/boost/xpressive/detail/dynamic/parser_traits.hpp	(original)
+++ branches/xpressive/nested_dynamic_regex/boost/xpressive/detail/dynamic/parser_traits.hpp	2007-08-19 13:51:36 EDT (Sun, 19 Aug 2007)
@@ -30,8 +30,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // compiler_traits
 //  this works for char and wchar_t. it must be specialized for anything else.
-//
-template<typename RegexTraits>
+// 
+template<typename BidiIter, typename RegexTraits>
 struct compiler_traits
 {
     typedef RegexTraits regex_traits;
@@ -363,6 +363,20 @@
         return token_escape;
     }
 
+    ///////////////////////////////////////////////////////////////////////////////
+    // is_reference
+    bool is_reference( string_type const& t )
+    {
+        return false;
+    }
+
+    basic_regex<BidiIter> const* get_reference( string_type const& name )
+    {
+         return NULL;
+    }
+    
+
+
 private:
 
     //////////////////////////////////////////////////////////////////////////
@@ -447,21 +461,6 @@
         return begin;
     }
 
-
-    ///////////////////////////////////////////////////////////////////////////////
-    // is_reference
-    bool is_reference( string_type const& t )
-    {
-        return false;
-    }
-
-    template<typename BidiIter>
-    basic_regex<BidiIter> const* get_reference( string_type const& name )
-    {
-         return NULL;
-    }
-    
-
     regex_traits traits_;
     regex_constants::syntax_option_type flags_;
     typename regex_traits::char_class_type space_;

Modified: branches/xpressive/nested_dynamic_regex/boost/xpressive/nested_dynamic_compiler.hpp
==============================================================================
--- branches/xpressive/nested_dynamic_regex/boost/xpressive/nested_dynamic_compiler.hpp	(original)
+++ branches/xpressive/nested_dynamic_regex/boost/xpressive/nested_dynamic_compiler.hpp	2007-08-19 13:51:36 EDT (Sun, 19 Aug 2007)
@@ -24,9 +24,9 @@
     namespace detail{
         template<typename BidiIter, typename RegexTraits>
         struct nested_parser
-          : compiler_traits<RegexTraits> 
+          : compiler_traits<BidiIter,RegexTraits> 
         {
-            typedef typename compiler_traits<RegexTraits>::string_type string_type;
+            typedef typename compiler_traits<BidiIter,RegexTraits>::string_type string_type;
 
             struct _values
             {
@@ -37,7 +37,7 @@
             typedef typename table_type::value_type value_type;
             
             nested_parser( RegexTraits const& t )
-                : compiler_traits<RegexTraits>(t),
+                : compiler_traits<BidiIter,RegexTraits>(t),
                   start(0)
             {}
 

Modified: branches/xpressive/nested_dynamic_regex/boost/xpressive/xpressive_fwd.hpp
==============================================================================
--- branches/xpressive/nested_dynamic_regex/boost/xpressive/xpressive_fwd.hpp	(original)
+++ branches/xpressive/nested_dynamic_regex/boost/xpressive/xpressive_fwd.hpp	2007-08-19 13:51:36 EDT (Sun, 19 Aug 2007)
@@ -119,7 +119,7 @@
     template<typename BidiIter>
     struct sub_match;
 
-    template<typename RegexTraits>
+    template<typename BidiIter, typename RegexTraits>
     struct compiler_traits;
 
     template<typename Char, typename Impl = typename detail::default_regex_traits<Char>::type>
@@ -129,7 +129,7 @@
     <
         typename BidiIter
       , typename RegexTraits = regex_traits<typename iterator_value<BidiIter>::type>
-      , typename CompilerTraits = compiler_traits<RegexTraits>
+      , typename CompilerTraits = compiler_traits<BidiIter,RegexTraits>
     >
     struct regex_compiler;