Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r68422 - sandbox/SOC/2010/phoenix3/boost/phoenix/core
From: thom.heller_at_[hidden]
Date: 2011-01-24 14:10:46


Author: theller
Date: 2011-01-24 14:10:45 EST (Mon, 24 Jan 2011)
New Revision: 68422
URL: http://svn.boost.org/trac/boost/changeset/68422

Log:
fixed nothing
Text files modified:
   sandbox/SOC/2010/phoenix3/boost/phoenix/core/nothing.hpp | 42 +++++----------------------------------
   1 files changed, 6 insertions(+), 36 deletions(-)

Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/nothing.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/nothing.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/nothing.hpp 2011-01-24 14:10:45 EST (Mon, 24 Jan 2011)
@@ -22,41 +22,6 @@
     /////////////////////////////////////////////////////////////////////////////
     
     PHOENIX_DEFINE_EXPRESSION(null, (proto::terminal<mpl::void_>::type))
- namespace tag
- {
- struct nothing {};
- }
-
- namespace expression
- {
- struct nothing
- : expr<tag::nothing, proto::terminal<mpl::void_> >
- {
- typedef actor<
- typename proto::result_of::make_expr<
- tag::nothing
- , default_domain_with_basic_expr
- , mpl::void_
- >::type
- >
- type;
-
- typedef
- typename proto::unnary_expr<tag::nothing, proto::_>::proto_grammar
- proto_grammar;
-
- static type const make()
- {
- type const e = {{}};
- return e;
- }
- };
- }
-
- namespace rule
- {
- struct null : expression::null {};
- }
     
     struct null_eval
     {
@@ -73,7 +38,12 @@
         : proto::call<null_eval()>
     {};
 
- expression::null::type const nothing = {};
+ template <typename Dummy>
+ struct is_nullary::when<rule::null, Dummy>
+ : proto::make<mpl::true_()>
+ {};
+
+ expression::null<mpl::void_>::type const nothing = {};
 }}
 
 #endif


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk