|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r71375 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/config 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/ranges 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/math boost/msm boost/numeric/ublas boost/pool boost/program_options boost/program_options/detail boost/property_tree boost/python boost/range boost/regex boost/serialization boost/signals boost/signals2 boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/karma/detail boost/spirit/home/karma/numeric boost/spirit/home/karma/numeric/detail boost/spirit/home/qi/numeric/detail boost/spirit/home/support boost/spirit/home/support/detail 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 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/math libs/math/doc/sf_and_dist libs/math/doc/sf_and_dist/html/math_toolkit/main_overview 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/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/doc/html libs/spirit/doc/html/spirit libs/spirit/doc/html/spirit/abstracts libs/spirit/doc/html/spirit/karma libs/spirit/doc/html/spirit/karma/reference/numeric libs/spirit/doc/html/spirit/qi libs/spirit/doc/html/spirit/qi/reference/operator libs/spirit/doc/html/spirit/what_s_new libs/spirit/doc/karma libs/spirit/example libs/spirit/phoenix libs/spirit/repository/doc libs/spirit/repository/doc/html libs/spirit/repository/doc/html/spirit_repository libs/spirit/repository/doc/html/spirit_repository/qi_components/nonterminal libs/spirit/test libs/spirit/test/karma 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/units/test 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: hartmut.kaiser_at_[hidden]
Date: 2011-04-18 21:31:19
Author: hkaiser
Date: 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
New Revision: 71375
URL: http://svn.boost.org/trac/boost/changeset/71375
Log:
Spirit: merging fixes from trunk
Added:
branches/release/libs/spirit/test/karma/regression_adapt_adt.cpp
- copied unchanged from r71373, /trunk/libs/spirit/test/karma/regression_adapt_adt.cpp
branches/release/libs/spirit/test/karma/uint_radix.cpp
- copied unchanged from r71373, /trunk/libs/spirit/test/karma/uint_radix.cpp
Removed:
branches/release/libs/spirit/test/karma/regression_numerics_adapt_adt.cpp
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/archive/basic_binary_iarchive.hpp (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/date_time/c_time.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/ranges/ (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/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/ (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/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/ (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 (contents, 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/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/math/ (props changed)
branches/release/libs/math/doc/sf_and_dist/faq.qbk (props changed)
branches/release/libs/math/doc/sf_and_dist/html/math_toolkit/main_overview/faq.html (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/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/units/test/ (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/spirit/home/karma/detail/extract_from.hpp | 2
branches/release/boost/spirit/home/karma/numeric/bool.hpp | 2
branches/release/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp | 82 ++++++++++++++----------------------
branches/release/boost/spirit/home/karma/numeric/detail/real_utils.hpp | 2
branches/release/boost/spirit/home/karma/numeric/int.hpp | 2
branches/release/boost/spirit/home/karma/numeric/uint.hpp | 8 +--
branches/release/boost/spirit/home/qi/numeric/detail/numeric_utils.hpp | 2
branches/release/boost/spirit/home/qi/numeric/detail/real_impl.hpp | 2
branches/release/boost/spirit/home/support/adapt_adt_attributes.hpp | 83 +++++++++++++++++++++++++++++++++++++
branches/release/boost/spirit/home/support/attributes.hpp | 87 ++++++++++++++++++++++-----------------
branches/release/boost/spirit/home/support/container.hpp | 10 ++++
branches/release/boost/spirit/home/support/detail/pow10.hpp | 2
branches/release/libs/spirit/doc/html/index.html | 4
branches/release/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html | 6 +-
branches/release/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html | 10 ++--
branches/release/libs/spirit/doc/html/spirit/introduction.html | 4
branches/release/libs/spirit/doc/html/spirit/karma/reference/numeric/signed_int.html | 27 ++++++-----
branches/release/libs/spirit/doc/html/spirit/karma/reference/numeric/unsigned_int.html | 58 ++++++++++++-------------
branches/release/libs/spirit/doc/html/spirit/karma/s05.html | 2
branches/release/libs/spirit/doc/html/spirit/preface.html | 4
branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/difference.html | 4
branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/optional.html | 4
branches/release/libs/spirit/doc/html/spirit/qi/s04.html | 2
branches/release/libs/spirit/doc/html/spirit/what_s_new/spirit_2_5.html | 5 ++
branches/release/libs/spirit/doc/karma/numeric.qbk | 35 ++++++++-------
branches/release/libs/spirit/doc/what_s_new.qbk | 2
branches/release/libs/spirit/repository/doc/html/index.html | 4
branches/release/libs/spirit/repository/doc/html/spirit_repository/preface.html | 4
branches/release/libs/spirit/repository/doc/html/spirit_repository/qi_components/nonterminal/subrule.html | 2
branches/release/libs/spirit/repository/doc/preface.qbk | 2
branches/release/libs/spirit/test/Jamfile | 4 +
branches/release/libs/spirit/test/karma/int1.cpp | 2
branches/release/libs/spirit/test/karma/int2.cpp | 2
branches/release/libs/spirit/test/karma/int3.cpp | 2
branches/release/libs/spirit/test/karma/real.hpp | 2
branches/release/libs/spirit/test/karma/real3.cpp | 27 ++++++++++++
36 files changed, 311 insertions(+), 191 deletions(-)
Modified: branches/release/boost/spirit/home/karma/detail/extract_from.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/detail/extract_from.hpp (original)
+++ branches/release/boost/spirit/home/karma/detail/extract_from.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -140,7 +140,7 @@
typedef typename traits::container_iterator<Attribute const>::type
iterator_type;
- iterator_type it = boost::begin(attr);
+ iterator_type it = traits::begin(attr);
type result = *it;
++it;
return result;
Modified: branches/release/boost/spirit/home/karma/numeric/bool.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/numeric/bool.hpp (original)
+++ branches/release/boost/spirit/home/karma/numeric/bool.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -10,7 +10,7 @@
#pragma once
#endif
-#include <limits>
+#include <boost/limits.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/utility/enable_if.hpp>
Modified: branches/release/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp (original)
+++ branches/release/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -12,7 +12,7 @@
#include <boost/config.hpp>
#include <boost/config/no_tr1/cmath.hpp>
-#include <limits>
+#include <boost/limits.hpp>
#include <boost/type_traits/is_integral.hpp>
#include <boost/spirit/home/support/char_class.hpp>
@@ -414,64 +414,46 @@
// static int call(unsigned n);
//
///////////////////////////////////////////////////////////////////////
- template <unsigned Radix, typename CharEncoding, typename Tag>
- struct convert_digit;
-
- // Binary
- template <typename CharEncoding, typename Tag>
- struct convert_digit<2, CharEncoding, Tag>
+ namespace detail
{
- static int call(unsigned n)
+ template <typename CharEncoding, typename Tag, bool radix_less_than_10>
+ struct convert_digit
{
- return n + '0';
- }
- };
+ static int call(unsigned n)
+ {
+ if (n <= 9)
+ return n + '0';
- // Octal
- template <typename CharEncoding, typename Tag>
- struct convert_digit<8, CharEncoding, Tag>
- {
- static int call(unsigned n)
- {
- return n + '0';
- }
- };
+ using spirit::char_class::convert;
+ return convert<CharEncoding>::to(Tag(), n - 10 + 'a');
+ }
+ };
- // Decimal
- template <typename CharEncoding, typename Tag>
- struct convert_digit<10, CharEncoding, Tag>
- {
- static int call(unsigned n)
+ template <>
+ struct convert_digit<unused_type, unused_type, false>
{
- return n + '0';
- }
- };
-
- // Hexadecimal, lower case
- template <>
- struct convert_digit<16, unused_type, unused_type>
- {
- static int call(unsigned n)
- {
- if (n <= 9)
- return n + '0';
- return n - 10 + 'a';
- }
- };
+ static int call(unsigned n)
+ {
+ if (n <= 9)
+ return n + '0';
+ return n - 10 + 'a';
+ }
+ };
- // Hexadecimal, upper case
- template <typename CharEncoding, typename Tag>
- struct convert_digit<16, CharEncoding, Tag>
- {
- static int call(unsigned n)
+ template <typename CharEncoding, typename Tag>
+ struct convert_digit<CharEncoding, Tag, true>
{
- if (n <= 9)
+ static int call(unsigned n)
+ {
return n + '0';
+ }
+ };
+ }
- using spirit::char_class::convert;
- return convert<CharEncoding>::to(Tag(), n - 10 + 'a');
- }
- };
+ template <unsigned Radix, typename CharEncoding, typename Tag>
+ struct convert_digit
+ : detail::convert_digit<CharEncoding, Tag, (Radix <= 10) ? true : false>
+ {};
///////////////////////////////////////////////////////////////////////
template <unsigned Radix>
Modified: branches/release/boost/spirit/home/karma/numeric/detail/real_utils.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/numeric/detail/real_utils.hpp (original)
+++ branches/release/boost/spirit/home/karma/numeric/detail/real_utils.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -13,7 +13,7 @@
#include <boost/config.hpp>
#include <boost/config/no_tr1/cmath.hpp>
#include <boost/detail/workaround.hpp>
-#include <limits>
+#include <boost/limits.hpp>
#include <boost/spirit/home/support/char_class.hpp>
#include <boost/spirit/home/support/unused.hpp>
Modified: branches/release/boost/spirit/home/karma/numeric/int.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/numeric/int.hpp (original)
+++ branches/release/boost/spirit/home/karma/numeric/int.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -10,7 +10,7 @@
#pragma once
#endif
-#include <limits>
+#include <boost/limits.hpp>
#include <boost/config.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/utility/enable_if.hpp>
Modified: branches/release/boost/spirit/home/karma/numeric/uint.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/numeric/uint.hpp (original)
+++ branches/release/boost/spirit/home/karma/numeric/uint.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -10,7 +10,7 @@
#pragma once
#endif
-#include <limits>
+#include <boost/limits.hpp>
#include <boost/config.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/utility/enable_if.hpp>
@@ -254,8 +254,7 @@
// check template Attribute 'Radix' for validity
BOOST_SPIRIT_ASSERT_MSG(
- Radix == 2 || Radix == 8 || Radix == 10 || Radix == 16,
- not_supported_radix, ());
+ Radix >= 2 && Radix <= 36, not_supported_radix, ());
BOOST_SPIRIT_ASSERT_MSG(
// the following is a workaround for STLPort, where the simpler
@@ -320,8 +319,7 @@
// check template Attribute 'Radix' for validity
BOOST_SPIRIT_ASSERT_MSG(
- Radix == 2 || Radix == 8 || Radix == 10 || Radix == 16,
- not_supported_radix, ());
+ Radix >= 2 && Radix <= 36, not_supported_radix, ());
BOOST_SPIRIT_ASSERT_MSG(
// the following is a workaround for STLPort, where the simpler
Modified: branches/release/boost/spirit/home/qi/numeric/detail/numeric_utils.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/numeric/detail/numeric_utils.hpp (original)
+++ branches/release/boost/spirit/home/qi/numeric/detail/numeric_utils.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -23,8 +23,6 @@
#include <boost/type_traits/is_signed.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/mpl/and.hpp>
-
-#include <limits>
#include <boost/limits.hpp>
#if !defined(SPIRIT_NUMERICS_LOOP_UNROLL)
Modified: branches/release/boost/spirit/home/qi/numeric/detail/real_impl.hpp
==============================================================================
--- branches/release/boost/spirit/home/qi/numeric/detail/real_impl.hpp (original)
+++ branches/release/boost/spirit/home/qi/numeric/detail/real_impl.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -14,7 +14,7 @@
#endif
#include <cmath>
-#include <limits>
+#include <boost/limits.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/spirit/home/support/unused.hpp>
#include <boost/spirit/home/qi/detail/attributes.hpp>
Modified: branches/release/boost/spirit/home/support/adapt_adt_attributes.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/adapt_adt_attributes.hpp (original)
+++ branches/release/boost/spirit/home/support/adapt_adt_attributes.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -21,6 +21,23 @@
namespace boost { namespace spirit { namespace traits
{
///////////////////////////////////////////////////////////////////////////
+ template <typename T, int N, bool Const, typename Domain>
+ struct not_is_variant<
+ fusion::extension::adt_attribute_proxy<T, N, Const>, Domain>
+ : not_is_variant<
+ typename fusion::extension::adt_attribute_proxy<T, N, Const>::type
+ , Domain>
+ {};
+
+ template <typename T, int N, bool Const, typename Domain>
+ struct not_is_optional<
+ fusion::extension::adt_attribute_proxy<T, N, Const>, Domain>
+ : not_is_optional<
+ typename fusion::extension::adt_attribute_proxy<T, N, Const>::type
+ , Domain>
+ {};
+
+ ///////////////////////////////////////////////////////////////////////////
template <typename T, int N, bool Const>
struct is_container<fusion::extension::adt_attribute_proxy<T, N, Const> >
: is_container<
@@ -73,7 +90,8 @@
};
template <typename T, int N, bool Const>
- struct container_iterator<fusion::extension::adt_attribute_proxy<T, N, Const> >
+ struct container_iterator<
+ fusion::extension::adt_attribute_proxy<T, N, Const> >
: container_iterator<
typename remove_reference<
typename fusion::extension::adt_attribute_proxy<
@@ -171,6 +189,27 @@
}
};
+ template <typename T, int N, bool Const, typename Exposed>
+ struct extract_from_attribute<
+ fusion::extension::adt_attribute_proxy<T, N, Const>, Exposed>
+ {
+ typedef typename remove_const<
+ typename remove_reference<
+ typename fusion::extension::adt_attribute_proxy<T, N, Const>::type
+ >::type
+ >::type embedded_type;
+ typedef
+ typename spirit::result_of::extract_from<Exposed, embedded_type>::type
+ type;
+
+ template <typename Context>
+ static type
+ call(fusion::extension::adt_attribute_proxy<T, N, Const> const& val, Context& ctx)
+ {
+ return extract_from<Exposed>(val.get(), ctx);
+ }
+ };
+
///////////////////////////////////////////////////////////////////////////
template <typename T, int N, bool Const>
struct attribute_type<fusion::extension::adt_attribute_proxy<T, N, Const> >
@@ -178,6 +217,30 @@
{};
///////////////////////////////////////////////////////////////////////////
+ template <typename T, int N, bool Const>
+ struct optional_attribute<
+ fusion::extension::adt_attribute_proxy<T, N, Const> >
+ {
+ typedef typename result_of::optional_value<
+ typename remove_reference<
+ typename fusion::extension::adt_attribute_proxy<T, N, Const>::type
+ >::type
+ >::type type;
+
+ static type
+ call(fusion::extension::adt_attribute_proxy<T, N, Const> const& val)
+ {
+ return optional_value(val.get());
+ }
+
+ static bool
+ is_valid(fusion::extension::adt_attribute_proxy<T, N, Const> const& val)
+ {
+ return has_optional_value(val.get());
+ }
+ };
+
+ ///////////////////////////////////////////////////////////////////////////
template <typename T, int N, typename Attribute, typename Domain>
struct transform_attribute<
fusion::extension::adt_attribute_proxy<T, N, false>
@@ -251,6 +314,24 @@
}
};
+ template <typename T, int N, bool Const>
+ struct attribute_size<fusion::extension::adt_attribute_proxy<T, N, Const> >
+ {
+ typedef typename remove_const<
+ typename remove_reference<
+ typename fusion::extension::adt_attribute_proxy<T, N, Const>::type
+ >::type
+ >::type embedded_type;
+
+ typedef typename attribute_size<embedded_type>::type type;
+
+ static type
+ call(fusion::extension::adt_attribute_proxy<T, N, Const> const& val)
+ {
+ return attribute_size<embedded_type>::call(val.get());
+ }
+ };
+
///////////////////////////////////////////////////////////////////////////
// customization point specializations for numeric generators
template <typename T, int N, bool Const>
Modified: branches/release/boost/spirit/home/support/attributes.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/attributes.hpp (original)
+++ branches/release/boost/spirit/home/support/attributes.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -413,50 +413,63 @@
///////////////////////////////////////////////////////////////////////////
// Retrieve the size of an attribute (runtime)
///////////////////////////////////////////////////////////////////////////
- template <typename Attribute, typename Enable/* = void*/>
- struct attribute_size
+ namespace detail
{
- typedef std::size_t type;
-
- static type call(Attribute const&)
+ template <typename Attribute, typename Enable = void>
+ struct attribute_size_impl
{
- return 1;
- }
- };
+ typedef std::size_t type;
- template <typename Attribute>
- struct attribute_size<Attribute
- , typename enable_if<
- mpl::and_<
- fusion::traits::is_sequence<Attribute>
- , mpl::not_<traits::is_container<Attribute> >
- >
- >::type
- > {
- typedef typename fusion::result_of::size<Attribute>::value_type type;
+ static type call(Attribute const&)
+ {
+ return 1;
+ }
+ };
- static type call(Attribute const& attr)
+ template <typename Attribute>
+ struct attribute_size_impl<Attribute
+ , typename enable_if<
+ mpl::and_<
+ fusion::traits::is_sequence<Attribute>
+ , mpl::not_<traits::is_container<Attribute> >
+ >
+ >::type>
{
- return fusion::size(attr);
- }
- };
+ typedef typename fusion::result_of::size<Attribute>::value_type type;
- template <typename Attribute>
- struct attribute_size<Attribute
- , typename enable_if<
- mpl::and_<
- traits::is_container<Attribute>
- , mpl::not_<traits::is_iterator_range<Attribute> >
- >
- >::type
- > {
- typedef typename Attribute::size_type type;
+ static type call(Attribute const& attr)
+ {
+ return fusion::size(attr);
+ }
+ };
- static type call(Attribute const& attr)
+ template <typename Attribute>
+ struct attribute_size_impl<Attribute
+ , typename enable_if<
+ mpl::and_<
+ traits::is_container<Attribute>
+ , mpl::not_<traits::is_iterator_range<Attribute> >
+ >
+ >::type>
{
- return attr.size();
- }
- };
+ typedef typename Attribute::size_type type;
+
+ static type call(Attribute const& attr)
+ {
+ return attr.size();
+ }
+ };
+ }
+
+ template <typename Attribute, typename Enable/* = void*/>
+ struct attribute_size
+ : detail::attribute_size_impl<Attribute>
+ {};
+
+ template <typename Attribute>
+ struct attribute_size<optional<Attribute> >
+ : attribute_size<Attribute>
+ {};
template <typename Iterator>
struct attribute_size<iterator_range<Iterator> >
@@ -483,7 +496,7 @@
template <typename Attribute>
typename attribute_size<Attribute>::type
- size(Attribute const& attr)
+ size (Attribute const& attr)
{
return attribute_size<Attribute>::call(attr);
}
Modified: branches/release/boost/spirit/home/support/container.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/container.hpp (original)
+++ branches/release/boost/spirit/home/support/container.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -180,6 +180,16 @@
typedef typename Container::const_iterator type;
};
+ template <typename T>
+ struct container_iterator<optional<T> >
+ : container_iterator<T>
+ {};
+
+ template <typename T>
+ struct container_iterator<optional<T> const>
+ : container_iterator<T const>
+ {};
+
template <typename Iterator>
struct container_iterator<iterator_range<Iterator> >
{
Modified: branches/release/boost/spirit/home/support/detail/pow10.hpp
==============================================================================
--- branches/release/boost/spirit/home/support/detail/pow10.hpp (original)
+++ branches/release/boost/spirit/home/support/detail/pow10.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -14,7 +14,7 @@
#endif
#include <boost/config/no_tr1/cmath.hpp>
-#include <limits>
+#include <boost/limits.hpp>
#include <boost/spirit/home/support/unused.hpp>
#include <boost/spirit/home/support/numeric_traits.hpp>
Modified: branches/release/libs/spirit/doc/html/index.html
==============================================================================
--- branches/release/libs/spirit/doc/html/index.html (original)
+++ branches/release/libs/spirit/doc/html/index.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -33,7 +33,7 @@
</div></div>
<div><p class="copyright">Copyright © 2001-2011 Joel de Guzman, Hartmut Kaiser</p></div>
<div><div class="legalnotice">
-<a name="id788444"></a><p>
+<a name="id868617"></a><p>
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)
</p>
@@ -294,7 +294,7 @@
</p>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: April 16, 2011 at 22:05:46 GMT</small></p></td>
+<td align="left"><p><small>Last revised: April 18, 2011 at 01:05:36 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
Modified: branches/release/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -28,7 +28,7 @@
Expression Grammar</a>
</h3></div></div></div>
<p>
- Parsing Expression Grammars (PEG) <sup>[<a name="id809058" href="#ftn.id809058" class="footnote">6</a>]</sup> are a derivative of Extended Backus-Naur Form (EBNF) <sup>[<a name="id809070" href="#ftn.id809070" class="footnote">7</a>]</sup> with a different interpretation, designed to represent a recursive
+ Parsing Expression Grammars (PEG) <sup>[<a name="id888954" href="#ftn.id888954" class="footnote">6</a>]</sup> are a derivative of Extended Backus-Naur Form (EBNF) <sup>[<a name="id888966" href="#ftn.id888966" class="footnote">7</a>]</sup> with a different interpretation, designed to represent a recursive
descent parser. A PEG can be directly represented as a recursive-descent
parser.
</p>
@@ -189,11 +189,11 @@
</table></div>
<div class="footnotes">
<br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a name="ftn.id809058" href="#id809058" class="para">6</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id888954" href="#id888954" class="para">6</a>] </sup>
Bryan Ford: Parsing Expression Grammars: A Recognition-Based Syntactic
Foundation, http://pdos.csail.mit.edu/~baford/packrat/popl04/
</p></div>
-<div class="footnote"><p><sup>[<a name="ftn.id809070" href="#id809070" class="para">7</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id888966" href="#id888966" class="para">7</a>] </sup>
Richard E. Pattis: EBNF: A Notation to Describe Syntax, http://www.cs.cmu.edu/~pattis/misc/ebnf.pdf
</p></div>
</div>
Modified: branches/release/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -28,9 +28,9 @@
</h3></div></div></div>
<p>
In the next section, we will deal with Parsing Expression Grammars (PEG)
- <sup>[<a name="id808652" href="#ftn.id808652" class="footnote">3</a>]</sup>, a variant of Extended Backus-Naur Form (EBNF) <sup>[<a name="id808664" href="#ftn.id808664" class="footnote">4</a>]</sup> with a different interpretation. It is easier to understand PEG
+ <sup>[<a name="id888548" href="#ftn.id888548" class="footnote">3</a>]</sup>, a variant of Extended Backus-Naur Form (EBNF) <sup>[<a name="id888560" href="#ftn.id888560" class="footnote">4</a>]</sup> with a different interpretation. It is easier to understand PEG
using Syntax Diagrams. Syntax diagrams represent a grammar graphically. It
- was used extensively by Niklaus Wirth <sup>[<a name="id808676" href="#ftn.id808676" class="footnote">5</a>]</sup> in the "Pascal User Manual". Syntax Diagrams are easily
+ was used extensively by Niklaus Wirth <sup>[<a name="id888572" href="#ftn.id888572" class="footnote">5</a>]</sup> in the "Pascal User Manual". Syntax Diagrams are easily
understandable by programmers due to their similarity to flow charts. The
isomorphism of the diagrams and functions make them ideal for representing
Recursive Descent parsers which are essentially mutually recursive functions.
@@ -147,14 +147,14 @@
</p>
<div class="footnotes">
<br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a name="ftn.id808652" href="#id808652" class="para">3</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id888548" href="#id888548" class="para">3</a>] </sup>
Bryan Ford: Parsing Expression Grammars: A Recognition-Based Syntactic
Foundation, http://pdos.csail.mit.edu/~baford/packrat/popl04/
</p></div>
-<div class="footnote"><p><sup>[<a name="ftn.id808664" href="#id808664" class="para">4</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id888560" href="#id888560" class="para">4</a>] </sup>
Richard E. Pattis: EBNF: A Notation to Describe Syntax, http://www.cs.cmu.edu/~pattis/misc/ebnf.pdf
</p></div>
-<div class="footnote"><p><sup>[<a name="ftn.id808676" href="#id808676" class="para">5</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id888572" href="#id888572" class="para">5</a>] </sup>
Niklaus Wirth: The Programming Language Pascal. (July 1973)
</p></div>
</div>
Modified: branches/release/libs/spirit/doc/html/spirit/introduction.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/introduction.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/introduction.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -29,7 +29,7 @@
<p>
Boost Spirit is an object-oriented, recursive-descent parser and output generation
library for C++. It allows you to write grammars and format descriptions using
- a format similar to Extended Backus Naur Form (EBNF)<sup>[<a name="id805666" href="#ftn.id805666" class="footnote">2</a>]</sup> directly in C++. These inline grammar specifications can mix freely
+ a format similar to Extended Backus Naur Form (EBNF)<sup>[<a name="id883447" href="#ftn.id883447" class="footnote">2</a>]</sup> directly in C++. These inline grammar specifications can mix freely
with other C++ code and, thanks to the generative power of C++ templates, are
immediately executable. In retrospect, conventional compiler-compilers or parser-generators
have to perform an additional translation step from the source EBNF code to
@@ -453,7 +453,7 @@
</div>
<br class="table-break"><div class="footnotes">
<br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a name="ftn.id805666" href="#id805666" class="para">2</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id883447" href="#id883447" class="para">2</a>] </sup>
<a href="http://www.cl.cam.ac.uk/%7Emgk25/iso-14977.pdf" target="_top">ISO-EBNF</a>
</p></div>
</div>
Modified: branches/release/libs/spirit/doc/html/spirit/karma/reference/numeric/signed_int.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/karma/reference/numeric/signed_int.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/karma/reference/numeric/signed_int.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -199,7 +199,7 @@
</td>
<td>
<p>
- 10
+ <code class="computeroutput"><span class="number">10</span></code>
</p>
</td>
</tr>
@@ -297,9 +297,10 @@
<td>
<p>
Generate the integer literal <code class="computeroutput"><span class="identifier">num</span></code>
- using the default formatting (radix is 10, sign is only printed
- for negative literals). This generator never fails (unless
- the underlying output stream reports an error).
+ using the default formatting (radix is <code class="computeroutput"><span class="number">10</span></code>,
+ sign is only printed for negative literals). This generator
+ never fails (unless the underlying output stream reports an
+ error).
</p>
</td>
</tr>
@@ -318,9 +319,10 @@
<td>
<p>
Generate the integer provided by a mandatory attribute using
- the default formatting (radix is 10, sign is only printed for
- negative literals). This generator never fails (unless the
- underlying output stream reports an error).
+ the default formatting (radix is <code class="computeroutput"><span class="number">10</span></code>,
+ sign is only printed for negative literals). This generator
+ never fails (unless the underlying output stream reports an
+ error).
</p>
</td>
</tr>
@@ -340,11 +342,12 @@
<p>
Generate the integer provided by the immediate literal value
the generator is initialized from using the default formatting
- (radix is 10, sign is only printed for negative literals).
- If this generator has an associated attribute it succeeds only
- if the attribute is equal to the immediate literal (unless
- the underlying output stream reports an error). Otherwise this
- generator fails and does not generate any output.
+ (radix is <code class="computeroutput"><span class="number">10</span></code>, sign
+ is only printed for negative literals). If this generator has
+ an associated attribute it succeeds only if the attribute is
+ equal to the immediate literal (unless the underlying output
+ stream reports an error). Otherwise this generator fails and
+ does not generate any output.
</p>
</td>
</tr>
Modified: branches/release/libs/spirit/doc/html/spirit/karma/reference/numeric/unsigned_int.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/karma/reference/numeric/unsigned_int.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/karma/reference/numeric/unsigned_int.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -207,13 +207,13 @@
</td>
<td>
<p>
- The radix base. This can be either 2: binary, 8: octal, 10:
- decimal and 16: hexadecimal.
+ The radix base. This can be any value in the (inclusive) range
+ from <code class="computeroutput"><span class="number">2</span></code> .. <code class="computeroutput"><span class="number">36</span></code>.
</p>
</td>
<td>
<p>
- 10
+ <code class="computeroutput"><span class="number">10</span></code>
</p>
</td>
</tr>
@@ -245,9 +245,7 @@
<dt><span class="term"><code class="computeroutput"><span class="identifier">Radix</span></code></span></dt>
<dd><p>
An integer literal specifying the required radix for the output
- conversion. Valid values are <code class="computeroutput"><span class="number">2</span></code>,
- <code class="computeroutput"><span class="number">8</span></code>, <code class="computeroutput"><span class="number">10</span></code>,
- and <code class="computeroutput"><span class="number">16</span></code>.
+ conversion. Valid values are from the (inclusive) range <code class="computeroutput"><span class="number">2</span></code> .. <code class="computeroutput"><span class="number">36</span></code>.
</p></dd>
</dl>
</div>
@@ -287,9 +285,9 @@
<td>
<p>
Generate the unsigned integer literal <code class="computeroutput"><span class="identifier">num</span></code>
- using the default formatting (radix is 10). This generator
- never fails (unless the underlying output stream reports an
- error).
+ using the default formatting (radix is <code class="computeroutput"><span class="number">10</span></code>).
+ This generator never fails (unless the underlying output stream
+ reports an error).
</p>
</td>
</tr>
@@ -308,9 +306,9 @@
<td>
<p>
Generate the unsigned integer provided by a mandatory attribute
- using the default formatting (radix is 10). This generator
- never fails (unless the underlying output stream reports an
- error).
+ using the default formatting (radix is <code class="computeroutput"><span class="number">10</span></code>).
+ This generator never fails (unless the underlying output stream
+ reports an error).
</p>
</td>
</tr>
@@ -330,10 +328,11 @@
<p>
Generate the unsigned integer provided by the immediate literal
value the generator is initialized from using the default formatting
- (radix is 10). If this generator has an associated attribute
- it succeeds only if the attribute is equal to the immediate
- literal (unless the underlying output stream reports an error).
- Otherwise this generator fails and does not generate any output.
+ (radix is <code class="computeroutput"><span class="number">10</span></code>).
+ If this generator has an associated attribute it succeeds only
+ if the attribute is equal to the immediate literal (unless
+ the underlying output stream reports an error). Otherwise this
+ generator fails and does not generate any output.
</p>
</td>
</tr>
@@ -351,9 +350,9 @@
<td>
<p>
Generate the unsigned integer provided by a mandatory attribute
- using the default formatting and the corresponding radix (<code class="computeroutput"><span class="identifier">bin</span></code>: radix is 2, <code class="computeroutput"><span class="identifier">oct</span></code>: radix is 8, <code class="computeroutput"><span class="identifier">hex</span></code>: radix is 16). This generator
- never fails (unless the underlying output stream reports an
- error).
+ using the default formatting and the corresponding radix (<code class="computeroutput"><span class="identifier">bin</span></code>: radix is <code class="computeroutput"><span class="number">2</span></code>, <code class="computeroutput"><span class="identifier">oct</span></code>:
+ radix is <code class="computeroutput"><span class="number">8</span></code>, <code class="computeroutput"><span class="identifier">hex</span></code>: radix is <code class="computeroutput"><span class="number">16</span></code>). This generator never fails
+ (unless the underlying output stream reports an error).
</p>
</td>
</tr>
@@ -373,12 +372,12 @@
Generate the unsigned integer provided by the immediate literal
value the generator is initialized from using the default formatting
and the corresponding radix (<code class="computeroutput"><span class="identifier">bin</span></code>:
- radix is 2, <code class="computeroutput"><span class="identifier">oct</span></code>:
- radix is 8, <code class="computeroutput"><span class="identifier">hex</span></code>:
- radix is 16). If this generator has an associated attribute
- it succeeds only if the attribute is equal to the immediate
- literal (unless the underlying output stream reports an error).
- Otherwise this generator fails and does not generate any output.
+ radix is <code class="computeroutput"><span class="number">2</span></code>, <code class="computeroutput"><span class="identifier">oct</span></code>: radix is <code class="computeroutput"><span class="number">8</span></code>, <code class="computeroutput"><span class="identifier">hex</span></code>:
+ radix is <code class="computeroutput"><span class="number">16</span></code>). If
+ this generator has an associated attribute it succeeds only
+ if the attribute is equal to the immediate literal (unless
+ the underlying output stream reports an error). Otherwise this
+ generator fails and does not generate any output.
</p>
</td>
</tr>
@@ -423,9 +422,9 @@
<td>
<p>
Generate the unsigned integer of type <code class="computeroutput"><span class="identifier">Num</span></code>
- provided by a mandatory attribute using the specified <code class="computeroutput"><span class="identifier">Radix</span></code> (possible values are
- <code class="computeroutput"><span class="number">2</span></code>, <code class="computeroutput"><span class="number">8</span></code>, <code class="computeroutput"><span class="number">10</span></code>,
- and <code class="computeroutput"><span class="number">16</span></code>, the default
+ provided by a mandatory attribute using the specified <code class="computeroutput"><span class="identifier">Radix</span></code> (allowed values are
+ from the (inclusive) range from <code class="computeroutput"><span class="number">2</span></code>
+ .. <code class="computeroutput"><span class="number">36</span></code>, the default
value is <code class="computeroutput"><span class="number">10</span></code>).This
generator never fails (unless the underlying output stream
reports an error).
@@ -448,8 +447,7 @@
Generate the unsigned integer of type <code class="computeroutput"><span class="identifier">Num</span></code>
provided by the immediate literal value the generator is initialized
from, using the specified <code class="computeroutput"><span class="identifier">Radix</span></code>
- (possible values are <code class="computeroutput"><span class="number">2</span></code>,
- <code class="computeroutput"><span class="number">8</span></code>, <code class="computeroutput"><span class="number">10</span></code>, and <code class="computeroutput"><span class="number">16</span></code>,
+ (allowed values are from the (inclusive) range from <code class="computeroutput"><span class="number">2</span></code> .. <code class="computeroutput"><span class="number">36</span></code>,
the default value is <code class="computeroutput"><span class="number">10</span></code>).
If this generator has an associated attribute it succeeds only
if the attribute is equal to the immediate literal (unless
Modified: branches/release/libs/spirit/doc/html/spirit/karma/s05.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/karma/s05.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/karma/s05.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -24,7 +24,7 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
-<a name="id1167173"></a>Karma Index</h3></div></div></div>
+<a name="id1244598"></a>Karma Index</h3></div></div></div>
<p><a class="link" href="s05.html#idx_id_23">A</a> <a class="link" href="s05.html#idx_id_24">B</a> <a class="link" href="s05.html#idx_id_25">C</a> <a class="link" href="s05.html#idx_id_26">D</a> <a class="link" href="s05.html#idx_id_27">E</a> <a class="link" href="s05.html#idx_id_28">F</a> <a class="link" href="s05.html#idx_id_29">G</a> <a class="link" href="s05.html#idx_id_30">H</a> <a class="link" href="s05.html#idx_id_31">I</a> <a class="link" href="s05.html#idx_id_32">K</a> <a class="link" href="s05.html#idx_id_33">L</a> <a class="link" href="s05.html#idx_id_34">M</a> <a class="link" href="s05.html#idx_id_35">N</a> <a class="link" href="s05.html#idx_id_36">O</a> <a class="link" href="s05.html#idx_id_37">P</a> <a class="link" href="s05.html#idx_id_38">Q</a> <a class="link" href="s05.html#idx_id_39">R</a> <a class="link" href="s05.html#idx_id_40">S</a> <a class="link" href="s05.html#idx_id_41">T</a> <a class="link" href="s05.html#idx_id_42">U</a> <a class="link" href="s05.html#idx_id_43">V</a> <a class="l
ink" href="s05.html#idx_id_44">W</a> <a class="link" href="s05.html#idx_id_45">X</a> <a class="link" href="s05.html#idx_id_46">_</a> </p>
<div class="variablelist"><dl>
<dt>
Modified: branches/release/libs/spirit/doc/html/spirit/preface.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/preface.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/preface.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -162,7 +162,7 @@
</h4>
<p>
Just before the development of Spirit V2 began, Hartmut came across the StringTemplate library that is
- a part of the ANTLR parser framework. <sup>[<a name="id788712" href="#ftn.id788712" class="footnote">1</a>]</sup> The concepts presented in that library lead Hartmut to the next
+ a part of the ANTLR parser framework. <sup>[<a name="id868885" href="#ftn.id868885" class="footnote">1</a>]</sup> The concepts presented in that library lead Hartmut to the next
step in the evolution of Spirit. Parsing and generation are tightly connected
to a formal notation, or a grammar. The grammar describes both input and output,
and therefore, a parser library should have a grammar driven output. This duality
@@ -353,7 +353,7 @@
</p>
<div class="footnotes">
<br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a name="ftn.id788712" href="#id788712" class="para">1</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id868885" href="#id868885" class="para">1</a>] </sup>
Quote from http:<span class="emphasis"><em>/www.stringtemplate.org</em></span>: It is a Java
template engine (with ports for C# and Python) for generating source code,
web pages, emails, or any other formatted text output.
Modified: branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/difference.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/difference.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/difference.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -36,7 +36,7 @@
The difference operator, <code class="computeroutput"><span class="identifier">a</span>
<span class="special">-</span> <span class="identifier">b</span></code>,
is a binary operator that matches the first (LHS) operand but not the
- second (RHS). <sup>[<a name="id962036" href="#ftn.id962036" class="footnote">8</a>]</sup>
+ second (RHS). <sup>[<a name="id1040029" href="#ftn.id1040029" class="footnote">8</a>]</sup>
</p>
<a name="spirit.qi.reference.operator.difference.header"></a><h6>
<a name="spirit.qi.reference.operator.difference.header-heading"></a>
@@ -192,7 +192,7 @@
</p>
<div class="footnotes">
<br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a name="ftn.id962036" href="#id962036" class="para">8</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id1040029" href="#id1040029" class="para">8</a>] </sup>
Unlike classic Spirit, with Spirit2, the expression will always fail
if the RHS is a successful match regardless if the RHS matches less
characters. For example, the rule <code class="computeroutput"><span class="identifier">lit</span><span class="special">(</span><span class="string">"policeman"</span><span class="special">)</span> <span class="special">-</span> <span class="string">"police"</span></code> will always fail to
Modified: branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/optional.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/optional.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/optional.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -180,7 +180,7 @@
<p>
</p>
<p>
- Parse a person info with name (in quotes) optional age <sup>[<a name="id971813" href="#ftn.id971813" class="footnote">9</a>]</sup> and optional sex, all separated by comma.
+ Parse a person info with name (in quotes) optional age <sup>[<a name="id1047485" href="#ftn.id1047485" class="footnote">9</a>]</sup> and optional sex, all separated by comma.
</p>
<p>
@@ -206,7 +206,7 @@
</p>
<div class="footnotes">
<br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a name="ftn.id971813" href="#id971813" class="para">9</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id1047485" href="#id1047485" class="para">9</a>] </sup>
James Bond is shy about his age :-)
</p></div>
</div>
Modified: branches/release/libs/spirit/doc/html/spirit/qi/s04.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/qi/s04.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/qi/s04.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -24,7 +24,7 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
-<a name="id989729"></a>Qi Index</h3></div></div></div>
+<a name="id1067873"></a>Qi Index</h3></div></div></div>
<p><a class="link" href="s04.html#idx_id_0">A</a> <a class="link" href="s04.html#idx_id_1">B</a> <a class="link" href="s04.html#idx_id_2">C</a> <a class="link" href="s04.html#idx_id_3">D</a> <a class="link" href="s04.html#idx_id_4">E</a> <a class="link" href="s04.html#idx_id_5">F</a> <a class="link" href="s04.html#idx_id_6">G</a> <a class="link" href="s04.html#idx_id_7">H</a> <a class="link" href="s04.html#idx_id_8">I</a> <a class="link" href="s04.html#idx_id_9">K</a> <a class="link" href="s04.html#idx_id_10">L</a> <a class="link" href="s04.html#idx_id_11">M</a> <a class="link" href="s04.html#idx_id_12">N</a> <a class="link" href="s04.html#idx_id_13">O</a> <a class="link" href="s04.html#idx_id_14">P</a> <a class="link" href="s04.html#idx_id_15">Q</a> <a class="link" href="s04.html#idx_id_16">R</a> <a class="link" href="s04.html#idx_id_17">S</a> <a class="link" href="s04.html#idx_id_18">T</a> <a class="link" href="s04.html#idx_id_19">U</a> <a class="link" href="s04.html#idx_id_20">W</a> <a class="link" href=
"s04.html#idx_id_21">X</a> <a class="link" href="s04.html#idx_id_22">_</a> </p>
<div class="variablelist"><dl>
<dt>
Modified: branches/release/libs/spirit/doc/html/spirit/what_s_new/spirit_2_5.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/what_s_new/spirit_2_5.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/what_s_new/spirit_2_5.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -93,6 +93,11 @@
placeholder allowing to use it everywhere, not only in semantic actions
attached to the right hand sides of a rule.
</li>
+<li class="listitem">
+ Added support for <span class="emphasis"><em>Spirit.Karma</em></span> <a class="link" href="../karma/reference/numeric/unsigned_int.html" title="Unsigned Integer Number Generators (uint_, etc.)">unsigned
+ numeric generators</a> with arbitrary radix values in the (inclusive)
+ range from <code class="computeroutput"><span class="number">2</span></code> .. <code class="computeroutput"><span class="number">36</span></code>.
+ </li>
</ul></div>
<a name="spirit.what_s_new.spirit_2_5.bug_fixes_in_qi_or_karma"></a><h5>
<a name="spirit.what_s_new.spirit_2_5.bug_fixes_in_qi_or_karma-heading"></a>
Modified: branches/release/libs/spirit/doc/karma/numeric.qbk
==============================================================================
--- branches/release/libs/spirit/doc/karma/numeric.qbk (original)
+++ branches/release/libs/spirit/doc/karma/numeric.qbk 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -90,8 +90,7 @@
[[`Num`] [The numeric base type of the
numeric generator.] [`unsigned int`]]
[[`Radix`] [The radix base. This can be
- either 2: binary, 8: octal,
- 10: decimal and 16: hexadecimal.] [10]]
+ any value in the (inclusive) range from `2` .. `36`.] [`10`]]
]
[heading Model of]
@@ -105,8 +104,8 @@
[[`Num`] [Type of `num`: any unsigned integer type, or in case
of a __karma_lazy_argument__, its return value]]
[[`Radix`] [An integer literal specifying the required radix for
- the output conversion. Valid values are `2`, `8`, `10`,
- and `16`.]]
+ the output conversion. Valid values are from the
+ (inclusive) range `2` .. `36`.]]
]
[heading Expression Semantics]
@@ -117,7 +116,7 @@
[table
[[Expression] [Semantics]]
[[`lit(num)`] [Generate the unsigned integer literal `num` using the
- default formatting (radix is 10). This generator never
+ default formatting (radix is `10`). This generator never
fails (unless the underlying output stream reports
an error).]]
[
@@ -125,7 +124,7 @@
uint_
ulong_
ulong_long``] [Generate the unsigned integer provided by a mandatory
- attribute using the default formatting (radix is 10).
+ attribute using the default formatting (radix is `10`).
This generator never fails (unless the underlying
output stream reports an error).]]
[
@@ -134,7 +133,7 @@
ulong_(num)
ulong_long(num)``] [Generate the unsigned integer provided by the
immediate literal value the generator is initialized
- from using the default formatting (radix is 10). If
+ from using the default formatting (radix is `10`). If
this generator has an associated attribute it succeeds
only if the attribute is equal to the
immediate literal (unless the underlying output
@@ -145,8 +144,8 @@
oct
hex``] [Generate the unsigned integer provided by a mandatory
attribute using the default formatting and the
- corresponding radix (`bin`: radix is 2, `oct`: radix is 8,
- `hex`: radix is 16). This generator never fails (unless
+ corresponding radix (`bin`: radix is `2`, `oct`: radix is `8`,
+ `hex`: radix is `16`). This generator never fails (unless
the underlying output stream reports an error).]]
[
[``bin(num)
@@ -154,8 +153,8 @@
hex(num)``] [Generate the unsigned integer provided by the
immediate literal value the generator is initialized
from using the default formatting and the
- corresponding radix (`bin`: radix is 2, `oct`:
- radix is 8, `hex`: radix is 16). If
+ corresponding radix (`bin`: radix is `2`, `oct`:
+ radix is `8`, `hex`: radix is `16`). If
this generator has an associated attribute it succeeds
only if the attribute is equal to the
immediate literal (unless the underlying output
@@ -177,7 +176,8 @@
>()``]
[Generate the unsigned integer of type `Num` provided
by a mandatory attribute using the specified `Radix`
- (possible values are `2`, `8`, `10`, and `16`, the
+ (allowed values are from the (inclusive) range from
+ `2` .. `36`, the
default value is `10`).This generator never fails
(unless the underlying output stream reports an
error).]]
@@ -188,7 +188,8 @@
[Generate the unsigned integer of type `Num` provided
by the immediate literal value the generator is
initialized from, using the specified `Radix`
- (possible values are `2`, `8`, `10`, and `16`, the
+ (allowed values are from the (inclusive) range from
+ `2` .. `36`, the
default value is `10`). If this generator has an
associated attribute it succeeds only if the
attribute is equal to the immediate literal (unless
@@ -367,7 +368,7 @@
numeric parser.] [`int`]]
[[`Radix`] [The radix base. This can be
either 2: binary, 8: octal,
- 10: decimal and 16: hexadecimal.] [10]]
+ 10: decimal and 16: hexadecimal.] [`10`]]
[[`force_sign`] [If `true`, all numbers will
have a sign (space for zero)] [`false`]]
]
@@ -398,7 +399,7 @@
[table
[[Expression] [Semantics]]
[[`lit(num)`] [Generate the integer literal `num` using the default
- formatting (radix is 10, sign is only printed for
+ formatting (radix is `10`, sign is only printed for
negative literals). This generator never fails (unless
the underlying output stream reports an error).]]
[
@@ -406,7 +407,7 @@
int_
long_
long_long``] [Generate the integer provided by a mandatory attribute
- using the default formatting (radix is 10, sign is
+ using the default formatting (radix is `10`, sign is
only printed for negative literals). This generator
never fails (unless the underlying output stream
reports an error).]]
@@ -416,7 +417,7 @@
long_(num)
long_long(num)``] [Generate the integer provided by the immediate literal
value the generator is initialized from using the
- default formatting (radix is 10, sign is only printed
+ default formatting (radix is `10`, sign is only printed
for negative literals). If this generator has an
associated attribute it succeeds only if the
attribute is equal to the immediate literal (unless
Modified: branches/release/libs/spirit/doc/what_s_new.qbk
==============================================================================
--- branches/release/libs/spirit/doc/what_s_new.qbk (original)
+++ branches/release/libs/spirit/doc/what_s_new.qbk 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -55,6 +55,8 @@
This change unifies the handling of the `_val` placeholder allowing to use it
everywhere, not only in semantic actions attached to the right hand sides of
a rule.
+* Added support for __karma__ [unsigned_int unsigned numeric generators] with
+ arbitrary radix values in the (inclusive) range from `2` .. `36`.
[heading Bug Fixes in Qi or Karma]
Modified: branches/release/libs/spirit/repository/doc/html/index.html
==============================================================================
--- branches/release/libs/spirit/repository/doc/html/index.html (original)
+++ branches/release/libs/spirit/repository/doc/html/index.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -33,7 +33,7 @@
</div></div>
<div><p class="copyright">Copyright © 2001-2011 Joel de Guzman, Hartmut Kaiser</p></div>
<div><div class="legalnotice">
-<a name="id803994"></a><p>
+<a name="id788044"></a><p>
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)
</p>
@@ -90,7 +90,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: April 16, 2011 at 22:11:06 GMT</small></p></td>
+<td align="left"><p><small>Last revised: April 16, 2011 at 22:12:58 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
Modified: branches/release/libs/spirit/repository/doc/html/spirit_repository/preface.html
==============================================================================
--- branches/release/libs/spirit/repository/doc/html/spirit_repository/preface.html (original)
+++ branches/release/libs/spirit/repository/doc/html/spirit_repository/preface.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -72,7 +72,7 @@
General List</a> ensure the targeted high quality standards.
</p>
<p>
- Based on the user feedback and general usability of things it it possible over
+ Based on the user feedback and general usability of things it is possible over
time to move repository components/grammars into the <span class="emphasis"><em>Spirit</em></span>
core library.
</p>
@@ -86,7 +86,7 @@
icons precede some text to indicate:
</p>
<div class="table">
-<a name="id804127"></a><p class="title"><b>Table 1. Icons</b></p>
+<a name="id788177"></a><p class="title"><b>Table 1. Icons</b></p>
<div class="table-contents"><table class="table" summary="Icons">
<colgroup>
<col>
Modified: branches/release/libs/spirit/repository/doc/html/spirit_repository/qi_components/nonterminal/subrule.html
==============================================================================
--- branches/release/libs/spirit/repository/doc/html/spirit_repository/qi_components/nonterminal/subrule.html (original)
+++ branches/release/libs/spirit/repository/doc/html/spirit_repository/qi_components/nonterminal/subrule.html 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -514,7 +514,7 @@
examples to subrules, with various compilers.
</p>
<div class="table">
-<a name="id830557"></a><p class="title"><b>Table 2. Subrules performance</b></p>
+<a name="id807897"></a><p class="title"><b>Table 2. Subrules performance</b></p>
<div class="table-contents"><table class="table" summary="Subrules performance">
<colgroup>
<col>
Modified: branches/release/libs/spirit/repository/doc/preface.qbk
==============================================================================
--- branches/release/libs/spirit/repository/doc/preface.qbk (original)
+++ branches/release/libs/spirit/repository/doc/preface.qbk 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -43,7 +43,7 @@
contributions on the __spirit_list__ ensure the targeted high quality
standards.
-Based on the user feedback and general usability of things it it possible over
+Based on the user feedback and general usability of things it is possible over
time to move repository components/grammars into the /Spirit/ core library.
[heading How to use this manual]
Modified: branches/release/libs/spirit/test/Jamfile
==============================================================================
--- branches/release/libs/spirit/test/Jamfile (original)
+++ branches/release/libs/spirit/test/Jamfile 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -133,6 +133,7 @@
[ run qi/uint1.cpp : : : : qi_uint1 ]
[ run qi/uint2.cpp : : : : qi_uint2 ]
[ run qi/uint3.cpp : : : : qi_uint3 ]
+# [ run qi/uint_radix.cpp : : : : qi_uint_radix ]
[ run qi/utree1.cpp : : : : qi_utree1 ]
[ run qi/utree2.cpp : : : : qi_utree2 ]
[ run qi/utree3.cpp : : : : qi_utree3 ]
@@ -227,6 +228,7 @@
[ run karma/symbols2.cpp : : : : karma_symbols2 ]
[ run karma/symbols3.cpp : : : : karma_symbols3 ]
[ run karma/tricky_alignment.cpp : : : : karma_tricky_alignment ]
+ [ run karma/uint_radix.cpp : : : : karma_uint_radix ]
[ run karma/utree1.cpp : : : : karma_utree1 ]
[ run karma/utree2.cpp : : : : karma_utree2 ]
[ run karma/utree3.cpp : : : : karma_utree3 ]
@@ -241,7 +243,7 @@
[ run karma/regression_semantic_action_attribute.cpp : : : : karma_regression_semantic_action_attribute ]
[ run karma/regression_real_scientific.cpp : : : : karma_regression_real_scientific ]
[ compile karma/regression_const_real_policies.cpp : : regression_const_real_policies ]
- [ run karma/regression_numerics_adapt_adt.cpp : : : : karma_regression_numerics_adapt_adt ]
+ [ run karma/regression_adapt_adt.cpp : : : : karma_regression_adapt_adt ]
;
Modified: branches/release/libs/spirit/test/karma/int1.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/int1.cpp (original)
+++ branches/release/libs/spirit/test/karma/int1.cpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -23,7 +23,7 @@
#include <boost/spirit/include/karma_action.hpp>
#include <boost/spirit/include/karma_phoenix_attributes.hpp>
-#include <limits>
+#include <boost/limits.hpp>
#include "test.hpp"
using namespace spirit_test;
Modified: branches/release/libs/spirit/test/karma/int2.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/int2.cpp (original)
+++ branches/release/libs/spirit/test/karma/int2.cpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -24,7 +24,7 @@
#include <boost/spirit/include/karma_rule.hpp>
#include <boost/spirit/include/karma_phoenix_attributes.hpp>
-#include <limits>
+#include <boost/limits.hpp>
#include "test.hpp"
using namespace spirit_test;
Modified: branches/release/libs/spirit/test/karma/int3.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/int3.cpp (original)
+++ branches/release/libs/spirit/test/karma/int3.cpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -23,7 +23,7 @@
#include <boost/spirit/include/karma_action.hpp>
#include <boost/spirit/include/karma_phoenix_attributes.hpp>
-#include <limits>
+#include <boost/limits.hpp>
#include "test.hpp"
using namespace spirit_test;
Modified: branches/release/libs/spirit/test/karma/real.hpp
==============================================================================
--- branches/release/libs/spirit/test/karma/real.hpp (original)
+++ branches/release/libs/spirit/test/karma/real.hpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -24,7 +24,7 @@
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_statement.hpp>
-#include <limits>
+#include <boost/limits.hpp>
#include "test.hpp"
using namespace spirit_test;
Modified: branches/release/libs/spirit/test/karma/real3.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/real3.cpp (original)
+++ branches/release/libs/spirit/test/karma/real3.cpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
@@ -6,9 +6,36 @@
//#define KARMA_FAIL_COMPILATION
+#include <boost/spirit/include/version.hpp>
#include "real.hpp"
///////////////////////////////////////////////////////////////////////////////
+// the customization points below have been added only recently
+#if SPIRIT_VERSION >= 0x2050
+// does not provide proper std::numeric_limits, we need to roll our own
+namespace boost { namespace spirit { namespace traits
+{
+ template <>
+ struct is_nan<boost::math::concepts::real_concept>
+ {
+ static bool call(boost::math::concepts::real_concept n)
+ {
+ return test_nan(n.value());
+ }
+ };
+
+ template <>
+ struct is_infinite<boost::math::concepts::real_concept>
+ {
+ static bool call(boost::math::concepts::real_concept n)
+ {
+ return test_infinite(n.value());
+ }
+ };
+}}}
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
int main()
{
using namespace boost::spirit;
Deleted: branches/release/libs/spirit/test/karma/regression_numerics_adapt_adt.cpp
==============================================================================
--- branches/release/libs/spirit/test/karma/regression_numerics_adapt_adt.cpp 2011-04-18 21:31:14 EDT (Mon, 18 Apr 2011)
+++ (empty file)
@@ -1,132 +0,0 @@
-// Copyright (c) 2001-2011 Hartmut Kaiser
-// Copyright (c) 2011 Colin Rundel
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#include <boost/config/warning_disable.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-#include <boost/fusion/include/adapt_adt.hpp>
-
-#include <boost/spirit/include/karma.hpp>
-#include <boost/spirit/include/support_adapt_adt_attributes.hpp>
-
-#include "test.hpp"
-
-///////////////////////////////////////////////////////////////////////////////
-class data1
-{
-private:
- int width_;
- int height_;
-
-public:
- data1()
- : width_(400), height_(400)
- {}
-
- data1(int width, int height)
- : width_(width), height_(height)
- {}
-
- int width() const { return width_;}
- int height() const { return height_;}
-
- void set_width(int width) { width_=width;}
- void set_height(int height) { height_=height;}
-};
-
-BOOST_FUSION_ADAPT_ADT(
- data1,
- (int, int, obj.width(), obj.set_width(val))
- (int, int, obj.height(), obj.set_height(val))
-);
-
-///////////////////////////////////////////////////////////////////////////////
-class data2
-{
-private:
- std::string data_;
-
-public:
- data2()
- : data_("test")
- {}
-
- data2(std::string const& data)
- : data_(data)
- {}
-
- std::string const& data() const { return data_;}
- void set_data(std::string const& data) { data_ = data;}
-};
-
-BOOST_FUSION_ADAPT_ADT(
- data2,
- (std::string, std::string const&, obj.data(), obj.set_data(val))
-);
-
-///////////////////////////////////////////////////////////////////////////////
-class data3
-{
-private:
- double data_;
-
-public:
- data3(double data = 0.0)
- : data_(data)
- {}
-
- double data() const { return data_;}
- void set_data(double data) { data_ = data;}
-};
-
-BOOST_FUSION_ADAPT_ADT(
- data3,
- (double, double, obj.data(), obj.set_data(val))
-);
-
-///////////////////////////////////////////////////////////////////////////////
-int main ()
-{
- using spirit_test::test;
-
- {
- using boost::spirit::karma::int_;
-
- data1 b(800, 600);
- BOOST_TEST(test("width: 800\nheight: 600\n",
- "width: " << int_ << "\n" << "height: " << int_ << "\n", b));
- }
-
- {
- using boost::spirit::karma::char_;
- using boost::spirit::karma::string;
-
- data2 d("test");
- BOOST_TEST(test("data: test\n", "data: " << +char_ << "\n", d));
- BOOST_TEST(test("data: test\n", "data: " << string << "\n", d));
- }
-
- {
- using boost::spirit::karma::double_;
-
- BOOST_TEST(test("x=0.0\n", "x=" << double_ << "\n", data3(0)));
- BOOST_TEST(test("x=1.1\n", "x=" << double_ << "\n", data3(1.1)));
- BOOST_TEST(test("x=1.0e10\n", "x=" << double_ << "\n", data3(1e10)));
-
- BOOST_TEST(test("x=inf\n", "x=" << double_ << "\n",
- data3(std::numeric_limits<double>::infinity())));
- if (std::numeric_limits<double>::has_quiet_NaN) {
- BOOST_TEST(test("x=nan\n", "x=" << double_ << "\n",
- data3(std::numeric_limits<double>::quiet_NaN())));
- }
- if (std::numeric_limits<double>::has_signaling_NaN) {
- BOOST_TEST(test("x=nan\n", "x=" << double_ << "\n",
- data3(std::numeric_limits<double>::signaling_NaN())));
- }
- }
-
- return boost::report_errors();
-}
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