Update of /cvsroot/boost/boost/boost/xpressive/detail/static/transforms
In directory 
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26850/detail/static/transforms

Modified Files:
        as_set.hpp 
Log Message:
test_actions passes on intel-win-9.1, misc. clean-up

Index: as_set.hpp
===================================================================
RCS file: 
/cvsroot/boost/boost/boost/xpressive/detail/static/transforms/as_set.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- as_set.hpp  15 Apr 2007 06:40:26 -0000      1.4
+++ as_set.hpp  16 Apr 2007 08:10:15 -0000      1.5
@@ -26,7 +26,7 @@
 {
 
     template<typename Grammar>
-    struct increment
+    struct next
       : Grammar
     {
         template<typename Expr, typename State, typename Visitor>
@@ -51,11 +51,11 @@
     {};
 
     ///////////////////////////////////////////////////////////////////////////
-    // SetSize
+    // ListSet
     template<typename Char>
-    struct SetSize
+    struct ListSet
       : proto::or_<
-            increment<proto::trans::left<proto::comma<SetSize<Char>, 
CharLiteral<Char> > > >
+            next<proto::trans::left<proto::comma<ListSet<Char>, 
CharLiteral<Char> > > >
           , proto::trans::always<proto::assign<set_initializer_type, 
CharLiteral<Char> >, mpl::int_<1> >
         >
     {};
@@ -91,7 +91,7 @@
         {
             typedef set_matcher<
                 typename Visitor::traits_type
-              , SetSize<typename Visitor::char_type>::template apply<Expr, 
State, Visitor>::type::value
+              , Grammar::template apply<Expr, State, Visitor>::type::value
             > type;
         };
 
@@ -103,8 +103,7 @@
             typename apply<Expr, State, Visitor>::type set(visitor.traits());
             SetFillContext<char_type> ctx(set.set_);
             proto::eval(expr, ctx);
-            BOOST_MPL_ASSERT((proto::matches<Expr, SetSize<char_type> >));
-            int const size = SetSize<char_type>::template apply<Expr, State, 
Visitor>::type::value;
+            int const size = Grammar::template apply<Expr, State, 
Visitor>::type::value;
             for(int i = 0; i < size; ++i)
             {
                 set.set_[i] = visitor.traits().translate(set.set_[i]);


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to