[Boost-commit] svn:boost r45569 - in branches/proto/v4/boost/phoenix: . function statement

From: eric_at_[hidden]
Date: 2008-05-19 19:11:12

Author: eric_niebler
Date: 2008-05-19 19:11:11 EDT (Mon, 19 May 2008)
New Revision: 45569
URL: http://svn.boost.org/trac/boost/changeset/45569

Log:
phoenix::function, with TR1 result_of-style return type deduction (breaking change)
Added:
   branches/proto/v4/boost/phoenix/function/
   branches/proto/v4/boost/phoenix/function.hpp   (contents, props changed)
   branches/proto/v4/boost/phoenix/function/function.hpp   (contents, props changed)
Text files modified: 
   branches/proto/v4/boost/phoenix/operator.hpp            |     5 -----                                   
   branches/proto/v4/boost/phoenix/statement.hpp           |     1 -                                       
   branches/proto/v4/boost/phoenix/statement/try_catch.hpp |     2 +-                                      
   3 files changed, 1 insertions(+), 7 deletions(-)

Added: branches/proto/v4/boost/phoenix/function.hpp
==============================================================================
--- (empty file)
+++ branches/proto/v4/boost/phoenix/function.hpp	2008-05-19 19:11:11 EDT (Mon, 19 May 2008)
@@ -0,0 +1,13 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#ifndef PHOENIX_FUNCTION_HPP
+#define PHOENIX_FUNCTION_HPP
+
+#include <boost/phoenix/version.hpp>
+#include <boost/phoenix/function/function.hpp>
+
+#endif

Added: branches/proto/v4/boost/phoenix/function/function.hpp
==============================================================================
--- (empty file)
+++ branches/proto/v4/boost/phoenix/function/function.hpp	2008-05-19 19:11:11 EDT (Mon, 19 May 2008)
@@ -0,0 +1,24 @@
+/*=============================================================================
+    Copyright (c) 2001-2007 Joel de Guzman
+
+    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)
+==============================================================================*/
+#ifndef PHOENIX_FUNCTION_FUNCTION_HPP
+#define PHOENIX_FUNCTION_FUNCTION_HPP
+
+#include <boost/phoenix/core/actor.hpp>
+#include <boost/proto/proto.hpp>
+
+namespace boost { namespace phoenix
+{
+
+    template<typename Fun>
+    struct function
+    {
+        BOOST_PROTO_EXTENDS(typename proto::terminal<Fun>::type, function<Fun>, detail::domain)
+    };
+
+}}
+
+#endif

Modified: branches/proto/v4/boost/phoenix/operator.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/operator.hpp	(original)
+++ branches/proto/v4/boost/phoenix/operator.hpp	2008-05-19 19:11:11 EDT (Mon, 19 May 2008)
@@ -8,12 +8,7 @@
 #define PHOENIX_OPERATOR_HPP
 
 #include <boost/phoenix/version.hpp>
-//#include <boost/phoenix/operator/arithmetic.hpp>
-//#include <boost/phoenix/operator/bitwise.hpp>
-//#include <boost/phoenix/operator/comparison.hpp>
 #include <boost/phoenix/operator/if_else.hpp>
-//#include <boost/phoenix/operator/logical.hpp>
-//#include <boost/phoenix/operator/self.hpp>
 #include <boost/phoenix/operator/io.hpp>
 //#include <boost/phoenix/operator/member.hpp>
 

Modified: branches/proto/v4/boost/phoenix/statement.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/statement.hpp	(original)
+++ branches/proto/v4/boost/phoenix/statement.hpp	2008-05-19 19:11:11 EDT (Mon, 19 May 2008)
@@ -11,7 +11,6 @@
 #include <boost/phoenix/statement/do_while.hpp>
 #include <boost/phoenix/statement/for.hpp>
 #include <boost/phoenix/statement/if.hpp>
-//#include <boost/phoenix/statement/sequence.hpp>
 #include <boost/phoenix/statement/switch.hpp>
 #include <boost/phoenix/statement/while.hpp>
 #include <boost/phoenix/statement/throw.hpp>

Modified: branches/proto/v4/boost/phoenix/statement/try_catch.hpp
==============================================================================
--- branches/proto/v4/boost/phoenix/statement/try_catch.hpp	(original)
+++ branches/proto/v4/boost/phoenix/statement/try_catch.hpp	2008-05-19 19:11:11 EDT (Mon, 19 May 2008)
@@ -217,7 +217,7 @@
     ////////////////////////////////////////////////////////////////////////////////////////
     template<>
     struct extension<tag::try_>
-      : proto::when<detail::Try, evaluator(proto::_child)>
+      : proto::when<proto::not_<proto::_>, evaluator(proto::_child)>
     {};
 
     ////////////////////////////////////////////////////////////////////////////////////////