[Boost-commit] svn:boost r53737 - branches/quickbook-1.5

Subject: [Boost-commit] svn:boost r53737 - branches/quickbook-1.5
From: daniel_james_at_[hidden]
Date: 2009-06-07 16:34:59

Author: danieljames
Date: 2009-06-07 16:34:58 EDT (Sun, 07 Jun 2009)
New Revision: 53737
URL: http://svn.boost.org/trac/boost/changeset/53737

Log:
Separate out the current version of the template argument parser, as I want to create a new one for 1.5
Text files modified: 
   branches/quickbook-1.5/phrase.hpp |    32 ++++++++++++++++++--------------        
   1 files changed, 18 insertions(+), 14 deletions(-)

Modified: branches/quickbook-1.5/phrase.hpp
==============================================================================
--- branches/quickbook-1.5/phrase.hpp	(original)
+++ branches/quickbook-1.5/phrase.hpp	2009-06-07 16:34:58 EDT (Sun, 07 Jun 2009)
@@ -116,13 +116,6 @@
                     >> actions.macro                    [actions.do_macro]
                     ;
 
-                template_args =
-                    template_arg                        [push_back_a(actions.template_info)]
-                    >> *(
-                            ".." >> template_arg        [push_back_a(actions.template_info)]
-                        )
-                    ;
-
                 static const bool true_ = true;
                 static const bool false_ = false;
 
@@ -148,12 +141,23 @@
                     >> eps_p(']')
                     ;
 
-                brackets =
-                    '[' >> +template_arg >> ']'
+                template_args =
+                    template_args_1_4
+                    ;
+
+                template_args_1_4 =
+                    template_arg_1_4                    [push_back_a(actions.template_info)]
+                    >> *(
+                            ".." >> template_arg_1_4    [push_back_a(actions.template_info)]
+                        )
+                    ;
+
+                template_arg_1_4 =
+                    +(brackets_1_4 | (anychar_p - (str_p("..") | ']')))
                     ;
 
-                template_arg =
-                    +(brackets | (anychar_p - (str_p("..") | ']')))
+                brackets_1_4 =
+                    '[' >> +template_arg_1_4 >> ']'
                     ;
 
                 inline_code =
@@ -420,10 +424,10 @@
                             memberref, enumref, macroref, headerref, conceptref, globalref,
                             anchor, link, hard_space, eol, inline_code, simple_format,
                             simple_bold, simple_italic, simple_underline,
-                            simple_teletype, source_mode, template_, template_arg,
+                            simple_teletype, source_mode, template_,
                             quote, code_block, footnote, replaceable, macro,
-                            brackets, template_args, dummy_block, cond_phrase,
-                            macro_identifier
+                            dummy_block, cond_phrase, macro_identifier, template_args,
+                            template_args_1_4, template_arg_1_4, brackets_1_4
                             ;
 
             rule<Scanner> const&