[Boost-commit] svn:boost r70188 - in trunk/tools/quickbook: . src

Subject: [Boost-commit] svn:boost r70188 - in trunk/tools/quickbook: . src
From: dnljms_at_[hidden]
Date: 2011-03-19 11:12:56

Author: danieljames
Date: 2011-03-19 11:12:55 EDT (Sat, 19 Mar 2011)
New Revision: 70188
URL: http://svn.boost.org/trac/boost/changeset/70188

Log:
Quickbook: simplify a couple of things.
Properties modified: 
   trunk/tools/quickbook/   (props changed)
Text files modified: 
   trunk/tools/quickbook/src/actions_class.cpp         |     1 -                                       
   trunk/tools/quickbook/src/actions_class.hpp         |     1 -                                       
   trunk/tools/quickbook/src/block_element_grammar.cpp |    23 ++++++-----------------                 
   3 files changed, 6 insertions(+), 19 deletions(-)

Modified: trunk/tools/quickbook/src/actions_class.cpp
==============================================================================
--- trunk/tools/quickbook/src/actions_class.cpp	(original)
+++ trunk/tools/quickbook/src/actions_class.cpp	2011-03-19 11:12:55 EDT (Sat, 19 Mar 2011)
@@ -55,7 +55,6 @@
         , source_mode("c++")
 
     // temporary or global state
-        , macro_id()
         , template_depth(0)
         , templates()
         , error_count(0)

Modified: trunk/tools/quickbook/src/actions_class.hpp
==============================================================================
--- trunk/tools/quickbook/src/actions_class.hpp	(original)
+++ trunk/tools/quickbook/src/actions_class.hpp	2011-03-19 11:12:55 EDT (Sat, 19 Mar 2011)
@@ -88,7 +88,6 @@
         std::stack<string_symbols> macro_stack;
 
     // temporary or global state
-        std::string             macro_id;
         int                     template_depth;
         template_stack          templates;
         int                     error_count;

Modified: trunk/tools/quickbook/src/block_element_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/block_element_grammar.cpp	(original)
+++ trunk/tools/quickbook/src/block_element_grammar.cpp	2011-03-19 11:12:55 EDT (Sat, 19 Mar 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]
                 )
             ;