[Boost-commit] svn:boost r40763 - in trunk/boost/xpressive: detail detail/core/matcher detail/static/transforms proto proto/context proto/transform

From: eric_at_[hidden]
Date: 2007-11-04 18:53:15

Author: eric_niebler
Date: 2007-11-04 18:53:13 EST (Sun, 04 Nov 2007)
New Revision: 40763
URL: http://svn.boost.org/trac/boost/changeset/40763

Log:
various fixes and missing includes, from Jens Seidel
Text files modified: 
   trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp     |     2 ++                                      
   trunk/boost/xpressive/detail/detail_fwd.hpp                      |     2 +-                                      
   trunk/boost/xpressive/detail/static/transforms/as_quantifier.hpp |     4 ++--                                    
   trunk/boost/xpressive/proto/context/callable.hpp                 |     1 +                                       
   trunk/boost/xpressive/proto/context/default.hpp                  |     1 +                                       
   trunk/boost/xpressive/proto/generate.hpp                         |     2 +-                                      
   trunk/boost/xpressive/proto/transform/apply.hpp                  |     1 +                                       
   trunk/boost/xpressive/proto/transform/branch.hpp                 |     1 +                                       
   trunk/boost/xpressive/proto/transform/compose.hpp                |     1 +                                       
   trunk/boost/xpressive/proto/transform/construct.hpp              |     5 ++++-                                   
   10 files changed, 15 insertions(+), 5 deletions(-)

Modified: trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp
==============================================================================
--- trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp	(original)
+++ trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp	2007-11-04 18:53:13 EST (Sun, 04 Nov 2007)
@@ -29,6 +29,8 @@
 #include <boost/xpressive/detail/core/state.hpp>
 #include <boost/xpressive/proto/proto.hpp>
 #include <boost/xpressive/proto/context.hpp>
+#include <boost/xpressive/match_results.hpp> // for type_info_less
+#include <boost/xpressive/detail/static/transforms/as_action.hpp> // for 'read_attr'
 #if BOOST_VERSION >= 103500
 # include <boost/xpressive/proto/fusion.hpp>
 # include <boost/fusion/include/transform_view.hpp>

Modified: trunk/boost/xpressive/detail/detail_fwd.hpp
==============================================================================
--- trunk/boost/xpressive/detail/detail_fwd.hpp	(original)
+++ trunk/boost/xpressive/detail/detail_fwd.hpp	2007-11-04 18:53:13 EST (Sun, 04 Nov 2007)
@@ -38,7 +38,7 @@
 
     struct type_info_less;
 
-    typedef std::map<std::type_info const *, void *, detail::type_info_less> action_args_type;
+    typedef std::map<std::type_info const *, void *, type_info_less> action_args_type;
 
     ///////////////////////////////////////////////////////////////////////////////
     // placeholders

Modified: trunk/boost/xpressive/detail/static/transforms/as_quantifier.hpp
==============================================================================
--- trunk/boost/xpressive/detail/static/transforms/as_quantifier.hpp	(original)
+++ trunk/boost/xpressive/detail/static/transforms/as_quantifier.hpp	2007-11-04 18:53:13 EST (Sun, 04 Nov 2007)
@@ -204,7 +204,7 @@
             return typename apply<Expr, State, Visitor>::type(
                 Grammar::call(expr, alternate_end_xpression(), visitor)
             );
-        };
+        }
     };
 
     ///////////////////////////////////////////////////////////////////////////////
@@ -233,7 +233,7 @@
                 Grammar::call(expr, alternate_end_xpression(), visitor)
               , mark_number
             );
-        };
+        }
     };
 
     ///////////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/xpressive/proto/context/callable.hpp
==============================================================================
--- trunk/boost/xpressive/proto/context/callable.hpp	(original)
+++ trunk/boost/xpressive/proto/context/callable.hpp	2007-11-04 18:53:13 EST (Sun, 04 Nov 2007)
@@ -29,6 +29,7 @@
     #include <boost/utility/result_of.hpp>
     #include <boost/type_traits/remove_cv.hpp>
     #include <boost/xpressive/proto/proto_fwd.hpp>
