[Boost-commit] svn:boost r42431 - in branches/proto/v3: boost/xpressive/detail/static boost/xpressive/proto/detail libs/xpressive/test

From: eric_at_[hidden]
Date: 2008-01-03 00:44:15

Author: eric_niebler
Date: 2008-01-03 00:44:15 EST (Thu, 03 Jan 2008)
New Revision: 42431
URL: http://svn.boost.org/trac/boost/changeset/42431

Log:
work around gcc bug
Text files modified: 
   branches/proto/v3/boost/xpressive/detail/static/grammar.hpp    |    40 ++++++++++++++++++++--------------------
   branches/proto/v3/boost/xpressive/proto/detail/is_callable.hpp |     2 --                                      
   branches/proto/v3/libs/xpressive/test/Jamfile.v2               |     1 +                                       
   3 files changed, 21 insertions(+), 22 deletions(-)

Modified: branches/proto/v3/boost/xpressive/detail/static/grammar.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/detail/static/grammar.hpp	(original)
+++ branches/proto/v3/boost/xpressive/detail/static/grammar.hpp	2008-01-03 00:44:15 EST (Thu, 03 Jan 2008)
@@ -636,25 +636,25 @@
             {};
 
             // Here are some transforms ...
-            struct as_regex
-              : call<Gram>
-            {};
-
-            struct as_independent
-              : call<as_regex(_make_shift_right(_, true_matcher()), no_next())>
-            {};
-
-            struct as_alternate
-              : call<as_regex(_make_shift_right(_, alternate_end_matcher()), no_next())>
-            {};
+            typedef 
+                call<Gram>
+            as_regex;
+
+            typedef
+                call<as_regex(_make_shift_right(_, true_matcher()), no_next())>
+            as_independent;
+
+            typedef
+                call<as_regex(_make_shift_right(_, alternate_end_matcher()), no_next())>
+            as_alternate;
 
-            struct as_alternates_list
-              : reverse_fold_tree<
+            typedef
+                reverse_fold_tree<
                     _
                   , fusion::nil()
                   , alternates_list<as_alternate, _state>(as_alternate, _state)
                 >
-            {};
+            as_alternates_list;
 
             template<typename Greedy, typename Tag, typename Base = callable>
             struct as_repeater
@@ -736,18 +736,18 @@
                 >
             {};
 
-            struct as_list_set
-              : call<
+            typedef
+                call<
                     fill_list_set(
                         set_matcher<traits(_visitor), ListSet<Char> >()
                       , _
                       , _visitor
                     )
                 >
-            {};
+            as_list_set;
 
-            struct as_set
-              : fold_tree<
+            typedef
+                fold_tree<
                     _
                   , charset_matcher<
                         traits(_visitor)
@@ -760,7 +760,7 @@
                     >()
                   , merge_charset(_state, as_regex(_make_shift_right(_, end_matcher()), no_next()), _visitor)
                 >
-            {};
+            as_set;
 
             // Here are the cases, which use the transforms defined above.
             template<typename Tag, typename Dummy = void>

Modified: branches/proto/v3/boost/xpressive/proto/detail/is_callable.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/detail/is_callable.hpp	(original)
+++ branches/proto/v3/boost/xpressive/proto/detail/is_callable.hpp	2008-01-03 00:44:15 EST (Thu, 03 Jan 2008)
@@ -73,8 +73,6 @@
             };
         #endif
 
-            // TODO when gcc #33965 is fixed, change the idiom to
-            // template<typename X, bool IsTransform = true> struct my_transform {...};
             template<
                 template<BOOST_PP_ENUM_PARAMS(N, typename BOOST_PP_INTERCEPT)> class T
               , BOOST_PP_ENUM_PARAMS(N, typename A)

Modified: branches/proto/v3/libs/xpressive/test/Jamfile.v2
==============================================================================
--- branches/proto/v3/libs/xpressive/test/Jamfile.v2	(original)
+++ branches/proto/v3/libs/xpressive/test/Jamfile.v2	2008-01-03 00:44:15 EST (Thu, 03 Jan 2008)
@@ -7,6 +7,7 @@
 
 project
     : requirements
+        <define>BOOST_PROTO_MAX_LOGICAL_ARITY=10
         <toolset>intel:<debug-symbols>off
         <toolset>msvc-7.1:<debug-symbols>off
         <toolset>msvc-8.0:<define>_SCL_SECURE_NO_DEPRECATE