[Boost-commit] svn:boost r69435 - branches/quickbook-filenames/tools/quickbook/src

Subject: [Boost-commit] svn:boost r69435 - branches/quickbook-filenames/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2011-03-01 04:13:10

Author: danieljames
Date: 2011-03-01 04:13:06 EST (Tue, 01 Mar 2011)
New Revision: 69435
URL: http://svn.boost.org/trac/boost/changeset/69435

Log:
Slightly simpler simple markup.
Text files modified: 
   branches/quickbook-filenames/tools/quickbook/src/main_grammar.cpp |     9 +++++----                               
   1 files changed, 5 insertions(+), 4 deletions(-)

Modified: branches/quickbook-filenames/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/src/main_grammar.cpp	(original)
+++ branches/quickbook-filenames/tools/quickbook/src/main_grammar.cpp	2011-03-01 04:13:06 EST (Tue, 01 Mar 2011)
@@ -122,7 +122,8 @@
         };
 
         cl::rule<scanner, simple_markup_closure::context_t>
-                        simple_markup, simple_markup_end;
+                        simple_markup;
+        cl::rule<scanner> simple_markup_end;
 
         element_info::type_enum element_type;
         cl::rule<scanner> element_rule;
@@ -397,7 +398,7 @@
                 [
                     actions.scoped_output()
                     [
-                        (*( ~cl::eps_p(local.simple_markup_end(local.simple_markup.mark))
+                        (*( ~cl::eps_p(local.simple_markup_end)
                         >>  local.nested_char
                         ))                      [actions.docinfo_value(ph::arg1, ph::arg2)]
                     ]                           
@@ -409,8 +410,8 @@
         local.simple_markup_end
             =   (   lookback[cl::graph_p]       // final mark must be preceeded by
                                                 // graph_p
-                >>  cl::f_ch_p(local.simple_markup_end.mark)
-                >>  ~cl::eps_p(cl::f_ch_p(local.simple_markup_end.mark))
+                >>  cl::f_ch_p(local.simple_markup.mark)
+                >>  ~cl::eps_p(cl::f_ch_p(local.simple_markup.mark))
                                                 // final mark not be followed by
                                                 // the same character.
                 >>  (cl::space_p | cl::punct_p | cl::end_p)