CVS: boost/boost/xpressive/detail/core linker.hpp, 1.9, 1.10 quant_style.hpp, 1.3, 1.4

Update of /cvsroot/boost/boost/boost/xpressive/detail/core
In directory 
sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4949/boost/xpressive/detail/core

Modified Files:
        linker.hpp quant_style.hpp 
Log Message:
proto2

Index: linker.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/core/linker.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- linker.hpp  23 Aug 2006 03:05:06 -0000      1.9
+++ linker.hpp  29 Oct 2006 06:14:41 -0000      1.10
@@ -101,6 +101,8 @@
 template<typename Locale>
 struct locale_modifier
 {
+    typedef Locale locale_type;
+
     locale_modifier(Locale const &loc)
       : loc_(loc)
     {
@@ -149,7 +151,7 @@
     template<typename Matcher>
     void accept(Matcher const &, xpression_base const *)
     {
-        // no-node
+        // no-op
     }
 
     void accept(repeat_begin_matcher const &, xpression_base const *next)

Index: quant_style.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/detail/core/quant_style.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- quant_style.hpp     17 Apr 2006 19:36:52 -0000      1.3
+++ quant_style.hpp     29 Oct 2006 06:14:41 -0000      1.4
@@ -18,6 +18,7 @@
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/not_equal_to.hpp>
+#include <boost/mpl/has_xxx.hpp>
 #include <boost/xpressive/detail/utility/width.hpp>
 #include <boost/xpressive/detail/detail_fwd.hpp>
 
@@ -37,23 +38,27 @@
 //////////////////////////////////////////////////////////////////////////
 // xpression_base
 //
-struct xpression_base
-{
-#ifdef BOOST_XPR_DEBUG_STACK
-    virtual ~xpression_base()
-    {
-    }
-#endif
-};
+//struct xpression_base
+//{
+//#ifdef BOOST_XPR_DEBUG_STACK
+//    virtual ~xpression_base()
+//    {
+//    }
+//#endif
+//};
+
+// BUGBUG
+typedef void xpression_base;
+
+BOOST_MPL_HAS_XXX_TRAIT_DEF(is_xpression)
 
 ///////////////////////////////////////////////////////////////////////////////
 // is_xpr
 //
 template<typename Xpr>
 struct is_xpr
-  : is_base_and_derived<xpression_base, Xpr>
-{
-};
+  : has_is_xpression<Xpr>
+{};
 
 ///////////////////////////////////////////////////////////////////////////////
 // quant_enum
@@ -70,8 +75,9 @@
 //
 template<quant_enum QuantStyle, std::size_t Width = unknown_width::value, bool 
Pure = true>
 struct quant_style
-  : xpression_base
 {
+    typedef void is_xpression;
+
     // Which quantification strategy to use?
     BOOST_STATIC_CONSTANT(quant_enum, quant = QuantStyle);
 
@@ -87,6 +93,14 @@
     }
 };
 
+#define BOOST_XPR_QUANT_STYLE(Style, Width, Pure)\
+    typedef void is_xpression;\
+    BOOST_STATIC_CONSTANT(quant_enum, quant = Style);\
+    BOOST_STATIC_CONSTANT(std::size_t, width = Width);\
+    BOOST_STATIC_CONSTANT(bool, pure = Pure);\
+    static detail::width get_width() { return width; }\
+    /**/
+
 ///////////////////////////////////////////////////////////////////////////////
 // quant_style_none
 //  this sub-expression cannot be quantified


-------------------------------------------------------------------------
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