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

Subject: [Boost-commit] svn:boost r60133 - branches/quickbook-1.5-spirit2
From: daniel_james_at_[hidden]
Date: 2010-03-03 18:29:51

Author: danieljames
Date: 2010-03-03 18:29:50 EST (Wed, 03 Mar 2010)
New Revision: 60133
URL: http://svn.boost.org/trac/boost/changeset/60133

Log:
The 'state' stack is only used for template scope state.
Text files modified: 
   branches/quickbook-1.5-spirit2/state.cpp |     8 ++------                                
   branches/quickbook-1.5-spirit2/state.hpp |    11 ++++++-----                             
   2 files changed, 8 insertions(+), 11 deletions(-)

Modified: branches/quickbook-1.5-spirit2/state.cpp
==============================================================================
--- branches/quickbook-1.5-spirit2/state.cpp	(original)
+++ branches/quickbook-1.5-spirit2/state.cpp	2010-03-03 18:29:50 EST (Wed, 03 Mar 2010)
@@ -64,9 +64,7 @@
     {
         state_stack.push(
             boost::make_tuple(
-                filename
-              , outdir
-              , macro
+                macro
               , section_level
               , min_section_level
               , section_id
@@ -82,9 +80,7 @@
     void state::pop()
     {
         boost::tie(
-            filename
-          , outdir
-          , macro
+            macro
           , section_level
           , min_section_level
           , section_id

Modified: branches/quickbook-1.5-spirit2/state.hpp
==============================================================================
--- branches/quickbook-1.5-spirit2/state.hpp	(original)
+++ branches/quickbook-1.5-spirit2/state.hpp	2010-03-03 18:29:50 EST (Wed, 03 Mar 2010)
@@ -41,9 +41,12 @@
         collector               phrase;
         encoder_ptr             encoder;
 
-    // state
-        fs::path                filename;
         fs::path                outdir;
+
+    // file state
+        fs::path                filename;
+
+    // scope state
         macro_symbols           macro;
         int                     section_level;
         int                     min_section_level;
@@ -52,9 +55,7 @@
         std::string             source_mode;
 
         typedef boost::tuple<
-            fs::path
-          , fs::path
-          , macro_symbols
+            macro_symbols
           , int
           , int
           , std::string