[Boost-commit] svn:boost r66635 - sandbox/SOC/2010/phoenix3/boost/phoenix/core

Subject: [Boost-commit] svn:boost r66635 - sandbox/SOC/2010/phoenix3/boost/phoenix/core
From: thom.heller_at_[hidden]
Date: 2010-11-18 11:11:33

Author: theller
Date: 2010-11-18 11:11:25 EST (Thu, 18 Nov 2010)
New Revision: 66635
URL: http://svn.boost.org/trac/boost/changeset/66635

Log:
fixed expression creation
Text files modified: 
   sandbox/SOC/2010/phoenix3/boost/phoenix/core/expression.hpp |    17 ++---------------                       
   1 files changed, 2 insertions(+), 15 deletions(-)

Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/expression.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/expression.hpp	(original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/expression.hpp	2010-11-18 11:11:25 EST (Thu, 18 Nov 2010)
@@ -46,20 +46,14 @@
     struct expr_ext<Actor, Tag, PHOENIX_A>
         : proto::transform<expr_ext<Actor, Tag, PHOENIX_A>, int>
     {
-        #define BOOST_PHOENIX_AS_EXPR(_, N, __) \
-        typename proto::detail::as_expr<BOOST_PP_CAT(A, N), proto::pod_generator<actor>, true>::result_type
-
-        //typedef typename proto::result_of::make_expr<Tag, default_domain_with_basic_expr, BOOST_PP_ENUM(PHOENIX_ITERATION, BOOST_PHOENIX_AS_EXPR, _)>::type base_type;
         typedef typename proto::result_of::make_expr<Tag, default_domain_with_basic_expr, PHOENIX_A>::type base_type;
         typedef Actor<base_type> type;
-        //typedef typename proto::nary_expr<Tag, BOOST_PP_ENUM_PARAMS(PHOENIX_ITERATION, proto::_ BOOST_PP_INTERCEPT)>::proto_grammar proto_grammar;//BOOST_PP_ENUM(PHOENIX_ITERATION, BOOST_PHOENIX_AS_EXPR, _)>::proto_grammar proto_grammar;
-        typedef typename proto::nary_expr<Tag, PHOENIX_A>::proto_grammar proto_grammar;//BOOST_PP_ENUM(PHOENIX_ITERATION, BOOST_PHOENIX_AS_EXPR, _)>::proto_grammar proto_grammar;
-        //typedef typename type::proto_grammar proto_grammar;//BOOST_PP_ENUM(PHOENIX_ITERATION, BOOST_PHOENIX_AS_EXPR, _)>::proto_grammar proto_grammar;
+        typedef typename proto::nary_expr<Tag, PHOENIX_A>::proto_grammar proto_grammar;
         
         static type const make(PHOENIX_A_a)
         {
             type const e = {PHOENIX_a};
-            //return e;
+            return e;
         }
 
         template<typename Expr, typename State, typename Data>
@@ -73,11 +67,4 @@
         #undef BOOST_PHOENIX_ENUM_CHILDREN
     };
 
-/*
-    template <typename Tag, PHOENIX_typename_A>
-	struct expr<Tag, PHOENIX_A>
-        : expr_ext<actor, Tag, PHOENIX_A>
-    {};
-*/
-
 #endif