[Boost-commit] svn:boost r68316 - in sandbox/SOC/2010/phoenix3: boost/phoenix/scope libs/phoenix/test/scope

Subject: [Boost-commit] svn:boost r68316 - in sandbox/SOC/2010/phoenix3: boost/phoenix/scope libs/phoenix/test/scope
From: thom.heller_at_[hidden]
Date: 2011-01-20 03:04:33

Author: theller
Date: 2011-01-20 03:04:27 EST (Thu, 20 Jan 2011)
New Revision: 68316
URL: http://svn.boost.org/trac/boost/changeset/68316

Log:
fixed bug https://svn.boost.org/trac/boost/ticket/3289
Added:
   sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/bug3289.cpp   (contents, props changed)
Text files modified: 
   sandbox/SOC/2010/phoenix3/boost/phoenix/scope/lambda.hpp |     2 +-                                      
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/scope/lambda.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/scope/lambda.hpp	(original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/scope/lambda.hpp	2011-01-20 03:04:27 EST (Thu, 20 Jan 2011)
@@ -238,7 +238,7 @@
                     rule::local_var_def_list
                   , meta_grammar
                 >
-              , evaluator(proto::_child_c<1>, _env)
+              , detail::local_var_def_is_nullary(proto::_child_c<0>, _env)// mpl::true_()//evaluator(proto::_child_c<1>, _env)
             >
         >
     {};

Added: sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/bug3289.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/test/scope/bug3289.cpp	2011-01-20 03:04:27 EST (Thu, 20 Jan 2011)
@@ -0,0 +1,36 @@
+/*==============================================================================
+    Copyright (c) 2005-2010 Joel de Guzman
+    Copyright (c) 2010 Thomas Heller
+
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#include <algorithm>
+#include <vector>
+
+#include <boost/detail/lightweight_test.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/operator.hpp>
+#include <boost/phoenix/scope.hpp>
+#include <boost/phoenix/stl.hpp>
+
+using namespace boost::phoenix;
+using namespace boost::phoenix::arg_names;
+using namespace boost::phoenix::local_names;
+
+int main()
+{
+    std::vector<double> u(11,1.0);
+    std::vector<double> w(11,2.0);
+    std::vector<double>::const_iterator it=w.begin();
+
+    boost::phoenix::generate(ref(u), lambda(_a=*ref(it)++)[_a*2.0])();
+
+    BOOST_TEST(std::accumulate(u.begin(), u.end(), 0.0) == 44.0);
+
+    BOOST_TEST(lambda(_a=*ref(it)++)[_a*2.0]()() == 4.0);
+    
+    return boost::report_errors();
+}
+
+