Subject: [Boost-commit] svn:boost r67180 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/config boost/detail boost/filesystem boost/functional/hash boost/fusion boost/gil boost/graph boost/integer boost/interprocess boost/intrusive boost/io boost/iostreams boost/math boost/msm boost/numeric/ublas boost/program_options boost/property_tree boost/proto/transform boost/python boost/range boost/regex boost/serialization boost/signals boost/signals2 boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/support boost/statechart boost/system boost/thread boost/tr1 boost/type_traits boost/typeof boost/unordered boost/utility boost/uuid boost/variant boost/wave doc libs libs/algorithm/string libs/array/doc libs/array/test libs/bimap libs/config libs/date_time libs/filesystem libs/functional/hash libs/fusion libs/graph_parallel libs/integer libs/interprocess libs/intrusive libs/iostreams libs/math libs/math/doc libs/math/doc/sf_and_dist libs/mpi/build libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/msm libs/numeric/ublas libs/numeric/ublas/doc libs/program_options libs/property_tree libs/python libs/range libs/regex libs/serialization libs/serialization/doc libs/serialization/example libs/serialization/src libs/serialization/test libs/serialization/vc7ide libs/signals libs/signals2 libs/spirit libs/spirit/classic/example libs/spirit/doc libs/spirit/example libs/spirit/phoenix libs/spirit/test libs/spirit/test/qi libs/statechart libs/static_assert libs/system libs/thread libs/timer libs/tr1 libs/type_traits libs/type_traits/doc libs/typeof/doc libs/unordered libs/utility libs/utility/swap/test libs/uuid libs/wave more more/getting_started status tools tools/bcp tools/boostbook tools/build/v2 tools/inspect tools/quickbook tools/regression tools/regression/src tools/release tools/wave
From: eric_at_[hidden]
Date: 2010-12-11 19:00:33
Author: eric_niebler
Date: 2010-12-11 19:00:32 EST (Sat, 11 Dec 2010)
New Revision: 67180
URL: http://svn.boost.org/trac/boost/changeset/67180
Log:
Merged revisions 67158,67179 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r67158 | eric_niebler | 2010-12-11 00:09:18 -0500 (Sat, 11 Dec 2010) | 1 line
clean-up proto::make implementation
........
r67179 | eric_niebler | 2010-12-11 11:30:03 -0500 (Sat, 11 Dec 2010) | 1 line
undefine temporary macro
........
Properties modified:
branches/release/ (props changed)
branches/release/INSTALL (props changed)
branches/release/Jamroot (props changed)
branches/release/LICENSE_1_0.txt (props changed)
branches/release/boost/ (props changed)
branches/release/boost-build.jam (props changed)
branches/release/boost.css (props changed)
branches/release/boost.png (props changed)
branches/release/boost/algorithm/string/ (props changed)
branches/release/boost/archive/ (props changed)
branches/release/boost/array.hpp (props changed)
branches/release/boost/bimap/ (props changed)
branches/release/boost/config/ (props changed)
branches/release/boost/config.hpp (props changed)
branches/release/boost/detail/ (props changed)
branches/release/boost/detail/endian.hpp (props changed)
branches/release/boost/filesystem/ (props changed)
branches/release/boost/filesystem.hpp (props changed)
branches/release/boost/functional/hash/ (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/gil/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/integer/ (props changed)
branches/release/boost/interprocess/ (props changed)
branches/release/boost/intrusive/ (props changed)
branches/release/boost/io/ (props changed)
branches/release/boost/iostreams/ (props changed)
branches/release/boost/math/ (props changed)
branches/release/boost/math_fwd.hpp (props changed)
branches/release/boost/msm/ (props changed)
branches/release/boost/numeric/ublas/ (props changed)
branches/release/boost/numeric/ublas/functional.hpp (props changed)
branches/release/boost/program_options/ (props changed)
branches/release/boost/property_tree/ (props changed)
branches/release/boost/python/ (props changed)
branches/release/boost/range/ (props changed)
branches/release/boost/regex/ (props changed)
branches/release/boost/serialization/ (props changed)
branches/release/boost/signals/ (props changed)
branches/release/boost/signals2/ (props changed)
branches/release/boost/signals2.hpp (props changed)
branches/release/boost/spirit/ (props changed)
branches/release/boost/spirit/home/ (props changed)
branches/release/boost/spirit/home/karma/ (props changed)
branches/release/boost/spirit/home/support/attributes.hpp (props changed)
branches/release/boost/statechart/ (props changed)
branches/release/boost/system/ (props changed)
branches/release/boost/thread/ (props changed)
branches/release/boost/thread.hpp (props changed)
branches/release/boost/token_functions.hpp (props changed)
branches/release/boost/tr1/ (props changed)
branches/release/boost/type_traits/ (props changed)
branches/release/boost/typeof/message.hpp (props changed)
branches/release/boost/typeof/register_functions.hpp (props changed)
branches/release/boost/typeof/register_functions_iterate.hpp (props changed)
branches/release/boost/typeof/typeof.hpp (props changed)
branches/release/boost/typeof/unsupported.hpp (props changed)
branches/release/boost/unordered/ (props changed)
branches/release/boost/utility/ (props changed)
branches/release/boost/utility/value_init.hpp (props changed)
branches/release/boost/uuid/ (props changed)
branches/release/boost/variant/ (props changed)
branches/release/boost/version.hpp (props changed)
branches/release/boost/wave/ (props changed)
branches/release/bootstrap.bat (props changed)
branches/release/bootstrap.sh (props changed)
branches/release/doc/ (props changed)
branches/release/index.htm (props changed)
branches/release/index.html (props changed)
branches/release/libs/ (props changed)
branches/release/libs/algorithm/string/ (props changed)
branches/release/libs/array/doc/array.xml (props changed)
branches/release/libs/array/test/array0.cpp (props changed)
branches/release/libs/array/test/array2.cpp (props changed)
branches/release/libs/bimap/ (props changed)
branches/release/libs/config/ (props changed)
branches/release/libs/date_time/ (props changed)
branches/release/libs/filesystem/ (props changed)
branches/release/libs/functional/hash/ (props changed)
branches/release/libs/fusion/ (props changed)
branches/release/libs/graph_parallel/ (props changed)
branches/release/libs/integer/ (props changed)
branches/release/libs/interprocess/ (props changed)
branches/release/libs/intrusive/ (props changed)
branches/release/libs/iostreams/ (props changed)
branches/release/libs/libraries.htm (props changed)
branches/release/libs/maintainers.txt (props changed)
branches/release/libs/math/ (props changed)
branches/release/libs/math/doc/ (props changed)
branches/release/libs/math/doc/sf_and_dist/ (props changed)
branches/release/libs/mpi/build/ (props changed)
branches/release/libs/mpl/doc/refmanual/broken-compiler-workarounds.html (props changed)
branches/release/libs/mpl/doc/refmanual/categorized-index-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/cfg-no-preprocessed-headers.html (props changed)
branches/release/libs/mpl/doc/refmanual/composition-and-argument-binding.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-concepts.html (props changed)
branches/release/libs/mpl/doc/refmanual/data-types-miscellaneous.html (props changed)
branches/release/libs/mpl/doc/refmanual/extensible-associative-sequence.html (props changed)
branches/release/libs/mpl/doc/refmanual/inserter-class.html (props changed)
branches/release/libs/mpl/doc/refmanual/tag-dispatched-metafunction.html (props changed)
branches/release/libs/mpl/doc/refmanual/trivial-metafunctions-summary.html (props changed)
branches/release/libs/mpl/doc/src/refmanual/Iterators-Iterator.rst (props changed)
branches/release/libs/msm/ (props changed)
branches/release/libs/numeric/ublas/ (props changed)
branches/release/libs/numeric/ublas/doc/ (props changed)
branches/release/libs/program_options/ (props changed)
branches/release/libs/property_tree/ (props changed)
branches/release/libs/python/ (props changed)
branches/release/libs/range/ (props changed)
branches/release/libs/regex/ (props changed)
branches/release/libs/serialization/ (props changed)
branches/release/libs/serialization/doc/ (props changed)
branches/release/libs/serialization/example/ (props changed)
branches/release/libs/serialization/src/ (props changed)
branches/release/libs/serialization/test/test_diamond_complex.cpp (props changed)
branches/release/libs/serialization/vc7ide/ (props changed)
branches/release/libs/signals/ (props changed)
branches/release/libs/signals2/ (props changed)
branches/release/libs/spirit/ (props changed)
branches/release/libs/spirit/classic/example/ (props changed)
branches/release/libs/spirit/doc/ (props changed)
branches/release/libs/spirit/example/ (props changed)
branches/release/libs/spirit/phoenix/ (props changed)
branches/release/libs/spirit/test/ (props changed)
branches/release/libs/spirit/test/qi/optional.cpp (props changed)
branches/release/libs/statechart/ (props changed)
branches/release/libs/static_assert/ (props changed)
branches/release/libs/system/ (props changed)
branches/release/libs/thread/ (props changed)
branches/release/libs/timer/ (props changed)
branches/release/libs/tr1/ (props changed)
branches/release/libs/type_traits/ (props changed)
branches/release/libs/type_traits/doc/ (props changed)
branches/release/libs/typeof/doc/typeof.qbk (props changed)
branches/release/libs/unordered/ (props changed)
branches/release/libs/utility/ (props changed)
branches/release/libs/utility/swap.html (props changed)
branches/release/libs/utility/swap/test/std_bitset.cpp (props changed)
branches/release/libs/utility/value_init.htm (props changed)
branches/release/libs/utility/value_init_test.cpp (props changed)
branches/release/libs/uuid/ (props changed)
branches/release/libs/wave/ (props changed)
branches/release/more/ (props changed)
branches/release/more/getting_started/ (props changed)
branches/release/rst.css (props changed)
branches/release/status/ (props changed)
branches/release/status/Jamfile.v2 (props changed)
branches/release/status/explicit-failures-markup.xml (props changed)
branches/release/tools/ (props changed)
branches/release/tools/bcp/ (props changed)
branches/release/tools/boostbook/ (props changed)
branches/release/tools/build/v2/ (props changed)
branches/release/tools/inspect/ (props changed)
branches/release/tools/quickbook/ (props changed)
branches/release/tools/regression/ (props changed)
branches/release/tools/regression/src/library_status.cpp (props changed)
branches/release/tools/release/ (props changed)
branches/release/tools/wave/ (props changed)
Text files modified:
branches/release/boost/proto/transform/make.hpp | 145 ++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 62 deletions(-)
Modified: branches/release/boost/proto/transform/make.hpp
==============================================================================
--- branches/release/boost/proto/transform/make.hpp (original)
+++ branches/release/boost/proto/transform/make.hpp 2010-12-11 19:00:32 EST (Sat, 11 Dec 2010)
@@ -37,12 +37,36 @@
{
namespace detail
{
- template<BOOST_PP_ENUM_PARAMS_WITH_A_DEFAULT(BOOST_PROTO_MAX_ARITY, typename A, void)>
- struct typelist
+ enum callable_type
{
- typedef void type;
+ CT_not_callable
+ , CT_callable
+ , CT_transform
};
+ template<typename T, bool IsTransform = is_transform<T>::value>
+ struct get_callable_type2
+ {
+ static callable_type const value = CT_callable;
+ };
+
+ template<typename T>
+ struct get_callable_type2<T, true>
+ {
+ static callable_type const value = CT_transform;
+ };
+
+ template<typename T, bool IsCallable = is_callable<T>::value>
+ struct get_callable_type
+ {
+ static callable_type const value = CT_not_callable;
+ };
+
+ template<typename T>
+ struct get_callable_type<T, true>
+ : get_callable_type2<T>
+ {};
+
template<typename T, bool HasType = mpl::aux::has_type<T>::value>
struct nested_type
{
@@ -55,70 +79,84 @@
typedef T type;
};
- template<typename T, typename Args, typename Void = void>
+ template<
+ typename T
+ , typename Expr, typename State, typename Data
+ , bool Applied, bool IsTransform = is_transform<T>::value
+ >
struct nested_type_if
+ {
+ typedef T type;
+ static bool const applied = false;
+ };
+
+ template<typename T, typename Expr, typename State, typename Data, bool Applied>
+ struct nested_type_if<T, Expr, State, Data, Applied, true>
+ : uncvref<typename T::template impl<Expr, State, Data>::result_type>
+ {
+ static bool const applied = true;
+ };
+
+ template<typename T, typename Expr, typename State, typename Data>
+ struct nested_type_if<T, Expr, State, Data, true, false>
: nested_type<T>
- {};
+ {
+ static bool const applied = true;
+ };
- template<typename R, typename Expr, typename State, typename Data
+ template<
+ typename R
+ , typename Expr, typename State, typename Data
BOOST_MPL_AUX_LAMBDA_ARITY_PARAM(long Arity = mpl::aux::template_arity<R>::value)
>
struct make_
{
typedef R type;
- typedef void not_applied_;
+ static bool const applied = false;
};
- template<typename R, typename Expr, typename State, typename Data
- , bool IsTransform = is_transform<R>::value
+ template<
+ typename R
+ , typename Expr, typename State, typename Data
+ , callable_type CallableType = get_callable_type<R>::value
>
- struct make_if2_
+ struct make_if_;
+
+ template<typename R, typename Expr, typename State, typename Data>
+ struct make_if_<R, Expr, State, Data, CT_callable>
: make_<R, Expr, State, Data>
{};
template<typename R, typename Expr, typename State, typename Data>
- struct make_if2_<R, Expr, State, Data, true>
+ struct make_if_<R, Expr, State, Data, CT_transform>
: uncvref<typename R::template impl<Expr, State, Data>::result_type>
- {};
-
- template<typename R, typename Expr, typename State, typename Data
- // HACKHACK This should really be is_transform; however, is_transform
- // would have the unfortunate side-effect of instantiating R which is
- // not acceptable in this context. Instead, we first check to see if
- // R is callable, which will not instantiate R. If is_callable is true,
- // it is safe to instantiate R to check if it is a transform.
- , bool IsCallable = is_callable<R>::value
- >
- struct make_if_;
+ {
+ static bool const applied = true;
+ };
template<typename R, typename Expr, typename State, typename Data>
- struct make_if_<R, Expr, State, Data, false>
+ struct make_if_<R, Expr, State, Data, CT_not_callable>
: make_<R, Expr, State, Data>
{};
#if BOOST_WORKAROUND(__GNUC__, == 3) || (__GNUC__ == 4 && __GNUC_MINOR__ == 0)
// work around GCC bug
template<typename Tag, typename Args, long N, typename Expr, typename State, typename Data>
- struct make_if_<proto::expr<Tag, Args, N>, Expr, State, Data, false>
+ struct make_if_<proto::expr<Tag, Args, N>, Expr, State, Data, CT_not_callable>
{
typedef proto::expr<Tag, Args, N> type;
- typedef void not_applied_;
+ static bool const applied = false;
};
// work around GCC bug
template<typename Tag, typename Args, long N, typename Expr, typename State, typename Data>
- struct make_if_<proto::basic_expr<Tag, Args, N>, Expr, State, Data, false>
+ struct make_if_<proto::basic_expr<Tag, Args, N>, Expr, State, Data, CT_not_callable>
{
typedef proto::basic_expr<Tag, Args, N> type;
- typedef void not_applied_;
+ static bool const applied = false;
};
#endif
- template<typename R, typename Expr, typename State, typename Data>
- struct make_if_<R, Expr, State, Data, true>
- : make_if2_<R, Expr, State, Data>
- {};
-
template<typename Type, bool IsAggregate = is_aggregate<Type>::value>
struct construct_
{
@@ -298,21 +336,9 @@
namespace detail
{
#if N > 0
- template<typename T BOOST_PP_ENUM_TRAILING_PARAMS(N, typename A)>
- struct nested_type_if<
- T
- , typelist<BOOST_PP_ENUM_PARAMS(N, A)>
- , typename typelist<
- BOOST_PP_ENUM_BINARY_PARAMS(N, typename A, ::not_applied_ BOOST_PP_INTERCEPT)
- >::type
- >
- {
- typedef T type;
- typedef void not_applied_;
- };
-
#define TMP0(Z, M, DATA) make_if_<BOOST_PP_CAT(A, M), Expr, State, Data>
#define TMP1(Z, M, DATA) typename TMP0(Z, M, DATA) ::type
+ #define TMP2(Z, M, DATA) TMP0(Z, M, DATA) ::applied ||
template<
template<BOOST_PP_ENUM_PARAMS(N, typename BOOST_PP_INTERCEPT)> class R
@@ -324,7 +350,8 @@
>
: nested_type_if<
R<BOOST_PP_ENUM(N, TMP1, ~)>
- , typelist<BOOST_PP_ENUM(N, TMP0, ~) >
+ , Expr, State, Data
+ , (BOOST_PP_REPEAT(N, TMP2, ~) false)
>
{};
@@ -338,10 +365,12 @@
>
{
typedef R<BOOST_PP_ENUM(N, TMP1, ~)> type;
+ static bool const applied = true;
};
#undef TMP0
#undef TMP1
+ #undef TMP2
#endif
template<
@@ -349,14 +378,10 @@
BOOST_PP_ENUM_TRAILING_PARAMS(N, typename A)
, typename Expr, typename State, typename Data
>
- struct make_if_<R(BOOST_PP_ENUM_PARAMS(N, A)), Expr, State, Data, false>
+ struct make_if_<R(BOOST_PP_ENUM_PARAMS(N, A)), Expr, State, Data, CT_not_callable>
+ : uncvref<typename when<_, R(BOOST_PP_ENUM_PARAMS(N, A))>::template impl<Expr, State, Data>::result_type>
{
- typedef
- typename uncvref<
- typename when<_, R(BOOST_PP_ENUM_PARAMS(N, A))>
- ::template impl<Expr, State, Data>::result_type
- >::type
- type;
+ static bool const applied = true;
};
template<
@@ -364,14 +389,10 @@
BOOST_PP_ENUM_TRAILING_PARAMS(N, typename A)
, typename Expr, typename State, typename Data
>
- struct make_if_<R(*)(BOOST_PP_ENUM_PARAMS(N, A)), Expr, State, Data, false>
+ struct make_if_<R(*)(BOOST_PP_ENUM_PARAMS(N, A)), Expr, State, Data, CT_not_callable>
+ : uncvref<typename when<_, R(BOOST_PP_ENUM_PARAMS(N, A))>::template impl<Expr, State, Data>::result_type>
{
- typedef
- typename uncvref<
- typename when<_, R(BOOST_PP_ENUM_PARAMS(N, A))>
- ::template impl<Expr, State, Data>::result_type
- >::type
- type;
+ static bool const applied = true;
};
template<typename T, typename A>
@@ -433,7 +454,7 @@
#define TMP(Z, M, DATA) \
detail::as_lvalue( \
typename when<_, BOOST_PP_CAT(A, M)> \
- ::template impl<Expr, State, Data>()(e, s, d) \
+ ::template impl<Expr, State, Data>()(e, s, d) \
)
BOOST_PP_ENUM(N, TMP, DATA)
#undef TMP
@@ -463,7 +484,7 @@
#define TMP(Z, M, DATA) \
detail::as_lvalue( \
typename when<_, BOOST_PP_CAT(A, M)> \
- ::template impl<Expr, State, Data>()(e, s, d) \
+ ::template impl<Expr, State, Data>()(e, s, d) \
)
BOOST_PP_ENUM(N, TMP, DATA)
#undef TMP