Subject: [Boost-commit] svn:boost r72044 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/config boost/config/compiler boost/date_time boost/date_time/posix_time boost/detail boost/filesystem boost/function boost/functional boost/functional/hash boost/fusion boost/fusion/container/list/detail boost/geometry boost/geometry/algorithms boost/geometry/arithmetic boost/geometry/core boost/geometry/domains boost/geometry/geometries boost/geometry/iterators boost/geometry/multi boost/geometry/policies boost/geometry/strategies boost/geometry/util boost/geometry/views boost/gil boost/graph boost/icl boost/integer boost/interprocess boost/intrusive boost/io boost/iostreams boost/iterator boost/msm boost/msm/back boost/msm/front/euml boost/numeric/ublas boost/pool boost/program_options boost/program_options/detail boost/property_tree boost/proto boost/proto/detail boost/proto/detail/preprocessed boost/python boost/range 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 boost/xpressive doc libs libs/algorithm/string libs/array libs/array/test libs/bimap libs/config libs/date_time libs/date_time/data libs/date_time/example/gregorian libs/date_time/example/local_time libs/date_time/example/posix_time libs/date_time/example/tutorial libs/date_time/test/posix_time libs/date_time/xmldoc libs/detail libs/filesystem libs/function libs/functional libs/functional/hash libs/fusion libs/geometry libs/geometry/doc libs/geometry/doc/concept libs/geometry/doc/doxy libs/geometry/doc/generated libs/geometry/doc/html libs/geometry/doc/reference libs/geometry/doc/src libs/geometry/example libs/geometry/test libs/graph/doc libs/graph_parallel libs/icl libs/icl/doc libs/icl/doc/html libs/icl/doc/html/header/boost/icl libs/icl/test libs/icl/test/test_doc_code_ libs/integer libs/interprocess libs/intrusive libs/io libs/io/doc libs/iostreams libs/iterator libs/mpi/build libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/msm libs/numeric/ublas libs/numeric/ublas/doc libs/parameter/doc/html libs/phoenix/doc libs/phoenix/doc/examples libs/pool libs/program_options libs/program_options/test libs/property_tree libs/proto/doc libs/proto/doc/reference libs/python libs/range libs/serialization libs/serialization/example libs/serialization/src libs/serialization/test 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/thread/src/win32 libs/timer libs/tr1 libs/type_traits libs/typeof/doc libs/unordered libs/utility libs/utility/swap/test libs/uuid libs/wave more status tools tools/bcp tools/boostbook tools/build/v2 tools/inspect tools/quickbook tools/quickbook/doc tools/quickbook/src tools/quickbook/test tools/regression tools/regression/src tools/release tools/wave
From: eric_at_[hidden]
Date: 2011-05-19 06:18:18
Author: eric_niebler
Date: 2011-05-19 06:18:15 EDT (Thu, 19 May 2011)
New Revision: 72044
URL: http://svn.boost.org/trac/boost/changeset/72044
Log:
merge [71978] from trunk
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/concept_check.hpp (props changed)
branches/release/boost/config/ (props changed)
branches/release/boost/config.hpp (props changed)
branches/release/boost/config/compiler/visualc.hpp (props changed)
branches/release/boost/cstdint.hpp (props changed)
branches/release/boost/date_time/c_time.hpp (props changed)
branches/release/boost/date_time/filetime_functions.hpp (props changed)
branches/release/boost/date_time/gregorian_calendar.ipp (props changed)
branches/release/boost/date_time/posix_time/time_serialize.hpp (props changed)
branches/release/boost/date_time/strings_from_facet.hpp (props changed)
branches/release/boost/date_time/time_facet.hpp (props changed)
branches/release/boost/detail/ (props changed)
branches/release/boost/filesystem/ (props changed)
branches/release/boost/filesystem.hpp (props changed)
branches/release/boost/function/ (props changed)
branches/release/boost/functional/ (props changed)
branches/release/boost/functional/hash/ (props changed)
branches/release/boost/fusion/ (props changed)
branches/release/boost/fusion/container/list/detail/build_cons.hpp (props changed)
branches/release/boost/geometry/ (props changed)
branches/release/boost/geometry/algorithms/ (props changed)
branches/release/boost/geometry/arithmetic/ (props changed)
branches/release/boost/geometry/core/ (props changed)
branches/release/boost/geometry/domains/ (props changed)
branches/release/boost/geometry/geometries/ (props changed)
branches/release/boost/geometry/geometry.hpp (props changed)
branches/release/boost/geometry/iterators/ (props changed)
branches/release/boost/geometry/multi/ (props changed)
branches/release/boost/geometry/policies/ (props changed)
branches/release/boost/geometry/strategies/ (props changed)
branches/release/boost/geometry/util/ (props changed)
branches/release/boost/geometry/views/ (props changed)
branches/release/boost/gil/ (props changed)
branches/release/boost/graph/ (props changed)
branches/release/boost/icl/ (props changed)
branches/release/boost/integer/ (props changed)
branches/release/boost/integer.hpp (props changed)
branches/release/boost/integer_fwd.hpp (props changed)
branches/release/boost/integer_traits.hpp (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/iterator/ (props changed)
branches/release/boost/iterator/iterator_facade.hpp (props changed)
branches/release/boost/math_fwd.hpp (props changed)
branches/release/boost/msm/back/any_event.hpp (props changed)
branches/release/boost/msm/front/euml/phoenix_placeholders.hpp (props changed)
branches/release/boost/msm/msm_grammar.hpp (props changed)
branches/release/boost/numeric/ublas/ (props changed)
branches/release/boost/numeric/ublas/functional.hpp (props changed)
branches/release/boost/pool/ (props changed)
branches/release/boost/program_options/ (props changed)
branches/release/boost/program_options/detail/parsers.hpp (props changed)
branches/release/boost/program_options/parsers.hpp (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.h (props changed)
branches/release/boost/regex_fwd.hpp (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/static_assert.hpp (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/boost/xpressive/ (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/ (props changed)
branches/release/libs/array/test/array0.cpp (props changed)
branches/release/libs/array/test/array2.cpp (props changed)
branches/release/libs/array/test/array6.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/date_time/data/date_time_zonespec.csv (props changed)
branches/release/libs/date_time/example/gregorian/days_between_new_years.cpp (props changed)
branches/release/libs/date_time/example/gregorian/days_since_year_start.cpp (props changed)
branches/release/libs/date_time/example/gregorian/days_till_new_year.cpp (props changed)
branches/release/libs/date_time/example/gregorian/month_add.cpp (props changed)
branches/release/libs/date_time/example/local_time/flight.cpp (props changed)
branches/release/libs/date_time/example/local_time/local_date_time.cpp (props changed)
branches/release/libs/date_time/example/posix_time/print_hours.cpp (props changed)
branches/release/libs/date_time/example/posix_time/time_math.cpp (props changed)
branches/release/libs/date_time/example/tutorial/io_tutorial.cpp (props changed)
branches/release/libs/date_time/test/posix_time/testtime_facet.cpp (props changed)
branches/release/libs/date_time/test/posix_time/testtime_input_facet.cpp (props changed)
branches/release/libs/date_time/xmldoc/date_class.xml (props changed)
branches/release/libs/date_time/xmldoc/usage_examples.xml (props changed)
branches/release/libs/detail/ (props changed)
branches/release/libs/filesystem/ (props changed)
branches/release/libs/function/ (props changed)
branches/release/libs/functional/ (props changed)
branches/release/libs/functional/hash/ (props changed)
branches/release/libs/fusion/ (props changed)
branches/release/libs/geometry/ (props changed)
branches/release/libs/geometry/doc/ (props changed)
branches/release/libs/geometry/doc/Jamfile.v2 (props changed)
branches/release/libs/geometry/doc/about_documentation.qbk (props changed)
branches/release/libs/geometry/doc/acknowledgments.qbk (props changed)
branches/release/libs/geometry/doc/concept/ (props changed)
branches/release/libs/geometry/doc/copyright_note_policy.txt (props changed)
branches/release/libs/geometry/doc/design_rationale.qbk (props changed)
branches/release/libs/geometry/doc/doxy/ (props changed)
branches/release/libs/geometry/doc/generated/ (props changed)
branches/release/libs/geometry/doc/geometry.qbk (props changed)
branches/release/libs/geometry/doc/html/ (props changed)
branches/release/libs/geometry/doc/imports.qbk (props changed)
branches/release/libs/geometry/doc/introduction.qbk (props changed)
branches/release/libs/geometry/doc/make_qbk.py (props changed)
branches/release/libs/geometry/doc/matrix.qbk (props changed)
branches/release/libs/geometry/doc/quickref.xml (props changed)
branches/release/libs/geometry/doc/quickstart.qbk (props changed)
branches/release/libs/geometry/doc/readme.txt (props changed)
branches/release/libs/geometry/doc/reference/ (props changed)
branches/release/libs/geometry/doc/reference.qbk (props changed)
branches/release/libs/geometry/doc/src/ (props changed)
branches/release/libs/geometry/example/ (props changed)
branches/release/libs/geometry/index.html (props changed)
branches/release/libs/geometry/test/ (props changed)
branches/release/libs/graph/doc/ (props changed)
branches/release/libs/graph_parallel/ (props changed)
branches/release/libs/icl/ (props changed)
branches/release/libs/icl/doc/ (props changed)
branches/release/libs/icl/doc/html/ (props changed)
branches/release/libs/icl/doc/html/header/boost/icl/ (props changed)
branches/release/libs/icl/test/ (props changed)
branches/release/libs/icl/test/test_doc_code_/ (props changed)
branches/release/libs/integer/ (props changed)
branches/release/libs/interprocess/ (props changed)
branches/release/libs/intrusive/ (props changed)
branches/release/libs/io/ (props changed)
branches/release/libs/io/doc/ (props changed)
branches/release/libs/iostreams/ (props changed)
branches/release/libs/iterator/ (props changed)
branches/release/libs/libraries.htm (props changed)
branches/release/libs/maintainers.txt (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/parameter/doc/html/index.html (props changed)
branches/release/libs/phoenix/doc/basics.qbk (props changed)
branches/release/libs/phoenix/doc/examples/extending_actors.qbk (props changed)
branches/release/libs/phoenix/doc/organisation.qbk (props changed)
branches/release/libs/pool/ (props changed)
branches/release/libs/program_options/ (props changed)
branches/release/libs/program_options/test/parsers_test.cpp (props changed)
branches/release/libs/property_tree/ (props changed)
branches/release/libs/python/ (props changed)
branches/release/libs/range/ (props changed)
branches/release/libs/serialization/ (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/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/thread/src/win32/thread.cpp (props changed)
branches/release/libs/timer/ (props changed)
branches/release/libs/tr1/ (props changed)
branches/release/libs/type_traits/ (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/assert.html (props changed)
branches/release/libs/utility/assert_test.cpp (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/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/quickbook/doc/ (props changed)
branches/release/tools/quickbook/src/ (props changed)
branches/release/tools/quickbook/test/ (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/detail/basic_expr.hpp | 2
branches/release/boost/proto/detail/deduce_domain.hpp | 40 ++++++++++++++++++++++++++
branches/release/boost/proto/detail/preprocessed/basic_expr.hpp | 22 +++++++-------
branches/release/boost/proto/domain.hpp | 7 ++++
branches/release/boost/proto/generate.hpp | 61 ++++++++++++++++++++++++++++++++-------
branches/release/boost/proto/operators.hpp | 4 +-
branches/release/boost/proto/proto_fwd.hpp | 4 ++
branches/release/libs/proto/doc/reference.xml | 10 ++++++
branches/release/libs/proto/doc/reference/domain.xml | 31 +++++++++++++++----
branches/release/libs/proto/doc/reference/expr.xml | 2
branches/release/libs/proto/doc/reference/generate.xml | 13 +++++++
11 files changed, 161 insertions(+), 35 deletions(-)
Modified: branches/release/boost/proto/detail/basic_expr.hpp
==============================================================================
--- branches/release/boost/proto/detail/basic_expr.hpp (original)
+++ branches/release/boost/proto/detail/basic_expr.hpp 2011-05-19 06:18:15 EDT (Thu, 19 May 2011)
@@ -98,7 +98,7 @@
typedef BOOST_PP_CAT(list, BOOST_PP_ITERATION())<BOOST_PP_ENUM_PARAMS(ARG_COUNT, Arg)> proto_args;
#endif
typedef basic_expr proto_grammar;
- typedef default_domain proto_domain;
+ typedef basic_default_domain proto_domain;
typedef default_generator proto_generator;
typedef proto::tag::proto_expr fusion_tag;
typedef basic_expr proto_derived_expr;
Modified: branches/release/boost/proto/detail/deduce_domain.hpp
==============================================================================
--- branches/release/boost/proto/detail/deduce_domain.hpp (original)
+++ branches/release/boost/proto/detail/deduce_domain.hpp 2011-05-19 06:18:15 EDT (Thu, 19 May 2011)
@@ -70,10 +70,20 @@
: domain_<not_a_domain>
{};
+ template<>
+ struct domain_<basic_default_domain>
+ : domain_<not_a_domain>
+ {};
+
sized_type<1>::type default_test(void*, void*);
sized_type<2>::type default_test(domain_<default_domain>*, void*);
+ sized_type<2>::type default_test(domain_<basic_default_domain>*, void*);
sized_type<3>::type default_test(void*, domain_<default_domain>*);
+ sized_type<3>::type default_test(void*, domain_<basic_default_domain>*);
sized_type<4>::type default_test(domain_<default_domain>*, domain_<default_domain>*);
+ sized_type<4>::type default_test(domain_<basic_default_domain>*, domain_<default_domain>*);
+ sized_type<4>::type default_test(domain_<default_domain>*, domain_<basic_default_domain>*);
+ sized_type<4>::type default_test(domain_<basic_default_domain>*, domain_<basic_default_domain>*);
#ifdef BOOST_NO_DECLTYPE
template<int N, typename Domain>
@@ -131,18 +141,48 @@
typedef D0 type;
};
+ template<typename D0>
+ struct common_domain2<D0, basic_default_domain, 4>
+ {
+ typedef D0 type;
+ };
+
template<typename D1>
struct common_domain2<default_domain, D1, 4>
{
typedef D1 type;
};
+ template<typename D1>
+ struct common_domain2<basic_default_domain, D1, 4>
+ {
+ typedef D1 type;
+ };
+
template<>
struct common_domain2<default_domain, default_domain, 4>
{
typedef default_domain type;
};
+ template<>
+ struct common_domain2<basic_default_domain, default_domain, 4>
+ {
+ typedef default_domain type;
+ };
+
+ template<>
+ struct common_domain2<default_domain, basic_default_domain, 4>
+ {
+ typedef default_domain type;
+ };
+
+ template<>
+ struct common_domain2<basic_default_domain, basic_default_domain, 4>
+ {
+ typedef basic_default_domain type;
+ };
+
template<typename E0, typename E1>
struct deduce_domain2
: common_domain2<
Modified: branches/release/boost/proto/detail/preprocessed/basic_expr.hpp
==============================================================================
--- branches/release/boost/proto/detail/preprocessed/basic_expr.hpp (original)
+++ branches/release/boost/proto/detail/preprocessed/basic_expr.hpp 2011-05-19 06:18:15 EDT (Thu, 19 May 2011)
@@ -42,7 +42,7 @@
typedef basic_expr proto_base_expr;
typedef term<Arg0> proto_args;
typedef basic_expr proto_grammar;
- typedef default_domain proto_domain;
+ typedef basic_default_domain proto_domain;
typedef default_generator proto_generator;
typedef proto::tag::proto_expr fusion_tag;
typedef basic_expr proto_derived_expr;
@@ -116,7 +116,7 @@
typedef basic_expr proto_base_expr;
typedef list1<Arg0> proto_args;
typedef basic_expr proto_grammar;
- typedef default_domain proto_domain;
+ typedef basic_default_domain proto_domain;
typedef default_generator proto_generator;
typedef proto::tag::proto_expr fusion_tag;
typedef basic_expr proto_derived_expr;
@@ -196,7 +196,7 @@
typedef basic_expr proto_base_expr;
typedef list2<Arg0 , Arg1> proto_args;
typedef basic_expr proto_grammar;
- typedef default_domain proto_domain;
+ typedef basic_default_domain proto_domain;
typedef default_generator proto_generator;
typedef proto::tag::proto_expr fusion_tag;
typedef basic_expr proto_derived_expr;
@@ -264,7 +264,7 @@
typedef basic_expr proto_base_expr;
typedef list3<Arg0 , Arg1 , Arg2> proto_args;
typedef basic_expr proto_grammar;
- typedef default_domain proto_domain;
+ typedef basic_default_domain proto_domain;
typedef default_generator proto_generator;
typedef proto::tag::proto_expr fusion_tag;
typedef basic_expr proto_derived_expr;
@@ -332,7 +332,7 @@
typedef basic_expr proto_base_expr;
typedef list4<Arg0 , Arg1 , Arg2 , Arg3> proto_args;
typedef basic_expr proto_grammar;
- typedef default_domain proto_domain;
+ typedef basic_default_domain proto_domain;
typedef default_generator proto_generator;
typedef proto::tag::proto_expr fusion_tag;
typedef basic_expr proto_derived_expr;
@@ -400,7 +400,7 @@
typedef basic_expr proto_base_expr;
typedef list5<Arg0 , Arg1 , Arg2 , Arg3 , Arg4> proto_args;
typedef basic_expr proto_grammar;
- typedef default_domain proto_domain;
+ typedef basic_default_domain proto_domain;
typedef default_generator proto_generator;
typedef proto::tag::proto_expr fusion_tag;
typedef basic_expr proto_derived_expr;
@@ -468,7 +468,7 @@
typedef basic_expr proto_base_expr;
typedef list6<Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5> proto_args;
typedef basic_expr proto_grammar;
- typedef default_domain proto_domain;
+ typedef basic_default_domain proto_domain;
typedef default_generator proto_generator;
typedef proto::tag::proto_expr fusion_tag;
typedef basic_expr proto_derived_expr;
@@ -536,7 +536,7 @@
typedef basic_expr proto_base_expr;
typedef list7<Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6> proto_args;
typedef basic_expr proto_grammar;
- typedef default_domain proto_domain;
+ typedef basic_default_domain proto_domain;
typedef default_generator proto_generator;
typedef proto::tag::proto_expr fusion_tag;
typedef basic_expr proto_derived_expr;
@@ -604,7 +604,7 @@
typedef basic_expr proto_base_expr;
typedef list8<Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7> proto_args;
typedef basic_expr proto_grammar;
- typedef default_domain proto_domain;
+ typedef basic_default_domain proto_domain;
typedef default_generator proto_generator;
typedef proto::tag::proto_expr fusion_tag;
typedef basic_expr proto_derived_expr;
@@ -672,7 +672,7 @@
typedef basic_expr proto_base_expr;
typedef list9<Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8> proto_args;
typedef basic_expr proto_grammar;
- typedef default_domain proto_domain;
+ typedef basic_default_domain proto_domain;
typedef default_generator proto_generator;
typedef proto::tag::proto_expr fusion_tag;
typedef basic_expr proto_derived_expr;
@@ -740,7 +740,7 @@
typedef basic_expr proto_base_expr;
typedef list10<Arg0 , Arg1 , Arg2 , Arg3 , Arg4 , Arg5 , Arg6 , Arg7 , Arg8 , Arg9> proto_args;
typedef basic_expr proto_grammar;
- typedef default_domain proto_domain;
+ typedef basic_default_domain proto_domain;
typedef default_generator proto_generator;
typedef proto::tag::proto_expr fusion_tag;
typedef basic_expr proto_derived_expr;
Modified: branches/release/boost/proto/domain.hpp
==============================================================================
--- branches/release/boost/proto/domain.hpp (original)
+++ branches/release/boost/proto/domain.hpp 2011-05-19 06:18:15 EDT (Thu, 19 May 2011)
@@ -200,6 +200,13 @@
: domain<>
{};
+ /// \brief A domain to use when you prefer the use of
+ /// \c proto::basic_expr\<\> over \c proto::expr\<\>.
+ ///
+ struct basic_default_domain
+ : domain<basic_default_generator>
+ {};
+
/// \brief A pseudo-domain for use in functions and
/// metafunctions that require a domain parameter. It
/// indicates that the domain of the parent node should
Modified: branches/release/boost/proto/generate.hpp
==============================================================================
--- branches/release/boost/proto/generate.hpp (original)
+++ branches/release/boost/proto/generate.hpp 2011-05-19 06:18:15 EDT (Thu, 19 May 2011)
@@ -72,6 +72,18 @@
#include <boost/proto/detail/generate_by_value.hpp>
}
+ /// \brief Annotate a generator to indicate that it would
+ /// prefer to be passed instances of \c proto::basic_expr\<\> rather
+ /// than \c proto::expr\<\>. <tt>use_basic_expr\<Generator\></tt> is
+ /// itself a generator.
+ ///
+ template<typename Generator>
+ struct use_basic_expr
+ : Generator
+ {
+ BOOST_PROTO_USE_BASIC_EXPR()
+ };
+
/// \brief A simple generator that passes an expression
/// through unchanged.
///
@@ -107,6 +119,19 @@
}
};
+ /// \brief A simple generator that passes an expression
+ /// through unchanged and specifies a preference for
+ /// \c proto::basic_expr\<\> over \c proto::expr\<\>.
+ ///
+ /// Generators are intended for use as the first template parameter
+ /// to the \c domain\<\> class template and control if and how
+ /// expressions within that domain are to be customized.
+ /// The \c default_generator makes no modifications to the expressions
+ /// passed to it.
+ struct basic_default_generator
+ : proto::use_basic_expr<default_generator>
+ {};
+
/// \brief A generator that wraps expressions passed
/// to it in the specified extension wrapper.
///
@@ -307,18 +332,6 @@
}
};
- /// \brief Annotate a generator to indicate that it would
- /// prefer to be passed instances of \c proto::basic_expr\<\> rather
- /// than \c proto::expr\<\>. <tt>use_basic_expr\<Generator\></tt> is
- /// itself a generator.
- ///
- template<typename Generator>
- struct use_basic_expr
- : Generator
- {
- BOOST_PROTO_USE_BASIC_EXPR()
- };
-
/// \brief Tests a generator to see whether it would prefer
/// to be passed instances of \c proto::basic_expr\<\> rather than
/// \c proto::expr\<\>.
@@ -376,11 +389,23 @@
};
template<typename Expr>
+ struct result_of<proto::basic_default_domain(Expr)>
+ {
+ typedef Expr type;
+ };
+
+ template<typename Expr>
struct result_of<proto::default_generator(Expr)>
{
typedef Expr type;
};
+ template<typename Expr>
+ struct result_of<proto::basic_default_generator(Expr)>
+ {
+ typedef Expr type;
+ };
+
#if BOOST_VERSION >= 104400
template<typename Expr>
struct tr1_result_of<proto::default_domain(Expr)>
@@ -389,10 +414,22 @@
};
template<typename Expr>
+ struct tr1_result_of<proto::basic_default_domain(Expr)>
+ {
+ typedef Expr type;
+ };
+
+ template<typename Expr>
struct tr1_result_of<proto::default_generator(Expr)>
{
typedef Expr type;
};
+
+ template<typename Expr>
+ struct tr1_result_of<proto::basic_default_generator(Expr)>
+ {
+ typedef Expr type;
+ };
#endif
}
Modified: branches/release/boost/proto/operators.hpp
==============================================================================
--- branches/release/boost/proto/operators.hpp (original)
+++ branches/release/boost/proto/operators.hpp 2011-05-19 06:18:15 EDT (Thu, 19 May 2011)
@@ -34,7 +34,7 @@
: boost::lazy_enable_if_c<
boost::mpl::and_<
Trait
- , lazy_matches<result_of::make_expr<Tag, default_domain, Arg &>, Grammar>
+ , lazy_matches<result_of::make_expr<Tag, basic_default_domain, Arg &>, Grammar>
>::value
, result_of::make_expr<Tag, Domain, Arg &>
>
@@ -64,7 +64,7 @@
: boost::lazy_enable_if_c<
boost::mpl::and_<
Trait
- , lazy_matches<result_of::make_expr<Tag, default_domain, Left &, Right &>, Grammar>
+ , lazy_matches<result_of::make_expr<Tag, basic_default_domain, Left &, Right &>, Grammar>
>::value
, result_of::make_expr<Tag, Domain, Left &, Right &>
>
Modified: branches/release/boost/proto/proto_fwd.hpp
==============================================================================
--- branches/release/boost/proto/proto_fwd.hpp (original)
+++ branches/release/boost/proto/proto_fwd.hpp 2011-05-19 06:18:15 EDT (Thu, 19 May 2011)
@@ -270,6 +270,8 @@
////////////////////////////////////////////////////////////////////////////////////////////////
struct default_generator;
+ struct basic_default_generator;
+
template<template<typename> class Extends>
struct generator;
@@ -301,6 +303,8 @@
struct default_domain;
+ struct basic_default_domain;
+
struct deduce_domain;
template<typename Domain, typename Tag, typename Args, bool WantsBasicExpr = wants_basic_expr<typename Domain::proto_generator>::value>
Modified: branches/release/libs/proto/doc/reference.xml
==============================================================================
--- branches/release/libs/proto/doc/reference.xml (original)
+++ branches/release/libs/proto/doc/reference.xml 2011-05-19 06:18:15 EDT (Thu, 19 May 2011)
@@ -77,6 +77,16 @@
</listitem>
<listitem>
<computeroutput>
+ <classname alt="boost::proto::basic_default_domain">proto::basic_default_domain</classname>
+ </computeroutput>
+ </listitem>
+ <listitem>
+ <computeroutput>
+ <classname alt="boost::proto::basic_default_generator">proto::basic_default_generator</classname>
+ </computeroutput>
+ </listitem>
+ <listitem>
+ <computeroutput>
<classname alt="boost::proto::basic_expr">proto::basic_expr</classname>
</computeroutput>
</listitem>
Modified: branches/release/libs/proto/doc/reference/domain.xml
==============================================================================
--- branches/release/libs/proto/doc/reference/domain.xml (original)
+++ branches/release/libs/proto/doc/reference/domain.xml 2011-05-19 06:18:15 EDT (Thu, 19 May 2011)
@@ -236,6 +236,13 @@
to associate a domain with an expression.</purpose>
</struct>
+ <!-- proto::basic_default_domain -->
+ <struct name="basic_default_domain">
+ <inherit><classname>proto::domain</classname>< <classname>proto::basic_default_generator</classname> ></inherit>
+ <purpose>A domain similiar in purpose to <classname>proto::default_domain</classname>, except stating
+ a preference for <classname>proto::basic_expr</classname><> over <classname>proto::expr</classname><>.</purpose>
+ </struct>
+
<!-- proto::deduce_domain -->
<struct name="deduce_domain">
<purpose>A pseudo-domain for use in functions and metafunctions that require a domain parameter.
@@ -256,8 +263,14 @@
A sub-domain is <emphasis>stronger</emphasis> than its super-domain.
</listitem>
<listitem>
- <computeroutput><classname>proto::default_domain</classname></computeroutput>
- and all its sub-domains are <emphasis>weaker</emphasis> than all other domains.
+ <computeroutput><classname>proto::default_domain</classname></computeroutput>,
+ <computeroutput><classname>proto::basic_default_domain</classname></computeroutput>
+ and all their sub-domains are <emphasis>weaker</emphasis> than all other domains.
+ </listitem>
+ <listitem>
+ <computeroutput><classname>proto::basic_default_domain</classname></computeroutput>
+ is weaker than
+ <computeroutput><classname>proto::default_domain</classname></computeroutput>.
</listitem>
<listitem>
For each child, define a set of domains <emphasis>S<subscript>N</subscript></emphasis>
@@ -266,12 +279,14 @@
<listitem>
Define a set <emphasis>I<subscript>S</subscript></emphasis> that is the intersection of
all the individual sets <emphasis>S<subscript>N</subscript></emphasis> that don't contain
- <computeroutput><classname>proto::default_domain</classname></computeroutput>.
+ <computeroutput><classname>proto::default_domain</classname></computeroutput> or
+ <computeroutput><classname>proto::basic_default_domain</classname></computeroutput>.
</listitem>
<listitem>
Define a set <emphasis>I<subscript>W</subscript></emphasis> that is the intersection of
all the individual sets <emphasis>S<subscript>N</subscript></emphasis> that contain
- <computeroutput><classname>proto::default_domain</classname></computeroutput>.
+ <computeroutput><classname>proto::default_domain</classname></computeroutput> or
+ <computeroutput><classname>proto::basic_default_domain</classname></computeroutput>.
</listitem>
<listitem>
Define a set <emphasis>P</emphasis> that is the union of
@@ -280,14 +295,16 @@
</listitem>
<listitem>
The common domain is the strongest domain in set <emphasis>P</emphasis>, with the
- following caveat.
+ following caveats.
</listitem>
<listitem>
Let <emphasis>U</emphasis> be the union of all sets
<emphasis>S<subscript>N</subscript></emphasis>. If the result is
- <computeroutput><classname>proto::default_domain</classname></computeroutput>
+ <computeroutput><classname>proto::default_domain</classname></computeroutput> or
+ <computeroutput><classname>proto::basic_default_domain</classname></computeroutput>
and <emphasis>U</emphasis> contains an element that is <emphasis>not </emphasis>
- <computeroutput><classname>proto::default_domain</classname></computeroutput>,
+ <computeroutput><classname>proto::default_domain</classname></computeroutput> or
+ <computeroutput><classname>proto::basic_default_domain</classname></computeroutput>,
it is an error.
</listitem>
</itemizedlist>
Modified: branches/release/libs/proto/doc/reference/expr.xml
==============================================================================
--- branches/release/libs/proto/doc/reference/expr.xml (original)
+++ branches/release/libs/proto/doc/reference/expr.xml 2011-05-19 06:18:15 EDT (Thu, 19 May 2011)
@@ -68,7 +68,7 @@
</typedef>
<typedef name="proto_domain">
- <type><classname>proto::default_domain</classname></type>
+ <type><classname>proto::basic_default_domain</classname></type>
</typedef>
<typedef name="proto_grammar">
Modified: branches/release/libs/proto/doc/reference/generate.xml
==============================================================================
--- branches/release/libs/proto/doc/reference/generate.xml (original)
+++ branches/release/libs/proto/doc/reference/generate.xml 2011-05-19 06:18:15 EDT (Thu, 19 May 2011)
@@ -21,7 +21,7 @@
</para>
</description>
<inherit>
- <type>proto::callable</type>
+ <type><classname>proto::callable</classname></type>
</inherit>
<struct-specialization name="result">
<template>
@@ -54,6 +54,17 @@
</method-group>
</struct>
+ <!-- proto::basic_default_generator -->
+ <struct name="basic_default_generator">
+ <purpose>
+ A simple generator that passes an expression through unchanged while stating
+ a preference for <classname>proto::basic_expr</classname><> over
+ <classname>proto::expr</classname><>.</purpose>
+ <inherit>
+ <type><classname>proto::use_basic_expr</classname>< <classname>proto::default_generator</classname> ></type>
+ </inherit>
+ </struct>
+
<!-- proto::generator -->
<struct name="generator">
<template>