+    #include <boost/xpressive/proto/traits.hpp> // for arg_c
     #include <boost/xpressive/proto/detail/suffix.hpp> // must be last include
 
     namespace boost { namespace proto

Modified: trunk/boost/xpressive/proto/context/default.hpp
==============================================================================
--- trunk/boost/xpressive/proto/context/default.hpp	(original)
+++ trunk/boost/xpressive/proto/context/default.hpp	2007-11-04 18:53:13 EST (Sun, 04 Nov 2007)
@@ -32,6 +32,7 @@
     #include <boost/xpressive/proto/proto_fwd.hpp>
     #include <boost/xpressive/proto/tags.hpp>
     #include <boost/xpressive/proto/eval.hpp>
+    #include <boost/xpressive/proto/traits.hpp> // for proto::arg_c()
     #include <boost/xpressive/proto/detail/suffix.hpp> // must be last include
 
     // If we're generating doxygen documentation, hide all the nasty

Modified: trunk/boost/xpressive/proto/generate.hpp
==============================================================================
--- trunk/boost/xpressive/proto/generate.hpp	(original)
+++ trunk/boost/xpressive/proto/generate.hpp	2007-11-04 18:53:13 EST (Sun, 04 Nov 2007)
@@ -98,7 +98,7 @@
                 static Expr const &make(Expr const &expr)
                 {
                     return expr;
-                };
+                }
             };
 
             template<template<typename> class Extends>

Modified: trunk/boost/xpressive/proto/transform/apply.hpp
==============================================================================
--- trunk/boost/xpressive/proto/transform/apply.hpp	(original)
+++ trunk/boost/xpressive/proto/transform/apply.hpp	2007-11-04 18:53:13 EST (Sun, 04 Nov 2007)
@@ -9,6 +9,7 @@
 #ifndef BOOST_PROTO_TRANSFORM_APPLY_HPP_EAN_06_23_2007
 #define BOOST_PROTO_TRANSFORM_APPLY_HPP_EAN_06_23_2007
 
+#include <boost/xpressive/proto/proto_fwd.hpp> // is_transform
 #include <boost/xpressive/proto/detail/prefix.hpp>
 #include <boost/mpl/apply.hpp>
 #include <boost/xpressive/proto/detail/suffix.hpp>

Modified: trunk/boost/xpressive/proto/transform/branch.hpp
==============================================================================
--- trunk/boost/xpressive/proto/transform/branch.hpp	(original)
+++ trunk/boost/xpressive/proto/transform/branch.hpp	2007-11-04 18:53:13 EST (Sun, 04 Nov 2007)
@@ -12,6 +12,7 @@
 #define BOOST_PROTO_TRANSFORM_BRANCH_HPP_EAN_12_16_2006
 
 #include <boost/xpressive/proto/detail/prefix.hpp>
+#include <boost/mpl/bool.hpp>
 #include <boost/xpressive/proto/proto_fwd.hpp>
 #include <boost/xpressive/proto/detail/suffix.hpp>
 

Modified: trunk/boost/xpressive/proto/transform/compose.hpp
==============================================================================
--- trunk/boost/xpressive/proto/transform/compose.hpp	(original)
+++ trunk/boost/xpressive/proto/transform/compose.hpp	2007-11-04 18:53:13 EST (Sun, 04 Nov 2007)
@@ -13,6 +13,7 @@
 #define BOOST_PROTO_TRANSFORM_COMPOSE_HPP_EAN_04_01_2007
 
 #include <boost/xpressive/proto/detail/prefix.hpp>
+#include <boost/mpl/bool.hpp> // mpl::true_
 #include <boost/xpressive/proto/proto_fwd.hpp>
 #include <boost/xpressive/proto/detail/suffix.hpp>
 

Modified: trunk/boost/xpressive/proto/transform/construct.hpp
==============================================================================
--- trunk/boost/xpressive/proto/transform/construct.hpp	(original)
+++ trunk/boost/xpressive/proto/transform/construct.hpp	2007-11-04 18:53:13 EST (Sun, 04 Nov 2007)
@@ -19,6 +19,8 @@
     #include <boost/preprocessor/repetition/enum_binary_params.hpp>
     #include <boost/preprocessor/repetition/enum_trailing_params.hpp>
     #include <boost/mpl/bool.hpp>
+    #include <boost/mpl/aux_/has_type.hpp>
+    #include <boost/mpl/aux_/lambda_arity_param.hpp>
     #include <boost/type_traits/is_pod.hpp>
     #include <boost/type_traits/is_function.hpp>
     #include <boost/type_traits/remove_pointer.hpp>
@@ -90,7 +92,8 @@
             };
 
             template<typename R, typename Expr, typename State, typename Visitor
-                     BOOST_MPL_AUX_LAMBDA_ARITY_PARAM(long Arity = mpl::aux::template_arity<R>::value)>
+                BOOST_MPL_AUX_LAMBDA_ARITY_PARAM(long Arity = mpl::aux::template_arity<R>::value)
+            >
             struct apply_aux_
             {
                 typedef R type;