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

Subject: [Boost-commit] svn:boost r58046 - branches/quickbook-1.5-spirit2/detail
From: daniel_james_at_[hidden]
Date: 2009-11-29 17:52:38

Author: danieljames
Date: 2009-11-29 17:52:37 EST (Sun, 29 Nov 2009)
New Revision: 58046
URL: http://svn.boost.org/trac/boost/changeset/58046

Log:
Remove the syntax highlighter collector.
Text files modified: 
   branches/quickbook-1.5-spirit2/detail/actions.hpp          |     7 ++-----                                 
   branches/quickbook-1.5-spirit2/detail/actions_class.cpp    |     5 +----                                   
   branches/quickbook-1.5-spirit2/detail/actions_class.hpp    |     1 -                                       
   branches/quickbook-1.5-spirit2/detail/syntax_highlight.cpp |     2 ++                                      
   4 files changed, 5 insertions(+), 10 deletions(-)

Modified: branches/quickbook-1.5-spirit2/detail/actions.hpp
==============================================================================
--- branches/quickbook-1.5-spirit2/detail/actions.hpp	(original)
+++ branches/quickbook-1.5-spirit2/detail/actions.hpp	2009-11-29 17:52:37 EST (Sun, 29 Nov 2009)
@@ -411,12 +411,10 @@
     struct syntax_highlight
     {
         syntax_highlight(
-            collector& temp
-          , std::string const& source_mode
+            std::string const& source_mode
           , string_symbols const& macro
           , actions& escape_actions)
-        : temp(temp)
-        , source_mode(source_mode)
+        : source_mode(source_mode)
         , macro(macro)
         , escape_actions(escape_actions)
         {
@@ -424,7 +422,6 @@
 
         std::string operator()(iterator begin, iterator end) const;
 
-        collector& temp;
         std::string const& source_mode;
         string_symbols const& macro;
         actions& escape_actions;

Modified: branches/quickbook-1.5-spirit2/detail/actions_class.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/detail/actions_class.cpp	(original)
+++ branches/quickbook-1.5-spirit2/detail/actions_class.cpp	2009-11-29 17:52:37 EST (Sun, 29 Nov 2009)
@@ -39,7 +39,6 @@
 
     // auxilliary streams
         , phrase()
-        , temp()
         , list_buffer()
 
     // state
@@ -68,7 +67,7 @@
         , extract_doc_license(doc_license, phrase)
         , extract_doc_purpose(doc_purpose, phrase)
 
-        , syntax_p(temp, source_mode, macro, *this)
+        , syntax_p(source_mode, macro, *this)
         , code(out, phrase, syntax_p)
         , code_block(phrase, phrase, syntax_p)
         , inline_code(phrase, syntax_p)
@@ -203,7 +202,6 @@
 
         out.push();
         phrase.push();
-        temp.push();
         temp_para.push();
         list_buffer.push();
         templates.push();
@@ -224,7 +222,6 @@
 
         out.pop();
         phrase.pop();
-        temp.pop();
         temp_para.pop();
         list_buffer.pop();
         templates.pop();

Modified: branches/quickbook-1.5-spirit2/detail/actions_class.hpp
==============================================================================
--- branches/quickbook-1.5-spirit2/detail/actions_class.hpp	(original)
+++ branches/quickbook-1.5-spirit2/detail/actions_class.hpp	2009-11-29 17:52:37 EST (Sun, 29 Nov 2009)
@@ -53,7 +53,6 @@
 
     // auxilliary streams
         collector               phrase;
-        collector               temp;
         collector               temp_para;
         collector               list_buffer;
 

Modified: branches/quickbook-1.5-spirit2/detail/syntax_highlight.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/detail/syntax_highlight.cpp	(original)
+++ branches/quickbook-1.5-spirit2/detail/syntax_highlight.cpp	2009-11-29 17:52:37 EST (Sun, 29 Nov 2009)
@@ -42,6 +42,8 @@
     
     std::string syntax_highlight::operator()(iterator first, iterator last) const
     {
+        collector temp;
+
         // print the code with syntax coloring
         if (source_mode == "c++")
         {