[Boost-commit] svn:boost r44656 - trunk/boost/spirit/home/lex/lexer/lexertl

From: hartmut.kaiser_at_[hidden]
Date: 2008-04-20 17:44:25

Author: hkaiser
Date: 2008-04-20 17:44:25 EDT (Sun, 20 Apr 2008)
New Revision: 44656
URL: http://svn.boost.org/trac/boost/changeset/44656

Log:
Spirit.Lex: Cleaning up ...
Text files modified: 
   trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_functor.hpp        |     8 ++++----                                
   trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_static_functor.hpp |     9 +++++----                               
   trunk/boost/spirit/home/lex/lexer/lexertl/wrap_action.hpp            |     3 ++-                                     
   3 files changed, 11 insertions(+), 9 deletions(-)

Modified: trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_functor.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_functor.hpp	(original)
+++ trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_functor.hpp	2008-04-20 17:44:25 EDT (Sun, 20 Apr 2008)
@@ -240,9 +240,9 @@
         
     public:
         lexertl_functor()
-#if /*0 != __DECCXX_VER || BOOST_INTEL_CXX_VERSION > 900 || */defined(__PGI)
+#if defined(__PGI)
           : eof()
-#endif // 0 != __DECCXX_VER
+#endif 
         {}
         
         ///////////////////////////////////////////////////////////////////////
@@ -358,7 +358,7 @@
         {}  
     };
 
-#if 0 != __COMO_VERSION__ || !BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
+#if defined(BOOST_SPIRIT_STATIC_EOF)
     ///////////////////////////////////////////////////////////////////////////
     //  eof token
     ///////////////////////////////////////////////////////////////////////////
@@ -370,7 +370,7 @@
                 Token, Iterator, SupportsActors, SupportsState>::eof = 
             typename lexertl_functor<
                 Token, Iterator, SupportsActors, SupportsState>::result_type();
-#endif // 0 != __COMO_VERSION__
+#endif
 
 }}}
 

Modified: trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_static_functor.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_static_functor.hpp	(original)
+++ trunk/boost/spirit/home/lex/lexer/lexertl/lexertl_static_functor.hpp	2008-04-20 17:44:25 EDT (Sun, 20 Apr 2008)
@@ -20,6 +20,7 @@
 #include <boost/spirit/home/support/detail/lexer/rules.hpp>
 #include <boost/spirit/home/support/detail/lexer/state_machine.hpp>
 #include <boost/spirit/home/lex/lexer/lexertl/iterator_tokenizer.hpp>
+#include <boost/spirit/home/lex/lexer/lexertl/wrap_action.hpp>
 
 #if 0 != __COMO_VERSION__ || !BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
 #define BOOST_SPIRIT_STATIC_EOF 1
@@ -233,9 +234,9 @@
         
     public:
         lexertl_static_functor()
-#if /*0 != __DECCXX_VER || BOOST_INTEL_CXX_VERSION > 900 || */defined(__PGI)
+#if defined(__PGI)
           : eof()
-#endif // 0 != __DECCXX_VER
+#endif 
         {}
         
         ///////////////////////////////////////////////////////////////////////
@@ -343,7 +344,7 @@
         }
     };
 
-#if 0 != __COMO_VERSION__ || !BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
+#if defined(BOOST_SPIRIT_STATIC_EOF)
     ///////////////////////////////////////////////////////////////////////////
     //  eof token
     ///////////////////////////////////////////////////////////////////////////
@@ -355,7 +356,7 @@
                 Token, Iterator, SupportsActors, SupportsState>::eof = 
             typename lexertl_static_functor<
                 Token, Iterator, SupportsActors, SupportsState>::result_type();
-#endif // 0 != __COMO_VERSION__
+#endif
 
 }}}
 

Modified: trunk/boost/spirit/home/lex/lexer/lexertl/wrap_action.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/lexertl/wrap_action.hpp	(original)
+++ trunk/boost/spirit/home/lex/lexer/lexertl/wrap_action.hpp	2008-04-20 17:44:25 EDT (Sun, 20 Apr 2008)
@@ -21,7 +21,8 @@
     template <typename FunctionType, typename Attribute, typename Context>
     struct wrap_action
     {
-        // plain functors are not touched at all
+        // plain functions with 4 arguments and function objects are not 
+        // touched at all
         template <typename F>
         static FunctionType call(F const& f)
         {