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

Subject: [Boost-commit] svn:boost r62846 - branches/quickbook-1.5-spirit2
From: daniel_james_at_[hidden]
Date: 2010-06-12 09:04:50

Author: danieljames
Date: 2010-06-12 09:04:49 EDT (Sat, 12 Jun 2010)
New Revision: 62846
URL: http://svn.boost.org/trac/boost/changeset/62846

Log:
Rename 'code::code' so that it isn't mistaken for a constructor.
Text files modified: 
   branches/quickbook-1.5-spirit2/block_grammar.cpp  |     2 +-                                      
   branches/quickbook-1.5-spirit2/code.hpp           |     2 +-                                      
   branches/quickbook-1.5-spirit2/phrase_actions.cpp |     2 +-                                      
   branches/quickbook-1.5-spirit2/phrase_grammar.cpp |     6 +++---                                  
   4 files changed, 6 insertions(+), 6 deletions(-)

Modified: branches/quickbook-1.5-spirit2/block_grammar.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/block_grammar.cpp	(original)
+++ branches/quickbook-1.5-spirit2/block_grammar.cpp	2010-06-12 09:04:49 EDT (Sat, 12 Jun 2010)
@@ -77,7 +77,7 @@
                 position                                [member_assign(&quickbook::code::position)]
                                                         [member_assign(&quickbook::code::block, true)]
             >>  qi::raw[code_line >> *(*eol >> code_line)]
-                                                        [member_assign(&quickbook::code::code)]
+                                                        [member_assign(&quickbook::code::content)]
             >>  +eol
             ;
 

Modified: branches/quickbook-1.5-spirit2/code.hpp
==============================================================================
--- branches/quickbook-1.5-spirit2/code.hpp	(original)
+++ branches/quickbook-1.5-spirit2/code.hpp	2010-06-12 09:04:49 EDT (Sat, 12 Jun 2010)
@@ -18,7 +18,7 @@
     struct code {
         bool block;
         file_position position;
-        std::string code;
+        std::string content;
     };
 
     std::string syntax_highlight(

Modified: branches/quickbook-1.5-spirit2/phrase_actions.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/phrase_actions.cpp	(original)
+++ branches/quickbook-1.5-spirit2/phrase_actions.cpp	2010-06-12 09:04:49 EDT (Sat, 12 Jun 2010)
@@ -85,7 +85,7 @@
         formatted r;
         r.type = "";
 
-         std::string program = x.code;
+         std::string program = x.content;
     
         if(x.block) {
             // preprocess the code section to remove the initial indentation

Modified: branches/quickbook-1.5-spirit2/phrase_grammar.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/phrase_grammar.cpp	(original)
+++ branches/quickbook-1.5-spirit2/phrase_grammar.cpp	2010-06-12 09:04:49 EDT (Sat, 12 Jun 2010)
@@ -147,14 +147,14 @@
                     "```"
                 >>  position                        [member_assign(&quickbook::code::position)]
                                                     [member_assign(&quickbook::code::block, true)]
-                >>  code_block1                     [member_assign(&quickbook::code::code)]
+                >>  code_block1                     [member_assign(&quickbook::code::content)]
                 >>  "```"
                 )
             |   (
                     "``"
                 >>  position                        [member_assign(&quickbook::code::position)]
                                                     [member_assign(&quickbook::code::block, true)]
-                >>  code_block2                     [member_assign(&quickbook::code::code)]
+                >>  code_block2                     [member_assign(&quickbook::code::content)]
                 >>  "``"
                 )
             ;
@@ -166,7 +166,7 @@
                 '`'
             >>  position                            [member_assign(&quickbook::code::position)]
                                                     [member_assign(&quickbook::code::block, false)]
-            >>  inline_code_block                   [member_assign(&quickbook::code::code)]
+            >>  inline_code_block                   [member_assign(&quickbook::code::content)]
             >>  '`'
             ;