[Boost-commit] svn:boost r85114 - trunk/tools/quickbook/src

Subject: [Boost-commit] svn:boost r85114 - trunk/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2013-07-22 15:33:21

Author: danieljames
Date: 2013-07-22 15:33:21 EDT (Mon, 22 Jul 2013)
New Revision: 85114
URL: http://svn.boost.org/trac/boost/changeset/85114

Log:
Rename some local variables.

Just to reduce confusion between the paragraph rule and the paragraph
action. Should possibly do this for all such local variables. I'll see
how it goes.

Text files modified: 
   trunk/tools/quickbook/src/main_grammar.cpp |    39 ++++++++++++++++++++------------------- 
   1 files changed, 20 insertions(+), 19 deletions(-)

Modified: trunk/tools/quickbook/src/main_grammar.cpp
==============================================================================
--- trunk/tools/quickbook/src/main_grammar.cpp	Mon Jul 22 15:33:05 2013	(r85113)
+++ trunk/tools/quickbook/src/main_grammar.cpp	2013-07-22 15:33:21 EDT (Mon, 22 Jul 2013)	(r85114)
@@ -267,9 +267,9 @@
             new main_grammar_local(state));
 
         // Global Actions
-        element_action element(state);
-        paragraph_action paragraph(state);
-        list_item_action list_item(state);
+        quickbook::element_action element_action(state);
+        quickbook::paragraph_action paragraph_action(state);
+        quickbook::list_item_action list_item_action(state);
 
         phrase_end_action end_phrase(state);
         raw_char_action raw_char(state.phrase);
@@ -408,7 +408,7 @@
                     >>  local.syntactic_block_item
                     )
                 ]
-            ]                                   [paragraph]
+            ]                                   [paragraph_action]
             ;
 
         local.list =
@@ -426,9 +426,9 @@
                         >>  local.syntactic_block_item
                         )
                     ]
-                ]                                   [list_item]
-                // TODO: `list_item` is sometimes called in the wrong place.
-                // Currently harmless.
+                ]                                   [list_item_action]
+                // TODO: `list_item_action` is sometimes called in the wrong
+                // place. Currently harmless.
             ;
 
         local.syntactic_block_item =
@@ -459,12 +459,13 @@
             state.values.save()
             [
                 scoped_context(element_info::in_nested_block)
-                [   *(  local.paragraph_separator   [paragraph]
+                [   *(  local.paragraph_separator
+                                                [paragraph_action]
                     |   ~cl::eps_p(']')
                     >>  local.common
                     )
                 ]
-            ]                                       [paragraph]
+            ]                                   [paragraph_action]
             ;
 
         local.hr =
@@ -476,7 +477,7 @@
                     >>  *(line_comment | (cl::anychar_p - (cl::eol_p | "[/")))
                     )
                 >>  *eol
-                ]                               [element]
+                ]                               [element_action]
             ;
 
         local.element
@@ -491,7 +492,7 @@
                     [   cl::lazy_p(*ph::var(local.info.rule))
                     >>  space
                     >>  ']'
-                    ]                           [element]
+                    ]                           [element_action]
                 ]
             ;
 
@@ -500,7 +501,7 @@
             [(  local.code_line
                 >> *(*local.blank_line >> local.code_line)
             )                                   [state.values.entry(ph::arg1, ph::arg2)]
-            ]                                   [element]
+            ]                                   [element_action]
             >> *eol
             ;
 
@@ -579,7 +580,7 @@
                 >>  !local.template_args
                 >>  ']'
                 ]
-            )                                   [element]
+            )                                   [element_action]
             ;
 
         local.template_args =
@@ -659,7 +660,7 @@
                 ) >> cl::eps_p('`')
             )                                   [state.values.entry(ph::arg1, ph::arg2)]
             >>  '`'
-            ]                                   [element]
+            ]                                   [element_action]
             ;
 
         local.skip_inline_code =
@@ -717,7 +718,7 @@
                             >>  !(*cl::blank_p >> cl::eol_p)
                         )                   [state.values.entry(ph::arg1, ph::arg2)]
                     >>  (*cl::space_p >> "```")
-                    ]                       [element]
+                    ]                       [element_action]
                 |   cl::eps_p               [error("Unfinished code block")]
                 >>  *cl::anychar_p
                 )
@@ -733,7 +734,7 @@
                             >>  !(*cl::blank_p >> cl::eol_p)
                         )                   [state.values.entry(ph::arg1, ph::arg2)]
                     >>  (*cl::space_p >> "``")
-                    ]                       [element]
+                    ]                       [element_action]
                 |   cl::eps_p               [error("Unfinished code block")]
                 >>  *cl::anychar_p
                 )
@@ -801,7 +802,7 @@
                 [   (*(cl::anychar_p - "'''"))  [state.values.entry(ph::arg1, ph::arg2, phrase_tags::escape)]
                 >>  (   cl::str_p("'''")
                     |   cl::eps_p               [error("Unclosed boostbook escape.")]
-                    )                           [element]
+                    )                           [element_action]
                 ]
             ;
 
@@ -832,7 +833,7 @@
             >>  (*(cl::anychar_p - "'''"))
             >>  (   cl::str_p("'''")
                 |   cl::eps_p                   [error("Unclosed boostbook escape.")]
-                )                               [element]
+                )                               [element_action]
             ;
 
         attribute_value_1_7 =
@@ -872,7 +873,7 @@
                 >>  *cl::space_p
                 )
             >>  cl::end_p
-            ]                                   [element]
+            ]                                   [element_action]
             ;
 
         local.command_line_macro_identifier =