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

Subject: [Boost-commit] svn:boost r69187 - branches/quickbook-filenames/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2011-02-22 16:27:29

Author: danieljames
Date: 2011-02-22 16:27:28 EST (Tue, 22 Feb 2011)
New Revision: 69187
URL: http://svn.boost.org/trac/boost/changeset/69187

Log:
Combine varlistitem and table_cell.
Text files modified: 
   branches/quickbook-filenames/tools/quickbook/src/block_element_grammar.cpp |    23 ++++++-----------------                 
   1 files changed, 6 insertions(+), 17 deletions(-)

Modified: branches/quickbook-filenames/tools/quickbook/src/block_element_grammar.cpp
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/src/block_element_grammar.cpp	(original)
+++ branches/quickbook-filenames/tools/quickbook/src/block_element_grammar.cpp	2011-02-22 16:27:28 EST (Tue, 22 Feb 2011)
@@ -29,7 +29,7 @@
         cl::rule<scanner>
                         heading, inner_block, inner_phrase, def_macro,
                         table, table_row, variablelist,
-                        varlistentry, varlistterm, varlistitem, table_cell,
+                        varlistentry, varlistterm, cell,
                         preformatted, begin_section, end_section,
                         xinclude, include,
                         template_, template_id, template_formal_arg,
@@ -185,7 +185,7 @@
             [
                 (
                     local.varlistterm
-                    >>  (   +local.varlistitem
+                    >>  (   +local.cell
                         |   cl::eps_p           [actions.error]
                         )
                     >>  cl::ch_p(']')
@@ -205,16 +205,6 @@
                 )
             ;
 
-        local.varlistitem =
-            space
-            >>  cl::ch_p('[')
-            >>  (   local.inner_block
-                >>  cl::ch_p(']')
-                >>  space
-                |   cl::eps_p                   [actions.error]
-                )
-            ;
-
         elements.add
             ("table", element_info(element_info::block, &local.table, block_tags::table))
             ;
@@ -235,7 +225,7 @@
             (
                 (
                     actions.values.list(table_tags::row)
-                    [   *local.table_cell
+                    [   *local.cell
                     ]
                     >>  cl::ch_p(']')
                     >>  space
@@ -244,14 +234,13 @@
             )
             ;
 
-        local.table_cell =
+        local.cell =
                 space
             >>  cl::ch_p('[')
-            >>  (   cl::eps_p
-                >>  local.inner_block
+            >>  (   local.inner_block
                 >>  cl::ch_p(']')
                 >>  space
-                | cl::eps_p                     [actions.error]
+                |   cl::eps_p                   [actions.error]
                 )
             ;