|
|
Boost-Commit : |
From: stipe_at_[hidden]
Date: 2008-03-01 14:01:24
Author: srajko
Date: 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
New Revision: 43440
URL: http://svn.boost.org/trac/boost/changeset/43440
Log:
added forced_sequence for signals::filter and replaced bind_object with bind_mem_fn
Added:
sandbox/SOC/2007/signals/boost/dataflow/utility/bind_mem_fn.hpp (contents, props changed)
sandbox/SOC/2007/signals/boost/dataflow/utility/bind_object.hpp
- copied, changed from r43438, /sandbox/SOC/2007/signals/boost/dataflow/signals/connection/detail/bind_object.hpp
sandbox/SOC/2007/signals/boost/dataflow/utility/forced_sequence.hpp (contents, props changed)
sandbox/SOC/2007/signals/boost/dataflow/utility/member_function_signature.hpp (contents, props changed)
sandbox/SOC/2007/signals/boost/dataflow/utility/slot_type.hpp
- copied, changed from r43438, /sandbox/SOC/2007/signals/boost/dataflow/signals/connection/detail/slot_type.hpp
sandbox/SOC/2007/signals/libs/dataflow/test/utility/
sandbox/SOC/2007/signals/libs/dataflow/test/utility/Jamfile.v2 (contents, props changed)
sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_bind_mem_fn.cpp (contents, props changed)
sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_forced_sequence.cpp (contents, props changed)
Removed:
sandbox/SOC/2007/signals/boost/dataflow/signals/connection/detail/bind_object.hpp
sandbox/SOC/2007/signals/boost/dataflow/signals/connection/detail/slot_type.hpp
Text files modified:
sandbox/SOC/2007/signals/boost/dataflow/signals/component/filter.hpp | 28 ++++++++++++--
sandbox/SOC/2007/signals/boost/dataflow/signals/component/filter_base.hpp | 74 ++++++++++++++++++++++++++++++++-------
sandbox/SOC/2007/signals/boost/dataflow/signals/component/storage.hpp | 2
sandbox/SOC/2007/signals/boost/dataflow/signals/support.hpp | 23 +++++++----
sandbox/SOC/2007/signals/boost/dataflow/utility/bind_object.hpp | 34 +++++++++---------
sandbox/SOC/2007/signals/boost/dataflow/utility/slot_type.hpp | 24 ++++++------
sandbox/SOC/2007/signals/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj | 38 +++++++++++++++++---
sandbox/SOC/2007/signals/libs/dataflow/doc/dataflow.qbk | 3 +
sandbox/SOC/2007/signals/libs/dataflow/doc/introduction/introduction.qbk | 23 ++++++++----
sandbox/SOC/2007/signals/libs/dataflow/doc/introduction/vtk_example.qbk | 4 +-
sandbox/SOC/2007/signals/libs/dataflow/doc/support/concepts/general.qbk | 4 +-
sandbox/SOC/2007/signals/libs/dataflow/doc/support/concepts/port.qbk | 6 ++-
sandbox/SOC/2007/signals/libs/dataflow/test/Jamfile.v2 | 3 +
sandbox/SOC/2007/signals/libs/dataflow/test/blueprint/test_component.cpp | 6 +-
sandbox/SOC/2007/signals/libs/dataflow/test/signals/Jamfile.v2 | 37 ++++++++++---------
sandbox/SOC/2007/signals/libs/dataflow/test/signals/test_filter.cpp | 4 +-
sandbox/SOC/2007/signals/libs/dataflow/test/test_port.cpp | 6 ++-
17 files changed, 214 insertions(+), 105 deletions(-)
Modified: sandbox/SOC/2007/signals/boost/dataflow/signals/component/filter.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/signals/component/filter.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/signals/component/filter.hpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -9,11 +9,13 @@
#define SIGNAL_NETWORK_FILTER_HPP
#include <boost/dataflow/signals/component/filter_base.hpp>
+#include <boost/dataflow/utility/forced_sequence.hpp>
#include <boost/fusion/functional/adapter/fused.hpp>
#include <boost/fusion/include/as_vector.hpp>
#include <boost/fusion/adapted/mpl.hpp>
+
#define SIGNAL_NETWORK_DEFAULT_OUT unfused
namespace boost { namespace signals {
@@ -114,9 +116,9 @@
: public filter_base<
Derived,
typename signal_from_args<OutSignature, SignalArgs>::type,
- InSignatures >
+ typename dataflow::utility::forced_sequence<InSignatures>::type >
{
- BOOST_MPL_ASSERT(( mpl::is_sequence<InSignatures> ));
+// BOOST_MPL_ASSERT(( mpl::is_sequence<InSignatures> ));
BOOST_MPL_ASSERT(( is_signal_args<SignalArgs> ));
public:
@@ -139,6 +141,22 @@
mutable signal_type out;
}; // class filter
+/** \brief Unfused version of the filter class
+*/
+template<typename Derived, typename InSignatures, typename OutSignal, typename SignalArgs>
+class filter<Derived, void, InSignatures, OutSignal, SignalArgs>
+ : public filter_base<
+ Derived,
+ typename signal_from_args<void, SignalArgs>::type,
+ typename dataflow::utility::forced_sequence<InSignatures>::type >
+{
+ BOOST_MPL_ASSERT(( is_signal_args<SignalArgs> ));
+
+public:
+ filter(const filter &) {}
+ filter(){}
+ const filter &operator = (const filter &) {return *this;}
+}; // class filter
/** \brief Combined version of the filter class
*/
@@ -146,7 +164,7 @@
class filter<Derived, OutSignature, InSignatures, combined, SignalArgs>
: public filter<Derived, OutSignature, InSignatures, unfused, SignalArgs>
{
- BOOST_MPL_ASSERT(( mpl::is_sequence<InSignatures> ));
+// BOOST_MPL_ASSERT(( mpl::is_sequence<InSignatures> ));
BOOST_MPL_ASSERT(( is_signal_args<SignalArgs> ));
public:
@@ -183,9 +201,9 @@
: public filter_base<
Derived,
typename detail::fused_signal_type<OutSignature, SignalArgs>::signal_type,
- InSignatures>
+ typename dataflow::utility::forced_sequence<InSignatures>::type >
{
- BOOST_MPL_ASSERT(( mpl::is_sequence<InSignatures> ));
+// BOOST_MPL_ASSERT(( mpl::is_sequence<InSignatures> ));
BOOST_MPL_ASSERT(( is_signal_args<SignalArgs> ));
public:
Modified: sandbox/SOC/2007/signals/boost/dataflow/signals/component/filter_base.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/signals/component/filter_base.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/signals/component/filter_base.hpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -14,24 +14,70 @@
namespace boost { namespace signals {
+
+namespace detail {
+
+ template<typename Signals, typename InSignatures>
+ struct default_port_map
+ {
+ typedef
+ mpl::map<
+ mpl::pair<dataflow::default_port_selector
+ <dataflow::args::left, dataflow::signals::connect_mechanism>,
+ mpl::int_<0> >,
+ mpl::pair<dataflow::default_port_selector
+ <dataflow::args::right, dataflow::signals::connect_mechanism>,
+ mpl::int_<1> >
+ > type;
+ };
-template<typename Filter, typename Signal, typename OutSignatures>
+ template<typename InSignatures>
+ struct default_port_map<void, InSignatures>
+ {
+ typedef
+ mpl::map<
+ mpl::pair<dataflow::default_port_selector
+ <dataflow::args::right, dataflow::signals::connect_mechanism>,
+ mpl::int_<0> >
+ > type;
+ };
+
+}
+
+/// ComponentTraits for a Dataflow.Signals filter.
+/// \param[in] Filter Filter type (the class deriving filter)
+/// \param[in] Signals A boost::signal type or void (will be: a fusion sequence of signals)
+/// \param[in] InSignatures An mpl sequence of input signatures
+template<typename Filter, typename Signals, typename InSignatures>
struct filter_component_traits
: public dataflow::fusion_component_traits<
fusion::vector<
- Signal &,
+ Signals &,
+ dataflow::port_adapter<
+ Filter,
+ dataflow::signals::call_consumer<InSignatures>,
+ dataflow::signals::tag> >,
+ typename detail::default_port_map<Signals, InSignatures>::type,
+ dataflow::signals::tag>
+{
+ template<typename Component>
+ static typename filter_component_traits::fusion_ports get_ports(Component &component)
+ {
+ return typename filter_component_traits::fusion_ports(
+ component.default_signal(),
+ component);
+ };
+};
+
+template<typename Filter, typename InSignatures>
+struct filter_component_traits<Filter, void, InSignatures>
+ : public dataflow::fusion_component_traits<
+ fusion::vector<
dataflow::port_adapter<
Filter,
- dataflow::signals::call_consumer<OutSignatures>,
+ dataflow::signals::call_consumer<InSignatures>,
dataflow::signals::tag> >,
- mpl::map<
- mpl::pair<dataflow::default_port_selector
- <dataflow::args::left, dataflow::signals::connect_mechanism>,
- mpl::int_<0> >,
- mpl::pair<dataflow::default_port_selector
- <dataflow::args::right, dataflow::signals::connect_mechanism>,
- mpl::int_<1> >
- >,
+ typename detail::default_port_map<void, InSignatures>::type,
dataflow::signals::tag>
{
template<typename Component>
@@ -43,11 +89,11 @@
};
};
-template<typename Filter, typename Signal, typename OutSignatures>
-class filter_base : public dataflow::component<filter_component_traits<Filter, Signal, OutSignatures> >
+template<typename Filter, typename Signals, typename InSignatures>
+class filter_base : public dataflow::component<filter_component_traits<Filter, Signals, InSignatures> >
{
public:
- typedef OutSignatures out_signatures_type;
+ typedef InSignatures in_signatures_type;
};
} }
Modified: sandbox/SOC/2007/signals/boost/dataflow/signals/component/storage.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/signals/component/storage.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/signals/component/storage.hpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -82,7 +82,7 @@
typename Storage::signal_type &,
dataflow::port_adapter<
Storage,
- dataflow::signals::call_consumer<typename Storage::out_signatures_type>,
+ dataflow::signals::call_consumer<typename Storage::in_signatures_type>,
dataflow::signals::tag>,
dataflow::port_adapter<
Storage,
Deleted: sandbox/SOC/2007/signals/boost/dataflow/signals/connection/detail/bind_object.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/signals/connection/detail/bind_object.hpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
+++ (empty file)
@@ -1,60 +0,0 @@
-// Copyright Stjepan Rajko 2007. Use, modification and
-// distribution is subject to 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)
-
-#if !defined(SIGNAL_NETWORK_BIND_OBJECT_HPP)
-#if !defined(BOOST_PP_IS_ITERATING)
-
-#include <boost/dataflow/signals/connection/detail/slot_type.hpp>
-
-#include <boost/function_types/function_arity.hpp>
-#include <boost/preprocessor/iterate.hpp>
-#include <boost/preprocessor/repetition/enum_shifted_params.hpp>
-#include <boost/preprocessor/punctuation/comma_if.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
-
-namespace boost { namespace signals {
-
-namespace detail {
-
- template<typename Signature, typename T, int Arity>
- struct bind_object_impl;
-
- template<typename Signature, typename T>
- struct bind_object : public bind_object_impl<Signature, T, boost::function_types::function_arity<Signature>::value>
- {};
-
-# define BOOST_PP_ITERATION_PARAMS_1 (3,(0,9,<boost/dataflow/signals/connection/detail/bind_object.hpp>))
-# include BOOST_PP_ITERATE()
-
- } // namespace detail
-
-} } // namespace boost::signals
-
-#define SIGNAL_NETWORK_BIND_OBJECT_HPP
-#else // defined(BOOST_PP_IS_ITERATING)
-
-template<typename Signature, typename T>
-struct bind_object_impl<Signature, T, BOOST_PP_ITERATION()>
-{
- boost::function<Signature> operator()(typename slot_type<Signature, T>::type mem_fn, T &object)
- {
- return boost::bind(mem_fn, boost::ref(object)
- BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
- BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_INC(BOOST_PP_ITERATION()),_));
- }
- /*boost::function<Signature> operator()(typename slot_type<Signature, T>::type mem_fn, const T &object)
- {
- return boost::bind(mem_fn, boost::ref(object)
- BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
- BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_INC(BOOST_PP_ITERATION()),_));
- }*/
-};
-
-#endif // defined(BOOST_PP_IS_ITERATING)
-#endif // SIGNAL_NETWORK_BIND_OBJECT_HPP
-
-
\ No newline at end of file
Deleted: sandbox/SOC/2007/signals/boost/dataflow/signals/connection/detail/slot_type.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/signals/connection/detail/slot_type.hpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
+++ (empty file)
@@ -1,38 +0,0 @@
-// Copyright Stjepan Rajko 2007. Use, modification and
-// distribution is subject to 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 SIGNAL_NETWORK_SLOT_TYPE_HPP
-#define SIGNAL_NETWORK_SLOT_TYPE_HPP
-
-// Constructs a type corresponding to pointer to member of T with signature Signature.
-// e.g. slot_type<some_class, void(float)>::type is void (some_class::*) (float)
-
-#include <boost/function_types/member_function_pointer.hpp>
-#include <boost/function_types/parameter_types.hpp>
-#include <boost/function_types/result_type.hpp>
-#include <boost/mpl/push_front.hpp>
-
-namespace boost { namespace signals {
-
-namespace detail {
-
- template <typename Signature, typename T>
- struct slot_type
- {
- typedef
- typename boost::function_types::member_function_pointer<
- typename boost::mpl::push_front<
- typename boost::mpl::push_front<
- typename boost::function_types::parameter_types<Signature>::type, T
- >::type, typename boost::function_types::result_type<Signature>::type
- >::type
- >::type type;
- };
-
-} // namespace detail
-
-} } // namespace boost::signals
-
-#endif // SIGNAL_NETWORK_SLOT_TYPE_HPP
Modified: sandbox/SOC/2007/signals/boost/dataflow/signals/support.hpp
==============================================================================
--- sandbox/SOC/2007/signals/boost/dataflow/signals/support.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/signals/support.hpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -8,7 +8,8 @@
#include <boost/dataflow/support.hpp>
#include <boost/dataflow/support/port/port_adapter.hpp>
-#include <boost/dataflow/signals/connection/detail/bind_object.hpp>
+#include <boost/dataflow/utility/bind_mem_fn.hpp>
+#include <boost/dataflow/utility/slot_type.hpp>
#include <boost/mpl/vector.hpp>
#include <boost/mpl/joint_view.hpp>
@@ -116,9 +117,10 @@
result_type operator()(ConsumerPort &consumer)
{
typedef typename get_object_type<ConsumerPort>::type object_type;
-
- return boost::signals::detail::bind_object<Signature, object_type>()
- (static_cast<typename boost::signals::detail::slot_type<Signature, object_type>::type>(&object_type::operator()), get_object(consumer));
+ typedef typename boost::dataflow::utility::slot_type<Signature, object_type>::type mem_fn_type;
+
+ return boost::dataflow::utility::bind_mem_fn<mem_fn_type, object_type>
+ (static_cast<mem_fn_type>(&object_type::operator()), get_object(consumer));
};
};
@@ -143,9 +145,10 @@
result_type operator()(ConsumerPort &consumer)
{
typedef typename get_object_type<ConsumerPort>::type object_type;
+ typedef typename boost::dataflow::utility::slot_type<Signature, object_type>::type mem_fn_type;
- return boost::signals::detail::bind_object<Signature, object_type>()
- (static_cast<typename boost::signals::detail::slot_type<Signature, object_type>::type>(&object_type::operator()), get_object(consumer));
+ return boost::dataflow::utility::bind_mem_fn<mem_fn_type, object_type>
+ (static_cast<mem_fn_type>(&object_type::operator()), get_object(consumer));
};
};
@@ -191,10 +194,12 @@
}
template<typename Signature, typename T>
-boost::function<Signature> make_slot_selector(typename detail::slot_type<Signature, T>::type func, T &object)
+boost::function<Signature> make_slot_selector(typename dataflow::utility::slot_type<Signature, T>::type func, T &object)
{
- return boost::signals::detail::bind_object<Signature, T>()
- (static_cast<typename boost::signals::detail::slot_type<Signature, T>::type>(func), object);
+ typedef typename boost::dataflow::utility::slot_type<Signature, T>::type mem_fn_type;
+
+ return boost::dataflow::utility::bind_mem_fn<mem_fn_type, T>
+ (static_cast<mem_fn_type>(func), object);
}
} } // namespace boost::phoenix
Added: sandbox/SOC/2007/signals/boost/dataflow/utility/bind_mem_fn.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2007/signals/boost/dataflow/utility/bind_mem_fn.hpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -0,0 +1,67 @@
+// Copyright Stjepan Rajko 2008. Use, modification and
+// distribution is subject to 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)
+
+#if !defined(BOOST_DATAFLOW_UTILITY_BIND_MEM_FN_HPP)
+#if !defined(BOOST_PP_IS_ITERATING)
+
+#include <boost/dataflow/utility/member_function_signature.hpp>
+
+#include <boost/bind.hpp>
+#include <boost/function.hpp>
+#include <boost/function_types/function_arity.hpp>
+#include <boost/preprocessor/arithmetic/inc.hpp>
+#include <boost/preprocessor/iterate.hpp>
+#include <boost/preprocessor/punctuation/comma_if.hpp>
+#include <boost/preprocessor/repetition/enum_shifted_params.hpp>
+
+namespace boost { namespace dataflow { namespace utility {
+
+namespace detail {
+
+ template<typename MemFn, typename T, int Arity>
+ struct bind_mem_fn_impl;
+
+# define BOOST_PP_ITERATION_PARAMS_1 (3,(0,9,<boost/dataflow/utility/bind_mem_fn.hpp>))
+# include BOOST_PP_ITERATE()
+
+ template<typename MemFn, typename T>
+ struct bind_mem_fn : public bind_mem_fn_impl<MemFn, T, boost::function_types::function_arity<MemFn>::value-1>
+ {};
+
+} // namespace detail
+
+template<typename MemFn, typename T>
+boost::function<typename member_function_signature<MemFn>::type>
+ bind_mem_fn(MemFn mem_fn, T &object)
+{
+ return detail::bind_mem_fn<MemFn, T>()(mem_fn, object);
+}
+
+} } } // namespace boost::dataflow::utility
+
+#define BOOST_DATAFLOW_UTILITY_BIND_MEM_FN_HPP
+#else // defined(BOOST_PP_IS_ITERATING)
+
+template<typename MemFn, typename T>
+struct bind_mem_fn_impl<MemFn, T, BOOST_PP_ITERATION()>
+{
+ boost::function<typename member_function_signature<MemFn>::type>
+ operator()(MemFn mem_fn, T &object)
+ {
+ return boost::bind(mem_fn, boost::ref(object)
+ BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
+ BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_INC(BOOST_PP_ITERATION()),_));
+ }
+/* boost::function<typename member_function_signature<MemFn>::type>
+ operator()(MemFn mem_fn, const T &object)
+ {
+ return boost::bind(mem_fn, boost::cref(object)
+ BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
+ BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_INC(BOOST_PP_ITERATION()),_));
+ }*/
+};
+
+#endif // defined(BOOST_PP_IS_ITERATING)
+#endif // BOOST_DATAFLOW_UTILITY_BIND_MEM_FN_HPP
\ No newline at end of file
Copied: sandbox/SOC/2007/signals/boost/dataflow/utility/bind_object.hpp (from r43438, /sandbox/SOC/2007/signals/boost/dataflow/signals/connection/detail/bind_object.hpp)
==============================================================================
--- /sandbox/SOC/2007/signals/boost/dataflow/signals/connection/detail/bind_object.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/utility/bind_object.hpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -1,12 +1,12 @@
-// Copyright Stjepan Rajko 2007. Use, modification and
+// Copyright Stjepan Rajko 2007,2008. Use, modification and
// distribution is subject to 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)
-#if !defined(SIGNAL_NETWORK_BIND_OBJECT_HPP)
+#if !defined(BOOST_DATAFLOW_UTILITY_BIND_OBJECT_HPP)
#if !defined(BOOST_PP_IS_ITERATING)
-#include <boost/dataflow/signals/connection/detail/slot_type.hpp>
+#include <boost/dataflow/utility/slot_type.hpp>
#include <boost/function_types/function_arity.hpp>
#include <boost/preprocessor/iterate.hpp>
@@ -16,25 +16,25 @@
#include <boost/bind.hpp>
#include <boost/function.hpp>
-namespace boost { namespace signals {
+namespace boost { namespace dataflow { namespace utility {
namespace detail {
template<typename Signature, typename T, int Arity>
struct bind_object_impl;
-
- template<typename Signature, typename T>
- struct bind_object : public bind_object_impl<Signature, T, boost::function_types::function_arity<Signature>::value>
- {};
-
-# define BOOST_PP_ITERATION_PARAMS_1 (3,(0,9,<boost/dataflow/signals/connection/detail/bind_object.hpp>))
+
+# define BOOST_PP_ITERATION_PARAMS_1 (3,(0,9,<boost/dataflow/utility/bind_object.hpp>))
# include BOOST_PP_ITERATE()
+
+} // namespace detail
- } // namespace detail
+template<typename Signature, typename T>
+struct bind_object : public detail::bind_object_impl<Signature, T, boost::function_types::function_arity<Signature>::value>
+{};
-} } // namespace boost::signals
+} } } // namespace boost::dataflow::utility
-#define SIGNAL_NETWORK_BIND_OBJECT_HPP
+#define BOOST_DATAFLOW_UTILITY_BIND_OBJECT_HPP
#else // defined(BOOST_PP_IS_ITERATING)
template<typename Signature, typename T>
@@ -46,15 +46,15 @@
BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_INC(BOOST_PP_ITERATION()),_));
}
- /*boost::function<Signature> operator()(typename slot_type<Signature, T>::type mem_fn, const T &object)
+ boost::function<Signature> operator()(typename slot_type<Signature, T>::type mem_fn, const T &object)
{
- return boost::bind(mem_fn, boost::ref(object)
+ return boost::bind(mem_fn, boost::cref(object)
BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_INC(BOOST_PP_ITERATION()),_));
- }*/
+ }
};
#endif // defined(BOOST_PP_IS_ITERATING)
-#endif // SIGNAL_NETWORK_BIND_OBJECT_HPP
+#endif // BOOST_DATAFLOW_UTILITY_BIND_OBJECT_HPP
\ No newline at end of file
Added: sandbox/SOC/2007/signals/boost/dataflow/utility/forced_sequence.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2007/signals/boost/dataflow/utility/forced_sequence.hpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -0,0 +1,39 @@
+// Copyright Stjepan Rajko 2007. Use, modification and
+// distribution is subject to 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 BOOST_DATAFLOW_UTILITY_FORCED_AS_SEQUENCE_HPP
+#define BOOST_DATAFLOW_UTILITY_FORCED_AS_SEQUENCE_HPP
+
+#include <boost/mpl/is_sequence.hpp>
+#include <boost/mpl/vector.hpp>
+#include <boost/utility/enable_if.hpp>
+
+namespace boost { namespace dataflow {
+
+namespace utility {
+
+template<typename T, typename Enable=void>
+struct forced_sequence
+{
+ typedef mpl::vector<T> type;
+};
+
+template<typename T>
+struct forced_sequence<T, typename enable_if<mpl::is_sequence<T> >::type >
+{
+ typedef T type;
+};
+
+template<>
+struct forced_sequence<void>
+{
+ typedef mpl::vector<> type;
+};
+
+}
+
+} }
+
+#endif
\ No newline at end of file
Added: sandbox/SOC/2007/signals/boost/dataflow/utility/member_function_signature.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2007/signals/boost/dataflow/utility/member_function_signature.hpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -0,0 +1,41 @@
+// Copyright Stjepan Rajko 2008. Use, modification and
+// distribution is subject to 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 BOOST_DATAFLOW_UTILITY_MEMBER_FUNCTION_SIGNATURE_HPP
+#define BOOST_DATAFLOW_UTILITY_MEMBER_FUNCTION_SIGNATURE_HPP
+
+#include <boost/function_types/function_type.hpp>
+#include <boost/function_types/is_member_function_pointer.hpp>
+#include <boost/function_types/components.hpp>
+
+#include <boost/mpl/assert.hpp>
+#include <boost/mpl/erase.hpp>
+
+namespace boost { namespace dataflow { namespace utility {
+
+/** Removes the class from a member function pointer type, yielding the
+ pure function signature (e.g., usable by boost::function).
+*/
+template<typename MemFn>
+struct member_function_signature
+{
+ BOOST_MPL_ASSERT((function_types::is_member_function_pointer<MemFn> ));
+
+ typedef
+ typename function_types::function_type<
+ typename mpl::erase<
+ typename boost::function_types::components<MemFn>::type,
+ typename mpl::next<
+ typename mpl::begin<
+ typename boost::function_types::components<MemFn>::type
+ >::type
+ >::type
+ >::type
+ >::type type;
+};
+
+} } } // namespace boost::dataflow::utility
+
+#endif // BOOST_DATAFLOW_UTILITY_MEMBER_FUNCTION_SIGNATURE_HPP
Copied: sandbox/SOC/2007/signals/boost/dataflow/utility/slot_type.hpp (from r43438, /sandbox/SOC/2007/signals/boost/dataflow/signals/connection/detail/slot_type.hpp)
==============================================================================
--- /sandbox/SOC/2007/signals/boost/dataflow/signals/connection/detail/slot_type.hpp (original)
+++ sandbox/SOC/2007/signals/boost/dataflow/utility/slot_type.hpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -1,23 +1,23 @@
-// Copyright Stjepan Rajko 2007. Use, modification and
+// Copyright Stjepan Rajko 2007,2008. Use, modification and
// distribution is subject to 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 SIGNAL_NETWORK_SLOT_TYPE_HPP
-#define SIGNAL_NETWORK_SLOT_TYPE_HPP
-
-// Constructs a type corresponding to pointer to member of T with signature Signature.
-// e.g. slot_type<some_class, void(float)>::type is void (some_class::*) (float)
+#ifndef BOOST_DATAFLOW_UTILITY_SLOT_TYPE_HPP
+#define BOOST_DATAFLOW_UTILITY_SLOT_TYPE_HPP
#include <boost/function_types/member_function_pointer.hpp>
#include <boost/function_types/parameter_types.hpp>
#include <boost/function_types/result_type.hpp>
#include <boost/mpl/push_front.hpp>
-namespace boost { namespace signals {
+namespace boost { namespace dataflow {
+
+namespace utility {
+
+// Constructs a type corresponding to pointer to member of T with signature Signature.
+// e.g. slot_type<some_class, void(float)>::type is void (some_class::*) (float)
-namespace detail {
-
template <typename Signature, typename T>
struct slot_type
{
@@ -31,8 +31,8 @@
>::type type;
};
-} // namespace detail
+} // namespace utility
-} } // namespace boost::signals
+} } // namespace boost::dataflow
-#endif // SIGNAL_NETWORK_SLOT_TYPE_HPP
+#endif // BOOST_DATAFLOW_UTILITY_SLOT_TYPE_HPP
Modified: sandbox/SOC/2007/signals/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/build/xcodeide/dataflow.xcodeproj/project.pbxproj 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -94,6 +94,8 @@
083FD3B90C62A4CB00EF3F6B /* concepts.qbk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = concepts.qbk; sourceTree = "<group>"; };
083FD3C10C62A75B00EF3F6B /* concepts.qbk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = concepts.qbk; sourceTree = "<group>"; };
083FD3C60C62A7F600EF3F6B /* phoenix.qbk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = phoenix.qbk; sourceTree = "<group>"; };
+ 0842A35C0D5A79A500CF8479 /* forced_sequence.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = forced_sequence.hpp; sourceTree = "<group>"; };
+ 0842A3600D5A7A8700CF8479 /* test_forced_sequence.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_forced_sequence.cpp; sourceTree = "<group>"; };
084467150CE790B300B3CFDF /* test_reflective_component.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = test_reflective_component.cpp; sourceTree = "<group>"; };
0844671B0CE7918C00B3CFDF /* reflective_component.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = reflective_component.hpp; sourceTree = "<group>"; };
084482560CA0B37200B88137 /* operators.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = operators.hpp; sourceTree = "<group>"; };
@@ -108,6 +110,14 @@
086231D10D1F42B60068A238 /* BlueprintWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlueprintWindow.cpp; sourceTree = "<group>"; };
08668C4E0C19A16300ACB19A /* simple_distributed_example.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = simple_distributed_example.cpp; sourceTree = "<group>"; };
08668C4F0C19A16300ACB19A /* Jamfile.v2 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Jamfile.v2; sourceTree = "<group>"; };
+ 088FC6BF0D5A6EAD004F0E76 /* Jamfile.v2 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Jamfile.v2; sourceTree = "<group>"; };
+ 088FC6C10D5A6EEC004F0E76 /* test_forced_as_vector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_forced_as_vector.cpp; sourceTree = "<group>"; };
+ 089AE57F0D79C5CF00AB9DA8 /* bind_mem_fn.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bind_mem_fn.hpp; sourceTree = "<group>"; };
+ 089AE5830D79C7CB00AB9DA8 /* bind_object.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = bind_object.hpp; sourceTree = "<group>"; };
+ 089AE58B0D79C96200AB9DA8 /* slot_type.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = slot_type.hpp; sourceTree = "<group>"; };
+ 089AE5BC0D79CE5E00AB9DA8 /* test_bind_mem_fn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_bind_mem_fn.cpp; sourceTree = "<group>"; };
+ 089AE6390D79D95C00AB9DA8 /* member_function_signature.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = member_function_signature.hpp; sourceTree = "<group>"; };
+ 089B93720D5AA99700F6EEAA /* test_filter_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_filter_base.cpp; sourceTree = "<group>"; };
08A0B20C0D21C4A90054AD32 /* cppgui_example.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cppgui_example.cpp; sourceTree = "<group>"; };
08A0B20D0D21C4A90054AD32 /* Jamfile.v2 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Jamfile.v2; sourceTree = "<group>"; };
08A0B2AC0D21D88F0054AD32 /* blueprint_bank.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = blueprint_bank.cpp; sourceTree = "<group>"; };
@@ -149,10 +159,8 @@
08EF9B350C5D506A00D4D206 /* socket_sender.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = socket_sender.hpp; sourceTree = "<group>"; };
08EF9B360C5D506A00D4D206 /* storage.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = storage.hpp; sourceTree = "<group>"; };
08EF9B370C5D506A00D4D206 /* timed_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = timed_generator.hpp; sourceTree = "<group>"; };
- 08EF9B3C0C5D506A00D4D206 /* bind_object.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = bind_object.hpp; sourceTree = "<group>"; };
08EF9B3D0C5D506A00D4D206 /* replace_return_type.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = replace_return_type.hpp; sourceTree = "<group>"; };
08EF9B3E0C5D506A00D4D206 /* result_of_defined.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = result_of_defined.hpp; sourceTree = "<group>"; };
- 08EF9B3F0C5D506A00D4D206 /* slot_type.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = slot_type.hpp; sourceTree = "<group>"; };
08EF9B440C5D506A00D4D206 /* connection.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = connection.hpp; sourceTree = "<group>"; };
08EF9B470C5D506A00D4D206 /* unfused_typed_class.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = unfused_typed_class.hpp; sourceTree = "<group>"; };
08EF9B520C5D537F00D4D206 /* support.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = support.hpp; sourceTree = "<group>"; };
@@ -338,6 +346,17 @@
path = ../../example;
sourceTree = SOURCE_ROOT;
};
+ 088FC6BE0D5A6EAD004F0E76 /* utility */ = {
+ isa = PBXGroup;
+ children = (
+ 088FC6BF0D5A6EAD004F0E76 /* Jamfile.v2 */,
+ 088FC6C10D5A6EEC004F0E76 /* test_forced_as_vector.cpp */,
+ 0842A3600D5A7A8700CF8479 /* test_forced_sequence.cpp */,
+ 089AE5BC0D79CE5E00AB9DA8 /* test_bind_mem_fn.cpp */,
+ );
+ path = utility;
+ sourceTree = "<group>";
+ };
08A0B20A0D21C4050054AD32 /* cppgui_gui */ = {
isa = PBXGroup;
children = (
@@ -359,6 +378,7 @@
08C675970C13A03E00D85379 /* Jamfile.v2 */,
08F5FF060D07082200FDBAEE /* blueprint */,
08F71D3D0CA3547C0010099E /* signals */,
+ 088FC6BE0D5A6EAD004F0E76 /* utility */,
084467150CE790B300B3CFDF /* test_reflective_component.cpp */,
08B9D4190CC3D0790050F10B /* test_binary_op.cpp */,
08F26C8B0CBF1CBA00EDC3F6 /* test_port.cpp */,
@@ -455,10 +475,8 @@
08EF9B3B0C5D506A00D4D206 /* detail */ = {
isa = PBXGroup;
children = (
- 08EF9B3C0C5D506A00D4D206 /* bind_object.hpp */,
08EF9B3D0C5D506A00D4D206 /* replace_return_type.hpp */,
08EF9B3E0C5D506A00D4D206 /* result_of_defined.hpp */,
- 08EF9B3F0C5D506A00D4D206 /* slot_type.hpp */,
);
path = detail;
sourceTree = "<group>";
@@ -615,12 +633,17 @@
08F348960CC021CE006D0A67 /* utility */ = {
isa = PBXGroup;
children = (
+ 089AE58B0D79C96200AB9DA8 /* slot_type.hpp */,
+ 089AE5830D79C7CB00AB9DA8 /* bind_object.hpp */,
08EFF41A0D0DAFEC004182AE /* enable_if_type.hpp */,
08F348970CC021E0006D0A67 /* copy_cv.hpp */,
08F2D3A90CCADDE00042A3FF /* underlying_type.hpp */,
08F49B8B0D08946200D0CF0E /* uuid_constant.hpp */,
084B11CE0D08EB2C00491E27 /* forwardable.hpp */,
0815AE780D0B7C88007ED135 /* is_type.hpp */,
+ 0842A35C0D5A79A500CF8479 /* forced_sequence.hpp */,
+ 089AE57F0D79C5CF00AB9DA8 /* bind_mem_fn.hpp */,
+ 089AE6390D79D95C00AB9DA8 /* member_function_signature.hpp */,
);
path = utility;
sourceTree = "<group>";
@@ -698,6 +721,7 @@
08F71D4F0CA3547C0010099E /* test_socket.cpp */,
08F71D500CA3547C0010099E /* test_storage.cpp */,
08FBDA3A0CD272ED00CC3891 /* test_multiplexer.cpp */,
+ 089B93720D5AA99700F6EEAA /* test_filter_base.cpp */,
);
path = signals;
sourceTree = "<group>";
@@ -808,10 +832,12 @@
/* Begin PBXProject section */
080DD7580C13908400EEB53D /* Project object */ = {
isa = PBXProject;
- buildConfigurationList = 080DD7590C13908400EEB53D /* Build configuration list for PBXProject "signal_network" */;
+ buildConfigurationList = 080DD7590C13908400EEB53D /* Build configuration list for PBXProject "dataflow" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 0;
mainGroup = 080DD7560C13908400EEB53D;
projectDirPath = "";
+ projectRoot = ../../../..;
targets = (
080DD7670C1390D400EEB53D /* test */,
08C675740C139E1300D85379 /* test clean */,
@@ -1054,7 +1080,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- 080DD7590C13908400EEB53D /* Build configuration list for PBXProject "signal_network" */ = {
+ 080DD7590C13908400EEB53D /* Build configuration list for PBXProject "dataflow" */ = {
isa = XCConfigurationList;
buildConfigurations = (
080DD75A0C13908400EEB53D /* Debug */,
Modified: sandbox/SOC/2007/signals/libs/dataflow/doc/dataflow.qbk
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/doc/dataflow.qbk (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/doc/dataflow.qbk 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -27,7 +27,7 @@
[template PortVector[] [link dataflow.support.concepts.component.portvector [^PortVector]]]
[template PortVectorTraits[] [link dataflow.support.concepts.component.portvector [^PortVectorTraits]]]
[template VectorPort[] [link dataflow.support.concepts.port_related.vectorport [^VectorPort]]]
-[template VectorPortTraits[] [link dataflow.support.concepts.port_related.vectorport [^VectorPortTraitr]]]
+[template VectorPortTraits[] [link dataflow.support.concepts.port_related.vectorport [^VectorPortTraits]]]
[template KeyedPort[] [link dataflow.support.concepts.port_related.keyedport [^KeyedPort]]]
[template KeyedPortTraits[] [link dataflow.support.concepts.port_related.keyedport [^KeyedPortTraitr]]]
@@ -129,6 +129,7 @@
[template is_entity[] [classref boost::dataflow::is_entity [^is_entity]]]
[template is_port[] [classref boost::dataflow::is_port [^is_port]]]
[template port[] [classref boost::dataflow::port [^port]]]
+[template port_adapter[] [classref boost::dataflow::port_adapter [^port_adapter]]]
[template complemented_port_traits[] [classref boost::dataflow::complemented_port_traits [^complemented_port_traits]]]
[template is_complemented_port[] [classref boost::dataflow::is_complemented_port [^is_complemented_port]]]
Modified: sandbox/SOC/2007/signals/libs/dataflow/doc/introduction/introduction.qbk
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/doc/introduction/introduction.qbk (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/doc/introduction/introduction.qbk 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -19,7 +19,7 @@
* A layer providing generic dataflow support centered around [concepts],
adaptable to various dataflow frameworks and data transport mechanisms.
-* The [DataflowSignals] layer, with a number of implemented components use
+* The [DataflowSignals] layer, with a number of implemented components using
[BoostSignals] as a data transport mechanism.
* The [DataflowBlueprint] layer, built on top of the generic layer and providing
runtime reflection and network modeling using the [BoostGraph].
@@ -78,11 +78,17 @@
connections made through simple object pointers, with support for using
[BoostPhoenix2] actors for data processing ([DataflowPhoenix]).]
-[heading What the Dataflow library doesn't offer]
+[heading What the Dataflow library doesn't offer (yet)]
-Ideally, the Dataflow library should at some point offer a native dataflow
-framework which offers memory management, flexible scheduling, optimized
-evaluation, etc. At this point, such a framework is missing.
+Since the development of the Dataflow library started with a dataflow
+framework built on top of [BoostSignals], its features are heavily biased
+towards the characteristics of [BoostSignals] - connectability is detirmined
+at compile time, and evaluation of a dataflow network is driven entirely by the
+components. Ideally, the Dataflow library should at some point offer a native
+dataflow framework of a different kind - one that allows runtime specification
+of port/component characteristics, offers memory management for the data being
+exchanged between the components, as well as flexible scheduling and optimized
+evaluation. At this point, however, such a framework is missing.
[heading Where to go from here]
@@ -233,12 +239,13 @@
Finally, [*we are not to far from the advantages of a [@http://en.wikipedia.org/wiki/Visual_programming_language
visual programming language]], since the components and the connections have a natural graphical representation.
-With a visaul development environment, programming becomes as easy as connecting components with connections
-(again, the Dataflow library provides no visual programming functionality).
+With a visaul development environment, programming becomes as easy as connecting components with connections.
+In fact, the Dataflow library provides a small [gui_example example]
+illustrating this.
[heading Go with the flow?]
-If you are interested in exploring the dataflow concept further using
+If you are interested in exploring dataflow programming further using
the Dataflow library, see
* [how_to_use How to use this library and the documentation].
Modified: sandbox/SOC/2007/signals/libs/dataflow/doc/introduction/vtk_example.qbk
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/doc/introduction/vtk_example.qbk (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/doc/introduction/vtk_example.qbk 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -82,7 +82,7 @@
[vtk_algorithm_output_producer]
[note More details about registering [PortTraits] for a [Port]
-can be found on the [Port] documentation page.]
+can be found on the [Traits] documentation page.]
Now that we have a producer [Port], we need a consumer [Port].
[vtkAlgorithm] can accept incoming connections using the `AddInputConnection`
@@ -146,7 +146,7 @@
[heading What we can do with what we have so far]
-[vtk_connect_unforwarded]
+[vtk_connect_forwarded]
[heading Next]
[link dataflow.introduction.examples.new_layer.component
Modified: sandbox/SOC/2007/signals/libs/dataflow/doc/support/concepts/general.qbk
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/doc/support/concepts/general.qbk (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/doc/support/concepts/general.qbk 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -128,7 +128,7 @@
the [register_traits] template (either directly, or through the provided
macros [DATAFLOW_TRAITS] and [DATAFLOW_TRAITS_ENABLE_IF]). This will
specialize [traits_of] for all cv-qualified versions of type `E`.
-If cv-qualified versions of type `E` should have different [Traits]s,
+If cv-qualified versions of type `E` should have different [Traits],
[traits_of] should be specialized directly.
Intrusive registration can be done by providing
@@ -136,7 +136,7 @@
type, or an MPL sequence of [Traits] types. Alternatively,
the Dataflow library provides a convenience class
`entity` which you can inherit instead of declaring the member type. This
-provides the additional benefit of accessing the free functions in the
+provides the additional benefit of being able to access free functions in the
`boost::dataflow` namespace using ADL.
The below examples illustrate the avaliable registration methods.
Modified: sandbox/SOC/2007/signals/libs/dataflow/doc/support/concepts/port.qbk
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/doc/support/concepts/port.qbk (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/doc/support/concepts/port.qbk 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -187,7 +187,7 @@
of [Port] types have the same complement port). An example of the
latter is [DataflowSignals], where any `signal` of signature `T` has
a complement port of type `function<T>`, and can therefore model
-[ComplementedPort], but `function<T>` is cannot because there are many `signal`
+[ComplementedPort], but `function<T>` cannot because there are many `signal`
types to which it can be connected.
The traits of a [ComplementedPort] are captured by the
@@ -233,7 +233,9 @@
[
The complement port type of `P`. If `P` is
[BinaryOperable] with another port type `P2`, then `P2` must
- be `PT::complement_port_type`.
+ be either `PT::complement_port_type`, , or a [KeyedPort]
+ that delegates to `PT::complement_port_type` in a binary operation
+ with `P`.
]
]
]
Modified: sandbox/SOC/2007/signals/libs/dataflow/test/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/test/Jamfile.v2 (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/Jamfile.v2 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -22,4 +22,5 @@
run test_component.cpp ;
build-project signals ;
-build-project blueprint ;
+#build-project blueprint ;
+build-project utility ;
\ No newline at end of file
Modified: sandbox/SOC/2007/signals/libs/dataflow/test/blueprint/test_component.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/test/blueprint/test_component.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/blueprint/test_component.cpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -18,13 +18,13 @@
{
blueprint::component_t<signals::storage<void(int)>, df::signals::tag > source, sink;
- BOOST_CHECK_EQUAL(source.num_ports(), 2u);
+ BOOST_CHECK_EQUAL(source.num_ports(), 3u);
BOOST_CHECK(source.get_port(0).traits().category().is<df::ports::producer>());
BOOST_CHECK(source.get_port(1).traits().category().is<df::ports::consumer>());
BOOST_CHECK(source.get_port(1).is_vector_port());
- BOOST_CHECK_EQUAL(source.get_port(1).as<blueprint::vector_port>().num_ports(), 2u);
+ BOOST_CHECK_EQUAL(source.get_port(1).as<blueprint::vector_port>().num_ports(), 4u);
if(source.get_port(1).is_vector_port() &&
- source.get_port(1).as<blueprint::vector_port>().num_ports() == 2u)
+ source.get_port(1).as<blueprint::vector_port>().num_ports() == 4u)
{
BOOST_CHECK(source.get_port(1).as<blueprint::vector_port>().get_port(0)
.traits().category().is<df::ports::consumer>());
Modified: sandbox/SOC/2007/signals/libs/dataflow/test/signals/Jamfile.v2
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/test/signals/Jamfile.v2 (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/signals/Jamfile.v2 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -13,27 +13,28 @@
<define>BOOST_ALL_NO_LIB=1
;
-#run test_result_of_defined.cpp ;
+run test_filter_base.cpp ;
+
run test_bind_object.cpp ;
run test_connect.cpp ;
run test_filter.cpp ;
run test_storage.cpp ;
-run test_counter.cpp ;
-run test_junction.cpp ;
-run test_multiplexer.cpp ;
-run test_function.cpp ;
-run test_chain.cpp ;
-run test_mutex.cpp
- /boost/thread//boost_thread/<link>static ;
-run test_socket.cpp
- /boost/serialization//boost_serialization/<link>static
- /boost/thread//boost_thread/<link>static ;
-run test_branching.cpp ;
-run test_pull.cpp ;
-run test_disconnect.cpp ;
-run test_multi_type.cpp ;
-run test_multi_args.cpp ;
-run test_same_type.cpp ;
-run test_multi_out.cpp ;
+#run test_counter.cpp ;
+#run test_junction.cpp ;
+#run test_multiplexer.cpp ;
+#run test_function.cpp ;
+#run test_chain.cpp ;
+#run test_mutex.cpp
+# /boost/thread//boost_thread/<link>static ;
+#run test_socket.cpp
+# /boost/serialization//boost_serialization/<link>static
+# /boost/thread//boost_thread/<link>static ;
+#run test_branching.cpp ;
+#run test_pull.cpp ;
+#run test_disconnect.cpp ;
+#run test_multi_type.cpp ;
+#run test_multi_args.cpp ;
+#run test_same_type.cpp ;
+#run test_multi_out.cpp ;
Modified: sandbox/SOC/2007/signals/libs/dataflow/test/signals/test_filter.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/test/signals/test_filter.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/signals/test_filter.cpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -14,7 +14,7 @@
//[ test_filter_classes
-class DoublerClass : public signals::filter<DoublerClass, void (int), mpl::vector<void(int)> >
+class DoublerClass : public signals::filter<DoublerClass, void(int), void(int)>
{
public:
void operator()(int x) {out(2*x);}
@@ -37,7 +37,7 @@
int stored;
};
-class FusedDoublerClass : public signals::filter<FusedDoublerClass, void (int), mpl::vector<>, signals::fused>
+class FusedDoublerClass : public signals::filter<FusedDoublerClass, void (int), void(const fusion::vector<int> &), signals::fused>
{
public:
void operator()(const fusion::vector<int> &x)
Modified: sandbox/SOC/2007/signals/libs/dataflow/test/test_port.cpp
==============================================================================
--- sandbox/SOC/2007/signals/libs/dataflow/test/test_port.cpp (original)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/test_port.cpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -17,7 +17,6 @@
typedef df::port_traits<df::ports::consumer> consumer_traits;
struct some_tag : public df::default_tag {};
-struct whatever;
typedef df::port_traits<df::ports::consumer, some_tag> other_consumer_traits;
@@ -118,6 +117,8 @@
//]
+struct whatever;
+
int test_main(int, char* [])
{
BOOST_CHECK(df::is_port_category<df::ports::producer>::value);
@@ -153,9 +154,10 @@
BOOST_CHECK(( df::is_port<non_intrusive_port_descendant>::value ));
BOOST_CHECK(( df::is_port<non_intrusive_port_descendant2>::value ));
+ //]
BOOST_CHECK(( df::has_default_port<my_producer, whatever, whatever>::value ));
BOOST_CHECK_EQUAL(( &df::get_default_port<whatever, whatever, df::default_tag>(p)), &p );
- //]
+
return 0;
} // int test_main(int, char* [])
Added: sandbox/SOC/2007/signals/libs/dataflow/test/utility/Jamfile.v2
==============================================================================
--- (empty file)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/utility/Jamfile.v2 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -0,0 +1,15 @@
+# Copyright 2007 Stjepan Rajko.
+# 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)
+
+import testing ;
+
+project dataflow/test/utility
+ : requirements
+ <include>../../../..
+ <define>BOOST_ALL_NO_LIB=1
+ ;
+
+run test_forced_sequence.cpp ;
+run test_bind_mem_fn.cpp ;
Added: sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_bind_mem_fn.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_bind_mem_fn.cpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -0,0 +1,49 @@
+// Copyright Stjepan Rajko 2008. Use, modification and
+// distribution is subject to 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 <boost/dataflow/utility/bind_mem_fn.hpp>
+
+#include <boost/test/included/test_exec_monitor.hpp>
+
+class sum
+{
+public:
+ sum(int base)
+ : m_base(base)
+ {}
+
+ int add1(int num) const
+ { return m_base + num; }
+
+ int add2(int num1, int num2) const
+ { return m_base + num1 + num2; }
+
+private:
+ int m_base;
+};
+
+int test_main(int, char* [])
+{
+ using namespace boost;
+ namespace df=boost::dataflow;
+
+ sum test_sum(1);
+
+ boost::function<int(int)> fun1 = df::utility::bind_mem_fn(&sum::add1, test_sum);
+ boost::function<int(int, int)> fun2 = df::utility::bind_mem_fn(&sum::add2, test_sum);
+
+ BOOST_CHECK_EQUAL(fun1(2), 3);
+ BOOST_CHECK_EQUAL(fun2(2, 3), 6);
+
+ const sum const_test_sum(2);
+
+ boost::function<int(int)> cfun1 = df::utility::bind_mem_fn(&sum::add1, const_test_sum);
+ boost::function<int(int, int)> cfun2 = df::utility::bind_mem_fn(&sum::add2, const_test_sum);
+
+ BOOST_CHECK_EQUAL(cfun1(2), 4);
+ BOOST_CHECK_EQUAL(cfun2(2, 3), 7);
+
+ return 0;
+} // int test_main(int, char* [])
Added: sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_forced_sequence.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2007/signals/libs/dataflow/test/utility/test_forced_sequence.cpp 2008-03-01 14:01:21 EST (Sat, 01 Mar 2008)
@@ -0,0 +1,26 @@
+// Copyright Stjepan Rajko 2008. Use, modification and
+// distribution is subject to 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 <boost/dataflow/utility/forced_sequence.hpp>
+
+#include <boost/type_traits/is_same.hpp>
+
+#include <boost/test/included/test_exec_monitor.hpp>
+
+int test_main(int, char* [])
+{
+ using namespace boost;
+ namespace df=boost::dataflow;
+
+ BOOST_CHECK((is_same<df::utility::forced_sequence<void>::type, mpl::vector<> >::value));
+ BOOST_CHECK((is_same<df::utility::forced_sequence<int>::type, mpl::vector<int> >::value));
+ BOOST_CHECK((is_same<df::utility::forced_sequence<mpl::vector<int> >::type, mpl::vector<int> >::value));
+
+ return 0;
+} // int test_main(int, char* [])
+
+
+
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