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

Modified Files:
        complement_compiler.hpp transmogrify.hpp visitor.hpp 
Log Message:
fix matches<> to not instantiate intermediate basic_expr types, preliminary 
proto meta-grammar for static xpressive

Index: complement_compiler.hpp
===================================================================
RCS file: 
/cvsroot/boost/boost/boost/xpressive/detail/static/productions/complement_compiler.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- complement_compiler.hpp     3 Nov 2006 02:47:44 -0000       1.8
+++ complement_compiler.hpp     13 Nov 2006 15:53:45 -0000      1.9
@@ -8,6 +8,7 @@
 #ifndef 
BOOST_XPRESSIVE_DETAIL_STATIC_PRODUCTIONS_COMPLEMENT_COMPILER_HPP_EAN_10_04_2005
 #define 
BOOST_XPRESSIVE_DETAIL_STATIC_PRODUCTIONS_COMPLEMENT_COMPILER_HPP_EAN_10_04_2005
 
+#include <boost/mpl/not.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/xpressive/detail/detail_fwd.hpp>
 #include <boost/xpressive/proto/proto.hpp>
@@ -32,12 +33,12 @@
 
     
///////////////////////////////////////////////////////////////////////////////
     //
-    template<typename Char, bool Not>
+    template<typename Char, typename Not>
     struct complement<proto::terminal_tag, literal_placeholder<Char, Not>, 
void>
     {
         template<typename Expr, typename>
         struct apply
-          : proto::meta::terminal<literal_placeholder<Char, !Not> >
+          : proto::meta::terminal<literal_placeholder<Char, typename 
mpl::not_<Not>::type> >
         {};
 
         template<typename Expr, typename Visitor>

Index: transmogrify.hpp
===================================================================
RCS file: 
/cvsroot/boost/boost/boost/xpressive/detail/static/productions/transmogrify.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- transmogrify.hpp    29 Oct 2006 06:14:41 -0000      1.5
+++ transmogrify.hpp    13 Nov 2006 15:53:45 -0000      1.6
@@ -76,11 +76,11 @@
         }
     };
 
-    template<typename BidiIter, typename ICase, typename Traits, typename 
Char, bool Not>
+    template<typename BidiIter, typename ICase, typename Traits, typename 
Char, typename Not>
     struct transmogrify<BidiIter, ICase, Traits, literal_placeholder<Char, 
Not> >
     {
         typedef typename iterator_value<BidiIter>::type char_type;
-        typedef literal_matcher<Traits, ICase::value, Not> type;
+        typedef literal_matcher<Traits, ICase::value, Not::value> type;
 
         template<typename Matcher2, typename Visitor>
         static type call(Matcher2 const &m, Visitor &visitor)
@@ -168,10 +168,10 @@
         }
     };
 
-    template<typename BidiIter, typename ICase, typename Traits, bool ByRef>
+    template<typename BidiIter, typename ICase, typename Traits, typename 
ByRef>
     struct transmogrify<BidiIter, ICase, Traits, regex_placeholder<BidiIter, 
ByRef> >
     {
-        typedef typename mpl::if_c
+        typedef typename mpl::if_
         <
             ByRef
           , regex_byref_matcher<BidiIter>

Index: visitor.hpp
===================================================================
RCS file: 
/cvsroot/boost/boost/boost/xpressive/detail/static/productions/visitor.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- visitor.hpp 23 Apr 2006 08:57:40 -0000      1.7
+++ visitor.hpp 13 Nov 2006 15:53:45 -0000      1.8
@@ -63,7 +63,7 @@
         {
         }
 
-        template<bool ByRef>
+        template<typename ByRef>
         void visit_(regex_placeholder<BidiIter, ByRef> const &rex)
         {
             // when visiting an embedded regex, track the references


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to