[Boost-commit] svn:boost r45958 - in trunk: boost/spirit/home/lex/lexer boost/spirit/home/qi/detail boost/spirit/home/support libs/spirit/example/lex

From: hartmut.kaiser_at_[hidden]
Date: 2008-05-30 13:07:28

Author: hkaiser
Date: 2008-05-30 13:07:27 EDT (Fri, 30 May 2008)
New Revision: 45958
URL: http://svn.boost.org/trac/boost/changeset/45958

Log:
Spirit.Lex: Fixed predefined lex semantic actions to match changed parameter sequence. Untabified files.
Text files modified: 
   trunk/boost/spirit/home/lex/lexer/action.hpp            |     4 ++--                                    
   trunk/boost/spirit/home/lex/lexer/lexer_actions.hpp     |     2 +-                                      
   trunk/boost/spirit/home/qi/detail/construct_fwd.hpp     |    15 ++++++++++-----                         
   trunk/boost/spirit/home/support/attribute_transform.hpp |    12 ++++++++----                            
   trunk/libs/spirit/example/lex/strip_comments_lexer.cpp  |     1 -                                       
   5 files changed, 21 insertions(+), 13 deletions(-)

Modified: trunk/boost/spirit/home/lex/lexer/action.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/action.hpp	(original)
+++ trunk/boost/spirit/home/lex/lexer/action.hpp	2008-05-30 13:07:27 EDT (Fri, 30 May 2008)
@@ -28,8 +28,8 @@
             }
             
             template <typename Range, typename LexerContext>
-            void operator()(Range const&, std::size_t, LexerContext& ctx, 
-                bool&) const
+            void operator()(Range const&, std::size_t, bool&, 
+                LexerContext& ctx) const
             {
                 ctx.set_state_name(new_state);
             }

Modified: trunk/boost/spirit/home/lex/lexer/lexer_actions.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/lexer_actions.hpp	(original)
+++ trunk/boost/spirit/home/lex/lexer/lexer_actions.hpp	2008-05-30 13:07:27 EDT (Fri, 30 May 2008)
@@ -25,7 +25,7 @@
         }
         
         template <typename Range, typename LexerContext>
-        void operator()(Range const& r, std::size_t, LexerContext&, bool&) const
+        void operator()(Range const& r, std::size_t, bool&, LexerContext&) const
         {
             os << r;
         }

Modified: trunk/boost/spirit/home/qi/detail/construct_fwd.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/detail/construct_fwd.hpp	(original)
+++ trunk/boost/spirit/home/qi/detail/construct_fwd.hpp	2008-05-30 13:07:27 EDT (Fri, 30 May 2008)
@@ -48,7 +48,8 @@
 
         template <typename Iterator>
         inline void
-        construct(unsigned int& attr, Iterator const& first, Iterator const& last);
+        construct(unsigned int& attr, Iterator const& first, 
+            Iterator const& last);
 
         template <typename Iterator>
         inline void
@@ -56,16 +57,19 @@
 
         template <typename Iterator>
         inline void
-        construct(unsigned long& attr, Iterator const& first, Iterator const& last);
+        construct(unsigned long& attr, Iterator const& first, 
+            Iterator const& last);
 
 #ifdef BOOST_HAS_LONG_LONG
         template <typename Iterator>
         inline void
-        construct(boost::long_long_type& attr, Iterator const& first, Iterator const& last);
+        construct(boost::long_long_type& attr, Iterator const& first, 
+            Iterator const& last);
 
         template <typename Iterator>
         inline void
-        construct(boost::ulong_long_type& attr, Iterator const& first, Iterator const& last);
+        construct(boost::ulong_long_type& attr, Iterator const& first, 
+            Iterator const& last);
 #endif
 
         template <typename Iterator>
@@ -78,7 +82,8 @@
 
         template <typename Iterator>
         inline void
-        construct(long double& attr, Iterator const& first, Iterator const& last);
+        construct(long double& attr, Iterator const& first, 
+            Iterator const& last);
     }
     
 }}}}

Modified: trunk/boost/spirit/home/support/attribute_transform.hpp
==============================================================================
--- trunk/boost/spirit/home/support/attribute_transform.hpp	(original)
+++ trunk/boost/spirit/home/support/attribute_transform.hpp	2008-05-30 13:07:27 EDT (Fri, 30 May 2008)
@@ -37,8 +37,10 @@
         };
 
         template <typename T>
-        struct strip_single_element_sequence<fusion::vector<T>, mpl::false_,
-					     typename boost::enable_if<not_is_variant<T> >::type>
+        struct strip_single_element_sequence<
+            fusion::vector<T>, mpl::false_,
+            typename boost::enable_if<not_is_variant<T> >::type
+        >
         {
             //  Strips single element fusion vectors into its 'naked'
             //  form: vector<T> --> T
@@ -46,8 +48,10 @@
         };
 
         template <typename T>
-        struct strip_single_element_sequence<fusion::vector<T>, mpl::true_,
-					     typename boost::enable_if<not_is_variant<T> >::type>
+        struct strip_single_element_sequence<
+            fusion::vector<T>, mpl::true_,
+            typename boost::enable_if<not_is_variant<T> >::type
+        >
         {
             //  Strips single element fusion vectors into its 'naked'
             //  form: vector<T> --> T, but does so only if T is not a fusion 

Modified: trunk/libs/spirit/example/lex/strip_comments_lexer.cpp
==============================================================================
--- trunk/libs/spirit/example/lex/strip_comments_lexer.cpp	(original)
+++ trunk/libs/spirit/example/lex/strip_comments_lexer.cpp	2008-05-30 13:07:27 EDT (Fri, 30 May 2008)
@@ -35,7 +35,6 @@
 
 #include <boost/config/warning_disable.hpp>
 #include <boost/spirit/include/lex_lexer_lexertl.hpp>
-#include <boost/spirit/lex/lexer/lexer_actions.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
 #include <boost/spirit/include/phoenix_statement.hpp>
 #include <boost/spirit/include/phoenix_core.hpp>