[Boost-commit] svn:boost r41730 - in branches/proto/v3/boost/xpressive/detail: core/matcher static

From: eric_at_[hidden]
Date: 2007-12-04 19:58:10

Author: eric_niebler
Date: 2007-12-04 19:58:09 EST (Tue, 04 Dec 2007)
New Revision: 41730
URL: http://svn.boost.org/trac/boost/changeset/41730

Log:
more bug fixes
Text files modified: 
   branches/proto/v3/boost/xpressive/detail/core/matcher/action_matcher.hpp |     4 ++--                                    
   branches/proto/v3/boost/xpressive/detail/static/grammar.hpp              |     8 ++++----                                
   2 files changed, 6 insertions(+), 6 deletions(-)

Modified: branches/proto/v3/boost/xpressive/detail/core/matcher/action_matcher.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/detail/core/matcher/action_matcher.hpp	(original)
+++ branches/proto/v3/boost/xpressive/detail/core/matcher/action_matcher.hpp	2007-12-04 19:58:09 EST (Tue, 04 Dec 2007)
@@ -308,10 +308,10 @@
     template<typename T>
     struct opt
     {
-        typedef T type;
+        typedef T value_type;
         typedef T const &reference;
 
-        opt(T const *t)
+        explicit opt(T const *t)
           : t_(t)
         {}
 

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	2007-12-04 19:58:09 EST (Tue, 04 Dec 2007)
@@ -506,7 +506,7 @@
                 when< subscript<_, _>,                                  _state >
               , when< terminal<_>,                                      _state >
               , when< assign<terminal<attribute_placeholder<Nbr> >, _>, _arg(_right) >
-              , when< nary_expr<_, vararg<_> >,                         fold<_, _state, FindAttr<Nbr> > >
+              , otherwise< fold<_, _state, FindAttr<Nbr> > >
             >
         {};
 
@@ -533,8 +533,8 @@
                 _make_terminal(
                     read_attr<
                         attr_number<_>
-                      , bind<FindAttr<attr_number<_> >(_state, mpl::void_(), mpl::void_())>
-                    >
+                      , bind<FindAttr<attr_number<_> >(_state, mpl::void_())>
+                    >()
                 )
             >
         {};
@@ -976,7 +976,7 @@
                     >
                   , when<
                         subscript<ActionableGrammar<Char>, _>
-                      , as_regex(as_action(_make_subscript(add_hidden_mark(_left), _right)))
+                      , call<ActionableGrammar<Char>(as_action(_make_subscript(add_hidden_mark(_left), _right)))>
                     >
                 >
             {};