Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r68004 - in branches/release: . boost boost/archive boost/archive/iterators boost/bimap boost/config boost/config/compiler boost/detail boost/functional/hash boost/fusion boost/fusion/container/list/detail 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/property_tree boost/python boost/regex boost/serialization boost/signals boost/signals2 boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/support boost/statechart boost/thread boost/tr1 boost/type_traits boost/typeof boost/unordered boost/utility boost/uuid boost/variant boost/wave boost/wave/cpplexer boost/wave/cpplexer/re2clex boost/wave/grammars boost/wave/util doc libs libs/array/doc libs/array/test libs/bimap libs/config libs/date_time libs/functional/hash libs/fusion libs/graph_parallel libs/icl libs/icl/doc libs/icl/doc/html/header/boost/icl libs/icl/test/test_doc_code_ libs/integer libs/interprocess libs/intrusive libs/iostreams libs/math libs/math/build libs/math/config libs/math/doc libs/math/doc/complex libs/math/doc/distexplorer libs/math/doc/gcd libs/math/doc/html libs/math/doc/octonion libs/math/doc/quaternion libs/math/doc/sf_and_dist libs/math/doc/sf_and_dist/html libs/math/doc/sf_and_dist/html/math_toolkit/main_overview libs/math/dot_net_example libs/math/example libs/math/minimax libs/math/performance libs/math/src libs/math/test libs/math/tools libs/mpi/build libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/msm libs/numeric/ublas libs/numeric/ublas/doc libs/pool libs/program_options libs/property_tree libs/python libs/regex libs/regex/build libs/serialization libs/serialization/doc libs/serialization/example libs/serialization/src libs/serialization/test libs/serialization/vc7ide libs/signals libs/signals2 libs/spirit libs/spirit/classic/example libs/spirit/doc libs/spirit/example libs/spirit/phoenix libs/spirit/test libs/spirit/test/qi libs/statechart libs/static_assert libs/thread libs/timer libs/tr1 libs/type_traits libs/typeof/doc libs/unordered libs/utility libs/utility/swap/test libs/uuid libs/wave libs/wave/build libs/wave/doc libs/wave/samples/cpp_tokens libs/wave/samples/cpp_tokens/slex libs/wave/samples/custom_directives libs/wave/samples/emit_custom_line_directives libs/wave/src libs/wave/src/cpplexer/re2clex libs/wave/test/build libs/wave/test/testlexers libs/wave/test/testwave libs/wave/test/testwave/testfiles more more/getting_started status tools tools/bcp tools/boostbook tools/build/v2 tools/build/v2/tools tools/inspect tools/quickbook tools/regression tools/regression/src tools/release tools/wave tools/wave/build
From: hartmut.kaiser_at_[hidden]
Date: 2011-01-11 18:20:45


Author: hkaiser
Date: 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
New Revision: 68004
URL: http://svn.boost.org/trac/boost/changeset/68004

Log:
Wave: merging from trunk
Added:
   branches/release/boost/config/compiler/pathscale.hpp
      - copied unchanged from r67707, /trunk/boost/config/compiler/pathscale.hpp
   branches/release/libs/wave/test/testwave/testfiles/t_2_021.cpp
      - copied, changed from r67119, /trunk/libs/wave/test/testwave/testfiles/t_2_021.cpp
   branches/release/libs/wave/test/testwave/testfiles/t_7_001.cpp
      - copied, changed from r67119, /trunk/libs/wave/test/testwave/testfiles/t_7_001.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/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/detail/ (props changed)
   branches/release/boost/detail/endian.hpp (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/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/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/property_tree/ (props changed)
   branches/release/boost/python/ (props changed)
   branches/release/boost/regex/ (props changed)
   branches/release/boost/serialization/ (props changed)
   branches/release/boost/signals/ (props changed)
   branches/release/boost/signals2/ (props changed)
   branches/release/boost/signals2.hpp (props changed)
   branches/release/boost/spirit/ (props changed)
   branches/release/boost/spirit/home/ (props changed)
   branches/release/boost/spirit/home/karma/ (props changed)
   branches/release/boost/spirit/home/support/attributes.hpp (props changed)
   branches/release/boost/statechart/ (props changed)
   branches/release/boost/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/array/doc/array.xml (props changed)
   branches/release/libs/array/test/array0.cpp (props changed)
   branches/release/libs/array/test/array2.cpp (props changed)
   branches/release/libs/bimap/ (props changed)
   branches/release/libs/config/ (props changed)
   branches/release/libs/date_time/ (props changed)
   branches/release/libs/functional/hash/ (props changed)
   branches/release/libs/fusion/ (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/header/boost/icl/ (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/iostreams/ (props changed)
   branches/release/libs/libraries.htm (props changed)
   branches/release/libs/maintainers.txt (props changed)
   branches/release/libs/math/ (props changed)
   branches/release/libs/math/build/ (props changed)
   branches/release/libs/math/config/ (props changed)
   branches/release/libs/math/doc/ (props changed)
   branches/release/libs/math/doc/complex/ (props changed)
   branches/release/libs/math/doc/distexplorer/ (props changed)
   branches/release/libs/math/doc/gcd/ (props changed)
   branches/release/libs/math/doc/html/ (props changed)
   branches/release/libs/math/doc/octonion/ (props changed)
   branches/release/libs/math/doc/quaternion/ (props changed)
   branches/release/libs/math/doc/sf_and_dist/ (props changed)
   branches/release/libs/math/doc/sf_and_dist/html/ (props changed)
   branches/release/libs/math/doc/sf_and_dist/html/math_toolkit/main_overview/faq.html (props changed)
   branches/release/libs/math/dot_net_example/ (props changed)
   branches/release/libs/math/example/ (props changed)
   branches/release/libs/math/minimax/ (props changed)
   branches/release/libs/math/performance/ (props changed)
   branches/release/libs/math/src/ (props changed)
   branches/release/libs/math/test/ (props changed)
   branches/release/libs/math/tools/ (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/pool/ (props changed)
   branches/release/libs/program_options/ (props changed)
   branches/release/libs/property_tree/ (props changed)
   branches/release/libs/python/ (props changed)
   branches/release/libs/regex/ (props changed)
   branches/release/libs/regex/build/ (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/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/typeof/doc/typeof.qbk (props changed)
   branches/release/libs/unordered/ (props changed)
   branches/release/libs/utility/ (props changed)
   branches/release/libs/utility/swap.html (props changed)
   branches/release/libs/utility/swap/test/std_bitset.cpp (props changed)
   branches/release/libs/utility/value_init.htm (props changed)
   branches/release/libs/utility/value_init_test.cpp (props changed)
   branches/release/libs/uuid/ (props changed)
   branches/release/libs/wave/ (props changed)
   branches/release/more/ (props changed)
   branches/release/more/getting_started/ (props changed)
   branches/release/rst.css (props changed)
   branches/release/status/ (props changed)
   branches/release/status/Jamfile.v2 (props changed)
   branches/release/status/explicit-failures-markup.xml (props changed)
   branches/release/tools/ (props changed)
   branches/release/tools/bcp/ (props changed)
   branches/release/tools/boostbook/ (props changed)
   branches/release/tools/build/v2/ (props changed)
   branches/release/tools/inspect/ (props changed)
   branches/release/tools/quickbook/ (props changed)
   branches/release/tools/regression/ (props changed)
   branches/release/tools/regression/src/library_status.cpp (props changed)
   branches/release/tools/release/ (props changed)
   branches/release/tools/wave/ (props changed)
Text files modified:
   branches/release/boost/archive/iterators/transform_width.hpp | 2
   branches/release/boost/config/select_compiler_config.hpp | 44
   branches/release/boost/wave.hpp | 2
   branches/release/boost/wave/cpp_context.hpp | 8
   branches/release/boost/wave/cpp_exceptions.hpp | 2
   branches/release/boost/wave/cpp_iteration_context.hpp | 2
   branches/release/boost/wave/cpp_throw.hpp | 2
   branches/release/boost/wave/cpplexer/convert_trigraphs.hpp | 2
   branches/release/boost/wave/cpplexer/cpp_lex_interface.hpp | 2
   branches/release/boost/wave/cpplexer/cpp_lex_interface_generator.hpp | 2
   branches/release/boost/wave/cpplexer/cpp_lex_iterator.hpp | 2
   branches/release/boost/wave/cpplexer/cpp_lex_token.hpp | 2
   branches/release/boost/wave/cpplexer/cpplexer_exceptions.hpp | 2
   branches/release/boost/wave/cpplexer/detect_include_guards.hpp | 2
   branches/release/boost/wave/cpplexer/re2clex/aq.hpp | 2
   branches/release/boost/wave/cpplexer/re2clex/cpp_re.hpp | 2
   branches/release/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp | 11
   branches/release/boost/wave/cpplexer/re2clex/scanner.hpp | 3
   branches/release/boost/wave/cpplexer/token_cache.hpp | 2
   branches/release/boost/wave/cpplexer/validate_universal_char.hpp | 2
   branches/release/boost/wave/grammars/cpp_chlit_grammar.hpp | 2
   branches/release/boost/wave/grammars/cpp_defined_grammar.hpp | 2
   branches/release/boost/wave/grammars/cpp_defined_grammar_gen.hpp | 2
   branches/release/boost/wave/grammars/cpp_expression_grammar.hpp | 2
   branches/release/boost/wave/grammars/cpp_expression_grammar_gen.hpp | 2
   branches/release/boost/wave/grammars/cpp_expression_value.hpp | 2
   branches/release/boost/wave/grammars/cpp_grammar.hpp | 2
   branches/release/boost/wave/grammars/cpp_grammar_gen.hpp | 2
   branches/release/boost/wave/grammars/cpp_intlit_grammar.hpp | 2
   branches/release/boost/wave/grammars/cpp_literal_grammar_gen.hpp | 2
   branches/release/boost/wave/grammars/cpp_predef_macros_gen.hpp | 2
   branches/release/boost/wave/grammars/cpp_predef_macros_grammar.hpp | 2
   branches/release/boost/wave/grammars/cpp_value_error.hpp | 2
   branches/release/boost/wave/language_support.hpp | 30
   branches/release/boost/wave/preprocessing_hooks.hpp | 2
   branches/release/boost/wave/token_ids.hpp | 15
   branches/release/boost/wave/util/cpp_ifblock.hpp | 2
   branches/release/boost/wave/util/cpp_include_paths.hpp | 6
   branches/release/boost/wave/util/cpp_iterator.hpp | 53
   branches/release/boost/wave/util/cpp_macromap.hpp | 118
   branches/release/boost/wave/util/cpp_macromap_predef.hpp | 52
   branches/release/boost/wave/util/cpp_macromap_utils.hpp | 38
   branches/release/boost/wave/util/file_position.hpp | 18
   branches/release/boost/wave/util/filesystem_compatibility.hpp | 71
   branches/release/boost/wave/util/flex_string.hpp | 28
   branches/release/boost/wave/util/functor_input.hpp | 2
   branches/release/boost/wave/util/insert_whitespace_detection.hpp | 2
   branches/release/boost/wave/util/interpret_pragma.hpp | 2
   branches/release/boost/wave/util/iteration_context.hpp | 2
   branches/release/boost/wave/util/macro_definition.hpp | 2
   branches/release/boost/wave/util/macro_helpers.hpp | 2
   branches/release/boost/wave/util/pattern_parser.hpp | 2
   branches/release/boost/wave/util/symbol_table.hpp | 2
   branches/release/boost/wave/util/time_conversion_helper.hpp | 2
   branches/release/boost/wave/util/transform_iterator.hpp | 2
   branches/release/boost/wave/util/unput_queue_iterator.hpp | 2
   branches/release/boost/wave/wave_config.hpp | 14
   branches/release/boost/wave/wave_config_constant.hpp | 2
   branches/release/boost/wave/wave_version.hpp | 6
   branches/release/boost/wave/whitespace_handling.hpp | 83
   branches/release/doc/Jamfile.v2 | 2
   branches/release/libs/wave/ChangeLog | 29
   branches/release/libs/wave/build/Jamfile.v2 | 2
   branches/release/libs/wave/doc/acknowledgements.html | 2
   branches/release/libs/wave/doc/class_ref_ctxpolicy_depr.html | 2
   branches/release/libs/wave/doc/class_reference_context.html | 3
   branches/release/libs/wave/doc/class_reference_ctxpolicy.html | 2
   branches/release/libs/wave/doc/class_reference_filepos.html | 2
   branches/release/libs/wave/doc/class_reference_inptpolcy.html | 2
   branches/release/libs/wave/doc/class_reference_lexer.html | 2
   branches/release/libs/wave/doc/class_reference_tokentype.html | 2
   branches/release/libs/wave/doc/compiletime_config.html | 10
   branches/release/libs/wave/doc/introduction.html | 2
   branches/release/libs/wave/doc/macro_expansion_process.html | 2
   branches/release/libs/wave/doc/predefined_macros.html | 10
   branches/release/libs/wave/doc/preface.html | 4
   branches/release/libs/wave/doc/quickstart.html | 2
   branches/release/libs/wave/doc/references.html | 2
   branches/release/libs/wave/doc/samples.html | 2
   branches/release/libs/wave/doc/supported_pragmas.html | 2
   branches/release/libs/wave/doc/token_ids.html | 2
   branches/release/libs/wave/doc/tracing_facility.html | 2
   branches/release/libs/wave/doc/wave_driver.html | 22
   branches/release/libs/wave/samples/cpp_tokens/cpp_tokens.cpp | 4
   branches/release/libs/wave/samples/cpp_tokens/cpp_tokens.hpp | 2
   branches/release/libs/wave/samples/cpp_tokens/cpp_tokens_config.hpp | 2
   branches/release/libs/wave/samples/cpp_tokens/instantiate_cpp_exprgrammar.cpp | 2
   branches/release/libs/wave/samples/cpp_tokens/instantiate_cpp_grammar.cpp | 2
   branches/release/libs/wave/samples/cpp_tokens/instantiate_cpp_literalgrs.cpp | 2
   branches/release/libs/wave/samples/cpp_tokens/instantiate_defined_grammar.cpp | 2
   branches/release/libs/wave/samples/cpp_tokens/instantiate_slex_lexer.cpp | 2
   branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp | 73
   branches/release/libs/wave/samples/cpp_tokens/slex/lexer.hpp | 2
   branches/release/libs/wave/samples/cpp_tokens/slex_interface.hpp | 2
   branches/release/libs/wave/samples/cpp_tokens/slex_iterator.hpp | 2
   branches/release/libs/wave/samples/cpp_tokens/slex_token.hpp | 2
   branches/release/libs/wave/samples/custom_directives/custom_directives.cpp | 2
   branches/release/libs/wave/samples/custom_directives/custom_directives.hpp | 2
   branches/release/libs/wave/samples/emit_custom_line_directives/emit_custom_line_directives.cpp | 2
   branches/release/libs/wave/samples/emit_custom_line_directives/emit_custom_line_directives.hpp | 2
   branches/release/libs/wave/src/cpplexer/re2clex/aq.cpp | 2
   branches/release/libs/wave/src/cpplexer/re2clex/cpp.re | 105
   branches/release/libs/wave/src/cpplexer/re2clex/cpp_re.cpp | 2
   branches/release/libs/wave/src/cpplexer/re2clex/cpp_re.inc | 9584 ++++++++++++++++++++++++---------------
   branches/release/libs/wave/src/cpplexer/re2clex/strict_cpp.re | 101
   branches/release/libs/wave/src/cpplexer/re2clex/strict_cpp_re.inc | 9569 ++++++++++++++++++++++++---------------
   branches/release/libs/wave/src/instantiate_cpp_exprgrammar.cpp | 2
   branches/release/libs/wave/src/instantiate_cpp_grammar.cpp | 2
   branches/release/libs/wave/src/instantiate_cpp_literalgrs.cpp | 2
   branches/release/libs/wave/src/instantiate_defined_grammar.cpp | 2
   branches/release/libs/wave/src/instantiate_predef_macros.cpp | 2
   branches/release/libs/wave/src/instantiate_re2c_lexer.cpp | 2
   branches/release/libs/wave/src/instantiate_re2c_lexer_str.cpp | 2
   branches/release/libs/wave/src/token_ids.cpp | 26
   branches/release/libs/wave/src/wave_config_constant.cpp | 2
   branches/release/libs/wave/test/build/Jamfile.v2 | 2
   branches/release/libs/wave/test/testlexers/cpp_tokens.hpp | 2
   branches/release/libs/wave/test/testlexers/test_lexertl_lexer.cpp | 2
   branches/release/libs/wave/test/testlexers/test_re2c_lexer.cpp | 2
   branches/release/libs/wave/test/testlexers/test_slex_lexer.cpp | 2
   branches/release/libs/wave/test/testlexers/test_xlex_lexer.cpp | 2
   branches/release/libs/wave/test/testwave/cmd_line_utils.hpp | 2
   branches/release/libs/wave/test/testwave/collect_hooks_information.hpp | 55
   branches/release/libs/wave/test/testwave/testfiles/t_1_001.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_002.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_003.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_004.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_005.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_006.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_007.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_008.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_009.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_010.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_011.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_012.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_013.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_014.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_015.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_016.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_017.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_018.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_019.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_020.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_021.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_022.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_023.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_024.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_025.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_026.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_027.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_028.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_029.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_030.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_031.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_032.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_033.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_034.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_035.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_036.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_037.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_1_038.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_001.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_002.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_003.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_004.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_005.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_006.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_007.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_008.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_009.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_010.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_011.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_012.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_013.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_014.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_015.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_016.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_017.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_018.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_019.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_019_001.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_019_002.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_019_003.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_020.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_2_021.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_3_001.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_3_002.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_3_003.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_3_004.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_4_001.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_4_002.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_4_003.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_4_004.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_001.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_002.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_003.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_004.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_005.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_006.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_007.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_007.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_008.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_009.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_010.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_011.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_012.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_013.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_014.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_015.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_016.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_017.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_018.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_019.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_020.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_021.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_022.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_023.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_024.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_025.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_026.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_027.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_028.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_029.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_030.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_031.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_031.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_032.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_033.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_034.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_01.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_02.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_03.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_04.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_05.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_06.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_07.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_08.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_09.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_10.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_11.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_12.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_13.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_14.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_5_035_15.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_001.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_002.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_003.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_004.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_005.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_006.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_007.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_008.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_009.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_010.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_011.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_012.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_013.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_014.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_015.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_016.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_017.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_018.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_019.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_020.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_021.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_022.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_023.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_024.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_025.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_026.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_027.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_028.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_029.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_029.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_030.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_030.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_031.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_032.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_033.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_034.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_035.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_036.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_037.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_038.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_039.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_040.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_041.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_042.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_043.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_044.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_045.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_046.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_047.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_048.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_049.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_050.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_051.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_052.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_053.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_054.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_055.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_056.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_057.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_058.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_059.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_060.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_061.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_062.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_063.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_063.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_064.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_065.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_066.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_066.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_067.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_067.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_068.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_6_069.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_7_001.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_001.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_002.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_003.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_004.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_005.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_006.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_007.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_008.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_009.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_010.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_011.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_012.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_013.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_014.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_015.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_016.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_016.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_017.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_018.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_019.cpp | 2
   branches/release/libs/wave/test/testwave/testfiles/t_9_019.hpp | 2
   branches/release/libs/wave/test/testwave/testfiles/test.cfg | 8
   branches/release/libs/wave/test/testwave/testwave.cpp | 4
   branches/release/libs/wave/test/testwave/testwave_app.cpp | 74
   branches/release/libs/wave/test/testwave/testwave_app.hpp | 2
   branches/release/libs/wave/test/testwave/testwave_app_dll.cpp | 2
   branches/release/libs/wave/test/testwave/testwave_dll.cpp | 2
   branches/release/tools/build/v2/tools/pathscale.jam | 20
   branches/release/tools/wave/build/Jamfile.v2 | 17
   branches/release/tools/wave/cpp.cpp | 74
   branches/release/tools/wave/cpp.hpp | 2
   branches/release/tools/wave/cpp_config.hpp | 2
   branches/release/tools/wave/cpp_version.hpp | 6
   branches/release/tools/wave/stop_watch.hpp | 2
   branches/release/tools/wave/trace_macro_expansion.hpp | 78
   356 files changed, 12954 insertions(+), 8154 deletions(-)

Modified: branches/release/boost/archive/iterators/transform_width.hpp
==============================================================================
--- branches/release/boost/archive/iterators/transform_width.hpp (original)
+++ branches/release/boost/archive/iterators/transform_width.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -24,6 +24,8 @@
 // character and 8 bit bytes. Lowest common multiple is 24 => 4 6 bit characters
 // or 3 8 bit characters
 
+#include <algorithm>
+
 #include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME & PTFO
 #include <boost/serialization/pfto.hpp>
 

Modified: branches/release/boost/config/select_compiler_config.hpp
==============================================================================
--- branches/release/boost/config/select_compiler_config.hpp (original)
+++ branches/release/boost/config/select_compiler_config.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -14,25 +14,27 @@
 // one identification macro for each of the
 // compilers we support:
 
-# define BOOST_CXX_GCCXML 0
-# define BOOST_CXX_CLANG 0
-# define BOOST_CXX_COMO 0
-# define BOOST_CXX_DMC 0
-# define BOOST_CXX_INTEL 0
-# define BOOST_CXX_GNUC 0
-# define BOOST_CXX_KCC 0
-# define BOOST_CXX_SGI 0
-# define BOOST_CXX_TRU64 0
-# define BOOST_CXX_GHS 0
-# define BOOST_CXX_BORLAND 0
-# define BOOST_CXX_CW 0
-# define BOOST_CXX_SUNPRO 0
-# define BOOST_CXX_HPACC 0
-# define BOOST_CXX_MPW 0
-# define BOOST_CXX_IBMCPP 0
-# define BOOST_CXX_MSVC 0
-# define BOOST_CXX_PGI 0
-# define BOOST_CXX_NVCC 0
+# define BOOST_CXX_GCCXML 0
+# define BOOST_CXX_NVCC 0
+# define BOOST_CXX_COMO 0
+# define BOOST_CXX_PATHSCALE 0
+# define BOOST_CXX_CLANG 0
+# define BOOST_CXX_DMC 0
+# define BOOST_CXX_INTEL 0
+# define BOOST_CXX_GNUC 0
+# define BOOST_CXX_KCC 0
+# define BOOST_CXX_SGI 0
+# define BOOST_CXX_TRU64 0
+# define BOOST_CXX_GHS 0
+# define BOOST_CXX_BORLAND 0
+# define BOOST_CXX_CW 0
+# define BOOST_CXX_SUNPRO 0
+# define BOOST_CXX_HPACC 0
+# define BOOST_CXX_MPW 0
+# define BOOST_CXX_IBMCPP 0
+# define BOOST_CXX_MSVC 0
+# define BOOST_CXX_PGI 0
+# define BOOST_CXX_NVCC 0
 
 
 // locate which compiler we are using and define
@@ -50,6 +52,10 @@
 // Comeau C++
 # define BOOST_COMPILER_CONFIG "boost/config/compiler/comeau.hpp"
 
+#elif defined __PATHSCALE__
+// PathScale EKOPath compiler (has to come before clang and gcc)
+# define BOOST_COMPILER_CONFIG "boost/config/compiler/pathscale.hpp"
+
 #elif defined __clang__
 // Clang C++ emulates GCC, so it has to appear early.
 # define BOOST_COMPILER_CONFIG "boost/config/compiler/clang.hpp"

Modified: branches/release/boost/wave.hpp
==============================================================================
--- branches/release/boost/wave.hpp (original)
+++ branches/release/boost/wave.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
 
     See http://www.boost.org/libs/wave for documentation
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpp_context.hpp
==============================================================================
--- branches/release/boost/wave/cpp_context.hpp (original)
+++ branches/release/boost/wave/cpp_context.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -165,7 +165,7 @@
         std::string fname(filename);
         if (filename != "<Unknown>" && filename != "<stdin>") {
             using namespace boost::filesystem;
- path fpath(complete(path(filename)));
+ path fpath(util::complete_path(path(filename)));
             fname = fpath.string();
         }
         return iterator_type(*this, first, last, position_type(fname.c_str()));
@@ -177,7 +177,7 @@
         std::string fname(filename);
         if (filename != "<Unknown>" && filename != "<stdin>") {
             using namespace boost::filesystem;
- path fpath(complete(path(filename)));
+ path fpath(util::complete_path(path(filename)));
             fname = fpath.string();
         }
         return iterator_type(*this, first_, last_, position_type(fname.c_str()));
@@ -324,7 +324,7 @@
             std::string fname(filename);
             if (filename != "<Unknown>" && filename != "<stdin>") {
                 using namespace boost::filesystem;
- path fpath(complete(path(filename)));
+ path fpath(util::complete_path(path(filename)));
                 fname = fpath.string();
                 includes.set_current_directory(fname.c_str());
             }

Modified: branches/release/boost/wave/cpp_exceptions.hpp
==============================================================================
--- branches/release/boost/wave/cpp_exceptions.hpp (original)
+++ branches/release/boost/wave/cpp_exceptions.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpp_iteration_context.hpp
==============================================================================
--- branches/release/boost/wave/cpp_iteration_context.hpp (original)
+++ branches/release/boost/wave/cpp_iteration_context.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpp_throw.hpp
==============================================================================
--- branches/release/boost/wave/cpp_throw.hpp (original)
+++ branches/release/boost/wave/cpp_throw.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpplexer/convert_trigraphs.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/convert_trigraphs.hpp (original)
+++ branches/release/boost/wave/cpplexer/convert_trigraphs.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpplexer/cpp_lex_interface.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/cpp_lex_interface.hpp (original)
+++ branches/release/boost/wave/cpplexer/cpp_lex_interface.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpplexer/cpp_lex_interface_generator.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/cpp_lex_interface_generator.hpp (original)
+++ branches/release/boost/wave/cpplexer/cpp_lex_interface_generator.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpplexer/cpp_lex_iterator.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/cpp_lex_iterator.hpp (original)
+++ branches/release/boost/wave/cpplexer/cpp_lex_iterator.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpplexer/cpp_lex_token.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/cpp_lex_token.hpp (original)
+++ branches/release/boost/wave/cpplexer/cpp_lex_token.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpplexer/cpplexer_exceptions.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/cpplexer_exceptions.hpp (original)
+++ branches/release/boost/wave/cpplexer/cpplexer_exceptions.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpplexer/detect_include_guards.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/detect_include_guards.hpp (original)
+++ branches/release/boost/wave/cpplexer/detect_include_guards.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -22,7 +22,7 @@
     will work as well). The code allows for any whitespace, newline and single
     '#' tokens before the #if/#ifndef and after the final #endif.
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpplexer/re2clex/aq.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/re2clex/aq.hpp (original)
+++ branches/release/boost/wave/cpplexer/re2clex/aq.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
     http://www.boost.org/
     
     Copyright (c) 2001 Daniel C. Nuffer.
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpplexer/re2clex/cpp_re.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/re2clex/cpp_re.hpp (original)
+++ branches/release/boost/wave/cpplexer/re2clex/cpp_re.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp (original)
+++ branches/release/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -152,6 +152,12 @@
 
     scanner.detect_pp_numbers = boost::wave::need_prefer_pp_numbers(language_);
     scanner.single_line_only = boost::wave::need_single_line(language_);
+
+#if BOOST_WAVE_SUPPORT_CPP0X != 0
+ scanner.act_in_cpp0x_mode = boost::wave::need_cpp0x(language_);
+#else
+ scanner.act_in_cpp0x_mode = false;
+#endif
 }
 
 template <typename IteratorT, typename PositionT, typename TokenT>
@@ -186,6 +192,7 @@
 
     case T_STRINGLIT:
     case T_CHARLIT:
+ case T_RAWSTRINGLIT:
     // test literal characters for validity (throws if invalid chars found)
         value = string_type((char const *)scanner.tok,
             scanner.cur-scanner.tok);
@@ -212,7 +219,7 @@
       }
 #endif
 
- case T_LONGINTLIT: // supported in C99 and long_long mode
+ case T_LONGINTLIT: // supported in C++0x, C99 and long_long mode
         value = string_type((char const *)scanner.tok,
             scanner.cur-scanner.tok);
         if (!boost::wave::need_long_long(language)) {

Modified: branches/release/boost/wave/cpplexer/re2clex/scanner.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/re2clex/scanner.hpp (original)
+++ branches/release/boost/wave/cpplexer/re2clex/scanner.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
     http://www.boost.org/
 
     Copyright (c) 2001 Daniel C. Nuffer.
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 =============================================================================*/
@@ -57,6 +57,7 @@
     bool detect_pp_numbers; /* lexer should prefer to detect pp-numbers */
     bool enable_import_keyword; /* recognize import as a keyword */
     bool single_line_only; /* don't report missing eol's in C++ comments */
+ bool act_in_cpp0x_mode; /* lexer works in C++0x mode */
 } Scanner;
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: branches/release/boost/wave/cpplexer/token_cache.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/token_cache.hpp (original)
+++ branches/release/boost/wave/cpplexer/token_cache.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/cpplexer/validate_universal_char.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/validate_universal_char.hpp (original)
+++ branches/release/boost/wave/cpplexer/validate_universal_char.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_chlit_grammar.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_chlit_grammar.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_chlit_grammar.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_defined_grammar.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_defined_grammar.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_defined_grammar.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_defined_grammar_gen.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_defined_grammar_gen.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_defined_grammar_gen.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_expression_grammar.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_expression_grammar.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_expression_grammar.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_expression_grammar_gen.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_expression_grammar_gen.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_expression_grammar_gen.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_expression_value.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_expression_value.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_expression_value.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_grammar.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_grammar.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_grammar.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_grammar_gen.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_grammar_gen.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_grammar_gen.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_intlit_grammar.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_intlit_grammar.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_intlit_grammar.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_literal_grammar_gen.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_literal_grammar_gen.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_literal_grammar_gen.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_predef_macros_gen.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_predef_macros_gen.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_predef_macros_gen.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_predef_macros_grammar.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_predef_macros_grammar.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_predef_macros_grammar.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/grammars/cpp_value_error.hpp
==============================================================================
--- branches/release/boost/wave/grammars/cpp_value_error.hpp (original)
+++ branches/release/boost/wave/grammars/cpp_value_error.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/language_support.hpp
==============================================================================
--- branches/release/boost/wave/language_support.hpp (original)
+++ branches/release/boost/wave/language_support.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -34,6 +34,9 @@
     support_option_variadics = 0x04,
     support_c99 = support_option_variadics | support_option_long_long | 0x08,
 #endif
+#if BOOST_WAVE_SUPPORT_CPP0X != 0
+ support_cpp0x = support_option_variadics | support_option_long_long | 0x10,
+#endif
 
     support_option_mask = 0xFF80,
     support_option_insert_whitespace = 0x0080,
@@ -60,6 +63,31 @@
     return (language & ~support_option_mask) == support_cpp;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+//
+// need_cpp0x
+//
+// Extract, if the language to support is C++0x
+//
+///////////////////////////////////////////////////////////////////////////////
+#if BOOST_WAVE_SUPPORT_CPP0X != 0
+
+inline bool
+need_cpp0x(language_support language)
+{
+ return (language & ~support_option_mask) == support_cpp0x;
+}
+
+#else
+
+inline bool
+need_cpp0x(language_support language)
+{
+ return false;
+}
+
+#endif
+
 #if BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS != 0
 ///////////////////////////////////////////////////////////////////////////////
 //

Modified: branches/release/boost/wave/preprocessing_hooks.hpp
==============================================================================
--- branches/release/boost/wave/preprocessing_hooks.hpp (original)
+++ branches/release/boost/wave/preprocessing_hooks.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/token_ids.hpp
==============================================================================
--- branches/release/boost/wave/token_ids.hpp (original)
+++ branches/release/boost/wave/token_ids.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -287,6 +287,19 @@
 // import is needed to be a keyword for the C++ module Standards proposal
     T_IMPORT = TOKEN_FROM_ID(421, KeywordTokenType),
 
+// C++0x keywords
+ T_ALIGNAS = TOKEN_FROM_ID(422, KeywordTokenType),
+ T_ALIGNOF = TOKEN_FROM_ID(423, KeywordTokenType),
+ T_CHAR16_T = TOKEN_FROM_ID(424, KeywordTokenType),
+ T_CHAR32_T = TOKEN_FROM_ID(425, KeywordTokenType),
+ T_CONSTEXPR = TOKEN_FROM_ID(426, KeywordTokenType),
+ T_DECLTYPE = TOKEN_FROM_ID(427, KeywordTokenType),
+ T_NOEXCEPT = TOKEN_FROM_ID(428, KeywordTokenType),
+ T_NULLPTR = TOKEN_FROM_ID(429, KeywordTokenType),
+ T_STATICASSERT = TOKEN_FROM_ID(430, KeywordTokenType),
+ T_THREADLOCAL = TOKEN_FROM_ID(431, KeywordTokenType),
+ T_RAWSTRINGLIT = TOKEN_FROM_ID(432, StringLiteralTokenType),
+
     T_LAST_TOKEN_ID,
     T_LAST_TOKEN = ID_FROM_TOKEN(T_LAST_TOKEN_ID & ~PPTokenFlag),
 

Modified: branches/release/boost/wave/util/cpp_ifblock.hpp
==============================================================================
--- branches/release/boost/wave/util/cpp_ifblock.hpp (original)
+++ branches/release/boost/wave/util/cpp_ifblock.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/util/cpp_include_paths.hpp
==============================================================================
--- branches/release/boost/wave/util/cpp_include_paths.hpp (original)
+++ branches/release/boost/wave/util/cpp_include_paths.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -273,7 +273,7 @@
 {
     namespace fs = boost::filesystem;
     if (path_) {
- fs::path newpath = fs::complete(create_path(path_), current_dir);
+ fs::path newpath = util::complete_path(create_path(path_), current_dir);
 
         if (!fs::exists(newpath) || !fs::is_directory(newpath)) {
         // the given path does not form a name of a valid file system directory
@@ -441,7 +441,7 @@
     namespace fs = boost::filesystem;
     
     fs::path filepath (create_path(path_));
- fs::path filename = fs::complete(filepath, current_dir);
+ fs::path filename = util::complete_path(filepath, current_dir);
     if (fs::exists(filename) && fs::is_directory(filename)) {
         current_rel_dir.clear();
         if (!as_relative_to(filepath, current_dir, current_rel_dir))

Modified: branches/release/boost/wave/util/cpp_iterator.hpp
==============================================================================
--- branches/release/boost/wave/util/cpp_iterator.hpp (original)
+++ branches/release/boost/wave/util/cpp_iterator.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -550,6 +550,13 @@
         ++iter_ctx->emitted_lines;
         break;
 
+#if BOOST_WAVE_SUPPORT_CPP0X != 0
+ case T_RAWSTRINGLIT:
+ iter_ctx->emitted_lines +=
+ context_policies::util::rawstring_count_newlines(act_token);
+ break;
+#endif
+
     case T_CCOMMENT: // will come here only if whitespace is preserved
         iter_ctx->emitted_lines +=
             context_policies::util::ccomment_count_newlines(act_token);
@@ -576,7 +583,7 @@
             pending_queue.pop_front();
         }
         break;
-
+
     case T_EOF:
         seen_newline = true;
         break;
@@ -663,7 +670,7 @@
                 if (!ctx.get_if_block_status()) {
                 // skip this token because of the disabled #if block
                     whitespace.shift_tokens(id); // whitespace controller
- util::call_skipped_token_hook(ctx, act_token);
+ util::impl::call_skipped_token_hook(ctx, act_token);
                     continue;
                 }
                 return act_token;
@@ -695,7 +702,7 @@
                 }
 
             // next token
- util::call_skipped_token_hook(ctx, act_token);
+ util::impl::call_skipped_token_hook(ctx, act_token);
                 ++iter_ctx->first;
             }
 
@@ -875,17 +882,17 @@
         return false;
     }
 
- // call 'skipped_token' preprocessing hook
- template <typename ContextT>
- void call_skipped_token_hook(ContextT& ctx,
- typename ContextT::token_type const& skipped)
- {
-#if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
- ctx.get_hooks().skipped_token(skipped);
-#else
- ctx.get_hooks().skipped_token(ctx.derived(), skipped);
-#endif
- }
+// // call 'skipped_token' preprocessing hook
+// template <typename ContextT>
+// void call_skipped_token_hook(ContextT& ctx,
+// typename ContextT::token_type const& skipped)
+// {
+// #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
+// ctx.get_hooks().skipped_token(skipped);
+// #else
+// ctx.get_hooks().skipped_token(ctx.derived(), skipped);
+// #endif
+// }
 
     template <typename ContextT, typename IteratorT>
     bool next_token_is_pp_directive(ContextT &ctx, IteratorT &it, IteratorT const &end)
@@ -906,7 +913,7 @@
             }
 
             // this token gets skipped
- util::call_skipped_token_hook(ctx, *it);
+ util::impl::call_skipped_token_hook(ctx, *it);
         }
         BOOST_ASSERT(it == end || id != T_UNKNOWN);
         return it != end && IS_CATEGORY(id, PPTokenType);
@@ -921,7 +928,7 @@
 
         // this token gets skipped
         if (call_hook)
- util::call_skipped_token_hook(ctx, *it);
+ util::impl::call_skipped_token_hook(ctx, *it);
 
         for (++it; it != end; ++it) {
         token_id id = token_id(*it);
@@ -930,7 +937,7 @@
                 context_policies::util::ccomment_has_newline(*it))
             {
                 if (call_hook)
- util::call_skipped_token_hook(ctx, *it);
+ util::impl::call_skipped_token_hook(ctx, *it);
                 ++it; // skip eol/C/C++ comment
                 return true; // no more significant tokens on this line
             }
@@ -940,7 +947,7 @@
 
             // this token gets skipped
             if (call_hook)
- util::call_skipped_token_hook(ctx, *it);
+ util::impl::call_skipped_token_hook(ctx, *it);
         }
         return false;
     }
@@ -959,13 +966,13 @@
                 context_policies::util::ccomment_has_newline(*it))
             {
                 // always call hook for eol
- util::call_skipped_token_hook(ctx, *it);
+ util::impl::call_skipped_token_hook(ctx, *it);
                 ++it; // skip eol/C/C++ comment
                 return true; // found eol
             }
 
             if (call_hook)
- util::call_skipped_token_hook(ctx, *it);
+ util::impl::call_skipped_token_hook(ctx, *it);
         }
         return false;
     }
@@ -979,7 +986,7 @@
         while (IS_CATEGORY(*it, WhiteSpaceTokenType)) {
             typename ContainerT::iterator save = it++;
             if (call_hook)
- util::call_skipped_token_hook(ctx, *save);
+ util::impl::call_skipped_token_hook(ctx, *save);
             c.erase(save);
         }
     }
@@ -1135,7 +1142,7 @@
             }
         }
         else {
- util::call_skipped_token_hook(ctx, *it);
+ util::impl::call_skipped_token_hook(ctx, *it);
             ++it;
         }
     }

Modified: branches/release/boost/wave/util/cpp_macromap.hpp
==============================================================================
--- branches/release/boost/wave/util/cpp_macromap.hpp (original)
+++ branches/release/boost/wave/util/cpp_macromap.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -574,7 +574,7 @@
 // return the next one from there
     if (!pending.empty()) {
     on_exit::pop_front<definition_container_type> pop_front_token(pending);
-
+
         return act_token = pending.front();
     }
 
@@ -582,20 +582,20 @@
 // T_IDENTIFIER token, try to replace this as a macro etc.
     using namespace boost::wave;
     typedef unput_queue_iterator<IteratorT, token_type, ContainerT> iterator_type;
-
+
     if (first != last) {
     token_id id = token_id(*first);
 
     // ignore placeholder tokens
         if (T_PLACEHOLDER == id) {
         token_type placeholder = *first;
-
+
             ++first;
             if (first == last)
                 return act_token = placeholder;
             id = token_id(*first);
         }
-
+
         if (T_IDENTIFIER == id || IS_CATEGORY(id, KeywordTokenType) ||
             IS_EXTCATEGORY(id, OperatorTokenType|AltExtTokenType) ||
             IS_CATEGORY(id, BoolLiteralTokenType))
@@ -610,7 +610,7 @@
             {
             // in C99 mode only: resolve the operator _Pragma
             token_type curr_token = *first;
-
+
                 if (!resolve_operator_pragma(first, last, pending, seen_newline) ||
                     pending.size() > 0)
                 {
@@ -620,7 +620,7 @@
 
                     return act_token = pending.front();
                 }
-
+
             // the operator _Pragma() was eaten completely, continue
                 return act_token = token_type(T_PLACEHOLDER, "_",
                     curr_token.get_position());
@@ -628,7 +628,7 @@
 
         token_type name_token (*first);
         typename defined_macros_type::iterator it;
-
+
             if (is_defined(name_token.get_value(), it)) {
             // the current token contains an identifier, which is currently
             // defined as a macro
@@ -640,12 +640,12 @@
                     if (first != last) {
                     // splice the last token back into the input queue
                     typename ContainerT::reverse_iterator rit = pending.rbegin();
-
+
                         first.get_unput_queue().splice(
                             first.get_unput_queue().begin(), pending,
                             (++rit).base(), pending.end());
                     }
-
+
                 // fall through ...
                 }
                 else if (!pending.empty()) {
@@ -719,7 +719,7 @@
     using namespace boost::wave;
 
     arguments.push_back(ContainerT());
-
+
 // collect the actual arguments
 typename std::vector<ContainerT>::size_type count_arguments = 0;
 int nested_parenthesis_level = 1;
@@ -740,14 +740,14 @@
                 main_pos);
             return 0;
         }
-
+
         switch (static_cast<unsigned int>(id)) {
         case T_LEFTPAREN:
             ++nested_parenthesis_level;
             argument->push_back(*next);
             was_whitespace = false;
             break;
-
+
         case T_RIGHTPAREN:
             {
                 if (--nested_parenthesis_level >= 1)
@@ -779,7 +779,7 @@
                 was_whitespace = false;
             }
             break;
-
+
         case T_COMMA:
             if (1 == nested_parenthesis_level) {
             // next parameter
@@ -822,7 +822,7 @@
 
         case T_PLACEHOLDER:
             break; // ignore placeholder
-
+
         default:
             argument->push_back(*next);
             was_whitespace = false;
@@ -844,7 +844,7 @@
         arguments.clear();
     }
     return count_arguments;
-}
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -902,17 +902,17 @@
     // expand the argument only once
         typedef typename std::vector<ContainerT>::value_type::iterator
             argument_iterator_type;
-
+
         argument_iterator_type begin_it = arguments[arg].begin();
         argument_iterator_type end_it = arguments[arg].end();
-
+
         expand_whole_tokensequence(expanded_args[arg], begin_it, end_it,
             expand_operator_defined);
         impl::remove_placeholders(expanded_args[arg]);
         has_expanded_args[arg] = true;
     }
 }
-
+
 ///////////////////////////////////////////////////////////////////////////////
 //
 // expand_replacement_list
@@ -992,7 +992,7 @@
                 position_type const &pos = (*cit).get_position();
 
                     BOOST_ASSERT(boost::wave::need_variadics(ctx.get_language()));
-
+
                 // ensure all variadic arguments to be expanded
                     for (typename vector<ContainerT>::size_type arg = i;
                          arg < expanded_args.size(); ++arg)
@@ -1008,7 +1008,7 @@
                 // ensure argument i to be expanded
                     expand_argument(i, arguments, expanded_args,
                         expand_operator_defined, has_expanded_args);
-
+
                 // replace argument
                 ContainerT const &arg = expanded_args[i];
                 
@@ -1021,7 +1021,7 @@
             {
             // stringize the current argument
                 BOOST_ASSERT(!arguments[i].empty());
-
+
             // safe a copy of the first tokens position (not a reference!)
             position_type pos ((*arguments[i].begin()).get_position());
 
@@ -1075,7 +1075,7 @@
             "stringize ('#')", main_pos);
         return;
     }
-
+
 // handle the cpp.concat operator
     if (seen_concat)
         concat_tokensequence(expanded);
@@ -1103,12 +1103,12 @@
         if (boost::wave::need_variadics(ctx.get_language())) {
         typename ContainerT::iterator end = replacement_list.end();
         typename ContainerT::iterator it = replacement_list.begin();
-
+
             while (it != end) {
                 using namespace boost::wave;
                 if (T_PLACEMARKER == token_id(*it)) {
                 typename ContainerT::iterator placemarker = it;
-
+
                     ++it;
                     replacement_list.erase(placemarker);
                 }
@@ -1124,14 +1124,14 @@
     on_exit::reset<bool> on_exit(macro_def.is_available_for_replacement, false);
     typename ContainerT::iterator begin_it = replacement_list.begin();
     typename ContainerT::iterator end_it = replacement_list.end();
-
+
         expand_whole_tokensequence(expanded, begin_it, end_it,
             expand_operator_defined);
-
+
     // trim replacement list, leave placeholder tokens untouched
         impl::trim_replacement_list(expanded);
     }
-
+
     if (expanded.empty()) {
     // the resulting replacement list should contain at least a placeholder
     // token
@@ -1158,9 +1158,9 @@
     defined_macros_type *scope, ContainerT *queue_symbol)
 {
     using namespace boost::wave;
-
+
     if (0 == scope) scope = current_macros;
-
+
     BOOST_ASSERT(T_IDENTIFIER == token_id(curr_token) ||
         IS_CATEGORY(token_id(curr_token), KeywordTokenType) ||
         IS_EXTCATEGORY(token_id(curr_token), OperatorTokenType|AltExtTokenType) ||
@@ -1172,7 +1172,7 @@
     // try to expand a predefined macro (__FILE__, __LINE__ or __INCLUDE_LEVEL__)
         if (expand_predefined_macro(curr_token, expanded))
             return false;
-
+
     // not defined as a macro
         if (0 != queue_symbol) {
             expanded.splice(expanded.end(), *queue_symbol);
@@ -1210,8 +1210,8 @@
 
     if (T_LEFTPAREN == impl::next_token<IteratorT>::peek(first, last)) {
     // called as a function-like macro
- impl::skip_to_token(first, last, T_LEFTPAREN, seen_newline);
-
+ impl::skip_to_token(ctx, first, last, T_LEFTPAREN, seen_newline);
+
 #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS == 0
         IteratorT seqstart = first;
         IteratorT seqend = first;
@@ -1219,7 +1219,7 @@
 
         if (macro_def.is_functionlike) {
         // defined as a function-like macro
-
+
         // collect the arguments
         std::vector<ContainerT> arguments;
 #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
@@ -1250,7 +1250,7 @@
                 }
                 return false;
             }
-
+
             if (count_args > macro_def.macroparameters.size() ||
                 arguments.size() > macro_def.macroparameters.size())
             {
@@ -1265,7 +1265,7 @@
                     return false;
                 }
             }
-
+
         // inject tracing support
 #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
             ctx.get_hooks().expanding_function_like_macro(
@@ -1300,19 +1300,18 @@
             {
                 // do not expand this macro, just copy the whole sequence
                 expanded.push_back(curr_token);
- ++first; // skip macro name
                 return false; // no further preprocessing required
             }
 #endif
 
         bool found = false;
         impl::find_concat_operator concat_tag(found);
-
+
             std::remove_copy_if(macro_def.macrodefinition.begin(),
                 macro_def.macrodefinition.end(),
                 std::inserter(replacement_list, replacement_list.end()),
                 concat_tag);
-
+
         // handle concatenation operators
             if (found && !concat_tokensequence(replacement_list))
                 return false;
@@ -1350,7 +1349,7 @@
 
         bool found = false;
         impl::find_concat_operator concat_tag(found);
-
+
             std::remove_copy_if(macro_def.macrodefinition.begin(),
                 macro_def.macrodefinition.end(),
                 std::inserter(replacement_list, replacement_list.end()),
@@ -1372,10 +1371,10 @@
 #else
     ctx.get_hooks().expanded_macro(ctx.derived(), replacement_list);
 #endif
-
+
     rescan_replacement_list(curr_token, macro_def, replacement_list,
         expanded_list, expand_operator_defined, first, last);
-
+
 #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
     ctx.get_hooks().rescanned_macro(expanded_list);
 #else
@@ -1503,7 +1502,7 @@
 // isolate the parameter of the operator _Pragma
     token_type pragma_token = *first;
     
- if (!impl::skip_to_token(first, last, T_LEFTPAREN, seen_newline)) {
+ if (!impl::skip_to_token(ctx, first, last, T_LEFTPAREN, seen_newline)) {
     // illformed operator _Pragma
         BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, ill_formed_expression,
             "operator _Pragma()", pragma_token.get_position());
@@ -1845,20 +1844,33 @@
     else
 #endif
     {
- // define C++ specifics
- for (int i = 0; 0 != predef.static_data_cpp(i).name; ++i) {
- predefined_macros::static_macros const& m = predef.static_data_cpp(i);
- predefine_macro(current_scope, m.name,
- token_type(m.token_id, m.value, pos));
+#if BOOST_WAVE_SUPPORT_CPP0X != 0
+ if (boost::wave::need_cpp0x(ctx.get_language())) {
+ // define C++0x specifics
+ for (int i = 0; 0 != predef.static_data_cpp0x(i).name; ++i) {
+ predefined_macros::static_macros const& m = predef.static_data_cpp0x(i);
+ predefine_macro(current_scope, m.name,
+ token_type(m.token_id, m.value, pos));
+ }
         }
+ else
+#endif
+ {
+ // define C++ specifics
+ for (int i = 0; 0 != predef.static_data_cpp(i).name; ++i) {
+ predefined_macros::static_macros const& m = predef.static_data_cpp(i);
+ predefine_macro(current_scope, m.name,
+ token_type(m.token_id, m.value, pos));
+ }
 
 #if BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS != 0
- // define __WAVE_HAS_VARIADICS__, if appropriate
- if (boost::wave::need_variadics(ctx.get_language())) {
- predefine_macro(current_scope, "__WAVE_HAS_VARIADICS__",
- token_type(T_INTLIT, "1", pos));
- }
+ // define __WAVE_HAS_VARIADICS__, if appropriate
+ if (boost::wave::need_variadics(ctx.get_language())) {
+ predefine_macro(current_scope, "__WAVE_HAS_VARIADICS__",
+ token_type(T_INTLIT, "1", pos));
+ }
 #endif
+ }
     }
 
 // predefine the __BASE_FILE__ macro which contains the main file name

Modified: branches/release/boost/wave/util/cpp_macromap_predef.hpp
==============================================================================
--- branches/release/boost/wave/util/cpp_macromap_predef.hpp (original)
+++ branches/release/boost/wave/util/cpp_macromap_predef.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -75,9 +75,9 @@
                 "Jan", "Feb", "Mar", "Apr", "May", "Jun",
                 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
             };
-
+
         // for some systems sprintf, time_t etc. is in namespace std
- using namespace std;
+ using namespace std;
 
         time_t tt = time(0);
         struct tm *tb = 0;
@@ -98,7 +98,7 @@
         void reset_timestr()
         {
         // for some systems sprintf, time_t etc. is in namespace std
- using namespace std;
+ using namespace std;
 
         time_t tt = time(0);
         struct tm *tb = 0;
@@ -119,9 +119,9 @@
         void reset_version()
         {
         char buffer[sizeof("0x00000000")+1];
-
+
         // for some systems sprintf, time_t etc. is in namespace std
- using namespace std;
+ using namespace std;
 
         // calculate the number of days since Dec 13 2001
         // (the day the Wave project was started)
@@ -140,13 +140,13 @@
                  seconds/(3600*24));
             version_ = buffer;
         }
-
+
         void reset_versionstr()
         {
         char buffer[sizeof("\"00.00.00.0000 \"")+sizeof(BOOST_PLATFORM)+sizeof(BOOST_COMPILER)+4];
 
         // for some systems sprintf, time_t etc. is in namespace std
- using namespace std;
+ using namespace std;
 
         // calculate the number of days since Dec 13 2001
         // (the day the Wave project was started)
@@ -164,11 +164,11 @@
                  seconds/(3600*24), BOOST_PLATFORM, BOOST_COMPILER);
             versionstr_ = buffer;
         }
-
+
     // dynamic predefined macros
         string_type get_date() const { return datestr_; } // __DATE__
         string_type get_time() const { return timestr_; } // __TIME__
-
+
     // __SPIRIT_PP__/__WAVE__
         string_type get_version() const
         {
@@ -179,7 +179,7 @@
                 BOOST_WAVE_VERSION_MINOR, BOOST_WAVE_VERSION_SUBMINOR);
             return buffer;
         }
-
+
     // __WAVE_CONFIG__
         string_type get_config() const
         {
@@ -189,7 +189,7 @@
             sprintf(buffer, "0x%08x", BOOST_WAVE_CONFIG);
             return buffer;
         }
-
+
     public:
         predefined_macros()
           : compilation_time_(__DATE__ " " __TIME__)
@@ -198,19 +198,19 @@
             reset_version();
             reset_versionstr();
         }
-
+
         void reset()
         {
             reset_datestr();
             reset_timestr();
         }
-
+
     // __SPIRIT_PP_VERSION__/__WAVE_VERSION__
         string_type get_fullversion() const { return version_; }
-
+
     // __SPIRIT_PP_VERSION_STR__/__WAVE_VERSION_STR__
         string_type get_versionstr() const { return versionstr_; }
-
+
     // C++ mode
         static_macros const& static_data_cpp(std::size_t i) const
         {
@@ -222,7 +222,24 @@
             BOOST_ASSERT(i < sizeof(data)/sizeof(data[0]));
             return data[i];
         }
-
+
+#if BOOST_WAVE_SUPPORT_CPP0X != 0
+ // C++0x mode
+ static_macros const& static_data_cpp0x(std::size_t i) const
+ {
+ static static_macros data[] = {
+ { "__STDC__", T_INTLIT, "1" },
+ { "__cplusplus", T_INTLIT, "201101L" },
+ { "__STDC_VERSION__", T_INTLIT, "199901L" },
+ { "__STDC_HOSTED__", T_INTLIT, "0" },
+ { "__WAVE_HAS_VARIADICS__", T_INTLIT, "1" },
+ { 0, T_EOF, 0 }
+ };
+ BOOST_ASSERT(i < sizeof(data)/sizeof(data[0]));
+ return data[i];
+ }
+#endif
+
 #if BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS != 0
     // C99 mode
         static_macros const& static_data_c99(std::size_t i) const
@@ -256,7 +273,6 @@
             BOOST_ASSERT(i < sizeof(data)/sizeof(data[0]));
             return data[i];
         }
-
     }; // predefined_macros
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: branches/release/boost/wave/util/cpp_macromap_utils.hpp
==============================================================================
--- branches/release/boost/wave/util/cpp_macromap_utils.hpp (original)
+++ branches/release/boost/wave/util/cpp_macromap_utils.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -427,18 +427,33 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// call 'skipped_token' preprocessing hook
+template <typename ContextT>
+void call_skipped_token_hook(ContextT& ctx,
+ typename ContextT::token_type const& skipped)
+{
+#if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
+ ctx.get_hooks().skipped_token(skipped);
+#else
+ ctx.get_hooks().skipped_token(ctx.derived(), skipped);
+#endif
+}
+
+///////////////////////////////////////////////////////////////////////////////
 //
 // Skip forward to a given token
 //
 ///////////////////////////////////////////////////////////////////////////////
-template <typename IteratorT>
+template <typename ContextT, typename IteratorT>
 inline bool
-skip_to_token(IteratorT &it, IteratorT const &end, token_id id,
- bool& seen_newline)
+skip_to_token(ContextT& ctx, IteratorT &it, IteratorT const &end,
+ token_id id, bool& seen_newline)
 {
     using namespace boost::wave;
     if (token_id(*it) == id)
         return true;
+
+// call_skipped_token_hook(ctx, *it);
     if (++it == end)
         return false;
 
@@ -447,6 +462,8 @@
     {
         if (T_NEWLINE == token_id(*it))
             seen_newline = true;
+
+// call_skipped_token_hook(ctx, *it);
         if (++it == end)
             return false;
     }
@@ -542,19 +559,6 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// call 'skipped_token' preprocessing hook
-template <typename ContextT>
-void call_skipped_token_hook(ContextT& ctx,
- typename ContextT::token_type const& skipped)
-{
-#if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
- ctx.get_hooks().skipped_token(skipped);
-#else
- ctx.get_hooks().skipped_token(ctx.derived(), skipped);
-#endif
-}
-
-///////////////////////////////////////////////////////////////////////////////
 } // namespace util
 } // namespace wave
 } // namespace boost

Modified: branches/release/boost/wave/util/file_position.hpp
==============================================================================
--- branches/release/boost/wave/util/file_position.hpp (original)
+++ branches/release/boost/wave/util/file_position.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -82,8 +82,8 @@
     file_position()
     : file(), line(1), column(1)
     {}
- explicit file_position(string_type const& file_, unsigned int line_ = 1,
- unsigned int column_ = 1)
+ explicit file_position(string_type const& file_, std::size_t line_ = 1,
+ std::size_t column_ = 1)
     : file(file_), line(line_), column(column_)
     {
         BOOST_ASSERT(!debug::is_escaped_lit(file));
@@ -91,16 +91,16 @@
 
 // accessors
     string_type const &get_file() const { return file; }
- unsigned int get_line() const { return line; }
- unsigned int get_column() const { return column; }
+ std::size_t get_line() const { return line; }
+ std::size_t get_column() const { return column; }
 
     void set_file(string_type const &file_)
     {
         file = file_;
         BOOST_ASSERT(!debug::is_escaped_lit(file));
     }
- void set_line(unsigned int line_) { line = line_; }
- void set_column(unsigned int column_) { column = column_; }
+ void set_line(std::size_t line_) { line = line_; }
+ void set_column(std::size_t column_) { column = column_; }
 
 private:
 #if BOOST_WAVE_SERIALIZATION != 0
@@ -116,8 +116,8 @@
 #endif
 
     string_type file;
- unsigned int line;
- unsigned int column;
+ std::size_t line;
+ std::size_t column;
 };
 
 template <typename StringT>

Modified: branches/release/boost/wave/util/filesystem_compatibility.hpp
==============================================================================
--- branches/release/boost/wave/util/filesystem_compatibility.hpp (original)
+++ branches/release/boost/wave/util/filesystem_compatibility.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -13,6 +13,7 @@
 
 #include <string>
 
+#include <boost/version.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
 
@@ -35,12 +36,20 @@
     template <typename String>
     inline boost::filesystem::path create_path(String const& p)
     {
+#if BOOST_FILESYSTEM_VERSION >= 3
+ return boost::filesystem::path(p);
+#else
         return boost::filesystem::path(p, boost::filesystem::native);
+#endif
     }
 
     inline std::string leaf(boost::filesystem::path const& p)
     {
+#if BOOST_FILESYSTEM_VERSION >= 3
+ return p.leaf().string();
+#else
         return p.leaf();
+#endif
     }
 
     inline boost::filesystem::path branch_path(boost::filesystem::path const& p)
@@ -55,19 +64,52 @@
 
     inline std::string native_file_string(boost::filesystem::path const& p)
     {
+#if BOOST_FILESYSTEM_VERSION >= 3
+ return p.string();
+#else
         return p.native_file_string();
+#endif
+ }
+
+ inline boost::filesystem::path complete_path(
+ boost::filesystem::path const& p)
+ {
+#if BOOST_FILESYSTEM_VERSION >= 3
+ return boost::filesystem3::complete(p, initial_path());
+#else
+ return boost::filesystem::complete(p, initial_path());
+#endif
     }
 
+ inline boost::filesystem::path complete_path(
+ boost::filesystem::path const& p, boost::filesystem::path const& base)
+ {
+#if BOOST_FILESYSTEM_VERSION >= 3
+ return boost::filesystem3::complete(p, base);
 #else
+ return boost::filesystem::complete(p, base);
+#endif
+ }
+
+#else
+
 // interface wrappers if deprecated functions do not exist
     inline boost::filesystem::path initial_path()
     {
+#if BOOST_FILESYSTEM_VERSION >= 3
+ return boost::filesystem3::detail::initial_path();
+#else
         return boost::filesystem::initial_path<boost::filesystem::path>();
+#endif
     }
 
     inline boost::filesystem::path current_path()
     {
+#if BOOST_FILESYSTEM_VERSION >= 3
+ return boost::filesystem3::current_path();
+#else
         return boost::filesystem::current_path<boost::filesystem::path>();
+#endif
     }
 
     template <typename String>
@@ -78,7 +120,11 @@
 
     inline std::string leaf(boost::filesystem::path const& p)
     {
+#if BOOST_VERSION >= 104600 && BOOST_FILESYSTEM_VERSION >= 3
+ return p.filename().string();
+#else
         return p.filename();
+#endif
     }
 
     inline boost::filesystem::path branch_path(boost::filesystem::path const& p)
@@ -93,9 +139,32 @@
 
     inline std::string native_file_string(boost::filesystem::path const& p)
     {
+#if BOOST_VERSION >= 104600
+ return p.string();
+#else
         return p.file_string();
+#endif
     }
 
+ inline boost::filesystem::path complete_path(
+ boost::filesystem::path const& p)
+ {
+#if BOOST_VERSION >= 104600 && BOOST_FILESYSTEM_VERSION >= 3
+ return boost::filesystem::absolute(p, initial_path());
+#else
+ return boost::filesystem::complete(p, initial_path());
+#endif
+ }
+
+ inline boost::filesystem::path complete_path(
+ boost::filesystem::path const& p, boost::filesystem::path const& base)
+ {
+#if BOOST_VERSION >= 104600 && BOOST_FILESYSTEM_VERSION >= 3
+ return boost::filesystem::absolute(p, base);
+#else
+ return boost::filesystem::complete(p, base);
+#endif
+ }
 #endif
 
 }}}

Modified: branches/release/boost/wave/util/flex_string.hpp
==============================================================================
--- branches/release/boost/wave/util/flex_string.hpp (original)
+++ branches/release/boost/wave/util/flex_string.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -102,7 +102,13 @@
 #include <functional>
 #include <limits>
 #include <stdexcept>
-#include <iosfwd>
+
+#if defined(__PATHSCALE__)
+ #include <ios>
+#else
+ #include <iosfwd>
+#endif
+
 #include <cstddef>
 #include <cstring>
 #include <cstdlib>
@@ -1818,7 +1824,7 @@
 #ifndef NDEBUG
         Invariant checker(*this);
 #endif
- assert(begin() <= p && p <= end());
+ BOOST_ASSERT(begin() <= p && p <= end());
         const size_type insertOffset(p - begin());
         const size_type originalSize(size());
         if(n < originalSize - insertOffset)
@@ -1884,16 +1890,16 @@
         const typename std::iterator_traits<FwdIterator>::difference_type n2 =
             std::distance(s1, s2);
 
- assert(n2 >= 0);
+ BOOST_ASSERT(n2 >= 0);
         using namespace flex_string_details;
- assert(pos <= size());
+ BOOST_ASSERT(pos <= size());
 
         const typename std::iterator_traits<FwdIterator>::difference_type maxn2 =
             capacity() - size();
         if (maxn2 < n2)
         {
             // Reallocate the string.
- assert(!IsAliasedRange(s1, s2));
+ BOOST_ASSERT(!IsAliasedRange(s1, s2));
             reserve(size() + n2);
             i = begin() + pos;
         }
@@ -1910,7 +1916,7 @@
             FwdIterator t = s1;
             const size_type old_size = size();
             std::advance(t, old_size - pos);
- assert(std::distance(t, s2) >= 0);
+ BOOST_ASSERT(std::distance(t, s2) >= 0);
             Storage::append(t, s2);
             Storage::append(data() + pos, data() + old_size);
             std::copy(s1, t, i);
@@ -2011,9 +2017,9 @@
     flex_string& ReplaceImplDiscr(iterator i1, iterator i2,
         const value_type* s, size_type n, Selector<2>)
     {
- assert(i1 <= i2);
- assert(begin() <= i1 && i1 <= end());
- assert(begin() <= i2 && i2 <= end());
+ BOOST_ASSERT(i1 <= i2);
+ BOOST_ASSERT(begin() <= i1 && i1 <= end());
+ BOOST_ASSERT(begin() <= i2 && i2 <= end());
         return replace(i1, i2, s, s + n);
     }
     
@@ -2052,10 +2058,10 @@
 #endif
         const typename std::iterator_traits<iterator>::difference_type n1 =
             i2 - i1;
- assert(n1 >= 0);
+ BOOST_ASSERT(n1 >= 0);
         const typename std::iterator_traits<FwdIterator>::difference_type n2 =
         std::distance(s1, s2);
- assert(n2 >= 0);
+ BOOST_ASSERT(n2 >= 0);
 
         if (IsAliasedRange(s1, s2))
         {

Modified: branches/release/boost/wave/util/functor_input.hpp
==============================================================================
--- branches/release/boost/wave/util/functor_input.hpp (original)
+++ branches/release/boost/wave/util/functor_input.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/util/insert_whitespace_detection.hpp
==============================================================================
--- branches/release/boost/wave/util/insert_whitespace_detection.hpp (original)
+++ branches/release/boost/wave/util/insert_whitespace_detection.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/util/interpret_pragma.hpp
==============================================================================
--- branches/release/boost/wave/util/interpret_pragma.hpp (original)
+++ branches/release/boost/wave/util/interpret_pragma.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/util/iteration_context.hpp
==============================================================================
--- branches/release/boost/wave/util/iteration_context.hpp (original)
+++ branches/release/boost/wave/util/iteration_context.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/util/macro_definition.hpp
==============================================================================
--- branches/release/boost/wave/util/macro_definition.hpp (original)
+++ branches/release/boost/wave/util/macro_definition.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/util/macro_helpers.hpp
==============================================================================
--- branches/release/boost/wave/util/macro_helpers.hpp (original)
+++ branches/release/boost/wave/util/macro_helpers.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/util/pattern_parser.hpp
==============================================================================
--- branches/release/boost/wave/util/pattern_parser.hpp (original)
+++ branches/release/boost/wave/util/pattern_parser.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/util/symbol_table.hpp
==============================================================================
--- branches/release/boost/wave/util/symbol_table.hpp (original)
+++ branches/release/boost/wave/util/symbol_table.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/util/time_conversion_helper.hpp
==============================================================================
--- branches/release/boost/wave/util/time_conversion_helper.hpp (original)
+++ branches/release/boost/wave/util/time_conversion_helper.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/util/transform_iterator.hpp
==============================================================================
--- branches/release/boost/wave/util/transform_iterator.hpp (original)
+++ branches/release/boost/wave/util/transform_iterator.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/util/unput_queue_iterator.hpp
==============================================================================
--- branches/release/boost/wave/util/unput_queue_iterator.hpp (original)
+++ branches/release/boost/wave/util/unput_queue_iterator.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/wave_config.hpp
==============================================================================
--- branches/release/boost/wave/wave_config.hpp (original)
+++ branches/release/boost/wave/wave_config.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -83,6 +83,18 @@
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
+// Decide, whether to support C++0x
+//
+// To implement C++0x keywords and preprocessor semantics define the following
+// to something not equal to zero.
+//
+#if !defined(BOOST_WAVE_SUPPORT_CPP0X)
+#define BOOST_WAVE_SUPPORT_CPP0X 1
+#undef BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS
+#define BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS 1
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
 // Undefine the following, to enable some MS specific language extensions:
 // __int8, __int16, __int32, __int64, __based, __declspec, __cdecl,
 // __fastcall, __stdcall, __try, __except, __finally, __leave, __inline,

Modified: branches/release/boost/wave/wave_config_constant.hpp
==============================================================================
--- branches/release/boost/wave/wave_config_constant.hpp (original)
+++ branches/release/boost/wave/wave_config_constant.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/boost/wave/wave_version.hpp
==============================================================================
--- branches/release/boost/wave/wave_version.hpp (original)
+++ branches/release/boost/wave/wave_version.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -16,11 +16,11 @@
 // BOOST_WAVE_VERSION & 0x0000FF is the sub-minor version
 // BOOST_WAVE_VERSION & 0x00FF00 is the minor version
 // BOOST_WAVE_VERSION & 0xFF0000 is the major version
-#define BOOST_WAVE_VERSION 0x020100
+#define BOOST_WAVE_VERSION 0x020200
 
 // The following defines contain the same information as above
 #define BOOST_WAVE_VERSION_MAJOR 2
-#define BOOST_WAVE_VERSION_MINOR 1
+#define BOOST_WAVE_VERSION_MINOR 2
 #define BOOST_WAVE_VERSION_SUBMINOR 0
 
 #endif // !defined(WAVE_VERSION_H_9D79ABDB_AC54_4C0A_89B1_F70A2DCFE21E_INCLUDED)

Modified: branches/release/boost/wave/whitespace_handling.hpp
==============================================================================
--- branches/release/boost/wave/whitespace_handling.hpp (original)
+++ branches/release/boost/wave/whitespace_handling.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     http://www.boost.org/
 
     Copyright (c) 2003 Paul Mensonides
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 =============================================================================*/
@@ -64,6 +64,28 @@
         }
         return newlines;
     }
+
+#if BOOST_WAVE_SUPPORT_CPP0X != 0
+ ///////////////////////////////////////////////////////////////////////////
+ // This function returns the number of newlines in the given C++0x style
+ // raw string
+ template <typename TokenT>
+ int rawstring_count_newlines(TokenT const& token)
+ {
+ using namespace boost::wave;
+ int newlines = 0;
+ if (T_RAWSTRINGLIT == token_id(token)) {
+ typename TokenT::string_type const& value = token.get_value();
+ typename TokenT::string_type::size_type p = value.find_first_of("\n");
+
+ while (TokenT::string_type::npos != p) {
+ ++newlines;
+ p = value.find_first_of("\n", p+1);
+ }
+ }
+ return newlines;
+ }
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -77,6 +99,10 @@
     template <typename ContextT>
     bool may_skip_whitespace(ContextT const& ctx, TokenT &token,
         bool &skipped_newline);
+ template <typename ContextT>
+ bool may_skip_whitespace(ContextT const& ctx, TokenT &token,
+ bool preserve_comments_, bool preserve_bol_whitespace_,
+ bool &skipped_newline);
 
 protected:
     bool skip_cppcomment(boost::wave::token_id id)
@@ -87,14 +113,16 @@
 private:
     typedef bool state_t(TokenT &token, bool &skipped_newline);
     state_t eat_whitespace::* state;
- state_t general, newline, newline_2nd, whitespace;
+ state_t general, newline, newline_2nd, whitespace, bol_whitespace;
     bool preserve_comments;
+ bool preserve_bol_whitespace;
 };
 
 template <typename TokenT>
 inline
 eat_whitespace<TokenT>::eat_whitespace()
-: state(&eat_whitespace::newline), preserve_comments(false)
+: state(&eat_whitespace::newline), preserve_comments(false),
+ preserve_bol_whitespace(false)
 {
 }
 
@@ -110,6 +138,19 @@
 }
 
 template <typename TokenT>
+template <typename ContextT>
+inline bool
+eat_whitespace<TokenT>::may_skip_whitespace(ContextT const& ctx, TokenT &token,
+ bool preserve_comments_, bool preserve_bol_whitespace_,
+ bool &skipped_newline)
+{
+ // re-initialize the preserve comments state
+ preserve_comments = preserve_comments_;
+ preserve_bol_whitespace = preserve_bol_whitespace_;
+ return (this->*state)(token, skipped_newline);
+}
+
+template <typename TokenT>
 inline bool
 eat_whitespace<TokenT>::general(TokenT &token, bool &skipped_newline)
 {
@@ -142,16 +183,16 @@
 eat_whitespace<TokenT>::newline(TokenT &token, bool &skipped_newline)
 {
     using namespace boost::wave;
-
+
     token_id id = token_id(token);
     if (T_NEWLINE == id || T_CPPCOMMENT == id) {
         skipped_newline = true;
         state = &eat_whitespace::newline_2nd;
         return T_NEWLINE == id || skip_cppcomment(id);
     }
- else if (T_SPACE != id && T_SPACE2 != id && T_CCOMMENT != id) {
+
+ if (T_SPACE != id && T_SPACE2 != id && T_CCOMMENT != id)
         return general(token, skipped_newline);
- }
 
     if (T_CCOMMENT == id) {
         if (util::ccomment_has_newline(token)) {
@@ -162,8 +203,14 @@
             state = &eat_whitespace::general;
             return false;
         }
- // fall through...
+ return true;
+ }
+
+ if (preserve_bol_whitespace) {
+ state = &eat_whitespace::bol_whitespace;
+ return false;
     }
+
     return true;
 }
 
@@ -174,8 +221,14 @@
     using namespace boost::wave;
 
     token_id id = token_id(token);
- if (T_SPACE == id || T_SPACE2 == id)
+ if (T_SPACE == id || T_SPACE2 == id) {
+ if (preserve_bol_whitespace) {
+ state = &eat_whitespace::bol_whitespace;
+ return false;
+ }
         return true;
+ }
+
     if (T_CCOMMENT == id) {
         if (util::ccomment_has_newline(token))
             skipped_newline = true;
@@ -186,6 +239,7 @@
         }
         return true;
     }
+
     if (T_NEWLINE != id && T_CPPCOMMENT != id)
         return general(token, skipped_newline);
 
@@ -195,6 +249,19 @@
 
 template <typename TokenT>
 inline bool
+eat_whitespace<TokenT>::bol_whitespace(TokenT &token, bool &skipped_newline)
+{
+ using namespace boost::wave;
+
+ token_id id = token_id(token);
+ if (T_SPACE == id || T_SPACE2 == id)
+ return !preserve_bol_whitespace;
+
+ return general(token, skipped_newline);
+}
+
+template <typename TokenT>
+inline bool
 eat_whitespace<TokenT>::whitespace(TokenT &token, bool &skipped_newline)
 {
     using namespace boost::wave;

Modified: branches/release/doc/Jamfile.v2
==============================================================================
--- branches/release/doc/Jamfile.v2 (original)
+++ branches/release/doc/Jamfile.v2 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -50,6 +50,7 @@
     <dependency>../libs/thread/doc//thread
     <dependency>../libs/signals2/doc//hello_world_def_code_snippet.xml
     <dependency>../libs/random/doc//random
+ <dependency>../libs/spirit/doc//spirit
 
     ## Add path references to the QuickBook generated docs...
 
@@ -73,6 +74,7 @@
     <implicit-dependency>../libs/thread/doc//thread
     <implicit-dependency>../libs/signals2/doc//hello_world_def_code_snippet.xml
     <implicit-dependency>../libs/random/doc//random
+ <implicit-dependency>../libs/spirit/doc//spirit
 
     <xsl:param>boost.libraries=../../libs/libraries.htm
 

Modified: branches/release/libs/wave/ChangeLog
==============================================================================
--- branches/release/libs/wave/ChangeLog (original)
+++ branches/release/libs/wave/ChangeLog 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -1,7 +1,7 @@
 Boost.Wave: A Standard compliant C++ preprocessor library
 http://www.boost.org/
 
-Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 -------------------------------------------------------------------------------
@@ -20,6 +20,31 @@
 
 CHANGELOG
 
+Boost V1.46.0
+- V2.2.0
+- Added recognition of C++0x keywords to Re2C lexers.
+- Added --c++0x command line option to Wave to enabling the recognition of
+ C++0x keywords, converting those to C++0x tokens.
+- Adapted all of the library to play well with Boost.Filesystem V3 (which is
+ the default from now on).
+- Added support for extended character and string literals, added test case
+ (which required to add C++0x support to the test application).
+- Added proper predefined macros fro --c++0x mode. __cplusplus is currently
+ defined to 201101L, but this will change when the Standard is finalized.
+- Fixed a problem with object like macros, which when being adjacent to a
+ parenthesis, caused the parenthesis to disappear when the macro expansion
+ was suppressed by the expanding_object_like_macro() hook function.
+- Fixed a bug in pragma option(preserve), missing to set to preserve=1 if
+ after the previous value was preserve=2.
+- Changed the --preserve option of the wave tool to interprete the integer
+ argument in a slightly different way:
+ 0: no whitespace is preserved,
+ 1: only begin of line whitespace is preserved,
+ 2: only begin of line whitespace and comments are preserved,
+ 3: all whitespace is preserved
+ The #pragma wave option(preserve) now supports these arguments:
+ [0|1|2|3|push|pop].
+
 Boost V1.45.0
 - V2.1.0
 - Token pasting is well formed only as long as the formed token(s) are
@@ -37,6 +62,8 @@
   preprocessing instead of just inhibiting the expansion of the macro.
 - Fixed a duplicated call to the pp hook skipped_token for preprocessing
   directives inside inactive conditional branches.
+- Changing exception handling to fix clang++ regression errors.
+- Replaced assert() with BOOST_ASSERT to pacify the Boost inspect tool.
 
 Boost V1.44.0
 - V2.0.6

Modified: branches/release/libs/wave/build/Jamfile.v2
==============================================================================
--- branches/release/libs/wave/build/Jamfile.v2 (original)
+++ branches/release/libs/wave/build/Jamfile.v2 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+# Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/doc/acknowledgements.html
==============================================================================
--- branches/release/libs/wave/doc/acknowledgements.html (original)
+++ branches/release/libs/wave/doc/acknowledgements.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -83,7 +83,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
   <font size="2">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)

Modified: branches/release/libs/wave/doc/class_ref_ctxpolicy_depr.html
==============================================================================
--- branches/release/libs/wave/doc/class_ref_ctxpolicy_depr.html (original)
+++ branches/release/libs/wave/doc/class_ref_ctxpolicy_depr.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -332,7 +332,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <p class="copyright"><span class="updated">Last updated:

Modified: branches/release/libs/wave/doc/class_reference_context.html
==============================================================================
--- branches/release/libs/wave/doc/class_reference_context.html (original)
+++ branches/release/libs/wave/doc/class_reference_context.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -468,8 +468,7 @@
   </tbody>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010
- Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
   <font size="2">Distributed under the Boost Software
   License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at

Modified: branches/release/libs/wave/doc/class_reference_ctxpolicy.html
==============================================================================
--- branches/release/libs/wave/doc/class_reference_ctxpolicy.html (original)
+++ branches/release/libs/wave/doc/class_reference_ctxpolicy.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -422,7 +422,7 @@
   </tbody>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
   <font size="2">Distributed under the Boost Software License, Version
   1.0. (See accompanying file LICENSE_1_0.txt or copy at

Modified: branches/release/libs/wave/doc/class_reference_filepos.html
==============================================================================
--- branches/release/libs/wave/doc/class_reference_filepos.html (original)
+++ branches/release/libs/wave/doc/class_reference_filepos.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -109,7 +109,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <p class="copyright"><span class="updated">Last updated:

Modified: branches/release/libs/wave/doc/class_reference_inptpolcy.html
==============================================================================
--- branches/release/libs/wave/doc/class_reference_inptpolcy.html (original)
+++ branches/release/libs/wave/doc/class_reference_inptpolcy.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -121,7 +121,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
   <font size="2">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) </font> </p>
 <span class="updated"></span>

Modified: branches/release/libs/wave/doc/class_reference_lexer.html
==============================================================================
--- branches/release/libs/wave/doc/class_reference_lexer.html (original)
+++ branches/release/libs/wave/doc/class_reference_lexer.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -93,7 +93,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <p class="copyright"><span class="updated">Last updated:

Modified: branches/release/libs/wave/doc/class_reference_tokentype.html
==============================================================================
--- branches/release/libs/wave/doc/class_reference_tokentype.html (original)
+++ branches/release/libs/wave/doc/class_reference_tokentype.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -165,7 +165,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
   <font size="2">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) </font> </p>
 <span class="updated"></span>

Modified: branches/release/libs/wave/doc/compiletime_config.html
==============================================================================
--- branches/release/libs/wave/doc/compiletime_config.html (original)
+++ branches/release/libs/wave/doc/compiletime_config.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -84,7 +84,11 @@
         variadics and placemarkers. Note, to support C99 mode, this constant must
         be defined too.</p></td>
   </tr>
- <tr>
+<tr>
+ <td class="table_cells"><code>BOOST_WAVE_SUPPORT_CPP0X</code></td>
+ <td class="table_cells"><p>If defined, then the preprocessor library supports
+ C++0x keywords and C++0x specific features, such as variadics, placemarkers, extended character and string literals. This implies the definitions of the <code>BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS</code> constant.</p></td>
+ </tr> <tr>
     <td class="table_cells"><code>BOOST_WAVE_MAX_INCLUDE_LEVEL_DEPTH</code></td>
     <td class="table_cells"><p>If defined, it will determine the initial maximal
         possible include file nesting depth supported. It defaults to 1024.</p></td>
@@ -239,12 +243,12 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>
 <p class="copyright"><span class="updated">Last updated:
- <!-- #BeginDate format:fcAm1m -->Tuesday, July 29, 2008 20:38<!-- #EndDate -->
+ <!-- #BeginDate format:fcAm1m -->Sunday, January 9, 2011 16:16<!-- #EndDate -->
 </span></p>
 </body>
 </html>

Modified: branches/release/libs/wave/doc/introduction.html
==============================================================================
--- branches/release/libs/wave/doc/introduction.html (original)
+++ branches/release/libs/wave/doc/introduction.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -82,7 +82,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>

Modified: branches/release/libs/wave/doc/macro_expansion_process.html
==============================================================================
--- branches/release/libs/wave/doc/macro_expansion_process.html (original)
+++ branches/release/libs/wave/doc/macro_expansion_process.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -88,7 +88,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>

Modified: branches/release/libs/wave/doc/predefined_macros.html
==============================================================================
--- branches/release/libs/wave/doc/predefined_macros.html (original)
+++ branches/release/libs/wave/doc/predefined_macros.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -121,19 +121,19 @@
   </tr>
   <tr>
     <td class="table_cells"><code>__STDC_VERSION__</code></td>
- <td class="table_cells"><p>199901L (a decimal constant), this is defined in C99 mode only</p></td>
+ <td class="table_cells"><p>199901L (a decimal constant), this is defined in C99 and C++0x modes only</p></td>
     <td class="table_cells"><p>yes</p></td>
   </tr>
   <tr>
     <td class="table_cells"><code>__STDC_HOSTED__</code></td>
- <td class="table_cells"><p>0L (a decimal constant), this is defined in C99 mode only</p></td>
+ <td class="table_cells"><p>0L (a decimal constant), this is defined in C99 and C++0x modes only</p></td>
     <td class="table_cells"><p>yes</p></td>
   </tr>
   <tr>
     <td class="table_cells"><code>__WAVE_HAS_VARIADICS__</code></td>
     <td class="table_cells"><p>1 (a decimal constant), this is defined in C++
         mode only if variadics and placemarkers are enabled, and it is defined
- in the C99 mode</p></td>
+ in the C99 and C++0x modes</p></td>
     <td class="table_cells"><p>no</p></td>
   </tr>
   <tr>
@@ -167,12 +167,12 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
   <font size="2">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) </font> </p>
 <span class="updated"></span>
 <p class="copyright"><span class="updated">Last updated:
- <!-- #BeginDate format:fcAm1m -->Monday, March 13, 2006 13:47<!-- #EndDate -->
+ <!-- #BeginDate format:fcAm1m -->Sunday, January 9, 2011 16:12<!-- #EndDate -->
   </span></p>
 </body>
 </html>

Modified: branches/release/libs/wave/doc/preface.html
==============================================================================
--- branches/release/libs/wave/doc/preface.html (original)
+++ branches/release/libs/wave/doc/preface.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -166,7 +166,7 @@
 </table>
 
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
 
   <br>
 
@@ -176,7 +176,7 @@
 
 <span class="updated"></span>
 <p class="copyright"><span class="updated">Last updated:
- <!-- #BeginDate format:fcAm1m -->Sunday, December 2, 2007 19:03<!-- #EndDate -->
+ <!-- #BeginDate format:fcAm1m -->Sunday, January 9, 2011 16:17<!-- #EndDate -->
 </span></p>
 
 </body>

Modified: branches/release/libs/wave/doc/quickstart.html
==============================================================================
--- branches/release/libs/wave/doc/quickstart.html (original)
+++ branches/release/libs/wave/doc/quickstart.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -110,7 +110,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>

Modified: branches/release/libs/wave/doc/references.html
==============================================================================
--- branches/release/libs/wave/doc/references.html (original)
+++ branches/release/libs/wave/doc/references.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -89,7 +89,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
   <font size="2">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) </font> </p>
 <span class="updated"></span>

Modified: branches/release/libs/wave/doc/samples.html
==============================================================================
--- branches/release/libs/wave/doc/samples.html (original)
+++ branches/release/libs/wave/doc/samples.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -103,7 +103,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
     <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>

Modified: branches/release/libs/wave/doc/supported_pragmas.html
==============================================================================
--- branches/release/libs/wave/doc/supported_pragmas.html (original)
+++ branches/release/libs/wave/doc/supported_pragmas.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -129,7 +129,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>

Modified: branches/release/libs/wave/doc/token_ids.html
==============================================================================
--- branches/release/libs/wave/doc/token_ids.html (original)
+++ branches/release/libs/wave/doc/token_ids.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -965,7 +965,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
   <font size="2">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) </font> </p>
 <span class="updated"></span>

Modified: branches/release/libs/wave/doc/tracing_facility.html
==============================================================================
--- branches/release/libs/wave/doc/tracing_facility.html (original)
+++ branches/release/libs/wave/doc/tracing_facility.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -149,7 +149,7 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <p class="copyright"><span class="updated">Last updated:

Modified: branches/release/libs/wave/doc/wave_driver.html
==============================================================================
--- branches/release/libs/wave/doc/wave_driver.html (original)
+++ branches/release/libs/wave/doc/wave_driver.html 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -56,6 +56,7 @@
     --long_long: enable long long support if C++ mode
     --variadics: enable variadics and placemarkers in C++ mode
     --c99: enable C99 mode (implies variadics and placemarkers)
+ --c++0x enable C++0x mode (implies --variadics and --long_long)
     -l [ --listincludes ] arg: list included file to a file [arg] or to stdout [-]
     -m [ --macronames ] arg: list names of all defined macros to a file [arg] or
                                  to stdout [-]
@@ -63,8 +64,9 @@
                                  stdout [-]
     -p [ --preserve ] arg (=0): preserve whitespace
                                  0: no whitespace is preserved (default),
- 1: comments are preserved,
- 2: all whitespace is preserved
+ 1: begin of line whitespace is preserved,
+ 2: comments and begin of line whitespace is preserved,
+ 3: all whitespace is preserved
     -L [ --line ] arg (=1): control the generation of #line directives
                                  0: no #line directives are generated
                                  1: #line directives will be emitted (default)
@@ -182,7 +184,7 @@
 </blockquote>
 <p dir="ltr">--c99</p>
 <blockquote>
- <p dir="ltr">Enable the C99 mode. This mode enables certain C99 specific features
+ <p dir="ltr">Enable the C99 mode. This mode enables certain C99 specific features, such
     as variadics (macros with variable parameter lists), placemarkers (empty macro
     arguments) and <tt>operator&nbsp;_Pragma</tt> support and disables some C++
     specific token types as for instance <tt>'::'</tt>, <tt>'-&gt;*'</tt> and <tt>'-&gt;.'</tt>.
@@ -190,6 +192,14 @@
     about predefined macros you may look here.
   </p>
 </blockquote>
+<p dir="ltr">--c++0x</p>
+<blockquote>
+ <p dir="ltr">Enable the C++0x mode. This mode enables C++0x specific keywords and features, such
+ as variadics (macros with variable parameter lists), placemarkers (empty macro
+ arguments) and <tt>operator&nbsp;_Pragma</tt> support.
+ Several predefined macros are different for this mode, for more information
+ about predefined macros you may look here. </p>
+</blockquote>
 <p dir="ltr">-l [--listincludes] path</p>
 <blockquote>
   <p dir="ltr">Enable the output of the names of all opened include files. The path specifies the filename to use for the output of the generated include log. If the filename given equals to <tt>'-'</tt> (without the quotes), the include log is put into the standard output stream (stdout).</p>
@@ -204,7 +214,7 @@
 </blockquote>
 <p dir="ltr">-p [--preserve] arg </p>
 <blockquote>
- <p dir="ltr">Preserve the whitespace from the input stream not located inside of macro definitions. The argument defines the amount of whitespace to be preserved. A value of '0' (zero) skips all whitespace, a value of '1' preserves all the comments and a value of '2' will preserve all whitespace in the output.</p>
+ <p dir="ltr">Preserve the whitespace from the input stream not located inside of macro definitions. The argument defines the amount of whitespace to be preserved. A value of '0' (zero) skips all whitespace, a value of '1' preserves begin of line whitespace only, a value of '2' preserves all the comments andd all begin of line whitespace, and a value of '3' will preserve all whitespace in the output.</p>
   <p dir="ltr">The comments located inside macro definitions are skipped even if this option is specified with an argument not '0' (zero) . If this option is not specified on the command line only essential whitespace is preserved (equivalent to '0' as the argument value). </p>
 </blockquote>
 <p dir="ltr">-L [--line]</p>
@@ -283,12 +293,12 @@
   </tr>
 </table>
 <hr size="1">
-<p class="copyright">Copyright &copy; 2003-2010 Hartmut Kaiser<br>
+<p class="copyright">Copyright &copy; 2003-2011 Hartmut Kaiser<br>
   <br>
 <font size="2">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) </font> </p>
 <span class="updated"></span>
 <p class="copyright"><span class="updated">Last updated:
- <!-- #BeginDate format:fcAm1m -->Thursday, September 17, 2009 12:40<!-- #EndDate -->
+ <!-- #BeginDate format:fcAm1m -->Sunday, January 9, 2011 16:12<!-- #EndDate -->
 </span></p>
 </body>
 </html>

Modified: branches/release/libs/wave/samples/cpp_tokens/cpp_tokens.cpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/cpp_tokens.cpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/cpp_tokens.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -8,7 +8,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -87,7 +87,7 @@
 // during iteration over the context_type::iterator_type stream.
     context_type ctx (teststr.begin(), teststr.end(), argv[1]);
 
- ctx.set_language(boost::wave::enable_long_long(ctx.get_language()));
+ ctx.set_language(boost::wave::support_cpp0x);
     ctx.set_language(boost::wave::enable_preserve_comments(ctx.get_language()));
     ctx.set_language(boost::wave::enable_prefer_pp_numbers(ctx.get_language()));
 

Modified: branches/release/libs/wave/samples/cpp_tokens/cpp_tokens.hpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/cpp_tokens.hpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/cpp_tokens.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -8,7 +8,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/cpp_tokens/cpp_tokens_config.hpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/cpp_tokens_config.hpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/cpp_tokens_config.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -6,7 +6,7 @@
         
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/cpp_tokens/instantiate_cpp_exprgrammar.cpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/instantiate_cpp_exprgrammar.cpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/instantiate_cpp_exprgrammar.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -7,7 +7,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/cpp_tokens/instantiate_cpp_grammar.cpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/instantiate_cpp_grammar.cpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/instantiate_cpp_grammar.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -6,7 +6,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/cpp_tokens/instantiate_cpp_literalgrs.cpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/instantiate_cpp_literalgrs.cpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/instantiate_cpp_literalgrs.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/cpp_tokens/instantiate_defined_grammar.cpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/instantiate_defined_grammar.cpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/instantiate_defined_grammar.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/cpp_tokens/instantiate_slex_lexer.cpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/instantiate_slex_lexer.cpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/instantiate_slex_lexer.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -6,7 +6,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -57,6 +57,7 @@
 #endif
 #define INIT_DATA_CPP_SIZE 15
 #define INIT_DATA_PP_NUMBER_SIZE 2
+#define INIT_DATA_CPP0X_SIZE 15
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -112,6 +113,7 @@
     static typename base_type::lexer_data const init_data[INIT_DATA_SIZE]; // common patterns
     static typename base_type::lexer_data const init_data_cpp[INIT_DATA_CPP_SIZE]; // C++ only patterns
     static typename base_type::lexer_data const init_data_pp_number[INIT_DATA_PP_NUMBER_SIZE]; // pp-number only patterns
+ static typename base_type::lexer_data const init_data_cpp0x[INIT_DATA_CPP0X_SIZE]; // C++0X only patterns
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -150,6 +152,7 @@
 #endif
 #define FLOAT_SUFFIX "(" "[fF][lL]?" OR "[lL][fF]?" ")"
 #define CHAR_SPEC "L?"
+#define EXTCHAR_SPEC "(" "[uU]" OR "u8" ")"
 
 #define BACKSLASH "(" Q("\\") OR TRI(Q("/")) ")"
 #define ESCAPESEQ "(" BACKSLASH "(" \
@@ -366,17 +369,17 @@
         "(" DIGIT "*" Q(".") DIGIT "+" OR DIGIT "+" Q(".") ")"
         EXPONENT "?" FLOAT_SUFFIX "?" OR
         DIGIT "+" EXPONENT FLOAT_SUFFIX "?"),
+ TOKEN_DATA(CCOMMENT, CCOMMENT),
+ TOKEN_DATA(CPPCOMMENT, Q("/") Q("/[^\\n\\r]*") NEWLINEDEF ),
+ TOKEN_DATA(CHARLIT, CHAR_SPEC "'"
+ "(" ESCAPESEQ OR UNIVERSALCHAR OR "[^\\n\\r\\\\']" ")+" "'"),
+ TOKEN_DATA(STRINGLIT, CHAR_SPEC Q("\"")
+ "(" ESCAPESEQ OR UNIVERSALCHAR OR "[^\\n\\r\\\\\"]" ")*" Q("\"")),
 #if BOOST_WAVE_USE_STRICT_LEXER != 0
     TOKEN_DATA(IDENTIFIER, "([a-zA-Z_]" OR UNIVERSALCHAR ")([a-zA-Z0-9_]" OR UNIVERSALCHAR ")*"),
 #else
     TOKEN_DATA(IDENTIFIER, "([a-zA-Z_$]" OR UNIVERSALCHAR ")([a-zA-Z0-9_$]" OR UNIVERSALCHAR ")*"),
 #endif
- TOKEN_DATA(CCOMMENT, CCOMMENT),
- TOKEN_DATA(CPPCOMMENT, Q("/") Q("/[^\\n\\r]*") NEWLINEDEF ),
- TOKEN_DATA(CHARLIT, CHAR_SPEC "'"
- "(" ESCAPESEQ OR "[^\\n\\r\\\\']" OR UNIVERSALCHAR ")+" "'"),
- TOKEN_DATA(STRINGLIT, CHAR_SPEC Q("\"")
- "(" ESCAPESEQ OR "[^\\n\\r\\\\\"]" OR UNIVERSALCHAR ")*" Q("\"")),
     TOKEN_DATA(SPACE, "[ \t\v\f]+"),
 // TOKEN_DATA(SPACE2, "[\\v\\f]+"),
     TOKEN_DATA(CONTLINE, "\\" "\\n"),
@@ -429,6 +432,38 @@
 };
 
 ///////////////////////////////////////////////////////////////////////////////
+// C++ only token definitions
+
+#define T_EXTCHARLIT token_id(T_CHARLIT|AltTokenType)
+#define T_EXTSTRINGLIT token_id(T_STRINGLIT|AltTokenType)
+#define T_EXTRAWSTRINGLIT token_id(T_RAWSTRINGLIT|AltTokenType)
+
+template <typename IteratorT, typename PositionT>
+typename lexer_base<IteratorT, PositionT>::lexer_data const
+lexer<IteratorT, PositionT>::init_data_cpp0x[INIT_DATA_CPP0X_SIZE] =
+{
+ TOKEN_DATA(EXTCHARLIT, EXTCHAR_SPEC "'"
+ "(" ESCAPESEQ OR UNIVERSALCHAR OR "[^\\n\\r\\\\']" ")+" "'"),
+ TOKEN_DATA(EXTSTRINGLIT, EXTCHAR_SPEC Q("\"")
+ "(" ESCAPESEQ OR UNIVERSALCHAR OR "[^\\n\\r\\\\\"]" ")*" Q("\"")),
+ TOKEN_DATA(RAWSTRINGLIT, CHAR_SPEC "R" Q("\"")
+ "(" ESCAPESEQ OR UNIVERSALCHAR OR "[^\\\\\"]" ")*" Q("\"")),
+ TOKEN_DATA(EXTRAWSTRINGLIT, EXTCHAR_SPEC "R" Q("\"")
+ "(" ESCAPESEQ OR UNIVERSALCHAR OR "[^\\\\\"]" ")*" Q("\"")),
+ TOKEN_DATA(ALIGNAS, "alignas"),
+ TOKEN_DATA(ALIGNOF, "alignof"),
+ TOKEN_DATA(CHAR16_T, "char16_t"),
+ TOKEN_DATA(CHAR32_T, "char32_t"),
+ TOKEN_DATA(CONSTEXPR, "constexpr"),
+ TOKEN_DATA(DECLTYPE, "decltype"),
+ TOKEN_DATA(NOEXCEPT, "noexcept"),
+ TOKEN_DATA(NULLPTR, "nullptr"),
+ TOKEN_DATA(STATICASSERT, "static_assert"),
+ TOKEN_DATA(THREADLOCAL, "threadlocal"),
+ { token_id(0) } // this should be the last entry
+};
+
+///////////////////////////////////////////////////////////////////////////////
 // undefine macros, required for regular expression definitions
 #undef INCLUDEDEF
 #undef POUNDDEF
@@ -493,6 +528,17 @@
         }
     }
     
+// if in C++0x mode, add all new keywords
+#if BOOST_WAVE_SUPPORT_CPP0X != 0
+ if (boost::wave::need_cpp0x(lang)) {
+ for (int j = 0; 0 != init_data_cpp0x[j].tokenid; ++j) {
+ this->register_regex(init_data_cpp0x[j].tokenregex,
+ init_data_cpp0x[j].tokenid, init_data_cpp0x[j].tokencb,
+ init_data_cpp0x[j].lexerstate);
+ }
+ }
+#endif
+
     for (int i = 0; 0 != init_data[i].tokenid; ++i) {
         this->register_regex(init_data[i].tokenregex, init_data[i].tokenid,
             init_data[i].tokencb, init_data[i].lexerstate);
@@ -606,8 +652,15 @@
                         }
                         break;
 
- case T_STRINGLIT:
+ case T_EXTCHARLIT:
+ case T_EXTSTRINGLIT:
+ case T_EXTRAWSTRINGLIT:
+ id = token_id(id & ~AltTokenType);
+ // fall through
+
                     case T_CHARLIT:
+ case T_STRINGLIT:
+ case T_RAWSTRINGLIT:
                     // test literal characters for validity (throws if invalid
                     // chars found)
                         if (boost::wave::need_convert_trigraphs(language)) {
@@ -713,6 +766,10 @@
 template <typename IteratorT, typename PositionT>
 lexer::lexer<IteratorT, PositionT> slex_functor<IteratorT, PositionT>::lexer;
 
+#undef T_EXTCHARLIT
+#undef T_EXTSTRINGLIT
+#undef T_EXTRAWSTRINGLIT
+
 ///////////////////////////////////////////////////////////////////////////////
 //
 // The 'new_lexer' function allows the opaque generation of a new lexer object.

Modified: branches/release/libs/wave/samples/cpp_tokens/slex/lexer.hpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/slex/lexer.hpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/slex/lexer.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -6,7 +6,7 @@
     http://www.boost.org/
 
     Copyright (c) 2001, Daniel C. Nuffer.
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 

Modified: branches/release/libs/wave/samples/cpp_tokens/slex_interface.hpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/slex_interface.hpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/slex_interface.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/cpp_tokens/slex_iterator.hpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/slex_iterator.hpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/slex_iterator.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/cpp_tokens/slex_token.hpp
==============================================================================
--- branches/release/libs/wave/samples/cpp_tokens/slex_token.hpp (original)
+++ branches/release/libs/wave/samples/cpp_tokens/slex_token.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/custom_directives/custom_directives.cpp
==============================================================================
--- branches/release/libs/wave/samples/custom_directives/custom_directives.cpp (original)
+++ branches/release/libs/wave/samples/custom_directives/custom_directives.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/custom_directives/custom_directives.hpp
==============================================================================
--- branches/release/libs/wave/samples/custom_directives/custom_directives.hpp (original)
+++ branches/release/libs/wave/samples/custom_directives/custom_directives.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/emit_custom_line_directives/emit_custom_line_directives.cpp
==============================================================================
--- branches/release/libs/wave/samples/emit_custom_line_directives/emit_custom_line_directives.cpp (original)
+++ branches/release/libs/wave/samples/emit_custom_line_directives/emit_custom_line_directives.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/samples/emit_custom_line_directives/emit_custom_line_directives.hpp
==============================================================================
--- branches/release/libs/wave/samples/emit_custom_line_directives/emit_custom_line_directives.hpp (original)
+++ branches/release/libs/wave/samples/emit_custom_line_directives/emit_custom_line_directives.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/src/cpplexer/re2clex/aq.cpp
==============================================================================
--- branches/release/libs/wave/src/cpplexer/re2clex/aq.cpp (original)
+++ branches/release/libs/wave/src/cpplexer/re2clex/aq.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
     http://www.boost.org/
 
     Copyright (c) 2001 Daniel C. Nuffer.
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 =============================================================================*/

Modified: branches/release/libs/wave/src/cpplexer/re2clex/cpp.re
==============================================================================
--- branches/release/libs/wave/src/cpplexer/re2clex/cpp.re (original)
+++ branches/release/libs/wave/src/cpplexer/re2clex/cpp.re 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
 
     Copyright (c) 2001 Daniel C. Nuffer
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 
@@ -44,6 +44,8 @@
     "//" { goto cppcomment; }
     "."? Digit { goto pp_number; }
 
+ "alignas" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_ALIGNAS : T_IDENTIFIER); }
+ "alignof" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_ALIGNOF : T_IDENTIFIER); }
     "asm" { BOOST_WAVE_RET(T_ASM); }
     "auto" { BOOST_WAVE_RET(T_AUTO); }
     "bool" { BOOST_WAVE_RET(T_BOOL); }
@@ -51,10 +53,14 @@
     "case" { BOOST_WAVE_RET(T_CASE); }
     "catch" { BOOST_WAVE_RET(T_CATCH); }
     "char" { BOOST_WAVE_RET(T_CHAR); }
+ "char16_t" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_CHAR16_T : T_IDENTIFIER); }
+ "char32_t" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_CHAR32_T : T_IDENTIFIER); }
     "class" { BOOST_WAVE_RET(T_CLASS); }
     "const" { BOOST_WAVE_RET(T_CONST); }
+ "constexpr" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_CONSTEXPR : T_IDENTIFIER); }
     "const_cast" { BOOST_WAVE_RET(T_CONSTCAST); }
     "continue" { BOOST_WAVE_RET(T_CONTINUE); }
+ "decltype" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_DECLTYPE : T_IDENTIFIER); }
     "default" { BOOST_WAVE_RET(T_DEFAULT); }
     "delete" { BOOST_WAVE_RET(T_DELETE); }
     "do" { BOOST_WAVE_RET(T_DO); }
@@ -78,6 +84,8 @@
     "mutable" { BOOST_WAVE_RET(T_MUTABLE); }
     "namespace" { BOOST_WAVE_RET(T_NAMESPACE); }
     "new" { BOOST_WAVE_RET(T_NEW); }
+ "noexcept" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_NOEXCEPT : T_IDENTIFIER); }
+ "nullptr" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_NULLPTR : T_IDENTIFIER); }
     "operator" { BOOST_WAVE_RET(T_OPERATOR); }
     "private" { BOOST_WAVE_RET(T_PRIVATE); }
     "protected" { BOOST_WAVE_RET(T_PROTECTED); }
@@ -90,10 +98,12 @@
     "sizeof" { BOOST_WAVE_RET(T_SIZEOF); }
     "static" { BOOST_WAVE_RET(T_STATIC); }
     "static_cast" { BOOST_WAVE_RET(T_STATICCAST); }
+ "static_assert" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_STATICASSERT : T_IDENTIFIER); }
     "struct" { BOOST_WAVE_RET(T_STRUCT); }
     "switch" { BOOST_WAVE_RET(T_SWITCH); }
     "template" { BOOST_WAVE_RET(T_TEMPLATE); }
     "this" { BOOST_WAVE_RET(T_THIS); }
+ "thread_local" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_THREADLOCAL : T_IDENTIFIER); }
     "throw" { BOOST_WAVE_RET(T_THROW); }
     "true" { BOOST_WAVE_RET(T_TRUE); }
     "try" { BOOST_WAVE_RET(T_TRY); }
@@ -238,16 +248,46 @@
     "->" { BOOST_WAVE_RET(T_ARROW); }
     "??/" { BOOST_WAVE_RET(T_ANY_TRIGRAPH); }
 
-
- ([a-zA-Z_$] | UniversalChar) ([a-zA-Z_0-9$] | UniversalChar)*
- { BOOST_WAVE_RET(T_IDENTIFIER); }
-
- "L"? (['] (EscapeSequence|any\[\n\r\\']|UniversalChar)+ ['])
+ "L"? (['] (EscapeSequence | UniversalChar | any\[\n\r\\'])+ ['])
         { BOOST_WAVE_RET(T_CHARLIT); }
 
- "L"? (["] (EscapeSequence|any\[\n\r\\"]|UniversalChar)* ["])
+ "L"? (["] (EscapeSequence | UniversalChar | any\[\n\r\\"])* ["])
         { BOOST_WAVE_RET(T_STRINGLIT); }
 
+ "L"? "R" ["]
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extrawstringlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+
+ [uU] [']
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extcharlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+
+ ([uU] | "u8") ["]
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extstringlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+
+ ([uU] | "u8") "R" ["]
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extrawstringlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+
+ ([a-zA-Z_$] | UniversalChar) ([a-zA-Z_0-9$] | UniversalChar)*
+ { BOOST_WAVE_RET(T_IDENTIFIER); }
 
     Pound PPSpace ( "include" | "include_next") PPSpace "<" (any\[\n\r>])+ ">"
         { BOOST_WAVE_RET(T_PP_HHEADER); }
@@ -310,7 +350,7 @@
 ccomment:
 /*!re2c
     "*/" { BOOST_WAVE_RET(T_CCOMMENT); }
-
+
     Newline
     {
         /*if(cursor == s->eof) BOOST_WAVE_RET(T_EOF);*/
@@ -370,7 +410,7 @@
             (*s->error_proc)(s, lexing_exception::generic_lexing_error,
                 "invalid character '\\000' in input stream");
         }
-
+
         --YYCURSOR; // next call returns T_EOF
         if (!s->single_line_only)
         {
@@ -407,13 +447,13 @@
     /*!re2c
         ((FractionalConstant ExponentPart?) | (Digit+ ExponentPart)) FloatingSuffix?
             { BOOST_WAVE_RET(T_FLOATLIT); }
-
+
         Integer { goto integer_suffix; }
     */
     }
 }
 
-/* this subscanner is called, whenever a Integer was recognized */
+/* this subscanner is called, whenever an Integer was recognized */
 integer_suffix:
 {
     if (s->enable_ms_extensions) {
@@ -435,3 +475,46 @@
     */
     }
 }
+
+/* this subscanner is invoked for C++0x extended character literals */
+extcharlit:
+{
+ /*!re2c
+ ((EscapeSequence | UniversalChar | any\[\n\r\\']) ['])
+ { BOOST_WAVE_RET(T_CHARLIT); }
+
+ any
+ { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
+ */
+}
+
+/* this subscanner is invoked for C++0x extended character string literals */
+extstringlit:
+{
+ /*!re2c
+ ((EscapeSequence | UniversalChar | any\[\n\r\\"])* ["])
+ { BOOST_WAVE_RET(T_STRINGLIT); }
+
+ any
+ { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
+ */
+}
+
+extrawstringlit:
+{
+ /*!re2c
+ (EscapeSequence | UniversalChar | any\[\r\n\\"])
+ {
+ goto extrawstringlit;
+ }
+
+ Newline
+ {
+ s->line += count_backslash_newlines(s, cursor) +1;
+ cursor.column = 1;
+ goto extrawstringlit;
+ }
+
+ ["] { BOOST_WAVE_RET(T_RAWSTRINGLIT); }
+ */
+}

Modified: branches/release/libs/wave/src/cpplexer/re2clex/cpp_re.cpp
==============================================================================
--- branches/release/libs/wave/src/cpplexer/re2clex/cpp_re.cpp (original)
+++ branches/release/libs/wave/src/cpplexer/re2clex/cpp_re.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
 
     Copyright (c) 2001 Daniel C. Nuffer
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 

Modified: branches/release/libs/wave/src/cpplexer/re2clex/cpp_re.inc
==============================================================================
--- branches/release/libs/wave/src/cpplexer/re2clex/cpp_re.inc (original)
+++ branches/release/libs/wave/src/cpplexer/re2clex/cpp_re.inc 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -1,10 +1,10 @@
-/* Generated by re2c 0.13.5 on Fri May 22 14:32:01 2009 */
+/* Generated by re2c 0.13.5 on Sun Jan 09 15:38:23 2011 */
 #line 1 "cpp.re"
 /*=============================================================================
     Boost.Wave: A Standard compliant C++ preprocessor library
 
     Copyright (c) 2001 Daniel C. Nuffer
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 
@@ -28,76 +28,76 @@
     static const unsigned char yybm[] = {
         /* table 1 .. 8: 0 */
           0, 0, 0, 0, 0, 0, 0, 0,
- 0, 58, 32, 58, 58, 64, 0, 0,
+ 0, 60, 32, 60, 60, 64, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0,
- 58, 58, 50, 58, 62, 58, 58, 56,
- 58, 58, 154, 58, 58, 58, 58, 58,
- 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 58, 58, 58, 58, 42, 56,
- 58, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 58, 57, 58, 58, 62,
- 58, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
+ 60, 60, 52, 60, 60, 60, 60, 56,
+ 60, 60, 156, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 44, 57,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 58, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
         /* table 9 .. 12: 256 */
           0, 0, 0, 0, 0, 0, 0, 0,
- 0, 48, 0, 48, 48, 0, 0, 0,
+ 0, 80, 0, 80, 80, 0, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0,
- 48, 32, 0, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
+ 80, 64, 0, 64, 96, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 224, 224, 224, 224, 224, 224, 224, 224,
+ 224, 224, 64, 64, 64, 64, 64, 0,
+ 64, 224, 224, 224, 224, 224, 224, 96,
+ 96, 96, 96, 96, 96, 96, 96, 96,
+ 96, 96, 96, 96, 96, 96, 96, 96,
+ 96, 96, 96, 64, 0, 64, 64, 96,
+ 64, 224, 224, 224, 224, 224, 224, 96,
          96, 96, 96, 96, 96, 96, 96, 96,
- 96, 96, 32, 32, 32, 32, 32, 128,
- 32, 96, 96, 96, 96, 96, 96, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 0, 32, 32, 32,
- 32, 96, 96, 96, 96, 96, 96, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
+ 96, 96, 96, 96, 96, 96, 96, 96,
+ 96, 96, 96, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
     };
 
     if ((YYLIMIT - YYCURSOR) < 17) YYFILL(17);
     yych = *YYCURSOR;
     switch (yych) {
- case 0x00: goto yy88;
+ case 0x00: goto yy90;
     case 0x01:
     case 0x02:
     case 0x03:
@@ -123,15 +123,15 @@
     case 0x1C:
     case 0x1D:
     case 0x1E:
- case 0x1F: goto yy91;
+ case 0x1F: goto yy93;
     case '\t':
     case '\v':
- case '\f': goto yy82;
- case '\n': goto yy85;
- case '\r': goto yy87;
- case ' ': goto yy84;
+ case '\f': goto yy84;
+ case '\n': goto yy87;
+ case '\r': goto yy89;
+ case ' ': goto yy86;
     case '!': goto yy68;
- case '"': goto yy81;
+ case '"': goto yy79;
     case '#': goto yy45;
     case '$':
     case 'A':
@@ -150,10 +150,8 @@
     case 'O':
     case 'P':
     case 'Q':
- case 'R':
     case 'S':
     case 'T':
- case 'U':
     case 'V':
     case 'W':
     case 'X':
@@ -164,10 +162,10 @@
     case 'k':
     case 'q':
     case 'y':
- case 'z': goto yy76;
+ case 'z': goto yy82;
     case '%': goto yy37;
     case '&': goto yy62;
- case '\'': goto yy80;
+ case '\'': goto yy77;
     case '(': goto yy47;
     case ')': goto yy49;
     case '*': goto yy57;
@@ -192,9 +190,11 @@
     case '=': goto yy70;
     case '>': goto yy72;
     case '?': goto yy31;
- case 'L': goto yy77;
+ case 'L': goto yy76;
+ case 'R': goto yy80;
+ case 'U': goto yy81;
     case '[': goto yy39;
- case '\\': goto yy78;
+ case '\\': goto yy83;
     case ']': goto yy41;
     case '^': goto yy59;
     case '_': goto yy28;
@@ -222,31 +222,31 @@
     case '|': goto yy64;
     case '}': goto yy35;
     case '~': goto yy66;
- default: goto yy90;
+ default: goto yy92;
     }
 yy2:
     ++YYCURSOR;
     if ((yych = *YYCURSOR) <= '.') {
- if (yych == '*') goto yy922;
+ if (yych == '*') goto yy998;
     } else {
- if (yych <= '/') goto yy920;
- if (yych == '=') goto yy918;
+ if (yych <= '/') goto yy996;
+ if (yych == '=') goto yy994;
     }
-#line 178 "cpp.re"
+#line 188 "cpp.re"
     { BOOST_WAVE_RET(T_DIVIDE); }
 #line 238 "cpp_re.inc"
 yy4:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '-') {
- if (yych == '*') goto yy912;
+ if (yych == '*') goto yy988;
     } else {
- if (yych <= '.') goto yy914;
+ if (yych <= '.') goto yy990;
         if (yych <= '/') goto yy5;
- if (yych <= '9') goto yy915;
+ if (yych <= '9') goto yy991;
     }
 yy5:
-#line 164 "cpp.re"
+#line 174 "cpp.re"
     { BOOST_WAVE_RET(T_DOT); }
 #line 252 "cpp_re.inc"
 yy6:
@@ -258,471 +258,531 @@
 yy8:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'r') {
- if (yych == 'n') goto yy898;
- goto yy195;
- } else {
- if (yych <= 's') goto yy899;
- if (yych == 'u') goto yy900;
- goto yy195;
+ switch (yych) {
+ case 'l': goto yy964;
+ case 'n': goto yy965;
+ case 's': goto yy966;
+ case 'u': goto yy967;
+ default: goto yy109;
     }
 yy9:
-#line 243 "cpp.re"
+#line 290 "cpp.re"
     { BOOST_WAVE_RET(T_IDENTIFIER); }
-#line 273 "cpp_re.inc"
+#line 272 "cpp_re.inc"
 yy10:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'n') {
- if (yych == 'i') goto yy880;
- goto yy195;
+ if (yych == 'i') goto yy946;
+ goto yy109;
     } else {
- if (yych <= 'o') goto yy881;
- if (yych == 'r') goto yy882;
- goto yy195;
+ if (yych <= 'o') goto yy947;
+ if (yych == 'r') goto yy948;
+ goto yy109;
     }
 yy11:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     switch (yych) {
- case 'a': goto yy842;
- case 'h': goto yy843;
- case 'l': goto yy844;
- case 'o': goto yy845;
- default: goto yy195;
+ case 'a': goto yy893;
+ case 'h': goto yy894;
+ case 'l': goto yy895;
+ case 'o': goto yy896;
+ default: goto yy109;
     }
 yy12:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'n') {
- if (yych == 'e') goto yy811;
- goto yy195;
+ if (yych == 'e') goto yy855;
+ goto yy109;
     } else {
- if (yych <= 'o') goto yy812;
- if (yych == 'y') goto yy814;
- goto yy195;
+ if (yych <= 'o') goto yy856;
+ if (yych == 'y') goto yy858;
+ goto yy109;
     }
 yy13:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'm') {
- if (yych == 'l') goto yy786;
- goto yy195;
+ if (yych == 'l') goto yy830;
+ goto yy109;
     } else {
- if (yych <= 'n') goto yy787;
- if (yych == 'x') goto yy788;
- goto yy195;
+ if (yych <= 'n') goto yy831;
+ if (yych == 'x') goto yy832;
+ goto yy109;
     }
 yy14:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     switch (yych) {
- case 'a': goto yy767;
- case 'l': goto yy768;
- case 'o': goto yy769;
- case 'r': goto yy770;
- default: goto yy195;
+ case 'a': goto yy811;
+ case 'l': goto yy812;
+ case 'o': goto yy813;
+ case 'r': goto yy814;
+ default: goto yy109;
     }
 yy15:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy763;
- goto yy195;
+ if (yych == 'o') goto yy807;
+ goto yy109;
 yy16:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'l') {
- if (yych == 'f') goto yy747;
- goto yy195;
+ if (yych == 'f') goto yy791;
+ goto yy109;
     } else {
- if (yych <= 'm') goto yy749;
- if (yych <= 'n') goto yy750;
- goto yy195;
+ if (yych <= 'm') goto yy793;
+ if (yych <= 'n') goto yy794;
+ goto yy109;
     }
 yy17:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy743;
- goto yy195;
+ if (yych == 'o') goto yy787;
+ goto yy109;
 yy18:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'u') goto yy736;
- goto yy195;
+ if (yych == 'u') goto yy780;
+ goto yy109;
 yy19:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'd') {
- if (yych == 'a') goto yy717;
- goto yy195;
- } else {
- if (yych <= 'e') goto yy718;
- if (yych == 'o') goto yy719;
- goto yy195;
+ if (yych <= 'e') {
+ if (yych == 'a') goto yy747;
+ if (yych <= 'd') goto yy109;
+ goto yy748;
+ } else {
+ if (yych <= 'o') {
+ if (yych <= 'n') goto yy109;
+ goto yy749;
+ } else {
+ if (yych == 'u') goto yy750;
+ goto yy109;
+ }
     }
 yy20:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'p') goto yy703;
- if (yych == 'r') goto yy704;
- goto yy195;
+ if (yych == 'p') goto yy733;
+ if (yych == 'r') goto yy734;
+ goto yy109;
 yy21:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'r') goto yy682;
- if (yych == 'u') goto yy683;
- goto yy195;
+ if (yych == 'r') goto yy712;
+ if (yych == 'u') goto yy713;
+ goto yy109;
 yy22:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'e') goto yy654;
- goto yy195;
+ if (yych == 'e') goto yy684;
+ goto yy109;
 yy23:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 's') {
- if (yych <= 'g') goto yy195;
- if (yych <= 'h') goto yy615;
- if (yych <= 'i') goto yy616;
- goto yy195;
- } else {
- if (yych <= 't') goto yy617;
- if (yych == 'w') goto yy618;
- goto yy195;
+ if (yych <= 'g') goto yy109;
+ if (yych <= 'h') goto yy638;
+ if (yych <= 'i') goto yy639;
+ goto yy109;
+ } else {
+ if (yych <= 't') goto yy640;
+ if (yych == 'w') goto yy641;
+ goto yy109;
     }
 yy24:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'h') {
- if (yych == 'e') goto yy578;
- if (yych <= 'g') goto yy195;
- goto yy579;
+ if (yych == 'e') goto yy591;
+ if (yych <= 'g') goto yy109;
+ goto yy592;
     } else {
         if (yych <= 'r') {
- if (yych <= 'q') goto yy195;
- goto yy580;
+ if (yych <= 'q') goto yy109;
+ goto yy593;
         } else {
- if (yych == 'y') goto yy581;
- goto yy195;
+ if (yych == 'y') goto yy594;
+ goto yy109;
         }
     }
 yy25:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'n') goto yy561;
- if (yych == 's') goto yy562;
- goto yy195;
+ if (yych <= '8') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy129;
+ goto yy109;
+ } else {
+ if (yych <= '\'') goto yy131;
+ if (yych <= '7') goto yy109;
+ goto yy573;
+ }
+ } else {
+ if (yych <= 'm') {
+ if (yych == 'R') goto yy128;
+ goto yy109;
+ } else {
+ if (yych <= 'n') goto yy574;
+ if (yych == 's') goto yy575;
+ goto yy109;
+ }
+ }
 yy26:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy543;
- if (yych == 'o') goto yy544;
- goto yy195;
+ if (yych == 'i') goto yy555;
+ if (yych == 'o') goto yy556;
+ goto yy109;
 yy27:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'c') goto yy531;
- if (yych == 'h') goto yy532;
- goto yy195;
+ if (yych == 'c') goto yy543;
+ if (yych == 'h') goto yy544;
+ goto yy109;
 yy28:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     switch (yych) {
- case '_': goto yy442;
- case 'a': goto yy443;
- case 'b': goto yy444;
- case 'c': goto yy445;
- case 'd': goto yy446;
- case 'f': goto yy447;
- case 'i': goto yy448;
- case 's': goto yy449;
- default: goto yy195;
+ case '_': goto yy454;
+ case 'a': goto yy455;
+ case 'b': goto yy456;
+ case 'c': goto yy457;
+ case 'd': goto yy458;
+ case 'f': goto yy459;
+ case 'i': goto yy460;
+ case 's': goto yy461;
+ default: goto yy109;
     }
 yy29:
     ++YYCURSOR;
-#line 128 "cpp.re"
+#line 138 "cpp.re"
     { BOOST_WAVE_RET(T_LEFTBRACE); }
-#line 446 "cpp_re.inc"
+#line 466 "cpp_re.inc"
 yy31:
     yyaccept = 2;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '?') goto yy407;
+ if (yych == '?') goto yy419;
 yy32:
-#line 153 "cpp.re"
+#line 163 "cpp.re"
     { BOOST_WAVE_RET(T_QUESTION_MARK); }
-#line 454 "cpp_re.inc"
+#line 474 "cpp_re.inc"
 yy33:
     ++YYCURSOR;
     if ((yych = *YYCURSOR) <= ':') {
- if (yych == '%') goto yy403;
- if (yych >= ':') goto yy401;
+ if (yych == '%') goto yy415;
+ if (yych >= ':') goto yy413;
     } else {
         if (yych <= ';') goto yy34;
- if (yych <= '<') goto yy399;
- if (yych <= '=') goto yy397;
+ if (yych <= '<') goto yy411;
+ if (yych <= '=') goto yy409;
     }
 yy34:
-#line 194 "cpp.re"
+#line 204 "cpp.re"
     { BOOST_WAVE_RET(T_LESS); }
-#line 468 "cpp_re.inc"
+#line 488 "cpp_re.inc"
 yy35:
     ++YYCURSOR;
-#line 131 "cpp.re"
+#line 141 "cpp.re"
     { BOOST_WAVE_RET(T_RIGHTBRACE); }
-#line 473 "cpp_re.inc"
+#line 493 "cpp_re.inc"
 yy37:
     ++YYCURSOR;
     if ((yych = *YYCURSOR) <= '<') {
- if (yych == ':') goto yy388;
+ if (yych == ':') goto yy400;
     } else {
- if (yych <= '=') goto yy390;
- if (yych <= '>') goto yy392;
+ if (yych <= '=') goto yy402;
+ if (yych <= '>') goto yy404;
     }
-#line 179 "cpp.re"
+#line 189 "cpp.re"
     { BOOST_WAVE_RET(T_PERCENT); }
-#line 484 "cpp_re.inc"
+#line 504 "cpp_re.inc"
 yy39:
     ++YYCURSOR;
-#line 134 "cpp.re"
+#line 144 "cpp.re"
     { BOOST_WAVE_RET(T_LEFTBRACKET); }
-#line 489 "cpp_re.inc"
+#line 509 "cpp_re.inc"
 yy41:
     ++YYCURSOR;
-#line 137 "cpp.re"
+#line 147 "cpp.re"
     { BOOST_WAVE_RET(T_RIGHTBRACKET); }
-#line 494 "cpp_re.inc"
+#line 514 "cpp_re.inc"
 yy43:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == ':') goto yy384;
- if (yych == '>') goto yy386;
-#line 151 "cpp.re"
+ if ((yych = *YYCURSOR) == ':') goto yy396;
+ if (yych == '>') goto yy398;
+#line 161 "cpp.re"
     { BOOST_WAVE_RET(T_COLON); }
-#line 501 "cpp_re.inc"
+#line 521 "cpp_re.inc"
 yy45:
     yyaccept = 3;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'c') {
         if (yych <= ' ') {
             if (yych <= '\n') {
- if (yych == '\t') goto yy261;
+ if (yych == '\t') goto yy273;
             } else {
- if (yych <= '\f') goto yy261;
- if (yych >= ' ') goto yy261;
+ if (yych <= '\f') goto yy273;
+ if (yych >= ' ') goto yy273;
             }
         } else {
             if (yych <= '.') {
- if (yych == '#') goto yy272;
+ if (yych == '#') goto yy284;
             } else {
- if (yych <= '/') goto yy261;
- if (yych == '?') goto yy271;
+ if (yych <= '/') goto yy273;
+ if (yych == '?') goto yy283;
             }
         }
     } else {
         if (yych <= 'p') {
             if (yych <= 'i') {
- if (yych <= 'e') goto yy261;
- if (yych >= 'i') goto yy261;
+ if (yych <= 'e') goto yy273;
+ if (yych >= 'i') goto yy273;
             } else {
- if (yych == 'l') goto yy261;
- if (yych >= 'p') goto yy261;
+ if (yych == 'l') goto yy273;
+ if (yych >= 'p') goto yy273;
             }
         } else {
             if (yych <= 't') {
- if (yych == 'r') goto yy261;
+ if (yych == 'r') goto yy273;
             } else {
                 if (yych == 'v') goto yy46;
- if (yych <= 'w') goto yy261;
+ if (yych <= 'w') goto yy273;
             }
         }
     }
 yy46:
-#line 140 "cpp.re"
+#line 150 "cpp.re"
     { BOOST_WAVE_RET(T_POUND); }
-#line 542 "cpp_re.inc"
+#line 562 "cpp_re.inc"
 yy47:
     ++YYCURSOR;
-#line 148 "cpp.re"
+#line 158 "cpp.re"
     { BOOST_WAVE_RET(T_LEFTPAREN); }
-#line 547 "cpp_re.inc"
+#line 567 "cpp_re.inc"
 yy49:
     ++YYCURSOR;
-#line 149 "cpp.re"
+#line 159 "cpp.re"
     { BOOST_WAVE_RET(T_RIGHTPAREN); }
-#line 552 "cpp_re.inc"
+#line 572 "cpp_re.inc"
 yy51:
     ++YYCURSOR;
-#line 150 "cpp.re"
+#line 160 "cpp.re"
     { BOOST_WAVE_RET(T_SEMICOLON); }
-#line 557 "cpp_re.inc"
+#line 577 "cpp_re.inc"
 yy53:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '+') goto yy256;
- if (yych == '=') goto yy258;
-#line 175 "cpp.re"
+ if ((yych = *YYCURSOR) == '+') goto yy268;
+ if (yych == '=') goto yy270;
+#line 185 "cpp.re"
     { BOOST_WAVE_RET(T_PLUS); }
-#line 564 "cpp_re.inc"
+#line 584 "cpp_re.inc"
 yy55:
     ++YYCURSOR;
     if ((yych = *YYCURSOR) <= '<') {
- if (yych == '-') goto yy250;
+ if (yych == '-') goto yy262;
     } else {
- if (yych <= '=') goto yy252;
- if (yych <= '>') goto yy248;
+ if (yych <= '=') goto yy264;
+ if (yych <= '>') goto yy260;
     }
-#line 176 "cpp.re"
+#line 186 "cpp.re"
     { BOOST_WAVE_RET(T_MINUS); }
-#line 575 "cpp_re.inc"
+#line 595 "cpp_re.inc"
 yy57:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy246;
-#line 177 "cpp.re"
+ if ((yych = *YYCURSOR) == '=') goto yy258;
+#line 187 "cpp.re"
     { BOOST_WAVE_RET(T_STAR); }
-#line 581 "cpp_re.inc"
+#line 601 "cpp_re.inc"
 yy59:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy244;
-#line 180 "cpp.re"
+ if ((yych = *YYCURSOR) == '=') goto yy256;
+#line 190 "cpp.re"
     { BOOST_WAVE_RET(T_XOR); }
-#line 587 "cpp_re.inc"
+#line 607 "cpp_re.inc"
 yy61:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy237;
- goto yy195;
+ if (yych == 'o') goto yy249;
+ goto yy109;
 yy62:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '&') goto yy233;
- if (yych == '=') goto yy235;
-#line 183 "cpp.re"
+ if ((yych = *YYCURSOR) == '&') goto yy245;
+ if (yych == '=') goto yy247;
+#line 193 "cpp.re"
     { BOOST_WAVE_RET(T_AND); }
-#line 599 "cpp_re.inc"
+#line 619 "cpp_re.inc"
 yy64:
     yyaccept = 4;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '>') {
- if (yych == '=') goto yy228;
+ if (yych == '=') goto yy240;
     } else {
- if (yych <= '?') goto yy225;
- if (yych == '|') goto yy226;
+ if (yych <= '?') goto yy237;
+ if (yych == '|') goto yy238;
     }
 yy65:
-#line 185 "cpp.re"
+#line 195 "cpp.re"
     { BOOST_WAVE_RET(T_OR); }
-#line 612 "cpp_re.inc"
+#line 632 "cpp_re.inc"
 yy66:
     ++YYCURSOR;
-#line 188 "cpp.re"
+#line 198 "cpp.re"
     { BOOST_WAVE_RET(T_COMPL); }
-#line 617 "cpp_re.inc"
+#line 637 "cpp_re.inc"
 yy68:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy223;
-#line 191 "cpp.re"
+ if ((yych = *YYCURSOR) == '=') goto yy235;
+#line 201 "cpp.re"
     { BOOST_WAVE_RET(T_NOT); }
-#line 623 "cpp_re.inc"
+#line 643 "cpp_re.inc"
 yy70:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy221;
-#line 193 "cpp.re"
+ if ((yych = *YYCURSOR) == '=') goto yy233;
+#line 203 "cpp.re"
     { BOOST_WAVE_RET(T_ASSIGN); }
-#line 629 "cpp_re.inc"
+#line 649 "cpp_re.inc"
 yy72:
     ++YYCURSOR;
     if ((yych = *YYCURSOR) <= '<') goto yy73;
- if (yych <= '=') goto yy215;
- if (yych <= '>') goto yy217;
+ if (yych <= '=') goto yy227;
+ if (yych <= '>') goto yy229;
 yy73:
-#line 195 "cpp.re"
+#line 205 "cpp.re"
     { BOOST_WAVE_RET(T_GREATER); }
-#line 638 "cpp_re.inc"
+#line 658 "cpp_re.inc"
 yy74:
     ++YYCURSOR;
-#line 227 "cpp.re"
+#line 237 "cpp.re"
     { BOOST_WAVE_RET(T_COMMA); }
-#line 643 "cpp_re.inc"
+#line 663 "cpp_re.inc"
 yy76:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- goto yy195;
-yy77:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
- }
- if (yych <= '\'') {
- if (yych == '"') goto yy96;
- if (yych <= '&') goto yy9;
- goto yy214;
+ if (yych <= '?') {
+ if (yych <= '&') {
+ if (yych <= '"') {
+ if (yych <= '!') goto yy9;
+ goto yy137;
+ } else {
+ if (yych == '$') goto yy108;
+ goto yy9;
+ }
+ } else {
+ if (yych <= '/') {
+ if (yych <= '\'') goto yy226;
+ goto yy9;
+ } else {
+ if (yych <= '9') goto yy108;
+ if (yych <= '>') goto yy9;
+ goto yy111;
+ }
+ }
     } else {
- if (yych <= '?') {
- if (yych <= '>') goto yy9;
- goto yy197;
+ if (yych <= '[') {
+ if (yych <= 'Q') {
+ if (yych <= '@') goto yy9;
+ goto yy108;
+ } else {
+ if (yych <= 'R') goto yy225;
+ if (yych <= 'Z') goto yy108;
+ goto yy9;
+ }
         } else {
- if (yych == '\\') goto yy196;
- goto yy9;
+ if (yych <= '_') {
+ if (yych <= '\\') goto yy110;
+ if (yych <= '^') goto yy9;
+ goto yy108;
+ } else {
+ if (yych <= '`') goto yy9;
+ if (yych <= 'z') goto yy108;
+ goto yy9;
+ }
         }
     }
-yy78:
+yy77:
     yyaccept = 5;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'U') goto yy186;
- if (yych == 'u') goto yy185;
-yy79:
-#line 299 "cpp.re"
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy182;
+ if (yych >= '\v') goto yy182;
+ } else {
+ if (yych <= 0x1F) goto yy78;
+ if (yych != '\'') goto yy182;
+ }
+yy78:
+#line 339 "cpp.re"
     { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 675 "cpp_re.inc"
-yy80:
+#line 721 "cpp_re.inc"
+yy79:
     yyaccept = 5;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= '\f') {
- if (yych == '\t') goto yy142;
- if (yych <= '\n') goto yy79;
- goto yy142;
- } else {
- if (yych <= 0x1F) goto yy79;
- if (yych == '\'') goto yy79;
- goto yy142;
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy138;
+ goto yy78;
+ } else {
+ if (yych <= '\f') goto yy138;
+ if (yych <= 0x1F) goto yy78;
+ goto yy138;
     }
+yy80:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '"') goto yy135;
+ goto yy109;
 yy81:
- yyaccept = 5;
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= '\n') {
- if (yych == '\t') goto yy97;
- goto yy79;
+ if (yych <= '&') {
+ if (yych == '"') goto yy129;
+ goto yy109;
     } else {
- if (yych <= '\f') goto yy97;
- if (yych <= 0x1F) goto yy79;
- goto yy97;
+ if (yych <= '\'') goto yy131;
+ if (yych == 'R') goto yy128;
+ goto yy109;
     }
 yy82:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ goto yy109;
+yy83:
+ yyaccept = 5;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 'U') goto yy100;
+ if (yych == 'u') goto yy98;
+ goto yy78;
+yy84:
     ++YYCURSOR;
     yych = *YYCURSOR;
- goto yy95;
-yy83:
-#line 279 "cpp.re"
+ goto yy97;
+yy85:
+#line 319 "cpp.re"
     { BOOST_WAVE_RET(T_SPACE); }
-#line 706 "cpp_re.inc"
-yy84:
+#line 766 "cpp_re.inc"
+yy86:
     yych = *++YYCURSOR;
- goto yy95;
-yy85:
+ goto yy97;
+yy87:
     ++YYCURSOR;
-yy86:
-#line 282 "cpp.re"
+yy88:
+#line 322 "cpp.re"
     {
         s->line++;
         cursor.column = 1;
         BOOST_WAVE_RET(T_NEWLINE);
     }
-#line 719 "cpp_re.inc"
-yy87:
+#line 779 "cpp_re.inc"
+yy89:
     yych = *++YYCURSOR;
- if (yych == '\n') goto yy93;
- goto yy86;
-yy88:
+ if (yych == '\n') goto yy95;
+ goto yy88;
+yy90:
     ++YYCURSOR;
-#line 289 "cpp.re"
+#line 329 "cpp.re"
     {
         if (s->eof && cursor != s->eof)
         {
@@ -732,50 +792,48 @@
         }
         BOOST_WAVE_RET(T_EOF);
     }
-#line 736 "cpp_re.inc"
-yy90:
+#line 796 "cpp_re.inc"
+yy92:
     yych = *++YYCURSOR;
- goto yy79;
-yy91:
+ goto yy78;
+yy93:
     ++YYCURSOR;
-#line 302 "cpp.re"
+#line 342 "cpp.re"
     {
         // flag the error
         BOOST_WAVE_UPDATE_CURSOR(); // adjust the input cursor
         (*s->error_proc)(s, lexing_exception::generic_lexing_error,
             "invalid character '\\%03o' in input stream", *--YYCURSOR);
     }
-#line 749 "cpp_re.inc"
-yy93:
- yych = *++YYCURSOR;
- goto yy86;
-yy94:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+#line 809 "cpp_re.inc"
 yy95:
- if (yybm[256+yych] & 16) {
- goto yy94;
- }
- goto yy83;
+ yych = *++YYCURSOR;
+ goto yy88;
 yy96:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy97:
- if (yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 16) {
         goto yy96;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy99;
- goto yy100;
+ goto yy85;
 yy98:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy125;
+ } else {
+ if (yych <= 'F') goto yy125;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy125;
+ }
+yy99:
     YYCURSOR = YYMARKER;
- if (yyaccept <= 51) {
- if (yyaccept <= 25) {
- if (yyaccept <= 12) {
- if (yyaccept <= 6) {
+ if (yyaccept <= 56) {
+ if (yyaccept <= 28) {
+ if (yyaccept <= 14) {
+ if (yyaccept <= 7) {
                     if (yyaccept <= 3) {
                         if (yyaccept <= 1) {
                             if (yyaccept <= 0) {
@@ -795,634 +853,1020 @@
                             if (yyaccept <= 4) {
                                 goto yy65;
                             } else {
- goto yy79;
+ goto yy78;
                             }
                         } else {
- goto yy102;
+ if (yyaccept <= 6) {
+ goto yy142;
+ } else {
+ goto yy192;
+ }
                         }
                     }
                 } else {
- if (yyaccept <= 9) {
- if (yyaccept <= 8) {
- if (yyaccept <= 7) {
- goto yy152;
+ if (yyaccept <= 11) {
+ if (yyaccept <= 9) {
+ if (yyaccept <= 8) {
+ goto yy251;
                             } else {
- goto yy239;
+ goto yy255;
                             }
                         } else {
- goto yy243;
+ if (yyaccept <= 10) {
+ goto yy291;
+ } else {
+ goto yy306;
+ }
                         }
                     } else {
- if (yyaccept <= 11) {
- if (yyaccept <= 10) {
- goto yy279;
+ if (yyaccept <= 13) {
+ if (yyaccept <= 12) {
+ goto yy401;
                             } else {
- goto yy294;
+ goto yy429;
                             }
                         } else {
- goto yy389;
+ goto yy433;
                         }
                     }
                 }
             } else {
- if (yyaccept <= 19) {
- if (yyaccept <= 16) {
- if (yyaccept <= 14) {
- if (yyaccept <= 13) {
- goto yy417;
+ if (yyaccept <= 21) {
+ if (yyaccept <= 18) {
+ if (yyaccept <= 16) {
+ if (yyaccept <= 15) {
+ goto yy437;
                             } else {
- goto yy421;
+ goto yy468;
                             }
                         } else {
- if (yyaccept <= 15) {
- goto yy425;
+ if (yyaccept <= 17) {
+ goto yy474;
                             } else {
- goto yy456;
+ goto yy482;
                             }
                         }
                     } else {
- if (yyaccept <= 18) {
- if (yyaccept <= 17) {
- goto yy462;
+ if (yyaccept <= 20) {
+ if (yyaccept <= 19) {
+ goto yy490;
                             } else {
- goto yy470;
+ goto yy495;
                             }
                         } else {
- goto yy478;
+ goto yy500;
                         }
                     }
                 } else {
- if (yyaccept <= 22) {
- if (yyaccept <= 21) {
- if (yyaccept <= 20) {
- goto yy483;
+ if (yyaccept <= 25) {
+ if (yyaccept <= 23) {
+ if (yyaccept <= 22) {
+ goto yy503;
                             } else {
- goto yy488;
+ goto yy513;
                             }
                         } else {
- goto yy491;
+ if (yyaccept <= 24) {
+ goto yy519;
+ } else {
+ goto yy522;
+ }
                         }
                     } else {
- if (yyaccept <= 24) {
- if (yyaccept <= 23) {
- goto yy501;
+ if (yyaccept <= 27) {
+ if (yyaccept <= 26) {
+ goto yy529;
                             } else {
- goto yy507;
+ goto yy536;
                             }
                         } else {
- goto yy510;
+ goto yy538;
                         }
                     }
                 }
             }
         } else {
- if (yyaccept <= 38) {
- if (yyaccept <= 32) {
- if (yyaccept <= 29) {
- if (yyaccept <= 27) {
- if (yyaccept <= 26) {
- goto yy517;
+ if (yyaccept <= 42) {
+ if (yyaccept <= 35) {
+ if (yyaccept <= 32) {
+ if (yyaccept <= 30) {
+ if (yyaccept <= 29) {
+ goto yy540;
                             } else {
- goto yy524;
+ goto yy542;
                             }
                         } else {
- if (yyaccept <= 28) {
- goto yy526;
+ if (yyaccept <= 31) {
+ goto yy548;
                             } else {
- goto yy528;
+ goto yy554;
                             }
                         }
                     } else {
- if (yyaccept <= 31) {
- if (yyaccept <= 30) {
- goto yy530;
+ if (yyaccept <= 34) {
+ if (yyaccept <= 33) {
+ goto yy564;
                             } else {
- goto yy536;
+ goto yy566;
                             }
                         } else {
- goto yy542;
+ goto yy572;
                         }
                     }
                 } else {
- if (yyaccept <= 35) {
- if (yyaccept <= 34) {
- if (yyaccept <= 33) {
- goto yy552;
+ if (yyaccept <= 39) {
+ if (yyaccept <= 37) {
+ if (yyaccept <= 36) {
+ goto yy579;
                             } else {
- goto yy554;
+ goto yy587;
                             }
                         } else {
- goto yy560;
+ if (yyaccept <= 38) {
+ goto yy590;
+ } else {
+ goto yy603;
+ }
                         }
                     } else {
- if (yyaccept <= 37) {
- if (yyaccept <= 36) {
- goto yy566;
+ if (yyaccept <= 41) {
+ if (yyaccept <= 40) {
+ goto yy605;
                             } else {
- goto yy574;
+ goto yy608;
                             }
                         } else {
- goto yy577;
+ goto yy611;
                         }
                     }
                 }
             } else {
- if (yyaccept <= 45) {
- if (yyaccept <= 42) {
- if (yyaccept <= 40) {
- if (yyaccept <= 39) {
- goto yy590;
+ if (yyaccept <= 49) {
+ if (yyaccept <= 46) {
+ if (yyaccept <= 44) {
+ if (yyaccept <= 43) {
+ goto yy613;
                             } else {
- goto yy592;
+ goto yy619;
                             }
                         } else {
- if (yyaccept <= 41) {
- goto yy595;
+ if (yyaccept <= 45) {
+ goto yy628;
                             } else {
- goto yy598;
+ goto yy630;
                             }
                         }
                     } else {
- if (yyaccept <= 44) {
- if (yyaccept <= 43) {
- goto yy600;
+ if (yyaccept <= 48) {
+ if (yyaccept <= 47) {
+ goto yy637;
                             } else {
- goto yy605;
+ goto yy646;
                             }
                         } else {
- goto yy607;
+ goto yy652;
                         }
                     }
                 } else {
- if (yyaccept <= 48) {
- if (yyaccept <= 47) {
- if (yyaccept <= 46) {
- goto yy614;
+ if (yyaccept <= 53) {
+ if (yyaccept <= 51) {
+ if (yyaccept <= 50) {
+ goto yy656;
                             } else {
- goto yy623;
+ goto yy663;
                             }
                         } else {
- goto yy629;
+ if (yyaccept <= 52) {
+ goto yy669;
+ } else {
+ goto yy675;
+ }
                         }
                     } else {
- if (yyaccept <= 50) {
- if (yyaccept <= 49) {
- goto yy633;
+ if (yyaccept <= 55) {
+ if (yyaccept <= 54) {
+ goto yy679;
                             } else {
- goto yy639;
+ goto yy683;
                             }
                         } else {
- goto yy645;
+ goto yy691;
                         }
                     }
                 }
             }
         }
     } else {
- if (yyaccept <= 77) {
- if (yyaccept <= 64) {
- if (yyaccept <= 58) {
- if (yyaccept <= 55) {
- if (yyaccept <= 53) {
- if (yyaccept <= 52) {
- goto yy649;
+ if (yyaccept <= 85) {
+ if (yyaccept <= 71) {
+ if (yyaccept <= 64) {
+ if (yyaccept <= 60) {
+ if (yyaccept <= 58) {
+ if (yyaccept <= 57) {
+ goto yy705;
                             } else {
- goto yy653;
+ goto yy711;
                             }
                         } else {
- if (yyaccept <= 54) {
- goto yy661;
+ if (yyaccept <= 59) {
+ goto yy718;
                             } else {
- goto yy675;
+ goto yy727;
                             }
                         }
                     } else {
- if (yyaccept <= 57) {
- if (yyaccept <= 56) {
- goto yy681;
+ if (yyaccept <= 62) {
+ if (yyaccept <= 61) {
+ goto yy732;
                             } else {
- goto yy688;
+ goto yy735;
                             }
                         } else {
- goto yy697;
+ if (yyaccept <= 63) {
+ goto yy739;
+ } else {
+ goto yy746;
+ }
                         }
                     }
                 } else {
- if (yyaccept <= 61) {
- if (yyaccept <= 60) {
- if (yyaccept <= 59) {
- goto yy702;
+ if (yyaccept <= 68) {
+ if (yyaccept <= 66) {
+ if (yyaccept <= 65) {
+ goto yy756;
                             } else {
- goto yy705;
+ goto yy759;
                             }
                         } else {
- goto yy709;
+ if (yyaccept <= 67) {
+ goto yy763;
+ } else {
+ goto yy769;
+ }
                         }
                     } else {
- if (yyaccept <= 63) {
- if (yyaccept <= 62) {
- goto yy716;
+ if (yyaccept <= 70) {
+ if (yyaccept <= 69) {
+ goto yy771;
                             } else {
- goto yy721;
+ goto yy779;
                             }
                         } else {
- goto yy725;
+ goto yy786;
                         }
                     }
                 }
             } else {
- if (yyaccept <= 71) {
- if (yyaccept <= 68) {
- if (yyaccept <= 66) {
- if (yyaccept <= 65) {
- goto yy727;
+ if (yyaccept <= 78) {
+ if (yyaccept <= 75) {
+ if (yyaccept <= 73) {
+ if (yyaccept <= 72) {
+ goto yy790;
                             } else {
- goto yy735;
+ goto yy792;
                             }
                         } else {
- if (yyaccept <= 67) {
- goto yy742;
+ if (yyaccept <= 74) {
+ goto yy797;
                             } else {
- goto yy746;
+ goto yy801;
                             }
                         }
                     } else {
- if (yyaccept <= 70) {
- if (yyaccept <= 69) {
- goto yy748;
+ if (yyaccept <= 77) {
+ if (yyaccept <= 76) {
+ goto yy806;
                             } else {
- goto yy753;
+ goto yy810;
                             }
                         } else {
- goto yy757;
+ goto yy819;
                         }
                     }
                 } else {
- if (yyaccept <= 74) {
- if (yyaccept <= 73) {
- if (yyaccept <= 72) {
- goto yy762;
+ if (yyaccept <= 82) {
+ if (yyaccept <= 80) {
+ if (yyaccept <= 79) {
+ goto yy821;
                             } else {
- goto yy766;
+ goto yy825;
                             }
                         } else {
- goto yy775;
+ if (yyaccept <= 81) {
+ goto yy829;
+ } else {
+ goto yy838;
+ }
                         }
                     } else {
- if (yyaccept <= 76) {
- if (yyaccept <= 75) {
- goto yy777;
+ if (yyaccept <= 84) {
+ if (yyaccept <= 83) {
+ goto yy843;
                             } else {
- goto yy781;
+ goto yy848;
                             }
                         } else {
- goto yy785;
+ goto yy851;
                         }
                     }
                 }
             }
         } else {
- if (yyaccept <= 90) {
- if (yyaccept <= 84) {
- if (yyaccept <= 81) {
- if (yyaccept <= 79) {
- if (yyaccept <= 78) {
- goto yy794;
+ if (yyaccept <= 99) {
+ if (yyaccept <= 92) {
+ if (yyaccept <= 89) {
+ if (yyaccept <= 87) {
+ if (yyaccept <= 86) {
+ goto yy854;
                             } else {
- goto yy799;
+ goto yy857;
                             }
                         } else {
- if (yyaccept <= 80) {
- goto yy804;
+ if (yyaccept <= 88) {
+ goto yy869;
                             } else {
- goto yy807;
+ goto yy874;
                             }
                         }
                     } else {
- if (yyaccept <= 83) {
- if (yyaccept <= 82) {
- goto yy810;
+ if (yyaccept <= 91) {
+ if (yyaccept <= 90) {
+ goto yy881;
                             } else {
- goto yy813;
+ goto yy886;
                             }
                         } else {
- goto yy825;
+ goto yy892;
                         }
                     }
                 } else {
- if (yyaccept <= 87) {
- if (yyaccept <= 86) {
- if (yyaccept <= 85) {
- goto yy830;
+ if (yyaccept <= 96) {
+ if (yyaccept <= 94) {
+ if (yyaccept <= 93) {
+ goto yy901;
                             } else {
- goto yy836;
+ goto yy908;
                             }
                         } else {
- goto yy841;
+ if (yyaccept <= 95) {
+ goto yy910;
+ } else {
+ goto yy916;
+ }
                         }
                     } else {
- if (yyaccept <= 89) {
- if (yyaccept <= 88) {
- goto yy850;
+ if (yyaccept <= 98) {
+ if (yyaccept <= 97) {
+ goto yy921;
                             } else {
- goto yy857;
+ goto yy925;
                             }
                         } else {
- goto yy859;
+ goto yy928;
                         }
                     }
                 }
             } else {
- if (yyaccept <= 97) {
- if (yyaccept <= 94) {
- if (yyaccept <= 92) {
- if (yyaccept <= 91) {
- goto yy865;
+ if (yyaccept <= 106) {
+ if (yyaccept <= 103) {
+ if (yyaccept <= 101) {
+ if (yyaccept <= 100) {
+ goto yy934;
                             } else {
- goto yy869;
+ goto yy938;
                             }
                         } else {
- if (yyaccept <= 93) {
- goto yy872;
+ if (yyaccept <= 102) {
+ goto yy943;
                             } else {
- goto yy877;
+ goto yy945;
                             }
                         }
                     } else {
- if (yyaccept <= 96) {
- if (yyaccept <= 95) {
- goto yy879;
+ if (yyaccept <= 105) {
+ if (yyaccept <= 104) {
+ goto yy952;
                             } else {
- goto yy886;
+ goto yy955;
                             }
                         } else {
- goto yy889;
+ goto yy960;
                         }
                     }
                 } else {
- if (yyaccept <= 100) {
- if (yyaccept <= 99) {
- if (yyaccept <= 98) {
- goto yy894;
+ if (yyaccept <= 110) {
+ if (yyaccept <= 108) {
+ if (yyaccept <= 107) {
+ goto yy963;
                             } else {
- goto yy897;
+ goto yy970;
                             }
                         } else {
- goto yy903;
+ if (yyaccept <= 109) {
+ goto yy972;
+ } else {
+ goto yy974;
+ }
                         }
                     } else {
- if (yyaccept <= 102) {
- if (yyaccept <= 101) {
- goto yy905;
+ if (yyaccept <= 112) {
+ if (yyaccept <= 111) {
+ goto yy978;
                             } else {
- goto yy907;
+ goto yy985;
                             }
                         } else {
- goto yy911;
+ goto yy987;
                         }
                     }
                 }
             }
         }
     }
-yy99:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
- }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy112;
 yy100:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy101;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy101:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy102;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy102:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy103;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy103:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy104;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy104:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy105;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy105:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy106;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy106:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy107;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy107:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy108;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy108:
+ yyaccept = 1;
+ YYMARKER = ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+yy109:
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych != '\\') goto yy9;
+yy110:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych == 'U') goto yy114;
+ if (yych == 'u') goto yy113;
+ goto yy99;
+yy111:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych != '?') goto yy99;
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych == '/') goto yy110;
+ goto yy99;
+yy113:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy122;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy122;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy122;
+ goto yy99;
+ }
+yy114:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy115;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy115:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy116;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy116:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy117;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy117:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy118;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy118:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy119;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy119:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy120;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy120:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy121;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy121:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy108;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy108;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy108;
+ goto yy99;
+ }
+yy122:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy123;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy123:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy124;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy124:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy108;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy108;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy108;
+ goto yy99;
+ }
+yy125:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy126;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy126:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy127;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy127:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy108;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy108;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy108;
+ goto yy99;
+ }
+yy128:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '"') goto yy133;
+ goto yy109;
+yy129:
+ ++YYCURSOR;
+#line 274 "cpp.re"
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extstringlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+#line 1591 "cpp_re.inc"
+yy131:
+ ++YYCURSOR;
+#line 266 "cpp.re"
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extcharlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+#line 1601 "cpp_re.inc"
+yy133:
+ ++YYCURSOR;
+#line 282 "cpp.re"
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extrawstringlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+#line 1611 "cpp_re.inc"
+yy135:
+ ++YYCURSOR;
+#line 258 "cpp.re"
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extrawstringlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+#line 1621 "cpp_re.inc"
+yy137:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+yy138:
+ if (yybm[256+yych] & 64) {
+ goto yy137;
+ }
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych >= '\\') goto yy140;
+yy139:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
+ }
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych <= '[') goto yy152;
+yy140:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy96;
- goto yy98;
+ if (yych == '"') goto yy137;
+ goto yy99;
             } else {
- if (yych <= '\'') goto yy96;
- if (yych <= '/') goto yy98;
- goto yy107;
+ if (yych <= '\'') goto yy137;
+ if (yych <= '/') goto yy99;
+ goto yy147;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy105;
- goto yy98;
+ if (yych == '?') goto yy145;
+ goto yy99;
             } else {
- if (yych <= 'U') goto yy104;
- if (yych == '\\') goto yy96;
- goto yy98;
+ if (yych <= 'U') goto yy144;
+ if (yych == '\\') goto yy137;
+ goto yy99;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy96;
- if (yych <= 'e') goto yy98;
- goto yy96;
- } else {
- if (yych == 'n') goto yy96;
- if (yych <= 'q') goto yy98;
- goto yy96;
+ if (yych <= 'b') goto yy137;
+ if (yych <= 'e') goto yy99;
+ goto yy137;
+ } else {
+ if (yych == 'n') goto yy137;
+ if (yych <= 'q') goto yy99;
+ goto yy137;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy98;
- if (yych <= 't') goto yy96;
- goto yy103;
- } else {
- if (yych <= 'v') goto yy96;
- if (yych == 'x') goto yy106;
- goto yy98;
+ if (yych <= 's') goto yy99;
+ if (yych <= 't') goto yy137;
+ goto yy143;
+ } else {
+ if (yych <= 'v') goto yy137;
+ if (yych == 'x') goto yy146;
+ goto yy99;
             }
         }
     }
-yy101:
+yy141:
     ++YYCURSOR;
-yy102:
-#line 249 "cpp.re"
+yy142:
+#line 255 "cpp.re"
     { BOOST_WAVE_RET(T_STRINGLIT); }
-#line 1251 "cpp_re.inc"
-yy103:
+#line 1695 "cpp_re.inc"
+yy143:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy138;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy138;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy138;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy178;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy178;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy178;
+ goto yy99;
     }
-yy104:
+yy144:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy131;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy131;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy131;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy171;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy171;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy171;
+ goto yy99;
     }
-yy105:
+yy145:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy111;
- goto yy100;
-yy106:
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych <= '[') goto yy151;
+ goto yy140;
+yy146:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 64) {
- goto yy109;
+ if (yybm[256+yych] & 128) {
+ goto yy149;
     }
- goto yy98;
-yy107:
+ goto yy99;
+yy147:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '"') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy96;
- goto yy98;
+ if (yych == '\t') goto yy137;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy96;
- if (yych <= 0x1F) goto yy98;
- if (yych <= '!') goto yy96;
- goto yy101;
+ if (yych <= '\f') goto yy137;
+ if (yych <= 0x1F) goto yy99;
+ if (yych <= '!') goto yy137;
+ goto yy141;
         }
     } else {
         if (yych <= '>') {
- if (yych <= '/') goto yy96;
- if (yych >= '8') goto yy96;
+ if (yych <= '/') goto yy137;
+ if (yych >= '8') goto yy137;
         } else {
- if (yych <= '?') goto yy99;
- if (yych == '\\') goto yy100;
- goto yy96;
+ if (yych <= '?') goto yy139;
+ if (yych == '\\') goto yy140;
+ goto yy137;
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy99;
- goto yy100;
-yy109:
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych <= '[') goto yy139;
+ goto yy140;
+yy149:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 64) {
- goto yy109;
+ if (yybm[256+yych] & 128) {
+ goto yy149;
     }
     if (yych <= '!') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy96;
- goto yy98;
+ if (yych == '\t') goto yy137;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy96;
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= '\f') goto yy137;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
         }
     } else {
         if (yych <= '?') {
- if (yych <= '"') goto yy101;
- if (yych <= '>') goto yy96;
- goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych <= '>') goto yy137;
+ goto yy139;
         } else {
- if (yych == '\\') goto yy100;
- goto yy96;
+ if (yych == '\\') goto yy140;
+ goto yy137;
         }
     }
-yy111:
+yy151:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych >= '\\') goto yy100;
-yy112:
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych >= '\\') goto yy140;
+yy152:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 128) {
- goto yy112;
+ if (yybm[0+yych] & 1) {
+ goto yy152;
     }
     if (yych <= '!') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy96;
- goto yy98;
+ if (yych == '\t') goto yy137;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy96;
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= '\f') goto yy137;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
         }
     } else {
         if (yych <= '/') {
- if (yych <= '"') goto yy101;
- if (yych <= '.') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '.') goto yy137;
         } else {
- if (yych == '\\') goto yy100;
- goto yy96;
+ if (yych == '\\') goto yy140;
+ goto yy137;
         }
     }
-yy114:
+yy154:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 1) {
- goto yy114;
+ if (yybm[0+yych] & 2) {
+ goto yy154;
     }
     if (yych <= '7') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy118;
- if (yych <= '/') goto yy96;
- goto yy107;
+ if (yych <= '"') goto yy158;
+ if (yych <= '/') goto yy137;
+ goto yy147;
             }
         }
     } else {
         if (yych <= 'U') {
- if (yych == '?') goto yy119;
- if (yych <= 'T') goto yy96;
- goto yy117;
+ if (yych == '?') goto yy159;
+ if (yych <= 'T') goto yy137;
+ goto yy157;
         } else {
             if (yych <= 'u') {
- if (yych <= 't') goto yy96;
+ if (yych <= 't') goto yy137;
             } else {
- if (yych == 'x') goto yy109;
- goto yy96;
+ if (yych == 'x') goto yy149;
+ goto yy137;
             }
         }
     }
@@ -1431,146 +1875,146 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
- goto yy128;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
+ goto yy168;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
- goto yy128;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
+ goto yy168;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych <= 'f') goto yy128;
- goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych <= 'f') goto yy168;
+ goto yy137;
             }
         }
     }
-yy117:
+yy157:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
- goto yy121;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
+ goto yy161;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
- goto yy121;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
+ goto yy161;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych <= 'f') goto yy121;
- goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych <= 'f') goto yy161;
+ goto yy137;
             }
         }
     }
-yy118:
+yy158:
     yyaccept = 6;
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy102;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy99;
- goto yy100;
-yy119:
+ if (yych <= '!') goto yy142;
+ if (yych <= '"') goto yy141;
+ if (yych <= '[') goto yy139;
+ goto yy140;
+yy159:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych >= '\\') goto yy100;
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych >= '\\') goto yy140;
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 128) {
- goto yy112;
+ if (yybm[0+yych] & 1) {
+ goto yy152;
     }
     if (yych <= '!') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy96;
- goto yy98;
+ if (yych == '\t') goto yy137;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy96;
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= '\f') goto yy137;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
         }
     } else {
         if (yych <= '/') {
- if (yych <= '"') goto yy101;
- if (yych <= '.') goto yy96;
- goto yy114;
+ if (yych <= '"') goto yy141;
+ if (yych <= '.') goto yy137;
+ goto yy154;
         } else {
- if (yych == '\\') goto yy100;
- goto yy96;
+ if (yych == '\\') goto yy140;
+ goto yy137;
         }
     }
-yy121:
+yy161:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
@@ -1579,29 +2023,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
@@ -1610,29 +2054,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
@@ -1641,29 +2085,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
@@ -1672,29 +2116,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
@@ -1703,71 +2147,71 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy99;
- goto yy100;
-yy128:
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych <= '[') goto yy139;
+ goto yy140;
+yy168:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
@@ -1776,230 +2220,230 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy99;
- goto yy100;
-yy131:
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych <= '[') goto yy139;
+ goto yy140;
+yy171:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy132;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy172;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy132:
+yy172:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy133;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy173;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy133:
+yy173:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy134;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy174;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy134:
+yy174:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy135;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy175;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy135:
+yy175:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy136;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy176;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy136:
+yy176:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy137;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy177;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy137:
+yy177:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy96;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy96;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy96;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy137;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy137;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy137;
+ goto yy99;
     }
-yy138:
+yy178:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy139;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy179;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy139:
+yy179:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy140;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy180;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy140:
+yy180:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy96;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy96;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy96;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy137;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy137;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy137;
+ goto yy99;
     }
-yy141:
+yy181:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
-yy142:
- if (yybm[0+yych] & 2) {
- goto yy141;
+yy182:
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych >= '\\') goto yy144;
-yy143:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych >= '\\') goto yy184;
+yy183:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych <= '[') goto yy156;
-yy144:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '[') goto yy196;
+yy184:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy141;
- goto yy98;
+ if (yych == '"') goto yy181;
+ goto yy99;
             } else {
- if (yych <= '\'') goto yy141;
- if (yych <= '/') goto yy98;
- goto yy149;
+ if (yych <= '\'') goto yy181;
+ if (yych <= '/') goto yy99;
+ goto yy189;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy147;
- goto yy98;
+ if (yych == '?') goto yy187;
+ goto yy99;
             } else {
- if (yych <= 'U') goto yy146;
- if (yych == '\\') goto yy141;
- goto yy98;
+ if (yych <= 'U') goto yy186;
+ if (yych == '\\') goto yy181;
+ goto yy99;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy141;
- if (yych <= 'e') goto yy98;
- goto yy141;
- } else {
- if (yych == 'n') goto yy141;
- if (yych <= 'q') goto yy98;
- goto yy141;
+ if (yych <= 'b') goto yy181;
+ if (yych <= 'e') goto yy99;
+ goto yy181;
+ } else {
+ if (yych == 'n') goto yy181;
+ if (yych <= 'q') goto yy99;
+ goto yy181;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy98;
- if (yych <= 't') goto yy141;
+ if (yych <= 's') goto yy99;
+ if (yych <= 't') goto yy181;
             } else {
- if (yych <= 'v') goto yy141;
- if (yych == 'x') goto yy148;
- goto yy98;
+ if (yych <= 'v') goto yy181;
+ if (yych == 'x') goto yy188;
+ goto yy99;
             }
         }
     }
@@ -2007,202 +2451,202 @@
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy182;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy222;
+ goto yy99;
     } else {
- if (yych <= 'F') goto yy182;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy182;
- goto yy98;
+ if (yych <= 'F') goto yy222;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy222;
+ goto yy99;
     }
-yy146:
+yy186:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy175;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy175;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy175;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy215;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy215;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy215;
+ goto yy99;
     }
-yy147:
+yy187:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych <= '[') goto yy155;
- goto yy144;
-yy148:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '[') goto yy195;
+ goto yy184;
+yy188:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy153;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy193;
+ goto yy99;
     } else {
- if (yych <= 'F') goto yy153;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy153;
- goto yy98;
+ if (yych <= 'F') goto yy193;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy193;
+ goto yy99;
     }
-yy149:
+yy189:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '\'') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy141;
- goto yy98;
+ if (yych == '\t') goto yy181;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy141;
- if (yych <= 0x1F) goto yy98;
- if (yych <= '&') goto yy141;
- goto yy151;
+ if (yych <= '\f') goto yy181;
+ if (yych <= 0x1F) goto yy99;
+ if (yych <= '&') goto yy181;
+ goto yy191;
         }
     } else {
         if (yych <= '>') {
- if (yych <= '/') goto yy141;
- if (yych >= '8') goto yy141;
+ if (yych <= '/') goto yy181;
+ if (yych >= '8') goto yy181;
         } else {
- if (yych <= '?') goto yy143;
- if (yych == '\\') goto yy144;
- goto yy141;
+ if (yych <= '?') goto yy183;
+ if (yych == '\\') goto yy184;
+ goto yy181;
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych <= '[') goto yy143;
- goto yy144;
-yy151:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '[') goto yy183;
+ goto yy184;
+yy191:
     ++YYCURSOR;
-yy152:
-#line 246 "cpp.re"
+yy192:
+#line 252 "cpp.re"
     { BOOST_WAVE_RET(T_CHARLIT); }
-#line 2098 "cpp_re.inc"
-yy153:
+#line 2542 "cpp_re.inc"
+yy193:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
- goto yy153;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
+ goto yy193;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
- goto yy153;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
+ goto yy193;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych <= 'f') goto yy153;
- goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych <= 'f') goto yy193;
+ goto yy181;
             }
         }
     }
-yy155:
+yy195:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych >= '\\') goto yy144;
-yy156:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych >= '\\') goto yy184;
+yy196:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '\'') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy141;
- goto yy98;
+ if (yych == '\t') goto yy181;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy141;
- if (yych <= 0x1F) goto yy98;
- if (yych <= '&') goto yy141;
- goto yy151;
+ if (yych <= '\f') goto yy181;
+ if (yych <= 0x1F) goto yy99;
+ if (yych <= '&') goto yy181;
+ goto yy191;
         }
     } else {
         if (yych <= '>') {
- if (yych != '/') goto yy141;
+ if (yych != '/') goto yy181;
         } else {
- if (yych <= '?') goto yy156;
- if (yych == '\\') goto yy144;
- goto yy141;
+ if (yych <= '?') goto yy196;
+ if (yych == '\\') goto yy184;
+ goto yy181;
         }
     }
-yy158:
+yy198:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '>') {
         if (yych <= 0x1F) {
             if (yych <= '\t') {
- if (yych <= 0x08) goto yy98;
- goto yy141;
+ if (yych <= 0x08) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\n') goto yy98;
- if (yych <= '\f') goto yy141;
- goto yy98;
+ if (yych <= '\n') goto yy99;
+ if (yych <= '\f') goto yy181;
+ goto yy99;
             }
         } else {
             if (yych <= '\'') {
- if (yych <= '&') goto yy141;
- goto yy162;
+ if (yych <= '&') goto yy181;
+ goto yy202;
             } else {
- if (yych <= '/') goto yy141;
- if (yych <= '7') goto yy149;
- goto yy141;
+ if (yych <= '/') goto yy181;
+ if (yych <= '7') goto yy189;
+ goto yy181;
             }
         }
     } else {
         if (yych <= '\\') {
             if (yych <= 'T') {
- if (yych <= '?') goto yy163;
- goto yy141;
+ if (yych <= '?') goto yy203;
+ goto yy181;
             } else {
- if (yych <= 'U') goto yy161;
- if (yych <= '[') goto yy141;
- goto yy158;
+ if (yych <= 'U') goto yy201;
+ if (yych <= '[') goto yy181;
+ goto yy198;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 't') goto yy141;
+ if (yych <= 't') goto yy181;
             } else {
- if (yych == 'x') goto yy153;
- goto yy141;
+ if (yych == 'x') goto yy193;
+ goto yy181;
             }
         }
     }
@@ -2211,144 +2655,144 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
- goto yy172;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
+ goto yy212;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
- goto yy172;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
+ goto yy212;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych <= 'f') goto yy172;
- goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych <= 'f') goto yy212;
+ goto yy181;
             }
         }
     }
-yy161:
+yy201:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
- goto yy165;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
+ goto yy205;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
- goto yy165;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
+ goto yy205;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych <= 'f') goto yy165;
- goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych <= 'f') goto yy205;
+ goto yy181;
             }
         }
     }
-yy162:
+yy202:
     yyaccept = 7;
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy152;
- if (yych <= '\'') goto yy151;
- if (yych <= '[') goto yy143;
- goto yy144;
-yy163:
+ if (yych <= '&') goto yy192;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '[') goto yy183;
+ goto yy184;
+yy203:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych >= '\\') goto yy144;
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych >= '\\') goto yy184;
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '\'') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy141;
- goto yy98;
+ if (yych == '\t') goto yy181;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy141;
- if (yych <= 0x1F) goto yy98;
- if (yych <= '&') goto yy141;
- goto yy151;
+ if (yych <= '\f') goto yy181;
+ if (yych <= 0x1F) goto yy99;
+ if (yych <= '&') goto yy181;
+ goto yy191;
         }
     } else {
         if (yych <= '>') {
- if (yych == '/') goto yy158;
- goto yy141;
+ if (yych == '/') goto yy198;
+ goto yy181;
         } else {
- if (yych <= '?') goto yy156;
- if (yych == '\\') goto yy144;
- goto yy141;
+ if (yych <= '?') goto yy196;
+ if (yych == '\\') goto yy184;
+ goto yy181;
         }
     }
-yy165:
+yy205:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
@@ -2357,29 +2801,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
@@ -2388,29 +2832,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
@@ -2419,29 +2863,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
@@ -2450,29 +2894,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
@@ -2481,71 +2925,71 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych <= '[') goto yy143;
- goto yy144;
-yy172:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '[') goto yy183;
+ goto yy184;
+yy212:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
@@ -2554,603 +2998,306 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych <= '[') goto yy143;
- goto yy144;
-yy175:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '[') goto yy183;
+ goto yy184;
+yy215:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy176;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy216;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy176:
+yy216:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy177;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy217;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy177:
+yy217:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy178;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy218;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy178:
+yy218:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy179;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy219;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy179:
+yy219:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy180;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy220;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy180:
+yy220:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy181;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy221;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy181:
+yy221:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy141;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy141;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy141;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy181;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy181;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy181;
+ goto yy99;
     }
-yy182:
+yy222:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy183;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy223;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy183:
+yy223:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy184;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy224;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy184:
+yy224:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy141;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy141;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy141;
- goto yy98;
- }
-yy185:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy211;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy211;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy211;
- goto yy98;
- }
-yy186:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy187;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy187:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy188;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy188:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy189;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy189:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy190;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy190:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy191;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy191:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy192;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy192:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy193;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy193:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy181;
+ goto yy99;
     } else {
- if (yych <= 'F') goto yy194;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy181;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy181;
+ goto yy99;
     }
-yy194:
+yy225:
     yyaccept = 1;
- YYMARKER = ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
-yy195:
- if (yybm[0+yych] & 4) {
- goto yy194;
- }
- if (yych == '?') goto yy197;
- if (yych != '\\') goto yy9;
-yy196:
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '"') goto yy135;
+ goto yy109;
+yy226:
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy99;
+ goto yy182;
+yy227:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych == 'U') goto yy200;
- if (yych == 'u') goto yy199;
- goto yy98;
-yy197:
+#line 227 "cpp.re"
+ { BOOST_WAVE_RET(T_GREATEREQUAL); }
+#line 3175 "cpp_re.inc"
+yy229:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych != '?') goto yy98;
+ if ((yych = *YYCURSOR) == '=') goto yy231;
+#line 220 "cpp.re"
+ { BOOST_WAVE_RET(T_SHIFTRIGHT); }
+#line 3181 "cpp_re.inc"
+yy231:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych == '/') goto yy196;
- goto yy98;
-yy199:
+#line 221 "cpp.re"
+ { BOOST_WAVE_RET(T_SHIFTRIGHTASSIGN); }
+#line 3186 "cpp_re.inc"
+yy233:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy208;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy208;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy208;
- goto yy98;
- }
-yy200:
+#line 223 "cpp.re"
+ { BOOST_WAVE_RET(T_EQUAL); }
+#line 3191 "cpp_re.inc"
+yy235:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy201;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy201:
+#line 224 "cpp.re"
+ { BOOST_WAVE_RET(T_NOTEQUAL); }
+#line 3196 "cpp_re.inc"
+yy237:
+ yych = *++YYCURSOR;
+ if (yych == '?') goto yy242;
+ goto yy99;
+yy238:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy202;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy202:
+#line 230 "cpp.re"
+ { BOOST_WAVE_RET(T_OROR); }
+#line 3205 "cpp_re.inc"
+yy240:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy203;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy203:
+#line 216 "cpp.re"
+ { BOOST_WAVE_RET(T_ORASSIGN); }
+#line 3210 "cpp_re.inc"
+yy242:
+ yych = *++YYCURSOR;
+ if (yych != '!') goto yy99;
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy204;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy204:
+#line 232 "cpp.re"
+ { BOOST_WAVE_RET(T_OROR_TRIGRAPH); }
+#line 3217 "cpp_re.inc"
+yy245:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy205;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy205:
+#line 228 "cpp.re"
+ { BOOST_WAVE_RET(T_ANDAND); }
+#line 3222 "cpp_re.inc"
+yy247:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+#line 214 "cpp.re"
+ { BOOST_WAVE_RET(T_ANDASSIGN); }
+#line 3227 "cpp_re.inc"
+yy249:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'r') goto yy109;
+ yyaccept = 8;
+ yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') {
+ if (yych == '$') goto yy108;
+ } else {
+ if (yych <= '9') goto yy108;
+ if (yych == '?') goto yy111;
+ }
     } else {
- if (yych <= 'F') goto yy206;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= '^') {
+ if (yych <= 'Z') goto yy108;
+ if (yych == '\\') goto yy110;
+ } else {
+ if (yych <= '_') goto yy252;
+ if (yych <= '`') goto yy251;
+ if (yych <= 'z') goto yy108;
+ }
     }
-yy206:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy207;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+yy251:
+#line 192 "cpp.re"
+ { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_XOR_ALT); }
+#line 3254 "cpp_re.inc"
+yy252:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'e') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'q') goto yy109;
+ yyaccept = 9;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
-yy207:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy194;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy194;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy194;
- goto yy98;
- }
-yy208:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy209;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy209:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy210;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy210:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy194;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy194;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy194;
- goto yy98;
- }
-yy211:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy212;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy212:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy213;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy213:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy194;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy194;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy194;
- goto yy98;
- }
-yy214:
- yych = *++YYCURSOR;
- if (yych == '\'') goto yy98;
- goto yy142;
-yy215:
- ++YYCURSOR;
-#line 217 "cpp.re"
- { BOOST_WAVE_RET(T_GREATEREQUAL); }
-#line 3028 "cpp_re.inc"
-yy217:
- ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy219;
-#line 210 "cpp.re"
- { BOOST_WAVE_RET(T_SHIFTRIGHT); }
-#line 3034 "cpp_re.inc"
-yy219:
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy255:
+#line 212 "cpp.re"
+ { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_XORASSIGN_ALT); }
+#line 3272 "cpp_re.inc"
+yy256:
     ++YYCURSOR;
 #line 211 "cpp.re"
- { BOOST_WAVE_RET(T_SHIFTRIGHTASSIGN); }
-#line 3039 "cpp_re.inc"
-yy221:
- ++YYCURSOR;
-#line 213 "cpp.re"
- { BOOST_WAVE_RET(T_EQUAL); }
-#line 3044 "cpp_re.inc"
-yy223:
- ++YYCURSOR;
-#line 214 "cpp.re"
- { BOOST_WAVE_RET(T_NOTEQUAL); }
-#line 3049 "cpp_re.inc"
-yy225:
- yych = *++YYCURSOR;
- if (yych == '?') goto yy230;
- goto yy98;
-yy226:
- ++YYCURSOR;
-#line 220 "cpp.re"
- { BOOST_WAVE_RET(T_OROR); }
-#line 3058 "cpp_re.inc"
-yy228:
- ++YYCURSOR;
-#line 206 "cpp.re"
- { BOOST_WAVE_RET(T_ORASSIGN); }
-#line 3063 "cpp_re.inc"
-yy230:
- yych = *++YYCURSOR;
- if (yych != '!') goto yy98;
- ++YYCURSOR;
-#line 222 "cpp.re"
- { BOOST_WAVE_RET(T_OROR_TRIGRAPH); }
-#line 3070 "cpp_re.inc"
-yy233:
- ++YYCURSOR;
-#line 218 "cpp.re"
- { BOOST_WAVE_RET(T_ANDAND); }
-#line 3075 "cpp_re.inc"
-yy235:
- ++YYCURSOR;
-#line 204 "cpp.re"
- { BOOST_WAVE_RET(T_ANDASSIGN); }
-#line 3080 "cpp_re.inc"
-yy237:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
- yyaccept = 8;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= '@') {
- if (yych <= '/') {
- if (yych == '$') goto yy194;
- } else {
- if (yych <= '9') goto yy194;
- if (yych == '?') goto yy197;
- }
- } else {
- if (yych <= '^') {
- if (yych <= 'Z') goto yy194;
- if (yych == '\\') goto yy196;
- } else {
- if (yych <= '_') goto yy240;
- if (yych <= '`') goto yy239;
- if (yych <= 'z') goto yy194;
- }
- }
-yy239:
-#line 182 "cpp.re"
- { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_XOR_ALT); }
-#line 3107 "cpp_re.inc"
-yy240:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'q') goto yy195;
- yyaccept = 9;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
- }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy243:
-#line 202 "cpp.re"
- { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_XORASSIGN_ALT); }
-#line 3125 "cpp_re.inc"
-yy244:
- ++YYCURSOR;
-#line 201 "cpp.re"
     { BOOST_WAVE_RET(T_XORASSIGN); }
-#line 3130 "cpp_re.inc"
-yy246:
+#line 3277 "cpp_re.inc"
+yy258:
     ++YYCURSOR;
-#line 198 "cpp.re"
+#line 208 "cpp.re"
     { BOOST_WAVE_RET(T_STARASSIGN); }
-#line 3135 "cpp_re.inc"
-yy248:
+#line 3282 "cpp_re.inc"
+yy260:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '*') goto yy254;
-#line 238 "cpp.re"
+ if ((yych = *YYCURSOR) == '*') goto yy266;
+#line 248 "cpp.re"
     { BOOST_WAVE_RET(T_ARROW); }
-#line 3141 "cpp_re.inc"
-yy250:
+#line 3288 "cpp_re.inc"
+yy262:
     ++YYCURSOR;
-#line 226 "cpp.re"
+#line 236 "cpp.re"
     { BOOST_WAVE_RET(T_MINUSMINUS); }
-#line 3146 "cpp_re.inc"
-yy252:
+#line 3293 "cpp_re.inc"
+yy264:
     ++YYCURSOR;
-#line 197 "cpp.re"
+#line 207 "cpp.re"
     { BOOST_WAVE_RET(T_MINUSASSIGN); }
-#line 3151 "cpp_re.inc"
-yy254:
+#line 3298 "cpp_re.inc"
+yy266:
     ++YYCURSOR;
-#line 229 "cpp.re"
+#line 239 "cpp.re"
     {
             if (s->act_in_c99_mode) {
                 --YYCURSOR;
@@ -3160,489 +3307,489 @@
                 BOOST_WAVE_RET(T_ARROWSTAR);
             }
         }
-#line 3164 "cpp_re.inc"
-yy256:
+#line 3311 "cpp_re.inc"
+yy268:
     ++YYCURSOR;
-#line 225 "cpp.re"
+#line 235 "cpp.re"
     { BOOST_WAVE_RET(T_PLUSPLUS); }
-#line 3169 "cpp_re.inc"
-yy258:
+#line 3316 "cpp_re.inc"
+yy270:
     ++YYCURSOR;
-#line 196 "cpp.re"
+#line 206 "cpp.re"
     { BOOST_WAVE_RET(T_PLUSASSIGN); }
-#line 3174 "cpp_re.inc"
-yy260:
+#line 3321 "cpp_re.inc"
+yy272:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
     yych = *YYCURSOR;
-yy261:
+yy273:
     if (yych <= 'h') {
         if (yych <= ' ') {
             if (yych <= '\n') {
- if (yych == '\t') goto yy260;
- goto yy98;
+ if (yych == '\t') goto yy272;
+ goto yy99;
             } else {
- if (yych <= '\f') goto yy260;
- if (yych <= 0x1F) goto yy98;
- goto yy260;
+ if (yych <= '\f') goto yy272;
+ if (yych <= 0x1F) goto yy99;
+ goto yy272;
             }
         } else {
             if (yych <= 'c') {
- if (yych != '/') goto yy98;
+ if (yych != '/') goto yy99;
             } else {
- if (yych <= 'd') goto yy269;
- if (yych <= 'e') goto yy263;
- goto yy98;
+ if (yych <= 'd') goto yy281;
+ if (yych <= 'e') goto yy275;
+ goto yy99;
             }
         }
     } else {
         if (yych <= 'q') {
             if (yych <= 'l') {
- if (yych <= 'i') goto yy270;
- if (yych <= 'k') goto yy98;
- goto yy267;
+ if (yych <= 'i') goto yy282;
+ if (yych <= 'k') goto yy99;
+ goto yy279;
             } else {
- if (yych == 'p') goto yy266;
- goto yy98;
+ if (yych == 'p') goto yy278;
+ goto yy99;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 'r') goto yy264;
- if (yych <= 't') goto yy98;
- goto yy268;
+ if (yych <= 'r') goto yy276;
+ if (yych <= 't') goto yy99;
+ goto yy280;
             } else {
- if (yych == 'w') goto yy265;
- goto yy98;
+ if (yych == 'w') goto yy277;
+ goto yy99;
             }
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych == '*') goto yy377;
- goto yy98;
-yy263:
+ if (yych == '*') goto yy389;
+ goto yy99;
+yy275:
     yych = *++YYCURSOR;
     if (yych <= 'm') {
- if (yych == 'l') goto yy353;
- goto yy98;
+ if (yych == 'l') goto yy365;
+ goto yy99;
     } else {
- if (yych <= 'n') goto yy354;
- if (yych == 'r') goto yy355;
- goto yy98;
+ if (yych <= 'n') goto yy366;
+ if (yych == 'r') goto yy367;
+ goto yy99;
     }
-yy264:
- yych = *++YYCURSOR;
- if (yych == 'e') goto yy347;
- goto yy98;
-yy265:
+yy276:
     yych = *++YYCURSOR;
- if (yych == 'a') goto yy340;
- goto yy98;
-yy266:
- yych = *++YYCURSOR;
- if (yych == 'r') goto yy334;
- goto yy98;
-yy267:
+ if (yych == 'e') goto yy359;
+ goto yy99;
+yy277:
     yych = *++YYCURSOR;
- if (yych == 'i') goto yy330;
- goto yy98;
-yy268:
+ if (yych == 'a') goto yy352;
+ goto yy99;
+yy278:
     yych = *++YYCURSOR;
- if (yych == 'n') goto yy325;
- goto yy98;
-yy269:
+ if (yych == 'r') goto yy346;
+ goto yy99;
+yy279:
     yych = *++YYCURSOR;
- if (yych == 'e') goto yy319;
- goto yy98;
-yy270:
+ if (yych == 'i') goto yy342;
+ goto yy99;
+yy280:
     yych = *++YYCURSOR;
- if (yych == 'f') goto yy278;
- if (yych == 'n') goto yy277;
- goto yy98;
-yy271:
+ if (yych == 'n') goto yy337;
+ goto yy99;
+yy281:
     yych = *++YYCURSOR;
- if (yych == '?') goto yy274;
- goto yy98;
-yy272:
+ if (yych == 'e') goto yy331;
+ goto yy99;
+yy282:
+ yych = *++YYCURSOR;
+ if (yych == 'f') goto yy290;
+ if (yych == 'n') goto yy289;
+ goto yy99;
+yy283:
+ yych = *++YYCURSOR;
+ if (yych == '?') goto yy286;
+ goto yy99;
+yy284:
     ++YYCURSOR;
-#line 143 "cpp.re"
+#line 153 "cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND); }
-#line 3272 "cpp_re.inc"
-yy274:
+#line 3419 "cpp_re.inc"
+yy286:
     yych = *++YYCURSOR;
- if (yych != '=') goto yy98;
+ if (yych != '=') goto yy99;
     ++YYCURSOR;
-#line 144 "cpp.re"
+#line 154 "cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_TRIGRAPH); }
-#line 3279 "cpp_re.inc"
-yy277:
+#line 3426 "cpp_re.inc"
+yy289:
     yych = *++YYCURSOR;
- if (yych == 'c') goto yy289;
- goto yy98;
-yy278:
+ if (yych == 'c') goto yy301;
+ goto yy99;
+yy290:
     yyaccept = 10;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'd') goto yy281;
- if (yych == 'n') goto yy280;
-yy279:
-#line 261 "cpp.re"
+ if (yych == 'd') goto yy293;
+ if (yych == 'n') goto yy292;
+yy291:
+#line 301 "cpp.re"
     { BOOST_WAVE_RET(T_PP_IF); }
-#line 3292 "cpp_re.inc"
-yy280:
+#line 3439 "cpp_re.inc"
+yy292:
     yych = *++YYCURSOR;
- if (yych == 'd') goto yy285;
- goto yy98;
-yy281:
+ if (yych == 'd') goto yy297;
+ goto yy99;
+yy293:
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'f') goto yy98;
+ if (yych != 'f') goto yy99;
     ++YYCURSOR;
-#line 262 "cpp.re"
+#line 302 "cpp.re"
     { BOOST_WAVE_RET(T_PP_IFDEF); }
-#line 3305 "cpp_re.inc"
-yy285:
+#line 3452 "cpp_re.inc"
+yy297:
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'f') goto yy98;
+ if (yych != 'f') goto yy99;
     ++YYCURSOR;
-#line 263 "cpp.re"
+#line 303 "cpp.re"
     { BOOST_WAVE_RET(T_PP_IFNDEF); }
-#line 3314 "cpp_re.inc"
-yy289:
+#line 3461 "cpp_re.inc"
+yy301:
     yych = *++YYCURSOR;
- if (yych != 'l') goto yy98;
+ if (yych != 'l') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'u') goto yy98;
+ if (yych != 'u') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'd') goto yy98;
+ if (yych != 'd') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     yyaccept = 11;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '_') goto yy295;
- goto yy297;
-yy294:
-#line 259 "cpp.re"
+ if (yych == '_') goto yy307;
+ goto yy309;
+yy306:
+#line 299 "cpp.re"
     { BOOST_WAVE_RET(T_PP_INCLUDE); }
-#line 3331 "cpp_re.inc"
-yy295:
+#line 3478 "cpp_re.inc"
+yy307:
     yych = *++YYCURSOR;
- if (yych == 'n') goto yy316;
- goto yy98;
-yy296:
+ if (yych == 'n') goto yy328;
+ goto yy99;
+yy308:
     yyaccept = 11;
     YYMARKER = ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
-yy297:
+yy309:
     if (yych <= ' ') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy296;
- goto yy294;
+ if (yych == '\t') goto yy308;
+ goto yy306;
         } else {
- if (yych <= '\f') goto yy296;
- if (yych <= 0x1F) goto yy294;
- goto yy296;
+ if (yych <= '\f') goto yy308;
+ if (yych <= 0x1F) goto yy306;
+ goto yy308;
         }
     } else {
         if (yych <= '.') {
- if (yych == '"') goto yy300;
- goto yy294;
+ if (yych == '"') goto yy312;
+ goto yy306;
         } else {
- if (yych <= '/') goto yy298;
- if (yych == '<') goto yy299;
- goto yy294;
+ if (yych <= '/') goto yy310;
+ if (yych == '<') goto yy311;
+ goto yy306;
         }
     }
-yy298:
+yy310:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych == '*') goto yy309;
- goto yy98;
-yy299:
+ if (yych == '*') goto yy321;
+ goto yy99;
+yy311:
     yych = *++YYCURSOR;
- if (yych == '>') goto yy98;
- goto yy306;
-yy300:
+ if (yych == '>') goto yy99;
+ goto yy318;
+yy312:
     yych = *++YYCURSOR;
- if (yych == '"') goto yy98;
- goto yy302;
-yy301:
+ if (yych == '"') goto yy99;
+ goto yy314;
+yy313:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
-yy302:
+yy314:
     if (yybm[0+yych] & 8) {
- goto yy301;
+ goto yy313;
     }
- if (yych <= '!') goto yy98;
+ if (yych <= '!') goto yy99;
     ++YYCURSOR;
-#line 256 "cpp.re"
+#line 296 "cpp.re"
     { BOOST_WAVE_RET(T_PP_QHEADER); }
-#line 3387 "cpp_re.inc"
-yy305:
+#line 3534 "cpp_re.inc"
+yy317:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
-yy306:
+yy318:
     if (yybm[0+yych] & 16) {
- goto yy305;
+ goto yy317;
     }
- if (yych <= '=') goto yy98;
+ if (yych <= '=') goto yy99;
     ++YYCURSOR;
-#line 253 "cpp.re"
+#line 293 "cpp.re"
     { BOOST_WAVE_RET(T_PP_HHEADER); }
-#line 3400 "cpp_re.inc"
-yy309:
+#line 3547 "cpp_re.inc"
+yy321:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 32) {
- goto yy309;
+ goto yy321;
     }
- if (yych == '\r') goto yy311;
- if (yych <= ')') goto yy98;
- goto yy313;
-yy311:
+ if (yych == '\r') goto yy323;
+ if (yych <= ')') goto yy99;
+ goto yy325;
+yy323:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 32) {
- goto yy309;
+ goto yy321;
     }
- if (yych == '\r') goto yy311;
- if (yych <= ')') goto yy98;
-yy313:
+ if (yych == '\r') goto yy323;
+ if (yych <= ')') goto yy99;
+yy325:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy313;
+ goto yy325;
     }
     if (yych <= '\r') {
- if (yych <= 0x08) goto yy98;
- if (yych <= '\f') goto yy309;
+ if (yych <= 0x08) goto yy99;
+ if (yych <= '\f') goto yy321;
     } else {
- if (yych <= 0x1F) goto yy98;
- if (yych == '/') goto yy296;
- goto yy309;
+ if (yych <= 0x1F) goto yy99;
+ if (yych == '/') goto yy308;
+ goto yy321;
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 32) {
- goto yy309;
+ goto yy321;
     }
- if (yych == '\r') goto yy311;
- if (yych <= ')') goto yy98;
- goto yy313;
-yy316:
+ if (yych == '\r') goto yy323;
+ if (yych <= ')') goto yy99;
+ goto yy325;
+yy328:
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'x') goto yy98;
+ if (yych != 'x') goto yy99;
     yych = *++YYCURSOR;
- if (yych == 't') goto yy296;
- goto yy98;
-yy319:
+ if (yych == 't') goto yy308;
+ goto yy99;
+yy331:
     yych = *++YYCURSOR;
- if (yych != 'f') goto yy98;
+ if (yych != 'f') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'i') goto yy98;
+ if (yych != 'i') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'n') goto yy98;
+ if (yych != 'n') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     ++YYCURSOR;
-#line 267 "cpp.re"
+#line 307 "cpp.re"
     { BOOST_WAVE_RET(T_PP_DEFINE); }
-#line 3464 "cpp_re.inc"
-yy325:
+#line 3611 "cpp_re.inc"
+yy337:
     yych = *++YYCURSOR;
- if (yych != 'd') goto yy98;
+ if (yych != 'd') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'f') goto yy98;
+ if (yych != 'f') goto yy99;
     ++YYCURSOR;
-#line 268 "cpp.re"
+#line 308 "cpp.re"
     { BOOST_WAVE_RET(T_PP_UNDEF); }
-#line 3475 "cpp_re.inc"
-yy330:
+#line 3622 "cpp_re.inc"
+yy342:
     yych = *++YYCURSOR;
- if (yych != 'n') goto yy98;
+ if (yych != 'n') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     ++YYCURSOR;
-#line 269 "cpp.re"
+#line 309 "cpp.re"
     { BOOST_WAVE_RET(T_PP_LINE); }
-#line 3484 "cpp_re.inc"
-yy334:
+#line 3631 "cpp_re.inc"
+yy346:
     yych = *++YYCURSOR;
- if (yych != 'a') goto yy98;
+ if (yych != 'a') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'g') goto yy98;
+ if (yych != 'g') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'm') goto yy98;
+ if (yych != 'm') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'a') goto yy98;
+ if (yych != 'a') goto yy99;
     ++YYCURSOR;
-#line 271 "cpp.re"
+#line 311 "cpp.re"
     { BOOST_WAVE_RET(T_PP_PRAGMA); }
-#line 3497 "cpp_re.inc"
-yy340:
+#line 3644 "cpp_re.inc"
+yy352:
     yych = *++YYCURSOR;
- if (yych != 'r') goto yy98;
+ if (yych != 'r') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'n') goto yy98;
+ if (yych != 'n') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'i') goto yy98;
+ if (yych != 'i') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'n') goto yy98;
+ if (yych != 'n') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'g') goto yy98;
+ if (yych != 'g') goto yy99;
     ++YYCURSOR;
-#line 273 "cpp.re"
+#line 313 "cpp.re"
     { BOOST_WAVE_RET(T_PP_WARNING); }
-#line 3512 "cpp_re.inc"
-yy347:
+#line 3659 "cpp_re.inc"
+yy359:
     yych = *++YYCURSOR;
- if (yych != 'g') goto yy98;
+ if (yych != 'g') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'i') goto yy98;
+ if (yych != 'i') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'o') goto yy98;
+ if (yych != 'o') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'n') goto yy98;
+ if (yych != 'n') goto yy99;
     ++YYCURSOR;
-#line 275 "cpp.re"
+#line 315 "cpp.re"
     { BOOST_WAVE_RET(T_MSEXT_PP_REGION); }
-#line 3525 "cpp_re.inc"
-yy353:
+#line 3672 "cpp_re.inc"
+yy365:
     yych = *++YYCURSOR;
- if (yych == 'i') goto yy371;
- if (yych == 's') goto yy372;
- goto yy98;
-yy354:
+ if (yych == 'i') goto yy383;
+ if (yych == 's') goto yy384;
+ goto yy99;
+yy366:
     yych = *++YYCURSOR;
- if (yych == 'd') goto yy360;
- goto yy98;
-yy355:
+ if (yych == 'd') goto yy372;
+ goto yy99;
+yy367:
     yych = *++YYCURSOR;
- if (yych != 'r') goto yy98;
+ if (yych != 'r') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'o') goto yy98;
+ if (yych != 'o') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'r') goto yy98;
+ if (yych != 'r') goto yy99;
     ++YYCURSOR;
-#line 270 "cpp.re"
+#line 310 "cpp.re"
     { BOOST_WAVE_RET(T_PP_ERROR); }
-#line 3545 "cpp_re.inc"
-yy360:
+#line 3692 "cpp_re.inc"
+yy372:
     yych = *++YYCURSOR;
- if (yych == 'i') goto yy361;
- if (yych == 'r') goto yy362;
- goto yy98;
-yy361:
+ if (yych == 'i') goto yy373;
+ if (yych == 'r') goto yy374;
+ goto yy99;
+yy373:
     yych = *++YYCURSOR;
- if (yych == 'f') goto yy369;
- goto yy98;
-yy362:
+ if (yych == 'f') goto yy381;
+ goto yy99;
+yy374:
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'g') goto yy98;
+ if (yych != 'g') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'i') goto yy98;
+ if (yych != 'i') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'o') goto yy98;
+ if (yych != 'o') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'n') goto yy98;
+ if (yych != 'n') goto yy99;
     ++YYCURSOR;
-#line 276 "cpp.re"
+#line 316 "cpp.re"
     { BOOST_WAVE_RET(T_MSEXT_PP_ENDREGION); }
-#line 3569 "cpp_re.inc"
-yy369:
+#line 3716 "cpp_re.inc"
+yy381:
     ++YYCURSOR;
-#line 266 "cpp.re"
+#line 306 "cpp.re"
     { BOOST_WAVE_RET(T_PP_ENDIF); }
-#line 3574 "cpp_re.inc"
-yy371:
+#line 3721 "cpp_re.inc"
+yy383:
     yych = *++YYCURSOR;
- if (yych == 'f') goto yy375;
- goto yy98;
-yy372:
+ if (yych == 'f') goto yy387;
+ goto yy99;
+yy384:
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     ++YYCURSOR;
-#line 264 "cpp.re"
+#line 304 "cpp.re"
     { BOOST_WAVE_RET(T_PP_ELSE); }
-#line 3585 "cpp_re.inc"
-yy375:
+#line 3732 "cpp_re.inc"
+yy387:
     ++YYCURSOR;
-#line 265 "cpp.re"
+#line 305 "cpp.re"
     { BOOST_WAVE_RET(T_PP_ELIF); }
-#line 3590 "cpp_re.inc"
-yy377:
+#line 3737 "cpp_re.inc"
+yy389:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '\r') {
- if (yych <= 0x08) goto yy98;
- if (yych <= '\f') goto yy377;
+ if (yych <= 0x08) goto yy99;
+ if (yych <= '\f') goto yy389;
     } else {
- if (yych <= 0x1F) goto yy98;
- if (yych == '*') goto yy381;
- goto yy377;
+ if (yych <= 0x1F) goto yy99;
+ if (yych == '*') goto yy393;
+ goto yy389;
     }
-yy379:
+yy391:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '\r') {
- if (yych <= 0x08) goto yy98;
- if (yych <= '\f') goto yy377;
- goto yy379;
+ if (yych <= 0x08) goto yy99;
+ if (yych <= '\f') goto yy389;
+ goto yy391;
     } else {
- if (yych <= 0x1F) goto yy98;
- if (yych != '*') goto yy377;
+ if (yych <= 0x1F) goto yy99;
+ if (yych != '*') goto yy389;
     }
-yy381:
+yy393:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= 0x1F) {
- if (yych <= 0x08) goto yy98;
- if (yych <= '\f') goto yy377;
- if (yych >= 0x0E) goto yy98;
+ if (yych <= 0x08) goto yy99;
+ if (yych <= '\f') goto yy389;
+ if (yych >= 0x0E) goto yy99;
     } else {
         if (yych <= '*') {
- if (yych <= ')') goto yy377;
- goto yy381;
+ if (yych <= ')') goto yy389;
+ goto yy393;
         } else {
- if (yych == '/') goto yy260;
- goto yy377;
+ if (yych == '/') goto yy272;
+ goto yy389;
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '\r') {
- if (yych <= 0x08) goto yy98;
- if (yych <= '\f') goto yy377;
- goto yy379;
- } else {
- if (yych <= 0x1F) goto yy98;
- if (yych == '*') goto yy381;
- goto yy377;
+ if (yych <= 0x08) goto yy99;
+ if (yych <= '\f') goto yy389;
+ goto yy391;
+ } else {
+ if (yych <= 0x1F) goto yy99;
+ if (yych == '*') goto yy393;
+ goto yy389;
     }
-yy384:
+yy396:
     ++YYCURSOR;
-#line 155 "cpp.re"
+#line 165 "cpp.re"
     {
             if (s->act_in_c99_mode) {
                 --YYCURSOR;
@@ -3652,2441 +3799,2758 @@
                 BOOST_WAVE_RET(T_COLON_COLON);
             }
         }
-#line 3656 "cpp_re.inc"
-yy386:
+#line 3803 "cpp_re.inc"
+yy398:
     ++YYCURSOR;
-#line 139 "cpp.re"
+#line 149 "cpp.re"
     { BOOST_WAVE_RET(T_RIGHTBRACKET_ALT); }
-#line 3661 "cpp_re.inc"
-yy388:
+#line 3808 "cpp_re.inc"
+yy400:
     yyaccept = 12;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'e') {
         if (yych <= ' ') {
             if (yych <= '\n') {
- if (yych == '\t') goto yy261;
+ if (yych == '\t') goto yy273;
             } else {
- if (yych <= '\f') goto yy261;
- if (yych >= ' ') goto yy261;
+ if (yych <= '\f') goto yy273;
+ if (yych >= ' ') goto yy273;
             }
         } else {
             if (yych <= '.') {
- if (yych == '%') goto yy394;
+ if (yych == '%') goto yy406;
             } else {
- if (yych <= '/') goto yy261;
- if (yych >= 'd') goto yy261;
+ if (yych <= '/') goto yy273;
+ if (yych >= 'd') goto yy273;
             }
         }
     } else {
         if (yych <= 'p') {
             if (yych <= 'k') {
- if (yych == 'i') goto yy261;
+ if (yych == 'i') goto yy273;
             } else {
- if (yych <= 'l') goto yy261;
- if (yych >= 'p') goto yy261;
+ if (yych <= 'l') goto yy273;
+ if (yych >= 'p') goto yy273;
             }
         } else {
             if (yych <= 't') {
- if (yych == 'r') goto yy261;
+ if (yych == 'r') goto yy273;
             } else {
- if (yych == 'v') goto yy389;
- if (yych <= 'w') goto yy261;
+ if (yych == 'v') goto yy401;
+ if (yych <= 'w') goto yy273;
             }
         }
     }
-yy389:
-#line 141 "cpp.re"
+yy401:
+#line 151 "cpp.re"
     { BOOST_WAVE_RET(T_POUND_ALT); }
-#line 3701 "cpp_re.inc"
-yy390:
+#line 3848 "cpp_re.inc"
+yy402:
     ++YYCURSOR;
-#line 200 "cpp.re"
+#line 210 "cpp.re"
     { BOOST_WAVE_RET(T_PERCENTASSIGN); }
-#line 3706 "cpp_re.inc"
-yy392:
+#line 3853 "cpp_re.inc"
+yy404:
     ++YYCURSOR;
-#line 133 "cpp.re"
+#line 143 "cpp.re"
     { BOOST_WAVE_RET(T_RIGHTBRACE_ALT); }
-#line 3711 "cpp_re.inc"
-yy394:
+#line 3858 "cpp_re.inc"
+yy406:
     yych = *++YYCURSOR;
- if (yych != ':') goto yy98;
+ if (yych != ':') goto yy99;
     ++YYCURSOR;
-#line 147 "cpp.re"
+#line 157 "cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_ALT); }
-#line 3718 "cpp_re.inc"
-yy397:
+#line 3865 "cpp_re.inc"
+yy409:
     ++YYCURSOR;
-#line 216 "cpp.re"
+#line 226 "cpp.re"
     { BOOST_WAVE_RET(T_LESSEQUAL); }
-#line 3723 "cpp_re.inc"
-yy399:
+#line 3870 "cpp_re.inc"
+yy411:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy405;
-#line 209 "cpp.re"
+ if ((yych = *YYCURSOR) == '=') goto yy417;
+#line 219 "cpp.re"
     { BOOST_WAVE_RET(T_SHIFTLEFT); }
-#line 3729 "cpp_re.inc"
-yy401:
+#line 3876 "cpp_re.inc"
+yy413:
     ++YYCURSOR;
-#line 136 "cpp.re"
+#line 146 "cpp.re"
     { BOOST_WAVE_RET(T_LEFTBRACKET_ALT); }
-#line 3734 "cpp_re.inc"
-yy403:
+#line 3881 "cpp_re.inc"
+yy415:
     ++YYCURSOR;
-#line 130 "cpp.re"
+#line 140 "cpp.re"
     { BOOST_WAVE_RET(T_LEFTBRACE_ALT); }
-#line 3739 "cpp_re.inc"
-yy405:
+#line 3886 "cpp_re.inc"
+yy417:
     ++YYCURSOR;
-#line 212 "cpp.re"
+#line 222 "cpp.re"
     { BOOST_WAVE_RET(T_SHIFTLEFTASSIGN); }
-#line 3744 "cpp_re.inc"
-yy407:
+#line 3891 "cpp_re.inc"
+yy419:
     yych = *++YYCURSOR;
     switch (yych) {
- case '!': goto yy420;
- case '\'': goto yy418;
- case '(': goto yy412;
- case ')': goto yy414;
- case '-': goto yy422;
- case '/': goto yy424;
- case '<': goto yy408;
- case '=': goto yy416;
- case '>': goto yy410;
- default: goto yy98;
+ case '!': goto yy432;
+ case '\'': goto yy430;
+ case '(': goto yy424;
+ case ')': goto yy426;
+ case '-': goto yy434;
+ case '/': goto yy436;
+ case '<': goto yy420;
+ case '=': goto yy428;
+ case '>': goto yy422;
+ default: goto yy99;
     }
-yy408:
+yy420:
     ++YYCURSOR;
-#line 129 "cpp.re"
+#line 139 "cpp.re"
     { BOOST_WAVE_RET(T_LEFTBRACE_TRIGRAPH); }
-#line 3763 "cpp_re.inc"
-yy410:
+#line 3910 "cpp_re.inc"
+yy422:
     ++YYCURSOR;
-#line 132 "cpp.re"
+#line 142 "cpp.re"
     { BOOST_WAVE_RET(T_RIGHTBRACE_TRIGRAPH); }
-#line 3768 "cpp_re.inc"
-yy412:
+#line 3915 "cpp_re.inc"
+yy424:
     ++YYCURSOR;
-#line 135 "cpp.re"
+#line 145 "cpp.re"
     { BOOST_WAVE_RET(T_LEFTBRACKET_TRIGRAPH); }
-#line 3773 "cpp_re.inc"
-yy414:
+#line 3920 "cpp_re.inc"
+yy426:
     ++YYCURSOR;
-#line 138 "cpp.re"
+#line 148 "cpp.re"
     { BOOST_WAVE_RET(T_RIGHTBRACKET_TRIGRAPH); }
-#line 3778 "cpp_re.inc"
-yy416:
+#line 3925 "cpp_re.inc"
+yy428:
     yyaccept = 13;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'c') {
         if (yych <= ' ') {
             if (yych <= '\n') {
- if (yych == '\t') goto yy261;
+ if (yych == '\t') goto yy273;
             } else {
- if (yych <= '\f') goto yy261;
- if (yych >= ' ') goto yy261;
+ if (yych <= '\f') goto yy273;
+ if (yych >= ' ') goto yy273;
             }
         } else {
             if (yych <= '.') {
- if (yych == '#') goto yy437;
+ if (yych == '#') goto yy449;
             } else {
- if (yych <= '/') goto yy261;
- if (yych == '?') goto yy436;
+ if (yych <= '/') goto yy273;
+ if (yych == '?') goto yy448;
             }
         }
     } else {
         if (yych <= 'p') {
             if (yych <= 'i') {
- if (yych <= 'e') goto yy261;
- if (yych >= 'i') goto yy261;
+ if (yych <= 'e') goto yy273;
+ if (yych >= 'i') goto yy273;
             } else {
- if (yych == 'l') goto yy261;
- if (yych >= 'p') goto yy261;
+ if (yych == 'l') goto yy273;
+ if (yych >= 'p') goto yy273;
             }
         } else {
             if (yych <= 't') {
- if (yych == 'r') goto yy261;
+ if (yych == 'r') goto yy273;
             } else {
- if (yych == 'v') goto yy417;
- if (yych <= 'w') goto yy261;
+ if (yych == 'v') goto yy429;
+ if (yych <= 'w') goto yy273;
             }
         }
     }
-yy417:
-#line 142 "cpp.re"
+yy429:
+#line 152 "cpp.re"
     { BOOST_WAVE_RET(T_POUND_TRIGRAPH); }
-#line 3819 "cpp_re.inc"
-yy418:
+#line 3966 "cpp_re.inc"
+yy430:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy434;
-#line 181 "cpp.re"
+ if ((yych = *YYCURSOR) == '=') goto yy446;
+#line 191 "cpp.re"
     { BOOST_WAVE_RET(T_XOR_TRIGRAPH); }
-#line 3825 "cpp_re.inc"
-yy420:
+#line 3972 "cpp_re.inc"
+yy432:
     yyaccept = 14;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '>') {
- if (yych == '=') goto yy429;
+ if (yych == '=') goto yy441;
     } else {
- if (yych <= '?') goto yy426;
- if (yych == '|') goto yy427;
+ if (yych <= '?') goto yy438;
+ if (yych == '|') goto yy439;
     }
-yy421:
-#line 187 "cpp.re"
+yy433:
+#line 197 "cpp.re"
     { BOOST_WAVE_RET(T_OR_TRIGRAPH); }
-#line 3838 "cpp_re.inc"
-yy422:
+#line 3985 "cpp_re.inc"
+yy434:
     ++YYCURSOR;
-#line 189 "cpp.re"
+#line 199 "cpp.re"
     { BOOST_WAVE_RET(T_COMPL_TRIGRAPH); }
-#line 3843 "cpp_re.inc"
-yy424:
+#line 3990 "cpp_re.inc"
+yy436:
     yyaccept = 15;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'U') goto yy186;
- if (yych == 'u') goto yy185;
-yy425:
-#line 239 "cpp.re"
+ if (yych == 'U') goto yy100;
+ if (yych == 'u') goto yy98;
+yy437:
+#line 249 "cpp.re"
     { BOOST_WAVE_RET(T_ANY_TRIGRAPH); }
-#line 3852 "cpp_re.inc"
-yy426:
+#line 3999 "cpp_re.inc"
+yy438:
     yych = *++YYCURSOR;
- if (yych == '?') goto yy431;
- goto yy98;
-yy427:
+ if (yych == '?') goto yy443;
+ goto yy99;
+yy439:
     ++YYCURSOR;
-#line 221 "cpp.re"
+#line 231 "cpp.re"
     { BOOST_WAVE_RET(T_OROR_TRIGRAPH); }
-#line 3861 "cpp_re.inc"
-yy429:
+#line 4008 "cpp_re.inc"
+yy441:
     ++YYCURSOR;
-#line 208 "cpp.re"
+#line 218 "cpp.re"
     { BOOST_WAVE_RET(T_ORASSIGN_TRIGRAPH); }
-#line 3866 "cpp_re.inc"
-yy431:
+#line 4013 "cpp_re.inc"
+yy443:
     yych = *++YYCURSOR;
- if (yych != '!') goto yy98;
+ if (yych != '!') goto yy99;
     ++YYCURSOR;
-#line 224 "cpp.re"
+#line 234 "cpp.re"
     { BOOST_WAVE_RET(T_OROR_TRIGRAPH); }
-#line 3873 "cpp_re.inc"
-yy434:
+#line 4020 "cpp_re.inc"
+yy446:
     ++YYCURSOR;
-#line 203 "cpp.re"
+#line 213 "cpp.re"
     { BOOST_WAVE_RET(T_XORASSIGN_TRIGRAPH); }
-#line 3878 "cpp_re.inc"
-yy436:
+#line 4025 "cpp_re.inc"
+yy448:
     yych = *++YYCURSOR;
- if (yych == '?') goto yy439;
- goto yy98;
-yy437:
+ if (yych == '?') goto yy451;
+ goto yy99;
+yy449:
     ++YYCURSOR;
-#line 145 "cpp.re"
+#line 155 "cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_TRIGRAPH); }
-#line 3887 "cpp_re.inc"
-yy439:
+#line 4034 "cpp_re.inc"
+yy451:
     yych = *++YYCURSOR;
- if (yych != '=') goto yy98;
+ if (yych != '=') goto yy99;
     ++YYCURSOR;
-#line 146 "cpp.re"
+#line 156 "cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_TRIGRAPH); }
-#line 3894 "cpp_re.inc"
-yy442:
+#line 4041 "cpp_re.inc"
+yy454:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     switch (yych) {
- case 'a': goto yy443;
- case 'b': goto yy444;
- case 'c': goto yy445;
- case 'd': goto yy446;
- case 'e': goto yy495;
- case 'f': goto yy493;
- case 'i': goto yy492;
- case 'l': goto yy496;
- case 's': goto yy449;
- case 't': goto yy494;
- default: goto yy195;
+ case 'a': goto yy455;
+ case 'b': goto yy456;
+ case 'c': goto yy457;
+ case 'd': goto yy458;
+ case 'e': goto yy507;
+ case 'f': goto yy505;
+ case 'i': goto yy504;
+ case 'l': goto yy508;
+ case 's': goto yy461;
+ case 't': goto yy506;
+ default: goto yy109;
     }
-yy443:
+yy455:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 's') goto yy489;
- goto yy195;
-yy444:
+ if (yych == 's') goto yy501;
+ goto yy109;
+yy456:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy484;
- goto yy195;
-yy445:
+ if (yych == 'a') goto yy496;
+ goto yy109;
+yy457:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'd') goto yy479;
- goto yy195;
-yy446:
+ if (yych == 'd') goto yy491;
+ goto yy109;
+yy458:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'e') goto yy471;
- goto yy195;
-yy447:
+ if (yych == 'e') goto yy483;
+ goto yy109;
+yy459:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy463;
- goto yy195;
-yy448:
+ if (yych == 'a') goto yy475;
+ goto yy109;
+yy460:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'n') goto yy457;
- goto yy195;
-yy449:
+ if (yych == 'n') goto yy469;
+ goto yy109;
+yy461:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
+ if (yych != 'd') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 16;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy456:
-#line 120 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy468:
+#line 130 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_STDCALL : T_IDENTIFIER); }
-#line 3970 "cpp_re.inc"
-yy457:
+#line 4117 "cpp_re.inc"
+yy469:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
-yy458:
+ if (yych != 'l') goto yy109;
+yy470:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 17;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy462:
-#line 125 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy474:
+#line 135 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INLINE : T_IDENTIFIER); }
-#line 3995 "cpp_re.inc"
-yy463:
+#line 4142 "cpp_re.inc"
+yy475:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 18;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy470:
-#line 119 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy482:
+#line 129 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_FASTCALL : T_IDENTIFIER); }
-#line 4025 "cpp_re.inc"
-yy471:
+#line 4172 "cpp_re.inc"
+yy483:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 19;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy478:
-#line 117 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy490:
+#line 127 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_DECLSPEC : T_IDENTIFIER); }
-#line 4055 "cpp_re.inc"
-yy479:
+#line 4202 "cpp_re.inc"
+yy491:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 20;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy483:
-#line 118 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy495:
+#line 128 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_CDECL : T_IDENTIFIER); }
-#line 4076 "cpp_re.inc"
-yy484:
+#line 4223 "cpp_re.inc"
+yy496:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
+ if (yych != 'd') goto yy109;
     yyaccept = 21;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy488:
-#line 116 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy500:
+#line 126 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_BASED : T_IDENTIFIER); }
-#line 4097 "cpp_re.inc"
-yy489:
+#line 4244 "cpp_re.inc"
+yy501:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'm') goto yy195;
+ if (yych != 'm') goto yy109;
     yyaccept = 22;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy491:
-#line 126 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy503:
+#line 136 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_ASM : T_IDENTIFIER); }
-#line 4112 "cpp_re.inc"
-yy492:
+#line 4259 "cpp_re.inc"
+yy504:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'n') goto yy518;
- goto yy195;
-yy493:
+ if (yych == 'n') goto yy530;
+ goto yy109;
+yy505:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy463;
- if (yych == 'i') goto yy511;
- goto yy195;
-yy494:
+ if (yych == 'a') goto yy475;
+ if (yych == 'i') goto yy523;
+ goto yy109;
+yy506:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'r') goto yy508;
- goto yy195;
-yy495:
+ if (yych == 'r') goto yy520;
+ goto yy109;
+yy507:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'x') goto yy502;
- goto yy195;
-yy496:
+ if (yych == 'x') goto yy514;
+ goto yy109;
+yy508:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'v') goto yy195;
+ if (yych != 'v') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 23;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy501:
-#line 124 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy513:
+#line 134 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_LEAVE : T_IDENTIFIER); }
-#line 4157 "cpp_re.inc"
-yy502:
+#line 4304 "cpp_re.inc"
+yy514:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 24;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy507:
-#line 122 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy519:
+#line 132 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_EXCEPT : T_IDENTIFIER); }
-#line 4181 "cpp_re.inc"
-yy508:
+#line 4328 "cpp_re.inc"
+yy520:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'y') goto yy195;
+ if (yych != 'y') goto yy109;
     yyaccept = 25;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy510:
-#line 121 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy522:
+#line 131 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_TRY : T_IDENTIFIER); }
-#line 4196 "cpp_re.inc"
-yy511:
+#line 4343 "cpp_re.inc"
+yy523:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'y') goto yy195;
+ if (yych != 'y') goto yy109;
     yyaccept = 26;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy517:
-#line 123 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy529:
+#line 133 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_FINALLY : T_IDENTIFIER); }
-#line 4223 "cpp_re.inc"
-yy518:
+#line 4370 "cpp_re.inc"
+yy530:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'l') goto yy458;
- if (yych != 't') goto yy195;
+ if (yych == 'l') goto yy470;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     switch (yych) {
- case '1': goto yy520;
- case '3': goto yy521;
- case '6': goto yy522;
- case '8': goto yy523;
- default: goto yy195;
+ case '1': goto yy532;
+ case '3': goto yy533;
+ case '6': goto yy534;
+ case '8': goto yy535;
+ default: goto yy109;
     }
-yy520:
+yy532:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '6') goto yy529;
- goto yy195;
-yy521:
+ if (yych == '6') goto yy541;
+ goto yy109;
+yy533:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '2') goto yy527;
- goto yy195;
-yy522:
+ if (yych == '2') goto yy539;
+ goto yy109;
+yy534:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '4') goto yy525;
- goto yy195;
-yy523:
+ if (yych == '4') goto yy537;
+ goto yy109;
+yy535:
     yyaccept = 27;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy524:
-#line 112 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy536:
+#line 122 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT8 : T_IDENTIFIER); }
-#line 4264 "cpp_re.inc"
-yy525:
+#line 4411 "cpp_re.inc"
+yy537:
     yyaccept = 28;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy526:
-#line 115 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy538:
+#line 125 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT64 : T_IDENTIFIER); }
-#line 4276 "cpp_re.inc"
-yy527:
+#line 4423 "cpp_re.inc"
+yy539:
     yyaccept = 29;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy528:
-#line 114 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy540:
+#line 124 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT32 : T_IDENTIFIER); }
-#line 4288 "cpp_re.inc"
-yy529:
+#line 4435 "cpp_re.inc"
+yy541:
     yyaccept = 30;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy530:
-#line 113 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy542:
+#line 123 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT16 : T_IDENTIFIER); }
-#line 4300 "cpp_re.inc"
-yy531:
+#line 4447 "cpp_re.inc"
+yy543:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'h') goto yy537;
- goto yy195;
-yy532:
+ if (yych == 'h') goto yy549;
+ goto yy109;
+yy544:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 31;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy536:
-#line 110 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy548:
+#line 120 "cpp.re"
     { BOOST_WAVE_RET(T_WHILE); }
-#line 4326 "cpp_re.inc"
-yy537:
+#line 4473 "cpp_re.inc"
+yy549:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != '_') goto yy195;
+ if (yych != '_') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 32;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy542:
-#line 109 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy554:
+#line 119 "cpp.re"
     { BOOST_WAVE_RET(T_WCHART); }
-#line 4350 "cpp_re.inc"
-yy543:
+#line 4497 "cpp_re.inc"
+yy555:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'r') goto yy555;
- goto yy195;
-yy544:
+ if (yych == 'r') goto yy567;
+ goto yy109;
+yy556:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy545;
- if (yych == 'l') goto yy546;
- goto yy195;
-yy545:
+ if (yych == 'i') goto yy557;
+ if (yych == 'l') goto yy558;
+ goto yy109;
+yy557:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'd') goto yy553;
- goto yy195;
-yy546:
+ if (yych == 'd') goto yy565;
+ goto yy109;
+yy558:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 33;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy552:
-#line 108 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy564:
+#line 118 "cpp.re"
     { BOOST_WAVE_RET(T_VOLATILE); }
-#line 4393 "cpp_re.inc"
-yy553:
+#line 4540 "cpp_re.inc"
+yy565:
     yyaccept = 34;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy554:
-#line 107 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy566:
+#line 117 "cpp.re"
     { BOOST_WAVE_RET(T_VOID); }
-#line 4405 "cpp_re.inc"
-yy555:
+#line 4552 "cpp_re.inc"
+yy567:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'u') goto yy195;
+ if (yych != 'u') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 35;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy560:
-#line 106 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy572:
+#line 116 "cpp.re"
     { BOOST_WAVE_RET(T_VIRTUAL); }
-#line 4429 "cpp_re.inc"
-yy561:
+#line 4576 "cpp_re.inc"
+yy573:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '"') goto yy129;
+ if (yych == 'R') goto yy128;
+ goto yy109;
+yy574:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy567;
- if (yych == 's') goto yy568;
- goto yy195;
-yy562:
+ if (yych == 'i') goto yy580;
+ if (yych == 's') goto yy581;
+ goto yy109;
+yy575:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'g') goto yy195;
+ if (yych != 'g') goto yy109;
     yyaccept = 36;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy566:
-#line 105 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy579:
+#line 115 "cpp.re"
     { BOOST_WAVE_RET(T_USING); }
-#line 4456 "cpp_re.inc"
-yy567:
+#line 4609 "cpp_re.inc"
+yy580:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy575;
- goto yy195;
-yy568:
+ if (yych == 'o') goto yy588;
+ goto yy109;
+yy581:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'g') goto yy195;
+ if (yych != 'g') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
+ if (yych != 'd') goto yy109;
     yyaccept = 37;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy574:
-#line 104 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy587:
+#line 114 "cpp.re"
     { BOOST_WAVE_RET(T_UNSIGNED); }
-#line 4488 "cpp_re.inc"
-yy575:
+#line 4641 "cpp_re.inc"
+yy588:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 38;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy577:
-#line 103 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy590:
+#line 113 "cpp.re"
     { BOOST_WAVE_RET(T_UNION); }
-#line 4503 "cpp_re.inc"
-yy578:
+#line 4656 "cpp_re.inc"
+yy591:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'm') goto yy608;
- goto yy195;
-yy579:
+ if (yych == 'm') goto yy631;
+ goto yy109;
+yy592:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy601;
- if (yych == 'r') goto yy602;
- goto yy195;
-yy580:
+ if (yych == 'i') goto yy614;
+ if (yych == 'r') goto yy615;
+ goto yy109;
+yy593:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'u') goto yy596;
- if (yych == 'y') goto yy597;
- goto yy195;
-yy581:
+ if (yych == 'u') goto yy609;
+ if (yych == 'y') goto yy610;
+ goto yy109;
+yy594:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'h') {
- if (yych != 'd') goto yy195;
+ if (yych != 'd') goto yy109;
     } else {
- if (yych <= 'i') goto yy585;
- if (yych == 'n') goto yy586;
- goto yy195;
+ if (yych <= 'i') goto yy598;
+ if (yych == 'n') goto yy599;
+ goto yy109;
     }
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'e') goto yy593;
- goto yy195;
-yy585:
+ if (yych == 'e') goto yy606;
+ goto yy109;
+yy598:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'd') goto yy591;
- goto yy195;
-yy586:
+ if (yych == 'd') goto yy604;
+ goto yy109;
+yy599:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'm') goto yy195;
+ if (yych != 'm') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 39;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy590:
-#line 102 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy603:
+#line 112 "cpp.re"
     { BOOST_WAVE_RET(T_TYPENAME); }
-#line 4566 "cpp_re.inc"
-yy591:
+#line 4719 "cpp_re.inc"
+yy604:
     yyaccept = 40;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy592:
-#line 101 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy605:
+#line 111 "cpp.re"
     { BOOST_WAVE_RET(T_TYPEID); }
-#line 4578 "cpp_re.inc"
-yy593:
+#line 4731 "cpp_re.inc"
+yy606:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'f') goto yy195;
+ if (yych != 'f') goto yy109;
     yyaccept = 41;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy595:
-#line 100 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy608:
+#line 110 "cpp.re"
     { BOOST_WAVE_RET(T_TYPEDEF); }
-#line 4593 "cpp_re.inc"
-yy596:
+#line 4746 "cpp_re.inc"
+yy609:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'e') goto yy599;
- goto yy195;
-yy597:
+ if (yych == 'e') goto yy612;
+ goto yy109;
+yy610:
     yyaccept = 42;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy598:
-#line 99 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy611:
+#line 109 "cpp.re"
     { BOOST_WAVE_RET(T_TRY); }
-#line 4610 "cpp_re.inc"
-yy599:
+#line 4763 "cpp_re.inc"
+yy612:
     yyaccept = 43;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy600:
-#line 98 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy613:
+#line 108 "cpp.re"
     { BOOST_WAVE_RET(T_TRUE); }
-#line 4622 "cpp_re.inc"
-yy601:
+#line 4775 "cpp_re.inc"
+yy614:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 's') goto yy629;
+ goto yy109;
+yy615:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 's') goto yy606;
- goto yy195;
-yy602:
+ if (yych == 'e') goto yy616;
+ if (yych == 'o') goto yy617;
+ goto yy109;
+yy616:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'o') goto yy195;
+ if (yych == 'a') goto yy620;
+ goto yy109;
+yy617:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'w') goto yy195;
+ if (yych != 'w') goto yy109;
     yyaccept = 44;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy605:
-#line 97 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy619:
+#line 107 "cpp.re"
     { BOOST_WAVE_RET(T_THROW); }
-#line 4645 "cpp_re.inc"
-yy606:
- yyaccept = 45;
+#line 4806 "cpp_re.inc"
+yy620:
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
- }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy607:
-#line 96 "cpp.re"
- { BOOST_WAVE_RET(T_THIS); }
-#line 4657 "cpp_re.inc"
-yy608:
+ if (yych != 'd') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != '_') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'o') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'l') goto yy109;
+ yyaccept = 45;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy628:
+#line 106 "cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_THREADLOCAL : T_IDENTIFIER); }
+#line 4839 "cpp_re.inc"
+yy629:
     yyaccept = 46;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy614:
-#line 95 "cpp.re"
- { BOOST_WAVE_RET(T_TEMPLATE); }
-#line 4684 "cpp_re.inc"
-yy615:
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy630:
+#line 105 "cpp.re"
+ { BOOST_WAVE_RET(T_THIS); }
+#line 4851 "cpp_re.inc"
+yy631:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy650;
- goto yy195;
-yy616:
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'g') goto yy640;
- if (yych == 'z') goto yy641;
- goto yy195;
-yy617:
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy624;
- if (yych == 'r') goto yy625;
- goto yy195;
-yy618:
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 'e') goto yy109;
+ yyaccept = 47;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy637:
+#line 104 "cpp.re"
+ { BOOST_WAVE_RET(T_TEMPLATE); }
+#line 4878 "cpp_re.inc"
+yy638:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych == 'o') goto yy680;
+ goto yy109;
+yy639:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'h') goto yy195;
- yyaccept = 47;
+ if (yych == 'g') goto yy670;
+ if (yych == 'z') goto yy671;
+ goto yy109;
+yy640:
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
- }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy623:
-#line 94 "cpp.re"
- { BOOST_WAVE_RET(T_SWITCH); }
-#line 4725 "cpp_re.inc"
-yy624:
+ if (yych == 'a') goto yy647;
+ if (yych == 'r') goto yy648;
+ goto yy109;
+yy641:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 't') goto yy630;
- goto yy195;
-yy625:
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'u') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 'h') goto yy109;
     yyaccept = 48;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy629:
-#line 93 "cpp.re"
- { BOOST_WAVE_RET(T_STRUCT); }
-#line 4751 "cpp_re.inc"
-yy630:
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy646:
+#line 103 "cpp.re"
+ { BOOST_WAVE_RET(T_SWITCH); }
+#line 4919 "cpp_re.inc"
+yy647:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych == 't') goto yy653;
+ goto yy109;
+yy648:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
- yyaccept = 49;
+ if (yych != 'u') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'c') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 't') goto yy109;
+ yyaccept = 49;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy652:
+#line 102 "cpp.re"
+ { BOOST_WAVE_RET(T_STRUCT); }
+#line 4945 "cpp_re.inc"
+yy653:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'i') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'c') goto yy109;
+ yyaccept = 50;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '@') {
         if (yych <= '/') {
- if (yych == '$') goto yy194;
+ if (yych == '$') goto yy108;
         } else {
- if (yych <= '9') goto yy194;
- if (yych == '?') goto yy197;
+ if (yych <= '9') goto yy108;
+ if (yych == '?') goto yy111;
         }
     } else {
         if (yych <= '^') {
- if (yych <= 'Z') goto yy194;
- if (yych == '\\') goto yy196;
+ if (yych <= 'Z') goto yy108;
+ if (yych == '\\') goto yy110;
         } else {
- if (yych <= '_') goto yy634;
- if (yych <= '`') goto yy633;
- if (yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy657;
+ if (yych <= '`') goto yy656;
+ if (yych <= 'z') goto yy108;
         }
     }
-yy633:
-#line 91 "cpp.re"
+yy656:
+#line 99 "cpp.re"
     { BOOST_WAVE_RET(T_STATIC); }
-#line 4781 "cpp_re.inc"
-yy634:
+#line 4975 "cpp_re.inc"
+yy657:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych == 'a') goto yy658;
+ if (yych == 'c') goto yy659;
+ goto yy109;
+yy658:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych == 's') goto yy664;
+ goto yy109;
+yy659:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 50;
+ if (yych != 's') goto yy109;
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yych != 't') goto yy109;
+ yyaccept = 51;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy639:
-#line 92 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy663:
+#line 100 "cpp.re"
     { BOOST_WAVE_RET(T_STATICCAST); }
-#line 4805 "cpp_re.inc"
-yy640:
+#line 5007 "cpp_re.inc"
+yy664:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'n') goto yy646;
- goto yy195;
-yy641:
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'o') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'f') goto yy195;
- yyaccept = 51;
+ if (yych != 't') goto yy109;
+ yyaccept = 52;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy645:
-#line 90 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy669:
+#line 101 "cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_STATICASSERT : T_IDENTIFIER); }
+#line 5031 "cpp_re.inc"
+yy670:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 'n') goto yy676;
+ goto yy109;
+yy671:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'e') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'o') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'f') goto yy109;
+ yyaccept = 53;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy675:
+#line 98 "cpp.re"
     { BOOST_WAVE_RET(T_SIZEOF); }
-#line 4831 "cpp_re.inc"
-yy646:
+#line 5057 "cpp_re.inc"
+yy676:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
- yyaccept = 52;
+ if (yych != 'd') goto yy109;
+ yyaccept = 54;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy649:
-#line 89 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy679:
+#line 97 "cpp.re"
     { BOOST_WAVE_RET(T_SIGNED); }
-#line 4849 "cpp_re.inc"
-yy650:
+#line 5075 "cpp_re.inc"
+yy680:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 53;
+ if (yych != 't') goto yy109;
+ yyaccept = 55;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy653:
-#line 88 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy683:
+#line 96 "cpp.re"
     { BOOST_WAVE_RET(T_SHORT); }
-#line 4867 "cpp_re.inc"
-yy654:
+#line 5093 "cpp_re.inc"
+yy684:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'h') {
- if (yych != 'g') goto yy195;
+ if (yych != 'g') goto yy109;
     } else {
- if (yych <= 'i') goto yy656;
- if (yych == 't') goto yy657;
- goto yy195;
+ if (yych <= 'i') goto yy686;
+ if (yych == 't') goto yy687;
+ goto yy109;
     }
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy676;
- goto yy195;
-yy656:
+ if (yych == 'i') goto yy706;
+ goto yy109;
+yy686:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'n') goto yy662;
- goto yy195;
-yy657:
+ if (yych == 'n') goto yy692;
+ goto yy109;
+yy687:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'u') goto yy195;
+ if (yych != 'u') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
- yyaccept = 54;
+ if (yych != 'n') goto yy109;
+ yyaccept = 56;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy661:
-#line 87 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy691:
+#line 95 "cpp.re"
     { BOOST_WAVE_RET(T_RETURN); }
-#line 4907 "cpp_re.inc"
-yy662:
+#line 5133 "cpp_re.inc"
+yy692:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != '_') goto yy195;
+ if (yych != '_') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 55;
+ if (yych != 't') goto yy109;
+ yyaccept = 57;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy675:
-#line 86 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy705:
+#line 94 "cpp.re"
     { BOOST_WAVE_RET(T_REINTERPRETCAST); }
-#line 4955 "cpp_re.inc"
-yy676:
+#line 5181 "cpp_re.inc"
+yy706:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
- yyaccept = 56;
+ if (yych != 'r') goto yy109;
+ yyaccept = 58;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy681:
-#line 85 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy711:
+#line 93 "cpp.re"
     { BOOST_WAVE_RET(T_REGISTER); }
-#line 4979 "cpp_re.inc"
-yy682:
+#line 5205 "cpp_re.inc"
+yy712:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy689;
- if (yych == 'o') goto yy690;
- goto yy195;
-yy683:
+ if (yych == 'i') goto yy719;
+ if (yych == 'o') goto yy720;
+ goto yy109;
+yy713:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'b') goto yy195;
+ if (yych != 'b') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
- yyaccept = 57;
+ if (yych != 'c') goto yy109;
+ yyaccept = 59;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy688:
-#line 84 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy718:
+#line 92 "cpp.re"
     { BOOST_WAVE_RET(T_PUBLIC); }
-#line 5009 "cpp_re.inc"
-yy689:
+#line 5235 "cpp_re.inc"
+yy719:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'v') goto yy698;
- goto yy195;
-yy690:
+ if (yych == 'v') goto yy728;
+ goto yy109;
+yy720:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
- yyaccept = 58;
+ if (yych != 'd') goto yy109;
+ yyaccept = 60;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy697:
-#line 83 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy727:
+#line 91 "cpp.re"
     { BOOST_WAVE_RET(T_PROTECTED); }
-#line 5044 "cpp_re.inc"
-yy698:
+#line 5270 "cpp_re.inc"
+yy728:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 59;
+ if (yych != 'e') goto yy109;
+ yyaccept = 61;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy702:
-#line 82 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy732:
+#line 90 "cpp.re"
     { BOOST_WAVE_RET(T_PRIVATE); }
-#line 5065 "cpp_re.inc"
-yy703:
+#line 5291 "cpp_re.inc"
+yy733:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'e') goto yy710;
- goto yy195;
-yy704:
- yyaccept = 60;
+ if (yych == 'e') goto yy740;
+ goto yy109;
+yy734:
+ yyaccept = 62;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '@') {
         if (yych <= '/') {
- if (yych == '$') goto yy194;
+ if (yych == '$') goto yy108;
         } else {
- if (yych <= '9') goto yy194;
- if (yych == '?') goto yy197;
+ if (yych <= '9') goto yy108;
+ if (yych == '?') goto yy111;
         }
     } else {
         if (yych <= '^') {
- if (yych <= 'Z') goto yy194;
- if (yych == '\\') goto yy196;
+ if (yych <= 'Z') goto yy108;
+ if (yych == '\\') goto yy110;
         } else {
- if (yych <= '_') goto yy706;
- if (yych <= '`') goto yy705;
- if (yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy736;
+ if (yych <= '`') goto yy735;
+ if (yych <= 'z') goto yy108;
         }
     }
-yy705:
-#line 223 "cpp.re"
+yy735:
+#line 233 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_OROR_ALT); }
-#line 5094 "cpp_re.inc"
-yy706:
+#line 5320 "cpp_re.inc"
+yy736:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'q') goto yy195;
- yyaccept = 61;
+ if (yych != 'q') goto yy109;
+ yyaccept = 63;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy709:
-#line 207 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy739:
+#line 217 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ORASSIGN_ALT); }
-#line 5112 "cpp_re.inc"
-yy710:
+#line 5338 "cpp_re.inc"
+yy740:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'o') goto yy195;
+ if (yych != 'o') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
- yyaccept = 62;
+ if (yych != 'r') goto yy109;
+ yyaccept = 64;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy716:
-#line 81 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy746:
+#line 89 "cpp.re"
     { BOOST_WAVE_RET(T_OPERATOR); }
-#line 5139 "cpp_re.inc"
-yy717:
+#line 5365 "cpp_re.inc"
+yy747:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'm') goto yy728;
- goto yy195;
-yy718:
+ if (yych == 'm') goto yy772;
+ goto yy109;
+yy748:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'w') goto yy726;
- goto yy195;
-yy719:
+ if (yych == 'w') goto yy770;
+ goto yy109;
+yy749:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 63;
+ if (yych == 'e') goto yy757;
+ if (yych == 't') goto yy758;
+ goto yy109;
+yy750:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'l') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'l') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'p') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 't') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'r') goto yy109;
+ yyaccept = 65;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy756:
+#line 88 "cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_NULLPTR : T_IDENTIFIER); }
+#line 5408 "cpp_re.inc"
+yy757:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 'x') goto yy764;
+ goto yy109;
+yy758:
+ yyaccept = 66;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '@') {
         if (yych <= '/') {
- if (yych == '$') goto yy194;
+ if (yych == '$') goto yy108;
         } else {
- if (yych <= '9') goto yy194;
- if (yych == '?') goto yy197;
+ if (yych <= '9') goto yy108;
+ if (yych == '?') goto yy111;
         }
     } else {
         if (yych <= '^') {
- if (yych <= 'Z') goto yy194;
- if (yych == '\\') goto yy196;
+ if (yych <= 'Z') goto yy108;
+ if (yych == '\\') goto yy110;
         } else {
- if (yych <= '_') goto yy722;
- if (yych <= '`') goto yy721;
- if (yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy760;
+ if (yych <= '`') goto yy759;
+ if (yych <= 'z') goto yy108;
         }
     }
-yy721:
-#line 192 "cpp.re"
+yy759:
+#line 202 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_NOT_ALT); }
-#line 5176 "cpp_re.inc"
-yy722:
+#line 5437 "cpp_re.inc"
+yy760:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'q') goto yy195;
- yyaccept = 64;
+ if (yych != 'q') goto yy109;
+ yyaccept = 67;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy725:
-#line 215 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy763:
+#line 225 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_NOTEQUAL_ALT); }
-#line 5194 "cpp_re.inc"
-yy726:
- yyaccept = 65;
+#line 5455 "cpp_re.inc"
+yy764:
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yych != 'c') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'e') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'p') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 't') goto yy109;
+ yyaccept = 68;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy727:
-#line 80 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy769:
+#line 87 "cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_NOEXCEPT : T_IDENTIFIER); }
+#line 5479 "cpp_re.inc"
+yy770:
+ yyaccept = 69;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy771:
+#line 86 "cpp.re"
     { BOOST_WAVE_RET(T_NEW); }
-#line 5206 "cpp_re.inc"
-yy728:
+#line 5491 "cpp_re.inc"
+yy772:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 66;
+ if (yych != 'e') goto yy109;
+ yyaccept = 70;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy735:
-#line 79 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy779:
+#line 85 "cpp.re"
     { BOOST_WAVE_RET(T_NAMESPACE); }
-#line 5236 "cpp_re.inc"
-yy736:
+#line 5521 "cpp_re.inc"
+yy780:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'b') goto yy195;
+ if (yych != 'b') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 67;
+ if (yych != 'e') goto yy109;
+ yyaccept = 71;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy742:
-#line 78 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy786:
+#line 84 "cpp.re"
     { BOOST_WAVE_RET(T_MUTABLE); }
-#line 5263 "cpp_re.inc"
-yy743:
+#line 5548 "cpp_re.inc"
+yy787:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'g') goto yy195;
- yyaccept = 68;
+ if (yych != 'g') goto yy109;
+ yyaccept = 72;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy746:
-#line 77 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy790:
+#line 83 "cpp.re"
     { BOOST_WAVE_RET(T_LONG); }
-#line 5281 "cpp_re.inc"
-yy747:
- yyaccept = 69;
+#line 5566 "cpp_re.inc"
+yy791:
+ yyaccept = 73;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy748:
-#line 73 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy792:
+#line 79 "cpp.re"
     { BOOST_WAVE_RET(T_IF); }
-#line 5293 "cpp_re.inc"
-yy749:
+#line 5578 "cpp_re.inc"
+yy793:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'p') goto yy758;
- goto yy195;
-yy750:
+ if (yych == 'p') goto yy802;
+ goto yy109;
+yy794:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'l') goto yy751;
- if (yych == 't') goto yy752;
- goto yy195;
-yy751:
+ if (yych == 'l') goto yy795;
+ if (yych == 't') goto yy796;
+ goto yy109;
+yy795:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy754;
- goto yy195;
-yy752:
- yyaccept = 70;
+ if (yych == 'i') goto yy798;
+ goto yy109;
+yy796:
+ yyaccept = 74;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy753:
-#line 76 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy797:
+#line 82 "cpp.re"
     { BOOST_WAVE_RET(T_INT); }
-#line 5321 "cpp_re.inc"
-yy754:
+#line 5606 "cpp_re.inc"
+yy798:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 71;
+ if (yych != 'e') goto yy109;
+ yyaccept = 75;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy757:
-#line 75 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy801:
+#line 81 "cpp.re"
     { BOOST_WAVE_RET(T_INLINE); }
-#line 5339 "cpp_re.inc"
-yy758:
+#line 5624 "cpp_re.inc"
+yy802:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'o') goto yy195;
+ if (yych != 'o') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 72;
+ if (yych != 't') goto yy109;
+ yyaccept = 76;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy762:
-#line 74 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy806:
+#line 80 "cpp.re"
     { BOOST_WAVE_RET(s->enable_import_keyword ? T_IMPORT : T_IDENTIFIER); }
-#line 5360 "cpp_re.inc"
-yy763:
+#line 5645 "cpp_re.inc"
+yy807:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'o') goto yy195;
- yyaccept = 73;
+ if (yych != 'o') goto yy109;
+ yyaccept = 77;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy766:
-#line 72 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy810:
+#line 78 "cpp.re"
     { BOOST_WAVE_RET(T_GOTO); }
-#line 5378 "cpp_re.inc"
-yy767:
+#line 5663 "cpp_re.inc"
+yy811:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'l') goto yy782;
- goto yy195;
-yy768:
+ if (yych == 'l') goto yy826;
+ goto yy109;
+yy812:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy778;
- goto yy195;
-yy769:
+ if (yych == 'o') goto yy822;
+ goto yy109;
+yy813:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'r') goto yy776;
- goto yy195;
-yy770:
+ if (yych == 'r') goto yy820;
+ goto yy109;
+yy814:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
- yyaccept = 74;
+ if (yych != 'd') goto yy109;
+ yyaccept = 78;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy775:
-#line 71 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy819:
+#line 77 "cpp.re"
     { BOOST_WAVE_RET(T_FRIEND); }
-#line 5417 "cpp_re.inc"
-yy776:
- yyaccept = 75;
+#line 5702 "cpp_re.inc"
+yy820:
+ yyaccept = 79;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy777:
-#line 70 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy821:
+#line 76 "cpp.re"
     { BOOST_WAVE_RET(T_FOR); }
-#line 5429 "cpp_re.inc"
-yy778:
+#line 5714 "cpp_re.inc"
+yy822:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 76;
+ if (yych != 't') goto yy109;
+ yyaccept = 80;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy781:
-#line 69 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy825:
+#line 75 "cpp.re"
     { BOOST_WAVE_RET(T_FLOAT); }
-#line 5447 "cpp_re.inc"
-yy782:
+#line 5732 "cpp_re.inc"
+yy826:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 77;
+ if (yych != 'e') goto yy109;
+ yyaccept = 81;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy785:
-#line 68 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy829:
+#line 74 "cpp.re"
     { BOOST_WAVE_RET(T_FALSE); }
-#line 5465 "cpp_re.inc"
-yy786:
+#line 5750 "cpp_re.inc"
+yy830:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 's') goto yy808;
- goto yy195;
-yy787:
+ if (yych == 's') goto yy852;
+ goto yy109;
+yy831:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'u') goto yy805;
- goto yy195;
-yy788:
+ if (yych == 'u') goto yy849;
+ goto yy109;
+yy832:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'p') goto yy789;
- if (yych == 't') goto yy790;
- goto yy195;
-yy789:
+ if (yych == 'p') goto yy833;
+ if (yych == 't') goto yy834;
+ goto yy109;
+yy833:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'l') goto yy795;
- if (yych == 'o') goto yy796;
- goto yy195;
-yy790:
+ if (yych == 'l') goto yy839;
+ if (yych == 'o') goto yy840;
+ goto yy109;
+yy834:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
- yyaccept = 78;
+ if (yych != 'n') goto yy109;
+ yyaccept = 82;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy794:
-#line 67 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy838:
+#line 73 "cpp.re"
     { BOOST_WAVE_RET(T_EXTERN); }
-#line 5508 "cpp_re.inc"
-yy795:
+#line 5793 "cpp_re.inc"
+yy839:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy800;
- goto yy195;
-yy796:
+ if (yych == 'i') goto yy844;
+ goto yy109;
+yy840:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 79;
+ if (yych != 't') goto yy109;
+ yyaccept = 83;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy799:
-#line 66 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy843:
+#line 72 "cpp.re"
     { BOOST_WAVE_RET(T_EXPORT); }
-#line 5531 "cpp_re.inc"
-yy800:
+#line 5816 "cpp_re.inc"
+yy844:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 80;
+ if (yych != 't') goto yy109;
+ yyaccept = 84;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy804:
-#line 65 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy848:
+#line 71 "cpp.re"
     { BOOST_WAVE_RET(T_EXPLICIT); }
-#line 5552 "cpp_re.inc"
-yy805:
+#line 5837 "cpp_re.inc"
+yy849:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'm') goto yy195;
- yyaccept = 81;
+ if (yych != 'm') goto yy109;
+ yyaccept = 85;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy807:
-#line 64 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy851:
+#line 70 "cpp.re"
     { BOOST_WAVE_RET(T_ENUM); }
-#line 5567 "cpp_re.inc"
-yy808:
+#line 5852 "cpp_re.inc"
+yy852:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 82;
+ if (yych != 'e') goto yy109;
+ yyaccept = 86;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy810:
-#line 63 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy854:
+#line 69 "cpp.re"
     { BOOST_WAVE_RET(T_ELSE); }
-#line 5582 "cpp_re.inc"
-yy811:
+#line 5867 "cpp_re.inc"
+yy855:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'f') goto yy831;
- if (yych == 'l') goto yy832;
- goto yy195;
-yy812:
- yyaccept = 83;
+ if (yych <= 'e') {
+ if (yych == 'c') goto yy875;
+ goto yy109;
+ } else {
+ if (yych <= 'f') goto yy876;
+ if (yych == 'l') goto yy877;
+ goto yy109;
+ }
+yy856:
+ yyaccept = 87;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'Z') {
         if (yych <= '9') {
- if (yych == '$') goto yy194;
- if (yych >= '0') goto yy194;
+ if (yych == '$') goto yy108;
+ if (yych >= '0') goto yy108;
         } else {
- if (yych == '?') goto yy197;
- if (yych >= 'A') goto yy194;
+ if (yych == '?') goto yy111;
+ if (yych >= 'A') goto yy108;
         }
     } else {
         if (yych <= '_') {
- if (yych == '\\') goto yy196;
- if (yych >= '_') goto yy194;
+ if (yych == '\\') goto yy110;
+ if (yych >= '_') goto yy108;
         } else {
             if (yych <= 't') {
- if (yych >= 'a') goto yy194;
+ if (yych >= 'a') goto yy108;
             } else {
- if (yych <= 'u') goto yy826;
- if (yych <= 'z') goto yy194;
+ if (yych <= 'u') goto yy870;
+ if (yych <= 'z') goto yy108;
             }
         }
     }
-yy813:
-#line 60 "cpp.re"
+yy857:
+#line 66 "cpp.re"
     { BOOST_WAVE_RET(T_DO); }
-#line 5616 "cpp_re.inc"
-yy814:
+#line 5906 "cpp_re.inc"
+yy858:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'm') goto yy195;
+ if (yych != 'm') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != '_') goto yy195;
+ if (yych != '_') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 84;
+ if (yych != 't') goto yy109;
+ yyaccept = 88;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy825:
-#line 62 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy869:
+#line 68 "cpp.re"
     { BOOST_WAVE_RET(T_DYNAMICCAST); }
-#line 5658 "cpp_re.inc"
-yy826:
+#line 5948 "cpp_re.inc"
+yy870:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'b') goto yy195;
+ if (yych != 'b') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 85;
+ if (yych != 'e') goto yy109;
+ yyaccept = 89;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy830:
-#line 61 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy874:
+#line 67 "cpp.re"
     { BOOST_WAVE_RET(T_DOUBLE); }
-#line 5679 "cpp_re.inc"
-yy831:
+#line 5969 "cpp_re.inc"
+yy875:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy837;
- goto yy195;
-yy832:
+ if (yych == 'l') goto yy887;
+ goto yy109;
+yy876:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych == 'a') goto yy882;
+ goto yy109;
+yy877:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 86;
+ if (yych != 't') goto yy109;
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yych != 'e') goto yy109;
+ yyaccept = 90;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy836:
-#line 59 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy881:
+#line 65 "cpp.re"
     { BOOST_WAVE_RET(T_DELETE); }
-#line 5705 "cpp_re.inc"
-yy837:
+#line 6000 "cpp_re.inc"
+yy882:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'u') goto yy195;
+ if (yych != 'u') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 87;
+ if (yych != 't') goto yy109;
+ yyaccept = 91;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy841:
-#line 58 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy886:
+#line 64 "cpp.re"
     { BOOST_WAVE_RET(T_DEFAULT); }
-#line 5726 "cpp_re.inc"
-yy842:
+#line 6021 "cpp_re.inc"
+yy887:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'r') goto yy195;
- if (yych <= 's') goto yy873;
- if (yych <= 't') goto yy874;
- goto yy195;
-yy843:
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy870;
- goto yy195;
-yy844:
+ if (yych != 'y') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'p') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'e') goto yy109;
+ yyaccept = 92;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy892:
+#line 63 "cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_DECLTYPE : T_IDENTIFIER); }
+#line 6045 "cpp_re.inc"
+yy893:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych <= 'r') goto yy109;
+ if (yych <= 's') goto yy939;
+ if (yych <= 't') goto yy940;
+ goto yy109;
+yy894:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy866;
- goto yy195;
-yy845:
+ if (yych == 'a') goto yy926;
+ goto yy109;
+yy895:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'l') goto yy195;
- if (yych <= 'm') goto yy847;
- if (yych >= 'o') goto yy195;
+ if (yych == 'a') goto yy922;
+ goto yy109;
+yy896:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'r') goto yy195;
- if (yych <= 's') goto yy851;
- if (yych <= 't') goto yy852;
- goto yy195;
-yy847:
+ if (yych <= 'l') goto yy109;
+ if (yych <= 'm') goto yy898;
+ if (yych >= 'o') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych <= 'r') goto yy109;
+ if (yych <= 's') goto yy902;
+ if (yych <= 't') goto yy903;
+ goto yy109;
+yy898:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
- yyaccept = 88;
+ if (yych != 'p') goto yy109;
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yych != 'l') goto yy109;
+ yyaccept = 93;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy850:
-#line 190 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy901:
+#line 200 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_COMPL_ALT); }
-#line 5773 "cpp_re.inc"
-yy851:
+#line 6092 "cpp_re.inc"
+yy902:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 't') goto yy858;
- goto yy195;
-yy852:
+ if (yych == 't') goto yy909;
+ goto yy109;
+yy903:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'u') goto yy195;
+ if (yych != 'u') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 89;
+ if (yych != 'e') goto yy109;
+ yyaccept = 94;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy857:
-#line 57 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy908:
+#line 62 "cpp.re"
     { BOOST_WAVE_RET(T_CONTINUE); }
-#line 5802 "cpp_re.inc"
-yy858:
- yyaccept = 90;
+#line 6121 "cpp_re.inc"
+yy909:
+ yyaccept = 95;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= '@') {
- if (yych <= '/') {
- if (yych == '$') goto yy194;
+ if (yych <= 'Z') {
+ if (yych <= '9') {
+ if (yych == '$') goto yy108;
+ if (yych >= '0') goto yy108;
         } else {
- if (yych <= '9') goto yy194;
- if (yych == '?') goto yy197;
+ if (yych == '?') goto yy111;
+ if (yych >= 'A') goto yy108;
         }
     } else {
- if (yych <= '^') {
- if (yych <= 'Z') goto yy194;
- if (yych == '\\') goto yy196;
+ if (yych <= '_') {
+ if (yych == '\\') goto yy110;
+ if (yych >= '_') goto yy911;
         } else {
- if (yych <= '_') goto yy860;
- if (yych <= '`') goto yy859;
- if (yych <= 'z') goto yy194;
+ if (yych <= 'd') {
+ if (yych >= 'a') goto yy108;
+ } else {
+ if (yych <= 'e') goto yy912;
+ if (yych <= 'z') goto yy108;
+ }
         }
     }
-yy859:
-#line 55 "cpp.re"
+yy910:
+#line 59 "cpp.re"
     { BOOST_WAVE_RET(T_CONST); }
-#line 5826 "cpp_re.inc"
-yy860:
+#line 6149 "cpp_re.inc"
+yy911:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych == 'c') goto yy917;
+ goto yy109;
+yy912:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'x') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 91;
+ if (yych != 'r') goto yy109;
+ yyaccept = 96;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy865:
-#line 56 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy916:
+#line 60 "cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_CONSTEXPR : T_IDENTIFIER); }
+#line 6175 "cpp_re.inc"
+yy917:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'a') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 's') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 't') goto yy109;
+ yyaccept = 97;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy921:
+#line 61 "cpp.re"
     { BOOST_WAVE_RET(T_CONSTCAST); }
-#line 5850 "cpp_re.inc"
-yy866:
+#line 6196 "cpp_re.inc"
+yy922:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
- yyaccept = 92;
+ if (yych != 's') goto yy109;
+ yyaccept = 98;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy869:
-#line 54 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy925:
+#line 58 "cpp.re"
     { BOOST_WAVE_RET(T_CLASS); }
-#line 5868 "cpp_re.inc"
-yy870:
+#line 6214 "cpp_re.inc"
+yy926:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
- yyaccept = 93;
+ if (yych != 'r') goto yy109;
+ yyaccept = 99;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yych <= '>') {
+ if (yych <= '0') {
+ if (yych == '$') goto yy108;
+ if (yych >= '0') goto yy108;
+ } else {
+ if (yych <= '2') {
+ if (yych <= '1') goto yy929;
+ goto yy108;
+ } else {
+ if (yych <= '3') goto yy930;
+ if (yych <= '9') goto yy108;
+ }
+ }
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '@') {
+ if (yych <= '?') goto yy111;
+ } else {
+ if (yych <= 'Z') goto yy108;
+ if (yych >= '\\') goto yy110;
+ }
+ } else {
+ if (yych <= '_') {
+ if (yych >= '_') goto yy108;
+ } else {
+ if (yych <= '`') goto yy928;
+ if (yych <= 'z') goto yy108;
+ }
+ }
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy872:
-#line 53 "cpp.re"
+yy928:
+#line 55 "cpp.re"
     { BOOST_WAVE_RET(T_CHAR); }
-#line 5883 "cpp_re.inc"
-yy873:
+#line 6254 "cpp_re.inc"
+yy929:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'e') goto yy878;
- goto yy195;
-yy874:
+ if (yych == '6') goto yy935;
+ goto yy109;
+yy930:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != '2') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'h') goto yy195;
- yyaccept = 94;
+ if (yych != '_') goto yy109;
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
- }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy877:
-#line 52 "cpp.re"
- { BOOST_WAVE_RET(T_CATCH); }
-#line 5906 "cpp_re.inc"
-yy878:
- yyaccept = 95;
+ if (yych != 't') goto yy109;
+ yyaccept = 100;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy879:
-#line 51 "cpp.re"
- { BOOST_WAVE_RET(T_CASE); }
-#line 5918 "cpp_re.inc"
-yy880:
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy934:
+#line 57 "cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_CHAR32_T : T_IDENTIFIER); }
+#line 6280 "cpp_re.inc"
+yy935:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 't') goto yy890;
- goto yy195;
-yy881:
+ if (yych != '_') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy887;
- goto yy195;
-yy882:
+ if (yych != 't') goto yy109;
+ yyaccept = 101;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy938:
+#line 56 "cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_CHAR16_T : T_IDENTIFIER); }
+#line 6298 "cpp_re.inc"
+yy939:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych == 'e') goto yy944;
+ goto yy109;
+yy940:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'k') goto yy195;
- yyaccept = 96;
+ if (yych != 'h') goto yy109;
+ yyaccept = 102;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy886:
-#line 50 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy943:
+#line 54 "cpp.re"
+ { BOOST_WAVE_RET(T_CATCH); }
+#line 6321 "cpp_re.inc"
+yy944:
+ yyaccept = 103;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy945:
+#line 53 "cpp.re"
+ { BOOST_WAVE_RET(T_CASE); }
+#line 6333 "cpp_re.inc"
+yy946:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 't') goto yy956;
+ goto yy109;
+yy947:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 'o') goto yy953;
+ goto yy109;
+yy948:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'e') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'a') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'k') goto yy109;
+ yyaccept = 104;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy952:
+#line 52 "cpp.re"
     { BOOST_WAVE_RET(T_BREAK); }
-#line 5949 "cpp_re.inc"
-yy887:
+#line 6364 "cpp_re.inc"
+yy953:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
- yyaccept = 97;
+ if (yych != 'l') goto yy109;
+ yyaccept = 105;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy889:
-#line 49 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy955:
+#line 51 "cpp.re"
     { BOOST_WAVE_RET(T_BOOL); }
-#line 5964 "cpp_re.inc"
-yy890:
+#line 6379 "cpp_re.inc"
+yy956:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy891;
- if (yych == 'o') goto yy892;
- goto yy195;
-yy891:
+ if (yych == 'a') goto yy957;
+ if (yych == 'o') goto yy958;
+ goto yy109;
+yy957:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'n') goto yy895;
- goto yy195;
-yy892:
+ if (yych == 'n') goto yy961;
+ goto yy109;
+yy958:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
- yyaccept = 98;
+ if (yych != 'r') goto yy109;
+ yyaccept = 106;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy894:
-#line 186 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy960:
+#line 196 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_OR_ALT); }
-#line 5990 "cpp_re.inc"
-yy895:
+#line 6405 "cpp_re.inc"
+yy961:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
- yyaccept = 99;
+ if (yych != 'd') goto yy109;
+ yyaccept = 107;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy897:
-#line 184 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy963:
+#line 194 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_AND_ALT); }
-#line 6005 "cpp_re.inc"
-yy898:
+#line 6420 "cpp_re.inc"
+yy964:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'd') goto yy906;
- goto yy195;
-yy899:
+ if (yych == 'i') goto yy979;
+ goto yy109;
+yy965:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'm') goto yy904;
- goto yy195;
-yy900:
+ if (yych == 'd') goto yy973;
+ goto yy109;
+yy966:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych == 'm') goto yy971;
+ goto yy109;
+yy967:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'o') goto yy195;
- yyaccept = 100;
+ if (yych != 't') goto yy109;
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yych != 'o') goto yy109;
+ yyaccept = 108;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy903:
-#line 48 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy970:
+#line 50 "cpp.re"
     { BOOST_WAVE_RET(T_AUTO); }
-#line 6033 "cpp_re.inc"
-yy904:
- yyaccept = 101;
+#line 6453 "cpp_re.inc"
+yy971:
+ yyaccept = 109;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy905:
-#line 47 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy972:
+#line 49 "cpp.re"
     { BOOST_WAVE_RET(T_ASM); }
-#line 6045 "cpp_re.inc"
-yy906:
- yyaccept = 102;
+#line 6465 "cpp_re.inc"
+yy973:
+ yyaccept = 110;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '@') {
         if (yych <= '/') {
- if (yych == '$') goto yy194;
+ if (yych == '$') goto yy108;
         } else {
- if (yych <= '9') goto yy194;
- if (yych == '?') goto yy197;
+ if (yych <= '9') goto yy108;
+ if (yych == '?') goto yy111;
         }
     } else {
         if (yych <= '^') {
- if (yych <= 'Z') goto yy194;
- if (yych == '\\') goto yy196;
+ if (yych <= 'Z') goto yy108;
+ if (yych == '\\') goto yy110;
         } else {
- if (yych <= '_') goto yy908;
- if (yych <= '`') goto yy907;
- if (yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy975;
+ if (yych <= '`') goto yy974;
+ if (yych <= 'z') goto yy108;
         }
     }
-yy907:
-#line 219 "cpp.re"
+yy974:
+#line 229 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ANDAND_ALT); }
-#line 6069 "cpp_re.inc"
-yy908:
+#line 6489 "cpp_re.inc"
+yy975:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'q') goto yy195;
- yyaccept = 103;
+ if (yych != 'q') goto yy109;
+ yyaccept = 111;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy911:
-#line 205 "cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy978:
+#line 215 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ANDASSIGN_ALT); }
-#line 6087 "cpp_re.inc"
-yy912:
+#line 6507 "cpp_re.inc"
+yy979:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'g') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'n') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 'a') goto yy982;
+ if (yych == 'o') goto yy983;
+ goto yy109;
+yy982:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 's') goto yy986;
+ goto yy109;
+yy983:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'f') goto yy109;
+ yyaccept = 112;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy985:
+#line 48 "cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_ALIGNOF : T_IDENTIFIER); }
+#line 6539 "cpp_re.inc"
+yy986:
+ yyaccept = 113;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy987:
+#line 47 "cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_ALIGNAS : T_IDENTIFIER); }
+#line 6551 "cpp_re.inc"
+yy988:
     ++YYCURSOR;
-#line 166 "cpp.re"
+#line 176 "cpp.re"
     {
             if (s->act_in_c99_mode) {
                 --YYCURSOR;
@@ -6096,71 +6560,71 @@
                 BOOST_WAVE_RET(T_DOTSTAR);
             }
         }
-#line 6100 "cpp_re.inc"
-yy914:
+#line 6564 "cpp_re.inc"
+yy990:
     yych = *++YYCURSOR;
- if (yych == '.') goto yy916;
- goto yy98;
-yy915:
+ if (yych == '.') goto yy992;
+ goto yy99;
+yy991:
     yych = *++YYCURSOR;
     goto yy7;
-yy916:
+yy992:
     ++YYCURSOR;
-#line 152 "cpp.re"
+#line 162 "cpp.re"
     { BOOST_WAVE_RET(T_ELLIPSIS); }
-#line 6112 "cpp_re.inc"
-yy918:
+#line 6576 "cpp_re.inc"
+yy994:
     ++YYCURSOR;
-#line 199 "cpp.re"
+#line 209 "cpp.re"
     { BOOST_WAVE_RET(T_DIVIDEASSIGN); }
-#line 6117 "cpp_re.inc"
-yy920:
+#line 6581 "cpp_re.inc"
+yy996:
     ++YYCURSOR;
 #line 44 "cpp.re"
     { goto cppcomment; }
-#line 6122 "cpp_re.inc"
-yy922:
+#line 6586 "cpp_re.inc"
+yy998:
     ++YYCURSOR;
 #line 43 "cpp.re"
     { goto ccomment; }
-#line 6127 "cpp_re.inc"
+#line 6591 "cpp_re.inc"
 }
-#line 308 "cpp.re"
+#line 348 "cpp.re"
 
 
 ccomment:
 
-#line 6134 "cpp_re.inc"
+#line 6598 "cpp_re.inc"
 {
     YYCTYPE yych;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
     if (yych <= '\f') {
         if (yych <= 0x08) {
- if (yych <= 0x00) goto yy933;
- goto yy935;
+ if (yych <= 0x00) goto yy1009;
+ goto yy1011;
         } else {
- if (yych == '\n') goto yy928;
- goto yy931;
+ if (yych == '\n') goto yy1004;
+ goto yy1007;
         }
     } else {
         if (yych <= 0x1F) {
- if (yych <= '\r') goto yy930;
- goto yy935;
+ if (yych <= '\r') goto yy1006;
+ goto yy1011;
         } else {
- if (yych != '*') goto yy932;
+ if (yych != '*') goto yy1008;
         }
     }
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '/') goto yy938;
-yy927:
-#line 323 "cpp.re"
+ if ((yych = *YYCURSOR) == '/') goto yy1014;
+yy1003:
+#line 363 "cpp.re"
     { goto ccomment; }
-#line 6160 "cpp_re.inc"
-yy928:
+#line 6624 "cpp_re.inc"
+yy1004:
     ++YYCURSOR;
-yy929:
-#line 315 "cpp.re"
+yy1005:
+#line 355 "cpp.re"
     {
         /*if(cursor == s->eof) BOOST_WAVE_RET(T_EOF);*/
         /*s->tok = cursor; */
@@ -6168,20 +6632,20 @@
         cursor.column = 1;
         goto ccomment;
     }
-#line 6172 "cpp_re.inc"
-yy930:
+#line 6636 "cpp_re.inc"
+yy1006:
     yych = *++YYCURSOR;
- if (yych == '\n') goto yy937;
- goto yy929;
-yy931:
+ if (yych == '\n') goto yy1013;
+ goto yy1005;
+yy1007:
     yych = *++YYCURSOR;
- goto yy927;
-yy932:
+ goto yy1003;
+yy1008:
     yych = *++YYCURSOR;
- goto yy927;
-yy933:
+ goto yy1003;
+yy1009:
     ++YYCURSOR;
-#line 326 "cpp.re"
+#line 366 "cpp.re"
     {
         if(cursor == s->eof)
         {
@@ -6197,49 +6661,49 @@
                 "invalid character: '\\000' in input stream");
         }
     }
-#line 6201 "cpp_re.inc"
-yy935:
+#line 6665 "cpp_re.inc"
+yy1011:
     ++YYCURSOR;
-#line 343 "cpp.re"
+#line 383 "cpp.re"
     {
         // flag the error
         BOOST_WAVE_UPDATE_CURSOR(); // adjust the input cursor
         (*s->error_proc)(s, lexing_exception::generic_lexing_error,
             "invalid character '\\%03o' in input stream", *--YYCURSOR);
     }
-#line 6211 "cpp_re.inc"
-yy937:
+#line 6675 "cpp_re.inc"
+yy1013:
     yych = *++YYCURSOR;
- goto yy929;
-yy938:
+ goto yy1005;
+yy1014:
     ++YYCURSOR;
-#line 312 "cpp.re"
+#line 352 "cpp.re"
     { BOOST_WAVE_RET(T_CCOMMENT); }
-#line 6219 "cpp_re.inc"
+#line 6683 "cpp_re.inc"
 }
-#line 349 "cpp.re"
+#line 389 "cpp.re"
 
 
 cppcomment:
 
-#line 6226 "cpp_re.inc"
+#line 6690 "cpp_re.inc"
 {
     YYCTYPE yych;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
     if (yych <= '\n') {
- if (yych <= 0x00) goto yy948;
- if (yych <= 0x08) goto yy950;
- if (yych <= '\t') goto yy945;
- } else {
- if (yych <= '\f') goto yy945;
- if (yych <= '\r') goto yy944;
- if (yych <= 0x1F) goto yy950;
- goto yy947;
+ if (yych <= 0x00) goto yy1024;
+ if (yych <= 0x08) goto yy1026;
+ if (yych <= '\t') goto yy1021;
+ } else {
+ if (yych <= '\f') goto yy1021;
+ if (yych <= '\r') goto yy1020;
+ if (yych <= 0x1F) goto yy1026;
+ goto yy1023;
     }
     ++YYCURSOR;
-yy943:
-#line 354 "cpp.re"
+yy1019:
+#line 394 "cpp.re"
     {
         /*if(cursor == s->eof) BOOST_WAVE_RET(T_EOF); */
         /*s->tok = cursor; */
@@ -6247,23 +6711,23 @@
         cursor.column = 1;
         BOOST_WAVE_RET(T_CPPCOMMENT);
     }
-#line 6251 "cpp_re.inc"
-yy944:
+#line 6715 "cpp_re.inc"
+yy1020:
     yych = *++YYCURSOR;
- if (yych == '\n') goto yy952;
- goto yy943;
-yy945:
+ if (yych == '\n') goto yy1028;
+ goto yy1019;
+yy1021:
     ++YYCURSOR;
-yy946:
-#line 362 "cpp.re"
+yy1022:
+#line 402 "cpp.re"
     { goto cppcomment; }
-#line 6261 "cpp_re.inc"
-yy947:
+#line 6725 "cpp_re.inc"
+yy1023:
     yych = *++YYCURSOR;
- goto yy946;
-yy948:
+ goto yy1022;
+yy1024:
     ++YYCURSOR;
-#line 365 "cpp.re"
+#line 405 "cpp.re"
     {
         if (s->eof && cursor != s->eof)
         {
@@ -6272,7 +6736,7 @@
             (*s->error_proc)(s, lexing_exception::generic_lexing_error,
                 "invalid character '\\000' in input stream");
         }
-
+
         --YYCURSOR; // next call returns T_EOF
         if (!s->single_line_only)
         {
@@ -6282,23 +6746,23 @@
         }
         BOOST_WAVE_RET(T_CPPCOMMENT);
     }
-#line 6286 "cpp_re.inc"
-yy950:
+#line 6750 "cpp_re.inc"
+yy1026:
     ++YYCURSOR;
-#line 385 "cpp.re"
+#line 425 "cpp.re"
     {
         // flag the error
         BOOST_WAVE_UPDATE_CURSOR(); // adjust the input cursor
         (*s->error_proc)(s, lexing_exception::generic_lexing_error,
             "invalid character '\\%03o' in input stream", *--YYCURSOR);
     }
-#line 6296 "cpp_re.inc"
-yy952:
+#line 6760 "cpp_re.inc"
+yy1028:
     ++YYCURSOR;
     yych = *YYCURSOR;
- goto yy943;
+ goto yy1019;
 }
-#line 391 "cpp.re"
+#line 431 "cpp.re"
 
 
 /* this subscanner is called whenever a pp_number has been started */
@@ -6310,7 +6774,7 @@
 
     if (s->detect_pp_numbers) {
     
-#line 6314 "cpp_re.inc"
+#line 6778 "cpp_re.inc"
 {
     YYCTYPE yych;
     static const unsigned char yybm[] = {
@@ -6349,253 +6813,253 @@
     };
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if (yych == '.') goto yy956;
- if (yych <= '/') goto yy955;
- if (yych <= '9') goto yy957;
-yy955:
+ if (yych == '.') goto yy1032;
+ if (yych <= '/') goto yy1031;
+ if (yych <= '9') goto yy1033;
+yy1031:
     YYCURSOR = YYMARKER;
- goto yy959;
-yy956:
+ goto yy1035;
+yy1032:
     yych = *++YYCURSOR;
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
-yy957:
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
+yy1033:
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 64) {
- goto yy957;
+ goto yy1033;
     }
     if (yych <= 'Z') {
- if (yych == '?') goto yy963;
- if (yych >= 'A') goto yy960;
+ if (yych == '?') goto yy1039;
+ if (yych >= 'A') goto yy1036;
     } else {
         if (yych <= '\\') {
- if (yych >= '\\') goto yy962;
+ if (yych >= '\\') goto yy1038;
         } else {
- if (yych == 'e') goto yy960;
+ if (yych == 'e') goto yy1036;
         }
     }
-yy959:
-#line 403 "cpp.re"
+yy1035:
+#line 443 "cpp.re"
     { BOOST_WAVE_RET(T_PP_NUMBER); }
-#line 6383 "cpp_re.inc"
-yy960:
+#line 6847 "cpp_re.inc"
+yy1036:
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy960;
+ goto yy1036;
     }
     if (yych <= '>') {
         if (yych <= '+') {
- if (yych == '$') goto yy957;
- if (yych <= '*') goto yy959;
- goto yy957;
+ if (yych == '$') goto yy1033;
+ if (yych <= '*') goto yy1035;
+ goto yy1033;
         } else {
             if (yych <= '.') {
- if (yych <= ',') goto yy959;
- goto yy957;
+ if (yych <= ',') goto yy1035;
+ goto yy1033;
             } else {
- if (yych <= '/') goto yy959;
- if (yych <= '9') goto yy957;
- goto yy959;
+ if (yych <= '/') goto yy1035;
+ if (yych <= '9') goto yy1033;
+ goto yy1035;
             }
         }
     } else {
         if (yych <= '\\') {
             if (yych <= '@') {
- if (yych <= '?') goto yy963;
- goto yy959;
+ if (yych <= '?') goto yy1039;
+ goto yy1035;
             } else {
- if (yych <= 'Z') goto yy957;
- if (yych <= '[') goto yy959;
+ if (yych <= 'Z') goto yy1033;
+ if (yych <= '[') goto yy1035;
             }
         } else {
             if (yych <= '_') {
- if (yych <= '^') goto yy959;
- goto yy957;
+ if (yych <= '^') goto yy1035;
+ goto yy1033;
             } else {
- if (yych <= '`') goto yy959;
- if (yych <= 'z') goto yy957;
- goto yy959;
+ if (yych <= '`') goto yy1035;
+ if (yych <= 'z') goto yy1033;
+ goto yy1035;
             }
         }
     }
-yy962:
+yy1038:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych == 'U') goto yy966;
- if (yych == 'u') goto yy965;
- goto yy955;
-yy963:
+ if (yych == 'U') goto yy1042;
+ if (yych == 'u') goto yy1041;
+ goto yy1031;
+yy1039:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych != '?') goto yy955;
+ if (yych != '?') goto yy1031;
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych == '/') goto yy962;
- goto yy955;
-yy965:
+ if (yych == '/') goto yy1038;
+ goto yy1031;
+yy1041:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych <= '9') goto yy974;
- goto yy955;
- } else {
- if (yych <= 'F') goto yy974;
- if (yych <= '`') goto yy955;
- if (yych <= 'f') goto yy974;
- goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych <= '9') goto yy1050;
+ goto yy1031;
+ } else {
+ if (yych <= 'F') goto yy1050;
+ if (yych <= '`') goto yy1031;
+ if (yych <= 'f') goto yy1050;
+ goto yy1031;
     }
-yy966:
+yy1042:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy967;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1043;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy967:
+yy1043:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy968;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1044;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy968:
+yy1044:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy969;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1045;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy969:
+yy1045:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy970;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1046;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy970:
+yy1046:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy971;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1047;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy971:
+yy1047:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy972;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1048;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy972:
+yy1048:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy973;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1049;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy973:
+yy1049:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych <= '9') goto yy957;
- goto yy955;
- } else {
- if (yych <= 'F') goto yy957;
- if (yych <= '`') goto yy955;
- if (yych <= 'f') goto yy957;
- goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych <= '9') goto yy1033;
+ goto yy1031;
+ } else {
+ if (yych <= 'F') goto yy1033;
+ if (yych <= '`') goto yy1031;
+ if (yych <= 'f') goto yy1033;
+ goto yy1031;
     }
-yy974:
+yy1050:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy975;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1051;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy975:
+yy1051:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy976;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1052;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy976:
+yy1052:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych <= '9') goto yy957;
- goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych <= '9') goto yy1033;
+ goto yy1031;
     } else {
- if (yych <= 'F') goto yy957;
- if (yych <= '`') goto yy955;
- if (yych <= 'f') goto yy957;
- goto yy955;
+ if (yych <= 'F') goto yy1033;
+ if (yych <= '`') goto yy1031;
+ if (yych <= 'f') goto yy1033;
+ goto yy1031;
     }
 }
-#line 404 "cpp.re"
+#line 444 "cpp.re"
 
     }
     else {
     
-#line 6599 "cpp_re.inc"
+#line 7063 "cpp_re.inc"
 {
     YYCTYPE yych;
     unsigned int yyaccept = 0;
@@ -6636,371 +7100,1945 @@
     if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
     yych = *YYCURSOR;
     if (yych <= '/') {
- if (yych == '.') goto yy984;
+ if (yych == '.') goto yy1060;
     } else {
- if (yych <= '0') goto yy980;
- if (yych <= '9') goto yy982;
+ if (yych <= '0') goto yy1056;
+ if (yych <= '9') goto yy1058;
     }
-yy979:
+yy1055:
     YYCURSOR = YYMARKER;
     if (yyaccept <= 0) {
- goto yy981;
+ goto yy1057;
     } else {
- goto yy987;
+ goto yy1063;
     }
-yy980:
+yy1056:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yybm[0+yych] & 64) {
- goto yy999;
+ goto yy1075;
     }
     if (yych <= 'E') {
         if (yych <= '/') {
- if (yych == '.') goto yy985;
+ if (yych == '.') goto yy1061;
         } else {
- if (yych <= '9') goto yy1002;
- if (yych >= 'E') goto yy995;
+ if (yych <= '9') goto yy1078;
+ if (yych >= 'E') goto yy1071;
         }
     } else {
         if (yych <= 'd') {
- if (yych == 'X') goto yy1001;
+ if (yych == 'X') goto yy1077;
         } else {
- if (yych <= 'e') goto yy995;
- if (yych == 'x') goto yy1001;
+ if (yych <= 'e') goto yy1071;
+ if (yych == 'x') goto yy1077;
         }
     }
-yy981:
-#line 411 "cpp.re"
+yy1057:
+#line 451 "cpp.re"
     { goto integer_suffix; }
-#line 6676 "cpp_re.inc"
-yy982:
+#line 7140 "cpp_re.inc"
+yy1058:
     yyaccept = 0;
     YYMARKER = ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 32) {
- goto yy982;
+ goto yy1058;
     }
     if (yych <= 'D') {
- if (yych == '.') goto yy985;
- goto yy981;
+ if (yych == '.') goto yy1061;
+ goto yy1057;
     } else {
- if (yych <= 'E') goto yy995;
- if (yych == 'e') goto yy995;
- goto yy981;
- }
-yy984:
- yych = *++YYCURSOR;
- if (yych <= '/') goto yy979;
- if (yych >= ':') goto yy979;
-yy985:
+ if (yych <= 'E') goto yy1071;
+ if (yych == 'e') goto yy1071;
+ goto yy1057;
+ }
+yy1060:
+ yych = *++YYCURSOR;
+ if (yych <= '/') goto yy1055;
+ if (yych >= ':') goto yy1055;
+yy1061:
     yyaccept = 1;
     YYMARKER = ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yych <= 'K') {
         if (yych <= 'D') {
- if (yych <= '/') goto yy987;
- if (yych <= '9') goto yy985;
+ if (yych <= '/') goto yy1063;
+ if (yych <= '9') goto yy1061;
         } else {
- if (yych <= 'E') goto yy988;
- if (yych <= 'F') goto yy989;
+ if (yych <= 'E') goto yy1064;
+ if (yych <= 'F') goto yy1065;
         }
     } else {
         if (yych <= 'e') {
- if (yych <= 'L') goto yy990;
- if (yych >= 'e') goto yy988;
+ if (yych <= 'L') goto yy1066;
+ if (yych >= 'e') goto yy1064;
         } else {
- if (yych <= 'f') goto yy989;
- if (yych == 'l') goto yy990;
+ if (yych <= 'f') goto yy1065;
+ if (yych == 'l') goto yy1066;
         }
     }
-yy987:
-#line 409 "cpp.re"
+yy1063:
+#line 449 "cpp.re"
     { BOOST_WAVE_RET(T_FLOATLIT); }
-#line 6722 "cpp_re.inc"
-yy988:
+#line 7186 "cpp_re.inc"
+yy1064:
     yych = *++YYCURSOR;
     if (yych <= ',') {
- if (yych == '+') goto yy992;
- goto yy979;
+ if (yych == '+') goto yy1068;
+ goto yy1055;
     } else {
- if (yych <= '-') goto yy992;
- if (yych <= '/') goto yy979;
- if (yych <= '9') goto yy993;
- goto yy979;
- }
-yy989:
- yych = *++YYCURSOR;
- if (yych == 'L') goto yy991;
- if (yych == 'l') goto yy991;
- goto yy987;
-yy990:
- yych = *++YYCURSOR;
- if (yych == 'F') goto yy991;
- if (yych != 'f') goto yy987;
-yy991:
- yych = *++YYCURSOR;
- goto yy987;
-yy992:
- yych = *++YYCURSOR;
- if (yych <= '/') goto yy979;
- if (yych >= ':') goto yy979;
-yy993:
+ if (yych <= '-') goto yy1068;
+ if (yych <= '/') goto yy1055;
+ if (yych <= '9') goto yy1069;
+ goto yy1055;
+ }
+yy1065:
+ yych = *++YYCURSOR;
+ if (yych == 'L') goto yy1067;
+ if (yych == 'l') goto yy1067;
+ goto yy1063;
+yy1066:
+ yych = *++YYCURSOR;
+ if (yych == 'F') goto yy1067;
+ if (yych != 'f') goto yy1063;
+yy1067:
+ yych = *++YYCURSOR;
+ goto yy1063;
+yy1068:
+ yych = *++YYCURSOR;
+ if (yych <= '/') goto yy1055;
+ if (yych >= ':') goto yy1055;
+yy1069:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
     if (yych <= 'K') {
         if (yych <= '9') {
- if (yych <= '/') goto yy987;
- goto yy993;
+ if (yych <= '/') goto yy1063;
+ goto yy1069;
         } else {
- if (yych == 'F') goto yy989;
- goto yy987;
+ if (yych == 'F') goto yy1065;
+ goto yy1063;
         }
     } else {
         if (yych <= 'f') {
- if (yych <= 'L') goto yy990;
- if (yych <= 'e') goto yy987;
- goto yy989;
+ if (yych <= 'L') goto yy1066;
+ if (yych <= 'e') goto yy1063;
+ goto yy1065;
         } else {
- if (yych == 'l') goto yy990;
- goto yy987;
+ if (yych == 'l') goto yy1066;
+ goto yy1063;
         }
     }
-yy995:
+yy1071:
     yych = *++YYCURSOR;
     if (yych <= ',') {
- if (yych != '+') goto yy979;
+ if (yych != '+') goto yy1055;
     } else {
- if (yych <= '-') goto yy996;
- if (yych <= '/') goto yy979;
- if (yych <= '9') goto yy997;
- goto yy979;
- }
-yy996:
- yych = *++YYCURSOR;
- if (yych <= '/') goto yy979;
- if (yych >= ':') goto yy979;
-yy997:
+ if (yych <= '-') goto yy1072;
+ if (yych <= '/') goto yy1055;
+ if (yych <= '9') goto yy1073;
+ goto yy1055;
+ }
+yy1072:
+ yych = *++YYCURSOR;
+ if (yych <= '/') goto yy1055;
+ if (yych >= ':') goto yy1055;
+yy1073:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
     if (yych <= 'K') {
         if (yych <= '9') {
- if (yych <= '/') goto yy987;
- goto yy997;
+ if (yych <= '/') goto yy1063;
+ goto yy1073;
         } else {
- if (yych == 'F') goto yy989;
- goto yy987;
+ if (yych == 'F') goto yy1065;
+ goto yy1063;
         }
     } else {
         if (yych <= 'f') {
- if (yych <= 'L') goto yy990;
- if (yych <= 'e') goto yy987;
- goto yy989;
+ if (yych <= 'L') goto yy1066;
+ if (yych <= 'e') goto yy1063;
+ goto yy1065;
         } else {
- if (yych == 'l') goto yy990;
- goto yy987;
+ if (yych == 'l') goto yy1066;
+ goto yy1063;
         }
     }
-yy999:
+yy1075:
     yyaccept = 0;
     YYMARKER = ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 64) {
- goto yy999;
+ goto yy1075;
     }
     if (yych <= '9') {
- if (yych == '.') goto yy985;
- if (yych <= '/') goto yy981;
- goto yy1002;
+ if (yych == '.') goto yy1061;
+ if (yych <= '/') goto yy1057;
+ goto yy1078;
     } else {
         if (yych <= 'E') {
- if (yych <= 'D') goto yy981;
- goto yy995;
+ if (yych <= 'D') goto yy1057;
+ goto yy1071;
         } else {
- if (yych == 'e') goto yy995;
- goto yy981;
+ if (yych == 'e') goto yy1071;
+ goto yy1057;
         }
     }
-yy1001:
+yy1077:
     yych = *++YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1004;
+ goto yy1080;
     }
- goto yy979;
-yy1002:
+ goto yy1055;
+yy1078:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yych <= '9') {
- if (yych == '.') goto yy985;
- if (yych <= '/') goto yy979;
- goto yy1002;
+ if (yych == '.') goto yy1061;
+ if (yych <= '/') goto yy1055;
+ goto yy1078;
     } else {
         if (yych <= 'E') {
- if (yych <= 'D') goto yy979;
- goto yy995;
+ if (yych <= 'D') goto yy1055;
+ goto yy1071;
         } else {
- if (yych == 'e') goto yy995;
- goto yy979;
+ if (yych == 'e') goto yy1071;
+ goto yy1055;
         }
     }
-yy1004:
+yy1080:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1004;
+ goto yy1080;
     }
- goto yy981;
+ goto yy1057;
 }
-#line 412 "cpp.re"
+#line 452 "cpp.re"
 
     }
 }
 
-/* this subscanner is called, whenever a Integer was recognized */
+/* this subscanner is called, whenever an Integer was recognized */
 integer_suffix:
 {
     if (s->enable_ms_extensions) {
     
-#line 6871 "cpp_re.inc"
+#line 7335 "cpp_re.inc"
 {
     YYCTYPE yych;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *(YYMARKER = YYCURSOR);
     if (yych <= 'h') {
         if (yych <= 'L') {
- if (yych >= 'L') goto yy1010;
+ if (yych >= 'L') goto yy1086;
         } else {
- if (yych == 'U') goto yy1009;
+ if (yych == 'U') goto yy1085;
         }
     } else {
         if (yych <= 'l') {
- if (yych <= 'i') goto yy1011;
- if (yych >= 'l') goto yy1010;
+ if (yych <= 'i') goto yy1087;
+ if (yych >= 'l') goto yy1086;
         } else {
- if (yych == 'u') goto yy1009;
+ if (yych == 'u') goto yy1085;
         }
     }
-yy1008:
-#line 425 "cpp.re"
+yy1084:
+#line 465 "cpp.re"
     { BOOST_WAVE_RET(T_INTLIT); }
-#line 6893 "cpp_re.inc"
-yy1009:
+#line 7357 "cpp_re.inc"
+yy1085:
     yych = *++YYCURSOR;
- if (yych == 'L') goto yy1018;
- if (yych == 'l') goto yy1018;
- goto yy1008;
-yy1010:
+ if (yych == 'L') goto yy1094;
+ if (yych == 'l') goto yy1094;
+ goto yy1084;
+yy1086:
     yych = *++YYCURSOR;
     if (yych <= 'U') {
- if (yych == 'L') goto yy1017;
- if (yych <= 'T') goto yy1008;
- goto yy1016;
+ if (yych == 'L') goto yy1093;
+ if (yych <= 'T') goto yy1084;
+ goto yy1092;
     } else {
         if (yych <= 'l') {
- if (yych <= 'k') goto yy1008;
- goto yy1017;
+ if (yych <= 'k') goto yy1084;
+ goto yy1093;
         } else {
- if (yych == 'u') goto yy1016;
- goto yy1008;
+ if (yych == 'u') goto yy1092;
+ goto yy1084;
         }
     }
-yy1011:
+yy1087:
     yych = *++YYCURSOR;
- if (yych == '6') goto yy1013;
-yy1012:
+ if (yych == '6') goto yy1089;
+yy1088:
     YYCURSOR = YYMARKER;
- goto yy1008;
-yy1013:
+ goto yy1084;
+yy1089:
     yych = *++YYCURSOR;
- if (yych != '4') goto yy1012;
-yy1014:
+ if (yych != '4') goto yy1088;
+yy1090:
     ++YYCURSOR;
-yy1015:
-#line 422 "cpp.re"
+yy1091:
+#line 462 "cpp.re"
     { BOOST_WAVE_RET(T_LONGINTLIT); }
-#line 6928 "cpp_re.inc"
-yy1016:
+#line 7392 "cpp_re.inc"
+yy1092:
     yych = *++YYCURSOR;
- goto yy1008;
-yy1017:
+ goto yy1084;
+yy1093:
     yych = *++YYCURSOR;
- if (yych == 'U') goto yy1014;
- if (yych == 'u') goto yy1014;
- goto yy1015;
-yy1018:
- ++YYCURSOR;
- if ((yych = *YYCURSOR) == 'L') goto yy1014;
- if (yych == 'l') goto yy1014;
- goto yy1008;
+ if (yych == 'U') goto yy1090;
+ if (yych == 'u') goto yy1090;
+ goto yy1091;
+yy1094:
+ ++YYCURSOR;
+ if ((yych = *YYCURSOR) == 'L') goto yy1090;
+ if (yych == 'l') goto yy1090;
+ goto yy1084;
 }
-#line 426 "cpp.re"
+#line 466 "cpp.re"
 
     }
     else {
     
-#line 6948 "cpp_re.inc"
+#line 7412 "cpp_re.inc"
 {
     YYCTYPE yych;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yych <= 'U') {
- if (yych == 'L') goto yy1023;
- if (yych >= 'U') goto yy1022;
+ if (yych == 'L') goto yy1099;
+ if (yych >= 'U') goto yy1098;
     } else {
         if (yych <= 'l') {
- if (yych >= 'l') goto yy1023;
+ if (yych >= 'l') goto yy1099;
         } else {
- if (yych == 'u') goto yy1022;
+ if (yych == 'u') goto yy1098;
         }
     }
-yy1021:
-#line 434 "cpp.re"
+yy1097:
+#line 474 "cpp.re"
     { BOOST_WAVE_RET(T_INTLIT); }
-#line 6966 "cpp_re.inc"
-yy1022:
+#line 7430 "cpp_re.inc"
+yy1098:
     yych = *++YYCURSOR;
- if (yych == 'L') goto yy1028;
- if (yych == 'l') goto yy1028;
- goto yy1021;
-yy1023:
+ if (yych == 'L') goto yy1104;
+ if (yych == 'l') goto yy1104;
+ goto yy1097;
+yy1099:
     yych = *++YYCURSOR;
     if (yych <= 'U') {
- if (yych == 'L') goto yy1025;
- if (yych <= 'T') goto yy1021;
+ if (yych == 'L') goto yy1101;
+ if (yych <= 'T') goto yy1097;
     } else {
         if (yych <= 'l') {
- if (yych <= 'k') goto yy1021;
- goto yy1025;
+ if (yych <= 'k') goto yy1097;
+ goto yy1101;
         } else {
- if (yych != 'u') goto yy1021;
+ if (yych != 'u') goto yy1097;
         }
     }
     yych = *++YYCURSOR;
- goto yy1021;
-yy1025:
+ goto yy1097;
+yy1101:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == 'U') goto yy1027;
- if (yych == 'u') goto yy1027;
-yy1026:
-#line 431 "cpp.re"
+ if ((yych = *YYCURSOR) == 'U') goto yy1103;
+ if (yych == 'u') goto yy1103;
+yy1102:
+#line 471 "cpp.re"
     { BOOST_WAVE_RET(T_LONGINTLIT); }
-#line 6994 "cpp_re.inc"
-yy1027:
+#line 7458 "cpp_re.inc"
+yy1103:
     yych = *++YYCURSOR;
- goto yy1026;
-yy1028:
+ goto yy1102;
+yy1104:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == 'L') goto yy1027;
- if (yych == 'l') goto yy1027;
- goto yy1021;
+ if ((yych = *YYCURSOR) == 'L') goto yy1103;
+ if (yych == 'l') goto yy1103;
+ goto yy1097;
+}
+#line 475 "cpp.re"
+
+ }
 }
-#line 435 "cpp.re"
 
+/* this subscanner is invoked for C++0x extended character literals */
+extcharlit:
+{
+
+#line 7477 "cpp_re.inc"
+{
+ YYCTYPE yych;
+ static const unsigned char yybm[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 0, 0, 0, 0, 0, 0,
+ 0, 128, 128, 128, 128, 128, 128, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 128, 128, 128, 128, 128, 128, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ };
+ if ((YYLIMIT - YYCURSOR) < 13) YYFILL(13);
+ yych = *YYCURSOR;
+ if (yych <= 0x1F) {
+ if (yych <= '\n') {
+ if (yych <= 0x08) goto yy1107;
+ if (yych <= '\t') goto yy1108;
+ goto yy1112;
+ } else {
+ if (yych <= '\f') goto yy1108;
+ if (yych <= '\r') goto yy1112;
+ }
+ } else {
+ if (yych <= '>') {
+ if (yych == '\'') goto yy1112;
+ goto yy1108;
+ } else {
+ if (yych <= '?') goto yy1110;
+ if (yych == '\\') goto yy1111;
+ goto yy1108;
+ }
     }
+yy1107:
+ YYCURSOR = YYMARKER;
+ goto yy1109;
+yy1108:
+ ++YYCURSOR;
+ if ((yych = *YYCURSOR) == '\'') goto yy1120;
+yy1109:
+#line 487 "cpp.re"
+ { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
+#line 7544 "cpp_re.inc"
+yy1110:
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '\'') goto yy1120;
+ if (yych == '?') goto yy1135;
+ goto yy1109;
+yy1111:
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy1115;
+ goto yy1109;
+ } else {
+ if (yych <= '\'') goto yy1115;
+ if (yych <= '/') goto yy1109;
+ goto yy1118;
+ }
+ } else {
+ if (yych <= 'T') {
+ if (yych == '?') goto yy1116;
+ goto yy1109;
+ } else {
+ if (yych <= 'U') goto yy1114;
+ if (yych == '\\') goto yy1115;
+ goto yy1109;
+ }
+ }
+ } else {
+ if (yych <= 'r') {
+ if (yych <= 'f') {
+ if (yych <= 'b') goto yy1115;
+ if (yych <= 'e') goto yy1109;
+ goto yy1115;
+ } else {
+ if (yych == 'n') goto yy1115;
+ if (yych <= 'q') goto yy1109;
+ goto yy1115;
+ }
+ } else {
+ if (yych <= 'u') {
+ if (yych <= 's') goto yy1109;
+ if (yych <= 't') goto yy1115;
+ goto yy1113;
+ } else {
+ if (yych <= 'v') goto yy1115;
+ if (yych == 'x') goto yy1117;
+ goto yy1109;
+ }
+ }
+ }
+yy1112:
+ yych = *++YYCURSOR;
+ goto yy1109;
+yy1113:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1132;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1132;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1132;
+ goto yy1107;
+ }
+yy1114:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1125;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1125;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1125;
+ goto yy1107;
+ }
+yy1115:
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy1120;
+ goto yy1107;
+yy1116:
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy1120;
+ if (yych == '?') goto yy1124;
+ goto yy1107;
+yy1117:
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy1107;
+ goto yy1123;
+yy1118:
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy1120;
+ if (yych <= '/') goto yy1107;
+ if (yych >= '8') goto yy1107;
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy1120;
+ if (yych <= '/') goto yy1107;
+ if (yych <= '7') goto yy1115;
+ goto yy1107;
+yy1120:
+ ++YYCURSOR;
+#line 484 "cpp.re"
+ { BOOST_WAVE_RET(T_CHARLIT); }
+#line 7649 "cpp_re.inc"
+yy1122:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+yy1123:
+ if (yybm[0+yych] & 128) {
+ goto yy1122;
+ }
+ if (yych == '\'') goto yy1120;
+ goto yy1107;
+yy1124:
+ yych = *++YYCURSOR;
+ if (yych == '/') goto yy1115;
+ goto yy1107;
+yy1125:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1126;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1126:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1127;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1127:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1128;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1128:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1129;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1129:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1130;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1130:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1131;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1131:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1115;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1115;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1115;
+ goto yy1107;
+ }
+yy1132:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1133;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1133:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1134;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1134:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1115;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1115;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1115;
+ goto yy1107;
+ }
+yy1135:
+ yych = *++YYCURSOR;
+ if (yych != '/') goto yy1107;
+ ++YYCURSOR;
+ if ((yych = *YYCURSOR) <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy1115;
+ goto yy1107;
+ } else {
+ if (yych <= '\'') goto yy1115;
+ if (yych <= '/') goto yy1107;
+ goto yy1118;
+ }
+ } else {
+ if (yych <= 'T') {
+ if (yych == '?') goto yy1116;
+ goto yy1107;
+ } else {
+ if (yych <= 'U') goto yy1114;
+ if (yych == '\\') goto yy1115;
+ goto yy1107;
+ }
+ }
+ } else {
+ if (yych <= 'r') {
+ if (yych <= 'f') {
+ if (yych <= 'b') goto yy1115;
+ if (yych <= 'e') goto yy1107;
+ goto yy1115;
+ } else {
+ if (yych == 'n') goto yy1115;
+ if (yych <= 'q') goto yy1107;
+ goto yy1115;
+ }
+ } else {
+ if (yych <= 'u') {
+ if (yych <= 's') goto yy1107;
+ if (yych <= 't') goto yy1115;
+ goto yy1113;
+ } else {
+ if (yych <= 'v') goto yy1115;
+ if (yych == 'x') goto yy1117;
+ goto yy1107;
+ }
+ }
+ }
+}
+#line 488 "cpp.re"
+
+}
+
+/* this subscanner is invoked for C++0x extended character string literals */
+extstringlit:
+{
+
+#line 7824 "cpp_re.inc"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept = 0;
+ static const unsigned char yybm[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 16, 0, 16, 16, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 16, 16, 0, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 144, 144, 144, 144, 144, 144, 144, 144,
+ 144, 144, 16, 16, 16, 16, 16, 32,
+ 16, 144, 144, 144, 144, 144, 144, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 64, 16, 16, 16,
+ 16, 144, 144, 144, 144, 144, 144, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ };
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ if (yych <= 0x1F) {
+ if (yych <= '\n') {
+ if (yych <= 0x08) goto yy1139;
+ if (yych <= '\t') goto yy1140;
+ goto yy1146;
+ } else {
+ if (yych <= '\f') goto yy1140;
+ if (yych <= '\r') goto yy1146;
+ }
+ } else {
+ if (yych <= '>') {
+ if (yych == '"') goto yy1144;
+ goto yy1140;
+ } else {
+ if (yych <= '?') goto yy1142;
+ if (yych == '\\') goto yy1143;
+ goto yy1140;
+ }
+ }
+yy1139:
+ YYCURSOR = YYMARKER;
+ if (yyaccept <= 0) {
+ goto yy1141;
+ } else {
+ goto yy1145;
+ }
+yy1140:
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy1150;
+ } else {
+ if (yych <= '\f') goto yy1150;
+ if (yych >= ' ') goto yy1150;
+ }
+yy1141:
+#line 499 "cpp.re"
+ { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
+#line 7902 "cpp_re.inc"
+yy1142:
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[0+yych] & 32) {
+ goto yy1158;
+ }
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy1150;
+ goto yy1141;
+ } else {
+ if (yych <= '\f') goto yy1150;
+ if (yych <= 0x1F) goto yy1141;
+ goto yy1150;
+ }
+yy1143:
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy1149;
+ goto yy1141;
+ } else {
+ if (yych <= '\'') goto yy1149;
+ if (yych <= '/') goto yy1141;
+ goto yy1153;
+ }
+ } else {
+ if (yych <= 'T') {
+ if (yych == '?') goto yy1151;
+ goto yy1141;
+ } else {
+ if (yych <= 'U') goto yy1148;
+ if (yych == '\\') goto yy1149;
+ goto yy1141;
+ }
+ }
+ } else {
+ if (yych <= 'r') {
+ if (yych <= 'f') {
+ if (yych <= 'b') goto yy1149;
+ if (yych <= 'e') goto yy1141;
+ goto yy1149;
+ } else {
+ if (yych == 'n') goto yy1149;
+ if (yych <= 'q') goto yy1141;
+ goto yy1149;
+ }
+ } else {
+ if (yych <= 'u') {
+ if (yych <= 's') goto yy1141;
+ if (yych <= 't') goto yy1149;
+ goto yy1147;
+ } else {
+ if (yych <= 'v') goto yy1149;
+ if (yych == 'x') goto yy1152;
+ goto yy1141;
+ }
+ }
+ }
+yy1144:
+ ++YYCURSOR;
+yy1145:
+#line 496 "cpp.re"
+ { BOOST_WAVE_RET(T_STRINGLIT); }
+#line 7968 "cpp_re.inc"
+yy1146:
+ yych = *++YYCURSOR;
+ goto yy1141;
+yy1147:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1187;
+ goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1187;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1187;
+ goto yy1139;
+ }
+yy1148:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1180;
+ goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1180;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1180;
+ goto yy1139;
+ }
+yy1149:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+yy1150:
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1151:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1179;
+ goto yy1157;
+yy1152:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 128) {
+ goto yy1166;
+ }
+ goto yy1139;
+yy1153:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '"') {
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ if (yych <= '!') goto yy1149;
+ goto yy1155;
+ }
+ } else {
+ if (yych <= '>') {
+ if (yych <= '/') goto yy1149;
+ if (yych >= '8') goto yy1149;
+ } else {
+ if (yych <= '?') goto yy1156;
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1155:
+ yych = *++YYCURSOR;
+ goto yy1145;
+yy1156:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1158;
+yy1157:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= '\'') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ goto yy1153;
+ }
+ } else {
+ if (yych <= 'T') {
+ if (yych == '?') goto yy1151;
+ goto yy1139;
+ } else {
+ if (yych <= 'U') goto yy1148;
+ if (yych == '\\') goto yy1149;
+ goto yy1139;
+ }
+ }
+ } else {
+ if (yych <= 'r') {
+ if (yych <= 'f') {
+ if (yych <= 'b') goto yy1149;
+ if (yych <= 'e') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych == 'n') goto yy1149;
+ if (yych <= 'q') goto yy1139;
+ goto yy1149;
+ }
+ } else {
+ if (yych <= 'u') {
+ if (yych <= 's') goto yy1139;
+ if (yych <= 't') goto yy1149;
+ goto yy1147;
+ } else {
+ if (yych <= 'v') goto yy1149;
+ if (yych == 'x') goto yy1152;
+ goto yy1139;
+ }
+ }
+ }
+yy1158:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 32) {
+ goto yy1158;
+ }
+ if (yych <= '!') {
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ }
+ } else {
+ if (yych <= '/') {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '.') goto yy1149;
+ } else {
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
+ }
+ }
+yy1160:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 64) {
+ goto yy1160;
+ }
+ if (yych <= '7') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1164;
+ if (yych <= '/') goto yy1149;
+ goto yy1153;
+ }
+ }
+ } else {
+ if (yych <= 'U') {
+ if (yych == '?') goto yy1165;
+ if (yych <= 'T') goto yy1149;
+ goto yy1163;
+ } else {
+ if (yych <= 'u') {
+ if (yych <= 't') goto yy1149;
+ } else {
+ if (yych == 'x') goto yy1166;
+ goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ goto yy1176;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ goto yy1176;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych <= 'f') goto yy1176;
+ goto yy1149;
+ }
+ }
+ }
+yy1163:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ goto yy1169;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ goto yy1169;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych <= 'f') goto yy1169;
+ goto yy1149;
+ }
+ }
+ }
+yy1164:
+ yyaccept = 1;
+ YYMARKER = ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1145;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1165:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1168;
+ goto yy1157;
+yy1166:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 128) {
+ goto yy1166;
+ }
+ if (yych <= '!') {
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ }
+ } else {
+ if (yych <= '?') {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '>') goto yy1149;
+ goto yy1156;
+ } else {
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
+ }
+ }
+yy1168:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 32) {
+ goto yy1158;
+ }
+ if (yych <= '!') {
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ }
+ } else {
+ if (yych <= '/') {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '.') goto yy1149;
+ goto yy1160;
+ } else {
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
+ }
+ }
+yy1169:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1176:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1179:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1158;
+ goto yy1157;
+yy1180:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1181;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1181:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1182;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1182:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1183;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1183:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1184;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1184:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1185;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1185:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1186;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1186:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1149;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1149;
+ goto yy1139;
+ }
+yy1187:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1188;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1188:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1189;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1189:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1149;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1149;
+ goto yy1139;
+ }
+}
+#line 500 "cpp.re"
+
+}
+
+extrawstringlit:
+{
+
+#line 8743 "cpp_re.inc"
+{
+ YYCTYPE yych;
+ static const unsigned char yybm[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 0, 0, 0, 0, 0, 0,
+ 0, 128, 128, 128, 128, 128, 128, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 128, 128, 128, 128, 128, 128, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ };
+ if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
+ yych = *YYCURSOR;
+ if (yych <= 0x1F) {
+ if (yych <= '\n') {
+ if (yych <= 0x08) goto yy1192;
+ if (yych <= '\t') goto yy1193;
+ goto yy1197;
+ } else {
+ if (yych <= '\f') goto yy1193;
+ if (yych <= '\r') goto yy1199;
+ }
+ } else {
+ if (yych <= '>') {
+ if (yych == '"') goto yy1200;
+ goto yy1193;
+ } else {
+ if (yych <= '?') goto yy1195;
+ if (yych == '\\') goto yy1196;
+ goto yy1193;
+ }
+ }
+yy1192:
+ YYCURSOR = YYMARKER;
+ goto yy1194;
+yy1193:
+ ++YYCURSOR;
+yy1194:
+#line 507 "cpp.re"
+ {
+ goto extrawstringlit;
+ }
+#line 8811 "cpp_re.inc"
+yy1195:
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '?') goto yy1221;
+ goto yy1194;
+yy1196:
+ yych = *++YYCURSOR;
+ if (yych <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy1193;
+ goto yy1192;
+ } else {
+ if (yych <= '\'') goto yy1193;
+ if (yych <= '/') goto yy1192;
+ goto yy1206;
+ }
+ } else {
+ if (yych <= 'T') {
+ if (yych == '?') goto yy1204;
+ goto yy1192;
+ } else {
+ if (yych <= 'U') goto yy1203;
+ if (yych == '\\') goto yy1193;
+ goto yy1192;
+ }
+ }
+ } else {
+ if (yych <= 'r') {
+ if (yych <= 'f') {
+ if (yych <= 'b') goto yy1193;
+ if (yych <= 'e') goto yy1192;
+ goto yy1193;
+ } else {
+ if (yych == 'n') goto yy1193;
+ if (yych <= 'q') goto yy1192;
+ goto yy1193;
+ }
+ } else {
+ if (yych <= 'u') {
+ if (yych <= 's') goto yy1192;
+ if (yych <= 't') goto yy1193;
+ goto yy1202;
+ } else {
+ if (yych <= 'v') goto yy1193;
+ if (yych == 'x') goto yy1205;
+ goto yy1192;
+ }
+ }
+ }
+yy1197:
+ ++YYCURSOR;
+yy1198:
+#line 512 "cpp.re"
+ {
+ s->line += count_backslash_newlines(s, cursor) +1;
+ cursor.column = 1;
+ goto extrawstringlit;
+ }
+#line 8870 "cpp_re.inc"
+yy1199:
+ yych = *++YYCURSOR;
+ if (yych == '\n') goto yy1197;
+ goto yy1198;
+yy1200:
+ ++YYCURSOR;
+#line 518 "cpp.re"
+ { BOOST_WAVE_RET(T_RAWSTRINGLIT); }
+#line 8879 "cpp_re.inc"
+yy1202:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1218;
+ goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1218;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1218;
+ goto yy1192;
+ }
+yy1203:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1211;
+ goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1211;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1211;
+ goto yy1192;
+ }
+yy1204:
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '?') goto yy1210;
+ goto yy1194;
+yy1205:
+ yych = *++YYCURSOR;
+ if (yybm[0+yych] & 128) {
+ goto yy1208;
+ }
+ goto yy1192;
+yy1206:
+ yych = *++YYCURSOR;
+ if (yych <= '/') goto yy1194;
+ if (yych >= '8') goto yy1194;
+ yych = *++YYCURSOR;
+ if (yych <= '/') goto yy1194;
+ if (yych <= '7') goto yy1193;
+ goto yy1194;
+yy1208:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 128) {
+ goto yy1208;
+ }
+ goto yy1194;
+yy1210:
+ yych = *++YYCURSOR;
+ if (yych == '/') goto yy1193;
+ goto yy1192;
+yy1211:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1212;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1212:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1213;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1213:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1214;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1214:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1215;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1215:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1216;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1216:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1217;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1217:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1193;
+ goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1193;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1193;
+ goto yy1192;
+ }
+yy1218:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1219;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1219:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1220;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1220:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1193;
+ goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1193;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1193;
+ goto yy1192;
+ }
+yy1221:
+ ++YYCURSOR;
+ if ((yych = *YYCURSOR) == '/') goto yy1196;
+ goto yy1192;
+}
+#line 519 "cpp.re"
+
 }

Modified: branches/release/libs/wave/src/cpplexer/re2clex/strict_cpp.re
==============================================================================
--- branches/release/libs/wave/src/cpplexer/re2clex/strict_cpp.re (original)
+++ branches/release/libs/wave/src/cpplexer/re2clex/strict_cpp.re 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
 
     Copyright (c) 2001 Daniel C. Nuffer
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 
@@ -44,6 +44,8 @@
     "//" { goto cppcomment; }
     "."? Digit { goto pp_number; }
 
+ "alignas" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_ALIGNAS : T_IDENTIFIER); }
+ "alignof" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_ALIGNOF : T_IDENTIFIER); }
     "asm" { BOOST_WAVE_RET(T_ASM); }
     "auto" { BOOST_WAVE_RET(T_AUTO); }
     "bool" { BOOST_WAVE_RET(T_BOOL); }
@@ -51,10 +53,14 @@
     "case" { BOOST_WAVE_RET(T_CASE); }
     "catch" { BOOST_WAVE_RET(T_CATCH); }
     "char" { BOOST_WAVE_RET(T_CHAR); }
+ "char16_t" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_CHAR16_T : T_IDENTIFIER); }
+ "char32_t" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_CHAR32_T : T_IDENTIFIER); }
     "class" { BOOST_WAVE_RET(T_CLASS); }
     "const" { BOOST_WAVE_RET(T_CONST); }
+ "constexpr" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_CONSTEXPR : T_IDENTIFIER); }
     "const_cast" { BOOST_WAVE_RET(T_CONSTCAST); }
     "continue" { BOOST_WAVE_RET(T_CONTINUE); }
+ "decltype" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_DECLTYPE : T_IDENTIFIER); }
     "default" { BOOST_WAVE_RET(T_DEFAULT); }
     "delete" { BOOST_WAVE_RET(T_DELETE); }
     "do" { BOOST_WAVE_RET(T_DO); }
@@ -78,6 +84,8 @@
     "mutable" { BOOST_WAVE_RET(T_MUTABLE); }
     "namespace" { BOOST_WAVE_RET(T_NAMESPACE); }
     "new" { BOOST_WAVE_RET(T_NEW); }
+ "noexcept" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_NOEXCEPT : T_IDENTIFIER); }
+ "nullptr" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_NULLPTR : T_IDENTIFIER); }
     "operator" { BOOST_WAVE_RET(T_OPERATOR); }
     "private" { BOOST_WAVE_RET(T_PRIVATE); }
     "protected" { BOOST_WAVE_RET(T_PROTECTED); }
@@ -90,10 +98,12 @@
     "sizeof" { BOOST_WAVE_RET(T_SIZEOF); }
     "static" { BOOST_WAVE_RET(T_STATIC); }
     "static_cast" { BOOST_WAVE_RET(T_STATICCAST); }
+ "static_assert" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_STATICASSERT : T_IDENTIFIER); }
     "struct" { BOOST_WAVE_RET(T_STRUCT); }
     "switch" { BOOST_WAVE_RET(T_SWITCH); }
     "template" { BOOST_WAVE_RET(T_TEMPLATE); }
     "this" { BOOST_WAVE_RET(T_THIS); }
+ "thread_local" { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_THREADLOCAL : T_IDENTIFIER); }
     "throw" { BOOST_WAVE_RET(T_THROW); }
     "true" { BOOST_WAVE_RET(T_TRUE); }
     "try" { BOOST_WAVE_RET(T_TRY); }
@@ -238,16 +248,46 @@
     "->" { BOOST_WAVE_RET(T_ARROW); }
     "??/" { BOOST_WAVE_RET(T_ANY_TRIGRAPH); }
 
-
- ([a-zA-Z_] | UniversalChar) ([a-zA-Z_0-9] | UniversalChar)*
- { BOOST_WAVE_RET(T_IDENTIFIER); }
-
- "L"? (['] (EscapeSequence|any\[\n\r\\']|UniversalChar)+ ['])
+ "L"? (['] (EscapeSequence | UniversalChar | any\[\n\r\\'])+ ['])
         { BOOST_WAVE_RET(T_CHARLIT); }
     
- "L"? (["] (EscapeSequence|any\[\n\r\\"]|UniversalChar)* ["])
+ "L"? (["] (EscapeSequence | UniversalChar | any\[\n\r\\"])* ["])
         { BOOST_WAVE_RET(T_STRINGLIT); }
     
+ "L"? "R" ["]
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extrawstringlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+
+ [uU] [']
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extcharlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+
+ ([uU] | "u8") ["]
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extstringlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+
+ ([uU] | "u8") "R" ["]
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extrawstringlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+
+ ([a-zA-Z_] | UniversalChar) ([a-zA-Z_0-9] | UniversalChar)*
+ { BOOST_WAVE_RET(T_IDENTIFIER); }
 
     Pound PPSpace ( "include" | "include_next") PPSpace "<" (any\[\n\r>])+ ">"
         { BOOST_WAVE_RET(T_PP_HHEADER); }
@@ -407,13 +447,13 @@
     /*!re2c
         ((FractionalConstant ExponentPart?) | (Digit+ ExponentPart)) FloatingSuffix?
             { BOOST_WAVE_RET(T_FLOATLIT); }
-
+
         Integer { goto integer_suffix; }
     */
     }
 }
 
-/* this subscanner is called, whenever a Integer was recognized */
+/* this subscanner is called, whenever an Integer was recognized */
 integer_suffix:
 {
     if (s->enable_ms_extensions) {
@@ -435,3 +475,46 @@
     */
     }
 }
+
+/* this subscanner is invoked for C++0x extended character literals */
+extcharlit:
+{
+ /*!re2c
+ ((EscapeSequence | UniversalChar | any\[\n\r\\']) ['])
+ { BOOST_WAVE_RET(T_CHARLIT); }
+
+ any
+ { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
+ */
+}
+
+/* this subscanner is invoked for C++0x extended character string literals */
+extstringlit:
+{
+ /*!re2c
+ ((EscapeSequence | UniversalChar | any\[\n\r\\"])* ["])
+ { BOOST_WAVE_RET(T_STRINGLIT); }
+
+ any
+ { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
+ */
+}
+
+extrawstringlit:
+{
+ /*!re2c
+ (EscapeSequence | UniversalChar | any\[\r\n\\"])
+ {
+ goto extrawstringlit;
+ }
+
+ Newline
+ {
+ s->line += count_backslash_newlines(s, cursor) +1;
+ cursor.column = 1;
+ goto extrawstringlit;
+ }
+
+ ["] { BOOST_WAVE_RET(T_RAWSTRINGLIT); }
+ */
+}

Modified: branches/release/libs/wave/src/cpplexer/re2clex/strict_cpp_re.inc
==============================================================================
--- branches/release/libs/wave/src/cpplexer/re2clex/strict_cpp_re.inc (original)
+++ branches/release/libs/wave/src/cpplexer/re2clex/strict_cpp_re.inc 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -1,10 +1,10 @@
-/* Generated by re2c 0.13.5 on Fri May 22 14:32:21 2009 */
+/* Generated by re2c 0.13.5 on Sun Jan 09 15:38:28 2011 */
 #line 1 "strict_cpp.re"
 /*=============================================================================
     Boost.Wave: A Standard compliant C++ preprocessor library
 
     Copyright (c) 2001 Daniel C. Nuffer
- Copyright (c) 2001-2010 Hartmut Kaiser.
+ Copyright (c) 2001-2011 Hartmut Kaiser.
     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)
 
@@ -28,76 +28,76 @@
     static const unsigned char yybm[] = {
         /* table 1 .. 8: 0 */
           0, 0, 0, 0, 0, 0, 0, 0,
- 0, 58, 32, 58, 58, 64, 0, 0,
+ 0, 60, 32, 60, 60, 64, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0,
- 58, 58, 50, 58, 58, 58, 58, 56,
- 58, 58, 154, 58, 58, 58, 58, 58,
- 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 58, 58, 58, 58, 42, 56,
- 58, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 58, 57, 58, 58, 62,
- 58, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 58, 58, 58, 58,
+ 60, 60, 52, 60, 60, 60, 60, 56,
+ 60, 60, 156, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 44, 57,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 58, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60,
         /* table 9 .. 12: 256 */
           0, 0, 0, 0, 0, 0, 0, 0,
- 0, 48, 0, 48, 48, 0, 0, 0,
+ 0, 80, 0, 80, 80, 0, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0,
- 48, 32, 0, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
+ 80, 64, 0, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 224, 224, 224, 224, 224, 224, 224, 224,
+ 224, 224, 64, 64, 64, 64, 64, 0,
+ 64, 224, 224, 224, 224, 224, 224, 96,
+ 96, 96, 96, 96, 96, 96, 96, 96,
+ 96, 96, 96, 96, 96, 96, 96, 96,
+ 96, 96, 96, 64, 0, 64, 64, 96,
+ 64, 224, 224, 224, 224, 224, 224, 96,
          96, 96, 96, 96, 96, 96, 96, 96,
- 96, 96, 32, 32, 32, 32, 32, 128,
- 32, 96, 96, 96, 96, 96, 96, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 0, 32, 32, 32,
- 32, 96, 96, 96, 96, 96, 96, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
- 32, 32, 32, 32, 32, 32, 32, 32,
+ 96, 96, 96, 96, 96, 96, 96, 96,
+ 96, 96, 96, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
+ 64, 64, 64, 64, 64, 64, 64, 64,
     };
 
     if ((YYLIMIT - YYCURSOR) < 17) YYFILL(17);
     yych = *YYCURSOR;
     switch (yych) {
- case 0x00: goto yy88;
+ case 0x00: goto yy90;
     case 0x01:
     case 0x02:
     case 0x03:
@@ -123,19 +123,19 @@
     case 0x1C:
     case 0x1D:
     case 0x1E:
- case 0x1F: goto yy91;
+ case 0x1F: goto yy93;
     case '\t':
     case '\v':
- case '\f': goto yy82;
- case '\n': goto yy85;
- case '\r': goto yy87;
- case ' ': goto yy84;
+ case '\f': goto yy84;
+ case '\n': goto yy87;
+ case '\r': goto yy89;
+ case ' ': goto yy86;
     case '!': goto yy68;
- case '"': goto yy81;
+ case '"': goto yy79;
     case '#': goto yy45;
     case '%': goto yy37;
     case '&': goto yy62;
- case '\'': goto yy80;
+ case '\'': goto yy77;
     case '(': goto yy47;
     case ')': goto yy49;
     case '*': goto yy57;
@@ -176,10 +176,8 @@
     case 'O':
     case 'P':
     case 'Q':
- case 'R':
     case 'S':
     case 'T':
- case 'U':
     case 'V':
     case 'W':
     case 'X':
@@ -190,10 +188,12 @@
     case 'k':
     case 'q':
     case 'y':
- case 'z': goto yy76;
- case 'L': goto yy77;
+ case 'z': goto yy82;
+ case 'L': goto yy76;
+ case 'R': goto yy80;
+ case 'U': goto yy81;
     case '[': goto yy39;
- case '\\': goto yy78;
+ case '\\': goto yy83;
     case ']': goto yy41;
     case '^': goto yy59;
     case '_': goto yy28;
@@ -221,31 +221,31 @@
     case '|': goto yy64;
     case '}': goto yy35;
     case '~': goto yy66;
- default: goto yy90;
+ default: goto yy92;
     }
 yy2:
     ++YYCURSOR;
     if ((yych = *YYCURSOR) <= '.') {
- if (yych == '*') goto yy922;
+ if (yych == '*') goto yy998;
     } else {
- if (yych <= '/') goto yy920;
- if (yych == '=') goto yy918;
+ if (yych <= '/') goto yy996;
+ if (yych == '=') goto yy994;
     }
-#line 178 "strict_cpp.re"
+#line 188 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DIVIDE); }
 #line 237 "strict_cpp_re.inc"
 yy4:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '-') {
- if (yych == '*') goto yy912;
+ if (yych == '*') goto yy988;
     } else {
- if (yych <= '.') goto yy914;
+ if (yych <= '.') goto yy990;
         if (yych <= '/') goto yy5;
- if (yych <= '9') goto yy915;
+ if (yych <= '9') goto yy991;
     }
 yy5:
-#line 164 "strict_cpp.re"
+#line 174 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DOT); }
 #line 251 "strict_cpp_re.inc"
 yy6:
@@ -257,471 +257,525 @@
 yy8:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'r') {
- if (yych == 'n') goto yy898;
- goto yy195;
- } else {
- if (yych <= 's') goto yy899;
- if (yych == 'u') goto yy900;
- goto yy195;
+ switch (yych) {
+ case 'l': goto yy964;
+ case 'n': goto yy965;
+ case 's': goto yy966;
+ case 'u': goto yy967;
+ default: goto yy109;
     }
 yy9:
-#line 243 "strict_cpp.re"
+#line 290 "strict_cpp.re"
     { BOOST_WAVE_RET(T_IDENTIFIER); }
-#line 272 "strict_cpp_re.inc"
+#line 271 "strict_cpp_re.inc"
 yy10:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'n') {
- if (yych == 'i') goto yy880;
- goto yy195;
+ if (yych == 'i') goto yy946;
+ goto yy109;
     } else {
- if (yych <= 'o') goto yy881;
- if (yych == 'r') goto yy882;
- goto yy195;
+ if (yych <= 'o') goto yy947;
+ if (yych == 'r') goto yy948;
+ goto yy109;
     }
 yy11:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     switch (yych) {
- case 'a': goto yy842;
- case 'h': goto yy843;
- case 'l': goto yy844;
- case 'o': goto yy845;
- default: goto yy195;
+ case 'a': goto yy893;
+ case 'h': goto yy894;
+ case 'l': goto yy895;
+ case 'o': goto yy896;
+ default: goto yy109;
     }
 yy12:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'n') {
- if (yych == 'e') goto yy811;
- goto yy195;
+ if (yych == 'e') goto yy855;
+ goto yy109;
     } else {
- if (yych <= 'o') goto yy812;
- if (yych == 'y') goto yy814;
- goto yy195;
+ if (yych <= 'o') goto yy856;
+ if (yych == 'y') goto yy858;
+ goto yy109;
     }
 yy13:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'm') {
- if (yych == 'l') goto yy786;
- goto yy195;
+ if (yych == 'l') goto yy830;
+ goto yy109;
     } else {
- if (yych <= 'n') goto yy787;
- if (yych == 'x') goto yy788;
- goto yy195;
+ if (yych <= 'n') goto yy831;
+ if (yych == 'x') goto yy832;
+ goto yy109;
     }
 yy14:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     switch (yych) {
- case 'a': goto yy767;
- case 'l': goto yy768;
- case 'o': goto yy769;
- case 'r': goto yy770;
- default: goto yy195;
+ case 'a': goto yy811;
+ case 'l': goto yy812;
+ case 'o': goto yy813;
+ case 'r': goto yy814;
+ default: goto yy109;
     }
 yy15:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy763;
- goto yy195;
+ if (yych == 'o') goto yy807;
+ goto yy109;
 yy16:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'l') {
- if (yych == 'f') goto yy747;
- goto yy195;
+ if (yych == 'f') goto yy791;
+ goto yy109;
     } else {
- if (yych <= 'm') goto yy749;
- if (yych <= 'n') goto yy750;
- goto yy195;
+ if (yych <= 'm') goto yy793;
+ if (yych <= 'n') goto yy794;
+ goto yy109;
     }
 yy17:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy743;
- goto yy195;
+ if (yych == 'o') goto yy787;
+ goto yy109;
 yy18:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'u') goto yy736;
- goto yy195;
+ if (yych == 'u') goto yy780;
+ goto yy109;
 yy19:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'd') {
- if (yych == 'a') goto yy717;
- goto yy195;
- } else {
- if (yych <= 'e') goto yy718;
- if (yych == 'o') goto yy719;
- goto yy195;
+ if (yych <= 'e') {
+ if (yych == 'a') goto yy747;
+ if (yych <= 'd') goto yy109;
+ goto yy748;
+ } else {
+ if (yych <= 'o') {
+ if (yych <= 'n') goto yy109;
+ goto yy749;
+ } else {
+ if (yych == 'u') goto yy750;
+ goto yy109;
+ }
     }
 yy20:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'p') goto yy703;
- if (yych == 'r') goto yy704;
- goto yy195;
+ if (yych == 'p') goto yy733;
+ if (yych == 'r') goto yy734;
+ goto yy109;
 yy21:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'r') goto yy682;
- if (yych == 'u') goto yy683;
- goto yy195;
+ if (yych == 'r') goto yy712;
+ if (yych == 'u') goto yy713;
+ goto yy109;
 yy22:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'e') goto yy654;
- goto yy195;
+ if (yych == 'e') goto yy684;
+ goto yy109;
 yy23:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 's') {
- if (yych <= 'g') goto yy195;
- if (yych <= 'h') goto yy615;
- if (yych <= 'i') goto yy616;
- goto yy195;
- } else {
- if (yych <= 't') goto yy617;
- if (yych == 'w') goto yy618;
- goto yy195;
+ if (yych <= 'g') goto yy109;
+ if (yych <= 'h') goto yy638;
+ if (yych <= 'i') goto yy639;
+ goto yy109;
+ } else {
+ if (yych <= 't') goto yy640;
+ if (yych == 'w') goto yy641;
+ goto yy109;
     }
 yy24:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'h') {
- if (yych == 'e') goto yy578;
- if (yych <= 'g') goto yy195;
- goto yy579;
+ if (yych == 'e') goto yy591;
+ if (yych <= 'g') goto yy109;
+ goto yy592;
     } else {
         if (yych <= 'r') {
- if (yych <= 'q') goto yy195;
- goto yy580;
+ if (yych <= 'q') goto yy109;
+ goto yy593;
         } else {
- if (yych == 'y') goto yy581;
- goto yy195;
+ if (yych == 'y') goto yy594;
+ goto yy109;
         }
     }
 yy25:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'n') goto yy561;
- if (yych == 's') goto yy562;
- goto yy195;
+ if (yych <= '8') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy129;
+ goto yy109;
+ } else {
+ if (yych <= '\'') goto yy131;
+ if (yych <= '7') goto yy109;
+ goto yy573;
+ }
+ } else {
+ if (yych <= 'm') {
+ if (yych == 'R') goto yy128;
+ goto yy109;
+ } else {
+ if (yych <= 'n') goto yy574;
+ if (yych == 's') goto yy575;
+ goto yy109;
+ }
+ }
 yy26:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy543;
- if (yych == 'o') goto yy544;
- goto yy195;
+ if (yych == 'i') goto yy555;
+ if (yych == 'o') goto yy556;
+ goto yy109;
 yy27:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'c') goto yy531;
- if (yych == 'h') goto yy532;
- goto yy195;
+ if (yych == 'c') goto yy543;
+ if (yych == 'h') goto yy544;
+ goto yy109;
 yy28:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     switch (yych) {
- case '_': goto yy442;
- case 'a': goto yy443;
- case 'b': goto yy444;
- case 'c': goto yy445;
- case 'd': goto yy446;
- case 'f': goto yy447;
- case 'i': goto yy448;
- case 's': goto yy449;
- default: goto yy195;
+ case '_': goto yy454;
+ case 'a': goto yy455;
+ case 'b': goto yy456;
+ case 'c': goto yy457;
+ case 'd': goto yy458;
+ case 'f': goto yy459;
+ case 'i': goto yy460;
+ case 's': goto yy461;
+ default: goto yy109;
     }
 yy29:
     ++YYCURSOR;
-#line 128 "strict_cpp.re"
+#line 138 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LEFTBRACE); }
-#line 445 "strict_cpp_re.inc"
+#line 465 "strict_cpp_re.inc"
 yy31:
     yyaccept = 2;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '?') goto yy407;
+ if (yych == '?') goto yy419;
 yy32:
-#line 153 "strict_cpp.re"
+#line 163 "strict_cpp.re"
     { BOOST_WAVE_RET(T_QUESTION_MARK); }
-#line 453 "strict_cpp_re.inc"
+#line 473 "strict_cpp_re.inc"
 yy33:
     ++YYCURSOR;
     if ((yych = *YYCURSOR) <= ':') {
- if (yych == '%') goto yy403;
- if (yych >= ':') goto yy401;
+ if (yych == '%') goto yy415;
+ if (yych >= ':') goto yy413;
     } else {
         if (yych <= ';') goto yy34;
- if (yych <= '<') goto yy399;
- if (yych <= '=') goto yy397;
+ if (yych <= '<') goto yy411;
+ if (yych <= '=') goto yy409;
     }
 yy34:
-#line 194 "strict_cpp.re"
+#line 204 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LESS); }
-#line 467 "strict_cpp_re.inc"
+#line 487 "strict_cpp_re.inc"
 yy35:
     ++YYCURSOR;
-#line 131 "strict_cpp.re"
+#line 141 "strict_cpp.re"
     { BOOST_WAVE_RET(T_RIGHTBRACE); }
-#line 472 "strict_cpp_re.inc"
+#line 492 "strict_cpp_re.inc"
 yy37:
     ++YYCURSOR;
     if ((yych = *YYCURSOR) <= '<') {
- if (yych == ':') goto yy388;
+ if (yych == ':') goto yy400;
     } else {
- if (yych <= '=') goto yy390;
- if (yych <= '>') goto yy392;
+ if (yych <= '=') goto yy402;
+ if (yych <= '>') goto yy404;
     }
-#line 179 "strict_cpp.re"
+#line 189 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PERCENT); }
-#line 483 "strict_cpp_re.inc"
+#line 503 "strict_cpp_re.inc"
 yy39:
     ++YYCURSOR;
-#line 134 "strict_cpp.re"
+#line 144 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LEFTBRACKET); }
-#line 488 "strict_cpp_re.inc"
+#line 508 "strict_cpp_re.inc"
 yy41:
     ++YYCURSOR;
-#line 137 "strict_cpp.re"
+#line 147 "strict_cpp.re"
     { BOOST_WAVE_RET(T_RIGHTBRACKET); }
-#line 493 "strict_cpp_re.inc"
+#line 513 "strict_cpp_re.inc"
 yy43:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == ':') goto yy384;
- if (yych == '>') goto yy386;
-#line 151 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == ':') goto yy396;
+ if (yych == '>') goto yy398;
+#line 161 "strict_cpp.re"
     { BOOST_WAVE_RET(T_COLON); }
-#line 500 "strict_cpp_re.inc"
+#line 520 "strict_cpp_re.inc"
 yy45:
     yyaccept = 3;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'c') {
         if (yych <= ' ') {
             if (yych <= '\n') {
- if (yych == '\t') goto yy261;
+ if (yych == '\t') goto yy273;
             } else {
- if (yych <= '\f') goto yy261;
- if (yych >= ' ') goto yy261;
+ if (yych <= '\f') goto yy273;
+ if (yych >= ' ') goto yy273;
             }
         } else {
             if (yych <= '.') {
- if (yych == '#') goto yy272;
+ if (yych == '#') goto yy284;
             } else {
- if (yych <= '/') goto yy261;
- if (yych == '?') goto yy271;
+ if (yych <= '/') goto yy273;
+ if (yych == '?') goto yy283;
             }
         }
     } else {
         if (yych <= 'p') {
             if (yych <= 'i') {
- if (yych <= 'e') goto yy261;
- if (yych >= 'i') goto yy261;
+ if (yych <= 'e') goto yy273;
+ if (yych >= 'i') goto yy273;
             } else {
- if (yych == 'l') goto yy261;
- if (yych >= 'p') goto yy261;
+ if (yych == 'l') goto yy273;
+ if (yych >= 'p') goto yy273;
             }
         } else {
             if (yych <= 't') {
- if (yych == 'r') goto yy261;
+ if (yych == 'r') goto yy273;
             } else {
                 if (yych == 'v') goto yy46;
- if (yych <= 'w') goto yy261;
+ if (yych <= 'w') goto yy273;
             }
         }
     }
 yy46:
-#line 140 "strict_cpp.re"
+#line 150 "strict_cpp.re"
     { BOOST_WAVE_RET(T_POUND); }
-#line 541 "strict_cpp_re.inc"
+#line 561 "strict_cpp_re.inc"
 yy47:
     ++YYCURSOR;
-#line 148 "strict_cpp.re"
+#line 158 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LEFTPAREN); }
-#line 546 "strict_cpp_re.inc"
+#line 566 "strict_cpp_re.inc"
 yy49:
     ++YYCURSOR;
-#line 149 "strict_cpp.re"
+#line 159 "strict_cpp.re"
     { BOOST_WAVE_RET(T_RIGHTPAREN); }
-#line 551 "strict_cpp_re.inc"
+#line 571 "strict_cpp_re.inc"
 yy51:
     ++YYCURSOR;
-#line 150 "strict_cpp.re"
+#line 160 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SEMICOLON); }
-#line 556 "strict_cpp_re.inc"
+#line 576 "strict_cpp_re.inc"
 yy53:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '+') goto yy256;
- if (yych == '=') goto yy258;
-#line 175 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == '+') goto yy268;
+ if (yych == '=') goto yy270;
+#line 185 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PLUS); }
-#line 563 "strict_cpp_re.inc"
+#line 583 "strict_cpp_re.inc"
 yy55:
     ++YYCURSOR;
     if ((yych = *YYCURSOR) <= '<') {
- if (yych == '-') goto yy250;
+ if (yych == '-') goto yy262;
     } else {
- if (yych <= '=') goto yy252;
- if (yych <= '>') goto yy248;
+ if (yych <= '=') goto yy264;
+ if (yych <= '>') goto yy260;
     }
-#line 176 "strict_cpp.re"
+#line 186 "strict_cpp.re"
     { BOOST_WAVE_RET(T_MINUS); }
-#line 574 "strict_cpp_re.inc"
+#line 594 "strict_cpp_re.inc"
 yy57:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy246;
-#line 177 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == '=') goto yy258;
+#line 187 "strict_cpp.re"
     { BOOST_WAVE_RET(T_STAR); }
-#line 580 "strict_cpp_re.inc"
+#line 600 "strict_cpp_re.inc"
 yy59:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy244;
-#line 180 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == '=') goto yy256;
+#line 190 "strict_cpp.re"
     { BOOST_WAVE_RET(T_XOR); }
-#line 586 "strict_cpp_re.inc"
+#line 606 "strict_cpp_re.inc"
 yy61:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy237;
- goto yy195;
+ if (yych == 'o') goto yy249;
+ goto yy109;
 yy62:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '&') goto yy233;
- if (yych == '=') goto yy235;
-#line 183 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == '&') goto yy245;
+ if (yych == '=') goto yy247;
+#line 193 "strict_cpp.re"
     { BOOST_WAVE_RET(T_AND); }
-#line 598 "strict_cpp_re.inc"
+#line 618 "strict_cpp_re.inc"
 yy64:
     yyaccept = 4;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '>') {
- if (yych == '=') goto yy228;
+ if (yych == '=') goto yy240;
     } else {
- if (yych <= '?') goto yy225;
- if (yych == '|') goto yy226;
+ if (yych <= '?') goto yy237;
+ if (yych == '|') goto yy238;
     }
 yy65:
-#line 185 "strict_cpp.re"
+#line 195 "strict_cpp.re"
     { BOOST_WAVE_RET(T_OR); }
-#line 611 "strict_cpp_re.inc"
+#line 631 "strict_cpp_re.inc"
 yy66:
     ++YYCURSOR;
-#line 188 "strict_cpp.re"
+#line 198 "strict_cpp.re"
     { BOOST_WAVE_RET(T_COMPL); }
-#line 616 "strict_cpp_re.inc"
+#line 636 "strict_cpp_re.inc"
 yy68:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy223;
-#line 191 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == '=') goto yy235;
+#line 201 "strict_cpp.re"
     { BOOST_WAVE_RET(T_NOT); }
-#line 622 "strict_cpp_re.inc"
+#line 642 "strict_cpp_re.inc"
 yy70:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy221;
-#line 193 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == '=') goto yy233;
+#line 203 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ASSIGN); }
-#line 628 "strict_cpp_re.inc"
+#line 648 "strict_cpp_re.inc"
 yy72:
     ++YYCURSOR;
     if ((yych = *YYCURSOR) <= '<') goto yy73;
- if (yych <= '=') goto yy215;
- if (yych <= '>') goto yy217;
+ if (yych <= '=') goto yy227;
+ if (yych <= '>') goto yy229;
 yy73:
-#line 195 "strict_cpp.re"
+#line 205 "strict_cpp.re"
     { BOOST_WAVE_RET(T_GREATER); }
-#line 637 "strict_cpp_re.inc"
+#line 657 "strict_cpp_re.inc"
 yy74:
     ++YYCURSOR;
-#line 227 "strict_cpp.re"
+#line 237 "strict_cpp.re"
     { BOOST_WAVE_RET(T_COMMA); }
-#line 642 "strict_cpp_re.inc"
+#line 662 "strict_cpp_re.inc"
 yy76:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- goto yy195;
-yy77:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
- }
- if (yych <= '\'') {
- if (yych == '"') goto yy96;
- if (yych <= '&') goto yy9;
- goto yy214;
+ if (yych <= '@') {
+ if (yych <= '\'') {
+ if (yych == '"') goto yy137;
+ if (yych <= '&') goto yy9;
+ goto yy226;
+ } else {
+ if (yych <= '9') {
+ if (yych <= '/') goto yy9;
+ goto yy108;
+ } else {
+ if (yych == '?') goto yy111;
+ goto yy9;
+ }
+ }
     } else {
- if (yych <= '?') {
- if (yych <= '>') goto yy9;
- goto yy197;
+ if (yych <= '\\') {
+ if (yych <= 'R') {
+ if (yych <= 'Q') goto yy108;
+ goto yy225;
+ } else {
+ if (yych <= 'Z') goto yy108;
+ if (yych <= '[') goto yy9;
+ goto yy110;
+ }
         } else {
- if (yych == '\\') goto yy196;
- goto yy9;
+ if (yych <= '_') {
+ if (yych <= '^') goto yy9;
+ goto yy108;
+ } else {
+ if (yych <= '`') goto yy9;
+ if (yych <= 'z') goto yy108;
+ goto yy9;
+ }
         }
     }
-yy78:
+yy77:
     yyaccept = 5;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'U') goto yy186;
- if (yych == 'u') goto yy185;
-yy79:
-#line 299 "strict_cpp.re"
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy182;
+ if (yych >= '\v') goto yy182;
+ } else {
+ if (yych <= 0x1F) goto yy78;
+ if (yych != '\'') goto yy182;
+ }
+yy78:
+#line 339 "strict_cpp.re"
     { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 674 "strict_cpp_re.inc"
-yy80:
+#line 714 "strict_cpp_re.inc"
+yy79:
     yyaccept = 5;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= '\f') {
- if (yych == '\t') goto yy142;
- if (yych <= '\n') goto yy79;
- goto yy142;
- } else {
- if (yych <= 0x1F) goto yy79;
- if (yych == '\'') goto yy79;
- goto yy142;
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy138;
+ goto yy78;
+ } else {
+ if (yych <= '\f') goto yy138;
+ if (yych <= 0x1F) goto yy78;
+ goto yy138;
     }
+yy80:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '"') goto yy135;
+ goto yy109;
 yy81:
- yyaccept = 5;
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= '\n') {
- if (yych == '\t') goto yy97;
- goto yy79;
+ if (yych <= '&') {
+ if (yych == '"') goto yy129;
+ goto yy109;
     } else {
- if (yych <= '\f') goto yy97;
- if (yych <= 0x1F) goto yy79;
- goto yy97;
+ if (yych <= '\'') goto yy131;
+ if (yych == 'R') goto yy128;
+ goto yy109;
     }
 yy82:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ goto yy109;
+yy83:
+ yyaccept = 5;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 'U') goto yy100;
+ if (yych == 'u') goto yy98;
+ goto yy78;
+yy84:
     ++YYCURSOR;
     yych = *YYCURSOR;
- goto yy95;
-yy83:
-#line 279 "strict_cpp.re"
+ goto yy97;
+yy85:
+#line 319 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SPACE); }
-#line 705 "strict_cpp_re.inc"
-yy84:
+#line 759 "strict_cpp_re.inc"
+yy86:
     yych = *++YYCURSOR;
- goto yy95;
-yy85:
+ goto yy97;
+yy87:
     ++YYCURSOR;
-yy86:
-#line 282 "strict_cpp.re"
+yy88:
+#line 322 "strict_cpp.re"
     {
         s->line++;
         cursor.column = 1;
         BOOST_WAVE_RET(T_NEWLINE);
     }
-#line 718 "strict_cpp_re.inc"
-yy87:
+#line 772 "strict_cpp_re.inc"
+yy89:
     yych = *++YYCURSOR;
- if (yych == '\n') goto yy93;
- goto yy86;
-yy88:
+ if (yych == '\n') goto yy95;
+ goto yy88;
+yy90:
     ++YYCURSOR;
-#line 289 "strict_cpp.re"
+#line 329 "strict_cpp.re"
     {
         if (s->eof && cursor != s->eof)
         {
@@ -731,50 +785,48 @@
         }
         BOOST_WAVE_RET(T_EOF);
     }
-#line 735 "strict_cpp_re.inc"
-yy90:
+#line 789 "strict_cpp_re.inc"
+yy92:
     yych = *++YYCURSOR;
- goto yy79;
-yy91:
+ goto yy78;
+yy93:
     ++YYCURSOR;
-#line 302 "strict_cpp.re"
+#line 342 "strict_cpp.re"
     {
         // flag the error
         BOOST_WAVE_UPDATE_CURSOR(); // adjust the input cursor
         (*s->error_proc)(s, lexing_exception::generic_lexing_error,
             "invalid character '\\%03o' in input stream", *--YYCURSOR);
     }
-#line 748 "strict_cpp_re.inc"
-yy93:
- yych = *++YYCURSOR;
- goto yy86;
-yy94:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+#line 802 "strict_cpp_re.inc"
 yy95:
- if (yybm[256+yych] & 16) {
- goto yy94;
- }
- goto yy83;
+ yych = *++YYCURSOR;
+ goto yy88;
 yy96:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy97:
- if (yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 16) {
         goto yy96;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy99;
- goto yy100;
+ goto yy85;
 yy98:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy125;
+ } else {
+ if (yych <= 'F') goto yy125;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy125;
+ }
+yy99:
     YYCURSOR = YYMARKER;
- if (yyaccept <= 51) {
- if (yyaccept <= 25) {
- if (yyaccept <= 12) {
- if (yyaccept <= 6) {
+ if (yyaccept <= 56) {
+ if (yyaccept <= 28) {
+ if (yyaccept <= 14) {
+ if (yyaccept <= 7) {
                     if (yyaccept <= 3) {
                         if (yyaccept <= 1) {
                             if (yyaccept <= 0) {
@@ -794,634 +846,1020 @@
                             if (yyaccept <= 4) {
                                 goto yy65;
                             } else {
- goto yy79;
+ goto yy78;
                             }
                         } else {
- goto yy102;
+ if (yyaccept <= 6) {
+ goto yy142;
+ } else {
+ goto yy192;
+ }
                         }
                     }
                 } else {
- if (yyaccept <= 9) {
- if (yyaccept <= 8) {
- if (yyaccept <= 7) {
- goto yy152;
+ if (yyaccept <= 11) {
+ if (yyaccept <= 9) {
+ if (yyaccept <= 8) {
+ goto yy251;
                             } else {
- goto yy239;
+ goto yy255;
                             }
                         } else {
- goto yy243;
+ if (yyaccept <= 10) {
+ goto yy291;
+ } else {
+ goto yy306;
+ }
                         }
                     } else {
- if (yyaccept <= 11) {
- if (yyaccept <= 10) {
- goto yy279;
+ if (yyaccept <= 13) {
+ if (yyaccept <= 12) {
+ goto yy401;
                             } else {
- goto yy294;
+ goto yy429;
                             }
                         } else {
- goto yy389;
+ goto yy433;
                         }
                     }
                 }
             } else {
- if (yyaccept <= 19) {
- if (yyaccept <= 16) {
- if (yyaccept <= 14) {
- if (yyaccept <= 13) {
- goto yy417;
+ if (yyaccept <= 21) {
+ if (yyaccept <= 18) {
+ if (yyaccept <= 16) {
+ if (yyaccept <= 15) {
+ goto yy437;
                             } else {
- goto yy421;
+ goto yy468;
                             }
                         } else {
- if (yyaccept <= 15) {
- goto yy425;
+ if (yyaccept <= 17) {
+ goto yy474;
                             } else {
- goto yy456;
+ goto yy482;
                             }
                         }
                     } else {
- if (yyaccept <= 18) {
- if (yyaccept <= 17) {
- goto yy462;
+ if (yyaccept <= 20) {
+ if (yyaccept <= 19) {
+ goto yy490;
                             } else {
- goto yy470;
+ goto yy495;
                             }
                         } else {
- goto yy478;
+ goto yy500;
                         }
                     }
                 } else {
- if (yyaccept <= 22) {
- if (yyaccept <= 21) {
- if (yyaccept <= 20) {
- goto yy483;
+ if (yyaccept <= 25) {
+ if (yyaccept <= 23) {
+ if (yyaccept <= 22) {
+ goto yy503;
                             } else {
- goto yy488;
+ goto yy513;
                             }
                         } else {
- goto yy491;
+ if (yyaccept <= 24) {
+ goto yy519;
+ } else {
+ goto yy522;
+ }
                         }
                     } else {
- if (yyaccept <= 24) {
- if (yyaccept <= 23) {
- goto yy501;
+ if (yyaccept <= 27) {
+ if (yyaccept <= 26) {
+ goto yy529;
                             } else {
- goto yy507;
+ goto yy536;
                             }
                         } else {
- goto yy510;
+ goto yy538;
                         }
                     }
                 }
             }
         } else {
- if (yyaccept <= 38) {
- if (yyaccept <= 32) {
- if (yyaccept <= 29) {
- if (yyaccept <= 27) {
- if (yyaccept <= 26) {
- goto yy517;
+ if (yyaccept <= 42) {
+ if (yyaccept <= 35) {
+ if (yyaccept <= 32) {
+ if (yyaccept <= 30) {
+ if (yyaccept <= 29) {
+ goto yy540;
                             } else {
- goto yy524;
+ goto yy542;
                             }
                         } else {
- if (yyaccept <= 28) {
- goto yy526;
+ if (yyaccept <= 31) {
+ goto yy548;
                             } else {
- goto yy528;
+ goto yy554;
                             }
                         }
                     } else {
- if (yyaccept <= 31) {
- if (yyaccept <= 30) {
- goto yy530;
+ if (yyaccept <= 34) {
+ if (yyaccept <= 33) {
+ goto yy564;
                             } else {
- goto yy536;
+ goto yy566;
                             }
                         } else {
- goto yy542;
+ goto yy572;
                         }
                     }
                 } else {
- if (yyaccept <= 35) {
- if (yyaccept <= 34) {
- if (yyaccept <= 33) {
- goto yy552;
+ if (yyaccept <= 39) {
+ if (yyaccept <= 37) {
+ if (yyaccept <= 36) {
+ goto yy579;
                             } else {
- goto yy554;
+ goto yy587;
                             }
                         } else {
- goto yy560;
+ if (yyaccept <= 38) {
+ goto yy590;
+ } else {
+ goto yy603;
+ }
                         }
                     } else {
- if (yyaccept <= 37) {
- if (yyaccept <= 36) {
- goto yy566;
+ if (yyaccept <= 41) {
+ if (yyaccept <= 40) {
+ goto yy605;
                             } else {
- goto yy574;
+ goto yy608;
                             }
                         } else {
- goto yy577;
+ goto yy611;
                         }
                     }
                 }
             } else {
- if (yyaccept <= 45) {
- if (yyaccept <= 42) {
- if (yyaccept <= 40) {
- if (yyaccept <= 39) {
- goto yy590;
+ if (yyaccept <= 49) {
+ if (yyaccept <= 46) {
+ if (yyaccept <= 44) {
+ if (yyaccept <= 43) {
+ goto yy613;
                             } else {
- goto yy592;
+ goto yy619;
                             }
                         } else {
- if (yyaccept <= 41) {
- goto yy595;
+ if (yyaccept <= 45) {
+ goto yy628;
                             } else {
- goto yy598;
+ goto yy630;
                             }
                         }
                     } else {
- if (yyaccept <= 44) {
- if (yyaccept <= 43) {
- goto yy600;
+ if (yyaccept <= 48) {
+ if (yyaccept <= 47) {
+ goto yy637;
                             } else {
- goto yy605;
+ goto yy646;
                             }
                         } else {
- goto yy607;
+ goto yy652;
                         }
                     }
                 } else {
- if (yyaccept <= 48) {
- if (yyaccept <= 47) {
- if (yyaccept <= 46) {
- goto yy614;
+ if (yyaccept <= 53) {
+ if (yyaccept <= 51) {
+ if (yyaccept <= 50) {
+ goto yy656;
                             } else {
- goto yy623;
+ goto yy663;
                             }
                         } else {
- goto yy629;
+ if (yyaccept <= 52) {
+ goto yy669;
+ } else {
+ goto yy675;
+ }
                         }
                     } else {
- if (yyaccept <= 50) {
- if (yyaccept <= 49) {
- goto yy633;
+ if (yyaccept <= 55) {
+ if (yyaccept <= 54) {
+ goto yy679;
                             } else {
- goto yy639;
+ goto yy683;
                             }
                         } else {
- goto yy645;
+ goto yy691;
                         }
                     }
                 }
             }
         }
     } else {
- if (yyaccept <= 77) {
- if (yyaccept <= 64) {
- if (yyaccept <= 58) {
- if (yyaccept <= 55) {
- if (yyaccept <= 53) {
- if (yyaccept <= 52) {
- goto yy649;
+ if (yyaccept <= 85) {
+ if (yyaccept <= 71) {
+ if (yyaccept <= 64) {
+ if (yyaccept <= 60) {
+ if (yyaccept <= 58) {
+ if (yyaccept <= 57) {
+ goto yy705;
                             } else {
- goto yy653;
+ goto yy711;
                             }
                         } else {
- if (yyaccept <= 54) {
- goto yy661;
+ if (yyaccept <= 59) {
+ goto yy718;
                             } else {
- goto yy675;
+ goto yy727;
                             }
                         }
                     } else {
- if (yyaccept <= 57) {
- if (yyaccept <= 56) {
- goto yy681;
+ if (yyaccept <= 62) {
+ if (yyaccept <= 61) {
+ goto yy732;
                             } else {
- goto yy688;
+ goto yy735;
                             }
                         } else {
- goto yy697;
+ if (yyaccept <= 63) {
+ goto yy739;
+ } else {
+ goto yy746;
+ }
                         }
                     }
                 } else {
- if (yyaccept <= 61) {
- if (yyaccept <= 60) {
- if (yyaccept <= 59) {
- goto yy702;
+ if (yyaccept <= 68) {
+ if (yyaccept <= 66) {
+ if (yyaccept <= 65) {
+ goto yy756;
                             } else {
- goto yy705;
+ goto yy759;
                             }
                         } else {
- goto yy709;
+ if (yyaccept <= 67) {
+ goto yy763;
+ } else {
+ goto yy769;
+ }
                         }
                     } else {
- if (yyaccept <= 63) {
- if (yyaccept <= 62) {
- goto yy716;
+ if (yyaccept <= 70) {
+ if (yyaccept <= 69) {
+ goto yy771;
                             } else {
- goto yy721;
+ goto yy779;
                             }
                         } else {
- goto yy725;
+ goto yy786;
                         }
                     }
                 }
             } else {
- if (yyaccept <= 71) {
- if (yyaccept <= 68) {
- if (yyaccept <= 66) {
- if (yyaccept <= 65) {
- goto yy727;
+ if (yyaccept <= 78) {
+ if (yyaccept <= 75) {
+ if (yyaccept <= 73) {
+ if (yyaccept <= 72) {
+ goto yy790;
                             } else {
- goto yy735;
+ goto yy792;
                             }
                         } else {
- if (yyaccept <= 67) {
- goto yy742;
+ if (yyaccept <= 74) {
+ goto yy797;
                             } else {
- goto yy746;
+ goto yy801;
                             }
                         }
                     } else {
- if (yyaccept <= 70) {
- if (yyaccept <= 69) {
- goto yy748;
+ if (yyaccept <= 77) {
+ if (yyaccept <= 76) {
+ goto yy806;
                             } else {
- goto yy753;
+ goto yy810;
                             }
                         } else {
- goto yy757;
+ goto yy819;
                         }
                     }
                 } else {
- if (yyaccept <= 74) {
- if (yyaccept <= 73) {
- if (yyaccept <= 72) {
- goto yy762;
+ if (yyaccept <= 82) {
+ if (yyaccept <= 80) {
+ if (yyaccept <= 79) {
+ goto yy821;
                             } else {
- goto yy766;
+ goto yy825;
                             }
                         } else {
- goto yy775;
+ if (yyaccept <= 81) {
+ goto yy829;
+ } else {
+ goto yy838;
+ }
                         }
                     } else {
- if (yyaccept <= 76) {
- if (yyaccept <= 75) {
- goto yy777;
+ if (yyaccept <= 84) {
+ if (yyaccept <= 83) {
+ goto yy843;
                             } else {
- goto yy781;
+ goto yy848;
                             }
                         } else {
- goto yy785;
+ goto yy851;
                         }
                     }
                 }
             }
         } else {
- if (yyaccept <= 90) {
- if (yyaccept <= 84) {
- if (yyaccept <= 81) {
- if (yyaccept <= 79) {
- if (yyaccept <= 78) {
- goto yy794;
+ if (yyaccept <= 99) {
+ if (yyaccept <= 92) {
+ if (yyaccept <= 89) {
+ if (yyaccept <= 87) {
+ if (yyaccept <= 86) {
+ goto yy854;
                             } else {
- goto yy799;
+ goto yy857;
                             }
                         } else {
- if (yyaccept <= 80) {
- goto yy804;
+ if (yyaccept <= 88) {
+ goto yy869;
                             } else {
- goto yy807;
+ goto yy874;
                             }
                         }
                     } else {
- if (yyaccept <= 83) {
- if (yyaccept <= 82) {
- goto yy810;
+ if (yyaccept <= 91) {
+ if (yyaccept <= 90) {
+ goto yy881;
                             } else {
- goto yy813;
+ goto yy886;
                             }
                         } else {
- goto yy825;
+ goto yy892;
                         }
                     }
                 } else {
- if (yyaccept <= 87) {
- if (yyaccept <= 86) {
- if (yyaccept <= 85) {
- goto yy830;
+ if (yyaccept <= 96) {
+ if (yyaccept <= 94) {
+ if (yyaccept <= 93) {
+ goto yy901;
                             } else {
- goto yy836;
+ goto yy908;
                             }
                         } else {
- goto yy841;
+ if (yyaccept <= 95) {
+ goto yy910;
+ } else {
+ goto yy916;
+ }
                         }
                     } else {
- if (yyaccept <= 89) {
- if (yyaccept <= 88) {
- goto yy850;
+ if (yyaccept <= 98) {
+ if (yyaccept <= 97) {
+ goto yy921;
                             } else {
- goto yy857;
+ goto yy925;
                             }
                         } else {
- goto yy859;
+ goto yy928;
                         }
                     }
                 }
             } else {
- if (yyaccept <= 97) {
- if (yyaccept <= 94) {
- if (yyaccept <= 92) {
- if (yyaccept <= 91) {
- goto yy865;
+ if (yyaccept <= 106) {
+ if (yyaccept <= 103) {
+ if (yyaccept <= 101) {
+ if (yyaccept <= 100) {
+ goto yy934;
                             } else {
- goto yy869;
+ goto yy938;
                             }
                         } else {
- if (yyaccept <= 93) {
- goto yy872;
+ if (yyaccept <= 102) {
+ goto yy943;
                             } else {
- goto yy877;
+ goto yy945;
                             }
                         }
                     } else {
- if (yyaccept <= 96) {
- if (yyaccept <= 95) {
- goto yy879;
+ if (yyaccept <= 105) {
+ if (yyaccept <= 104) {
+ goto yy952;
                             } else {
- goto yy886;
+ goto yy955;
                             }
                         } else {
- goto yy889;
+ goto yy960;
                         }
                     }
                 } else {
- if (yyaccept <= 100) {
- if (yyaccept <= 99) {
- if (yyaccept <= 98) {
- goto yy894;
+ if (yyaccept <= 110) {
+ if (yyaccept <= 108) {
+ if (yyaccept <= 107) {
+ goto yy963;
                             } else {
- goto yy897;
+ goto yy970;
                             }
                         } else {
- goto yy903;
+ if (yyaccept <= 109) {
+ goto yy972;
+ } else {
+ goto yy974;
+ }
                         }
                     } else {
- if (yyaccept <= 102) {
- if (yyaccept <= 101) {
- goto yy905;
+ if (yyaccept <= 112) {
+ if (yyaccept <= 111) {
+ goto yy978;
                             } else {
- goto yy907;
+ goto yy985;
                             }
                         } else {
- goto yy911;
+ goto yy987;
                         }
                     }
                 }
             }
         }
     }
-yy99:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
- }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy112;
 yy100:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy101;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy101:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy102;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy102:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy103;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy103:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy104;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy104:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy105;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy105:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy106;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy106:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy107;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy107:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy108;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy108:
+ yyaccept = 1;
+ YYMARKER = ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+yy109:
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych != '\\') goto yy9;
+yy110:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych == 'U') goto yy114;
+ if (yych == 'u') goto yy113;
+ goto yy99;
+yy111:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych != '?') goto yy99;
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych == '/') goto yy110;
+ goto yy99;
+yy113:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy122;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy122;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy122;
+ goto yy99;
+ }
+yy114:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy115;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy115:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy116;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy116:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy117;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy117:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy118;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy118:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy119;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy119:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy120;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy120:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy121;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy121:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy108;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy108;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy108;
+ goto yy99;
+ }
+yy122:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy123;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy123:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy124;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy124:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy108;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy108;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy108;
+ goto yy99;
+ }
+yy125:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy126;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy126:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
+ } else {
+ if (yych <= 'F') goto yy127;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
+ }
+yy127:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy108;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy108;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy108;
+ goto yy99;
+ }
+yy128:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '"') goto yy133;
+ goto yy109;
+yy129:
+ ++YYCURSOR;
+#line 274 "strict_cpp.re"
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extstringlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+#line 1584 "strict_cpp_re.inc"
+yy131:
+ ++YYCURSOR;
+#line 266 "strict_cpp.re"
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extcharlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+#line 1594 "strict_cpp_re.inc"
+yy133:
+ ++YYCURSOR;
+#line 282 "strict_cpp.re"
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extrawstringlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+#line 1604 "strict_cpp_re.inc"
+yy135:
+ ++YYCURSOR;
+#line 258 "strict_cpp.re"
+ {
+ if (s->act_in_cpp0x_mode)
+ goto extrawstringlit;
+ --YYCURSOR;
+ BOOST_WAVE_RET(T_IDENTIFIER);
+ }
+#line 1614 "strict_cpp_re.inc"
+yy137:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+yy138:
+ if (yybm[256+yych] & 64) {
+ goto yy137;
+ }
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych >= '\\') goto yy140;
+yy139:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
+ }
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych <= '[') goto yy152;
+yy140:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
     if (yych <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy96;
- goto yy98;
+ if (yych == '"') goto yy137;
+ goto yy99;
             } else {
- if (yych <= '\'') goto yy96;
- if (yych <= '/') goto yy98;
- goto yy107;
+ if (yych <= '\'') goto yy137;
+ if (yych <= '/') goto yy99;
+ goto yy147;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy105;
- goto yy98;
+ if (yych == '?') goto yy145;
+ goto yy99;
             } else {
- if (yych <= 'U') goto yy104;
- if (yych == '\\') goto yy96;
- goto yy98;
+ if (yych <= 'U') goto yy144;
+ if (yych == '\\') goto yy137;
+ goto yy99;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy96;
- if (yych <= 'e') goto yy98;
- goto yy96;
- } else {
- if (yych == 'n') goto yy96;
- if (yych <= 'q') goto yy98;
- goto yy96;
+ if (yych <= 'b') goto yy137;
+ if (yych <= 'e') goto yy99;
+ goto yy137;
+ } else {
+ if (yych == 'n') goto yy137;
+ if (yych <= 'q') goto yy99;
+ goto yy137;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy98;
- if (yych <= 't') goto yy96;
- goto yy103;
- } else {
- if (yych <= 'v') goto yy96;
- if (yych == 'x') goto yy106;
- goto yy98;
+ if (yych <= 's') goto yy99;
+ if (yych <= 't') goto yy137;
+ goto yy143;
+ } else {
+ if (yych <= 'v') goto yy137;
+ if (yych == 'x') goto yy146;
+ goto yy99;
             }
         }
     }
-yy101:
+yy141:
     ++YYCURSOR;
-yy102:
-#line 249 "strict_cpp.re"
+yy142:
+#line 255 "strict_cpp.re"
     { BOOST_WAVE_RET(T_STRINGLIT); }
-#line 1250 "strict_cpp_re.inc"
-yy103:
+#line 1688 "strict_cpp_re.inc"
+yy143:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy138;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy138;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy138;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy178;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy178;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy178;
+ goto yy99;
     }
-yy104:
+yy144:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy131;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy131;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy131;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy171;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy171;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy171;
+ goto yy99;
     }
-yy105:
+yy145:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy111;
- goto yy100;
-yy106:
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych <= '[') goto yy151;
+ goto yy140;
+yy146:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 64) {
- goto yy109;
+ if (yybm[256+yych] & 128) {
+ goto yy149;
     }
- goto yy98;
-yy107:
+ goto yy99;
+yy147:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '"') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy96;
- goto yy98;
+ if (yych == '\t') goto yy137;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy96;
- if (yych <= 0x1F) goto yy98;
- if (yych <= '!') goto yy96;
- goto yy101;
+ if (yych <= '\f') goto yy137;
+ if (yych <= 0x1F) goto yy99;
+ if (yych <= '!') goto yy137;
+ goto yy141;
         }
     } else {
         if (yych <= '>') {
- if (yych <= '/') goto yy96;
- if (yych >= '8') goto yy96;
+ if (yych <= '/') goto yy137;
+ if (yych >= '8') goto yy137;
         } else {
- if (yych <= '?') goto yy99;
- if (yych == '\\') goto yy100;
- goto yy96;
+ if (yych <= '?') goto yy139;
+ if (yych == '\\') goto yy140;
+ goto yy137;
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy99;
- goto yy100;
-yy109:
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych <= '[') goto yy139;
+ goto yy140;
+yy149:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 64) {
- goto yy109;
+ if (yybm[256+yych] & 128) {
+ goto yy149;
     }
     if (yych <= '!') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy96;
- goto yy98;
+ if (yych == '\t') goto yy137;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy96;
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= '\f') goto yy137;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
         }
     } else {
         if (yych <= '?') {
- if (yych <= '"') goto yy101;
- if (yych <= '>') goto yy96;
- goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych <= '>') goto yy137;
+ goto yy139;
         } else {
- if (yych == '\\') goto yy100;
- goto yy96;
+ if (yych == '\\') goto yy140;
+ goto yy137;
         }
     }
-yy111:
+yy151:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych >= '\\') goto yy100;
-yy112:
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych >= '\\') goto yy140;
+yy152:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 128) {
- goto yy112;
+ if (yybm[0+yych] & 1) {
+ goto yy152;
     }
     if (yych <= '!') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy96;
- goto yy98;
+ if (yych == '\t') goto yy137;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy96;
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= '\f') goto yy137;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
         }
     } else {
         if (yych <= '/') {
- if (yych <= '"') goto yy101;
- if (yych <= '.') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '.') goto yy137;
         } else {
- if (yych == '\\') goto yy100;
- goto yy96;
+ if (yych == '\\') goto yy140;
+ goto yy137;
         }
     }
-yy114:
+yy154:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 1) {
- goto yy114;
+ if (yybm[0+yych] & 2) {
+ goto yy154;
     }
     if (yych <= '7') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy118;
- if (yych <= '/') goto yy96;
- goto yy107;
+ if (yych <= '"') goto yy158;
+ if (yych <= '/') goto yy137;
+ goto yy147;
             }
         }
     } else {
         if (yych <= 'U') {
- if (yych == '?') goto yy119;
- if (yych <= 'T') goto yy96;
- goto yy117;
+ if (yych == '?') goto yy159;
+ if (yych <= 'T') goto yy137;
+ goto yy157;
         } else {
             if (yych <= 'u') {
- if (yych <= 't') goto yy96;
+ if (yych <= 't') goto yy137;
             } else {
- if (yych == 'x') goto yy109;
- goto yy96;
+ if (yych == 'x') goto yy149;
+ goto yy137;
             }
         }
     }
@@ -1430,146 +1868,146 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
- goto yy128;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
+ goto yy168;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
- goto yy128;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
+ goto yy168;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych <= 'f') goto yy128;
- goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych <= 'f') goto yy168;
+ goto yy137;
             }
         }
     }
-yy117:
+yy157:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
- goto yy121;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
+ goto yy161;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
- goto yy121;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
+ goto yy161;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych <= 'f') goto yy121;
- goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych <= 'f') goto yy161;
+ goto yy137;
             }
         }
     }
-yy118:
+yy158:
     yyaccept = 6;
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy102;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy99;
- goto yy100;
-yy119:
+ if (yych <= '!') goto yy142;
+ if (yych <= '"') goto yy141;
+ if (yych <= '[') goto yy139;
+ goto yy140;
+yy159:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych >= '\\') goto yy100;
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych >= '\\') goto yy140;
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 128) {
- goto yy112;
+ if (yybm[0+yych] & 1) {
+ goto yy152;
     }
     if (yych <= '!') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy96;
- goto yy98;
+ if (yych == '\t') goto yy137;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy96;
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= '\f') goto yy137;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
         }
     } else {
         if (yych <= '/') {
- if (yych <= '"') goto yy101;
- if (yych <= '.') goto yy96;
- goto yy114;
+ if (yych <= '"') goto yy141;
+ if (yych <= '.') goto yy137;
+ goto yy154;
         } else {
- if (yych == '\\') goto yy100;
- goto yy96;
+ if (yych == '\\') goto yy140;
+ goto yy137;
         }
     }
-yy121:
+yy161:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
@@ -1578,29 +2016,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
@@ -1609,29 +2047,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
@@ -1640,29 +2078,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
@@ -1671,29 +2109,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
@@ -1702,71 +2140,71 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy99;
- goto yy100;
-yy128:
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych <= '[') goto yy139;
+ goto yy140;
+yy168:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
@@ -1775,230 +2213,230 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy96;
- if (yych <= '\n') goto yy98;
- goto yy96;
+ if (yych == '\t') goto yy137;
+ if (yych <= '\n') goto yy99;
+ goto yy137;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy98;
- goto yy96;
+ if (yych <= 0x1F) goto yy99;
+ goto yy137;
             } else {
- if (yych <= '"') goto yy101;
- if (yych <= '/') goto yy96;
+ if (yych <= '"') goto yy141;
+ if (yych <= '/') goto yy137;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy99;
- if (yych <= '@') goto yy96;
+ if (yych == '?') goto yy139;
+ if (yych <= '@') goto yy137;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy96;
- goto yy100;
+ if (yych <= '[') goto yy137;
+ goto yy140;
             } else {
- if (yych <= '`') goto yy96;
- if (yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy137;
+ if (yych >= 'g') goto yy137;
             }
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[256+yych] & 32) {
- goto yy96;
+ if (yybm[256+yych] & 64) {
+ goto yy137;
     }
- if (yych <= '!') goto yy98;
- if (yych <= '"') goto yy101;
- if (yych <= '[') goto yy99;
- goto yy100;
-yy131:
+ if (yych <= '!') goto yy99;
+ if (yych <= '"') goto yy141;
+ if (yych <= '[') goto yy139;
+ goto yy140;
+yy171:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy132;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy172;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy132:
+yy172:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy133;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy173;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy133:
+yy173:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy134;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy174;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy134:
+yy174:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy135;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy175;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy135:
+yy175:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy136;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy176;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy136:
+yy176:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy137;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy177;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy137:
+yy177:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy96;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy96;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy96;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy137;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy137;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy137;
+ goto yy99;
     }
-yy138:
+yy178:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy139;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy179;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy139:
+yy179:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy140;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy180;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy140:
+yy180:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy96;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy96;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy96;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy137;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy137;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy137;
+ goto yy99;
     }
-yy141:
+yy181:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
-yy142:
- if (yybm[0+yych] & 2) {
- goto yy141;
+yy182:
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych >= '\\') goto yy144;
-yy143:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych >= '\\') goto yy184;
+yy183:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych <= '[') goto yy156;
-yy144:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '[') goto yy196;
+yy184:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy141;
- goto yy98;
+ if (yych == '"') goto yy181;
+ goto yy99;
             } else {
- if (yych <= '\'') goto yy141;
- if (yych <= '/') goto yy98;
- goto yy149;
+ if (yych <= '\'') goto yy181;
+ if (yych <= '/') goto yy99;
+ goto yy189;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy147;
- goto yy98;
+ if (yych == '?') goto yy187;
+ goto yy99;
             } else {
- if (yych <= 'U') goto yy146;
- if (yych == '\\') goto yy141;
- goto yy98;
+ if (yych <= 'U') goto yy186;
+ if (yych == '\\') goto yy181;
+ goto yy99;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy141;
- if (yych <= 'e') goto yy98;
- goto yy141;
- } else {
- if (yych == 'n') goto yy141;
- if (yych <= 'q') goto yy98;
- goto yy141;
+ if (yych <= 'b') goto yy181;
+ if (yych <= 'e') goto yy99;
+ goto yy181;
+ } else {
+ if (yych == 'n') goto yy181;
+ if (yych <= 'q') goto yy99;
+ goto yy181;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy98;
- if (yych <= 't') goto yy141;
+ if (yych <= 's') goto yy99;
+ if (yych <= 't') goto yy181;
             } else {
- if (yych <= 'v') goto yy141;
- if (yych == 'x') goto yy148;
- goto yy98;
+ if (yych <= 'v') goto yy181;
+ if (yych == 'x') goto yy188;
+ goto yy99;
             }
         }
     }
@@ -2006,202 +2444,202 @@
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy182;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy222;
+ goto yy99;
     } else {
- if (yych <= 'F') goto yy182;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy182;
- goto yy98;
+ if (yych <= 'F') goto yy222;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy222;
+ goto yy99;
     }
-yy146:
+yy186:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy175;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy175;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy175;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy215;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy215;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy215;
+ goto yy99;
     }
-yy147:
+yy187:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych <= '[') goto yy155;
- goto yy144;
-yy148:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '[') goto yy195;
+ goto yy184;
+yy188:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy153;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy193;
+ goto yy99;
     } else {
- if (yych <= 'F') goto yy153;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy153;
- goto yy98;
+ if (yych <= 'F') goto yy193;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy193;
+ goto yy99;
     }
-yy149:
+yy189:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '\'') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy141;
- goto yy98;
+ if (yych == '\t') goto yy181;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy141;
- if (yych <= 0x1F) goto yy98;
- if (yych <= '&') goto yy141;
- goto yy151;
+ if (yych <= '\f') goto yy181;
+ if (yych <= 0x1F) goto yy99;
+ if (yych <= '&') goto yy181;
+ goto yy191;
         }
     } else {
         if (yych <= '>') {
- if (yych <= '/') goto yy141;
- if (yych >= '8') goto yy141;
+ if (yych <= '/') goto yy181;
+ if (yych >= '8') goto yy181;
         } else {
- if (yych <= '?') goto yy143;
- if (yych == '\\') goto yy144;
- goto yy141;
+ if (yych <= '?') goto yy183;
+ if (yych == '\\') goto yy184;
+ goto yy181;
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych <= '[') goto yy143;
- goto yy144;
-yy151:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '[') goto yy183;
+ goto yy184;
+yy191:
     ++YYCURSOR;
-yy152:
-#line 246 "strict_cpp.re"
+yy192:
+#line 252 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CHARLIT); }
-#line 2097 "strict_cpp_re.inc"
-yy153:
+#line 2535 "strict_cpp_re.inc"
+yy193:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
- goto yy153;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
+ goto yy193;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
- goto yy153;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
+ goto yy193;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych <= 'f') goto yy153;
- goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych <= 'f') goto yy193;
+ goto yy181;
             }
         }
     }
-yy155:
+yy195:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych >= '\\') goto yy144;
-yy156:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych >= '\\') goto yy184;
+yy196:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '\'') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy141;
- goto yy98;
+ if (yych == '\t') goto yy181;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy141;
- if (yych <= 0x1F) goto yy98;
- if (yych <= '&') goto yy141;
- goto yy151;
+ if (yych <= '\f') goto yy181;
+ if (yych <= 0x1F) goto yy99;
+ if (yych <= '&') goto yy181;
+ goto yy191;
         }
     } else {
         if (yych <= '>') {
- if (yych != '/') goto yy141;
+ if (yych != '/') goto yy181;
         } else {
- if (yych <= '?') goto yy156;
- if (yych == '\\') goto yy144;
- goto yy141;
+ if (yych <= '?') goto yy196;
+ if (yych == '\\') goto yy184;
+ goto yy181;
         }
     }
-yy158:
+yy198:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '>') {
         if (yych <= 0x1F) {
             if (yych <= '\t') {
- if (yych <= 0x08) goto yy98;
- goto yy141;
+ if (yych <= 0x08) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\n') goto yy98;
- if (yych <= '\f') goto yy141;
- goto yy98;
+ if (yych <= '\n') goto yy99;
+ if (yych <= '\f') goto yy181;
+ goto yy99;
             }
         } else {
             if (yych <= '\'') {
- if (yych <= '&') goto yy141;
- goto yy162;
+ if (yych <= '&') goto yy181;
+ goto yy202;
             } else {
- if (yych <= '/') goto yy141;
- if (yych <= '7') goto yy149;
- goto yy141;
+ if (yych <= '/') goto yy181;
+ if (yych <= '7') goto yy189;
+ goto yy181;
             }
         }
     } else {
         if (yych <= '\\') {
             if (yych <= 'T') {
- if (yych <= '?') goto yy163;
- goto yy141;
+ if (yych <= '?') goto yy203;
+ goto yy181;
             } else {
- if (yych <= 'U') goto yy161;
- if (yych <= '[') goto yy141;
- goto yy158;
+ if (yych <= 'U') goto yy201;
+ if (yych <= '[') goto yy181;
+ goto yy198;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 't') goto yy141;
+ if (yych <= 't') goto yy181;
             } else {
- if (yych == 'x') goto yy153;
- goto yy141;
+ if (yych == 'x') goto yy193;
+ goto yy181;
             }
         }
     }
@@ -2210,144 +2648,144 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
- goto yy172;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
+ goto yy212;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
- goto yy172;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
+ goto yy212;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych <= 'f') goto yy172;
- goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych <= 'f') goto yy212;
+ goto yy181;
             }
         }
     }
-yy161:
+yy201:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
- goto yy165;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
+ goto yy205;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
- goto yy165;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
+ goto yy205;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych <= 'f') goto yy165;
- goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych <= 'f') goto yy205;
+ goto yy181;
             }
         }
     }
-yy162:
+yy202:
     yyaccept = 7;
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy152;
- if (yych <= '\'') goto yy151;
- if (yych <= '[') goto yy143;
- goto yy144;
-yy163:
+ if (yych <= '&') goto yy192;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '[') goto yy183;
+ goto yy184;
+yy203:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych >= '\\') goto yy144;
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych >= '\\') goto yy184;
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '\'') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy141;
- goto yy98;
+ if (yych == '\t') goto yy181;
+ goto yy99;
         } else {
- if (yych <= '\f') goto yy141;
- if (yych <= 0x1F) goto yy98;
- if (yych <= '&') goto yy141;
- goto yy151;
+ if (yych <= '\f') goto yy181;
+ if (yych <= 0x1F) goto yy99;
+ if (yych <= '&') goto yy181;
+ goto yy191;
         }
     } else {
         if (yych <= '>') {
- if (yych == '/') goto yy158;
- goto yy141;
+ if (yych == '/') goto yy198;
+ goto yy181;
         } else {
- if (yych <= '?') goto yy156;
- if (yych == '\\') goto yy144;
- goto yy141;
+ if (yych <= '?') goto yy196;
+ if (yych == '\\') goto yy184;
+ goto yy181;
         }
     }
-yy165:
+yy205:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
@@ -2356,29 +2794,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
@@ -2387,29 +2825,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
@@ -2418,29 +2856,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
@@ -2449,29 +2887,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
@@ -2480,71 +2918,71 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych <= '[') goto yy143;
- goto yy144;
-yy172:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '[') goto yy183;
+ goto yy184;
+yy212:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
@@ -2553,603 +2991,306 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy141;
- if (yych <= '\n') goto yy98;
- goto yy141;
+ if (yych == '\t') goto yy181;
+ if (yych <= '\n') goto yy99;
+ goto yy181;
         } else {
             if (yych <= '&') {
- if (yych <= 0x1F) goto yy98;
- goto yy141;
+ if (yych <= 0x1F) goto yy99;
+ goto yy181;
             } else {
- if (yych <= '\'') goto yy151;
- if (yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '/') goto yy181;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy143;
- if (yych <= '@') goto yy141;
+ if (yych == '?') goto yy183;
+ if (yych <= '@') goto yy181;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy141;
- goto yy144;
+ if (yych <= '[') goto yy181;
+ goto yy184;
             } else {
- if (yych <= '`') goto yy141;
- if (yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy181;
+ if (yych >= 'g') goto yy181;
             }
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 2) {
- goto yy141;
+ if (yybm[0+yych] & 4) {
+ goto yy181;
     }
- if (yych <= '&') goto yy98;
- if (yych <= '\'') goto yy151;
- if (yych <= '[') goto yy143;
- goto yy144;
-yy175:
+ if (yych <= '&') goto yy99;
+ if (yych <= '\'') goto yy191;
+ if (yych <= '[') goto yy183;
+ goto yy184;
+yy215:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy176;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy216;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy176:
+yy216:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy177;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy217;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy177:
+yy217:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy178;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy218;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy178:
+yy218:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy179;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy219;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy179:
+yy219:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy180;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy220;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy180:
+yy220:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy181;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy221;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy181:
+yy221:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy141;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy141;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy141;
- goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy181;
+ goto yy99;
+ } else {
+ if (yych <= 'F') goto yy181;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy181;
+ goto yy99;
     }
-yy182:
+yy222:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy183;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy223;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy183:
+yy223:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych >= ':') goto yy99;
     } else {
- if (yych <= 'F') goto yy184;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy224;
+ if (yych <= '`') goto yy99;
+ if (yych >= 'g') goto yy99;
     }
-yy184:
+yy224:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy141;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy141;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy141;
- goto yy98;
- }
-yy185:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy211;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy211;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy211;
- goto yy98;
- }
-yy186:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy187;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy187:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy188;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy188:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy189;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy189:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy190;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy190:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy191;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy191:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy192;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy192:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+ if (yych <= '/') goto yy99;
+ if (yych <= '9') goto yy181;
+ goto yy99;
     } else {
- if (yych <= 'F') goto yy193;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy193:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy194;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= 'F') goto yy181;
+ if (yych <= '`') goto yy99;
+ if (yych <= 'f') goto yy181;
+ goto yy99;
     }
-yy194:
+yy225:
     yyaccept = 1;
- YYMARKER = ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
-yy195:
- if (yybm[0+yych] & 4) {
- goto yy194;
- }
- if (yych == '?') goto yy197;
- if (yych != '\\') goto yy9;
-yy196:
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '"') goto yy135;
+ goto yy109;
+yy226:
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy99;
+ goto yy182;
+yy227:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych == 'U') goto yy200;
- if (yych == 'u') goto yy199;
- goto yy98;
-yy197:
+#line 227 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_GREATEREQUAL); }
+#line 3168 "strict_cpp_re.inc"
+yy229:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych != '?') goto yy98;
+ if ((yych = *YYCURSOR) == '=') goto yy231;
+#line 220 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_SHIFTRIGHT); }
+#line 3174 "strict_cpp_re.inc"
+yy231:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych == '/') goto yy196;
- goto yy98;
-yy199:
+#line 221 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_SHIFTRIGHTASSIGN); }
+#line 3179 "strict_cpp_re.inc"
+yy233:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy208;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy208;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy208;
- goto yy98;
- }
-yy200:
+#line 223 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_EQUAL); }
+#line 3184 "strict_cpp_re.inc"
+yy235:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy201;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy201:
+#line 224 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_NOTEQUAL); }
+#line 3189 "strict_cpp_re.inc"
+yy237:
+ yych = *++YYCURSOR;
+ if (yych == '?') goto yy242;
+ goto yy99;
+yy238:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy202;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy202:
+#line 230 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_OROR); }
+#line 3198 "strict_cpp_re.inc"
+yy240:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy203;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy203:
+#line 216 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_ORASSIGN); }
+#line 3203 "strict_cpp_re.inc"
+yy242:
+ yych = *++YYCURSOR;
+ if (yych != '!') goto yy99;
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy204;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy204:
+#line 232 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_OROR_TRIGRAPH); }
+#line 3210 "strict_cpp_re.inc"
+yy245:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy205;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy205:
+#line 228 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_ANDAND); }
+#line 3215 "strict_cpp_re.inc"
+yy247:
     ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
+#line 214 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_ANDASSIGN); }
+#line 3220 "strict_cpp_re.inc"
+yy249:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'r') goto yy109;
+ yyaccept = 8;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych <= 'Z') {
+ if (yych <= '>') {
+ if (yych <= '/') goto yy251;
+ if (yych <= '9') goto yy108;
+ } else {
+ if (yych <= '?') goto yy111;
+ if (yych >= 'A') goto yy108;
+ }
     } else {
- if (yych <= 'F') goto yy206;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+ if (yych <= '^') {
+ if (yych == '\\') goto yy110;
+ } else {
+ if (yych <= '_') goto yy252;
+ if (yych <= '`') goto yy251;
+ if (yych <= 'z') goto yy108;
+ }
     }
-yy206:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy207;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
+yy251:
+#line 192 "strict_cpp.re"
+ { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_XOR_ALT); }
+#line 3247 "strict_cpp_re.inc"
+yy252:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'e') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'q') goto yy109;
+ yyaccept = 9;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
-yy207:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy194;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy194;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy194;
- goto yy98;
- }
-yy208:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy209;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy209:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy210;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy210:
- ++YYCURSOR;
- if (YYLIMIT <= YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy194;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy194;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy194;
- goto yy98;
- }
-yy211:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy212;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy212:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych >= ':') goto yy98;
- } else {
- if (yych <= 'F') goto yy213;
- if (yych <= '`') goto yy98;
- if (yych >= 'g') goto yy98;
- }
-yy213:
- yych = *++YYCURSOR;
- if (yych <= '@') {
- if (yych <= '/') goto yy98;
- if (yych <= '9') goto yy194;
- goto yy98;
- } else {
- if (yych <= 'F') goto yy194;
- if (yych <= '`') goto yy98;
- if (yych <= 'f') goto yy194;
- goto yy98;
- }
-yy214:
- yych = *++YYCURSOR;
- if (yych == '\'') goto yy98;
- goto yy142;
-yy215:
- ++YYCURSOR;
-#line 217 "strict_cpp.re"
- { BOOST_WAVE_RET(T_GREATEREQUAL); }
-#line 3027 "strict_cpp_re.inc"
-yy217:
- ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy219;
-#line 210 "strict_cpp.re"
- { BOOST_WAVE_RET(T_SHIFTRIGHT); }
-#line 3033 "strict_cpp_re.inc"
-yy219:
- ++YYCURSOR;
-#line 211 "strict_cpp.re"
- { BOOST_WAVE_RET(T_SHIFTRIGHTASSIGN); }
-#line 3038 "strict_cpp_re.inc"
-yy221:
- ++YYCURSOR;
-#line 213 "strict_cpp.re"
- { BOOST_WAVE_RET(T_EQUAL); }
-#line 3043 "strict_cpp_re.inc"
-yy223:
- ++YYCURSOR;
-#line 214 "strict_cpp.re"
- { BOOST_WAVE_RET(T_NOTEQUAL); }
-#line 3048 "strict_cpp_re.inc"
-yy225:
- yych = *++YYCURSOR;
- if (yych == '?') goto yy230;
- goto yy98;
-yy226:
- ++YYCURSOR;
-#line 220 "strict_cpp.re"
- { BOOST_WAVE_RET(T_OROR); }
-#line 3057 "strict_cpp_re.inc"
-yy228:
- ++YYCURSOR;
-#line 206 "strict_cpp.re"
- { BOOST_WAVE_RET(T_ORASSIGN); }
-#line 3062 "strict_cpp_re.inc"
-yy230:
- yych = *++YYCURSOR;
- if (yych != '!') goto yy98;
- ++YYCURSOR;
-#line 222 "strict_cpp.re"
- { BOOST_WAVE_RET(T_OROR_TRIGRAPH); }
-#line 3069 "strict_cpp_re.inc"
-yy233:
- ++YYCURSOR;
-#line 218 "strict_cpp.re"
- { BOOST_WAVE_RET(T_ANDAND); }
-#line 3074 "strict_cpp_re.inc"
-yy235:
- ++YYCURSOR;
-#line 204 "strict_cpp.re"
- { BOOST_WAVE_RET(T_ANDASSIGN); }
-#line 3079 "strict_cpp_re.inc"
-yy237:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
- yyaccept = 8;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'Z') {
- if (yych <= '>') {
- if (yych <= '/') goto yy239;
- if (yych <= '9') goto yy194;
- } else {
- if (yych <= '?') goto yy197;
- if (yych >= 'A') goto yy194;
- }
- } else {
- if (yych <= '^') {
- if (yych == '\\') goto yy196;
- } else {
- if (yych <= '_') goto yy240;
- if (yych <= '`') goto yy239;
- if (yych <= 'z') goto yy194;
- }
- }
-yy239:
-#line 182 "strict_cpp.re"
- { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_XOR_ALT); }
-#line 3106 "strict_cpp_re.inc"
-yy240:
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 1;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'q') goto yy195;
- yyaccept = 9;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
- }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy243:
-#line 202 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy255:
+#line 212 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_XORASSIGN_ALT); }
-#line 3124 "strict_cpp_re.inc"
-yy244:
+#line 3265 "strict_cpp_re.inc"
+yy256:
     ++YYCURSOR;
-#line 201 "strict_cpp.re"
+#line 211 "strict_cpp.re"
     { BOOST_WAVE_RET(T_XORASSIGN); }
-#line 3129 "strict_cpp_re.inc"
-yy246:
+#line 3270 "strict_cpp_re.inc"
+yy258:
     ++YYCURSOR;
-#line 198 "strict_cpp.re"
+#line 208 "strict_cpp.re"
     { BOOST_WAVE_RET(T_STARASSIGN); }
-#line 3134 "strict_cpp_re.inc"
-yy248:
+#line 3275 "strict_cpp_re.inc"
+yy260:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '*') goto yy254;
-#line 238 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == '*') goto yy266;
+#line 248 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ARROW); }
-#line 3140 "strict_cpp_re.inc"
-yy250:
+#line 3281 "strict_cpp_re.inc"
+yy262:
     ++YYCURSOR;
-#line 226 "strict_cpp.re"
+#line 236 "strict_cpp.re"
     { BOOST_WAVE_RET(T_MINUSMINUS); }
-#line 3145 "strict_cpp_re.inc"
-yy252:
+#line 3286 "strict_cpp_re.inc"
+yy264:
     ++YYCURSOR;
-#line 197 "strict_cpp.re"
+#line 207 "strict_cpp.re"
     { BOOST_WAVE_RET(T_MINUSASSIGN); }
-#line 3150 "strict_cpp_re.inc"
-yy254:
+#line 3291 "strict_cpp_re.inc"
+yy266:
     ++YYCURSOR;
-#line 229 "strict_cpp.re"
+#line 239 "strict_cpp.re"
     {
             if (s->act_in_c99_mode) {
                 --YYCURSOR;
@@ -3159,489 +3300,489 @@
                 BOOST_WAVE_RET(T_ARROWSTAR);
             }
         }
-#line 3163 "strict_cpp_re.inc"
-yy256:
+#line 3304 "strict_cpp_re.inc"
+yy268:
     ++YYCURSOR;
-#line 225 "strict_cpp.re"
+#line 235 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PLUSPLUS); }
-#line 3168 "strict_cpp_re.inc"
-yy258:
+#line 3309 "strict_cpp_re.inc"
+yy270:
     ++YYCURSOR;
-#line 196 "strict_cpp.re"
+#line 206 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PLUSASSIGN); }
-#line 3173 "strict_cpp_re.inc"
-yy260:
+#line 3314 "strict_cpp_re.inc"
+yy272:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
     yych = *YYCURSOR;
-yy261:
+yy273:
     if (yych <= 'h') {
         if (yych <= ' ') {
             if (yych <= '\n') {
- if (yych == '\t') goto yy260;
- goto yy98;
+ if (yych == '\t') goto yy272;
+ goto yy99;
             } else {
- if (yych <= '\f') goto yy260;
- if (yych <= 0x1F) goto yy98;
- goto yy260;
+ if (yych <= '\f') goto yy272;
+ if (yych <= 0x1F) goto yy99;
+ goto yy272;
             }
         } else {
             if (yych <= 'c') {
- if (yych != '/') goto yy98;
+ if (yych != '/') goto yy99;
             } else {
- if (yych <= 'd') goto yy269;
- if (yych <= 'e') goto yy263;
- goto yy98;
+ if (yych <= 'd') goto yy281;
+ if (yych <= 'e') goto yy275;
+ goto yy99;
             }
         }
     } else {
         if (yych <= 'q') {
             if (yych <= 'l') {
- if (yych <= 'i') goto yy270;
- if (yych <= 'k') goto yy98;
- goto yy267;
+ if (yych <= 'i') goto yy282;
+ if (yych <= 'k') goto yy99;
+ goto yy279;
             } else {
- if (yych == 'p') goto yy266;
- goto yy98;
+ if (yych == 'p') goto yy278;
+ goto yy99;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 'r') goto yy264;
- if (yych <= 't') goto yy98;
- goto yy268;
+ if (yych <= 'r') goto yy276;
+ if (yych <= 't') goto yy99;
+ goto yy280;
             } else {
- if (yych == 'w') goto yy265;
- goto yy98;
+ if (yych == 'w') goto yy277;
+ goto yy99;
             }
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych == '*') goto yy377;
- goto yy98;
-yy263:
+ if (yych == '*') goto yy389;
+ goto yy99;
+yy275:
     yych = *++YYCURSOR;
     if (yych <= 'm') {
- if (yych == 'l') goto yy353;
- goto yy98;
+ if (yych == 'l') goto yy365;
+ goto yy99;
     } else {
- if (yych <= 'n') goto yy354;
- if (yych == 'r') goto yy355;
- goto yy98;
+ if (yych <= 'n') goto yy366;
+ if (yych == 'r') goto yy367;
+ goto yy99;
     }
-yy264:
- yych = *++YYCURSOR;
- if (yych == 'e') goto yy347;
- goto yy98;
-yy265:
- yych = *++YYCURSOR;
- if (yych == 'a') goto yy340;
- goto yy98;
-yy266:
+yy276:
     yych = *++YYCURSOR;
- if (yych == 'r') goto yy334;
- goto yy98;
-yy267:
+ if (yych == 'e') goto yy359;
+ goto yy99;
+yy277:
     yych = *++YYCURSOR;
- if (yych == 'i') goto yy330;
- goto yy98;
-yy268:
+ if (yych == 'a') goto yy352;
+ goto yy99;
+yy278:
     yych = *++YYCURSOR;
- if (yych == 'n') goto yy325;
- goto yy98;
-yy269:
+ if (yych == 'r') goto yy346;
+ goto yy99;
+yy279:
     yych = *++YYCURSOR;
- if (yych == 'e') goto yy319;
- goto yy98;
-yy270:
+ if (yych == 'i') goto yy342;
+ goto yy99;
+yy280:
     yych = *++YYCURSOR;
- if (yych == 'f') goto yy278;
- if (yych == 'n') goto yy277;
- goto yy98;
-yy271:
+ if (yych == 'n') goto yy337;
+ goto yy99;
+yy281:
     yych = *++YYCURSOR;
- if (yych == '?') goto yy274;
- goto yy98;
-yy272:
+ if (yych == 'e') goto yy331;
+ goto yy99;
+yy282:
+ yych = *++YYCURSOR;
+ if (yych == 'f') goto yy290;
+ if (yych == 'n') goto yy289;
+ goto yy99;
+yy283:
+ yych = *++YYCURSOR;
+ if (yych == '?') goto yy286;
+ goto yy99;
+yy284:
     ++YYCURSOR;
-#line 143 "strict_cpp.re"
+#line 153 "strict_cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND); }
-#line 3271 "strict_cpp_re.inc"
-yy274:
+#line 3412 "strict_cpp_re.inc"
+yy286:
     yych = *++YYCURSOR;
- if (yych != '=') goto yy98;
+ if (yych != '=') goto yy99;
     ++YYCURSOR;
-#line 144 "strict_cpp.re"
+#line 154 "strict_cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_TRIGRAPH); }
-#line 3278 "strict_cpp_re.inc"
-yy277:
+#line 3419 "strict_cpp_re.inc"
+yy289:
     yych = *++YYCURSOR;
- if (yych == 'c') goto yy289;
- goto yy98;
-yy278:
+ if (yych == 'c') goto yy301;
+ goto yy99;
+yy290:
     yyaccept = 10;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'd') goto yy281;
- if (yych == 'n') goto yy280;
-yy279:
-#line 261 "strict_cpp.re"
+ if (yych == 'd') goto yy293;
+ if (yych == 'n') goto yy292;
+yy291:
+#line 301 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_IF); }
-#line 3291 "strict_cpp_re.inc"
-yy280:
+#line 3432 "strict_cpp_re.inc"
+yy292:
     yych = *++YYCURSOR;
- if (yych == 'd') goto yy285;
- goto yy98;
-yy281:
+ if (yych == 'd') goto yy297;
+ goto yy99;
+yy293:
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'f') goto yy98;
+ if (yych != 'f') goto yy99;
     ++YYCURSOR;
-#line 262 "strict_cpp.re"
+#line 302 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_IFDEF); }
-#line 3304 "strict_cpp_re.inc"
-yy285:
+#line 3445 "strict_cpp_re.inc"
+yy297:
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'f') goto yy98;
+ if (yych != 'f') goto yy99;
     ++YYCURSOR;
-#line 263 "strict_cpp.re"
+#line 303 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_IFNDEF); }
-#line 3313 "strict_cpp_re.inc"
-yy289:
+#line 3454 "strict_cpp_re.inc"
+yy301:
     yych = *++YYCURSOR;
- if (yych != 'l') goto yy98;
+ if (yych != 'l') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'u') goto yy98;
+ if (yych != 'u') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'd') goto yy98;
+ if (yych != 'd') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     yyaccept = 11;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '_') goto yy295;
- goto yy297;
-yy294:
-#line 259 "strict_cpp.re"
+ if (yych == '_') goto yy307;
+ goto yy309;
+yy306:
+#line 299 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_INCLUDE); }
-#line 3330 "strict_cpp_re.inc"
-yy295:
+#line 3471 "strict_cpp_re.inc"
+yy307:
     yych = *++YYCURSOR;
- if (yych == 'n') goto yy316;
- goto yy98;
-yy296:
+ if (yych == 'n') goto yy328;
+ goto yy99;
+yy308:
     yyaccept = 11;
     YYMARKER = ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
-yy297:
+yy309:
     if (yych <= ' ') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy296;
- goto yy294;
+ if (yych == '\t') goto yy308;
+ goto yy306;
         } else {
- if (yych <= '\f') goto yy296;
- if (yych <= 0x1F) goto yy294;
- goto yy296;
+ if (yych <= '\f') goto yy308;
+ if (yych <= 0x1F) goto yy306;
+ goto yy308;
         }
     } else {
         if (yych <= '.') {
- if (yych == '"') goto yy300;
- goto yy294;
+ if (yych == '"') goto yy312;
+ goto yy306;
         } else {
- if (yych <= '/') goto yy298;
- if (yych == '<') goto yy299;
- goto yy294;
+ if (yych <= '/') goto yy310;
+ if (yych == '<') goto yy311;
+ goto yy306;
         }
     }
-yy298:
+yy310:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych == '*') goto yy309;
- goto yy98;
-yy299:
+ if (yych == '*') goto yy321;
+ goto yy99;
+yy311:
     yych = *++YYCURSOR;
- if (yych == '>') goto yy98;
- goto yy306;
-yy300:
+ if (yych == '>') goto yy99;
+ goto yy318;
+yy312:
     yych = *++YYCURSOR;
- if (yych == '"') goto yy98;
- goto yy302;
-yy301:
+ if (yych == '"') goto yy99;
+ goto yy314;
+yy313:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
-yy302:
+yy314:
     if (yybm[0+yych] & 8) {
- goto yy301;
+ goto yy313;
     }
- if (yych <= '!') goto yy98;
+ if (yych <= '!') goto yy99;
     ++YYCURSOR;
-#line 256 "strict_cpp.re"
+#line 296 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_QHEADER); }
-#line 3386 "strict_cpp_re.inc"
-yy305:
+#line 3527 "strict_cpp_re.inc"
+yy317:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
-yy306:
+yy318:
     if (yybm[0+yych] & 16) {
- goto yy305;
+ goto yy317;
     }
- if (yych <= '=') goto yy98;
+ if (yych <= '=') goto yy99;
     ++YYCURSOR;
-#line 253 "strict_cpp.re"
+#line 293 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_HHEADER); }
-#line 3399 "strict_cpp_re.inc"
-yy309:
+#line 3540 "strict_cpp_re.inc"
+yy321:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 32) {
- goto yy309;
+ goto yy321;
     }
- if (yych == '\r') goto yy311;
- if (yych <= ')') goto yy98;
- goto yy313;
-yy311:
+ if (yych == '\r') goto yy323;
+ if (yych <= ')') goto yy99;
+ goto yy325;
+yy323:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 32) {
- goto yy309;
+ goto yy321;
     }
- if (yych == '\r') goto yy311;
- if (yych <= ')') goto yy98;
-yy313:
+ if (yych == '\r') goto yy323;
+ if (yych <= ')') goto yy99;
+yy325:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy313;
+ goto yy325;
     }
     if (yych <= '\r') {
- if (yych <= 0x08) goto yy98;
- if (yych <= '\f') goto yy309;
+ if (yych <= 0x08) goto yy99;
+ if (yych <= '\f') goto yy321;
     } else {
- if (yych <= 0x1F) goto yy98;
- if (yych == '/') goto yy296;
- goto yy309;
+ if (yych <= 0x1F) goto yy99;
+ if (yych == '/') goto yy308;
+ goto yy321;
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 32) {
- goto yy309;
+ goto yy321;
     }
- if (yych == '\r') goto yy311;
- if (yych <= ')') goto yy98;
- goto yy313;
-yy316:
+ if (yych == '\r') goto yy323;
+ if (yych <= ')') goto yy99;
+ goto yy325;
+yy328:
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'x') goto yy98;
+ if (yych != 'x') goto yy99;
     yych = *++YYCURSOR;
- if (yych == 't') goto yy296;
- goto yy98;
-yy319:
+ if (yych == 't') goto yy308;
+ goto yy99;
+yy331:
     yych = *++YYCURSOR;
- if (yych != 'f') goto yy98;
+ if (yych != 'f') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'i') goto yy98;
+ if (yych != 'i') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'n') goto yy98;
+ if (yych != 'n') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     ++YYCURSOR;
-#line 267 "strict_cpp.re"
+#line 307 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_DEFINE); }
-#line 3463 "strict_cpp_re.inc"
-yy325:
+#line 3604 "strict_cpp_re.inc"
+yy337:
     yych = *++YYCURSOR;
- if (yych != 'd') goto yy98;
+ if (yych != 'd') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'f') goto yy98;
+ if (yych != 'f') goto yy99;
     ++YYCURSOR;
-#line 268 "strict_cpp.re"
+#line 308 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_UNDEF); }
-#line 3474 "strict_cpp_re.inc"
-yy330:
+#line 3615 "strict_cpp_re.inc"
+yy342:
     yych = *++YYCURSOR;
- if (yych != 'n') goto yy98;
+ if (yych != 'n') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     ++YYCURSOR;
-#line 269 "strict_cpp.re"
+#line 309 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_LINE); }
-#line 3483 "strict_cpp_re.inc"
-yy334:
+#line 3624 "strict_cpp_re.inc"
+yy346:
     yych = *++YYCURSOR;
- if (yych != 'a') goto yy98;
+ if (yych != 'a') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'g') goto yy98;
+ if (yych != 'g') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'm') goto yy98;
+ if (yych != 'm') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'a') goto yy98;
+ if (yych != 'a') goto yy99;
     ++YYCURSOR;
-#line 271 "strict_cpp.re"
+#line 311 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_PRAGMA); }
-#line 3496 "strict_cpp_re.inc"
-yy340:
+#line 3637 "strict_cpp_re.inc"
+yy352:
     yych = *++YYCURSOR;
- if (yych != 'r') goto yy98;
+ if (yych != 'r') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'n') goto yy98;
+ if (yych != 'n') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'i') goto yy98;
+ if (yych != 'i') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'n') goto yy98;
+ if (yych != 'n') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'g') goto yy98;
+ if (yych != 'g') goto yy99;
     ++YYCURSOR;
-#line 273 "strict_cpp.re"
+#line 313 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_WARNING); }
-#line 3511 "strict_cpp_re.inc"
-yy347:
+#line 3652 "strict_cpp_re.inc"
+yy359:
     yych = *++YYCURSOR;
- if (yych != 'g') goto yy98;
+ if (yych != 'g') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'i') goto yy98;
+ if (yych != 'i') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'o') goto yy98;
+ if (yych != 'o') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'n') goto yy98;
+ if (yych != 'n') goto yy99;
     ++YYCURSOR;
-#line 275 "strict_cpp.re"
+#line 315 "strict_cpp.re"
     { BOOST_WAVE_RET(T_MSEXT_PP_REGION); }
-#line 3524 "strict_cpp_re.inc"
-yy353:
+#line 3665 "strict_cpp_re.inc"
+yy365:
     yych = *++YYCURSOR;
- if (yych == 'i') goto yy371;
- if (yych == 's') goto yy372;
- goto yy98;
-yy354:
+ if (yych == 'i') goto yy383;
+ if (yych == 's') goto yy384;
+ goto yy99;
+yy366:
     yych = *++YYCURSOR;
- if (yych == 'd') goto yy360;
- goto yy98;
-yy355:
+ if (yych == 'd') goto yy372;
+ goto yy99;
+yy367:
     yych = *++YYCURSOR;
- if (yych != 'r') goto yy98;
+ if (yych != 'r') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'o') goto yy98;
+ if (yych != 'o') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'r') goto yy98;
+ if (yych != 'r') goto yy99;
     ++YYCURSOR;
-#line 270 "strict_cpp.re"
+#line 310 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_ERROR); }
-#line 3544 "strict_cpp_re.inc"
-yy360:
+#line 3685 "strict_cpp_re.inc"
+yy372:
     yych = *++YYCURSOR;
- if (yych == 'i') goto yy361;
- if (yych == 'r') goto yy362;
- goto yy98;
-yy361:
+ if (yych == 'i') goto yy373;
+ if (yych == 'r') goto yy374;
+ goto yy99;
+yy373:
     yych = *++YYCURSOR;
- if (yych == 'f') goto yy369;
- goto yy98;
-yy362:
+ if (yych == 'f') goto yy381;
+ goto yy99;
+yy374:
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'g') goto yy98;
+ if (yych != 'g') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'i') goto yy98;
+ if (yych != 'i') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'o') goto yy98;
+ if (yych != 'o') goto yy99;
     yych = *++YYCURSOR;
- if (yych != 'n') goto yy98;
+ if (yych != 'n') goto yy99;
     ++YYCURSOR;
-#line 276 "strict_cpp.re"
+#line 316 "strict_cpp.re"
     { BOOST_WAVE_RET(T_MSEXT_PP_ENDREGION); }
-#line 3568 "strict_cpp_re.inc"
-yy369:
+#line 3709 "strict_cpp_re.inc"
+yy381:
     ++YYCURSOR;
-#line 266 "strict_cpp.re"
+#line 306 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_ENDIF); }
-#line 3573 "strict_cpp_re.inc"
-yy371:
+#line 3714 "strict_cpp_re.inc"
+yy383:
     yych = *++YYCURSOR;
- if (yych == 'f') goto yy375;
- goto yy98;
-yy372:
+ if (yych == 'f') goto yy387;
+ goto yy99;
+yy384:
     yych = *++YYCURSOR;
- if (yych != 'e') goto yy98;
+ if (yych != 'e') goto yy99;
     ++YYCURSOR;
-#line 264 "strict_cpp.re"
+#line 304 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_ELSE); }
-#line 3584 "strict_cpp_re.inc"
-yy375:
+#line 3725 "strict_cpp_re.inc"
+yy387:
     ++YYCURSOR;
-#line 265 "strict_cpp.re"
+#line 305 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_ELIF); }
-#line 3589 "strict_cpp_re.inc"
-yy377:
+#line 3730 "strict_cpp_re.inc"
+yy389:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '\r') {
- if (yych <= 0x08) goto yy98;
- if (yych <= '\f') goto yy377;
+ if (yych <= 0x08) goto yy99;
+ if (yych <= '\f') goto yy389;
     } else {
- if (yych <= 0x1F) goto yy98;
- if (yych == '*') goto yy381;
- goto yy377;
+ if (yych <= 0x1F) goto yy99;
+ if (yych == '*') goto yy393;
+ goto yy389;
     }
-yy379:
+yy391:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '\r') {
- if (yych <= 0x08) goto yy98;
- if (yych <= '\f') goto yy377;
- goto yy379;
+ if (yych <= 0x08) goto yy99;
+ if (yych <= '\f') goto yy389;
+ goto yy391;
     } else {
- if (yych <= 0x1F) goto yy98;
- if (yych != '*') goto yy377;
+ if (yych <= 0x1F) goto yy99;
+ if (yych != '*') goto yy389;
     }
-yy381:
+yy393:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= 0x1F) {
- if (yych <= 0x08) goto yy98;
- if (yych <= '\f') goto yy377;
- if (yych >= 0x0E) goto yy98;
+ if (yych <= 0x08) goto yy99;
+ if (yych <= '\f') goto yy389;
+ if (yych >= 0x0E) goto yy99;
     } else {
         if (yych <= '*') {
- if (yych <= ')') goto yy377;
- goto yy381;
+ if (yych <= ')') goto yy389;
+ goto yy393;
         } else {
- if (yych == '/') goto yy260;
- goto yy377;
+ if (yych == '/') goto yy272;
+ goto yy389;
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '\r') {
- if (yych <= 0x08) goto yy98;
- if (yych <= '\f') goto yy377;
- goto yy379;
- } else {
- if (yych <= 0x1F) goto yy98;
- if (yych == '*') goto yy381;
- goto yy377;
+ if (yych <= 0x08) goto yy99;
+ if (yych <= '\f') goto yy389;
+ goto yy391;
+ } else {
+ if (yych <= 0x1F) goto yy99;
+ if (yych == '*') goto yy393;
+ goto yy389;
     }
-yy384:
+yy396:
     ++YYCURSOR;
-#line 155 "strict_cpp.re"
+#line 165 "strict_cpp.re"
     {
             if (s->act_in_c99_mode) {
                 --YYCURSOR;
@@ -3651,2438 +3792,2746 @@
                 BOOST_WAVE_RET(T_COLON_COLON);
             }
         }
-#line 3655 "strict_cpp_re.inc"
-yy386:
+#line 3796 "strict_cpp_re.inc"
+yy398:
     ++YYCURSOR;
-#line 139 "strict_cpp.re"
+#line 149 "strict_cpp.re"
     { BOOST_WAVE_RET(T_RIGHTBRACKET_ALT); }
-#line 3660 "strict_cpp_re.inc"
-yy388:
+#line 3801 "strict_cpp_re.inc"
+yy400:
     yyaccept = 12;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'e') {
         if (yych <= ' ') {
             if (yych <= '\n') {
- if (yych == '\t') goto yy261;
+ if (yych == '\t') goto yy273;
             } else {
- if (yych <= '\f') goto yy261;
- if (yych >= ' ') goto yy261;
+ if (yych <= '\f') goto yy273;
+ if (yych >= ' ') goto yy273;
             }
         } else {
             if (yych <= '.') {
- if (yych == '%') goto yy394;
+ if (yych == '%') goto yy406;
             } else {
- if (yych <= '/') goto yy261;
- if (yych >= 'd') goto yy261;
+ if (yych <= '/') goto yy273;
+ if (yych >= 'd') goto yy273;
             }
         }
     } else {
         if (yych <= 'p') {
             if (yych <= 'k') {
- if (yych == 'i') goto yy261;
+ if (yych == 'i') goto yy273;
             } else {
- if (yych <= 'l') goto yy261;
- if (yych >= 'p') goto yy261;
+ if (yych <= 'l') goto yy273;
+ if (yych >= 'p') goto yy273;
             }
         } else {
             if (yych <= 't') {
- if (yych == 'r') goto yy261;
+ if (yych == 'r') goto yy273;
             } else {
- if (yych == 'v') goto yy389;
- if (yych <= 'w') goto yy261;
+ if (yych == 'v') goto yy401;
+ if (yych <= 'w') goto yy273;
             }
         }
     }
-yy389:
-#line 141 "strict_cpp.re"
+yy401:
+#line 151 "strict_cpp.re"
     { BOOST_WAVE_RET(T_POUND_ALT); }
-#line 3700 "strict_cpp_re.inc"
-yy390:
+#line 3841 "strict_cpp_re.inc"
+yy402:
     ++YYCURSOR;
-#line 200 "strict_cpp.re"
+#line 210 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PERCENTASSIGN); }
-#line 3705 "strict_cpp_re.inc"
-yy392:
+#line 3846 "strict_cpp_re.inc"
+yy404:
     ++YYCURSOR;
-#line 133 "strict_cpp.re"
+#line 143 "strict_cpp.re"
     { BOOST_WAVE_RET(T_RIGHTBRACE_ALT); }
-#line 3710 "strict_cpp_re.inc"
-yy394:
+#line 3851 "strict_cpp_re.inc"
+yy406:
     yych = *++YYCURSOR;
- if (yych != ':') goto yy98;
+ if (yych != ':') goto yy99;
     ++YYCURSOR;
-#line 147 "strict_cpp.re"
+#line 157 "strict_cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_ALT); }
-#line 3717 "strict_cpp_re.inc"
-yy397:
+#line 3858 "strict_cpp_re.inc"
+yy409:
     ++YYCURSOR;
-#line 216 "strict_cpp.re"
+#line 226 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LESSEQUAL); }
-#line 3722 "strict_cpp_re.inc"
-yy399:
+#line 3863 "strict_cpp_re.inc"
+yy411:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy405;
-#line 209 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == '=') goto yy417;
+#line 219 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SHIFTLEFT); }
-#line 3728 "strict_cpp_re.inc"
-yy401:
+#line 3869 "strict_cpp_re.inc"
+yy413:
     ++YYCURSOR;
-#line 136 "strict_cpp.re"
+#line 146 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LEFTBRACKET_ALT); }
-#line 3733 "strict_cpp_re.inc"
-yy403:
+#line 3874 "strict_cpp_re.inc"
+yy415:
     ++YYCURSOR;
-#line 130 "strict_cpp.re"
+#line 140 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LEFTBRACE_ALT); }
-#line 3738 "strict_cpp_re.inc"
-yy405:
+#line 3879 "strict_cpp_re.inc"
+yy417:
     ++YYCURSOR;
-#line 212 "strict_cpp.re"
+#line 222 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SHIFTLEFTASSIGN); }
-#line 3743 "strict_cpp_re.inc"
-yy407:
+#line 3884 "strict_cpp_re.inc"
+yy419:
     yych = *++YYCURSOR;
     switch (yych) {
- case '!': goto yy420;
- case '\'': goto yy418;
- case '(': goto yy412;
- case ')': goto yy414;
- case '-': goto yy422;
- case '/': goto yy424;
- case '<': goto yy408;
- case '=': goto yy416;
- case '>': goto yy410;
- default: goto yy98;
+ case '!': goto yy432;
+ case '\'': goto yy430;
+ case '(': goto yy424;
+ case ')': goto yy426;
+ case '-': goto yy434;
+ case '/': goto yy436;
+ case '<': goto yy420;
+ case '=': goto yy428;
+ case '>': goto yy422;
+ default: goto yy99;
     }
-yy408:
+yy420:
     ++YYCURSOR;
-#line 129 "strict_cpp.re"
+#line 139 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LEFTBRACE_TRIGRAPH); }
-#line 3762 "strict_cpp_re.inc"
-yy410:
+#line 3903 "strict_cpp_re.inc"
+yy422:
     ++YYCURSOR;
-#line 132 "strict_cpp.re"
+#line 142 "strict_cpp.re"
     { BOOST_WAVE_RET(T_RIGHTBRACE_TRIGRAPH); }
-#line 3767 "strict_cpp_re.inc"
-yy412:
+#line 3908 "strict_cpp_re.inc"
+yy424:
     ++YYCURSOR;
-#line 135 "strict_cpp.re"
+#line 145 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LEFTBRACKET_TRIGRAPH); }
-#line 3772 "strict_cpp_re.inc"
-yy414:
+#line 3913 "strict_cpp_re.inc"
+yy426:
     ++YYCURSOR;
-#line 138 "strict_cpp.re"
+#line 148 "strict_cpp.re"
     { BOOST_WAVE_RET(T_RIGHTBRACKET_TRIGRAPH); }
-#line 3777 "strict_cpp_re.inc"
-yy416:
+#line 3918 "strict_cpp_re.inc"
+yy428:
     yyaccept = 13;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'c') {
         if (yych <= ' ') {
             if (yych <= '\n') {
- if (yych == '\t') goto yy261;
+ if (yych == '\t') goto yy273;
             } else {
- if (yych <= '\f') goto yy261;
- if (yych >= ' ') goto yy261;
+ if (yych <= '\f') goto yy273;
+ if (yych >= ' ') goto yy273;
             }
         } else {
             if (yych <= '.') {
- if (yych == '#') goto yy437;
+ if (yych == '#') goto yy449;
             } else {
- if (yych <= '/') goto yy261;
- if (yych == '?') goto yy436;
+ if (yych <= '/') goto yy273;
+ if (yych == '?') goto yy448;
             }
         }
     } else {
         if (yych <= 'p') {
             if (yych <= 'i') {
- if (yych <= 'e') goto yy261;
- if (yych >= 'i') goto yy261;
+ if (yych <= 'e') goto yy273;
+ if (yych >= 'i') goto yy273;
             } else {
- if (yych == 'l') goto yy261;
- if (yych >= 'p') goto yy261;
+ if (yych == 'l') goto yy273;
+ if (yych >= 'p') goto yy273;
             }
         } else {
             if (yych <= 't') {
- if (yych == 'r') goto yy261;
+ if (yych == 'r') goto yy273;
             } else {
- if (yych == 'v') goto yy417;
- if (yych <= 'w') goto yy261;
+ if (yych == 'v') goto yy429;
+ if (yych <= 'w') goto yy273;
             }
         }
     }
-yy417:
-#line 142 "strict_cpp.re"
+yy429:
+#line 152 "strict_cpp.re"
     { BOOST_WAVE_RET(T_POUND_TRIGRAPH); }
-#line 3818 "strict_cpp_re.inc"
-yy418:
+#line 3959 "strict_cpp_re.inc"
+yy430:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '=') goto yy434;
-#line 181 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == '=') goto yy446;
+#line 191 "strict_cpp.re"
     { BOOST_WAVE_RET(T_XOR_TRIGRAPH); }
-#line 3824 "strict_cpp_re.inc"
-yy420:
+#line 3965 "strict_cpp_re.inc"
+yy432:
     yyaccept = 14;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '>') {
- if (yych == '=') goto yy429;
+ if (yych == '=') goto yy441;
     } else {
- if (yych <= '?') goto yy426;
- if (yych == '|') goto yy427;
+ if (yych <= '?') goto yy438;
+ if (yych == '|') goto yy439;
     }
-yy421:
-#line 187 "strict_cpp.re"
+yy433:
+#line 197 "strict_cpp.re"
     { BOOST_WAVE_RET(T_OR_TRIGRAPH); }
-#line 3837 "strict_cpp_re.inc"
-yy422:
+#line 3978 "strict_cpp_re.inc"
+yy434:
     ++YYCURSOR;
-#line 189 "strict_cpp.re"
+#line 199 "strict_cpp.re"
     { BOOST_WAVE_RET(T_COMPL_TRIGRAPH); }
-#line 3842 "strict_cpp_re.inc"
-yy424:
+#line 3983 "strict_cpp_re.inc"
+yy436:
     yyaccept = 15;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'U') goto yy186;
- if (yych == 'u') goto yy185;
-yy425:
-#line 239 "strict_cpp.re"
+ if (yych == 'U') goto yy100;
+ if (yych == 'u') goto yy98;
+yy437:
+#line 249 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ANY_TRIGRAPH); }
-#line 3851 "strict_cpp_re.inc"
-yy426:
+#line 3992 "strict_cpp_re.inc"
+yy438:
     yych = *++YYCURSOR;
- if (yych == '?') goto yy431;
- goto yy98;
-yy427:
+ if (yych == '?') goto yy443;
+ goto yy99;
+yy439:
     ++YYCURSOR;
-#line 221 "strict_cpp.re"
+#line 231 "strict_cpp.re"
     { BOOST_WAVE_RET(T_OROR_TRIGRAPH); }
-#line 3860 "strict_cpp_re.inc"
-yy429:
+#line 4001 "strict_cpp_re.inc"
+yy441:
     ++YYCURSOR;
-#line 208 "strict_cpp.re"
+#line 218 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ORASSIGN_TRIGRAPH); }
-#line 3865 "strict_cpp_re.inc"
-yy431:
+#line 4006 "strict_cpp_re.inc"
+yy443:
     yych = *++YYCURSOR;
- if (yych != '!') goto yy98;
+ if (yych != '!') goto yy99;
     ++YYCURSOR;
-#line 224 "strict_cpp.re"
+#line 234 "strict_cpp.re"
     { BOOST_WAVE_RET(T_OROR_TRIGRAPH); }
-#line 3872 "strict_cpp_re.inc"
-yy434:
+#line 4013 "strict_cpp_re.inc"
+yy446:
     ++YYCURSOR;
-#line 203 "strict_cpp.re"
+#line 213 "strict_cpp.re"
     { BOOST_WAVE_RET(T_XORASSIGN_TRIGRAPH); }
-#line 3877 "strict_cpp_re.inc"
-yy436:
+#line 4018 "strict_cpp_re.inc"
+yy448:
     yych = *++YYCURSOR;
- if (yych == '?') goto yy439;
- goto yy98;
-yy437:
+ if (yych == '?') goto yy451;
+ goto yy99;
+yy449:
     ++YYCURSOR;
-#line 145 "strict_cpp.re"
+#line 155 "strict_cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_TRIGRAPH); }
-#line 3886 "strict_cpp_re.inc"
-yy439:
+#line 4027 "strict_cpp_re.inc"
+yy451:
     yych = *++YYCURSOR;
- if (yych != '=') goto yy98;
+ if (yych != '=') goto yy99;
     ++YYCURSOR;
-#line 146 "strict_cpp.re"
+#line 156 "strict_cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_TRIGRAPH); }
-#line 3893 "strict_cpp_re.inc"
-yy442:
+#line 4034 "strict_cpp_re.inc"
+yy454:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     switch (yych) {
- case 'a': goto yy443;
- case 'b': goto yy444;
- case 'c': goto yy445;
- case 'd': goto yy446;
- case 'e': goto yy495;
- case 'f': goto yy493;
- case 'i': goto yy492;
- case 'l': goto yy496;
- case 's': goto yy449;
- case 't': goto yy494;
- default: goto yy195;
+ case 'a': goto yy455;
+ case 'b': goto yy456;
+ case 'c': goto yy457;
+ case 'd': goto yy458;
+ case 'e': goto yy507;
+ case 'f': goto yy505;
+ case 'i': goto yy504;
+ case 'l': goto yy508;
+ case 's': goto yy461;
+ case 't': goto yy506;
+ default: goto yy109;
     }
-yy443:
+yy455:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 's') goto yy489;
- goto yy195;
-yy444:
+ if (yych == 's') goto yy501;
+ goto yy109;
+yy456:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy484;
- goto yy195;
-yy445:
+ if (yych == 'a') goto yy496;
+ goto yy109;
+yy457:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'd') goto yy479;
- goto yy195;
-yy446:
+ if (yych == 'd') goto yy491;
+ goto yy109;
+yy458:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'e') goto yy471;
- goto yy195;
-yy447:
+ if (yych == 'e') goto yy483;
+ goto yy109;
+yy459:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy463;
- goto yy195;
-yy448:
+ if (yych == 'a') goto yy475;
+ goto yy109;
+yy460:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'n') goto yy457;
- goto yy195;
-yy449:
+ if (yych == 'n') goto yy469;
+ goto yy109;
+yy461:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
+ if (yych != 'd') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 16;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy456:
-#line 120 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy468:
+#line 130 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_STDCALL : T_IDENTIFIER); }
-#line 3969 "strict_cpp_re.inc"
-yy457:
+#line 4110 "strict_cpp_re.inc"
+yy469:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
-yy458:
+ if (yych != 'l') goto yy109;
+yy470:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 17;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy462:
-#line 125 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy474:
+#line 135 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INLINE : T_IDENTIFIER); }
-#line 3994 "strict_cpp_re.inc"
-yy463:
+#line 4135 "strict_cpp_re.inc"
+yy475:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 18;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy470:
-#line 119 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy482:
+#line 129 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_FASTCALL : T_IDENTIFIER); }
-#line 4024 "strict_cpp_re.inc"
-yy471:
+#line 4165 "strict_cpp_re.inc"
+yy483:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 19;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy478:
-#line 117 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy490:
+#line 127 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_DECLSPEC : T_IDENTIFIER); }
-#line 4054 "strict_cpp_re.inc"
-yy479:
+#line 4195 "strict_cpp_re.inc"
+yy491:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 20;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy483:
-#line 118 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy495:
+#line 128 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_CDECL : T_IDENTIFIER); }
-#line 4075 "strict_cpp_re.inc"
-yy484:
+#line 4216 "strict_cpp_re.inc"
+yy496:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
+ if (yych != 'd') goto yy109;
     yyaccept = 21;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy488:
-#line 116 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy500:
+#line 126 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_BASED : T_IDENTIFIER); }
-#line 4096 "strict_cpp_re.inc"
-yy489:
+#line 4237 "strict_cpp_re.inc"
+yy501:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'm') goto yy195;
+ if (yych != 'm') goto yy109;
     yyaccept = 22;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy491:
-#line 126 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy503:
+#line 136 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_ASM : T_IDENTIFIER); }
-#line 4111 "strict_cpp_re.inc"
-yy492:
+#line 4252 "strict_cpp_re.inc"
+yy504:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'n') goto yy518;
- goto yy195;
-yy493:
+ if (yych == 'n') goto yy530;
+ goto yy109;
+yy505:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy463;
- if (yych == 'i') goto yy511;
- goto yy195;
-yy494:
+ if (yych == 'a') goto yy475;
+ if (yych == 'i') goto yy523;
+ goto yy109;
+yy506:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'r') goto yy508;
- goto yy195;
-yy495:
+ if (yych == 'r') goto yy520;
+ goto yy109;
+yy507:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'x') goto yy502;
- goto yy195;
-yy496:
+ if (yych == 'x') goto yy514;
+ goto yy109;
+yy508:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'v') goto yy195;
+ if (yych != 'v') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 23;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy501:
-#line 124 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy513:
+#line 134 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_LEAVE : T_IDENTIFIER); }
-#line 4156 "strict_cpp_re.inc"
-yy502:
+#line 4297 "strict_cpp_re.inc"
+yy514:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 24;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy507:
-#line 122 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy519:
+#line 132 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_EXCEPT : T_IDENTIFIER); }
-#line 4180 "strict_cpp_re.inc"
-yy508:
+#line 4321 "strict_cpp_re.inc"
+yy520:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'y') goto yy195;
+ if (yych != 'y') goto yy109;
     yyaccept = 25;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy510:
-#line 121 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy522:
+#line 131 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_TRY : T_IDENTIFIER); }
-#line 4195 "strict_cpp_re.inc"
-yy511:
+#line 4336 "strict_cpp_re.inc"
+yy523:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'y') goto yy195;
+ if (yych != 'y') goto yy109;
     yyaccept = 26;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy517:
-#line 123 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy529:
+#line 133 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_FINALLY : T_IDENTIFIER); }
-#line 4222 "strict_cpp_re.inc"
-yy518:
+#line 4363 "strict_cpp_re.inc"
+yy530:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'l') goto yy458;
- if (yych != 't') goto yy195;
+ if (yych == 'l') goto yy470;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     switch (yych) {
- case '1': goto yy520;
- case '3': goto yy521;
- case '6': goto yy522;
- case '8': goto yy523;
- default: goto yy195;
+ case '1': goto yy532;
+ case '3': goto yy533;
+ case '6': goto yy534;
+ case '8': goto yy535;
+ default: goto yy109;
     }
-yy520:
+yy532:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '6') goto yy529;
- goto yy195;
-yy521:
+ if (yych == '6') goto yy541;
+ goto yy109;
+yy533:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '2') goto yy527;
- goto yy195;
-yy522:
+ if (yych == '2') goto yy539;
+ goto yy109;
+yy534:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '4') goto yy525;
- goto yy195;
-yy523:
+ if (yych == '4') goto yy537;
+ goto yy109;
+yy535:
     yyaccept = 27;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy524:
-#line 112 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy536:
+#line 122 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT8 : T_IDENTIFIER); }
-#line 4263 "strict_cpp_re.inc"
-yy525:
+#line 4404 "strict_cpp_re.inc"
+yy537:
     yyaccept = 28;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy526:
-#line 115 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy538:
+#line 125 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT64 : T_IDENTIFIER); }
-#line 4275 "strict_cpp_re.inc"
-yy527:
+#line 4416 "strict_cpp_re.inc"
+yy539:
     yyaccept = 29;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy528:
-#line 114 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy540:
+#line 124 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT32 : T_IDENTIFIER); }
-#line 4287 "strict_cpp_re.inc"
-yy529:
+#line 4428 "strict_cpp_re.inc"
+yy541:
     yyaccept = 30;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy530:
-#line 113 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy542:
+#line 123 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT16 : T_IDENTIFIER); }
-#line 4299 "strict_cpp_re.inc"
-yy531:
+#line 4440 "strict_cpp_re.inc"
+yy543:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'h') goto yy537;
- goto yy195;
-yy532:
+ if (yych == 'h') goto yy549;
+ goto yy109;
+yy544:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 31;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy536:
-#line 110 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy548:
+#line 120 "strict_cpp.re"
     { BOOST_WAVE_RET(T_WHILE); }
-#line 4325 "strict_cpp_re.inc"
-yy537:
+#line 4466 "strict_cpp_re.inc"
+yy549:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != '_') goto yy195;
+ if (yych != '_') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 32;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy542:
-#line 109 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy554:
+#line 119 "strict_cpp.re"
     { BOOST_WAVE_RET(T_WCHART); }
-#line 4349 "strict_cpp_re.inc"
-yy543:
+#line 4490 "strict_cpp_re.inc"
+yy555:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'r') goto yy555;
- goto yy195;
-yy544:
+ if (yych == 'r') goto yy567;
+ goto yy109;
+yy556:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy545;
- if (yych == 'l') goto yy546;
- goto yy195;
-yy545:
+ if (yych == 'i') goto yy557;
+ if (yych == 'l') goto yy558;
+ goto yy109;
+yy557:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'd') goto yy553;
- goto yy195;
-yy546:
+ if (yych == 'd') goto yy565;
+ goto yy109;
+yy558:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 33;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy552:
-#line 108 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy564:
+#line 118 "strict_cpp.re"
     { BOOST_WAVE_RET(T_VOLATILE); }
-#line 4392 "strict_cpp_re.inc"
-yy553:
+#line 4533 "strict_cpp_re.inc"
+yy565:
     yyaccept = 34;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy554:
-#line 107 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy566:
+#line 117 "strict_cpp.re"
     { BOOST_WAVE_RET(T_VOID); }
-#line 4404 "strict_cpp_re.inc"
-yy555:
+#line 4545 "strict_cpp_re.inc"
+yy567:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'u') goto yy195;
+ if (yych != 'u') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 35;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy560:
-#line 106 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy572:
+#line 116 "strict_cpp.re"
     { BOOST_WAVE_RET(T_VIRTUAL); }
-#line 4428 "strict_cpp_re.inc"
-yy561:
+#line 4569 "strict_cpp_re.inc"
+yy573:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '"') goto yy129;
+ if (yych == 'R') goto yy128;
+ goto yy109;
+yy574:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy567;
- if (yych == 's') goto yy568;
- goto yy195;
-yy562:
+ if (yych == 'i') goto yy580;
+ if (yych == 's') goto yy581;
+ goto yy109;
+yy575:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'g') goto yy195;
+ if (yych != 'g') goto yy109;
     yyaccept = 36;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy566:
-#line 105 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy579:
+#line 115 "strict_cpp.re"
     { BOOST_WAVE_RET(T_USING); }
-#line 4455 "strict_cpp_re.inc"
-yy567:
+#line 4602 "strict_cpp_re.inc"
+yy580:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy575;
- goto yy195;
-yy568:
+ if (yych == 'o') goto yy588;
+ goto yy109;
+yy581:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'g') goto yy195;
+ if (yych != 'g') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
+ if (yych != 'd') goto yy109;
     yyaccept = 37;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy574:
-#line 104 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy587:
+#line 114 "strict_cpp.re"
     { BOOST_WAVE_RET(T_UNSIGNED); }
-#line 4487 "strict_cpp_re.inc"
-yy575:
+#line 4634 "strict_cpp_re.inc"
+yy588:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 38;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy577:
-#line 103 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy590:
+#line 113 "strict_cpp.re"
     { BOOST_WAVE_RET(T_UNION); }
-#line 4502 "strict_cpp_re.inc"
-yy578:
+#line 4649 "strict_cpp_re.inc"
+yy591:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'm') goto yy608;
- goto yy195;
-yy579:
+ if (yych == 'm') goto yy631;
+ goto yy109;
+yy592:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy601;
- if (yych == 'r') goto yy602;
- goto yy195;
-yy580:
+ if (yych == 'i') goto yy614;
+ if (yych == 'r') goto yy615;
+ goto yy109;
+yy593:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'u') goto yy596;
- if (yych == 'y') goto yy597;
- goto yy195;
-yy581:
+ if (yych == 'u') goto yy609;
+ if (yych == 'y') goto yy610;
+ goto yy109;
+yy594:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'h') {
- if (yych != 'd') goto yy195;
+ if (yych != 'd') goto yy109;
     } else {
- if (yych <= 'i') goto yy585;
- if (yych == 'n') goto yy586;
- goto yy195;
+ if (yych <= 'i') goto yy598;
+ if (yych == 'n') goto yy599;
+ goto yy109;
     }
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'e') goto yy593;
- goto yy195;
-yy585:
+ if (yych == 'e') goto yy606;
+ goto yy109;
+yy598:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'd') goto yy591;
- goto yy195;
-yy586:
+ if (yych == 'd') goto yy604;
+ goto yy109;
+yy599:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'm') goto yy195;
+ if (yych != 'm') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 39;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy590:
-#line 102 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy603:
+#line 112 "strict_cpp.re"
     { BOOST_WAVE_RET(T_TYPENAME); }
-#line 4565 "strict_cpp_re.inc"
-yy591:
+#line 4712 "strict_cpp_re.inc"
+yy604:
     yyaccept = 40;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy592:
-#line 101 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy605:
+#line 111 "strict_cpp.re"
     { BOOST_WAVE_RET(T_TYPEID); }
-#line 4577 "strict_cpp_re.inc"
-yy593:
+#line 4724 "strict_cpp_re.inc"
+yy606:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'f') goto yy195;
+ if (yych != 'f') goto yy109;
     yyaccept = 41;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy595:
-#line 100 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy608:
+#line 110 "strict_cpp.re"
     { BOOST_WAVE_RET(T_TYPEDEF); }
-#line 4592 "strict_cpp_re.inc"
-yy596:
+#line 4739 "strict_cpp_re.inc"
+yy609:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'e') goto yy599;
- goto yy195;
-yy597:
+ if (yych == 'e') goto yy612;
+ goto yy109;
+yy610:
     yyaccept = 42;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy598:
-#line 99 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy611:
+#line 109 "strict_cpp.re"
     { BOOST_WAVE_RET(T_TRY); }
-#line 4609 "strict_cpp_re.inc"
-yy599:
+#line 4756 "strict_cpp_re.inc"
+yy612:
     yyaccept = 43;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy600:
-#line 98 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy613:
+#line 108 "strict_cpp.re"
     { BOOST_WAVE_RET(T_TRUE); }
-#line 4621 "strict_cpp_re.inc"
-yy601:
+#line 4768 "strict_cpp_re.inc"
+yy614:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 's') goto yy629;
+ goto yy109;
+yy615:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 's') goto yy606;
- goto yy195;
-yy602:
+ if (yych == 'e') goto yy616;
+ if (yych == 'o') goto yy617;
+ goto yy109;
+yy616:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'o') goto yy195;
+ if (yych == 'a') goto yy620;
+ goto yy109;
+yy617:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'w') goto yy195;
+ if (yych != 'w') goto yy109;
     yyaccept = 44;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy605:
-#line 97 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy619:
+#line 107 "strict_cpp.re"
     { BOOST_WAVE_RET(T_THROW); }
-#line 4644 "strict_cpp_re.inc"
-yy606:
- yyaccept = 45;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
- }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy607:
-#line 96 "strict_cpp.re"
- { BOOST_WAVE_RET(T_THIS); }
-#line 4656 "strict_cpp_re.inc"
-yy608:
+#line 4799 "strict_cpp_re.inc"
+yy620:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych != 'd') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != '_') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 'o') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 46;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
- }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy614:
-#line 95 "strict_cpp.re"
- { BOOST_WAVE_RET(T_TEMPLATE); }
-#line 4683 "strict_cpp_re.inc"
-yy615:
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy650;
- goto yy195;
-yy616:
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'g') goto yy640;
- if (yych == 'z') goto yy641;
- goto yy195;
-yy617:
+ if (yych != 'l') goto yy109;
+ yyaccept = 45;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy628:
+#line 106 "strict_cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_THREADLOCAL : T_IDENTIFIER); }
+#line 4832 "strict_cpp_re.inc"
+yy629:
+ yyaccept = 46;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy630:
+#line 105 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_THIS); }
+#line 4844 "strict_cpp_re.inc"
+yy631:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy624;
- if (yych == 'r') goto yy625;
- goto yy195;
-yy618:
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'h') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 47;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy623:
-#line 94 "strict_cpp.re"
- { BOOST_WAVE_RET(T_SWITCH); }
-#line 4724 "strict_cpp_re.inc"
-yy624:
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy637:
+#line 104 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_TEMPLATE); }
+#line 4871 "strict_cpp_re.inc"
+yy638:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 't') goto yy630;
- goto yy195;
-yy625:
+ if (yych == 'o') goto yy680;
+ goto yy109;
+yy639:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'u') goto yy195;
+ if (yych == 'g') goto yy670;
+ if (yych == 'z') goto yy671;
+ goto yy109;
+yy640:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych == 'a') goto yy647;
+ if (yych == 'r') goto yy648;
+ goto yy109;
+yy641:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 'i') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 't') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'c') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'h') goto yy109;
     yyaccept = 48;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy629:
-#line 93 "strict_cpp.re"
- { BOOST_WAVE_RET(T_STRUCT); }
-#line 4750 "strict_cpp_re.inc"
-yy630:
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy646:
+#line 103 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_SWITCH); }
+#line 4912 "strict_cpp_re.inc"
+yy647:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 't') goto yy653;
+ goto yy109;
+yy648:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'u') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 49;
     yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy652:
+#line 102 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_STRUCT); }
+#line 4938 "strict_cpp_re.inc"
+yy653:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'i') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'c') goto yy109;
+ yyaccept = 50;
+ yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'Z') {
         if (yych <= '>') {
- if (yych <= '/') goto yy633;
- if (yych <= '9') goto yy194;
+ if (yych <= '/') goto yy656;
+ if (yych <= '9') goto yy108;
         } else {
- if (yych <= '?') goto yy197;
- if (yych >= 'A') goto yy194;
+ if (yych <= '?') goto yy111;
+ if (yych >= 'A') goto yy108;
         }
     } else {
         if (yych <= '^') {
- if (yych == '\\') goto yy196;
+ if (yych == '\\') goto yy110;
         } else {
- if (yych <= '_') goto yy634;
- if (yych <= '`') goto yy633;
- if (yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy657;
+ if (yych <= '`') goto yy656;
+ if (yych <= 'z') goto yy108;
         }
     }
-yy633:
-#line 91 "strict_cpp.re"
+yy656:
+#line 99 "strict_cpp.re"
     { BOOST_WAVE_RET(T_STATIC); }
-#line 4780 "strict_cpp_re.inc"
-yy634:
+#line 4968 "strict_cpp_re.inc"
+yy657:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych == 'a') goto yy658;
+ if (yych == 'c') goto yy659;
+ goto yy109;
+yy658:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych == 's') goto yy664;
+ goto yy109;
+yy659:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 50;
+ if (yych != 's') goto yy109;
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yych != 't') goto yy109;
+ yyaccept = 51;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy639:
-#line 92 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy663:
+#line 100 "strict_cpp.re"
     { BOOST_WAVE_RET(T_STATICCAST); }
-#line 4804 "strict_cpp_re.inc"
-yy640:
+#line 5000 "strict_cpp_re.inc"
+yy664:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'n') goto yy646;
- goto yy195;
-yy641:
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'o') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'f') goto yy195;
- yyaccept = 51;
+ if (yych != 't') goto yy109;
+ yyaccept = 52;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy645:
-#line 90 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy669:
+#line 101 "strict_cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_STATICASSERT : T_IDENTIFIER); }
+#line 5024 "strict_cpp_re.inc"
+yy670:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 'n') goto yy676;
+ goto yy109;
+yy671:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'e') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'o') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'f') goto yy109;
+ yyaccept = 53;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy675:
+#line 98 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SIZEOF); }
-#line 4830 "strict_cpp_re.inc"
-yy646:
+#line 5050 "strict_cpp_re.inc"
+yy676:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
- yyaccept = 52;
+ if (yych != 'd') goto yy109;
+ yyaccept = 54;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy649:
-#line 89 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy679:
+#line 97 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SIGNED); }
-#line 4848 "strict_cpp_re.inc"
-yy650:
+#line 5068 "strict_cpp_re.inc"
+yy680:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 53;
+ if (yych != 't') goto yy109;
+ yyaccept = 55;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy653:
-#line 88 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy683:
+#line 96 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SHORT); }
-#line 4866 "strict_cpp_re.inc"
-yy654:
+#line 5086 "strict_cpp_re.inc"
+yy684:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'h') {
- if (yych != 'g') goto yy195;
+ if (yych != 'g') goto yy109;
     } else {
- if (yych <= 'i') goto yy656;
- if (yych == 't') goto yy657;
- goto yy195;
+ if (yych <= 'i') goto yy686;
+ if (yych == 't') goto yy687;
+ goto yy109;
     }
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy676;
- goto yy195;
-yy656:
+ if (yych == 'i') goto yy706;
+ goto yy109;
+yy686:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'n') goto yy662;
- goto yy195;
-yy657:
+ if (yych == 'n') goto yy692;
+ goto yy109;
+yy687:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'u') goto yy195;
+ if (yych != 'u') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
- yyaccept = 54;
+ if (yych != 'n') goto yy109;
+ yyaccept = 56;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy661:
-#line 87 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy691:
+#line 95 "strict_cpp.re"
     { BOOST_WAVE_RET(T_RETURN); }
-#line 4906 "strict_cpp_re.inc"
-yy662:
+#line 5126 "strict_cpp_re.inc"
+yy692:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != '_') goto yy195;
+ if (yych != '_') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 55;
+ if (yych != 't') goto yy109;
+ yyaccept = 57;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy675:
-#line 86 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy705:
+#line 94 "strict_cpp.re"
     { BOOST_WAVE_RET(T_REINTERPRETCAST); }
-#line 4954 "strict_cpp_re.inc"
-yy676:
+#line 5174 "strict_cpp_re.inc"
+yy706:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
- yyaccept = 56;
+ if (yych != 'r') goto yy109;
+ yyaccept = 58;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy681:
-#line 85 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy711:
+#line 93 "strict_cpp.re"
     { BOOST_WAVE_RET(T_REGISTER); }
-#line 4978 "strict_cpp_re.inc"
-yy682:
+#line 5198 "strict_cpp_re.inc"
+yy712:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy689;
- if (yych == 'o') goto yy690;
- goto yy195;
-yy683:
+ if (yych == 'i') goto yy719;
+ if (yych == 'o') goto yy720;
+ goto yy109;
+yy713:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'b') goto yy195;
+ if (yych != 'b') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
- yyaccept = 57;
+ if (yych != 'c') goto yy109;
+ yyaccept = 59;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy688:
-#line 84 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy718:
+#line 92 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PUBLIC); }
-#line 5008 "strict_cpp_re.inc"
-yy689:
+#line 5228 "strict_cpp_re.inc"
+yy719:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'v') goto yy698;
- goto yy195;
-yy690:
+ if (yych == 'v') goto yy728;
+ goto yy109;
+yy720:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
- yyaccept = 58;
+ if (yych != 'd') goto yy109;
+ yyaccept = 60;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy697:
-#line 83 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy727:
+#line 91 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PROTECTED); }
-#line 5043 "strict_cpp_re.inc"
-yy698:
+#line 5263 "strict_cpp_re.inc"
+yy728:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 59;
+ if (yych != 'e') goto yy109;
+ yyaccept = 61;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy702:
-#line 82 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy732:
+#line 90 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PRIVATE); }
-#line 5064 "strict_cpp_re.inc"
-yy703:
+#line 5284 "strict_cpp_re.inc"
+yy733:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'e') goto yy710;
- goto yy195;
-yy704:
- yyaccept = 60;
+ if (yych == 'e') goto yy740;
+ goto yy109;
+yy734:
+ yyaccept = 62;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'Z') {
         if (yych <= '>') {
- if (yych <= '/') goto yy705;
- if (yych <= '9') goto yy194;
+ if (yych <= '/') goto yy735;
+ if (yych <= '9') goto yy108;
         } else {
- if (yych <= '?') goto yy197;
- if (yych >= 'A') goto yy194;
+ if (yych <= '?') goto yy111;
+ if (yych >= 'A') goto yy108;
         }
     } else {
         if (yych <= '^') {
- if (yych == '\\') goto yy196;
+ if (yych == '\\') goto yy110;
         } else {
- if (yych <= '_') goto yy706;
- if (yych <= '`') goto yy705;
- if (yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy736;
+ if (yych <= '`') goto yy735;
+ if (yych <= 'z') goto yy108;
         }
     }
-yy705:
-#line 223 "strict_cpp.re"
+yy735:
+#line 233 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_OROR_ALT); }
-#line 5093 "strict_cpp_re.inc"
-yy706:
+#line 5313 "strict_cpp_re.inc"
+yy736:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'q') goto yy195;
- yyaccept = 61;
+ if (yych != 'q') goto yy109;
+ yyaccept = 63;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy709:
-#line 207 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy739:
+#line 217 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ORASSIGN_ALT); }
-#line 5111 "strict_cpp_re.inc"
-yy710:
+#line 5331 "strict_cpp_re.inc"
+yy740:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'o') goto yy195;
+ if (yych != 'o') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
- yyaccept = 62;
+ if (yych != 'r') goto yy109;
+ yyaccept = 64;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy716:
-#line 81 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy746:
+#line 89 "strict_cpp.re"
     { BOOST_WAVE_RET(T_OPERATOR); }
-#line 5138 "strict_cpp_re.inc"
-yy717:
+#line 5358 "strict_cpp_re.inc"
+yy747:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'm') goto yy728;
- goto yy195;
-yy718:
+ if (yych == 'm') goto yy772;
+ goto yy109;
+yy748:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'w') goto yy726;
- goto yy195;
-yy719:
+ if (yych == 'w') goto yy770;
+ goto yy109;
+yy749:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 63;
+ if (yych == 'e') goto yy757;
+ if (yych == 't') goto yy758;
+ goto yy109;
+yy750:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'l') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'l') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'p') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 't') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'r') goto yy109;
+ yyaccept = 65;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy756:
+#line 88 "strict_cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_NULLPTR : T_IDENTIFIER); }
+#line 5401 "strict_cpp_re.inc"
+yy757:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 'x') goto yy764;
+ goto yy109;
+yy758:
+ yyaccept = 66;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'Z') {
         if (yych <= '>') {
- if (yych <= '/') goto yy721;
- if (yych <= '9') goto yy194;
+ if (yych <= '/') goto yy759;
+ if (yych <= '9') goto yy108;
         } else {
- if (yych <= '?') goto yy197;
- if (yych >= 'A') goto yy194;
+ if (yych <= '?') goto yy111;
+ if (yych >= 'A') goto yy108;
         }
     } else {
         if (yych <= '^') {
- if (yych == '\\') goto yy196;
+ if (yych == '\\') goto yy110;
         } else {
- if (yych <= '_') goto yy722;
- if (yych <= '`') goto yy721;
- if (yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy760;
+ if (yych <= '`') goto yy759;
+ if (yych <= 'z') goto yy108;
         }
     }
-yy721:
-#line 192 "strict_cpp.re"
+yy759:
+#line 202 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_NOT_ALT); }
-#line 5175 "strict_cpp_re.inc"
-yy722:
+#line 5430 "strict_cpp_re.inc"
+yy760:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'q') goto yy195;
- yyaccept = 64;
+ if (yych != 'q') goto yy109;
+ yyaccept = 67;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy725:
-#line 215 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy763:
+#line 225 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_NOTEQUAL_ALT); }
-#line 5193 "strict_cpp_re.inc"
-yy726:
- yyaccept = 65;
+#line 5448 "strict_cpp_re.inc"
+yy764:
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yych != 'c') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'e') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'p') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 't') goto yy109;
+ yyaccept = 68;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy727:
-#line 80 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy769:
+#line 87 "strict_cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_NOEXCEPT : T_IDENTIFIER); }
+#line 5472 "strict_cpp_re.inc"
+yy770:
+ yyaccept = 69;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy771:
+#line 86 "strict_cpp.re"
     { BOOST_WAVE_RET(T_NEW); }
-#line 5205 "strict_cpp_re.inc"
-yy728:
+#line 5484 "strict_cpp_re.inc"
+yy772:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 66;
+ if (yych != 'e') goto yy109;
+ yyaccept = 70;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy735:
-#line 79 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy779:
+#line 85 "strict_cpp.re"
     { BOOST_WAVE_RET(T_NAMESPACE); }
-#line 5235 "strict_cpp_re.inc"
-yy736:
+#line 5514 "strict_cpp_re.inc"
+yy780:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'b') goto yy195;
+ if (yych != 'b') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 67;
+ if (yych != 'e') goto yy109;
+ yyaccept = 71;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy742:
-#line 78 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy786:
+#line 84 "strict_cpp.re"
     { BOOST_WAVE_RET(T_MUTABLE); }
-#line 5262 "strict_cpp_re.inc"
-yy743:
+#line 5541 "strict_cpp_re.inc"
+yy787:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'g') goto yy195;
- yyaccept = 68;
+ if (yych != 'g') goto yy109;
+ yyaccept = 72;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy746:
-#line 77 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy790:
+#line 83 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LONG); }
-#line 5280 "strict_cpp_re.inc"
-yy747:
- yyaccept = 69;
+#line 5559 "strict_cpp_re.inc"
+yy791:
+ yyaccept = 73;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy748:
-#line 73 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy792:
+#line 79 "strict_cpp.re"
     { BOOST_WAVE_RET(T_IF); }
-#line 5292 "strict_cpp_re.inc"
-yy749:
+#line 5571 "strict_cpp_re.inc"
+yy793:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'p') goto yy758;
- goto yy195;
-yy750:
+ if (yych == 'p') goto yy802;
+ goto yy109;
+yy794:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'l') goto yy751;
- if (yych == 't') goto yy752;
- goto yy195;
-yy751:
+ if (yych == 'l') goto yy795;
+ if (yych == 't') goto yy796;
+ goto yy109;
+yy795:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy754;
- goto yy195;
-yy752:
- yyaccept = 70;
+ if (yych == 'i') goto yy798;
+ goto yy109;
+yy796:
+ yyaccept = 74;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy753:
-#line 76 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy797:
+#line 82 "strict_cpp.re"
     { BOOST_WAVE_RET(T_INT); }
-#line 5320 "strict_cpp_re.inc"
-yy754:
+#line 5599 "strict_cpp_re.inc"
+yy798:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 71;
+ if (yych != 'e') goto yy109;
+ yyaccept = 75;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy757:
-#line 75 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy801:
+#line 81 "strict_cpp.re"
     { BOOST_WAVE_RET(T_INLINE); }
-#line 5338 "strict_cpp_re.inc"
-yy758:
+#line 5617 "strict_cpp_re.inc"
+yy802:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'o') goto yy195;
+ if (yych != 'o') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 72;
+ if (yych != 't') goto yy109;
+ yyaccept = 76;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy762:
-#line 74 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy806:
+#line 80 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_import_keyword ? T_IMPORT : T_IDENTIFIER); }
-#line 5359 "strict_cpp_re.inc"
-yy763:
+#line 5638 "strict_cpp_re.inc"
+yy807:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'o') goto yy195;
- yyaccept = 73;
+ if (yych != 'o') goto yy109;
+ yyaccept = 77;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy766:
-#line 72 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy810:
+#line 78 "strict_cpp.re"
     { BOOST_WAVE_RET(T_GOTO); }
-#line 5377 "strict_cpp_re.inc"
-yy767:
+#line 5656 "strict_cpp_re.inc"
+yy811:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'l') goto yy782;
- goto yy195;
-yy768:
+ if (yych == 'l') goto yy826;
+ goto yy109;
+yy812:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy778;
- goto yy195;
-yy769:
+ if (yych == 'o') goto yy822;
+ goto yy109;
+yy813:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'r') goto yy776;
- goto yy195;
-yy770:
+ if (yych == 'r') goto yy820;
+ goto yy109;
+yy814:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
- yyaccept = 74;
+ if (yych != 'd') goto yy109;
+ yyaccept = 78;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy775:
-#line 71 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy819:
+#line 77 "strict_cpp.re"
     { BOOST_WAVE_RET(T_FRIEND); }
-#line 5416 "strict_cpp_re.inc"
-yy776:
- yyaccept = 75;
+#line 5695 "strict_cpp_re.inc"
+yy820:
+ yyaccept = 79;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy777:
-#line 70 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy821:
+#line 76 "strict_cpp.re"
     { BOOST_WAVE_RET(T_FOR); }
-#line 5428 "strict_cpp_re.inc"
-yy778:
+#line 5707 "strict_cpp_re.inc"
+yy822:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 76;
+ if (yych != 't') goto yy109;
+ yyaccept = 80;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy781:
-#line 69 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy825:
+#line 75 "strict_cpp.re"
     { BOOST_WAVE_RET(T_FLOAT); }
-#line 5446 "strict_cpp_re.inc"
-yy782:
+#line 5725 "strict_cpp_re.inc"
+yy826:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 77;
+ if (yych != 'e') goto yy109;
+ yyaccept = 81;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy785:
-#line 68 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy829:
+#line 74 "strict_cpp.re"
     { BOOST_WAVE_RET(T_FALSE); }
-#line 5464 "strict_cpp_re.inc"
-yy786:
+#line 5743 "strict_cpp_re.inc"
+yy830:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 's') goto yy808;
- goto yy195;
-yy787:
+ if (yych == 's') goto yy852;
+ goto yy109;
+yy831:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'u') goto yy805;
- goto yy195;
-yy788:
+ if (yych == 'u') goto yy849;
+ goto yy109;
+yy832:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'p') goto yy789;
- if (yych == 't') goto yy790;
- goto yy195;
-yy789:
+ if (yych == 'p') goto yy833;
+ if (yych == 't') goto yy834;
+ goto yy109;
+yy833:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'l') goto yy795;
- if (yych == 'o') goto yy796;
- goto yy195;
-yy790:
+ if (yych == 'l') goto yy839;
+ if (yych == 'o') goto yy840;
+ goto yy109;
+yy834:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
- yyaccept = 78;
+ if (yych != 'n') goto yy109;
+ yyaccept = 82;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy794:
-#line 67 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy838:
+#line 73 "strict_cpp.re"
     { BOOST_WAVE_RET(T_EXTERN); }
-#line 5507 "strict_cpp_re.inc"
-yy795:
+#line 5786 "strict_cpp_re.inc"
+yy839:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'i') goto yy800;
- goto yy195;
-yy796:
+ if (yych == 'i') goto yy844;
+ goto yy109;
+yy840:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
+ if (yych != 'r') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 79;
+ if (yych != 't') goto yy109;
+ yyaccept = 83;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy799:
-#line 66 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy843:
+#line 72 "strict_cpp.re"
     { BOOST_WAVE_RET(T_EXPORT); }
-#line 5530 "strict_cpp_re.inc"
-yy800:
+#line 5809 "strict_cpp_re.inc"
+yy844:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 80;
+ if (yych != 't') goto yy109;
+ yyaccept = 84;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy804:
-#line 65 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy848:
+#line 71 "strict_cpp.re"
     { BOOST_WAVE_RET(T_EXPLICIT); }
-#line 5551 "strict_cpp_re.inc"
-yy805:
+#line 5830 "strict_cpp_re.inc"
+yy849:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'm') goto yy195;
- yyaccept = 81;
+ if (yych != 'm') goto yy109;
+ yyaccept = 85;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy807:
-#line 64 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy851:
+#line 70 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ENUM); }
-#line 5566 "strict_cpp_re.inc"
-yy808:
+#line 5845 "strict_cpp_re.inc"
+yy852:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 82;
+ if (yych != 'e') goto yy109;
+ yyaccept = 86;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy810:
-#line 63 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy854:
+#line 69 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ELSE); }
-#line 5581 "strict_cpp_re.inc"
-yy811:
+#line 5860 "strict_cpp_re.inc"
+yy855:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'f') goto yy831;
- if (yych == 'l') goto yy832;
- goto yy195;
-yy812:
- yyaccept = 83;
+ if (yych <= 'e') {
+ if (yych == 'c') goto yy875;
+ goto yy109;
+ } else {
+ if (yych <= 'f') goto yy876;
+ if (yych == 'l') goto yy877;
+ goto yy109;
+ }
+yy856:
+ yyaccept = 87;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '[') {
         if (yych <= '>') {
- if (yych <= '/') goto yy813;
- if (yych <= '9') goto yy194;
+ if (yych <= '/') goto yy857;
+ if (yych <= '9') goto yy108;
         } else {
- if (yych <= '?') goto yy197;
- if (yych <= '@') goto yy813;
- if (yych <= 'Z') goto yy194;
+ if (yych <= '?') goto yy111;
+ if (yych <= '@') goto yy857;
+ if (yych <= 'Z') goto yy108;
         }
     } else {
         if (yych <= '`') {
- if (yych <= '\\') goto yy196;
- if (yych == '_') goto yy194;
+ if (yych <= '\\') goto yy110;
+ if (yych == '_') goto yy108;
         } else {
- if (yych == 'u') goto yy826;
- if (yych <= 'z') goto yy194;
+ if (yych == 'u') goto yy870;
+ if (yych <= 'z') goto yy108;
         }
     }
-yy813:
-#line 60 "strict_cpp.re"
+yy857:
+#line 66 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DO); }
-#line 5612 "strict_cpp_re.inc"
-yy814:
+#line 5896 "strict_cpp_re.inc"
+yy858:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'm') goto yy195;
+ if (yych != 'm') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != '_') goto yy195;
+ if (yych != '_') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'a') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 84;
+ if (yych != 't') goto yy109;
+ yyaccept = 88;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy825:
-#line 62 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy869:
+#line 68 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DYNAMICCAST); }
-#line 5654 "strict_cpp_re.inc"
-yy826:
+#line 5938 "strict_cpp_re.inc"
+yy870:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'b') goto yy195;
+ if (yych != 'b') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 85;
+ if (yych != 'e') goto yy109;
+ yyaccept = 89;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy830:
-#line 61 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy874:
+#line 67 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DOUBLE); }
-#line 5675 "strict_cpp_re.inc"
-yy831:
+#line 5959 "strict_cpp_re.inc"
+yy875:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy837;
- goto yy195;
-yy832:
+ if (yych == 'l') goto yy887;
+ goto yy109;
+yy876:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych == 'a') goto yy882;
+ goto yy109;
+yy877:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 86;
+ if (yych != 't') goto yy109;
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yych != 'e') goto yy109;
+ yyaccept = 90;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy836:
-#line 59 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy881:
+#line 65 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DELETE); }
-#line 5701 "strict_cpp_re.inc"
-yy837:
+#line 5990 "strict_cpp_re.inc"
+yy882:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'u') goto yy195;
+ if (yych != 'u') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
+ if (yych != 'l') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 87;
+ if (yych != 't') goto yy109;
+ yyaccept = 91;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy841:
-#line 58 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy886:
+#line 64 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DEFAULT); }
-#line 5722 "strict_cpp_re.inc"
-yy842:
+#line 6011 "strict_cpp_re.inc"
+yy887:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'r') goto yy195;
- if (yych <= 's') goto yy873;
- if (yych <= 't') goto yy874;
- goto yy195;
-yy843:
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy870;
- goto yy195;
-yy844:
+ if (yych != 'y') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'p') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'e') goto yy109;
+ yyaccept = 92;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy892:
+#line 63 "strict_cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_DECLTYPE : T_IDENTIFIER); }
+#line 6035 "strict_cpp_re.inc"
+yy893:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy866;
- goto yy195;
-yy845:
+ if (yych <= 'r') goto yy109;
+ if (yych <= 's') goto yy939;
+ if (yych <= 't') goto yy940;
+ goto yy109;
+yy894:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'l') goto yy195;
- if (yych <= 'm') goto yy847;
- if (yych >= 'o') goto yy195;
+ if (yych == 'a') goto yy926;
+ goto yy109;
+yy895:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'r') goto yy195;
- if (yych <= 's') goto yy851;
- if (yych <= 't') goto yy852;
- goto yy195;
-yy847:
+ if (yych == 'a') goto yy922;
+ goto yy109;
+yy896:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'p') goto yy195;
+ if (yych <= 'l') goto yy109;
+ if (yych <= 'm') goto yy898;
+ if (yych >= 'o') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
- yyaccept = 88;
+ if (yych <= 'r') goto yy109;
+ if (yych <= 's') goto yy902;
+ if (yych <= 't') goto yy903;
+ goto yy109;
+yy898:
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yych != 'p') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'l') goto yy109;
+ yyaccept = 93;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy850:
-#line 190 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy901:
+#line 200 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_COMPL_ALT); }
-#line 5769 "strict_cpp_re.inc"
-yy851:
+#line 6082 "strict_cpp_re.inc"
+yy902:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 't') goto yy858;
- goto yy195;
-yy852:
+ if (yych == 't') goto yy909;
+ goto yy109;
+yy903:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'i') goto yy195;
+ if (yych != 'i') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'n') goto yy195;
+ if (yych != 'n') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'u') goto yy195;
+ if (yych != 'u') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
- yyaccept = 89;
+ if (yych != 'e') goto yy109;
+ yyaccept = 94;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy857:
-#line 57 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy908:
+#line 62 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CONTINUE); }
-#line 5798 "strict_cpp_re.inc"
-yy858:
- yyaccept = 90;
+#line 6111 "strict_cpp_re.inc"
+yy909:
+ yyaccept = 95;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= 'Z') {
+ if (yych <= '[') {
         if (yych <= '>') {
- if (yych <= '/') goto yy859;
- if (yych <= '9') goto yy194;
+ if (yych <= '/') goto yy910;
+ if (yych <= '9') goto yy108;
         } else {
- if (yych <= '?') goto yy197;
- if (yych >= 'A') goto yy194;
+ if (yych <= '?') goto yy111;
+ if (yych <= '@') goto yy910;
+ if (yych <= 'Z') goto yy108;
         }
     } else {
- if (yych <= '^') {
- if (yych == '\\') goto yy196;
+ if (yych <= '`') {
+ if (yych <= '\\') goto yy110;
+ if (yych == '_') goto yy911;
         } else {
- if (yych <= '_') goto yy860;
- if (yych <= '`') goto yy859;
- if (yych <= 'z') goto yy194;
+ if (yych == 'e') goto yy912;
+ if (yych <= 'z') goto yy108;
         }
     }
-yy859:
-#line 55 "strict_cpp.re"
+yy910:
+#line 59 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CONST); }
-#line 5822 "strict_cpp_re.inc"
-yy860:
+#line 6136 "strict_cpp_re.inc"
+yy911:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych == 'c') goto yy917;
+ goto yy109;
+yy912:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'x') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 'p') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
- yyaccept = 91;
+ if (yych != 'r') goto yy109;
+ yyaccept = 96;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy865:
-#line 56 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy916:
+#line 60 "strict_cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_CONSTEXPR : T_IDENTIFIER); }
+#line 6162 "strict_cpp_re.inc"
+yy917:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'a') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 's') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 't') goto yy109;
+ yyaccept = 97;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy921:
+#line 61 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CONSTCAST); }
-#line 5846 "strict_cpp_re.inc"
-yy866:
+#line 6183 "strict_cpp_re.inc"
+yy922:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
+ if (yych != 's') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 's') goto yy195;
- yyaccept = 92;
+ if (yych != 's') goto yy109;
+ yyaccept = 98;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy869:
-#line 54 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy925:
+#line 58 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CLASS); }
-#line 5864 "strict_cpp_re.inc"
-yy870:
+#line 6201 "strict_cpp_re.inc"
+yy926:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
- yyaccept = 93;
+ if (yych != 'r') goto yy109;
+ yyaccept = 99;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yych <= '?') {
+ if (yych <= '2') {
+ if (yych <= '/') goto yy928;
+ if (yych == '1') goto yy929;
+ goto yy108;
+ } else {
+ if (yych <= '3') goto yy930;
+ if (yych <= '9') goto yy108;
+ if (yych >= '?') goto yy111;
+ }
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '@') goto yy928;
+ if (yych <= 'Z') goto yy108;
+ if (yych >= '\\') goto yy110;
+ } else {
+ if (yych <= '_') {
+ if (yych >= '_') goto yy108;
+ } else {
+ if (yych <= '`') goto yy928;
+ if (yych <= 'z') goto yy108;
+ }
+ }
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy872:
-#line 53 "strict_cpp.re"
+yy928:
+#line 55 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CHAR); }
-#line 5879 "strict_cpp_re.inc"
-yy873:
+#line 6235 "strict_cpp_re.inc"
+yy929:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'e') goto yy878;
- goto yy195;
-yy874:
+ if (yych == '6') goto yy935;
+ goto yy109;
+yy930:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'c') goto yy195;
+ if (yych != '2') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'h') goto yy195;
- yyaccept = 94;
+ if (yych != '_') goto yy109;
+ yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
- }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy877:
-#line 52 "strict_cpp.re"
- { BOOST_WAVE_RET(T_CATCH); }
-#line 5902 "strict_cpp_re.inc"
-yy878:
- yyaccept = 95;
+ if (yych != 't') goto yy109;
+ yyaccept = 100;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy879:
-#line 51 "strict_cpp.re"
- { BOOST_WAVE_RET(T_CASE); }
-#line 5914 "strict_cpp_re.inc"
-yy880:
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy934:
+#line 57 "strict_cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_CHAR32_T : T_IDENTIFIER); }
+#line 6261 "strict_cpp_re.inc"
+yy935:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 't') goto yy890;
- goto yy195;
-yy881:
+ if (yych != '_') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'o') goto yy887;
- goto yy195;
-yy882:
+ if (yych != 't') goto yy109;
+ yyaccept = 101;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy938:
+#line 56 "strict_cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_CHAR16_T : T_IDENTIFIER); }
+#line 6279 "strict_cpp_re.inc"
+yy939:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych == 'e') goto yy944;
+ goto yy109;
+yy940:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'a') goto yy195;
+ if (yych != 'c') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'k') goto yy195;
- yyaccept = 96;
+ if (yych != 'h') goto yy109;
+ yyaccept = 102;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy886:
-#line 50 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy943:
+#line 54 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_CATCH); }
+#line 6302 "strict_cpp_re.inc"
+yy944:
+ yyaccept = 103;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy945:
+#line 53 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_CASE); }
+#line 6314 "strict_cpp_re.inc"
+yy946:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 't') goto yy956;
+ goto yy109;
+yy947:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 'o') goto yy953;
+ goto yy109;
+yy948:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'e') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'a') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'k') goto yy109;
+ yyaccept = 104;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy952:
+#line 52 "strict_cpp.re"
     { BOOST_WAVE_RET(T_BREAK); }
-#line 5945 "strict_cpp_re.inc"
-yy887:
+#line 6345 "strict_cpp_re.inc"
+yy953:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'l') goto yy195;
- yyaccept = 97;
+ if (yych != 'l') goto yy109;
+ yyaccept = 105;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy889:
-#line 49 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy955:
+#line 51 "strict_cpp.re"
     { BOOST_WAVE_RET(T_BOOL); }
-#line 5960 "strict_cpp_re.inc"
-yy890:
+#line 6360 "strict_cpp_re.inc"
+yy956:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'a') goto yy891;
- if (yych == 'o') goto yy892;
- goto yy195;
-yy891:
+ if (yych == 'a') goto yy957;
+ if (yych == 'o') goto yy958;
+ goto yy109;
+yy957:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'n') goto yy895;
- goto yy195;
-yy892:
+ if (yych == 'n') goto yy961;
+ goto yy109;
+yy958:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'r') goto yy195;
- yyaccept = 98;
+ if (yych != 'r') goto yy109;
+ yyaccept = 106;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy894:
-#line 186 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy960:
+#line 196 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_OR_ALT); }
-#line 5986 "strict_cpp_re.inc"
-yy895:
+#line 6386 "strict_cpp_re.inc"
+yy961:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'd') goto yy195;
- yyaccept = 99;
+ if (yych != 'd') goto yy109;
+ yyaccept = 107;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy897:
-#line 184 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy963:
+#line 194 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_AND_ALT); }
-#line 6001 "strict_cpp_re.inc"
-yy898:
+#line 6401 "strict_cpp_re.inc"
+yy964:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 'i') goto yy979;
+ goto yy109;
+yy965:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'd') goto yy906;
- goto yy195;
-yy899:
+ if (yych == 'd') goto yy973;
+ goto yy109;
+yy966:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == 'm') goto yy904;
- goto yy195;
-yy900:
+ if (yych == 'm') goto yy971;
+ goto yy109;
+yy967:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 't') goto yy195;
+ if (yych != 't') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'o') goto yy195;
- yyaccept = 100;
+ if (yych != 'o') goto yy109;
+ yyaccept = 108;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy903:
-#line 48 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy970:
+#line 50 "strict_cpp.re"
     { BOOST_WAVE_RET(T_AUTO); }
-#line 6029 "strict_cpp_re.inc"
-yy904:
- yyaccept = 101;
+#line 6434 "strict_cpp_re.inc"
+yy971:
+ yyaccept = 109;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy905:
-#line 47 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy972:
+#line 49 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ASM); }
-#line 6041 "strict_cpp_re.inc"
-yy906:
- yyaccept = 102;
+#line 6446 "strict_cpp_re.inc"
+yy973:
+ yyaccept = 110;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= 'Z') {
         if (yych <= '>') {
- if (yych <= '/') goto yy907;
- if (yych <= '9') goto yy194;
+ if (yych <= '/') goto yy974;
+ if (yych <= '9') goto yy108;
         } else {
- if (yych <= '?') goto yy197;
- if (yych >= 'A') goto yy194;
+ if (yych <= '?') goto yy111;
+ if (yych >= 'A') goto yy108;
         }
     } else {
         if (yych <= '^') {
- if (yych == '\\') goto yy196;
+ if (yych == '\\') goto yy110;
         } else {
- if (yych <= '_') goto yy908;
- if (yych <= '`') goto yy907;
- if (yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy975;
+ if (yych <= '`') goto yy974;
+ if (yych <= 'z') goto yy108;
         }
     }
-yy907:
-#line 219 "strict_cpp.re"
+yy974:
+#line 229 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ANDAND_ALT); }
-#line 6065 "strict_cpp_re.inc"
-yy908:
+#line 6470 "strict_cpp_re.inc"
+yy975:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'e') goto yy195;
+ if (yych != 'e') goto yy109;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych != 'q') goto yy195;
- yyaccept = 103;
+ if (yych != 'q') goto yy109;
+ yyaccept = 111;
     yych = *(YYMARKER = ++YYCURSOR);
- if (yybm[0+yych] & 4) {
- goto yy194;
+ if (yybm[256+yych] & 32) {
+ goto yy108;
     }
- if (yych == '?') goto yy197;
- if (yych == '\\') goto yy196;
-yy911:
-#line 205 "strict_cpp.re"
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy978:
+#line 215 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ANDASSIGN_ALT); }
-#line 6083 "strict_cpp_re.inc"
-yy912:
+#line 6488 "strict_cpp_re.inc"
+yy979:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'g') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'n') goto yy109;
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 'a') goto yy982;
+ if (yych == 'o') goto yy983;
+ goto yy109;
+yy982:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == 's') goto yy986;
+ goto yy109;
+yy983:
+ yyaccept = 1;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych != 'f') goto yy109;
+ yyaccept = 112;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy985:
+#line 48 "strict_cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_ALIGNOF : T_IDENTIFIER); }
+#line 6520 "strict_cpp_re.inc"
+yy986:
+ yyaccept = 113;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[256+yych] & 32) {
+ goto yy108;
+ }
+ if (yych == '?') goto yy111;
+ if (yych == '\\') goto yy110;
+yy987:
+#line 47 "strict_cpp.re"
+ { BOOST_WAVE_RET(s->act_in_cpp0x_mode ? T_ALIGNAS : T_IDENTIFIER); }
+#line 6532 "strict_cpp_re.inc"
+yy988:
     ++YYCURSOR;
-#line 166 "strict_cpp.re"
+#line 176 "strict_cpp.re"
     {
             if (s->act_in_c99_mode) {
                 --YYCURSOR;
@@ -6092,71 +6541,71 @@
                 BOOST_WAVE_RET(T_DOTSTAR);
             }
         }
-#line 6096 "strict_cpp_re.inc"
-yy914:
+#line 6545 "strict_cpp_re.inc"
+yy990:
     yych = *++YYCURSOR;
- if (yych == '.') goto yy916;
- goto yy98;
-yy915:
+ if (yych == '.') goto yy992;
+ goto yy99;
+yy991:
     yych = *++YYCURSOR;
     goto yy7;
-yy916:
+yy992:
     ++YYCURSOR;
-#line 152 "strict_cpp.re"
+#line 162 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ELLIPSIS); }
-#line 6108 "strict_cpp_re.inc"
-yy918:
+#line 6557 "strict_cpp_re.inc"
+yy994:
     ++YYCURSOR;
-#line 199 "strict_cpp.re"
+#line 209 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DIVIDEASSIGN); }
-#line 6113 "strict_cpp_re.inc"
-yy920:
+#line 6562 "strict_cpp_re.inc"
+yy996:
     ++YYCURSOR;
 #line 44 "strict_cpp.re"
     { goto cppcomment; }
-#line 6118 "strict_cpp_re.inc"
-yy922:
+#line 6567 "strict_cpp_re.inc"
+yy998:
     ++YYCURSOR;
 #line 43 "strict_cpp.re"
     { goto ccomment; }
-#line 6123 "strict_cpp_re.inc"
+#line 6572 "strict_cpp_re.inc"
 }
-#line 308 "strict_cpp.re"
+#line 348 "strict_cpp.re"
 
 
 ccomment:
 
-#line 6130 "strict_cpp_re.inc"
+#line 6579 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
     if (yych <= '\f') {
         if (yych <= 0x08) {
- if (yych <= 0x00) goto yy933;
- goto yy935;
+ if (yych <= 0x00) goto yy1009;
+ goto yy1011;
         } else {
- if (yych == '\n') goto yy928;
- goto yy931;
+ if (yych == '\n') goto yy1004;
+ goto yy1007;
         }
     } else {
         if (yych <= 0x1F) {
- if (yych <= '\r') goto yy930;
- goto yy935;
+ if (yych <= '\r') goto yy1006;
+ goto yy1011;
         } else {
- if (yych != '*') goto yy932;
+ if (yych != '*') goto yy1008;
         }
     }
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '/') goto yy938;
-yy927:
-#line 323 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == '/') goto yy1014;
+yy1003:
+#line 363 "strict_cpp.re"
     { goto ccomment; }
-#line 6156 "strict_cpp_re.inc"
-yy928:
+#line 6605 "strict_cpp_re.inc"
+yy1004:
     ++YYCURSOR;
-yy929:
-#line 315 "strict_cpp.re"
+yy1005:
+#line 355 "strict_cpp.re"
     {
         /*if(cursor == s->eof) BOOST_WAVE_RET(T_EOF);*/
         /*s->tok = cursor; */
@@ -6164,20 +6613,20 @@
         cursor.column = 1;
         goto ccomment;
     }
-#line 6168 "strict_cpp_re.inc"
-yy930:
+#line 6617 "strict_cpp_re.inc"
+yy1006:
     yych = *++YYCURSOR;
- if (yych == '\n') goto yy937;
- goto yy929;
-yy931:
+ if (yych == '\n') goto yy1013;
+ goto yy1005;
+yy1007:
     yych = *++YYCURSOR;
- goto yy927;
-yy932:
+ goto yy1003;
+yy1008:
     yych = *++YYCURSOR;
- goto yy927;
-yy933:
+ goto yy1003;
+yy1009:
     ++YYCURSOR;
-#line 326 "strict_cpp.re"
+#line 366 "strict_cpp.re"
     {
         if(cursor == s->eof)
         {
@@ -6193,49 +6642,49 @@
                 "invalid character: '\\000' in input stream");
         }
     }
-#line 6197 "strict_cpp_re.inc"
-yy935:
+#line 6646 "strict_cpp_re.inc"
+yy1011:
     ++YYCURSOR;
-#line 343 "strict_cpp.re"
+#line 383 "strict_cpp.re"
     {
         // flag the error
         BOOST_WAVE_UPDATE_CURSOR(); // adjust the input cursor
         (*s->error_proc)(s, lexing_exception::generic_lexing_error,
             "invalid character '\\%03o' in input stream", *--YYCURSOR);
     }
-#line 6207 "strict_cpp_re.inc"
-yy937:
+#line 6656 "strict_cpp_re.inc"
+yy1013:
     yych = *++YYCURSOR;
- goto yy929;
-yy938:
+ goto yy1005;
+yy1014:
     ++YYCURSOR;
-#line 312 "strict_cpp.re"
+#line 352 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CCOMMENT); }
-#line 6215 "strict_cpp_re.inc"
+#line 6664 "strict_cpp_re.inc"
 }
-#line 349 "strict_cpp.re"
+#line 389 "strict_cpp.re"
 
 
 cppcomment:
 
-#line 6222 "strict_cpp_re.inc"
+#line 6671 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
     if (yych <= '\n') {
- if (yych <= 0x00) goto yy948;
- if (yych <= 0x08) goto yy950;
- if (yych <= '\t') goto yy945;
- } else {
- if (yych <= '\f') goto yy945;
- if (yych <= '\r') goto yy944;
- if (yych <= 0x1F) goto yy950;
- goto yy947;
+ if (yych <= 0x00) goto yy1024;
+ if (yych <= 0x08) goto yy1026;
+ if (yych <= '\t') goto yy1021;
+ } else {
+ if (yych <= '\f') goto yy1021;
+ if (yych <= '\r') goto yy1020;
+ if (yych <= 0x1F) goto yy1026;
+ goto yy1023;
     }
     ++YYCURSOR;
-yy943:
-#line 354 "strict_cpp.re"
+yy1019:
+#line 394 "strict_cpp.re"
     {
         /*if(cursor == s->eof) BOOST_WAVE_RET(T_EOF); */
         /*s->tok = cursor; */
@@ -6243,23 +6692,23 @@
         cursor.column = 1;
         BOOST_WAVE_RET(T_CPPCOMMENT);
     }
-#line 6247 "strict_cpp_re.inc"
-yy944:
+#line 6696 "strict_cpp_re.inc"
+yy1020:
     yych = *++YYCURSOR;
- if (yych == '\n') goto yy952;
- goto yy943;
-yy945:
+ if (yych == '\n') goto yy1028;
+ goto yy1019;
+yy1021:
     ++YYCURSOR;
-yy946:
-#line 362 "strict_cpp.re"
+yy1022:
+#line 402 "strict_cpp.re"
     { goto cppcomment; }
-#line 6257 "strict_cpp_re.inc"
-yy947:
+#line 6706 "strict_cpp_re.inc"
+yy1023:
     yych = *++YYCURSOR;
- goto yy946;
-yy948:
+ goto yy1022;
+yy1024:
     ++YYCURSOR;
-#line 365 "strict_cpp.re"
+#line 405 "strict_cpp.re"
     {
         if (s->eof && cursor != s->eof)
         {
@@ -6278,23 +6727,23 @@
         }
         BOOST_WAVE_RET(T_CPPCOMMENT);
     }
-#line 6282 "strict_cpp_re.inc"
-yy950:
+#line 6731 "strict_cpp_re.inc"
+yy1026:
     ++YYCURSOR;
-#line 385 "strict_cpp.re"
+#line 425 "strict_cpp.re"
     {
         // flag the error
         BOOST_WAVE_UPDATE_CURSOR(); // adjust the input cursor
         (*s->error_proc)(s, lexing_exception::generic_lexing_error,
             "invalid character '\\%03o' in input stream", *--YYCURSOR);
     }
-#line 6292 "strict_cpp_re.inc"
-yy952:
+#line 6741 "strict_cpp_re.inc"
+yy1028:
     ++YYCURSOR;
     yych = *YYCURSOR;
- goto yy943;
+ goto yy1019;
 }
-#line 391 "strict_cpp.re"
+#line 431 "strict_cpp.re"
 
 
 /* this subscanner is called whenever a pp_number has been started */
@@ -6306,7 +6755,7 @@
 
     if (s->detect_pp_numbers) {
     
-#line 6310 "strict_cpp_re.inc"
+#line 6759 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
     static const unsigned char yybm[] = {
@@ -6345,245 +6794,245 @@
     };
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if (yych == '.') goto yy956;
- if (yych <= '/') goto yy955;
- if (yych <= '9') goto yy957;
-yy955:
+ if (yych == '.') goto yy1032;
+ if (yych <= '/') goto yy1031;
+ if (yych <= '9') goto yy1033;
+yy1031:
     YYCURSOR = YYMARKER;
- goto yy959;
-yy956:
+ goto yy1035;
+yy1032:
     yych = *++YYCURSOR;
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
-yy957:
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
+yy1033:
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 64) {
- goto yy957;
+ goto yy1033;
     }
     if (yych <= 'Z') {
- if (yych == '?') goto yy963;
- if (yych >= 'A') goto yy960;
+ if (yych == '?') goto yy1039;
+ if (yych >= 'A') goto yy1036;
     } else {
         if (yych <= '\\') {
- if (yych >= '\\') goto yy962;
+ if (yych >= '\\') goto yy1038;
         } else {
- if (yych == 'e') goto yy960;
+ if (yych == 'e') goto yy1036;
         }
     }
-yy959:
-#line 403 "strict_cpp.re"
+yy1035:
+#line 443 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_NUMBER); }
-#line 6379 "strict_cpp_re.inc"
-yy960:
+#line 6828 "strict_cpp_re.inc"
+yy1036:
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy960;
+ goto yy1036;
     }
     if (yych <= '?') {
         if (yych <= '.') {
- if (yych == '+') goto yy957;
- if (yych <= ',') goto yy959;
- goto yy957;
- } else {
- if (yych <= '/') goto yy959;
- if (yych <= '9') goto yy957;
- if (yych <= '>') goto yy959;
- goto yy963;
+ if (yych == '+') goto yy1033;
+ if (yych <= ',') goto yy1035;
+ goto yy1033;
+ } else {
+ if (yych <= '/') goto yy1035;
+ if (yych <= '9') goto yy1033;
+ if (yych <= '>') goto yy1035;
+ goto yy1039;
         }
     } else {
         if (yych <= '\\') {
- if (yych <= '@') goto yy959;
- if (yych <= 'Z') goto yy957;
- if (yych <= '[') goto yy959;
+ if (yych <= '@') goto yy1035;
+ if (yych <= 'Z') goto yy1033;
+ if (yych <= '[') goto yy1035;
         } else {
             if (yych <= '_') {
- if (yych <= '^') goto yy959;
- goto yy957;
+ if (yych <= '^') goto yy1035;
+ goto yy1033;
             } else {
- if (yych <= '`') goto yy959;
- if (yych <= 'z') goto yy957;
- goto yy959;
+ if (yych <= '`') goto yy1035;
+ if (yych <= 'z') goto yy1033;
+ goto yy1035;
             }
         }
     }
-yy962:
+yy1038:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych == 'U') goto yy966;
- if (yych == 'u') goto yy965;
- goto yy955;
-yy963:
+ if (yych == 'U') goto yy1042;
+ if (yych == 'u') goto yy1041;
+ goto yy1031;
+yy1039:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych != '?') goto yy955;
+ if (yych != '?') goto yy1031;
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych == '/') goto yy962;
- goto yy955;
-yy965:
+ if (yych == '/') goto yy1038;
+ goto yy1031;
+yy1041:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych <= '9') goto yy974;
- goto yy955;
- } else {
- if (yych <= 'F') goto yy974;
- if (yych <= '`') goto yy955;
- if (yych <= 'f') goto yy974;
- goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych <= '9') goto yy1050;
+ goto yy1031;
+ } else {
+ if (yych <= 'F') goto yy1050;
+ if (yych <= '`') goto yy1031;
+ if (yych <= 'f') goto yy1050;
+ goto yy1031;
     }
-yy966:
+yy1042:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy967;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1043;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy967:
+yy1043:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy968;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1044;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy968:
+yy1044:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy969;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1045;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy969:
+yy1045:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy970;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1046;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy970:
+yy1046:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy971;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1047;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy971:
+yy1047:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy972;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1048;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy972:
+yy1048:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy973;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1049;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy973:
+yy1049:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych <= '9') goto yy957;
- goto yy955;
- } else {
- if (yych <= 'F') goto yy957;
- if (yych <= '`') goto yy955;
- if (yych <= 'f') goto yy957;
- goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych <= '9') goto yy1033;
+ goto yy1031;
+ } else {
+ if (yych <= 'F') goto yy1033;
+ if (yych <= '`') goto yy1031;
+ if (yych <= 'f') goto yy1033;
+ goto yy1031;
     }
-yy974:
+yy1050:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy975;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1051;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy975:
+yy1051:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych >= ':') goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy976;
- if (yych <= '`') goto yy955;
- if (yych >= 'g') goto yy955;
+ if (yych <= 'F') goto yy1052;
+ if (yych <= '`') goto yy1031;
+ if (yych >= 'g') goto yy1031;
     }
-yy976:
+yy1052:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy955;
- if (yych <= '9') goto yy957;
- goto yy955;
+ if (yych <= '/') goto yy1031;
+ if (yych <= '9') goto yy1033;
+ goto yy1031;
     } else {
- if (yych <= 'F') goto yy957;
- if (yych <= '`') goto yy955;
- if (yych <= 'f') goto yy957;
- goto yy955;
+ if (yych <= 'F') goto yy1033;
+ if (yych <= '`') goto yy1031;
+ if (yych <= 'f') goto yy1033;
+ goto yy1031;
     }
 }
-#line 404 "strict_cpp.re"
+#line 444 "strict_cpp.re"
 
     }
     else {
     
-#line 6587 "strict_cpp_re.inc"
+#line 7036 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
     unsigned int yyaccept = 0;
@@ -6624,371 +7073,1945 @@
     if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
     yych = *YYCURSOR;
     if (yych <= '/') {
- if (yych == '.') goto yy984;
+ if (yych == '.') goto yy1060;
     } else {
- if (yych <= '0') goto yy980;
- if (yych <= '9') goto yy982;
+ if (yych <= '0') goto yy1056;
+ if (yych <= '9') goto yy1058;
     }
-yy979:
+yy1055:
     YYCURSOR = YYMARKER;
     if (yyaccept <= 0) {
- goto yy981;
+ goto yy1057;
     } else {
- goto yy987;
+ goto yy1063;
     }
-yy980:
+yy1056:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yybm[0+yych] & 64) {
- goto yy999;
+ goto yy1075;
     }
     if (yych <= 'E') {
         if (yych <= '/') {
- if (yych == '.') goto yy985;
+ if (yych == '.') goto yy1061;
         } else {
- if (yych <= '9') goto yy1002;
- if (yych >= 'E') goto yy995;
+ if (yych <= '9') goto yy1078;
+ if (yych >= 'E') goto yy1071;
         }
     } else {
         if (yych <= 'd') {
- if (yych == 'X') goto yy1001;
+ if (yych == 'X') goto yy1077;
         } else {
- if (yych <= 'e') goto yy995;
- if (yych == 'x') goto yy1001;
+ if (yych <= 'e') goto yy1071;
+ if (yych == 'x') goto yy1077;
         }
     }
-yy981:
-#line 411 "strict_cpp.re"
+yy1057:
+#line 451 "strict_cpp.re"
     { goto integer_suffix; }
-#line 6664 "strict_cpp_re.inc"
-yy982:
+#line 7113 "strict_cpp_re.inc"
+yy1058:
     yyaccept = 0;
     YYMARKER = ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 32) {
- goto yy982;
+ goto yy1058;
     }
     if (yych <= 'D') {
- if (yych == '.') goto yy985;
- goto yy981;
+ if (yych == '.') goto yy1061;
+ goto yy1057;
     } else {
- if (yych <= 'E') goto yy995;
- if (yych == 'e') goto yy995;
- goto yy981;
- }
-yy984:
- yych = *++YYCURSOR;
- if (yych <= '/') goto yy979;
- if (yych >= ':') goto yy979;
-yy985:
+ if (yych <= 'E') goto yy1071;
+ if (yych == 'e') goto yy1071;
+ goto yy1057;
+ }
+yy1060:
+ yych = *++YYCURSOR;
+ if (yych <= '/') goto yy1055;
+ if (yych >= ':') goto yy1055;
+yy1061:
     yyaccept = 1;
     YYMARKER = ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yych <= 'K') {
         if (yych <= 'D') {
- if (yych <= '/') goto yy987;
- if (yych <= '9') goto yy985;
+ if (yych <= '/') goto yy1063;
+ if (yych <= '9') goto yy1061;
         } else {
- if (yych <= 'E') goto yy988;
- if (yych <= 'F') goto yy989;
+ if (yych <= 'E') goto yy1064;
+ if (yych <= 'F') goto yy1065;
         }
     } else {
         if (yych <= 'e') {
- if (yych <= 'L') goto yy990;
- if (yych >= 'e') goto yy988;
+ if (yych <= 'L') goto yy1066;
+ if (yych >= 'e') goto yy1064;
         } else {
- if (yych <= 'f') goto yy989;
- if (yych == 'l') goto yy990;
+ if (yych <= 'f') goto yy1065;
+ if (yych == 'l') goto yy1066;
         }
     }
-yy987:
-#line 409 "strict_cpp.re"
+yy1063:
+#line 449 "strict_cpp.re"
     { BOOST_WAVE_RET(T_FLOATLIT); }
-#line 6710 "strict_cpp_re.inc"
-yy988:
+#line 7159 "strict_cpp_re.inc"
+yy1064:
     yych = *++YYCURSOR;
     if (yych <= ',') {
- if (yych == '+') goto yy992;
- goto yy979;
+ if (yych == '+') goto yy1068;
+ goto yy1055;
     } else {
- if (yych <= '-') goto yy992;
- if (yych <= '/') goto yy979;
- if (yych <= '9') goto yy993;
- goto yy979;
- }
-yy989:
- yych = *++YYCURSOR;
- if (yych == 'L') goto yy991;
- if (yych == 'l') goto yy991;
- goto yy987;
-yy990:
- yych = *++YYCURSOR;
- if (yych == 'F') goto yy991;
- if (yych != 'f') goto yy987;
-yy991:
- yych = *++YYCURSOR;
- goto yy987;
-yy992:
- yych = *++YYCURSOR;
- if (yych <= '/') goto yy979;
- if (yych >= ':') goto yy979;
-yy993:
+ if (yych <= '-') goto yy1068;
+ if (yych <= '/') goto yy1055;
+ if (yych <= '9') goto yy1069;
+ goto yy1055;
+ }
+yy1065:
+ yych = *++YYCURSOR;
+ if (yych == 'L') goto yy1067;
+ if (yych == 'l') goto yy1067;
+ goto yy1063;
+yy1066:
+ yych = *++YYCURSOR;
+ if (yych == 'F') goto yy1067;
+ if (yych != 'f') goto yy1063;
+yy1067:
+ yych = *++YYCURSOR;
+ goto yy1063;
+yy1068:
+ yych = *++YYCURSOR;
+ if (yych <= '/') goto yy1055;
+ if (yych >= ':') goto yy1055;
+yy1069:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
     if (yych <= 'K') {
         if (yych <= '9') {
- if (yych <= '/') goto yy987;
- goto yy993;
+ if (yych <= '/') goto yy1063;
+ goto yy1069;
         } else {
- if (yych == 'F') goto yy989;
- goto yy987;
+ if (yych == 'F') goto yy1065;
+ goto yy1063;
         }
     } else {
         if (yych <= 'f') {
- if (yych <= 'L') goto yy990;
- if (yych <= 'e') goto yy987;
- goto yy989;
+ if (yych <= 'L') goto yy1066;
+ if (yych <= 'e') goto yy1063;
+ goto yy1065;
         } else {
- if (yych == 'l') goto yy990;
- goto yy987;
+ if (yych == 'l') goto yy1066;
+ goto yy1063;
         }
     }
-yy995:
+yy1071:
     yych = *++YYCURSOR;
     if (yych <= ',') {
- if (yych != '+') goto yy979;
+ if (yych != '+') goto yy1055;
     } else {
- if (yych <= '-') goto yy996;
- if (yych <= '/') goto yy979;
- if (yych <= '9') goto yy997;
- goto yy979;
- }
-yy996:
- yych = *++YYCURSOR;
- if (yych <= '/') goto yy979;
- if (yych >= ':') goto yy979;
-yy997:
+ if (yych <= '-') goto yy1072;
+ if (yych <= '/') goto yy1055;
+ if (yych <= '9') goto yy1073;
+ goto yy1055;
+ }
+yy1072:
+ yych = *++YYCURSOR;
+ if (yych <= '/') goto yy1055;
+ if (yych >= ':') goto yy1055;
+yy1073:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
     if (yych <= 'K') {
         if (yych <= '9') {
- if (yych <= '/') goto yy987;
- goto yy997;
+ if (yych <= '/') goto yy1063;
+ goto yy1073;
         } else {
- if (yych == 'F') goto yy989;
- goto yy987;
+ if (yych == 'F') goto yy1065;
+ goto yy1063;
         }
     } else {
         if (yych <= 'f') {
- if (yych <= 'L') goto yy990;
- if (yych <= 'e') goto yy987;
- goto yy989;
+ if (yych <= 'L') goto yy1066;
+ if (yych <= 'e') goto yy1063;
+ goto yy1065;
         } else {
- if (yych == 'l') goto yy990;
- goto yy987;
+ if (yych == 'l') goto yy1066;
+ goto yy1063;
         }
     }
-yy999:
+yy1075:
     yyaccept = 0;
     YYMARKER = ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 64) {
- goto yy999;
+ goto yy1075;
     }
     if (yych <= '9') {
- if (yych == '.') goto yy985;
- if (yych <= '/') goto yy981;
- goto yy1002;
+ if (yych == '.') goto yy1061;
+ if (yych <= '/') goto yy1057;
+ goto yy1078;
     } else {
         if (yych <= 'E') {
- if (yych <= 'D') goto yy981;
- goto yy995;
+ if (yych <= 'D') goto yy1057;
+ goto yy1071;
         } else {
- if (yych == 'e') goto yy995;
- goto yy981;
+ if (yych == 'e') goto yy1071;
+ goto yy1057;
         }
     }
-yy1001:
+yy1077:
     yych = *++YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1004;
+ goto yy1080;
     }
- goto yy979;
-yy1002:
+ goto yy1055;
+yy1078:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yych <= '9') {
- if (yych == '.') goto yy985;
- if (yych <= '/') goto yy979;
- goto yy1002;
+ if (yych == '.') goto yy1061;
+ if (yych <= '/') goto yy1055;
+ goto yy1078;
     } else {
         if (yych <= 'E') {
- if (yych <= 'D') goto yy979;
- goto yy995;
+ if (yych <= 'D') goto yy1055;
+ goto yy1071;
         } else {
- if (yych == 'e') goto yy995;
- goto yy979;
+ if (yych == 'e') goto yy1071;
+ goto yy1055;
         }
     }
-yy1004:
+yy1080:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1004;
+ goto yy1080;
     }
- goto yy981;
+ goto yy1057;
 }
-#line 412 "strict_cpp.re"
+#line 452 "strict_cpp.re"
 
     }
 }
 
-/* this subscanner is called, whenever a Integer was recognized */
+/* this subscanner is called, whenever an Integer was recognized */
 integer_suffix:
 {
     if (s->enable_ms_extensions) {
     
-#line 6859 "strict_cpp_re.inc"
+#line 7308 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *(YYMARKER = YYCURSOR);
     if (yych <= 'h') {
         if (yych <= 'L') {
- if (yych >= 'L') goto yy1010;
+ if (yych >= 'L') goto yy1086;
         } else {
- if (yych == 'U') goto yy1009;
+ if (yych == 'U') goto yy1085;
         }
     } else {
         if (yych <= 'l') {
- if (yych <= 'i') goto yy1011;
- if (yych >= 'l') goto yy1010;
+ if (yych <= 'i') goto yy1087;
+ if (yych >= 'l') goto yy1086;
         } else {
- if (yych == 'u') goto yy1009;
+ if (yych == 'u') goto yy1085;
         }
     }
-yy1008:
-#line 425 "strict_cpp.re"
+yy1084:
+#line 465 "strict_cpp.re"
     { BOOST_WAVE_RET(T_INTLIT); }
-#line 6881 "strict_cpp_re.inc"
-yy1009:
+#line 7330 "strict_cpp_re.inc"
+yy1085:
     yych = *++YYCURSOR;
- if (yych == 'L') goto yy1018;
- if (yych == 'l') goto yy1018;
- goto yy1008;
-yy1010:
+ if (yych == 'L') goto yy1094;
+ if (yych == 'l') goto yy1094;
+ goto yy1084;
+yy1086:
     yych = *++YYCURSOR;
     if (yych <= 'U') {
- if (yych == 'L') goto yy1017;
- if (yych <= 'T') goto yy1008;
- goto yy1016;
+ if (yych == 'L') goto yy1093;
+ if (yych <= 'T') goto yy1084;
+ goto yy1092;
     } else {
         if (yych <= 'l') {
- if (yych <= 'k') goto yy1008;
- goto yy1017;
+ if (yych <= 'k') goto yy1084;
+ goto yy1093;
         } else {
- if (yych == 'u') goto yy1016;
- goto yy1008;
+ if (yych == 'u') goto yy1092;
+ goto yy1084;
         }
     }
-yy1011:
+yy1087:
     yych = *++YYCURSOR;
- if (yych == '6') goto yy1013;
-yy1012:
+ if (yych == '6') goto yy1089;
+yy1088:
     YYCURSOR = YYMARKER;
- goto yy1008;
-yy1013:
+ goto yy1084;
+yy1089:
     yych = *++YYCURSOR;
- if (yych != '4') goto yy1012;
-yy1014:
+ if (yych != '4') goto yy1088;
+yy1090:
     ++YYCURSOR;
-yy1015:
-#line 422 "strict_cpp.re"
+yy1091:
+#line 462 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LONGINTLIT); }
-#line 6916 "strict_cpp_re.inc"
-yy1016:
+#line 7365 "strict_cpp_re.inc"
+yy1092:
     yych = *++YYCURSOR;
- goto yy1008;
-yy1017:
+ goto yy1084;
+yy1093:
     yych = *++YYCURSOR;
- if (yych == 'U') goto yy1014;
- if (yych == 'u') goto yy1014;
- goto yy1015;
-yy1018:
- ++YYCURSOR;
- if ((yych = *YYCURSOR) == 'L') goto yy1014;
- if (yych == 'l') goto yy1014;
- goto yy1008;
+ if (yych == 'U') goto yy1090;
+ if (yych == 'u') goto yy1090;
+ goto yy1091;
+yy1094:
+ ++YYCURSOR;
+ if ((yych = *YYCURSOR) == 'L') goto yy1090;
+ if (yych == 'l') goto yy1090;
+ goto yy1084;
 }
-#line 426 "strict_cpp.re"
+#line 466 "strict_cpp.re"
 
     }
     else {
     
-#line 6936 "strict_cpp_re.inc"
+#line 7385 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yych <= 'U') {
- if (yych == 'L') goto yy1023;
- if (yych >= 'U') goto yy1022;
+ if (yych == 'L') goto yy1099;
+ if (yych >= 'U') goto yy1098;
     } else {
         if (yych <= 'l') {
- if (yych >= 'l') goto yy1023;
+ if (yych >= 'l') goto yy1099;
         } else {
- if (yych == 'u') goto yy1022;
+ if (yych == 'u') goto yy1098;
         }
     }
-yy1021:
-#line 434 "strict_cpp.re"
+yy1097:
+#line 474 "strict_cpp.re"
     { BOOST_WAVE_RET(T_INTLIT); }
-#line 6954 "strict_cpp_re.inc"
-yy1022:
+#line 7403 "strict_cpp_re.inc"
+yy1098:
     yych = *++YYCURSOR;
- if (yych == 'L') goto yy1028;
- if (yych == 'l') goto yy1028;
- goto yy1021;
-yy1023:
+ if (yych == 'L') goto yy1104;
+ if (yych == 'l') goto yy1104;
+ goto yy1097;
+yy1099:
     yych = *++YYCURSOR;
     if (yych <= 'U') {
- if (yych == 'L') goto yy1025;
- if (yych <= 'T') goto yy1021;
+ if (yych == 'L') goto yy1101;
+ if (yych <= 'T') goto yy1097;
     } else {
         if (yych <= 'l') {
- if (yych <= 'k') goto yy1021;
- goto yy1025;
+ if (yych <= 'k') goto yy1097;
+ goto yy1101;
         } else {
- if (yych != 'u') goto yy1021;
+ if (yych != 'u') goto yy1097;
         }
     }
     yych = *++YYCURSOR;
- goto yy1021;
-yy1025:
+ goto yy1097;
+yy1101:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == 'U') goto yy1027;
- if (yych == 'u') goto yy1027;
-yy1026:
-#line 431 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == 'U') goto yy1103;
+ if (yych == 'u') goto yy1103;
+yy1102:
+#line 471 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LONGINTLIT); }
-#line 6982 "strict_cpp_re.inc"
-yy1027:
+#line 7431 "strict_cpp_re.inc"
+yy1103:
     yych = *++YYCURSOR;
- goto yy1026;
-yy1028:
+ goto yy1102;
+yy1104:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == 'L') goto yy1027;
- if (yych == 'l') goto yy1027;
- goto yy1021;
+ if ((yych = *YYCURSOR) == 'L') goto yy1103;
+ if (yych == 'l') goto yy1103;
+ goto yy1097;
 }
-#line 435 "strict_cpp.re"
+#line 475 "strict_cpp.re"
 
     }
 }
+
+/* this subscanner is invoked for C++0x extended character literals */
+extcharlit:
+{
+
+#line 7450 "strict_cpp_re.inc"
+{
+ YYCTYPE yych;
+ static const unsigned char yybm[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 0, 0, 0, 0, 0, 0,
+ 0, 128, 128, 128, 128, 128, 128, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 128, 128, 128, 128, 128, 128, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ };
+ if ((YYLIMIT - YYCURSOR) < 13) YYFILL(13);
+ yych = *YYCURSOR;
+ if (yych <= 0x1F) {
+ if (yych <= '\n') {
+ if (yych <= 0x08) goto yy1107;
+ if (yych <= '\t') goto yy1108;
+ goto yy1112;
+ } else {
+ if (yych <= '\f') goto yy1108;
+ if (yych <= '\r') goto yy1112;
+ }
+ } else {
+ if (yych <= '>') {
+ if (yych == '\'') goto yy1112;
+ goto yy1108;
+ } else {
+ if (yych <= '?') goto yy1110;
+ if (yych == '\\') goto yy1111;
+ goto yy1108;
+ }
+ }
+yy1107:
+ YYCURSOR = YYMARKER;
+ goto yy1109;
+yy1108:
+ ++YYCURSOR;
+ if ((yych = *YYCURSOR) == '\'') goto yy1120;
+yy1109:
+#line 487 "strict_cpp.re"
+ { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
+#line 7517 "strict_cpp_re.inc"
+yy1110:
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '\'') goto yy1120;
+ if (yych == '?') goto yy1135;
+ goto yy1109;
+yy1111:
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy1115;
+ goto yy1109;
+ } else {
+ if (yych <= '\'') goto yy1115;
+ if (yych <= '/') goto yy1109;
+ goto yy1118;
+ }
+ } else {
+ if (yych <= 'T') {
+ if (yych == '?') goto yy1116;
+ goto yy1109;
+ } else {
+ if (yych <= 'U') goto yy1114;
+ if (yych == '\\') goto yy1115;
+ goto yy1109;
+ }
+ }
+ } else {
+ if (yych <= 'r') {
+ if (yych <= 'f') {
+ if (yych <= 'b') goto yy1115;
+ if (yych <= 'e') goto yy1109;
+ goto yy1115;
+ } else {
+ if (yych == 'n') goto yy1115;
+ if (yych <= 'q') goto yy1109;
+ goto yy1115;
+ }
+ } else {
+ if (yych <= 'u') {
+ if (yych <= 's') goto yy1109;
+ if (yych <= 't') goto yy1115;
+ goto yy1113;
+ } else {
+ if (yych <= 'v') goto yy1115;
+ if (yych == 'x') goto yy1117;
+ goto yy1109;
+ }
+ }
+ }
+yy1112:
+ yych = *++YYCURSOR;
+ goto yy1109;
+yy1113:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1132;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1132;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1132;
+ goto yy1107;
+ }
+yy1114:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1125;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1125;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1125;
+ goto yy1107;
+ }
+yy1115:
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy1120;
+ goto yy1107;
+yy1116:
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy1120;
+ if (yych == '?') goto yy1124;
+ goto yy1107;
+yy1117:
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy1107;
+ goto yy1123;
+yy1118:
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy1120;
+ if (yych <= '/') goto yy1107;
+ if (yych >= '8') goto yy1107;
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy1120;
+ if (yych <= '/') goto yy1107;
+ if (yych <= '7') goto yy1115;
+ goto yy1107;
+yy1120:
+ ++YYCURSOR;
+#line 484 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_CHARLIT); }
+#line 7622 "strict_cpp_re.inc"
+yy1122:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+yy1123:
+ if (yybm[0+yych] & 128) {
+ goto yy1122;
+ }
+ if (yych == '\'') goto yy1120;
+ goto yy1107;
+yy1124:
+ yych = *++YYCURSOR;
+ if (yych == '/') goto yy1115;
+ goto yy1107;
+yy1125:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1126;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1126:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1127;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1127:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1128;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1128:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1129;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1129:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1130;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1130:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1131;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1131:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1115;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1115;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1115;
+ goto yy1107;
+ }
+yy1132:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1133;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1133:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1134;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
+ }
+yy1134:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1115;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1115;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1115;
+ goto yy1107;
+ }
+yy1135:
+ yych = *++YYCURSOR;
+ if (yych != '/') goto yy1107;
+ ++YYCURSOR;
+ if ((yych = *YYCURSOR) <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy1115;
+ goto yy1107;
+ } else {
+ if (yych <= '\'') goto yy1115;
+ if (yych <= '/') goto yy1107;
+ goto yy1118;
+ }
+ } else {
+ if (yych <= 'T') {
+ if (yych == '?') goto yy1116;
+ goto yy1107;
+ } else {
+ if (yych <= 'U') goto yy1114;
+ if (yych == '\\') goto yy1115;
+ goto yy1107;
+ }
+ }
+ } else {
+ if (yych <= 'r') {
+ if (yych <= 'f') {
+ if (yych <= 'b') goto yy1115;
+ if (yych <= 'e') goto yy1107;
+ goto yy1115;
+ } else {
+ if (yych == 'n') goto yy1115;
+ if (yych <= 'q') goto yy1107;
+ goto yy1115;
+ }
+ } else {
+ if (yych <= 'u') {
+ if (yych <= 's') goto yy1107;
+ if (yych <= 't') goto yy1115;
+ goto yy1113;
+ } else {
+ if (yych <= 'v') goto yy1115;
+ if (yych == 'x') goto yy1117;
+ goto yy1107;
+ }
+ }
+ }
+}
+#line 488 "strict_cpp.re"
+
+}
+
+/* this subscanner is invoked for C++0x extended character string literals */
+extstringlit:
+{
+
+#line 7797 "strict_cpp_re.inc"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept = 0;
+ static const unsigned char yybm[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 16, 0, 16, 16, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 16, 16, 0, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 144, 144, 144, 144, 144, 144, 144, 144,
+ 144, 144, 16, 16, 16, 16, 16, 32,
+ 16, 144, 144, 144, 144, 144, 144, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 64, 16, 16, 16,
+ 16, 144, 144, 144, 144, 144, 144, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ 16, 16, 16, 16, 16, 16, 16, 16,
+ };
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ yych = *YYCURSOR;
+ if (yych <= 0x1F) {
+ if (yych <= '\n') {
+ if (yych <= 0x08) goto yy1139;
+ if (yych <= '\t') goto yy1140;
+ goto yy1146;
+ } else {
+ if (yych <= '\f') goto yy1140;
+ if (yych <= '\r') goto yy1146;
+ }
+ } else {
+ if (yych <= '>') {
+ if (yych == '"') goto yy1144;
+ goto yy1140;
+ } else {
+ if (yych <= '?') goto yy1142;
+ if (yych == '\\') goto yy1143;
+ goto yy1140;
+ }
+ }
+yy1139:
+ YYCURSOR = YYMARKER;
+ if (yyaccept <= 0) {
+ goto yy1141;
+ } else {
+ goto yy1145;
+ }
+yy1140:
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy1150;
+ } else {
+ if (yych <= '\f') goto yy1150;
+ if (yych >= ' ') goto yy1150;
+ }
+yy1141:
+#line 499 "strict_cpp.re"
+ { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
+#line 7875 "strict_cpp_re.inc"
+yy1142:
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yybm[0+yych] & 32) {
+ goto yy1158;
+ }
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy1150;
+ goto yy1141;
+ } else {
+ if (yych <= '\f') goto yy1150;
+ if (yych <= 0x1F) goto yy1141;
+ goto yy1150;
+ }
+yy1143:
+ yyaccept = 0;
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy1149;
+ goto yy1141;
+ } else {
+ if (yych <= '\'') goto yy1149;
+ if (yych <= '/') goto yy1141;
+ goto yy1153;
+ }
+ } else {
+ if (yych <= 'T') {
+ if (yych == '?') goto yy1151;
+ goto yy1141;
+ } else {
+ if (yych <= 'U') goto yy1148;
+ if (yych == '\\') goto yy1149;
+ goto yy1141;
+ }
+ }
+ } else {
+ if (yych <= 'r') {
+ if (yych <= 'f') {
+ if (yych <= 'b') goto yy1149;
+ if (yych <= 'e') goto yy1141;
+ goto yy1149;
+ } else {
+ if (yych == 'n') goto yy1149;
+ if (yych <= 'q') goto yy1141;
+ goto yy1149;
+ }
+ } else {
+ if (yych <= 'u') {
+ if (yych <= 's') goto yy1141;
+ if (yych <= 't') goto yy1149;
+ goto yy1147;
+ } else {
+ if (yych <= 'v') goto yy1149;
+ if (yych == 'x') goto yy1152;
+ goto yy1141;
+ }
+ }
+ }
+yy1144:
+ ++YYCURSOR;
+yy1145:
+#line 496 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_STRINGLIT); }
+#line 7941 "strict_cpp_re.inc"
+yy1146:
+ yych = *++YYCURSOR;
+ goto yy1141;
+yy1147:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1187;
+ goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1187;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1187;
+ goto yy1139;
+ }
+yy1148:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1180;
+ goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1180;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1180;
+ goto yy1139;
+ }
+yy1149:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+yy1150:
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1151:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1179;
+ goto yy1157;
+yy1152:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 128) {
+ goto yy1166;
+ }
+ goto yy1139;
+yy1153:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '"') {
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ if (yych <= '!') goto yy1149;
+ goto yy1155;
+ }
+ } else {
+ if (yych <= '>') {
+ if (yych <= '/') goto yy1149;
+ if (yych >= '8') goto yy1149;
+ } else {
+ if (yych <= '?') goto yy1156;
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1155:
+ yych = *++YYCURSOR;
+ goto yy1145;
+yy1156:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1158;
+yy1157:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= '\'') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ goto yy1153;
+ }
+ } else {
+ if (yych <= 'T') {
+ if (yych == '?') goto yy1151;
+ goto yy1139;
+ } else {
+ if (yych <= 'U') goto yy1148;
+ if (yych == '\\') goto yy1149;
+ goto yy1139;
+ }
+ }
+ } else {
+ if (yych <= 'r') {
+ if (yych <= 'f') {
+ if (yych <= 'b') goto yy1149;
+ if (yych <= 'e') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych == 'n') goto yy1149;
+ if (yych <= 'q') goto yy1139;
+ goto yy1149;
+ }
+ } else {
+ if (yych <= 'u') {
+ if (yych <= 's') goto yy1139;
+ if (yych <= 't') goto yy1149;
+ goto yy1147;
+ } else {
+ if (yych <= 'v') goto yy1149;
+ if (yych == 'x') goto yy1152;
+ goto yy1139;
+ }
+ }
+ }
+yy1158:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 32) {
+ goto yy1158;
+ }
+ if (yych <= '!') {
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ }
+ } else {
+ if (yych <= '/') {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '.') goto yy1149;
+ } else {
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
+ }
+ }
+yy1160:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 64) {
+ goto yy1160;
+ }
+ if (yych <= '7') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1164;
+ if (yych <= '/') goto yy1149;
+ goto yy1153;
+ }
+ }
+ } else {
+ if (yych <= 'U') {
+ if (yych == '?') goto yy1165;
+ if (yych <= 'T') goto yy1149;
+ goto yy1163;
+ } else {
+ if (yych <= 'u') {
+ if (yych <= 't') goto yy1149;
+ } else {
+ if (yych == 'x') goto yy1166;
+ goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ goto yy1176;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ goto yy1176;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych <= 'f') goto yy1176;
+ goto yy1149;
+ }
+ }
+ }
+yy1163:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ goto yy1169;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ goto yy1169;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych <= 'f') goto yy1169;
+ goto yy1149;
+ }
+ }
+ }
+yy1164:
+ yyaccept = 1;
+ YYMARKER = ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1145;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1165:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1168;
+ goto yy1157;
+yy1166:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 128) {
+ goto yy1166;
+ }
+ if (yych <= '!') {
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ }
+ } else {
+ if (yych <= '?') {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '>') goto yy1149;
+ goto yy1156;
+ } else {
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
+ }
+ }
+yy1168:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 32) {
+ goto yy1158;
+ }
+ if (yych <= '!') {
+ if (yych <= '\n') {
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ }
+ } else {
+ if (yych <= '/') {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '.') goto yy1149;
+ goto yy1160;
+ } else {
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
+ }
+ }
+yy1169:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1176:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '9') {
+ if (yych <= '\f') {
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ }
+ }
+ } else {
+ if (yych <= 'F') {
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ } else {
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
+ } else {
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
+ }
+ }
+ }
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1179:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 16) {
+ goto yy1149;
+ }
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1158;
+ goto yy1157;
+yy1180:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1181;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1181:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1182;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1182:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1183;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1183:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1184;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1184:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1185;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1185:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1186;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1186:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1149;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1149;
+ goto yy1139;
+ }
+yy1187:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1188;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1188:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1189;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
+ }
+yy1189:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1149;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1149;
+ goto yy1139;
+ }
+}
+#line 500 "strict_cpp.re"
+
+}
+
+extrawstringlit:
+{
+
+#line 8716 "strict_cpp_re.inc"
+{
+ YYCTYPE yych;
+ static const unsigned char yybm[] = {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 0, 0, 0, 0, 0, 0,
+ 0, 128, 128, 128, 128, 128, 128, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 128, 128, 128, 128, 128, 128, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ };
+ if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
+ yych = *YYCURSOR;
+ if (yych <= 0x1F) {
+ if (yych <= '\n') {
+ if (yych <= 0x08) goto yy1192;
+ if (yych <= '\t') goto yy1193;
+ goto yy1197;
+ } else {
+ if (yych <= '\f') goto yy1193;
+ if (yych <= '\r') goto yy1199;
+ }
+ } else {
+ if (yych <= '>') {
+ if (yych == '"') goto yy1200;
+ goto yy1193;
+ } else {
+ if (yych <= '?') goto yy1195;
+ if (yych == '\\') goto yy1196;
+ goto yy1193;
+ }
+ }
+yy1192:
+ YYCURSOR = YYMARKER;
+ goto yy1194;
+yy1193:
+ ++YYCURSOR;
+yy1194:
+#line 507 "strict_cpp.re"
+ {
+ goto extrawstringlit;
+ }
+#line 8784 "strict_cpp_re.inc"
+yy1195:
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '?') goto yy1221;
+ goto yy1194;
+yy1196:
+ yych = *++YYCURSOR;
+ if (yych <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy1193;
+ goto yy1192;
+ } else {
+ if (yych <= '\'') goto yy1193;
+ if (yych <= '/') goto yy1192;
+ goto yy1206;
+ }
+ } else {
+ if (yych <= 'T') {
+ if (yych == '?') goto yy1204;
+ goto yy1192;
+ } else {
+ if (yych <= 'U') goto yy1203;
+ if (yych == '\\') goto yy1193;
+ goto yy1192;
+ }
+ }
+ } else {
+ if (yych <= 'r') {
+ if (yych <= 'f') {
+ if (yych <= 'b') goto yy1193;
+ if (yych <= 'e') goto yy1192;
+ goto yy1193;
+ } else {
+ if (yych == 'n') goto yy1193;
+ if (yych <= 'q') goto yy1192;
+ goto yy1193;
+ }
+ } else {
+ if (yych <= 'u') {
+ if (yych <= 's') goto yy1192;
+ if (yych <= 't') goto yy1193;
+ goto yy1202;
+ } else {
+ if (yych <= 'v') goto yy1193;
+ if (yych == 'x') goto yy1205;
+ goto yy1192;
+ }
+ }
+ }
+yy1197:
+ ++YYCURSOR;
+yy1198:
+#line 512 "strict_cpp.re"
+ {
+ s->line += count_backslash_newlines(s, cursor) +1;
+ cursor.column = 1;
+ goto extrawstringlit;
+ }
+#line 8843 "strict_cpp_re.inc"
+yy1199:
+ yych = *++YYCURSOR;
+ if (yych == '\n') goto yy1197;
+ goto yy1198;
+yy1200:
+ ++YYCURSOR;
+#line 518 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_RAWSTRINGLIT); }
+#line 8852 "strict_cpp_re.inc"
+yy1202:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1218;
+ goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1218;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1218;
+ goto yy1192;
+ }
+yy1203:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1211;
+ goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1211;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1211;
+ goto yy1192;
+ }
+yy1204:
+ yych = *(YYMARKER = ++YYCURSOR);
+ if (yych == '?') goto yy1210;
+ goto yy1194;
+yy1205:
+ yych = *++YYCURSOR;
+ if (yybm[0+yych] & 128) {
+ goto yy1208;
+ }
+ goto yy1192;
+yy1206:
+ yych = *++YYCURSOR;
+ if (yych <= '/') goto yy1194;
+ if (yych >= '8') goto yy1194;
+ yych = *++YYCURSOR;
+ if (yych <= '/') goto yy1194;
+ if (yych <= '7') goto yy1193;
+ goto yy1194;
+yy1208:
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 128) {
+ goto yy1208;
+ }
+ goto yy1194;
+yy1210:
+ yych = *++YYCURSOR;
+ if (yych == '/') goto yy1193;
+ goto yy1192;
+yy1211:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1212;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1212:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1213;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1213:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1214;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1214:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1215;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1215:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1216;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1216:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1217;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1217:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1193;
+ goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1193;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1193;
+ goto yy1192;
+ }
+yy1218:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1219;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1219:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1220;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
+ }
+yy1220:
+ yych = *++YYCURSOR;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1193;
+ goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1193;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1193;
+ goto yy1192;
+ }
+yy1221:
+ ++YYCURSOR;
+ if ((yych = *YYCURSOR) == '/') goto yy1196;
+ goto yy1192;
+}
+#line 519 "strict_cpp.re"
+
+}

Modified: branches/release/libs/wave/src/instantiate_cpp_exprgrammar.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_cpp_exprgrammar.cpp (original)
+++ branches/release/libs/wave/src/instantiate_cpp_exprgrammar.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/src/instantiate_cpp_grammar.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_cpp_grammar.cpp (original)
+++ branches/release/libs/wave/src/instantiate_cpp_grammar.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/src/instantiate_cpp_literalgrs.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_cpp_literalgrs.cpp (original)
+++ branches/release/libs/wave/src/instantiate_cpp_literalgrs.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/src/instantiate_defined_grammar.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_defined_grammar.cpp (original)
+++ branches/release/libs/wave/src/instantiate_defined_grammar.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/src/instantiate_predef_macros.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_predef_macros.cpp (original)
+++ branches/release/libs/wave/src/instantiate_predef_macros.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/src/instantiate_re2c_lexer.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_re2c_lexer.cpp (original)
+++ branches/release/libs/wave/src/instantiate_re2c_lexer.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/src/instantiate_re2c_lexer_str.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_re2c_lexer_str.cpp (original)
+++ branches/release/libs/wave/src/instantiate_re2c_lexer_str.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/src/token_ids.cpp
==============================================================================
--- branches/release/libs/wave/src/token_ids.cpp (original)
+++ branches/release/libs/wave/src/token_ids.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -5,7 +5,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -210,6 +210,18 @@
     /* 420 */ "MSEXT_ENDREGION",
     
     /* 421 */ "IMPORT",
+
+ /* 422 */ "ALIGNAS",
+ /* 423 */ "ALIGNOF",
+ /* 424 */ "CHAR16_T",
+ /* 425 */ "CHAR32_T",
+ /* 426 */ "CONSTEXPR",
+ /* 427 */ "DECLTYPE",
+ /* 428 */ "NOEXCEPT",
+ /* 429 */ "NULLPTR",
+ /* 430 */ "STATIC_ASSERT",
+ /* 431 */ "THREADLOCAL",
+ /* 432 */ "RAWSTRINGLIT",
     };
 
     // make sure, I have not forgotten any commas (as I did more than once)
@@ -400,6 +412,18 @@
     /* 420 */ "#endregion",
     
     /* 421 */ "import",
+
+ /* 422 */ "alignas",
+ /* 423 */ "alignof",
+ /* 424 */ "char16_t",
+ /* 425 */ "char32_t",
+ /* 426 */ "constexpr",
+ /* 427 */ "decltype",
+ /* 428 */ "noexcept",
+ /* 429 */ "nullptr",
+ /* 430 */ "static_assert",
+ /* 431 */ "threadlocal",
+ /* 432 */ "", // extrawstringlit
     };
      
     // make sure, I have not forgotten any commas (as I did more than once)

Modified: branches/release/libs/wave/src/wave_config_constant.cpp
==============================================================================
--- branches/release/libs/wave/src/wave_config_constant.cpp (original)
+++ branches/release/libs/wave/src/wave_config_constant.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/build/Jamfile.v2
==============================================================================
--- branches/release/libs/wave/test/build/Jamfile.v2 (original)
+++ branches/release/libs/wave/test/build/Jamfile.v2 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
 #
 # http://www.boost.org/
 #
-# Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+# Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testlexers/cpp_tokens.hpp
==============================================================================
--- branches/release/libs/wave/test/testlexers/cpp_tokens.hpp (original)
+++ branches/release/libs/wave/test/testlexers/cpp_tokens.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testlexers/test_lexertl_lexer.cpp
==============================================================================
--- branches/release/libs/wave/test/testlexers/test_lexertl_lexer.cpp (original)
+++ branches/release/libs/wave/test/testlexers/test_lexertl_lexer.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testlexers/test_re2c_lexer.cpp
==============================================================================
--- branches/release/libs/wave/test/testlexers/test_re2c_lexer.cpp (original)
+++ branches/release/libs/wave/test/testlexers/test_re2c_lexer.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testlexers/test_slex_lexer.cpp
==============================================================================
--- branches/release/libs/wave/test/testlexers/test_slex_lexer.cpp (original)
+++ branches/release/libs/wave/test/testlexers/test_slex_lexer.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testlexers/test_xlex_lexer.cpp
==============================================================================
--- branches/release/libs/wave/test/testlexers/test_xlex_lexer.cpp (original)
+++ branches/release/libs/wave/test/testlexers/test_xlex_lexer.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/cmd_line_utils.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/cmd_line_utils.hpp (original)
+++ branches/release/libs/wave/test/testwave/cmd_line_utils.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/collect_hooks_information.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/collect_hooks_information.hpp (original)
+++ branches/release/libs/wave/test/testwave/collect_hooks_information.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -10,6 +10,7 @@
 #if !defined(BOOST_WAVE_LIBS_WAVE_TEST_COLLECT_HOOKS_INFORMATION_HPP)
 #define BOOST_WAVE_LIBS_WAVE_TEST_COLLECT_HOOKS_INFORMATION_HPP
 
+#include <boost/config.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
@@ -82,6 +83,20 @@
     return result;
 }
 
+#if defined(BOOST_WINDOWS)
+template <typename String>
+inline String replace_slashes(String value, char const* lookfor = "\\",
+ char replace_with = '/')
+{
+ typename String::size_type p = value.find_first_of(lookfor);
+ while (p != value.npos) {
+ value[p] = replace_with;
+ p = value.find_first_of(lookfor, p+1);
+ }
+ return value;
+}
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 template <typename Token>
 class collect_hooks_information
@@ -265,7 +280,7 @@
     ///////////////////////////////////////////////////////////////////////////
     template <typename Context>
     bool
- found_include_directive(Context const& ctx, std::string const& filename,
+ found_include_directive(Context const& ctx, std::string filename,
         bool include_next)
     {
         BOOST_WAVETEST_OSSTREAM strm;
@@ -298,11 +313,19 @@
     ///////////////////////////////////////////////////////////////////////////
     template <typename Context>
     void
- opened_include_file(Context const& ctx, std::string const& relname,
- std::string const& absname, bool is_system_include)
+ opened_include_file(Context const& ctx, std::string relname,
+ std::string absname, bool is_system_include)
     {
+ using boost::wave::util::impl::escape_lit;
+
+#if defined(BOOST_WINDOWS)
+ relname = replace_slashes(relname);
+ absname = replace_slashes(absname);
+#endif
+
         BOOST_WAVETEST_OSSTREAM strm;
- strm << "05: " << relname << " (" << absname << ")" << std::endl;
+ strm << "05: " << escape_lit(relname)
+ << " (" << escape_lit(absname) << ")" << std::endl;
         hooks_trace += BOOST_WAVETEST_GETSTRING(strm);
     }
     
@@ -750,11 +773,18 @@
     ///////////////////////////////////////////////////////////////////////////
     template <typename ContextT>
     void
- detected_include_guard(ContextT const& ctx, std::string const& filename,
+ detected_include_guard(ContextT const& ctx, std::string filename,
         std::string const& include_guard)
     {
+ using boost::wave::util::impl::escape_lit;
+
+#if defined(BOOST_WINDOWS)
+ filename = replace_slashes(filename);
+#endif
+
         BOOST_WAVETEST_OSSTREAM strm;
- strm << "19: " << filename << ": " << include_guard << std::endl;
+ strm << "19: " << escape_lit(filename) << ": "
+ << include_guard << std::endl;
         hooks_trace += BOOST_WAVETEST_GETSTRING(strm);
     }
 
@@ -782,11 +812,18 @@
     template <typename ContextT, typename TokenT>
     void
     detected_pragma_once(ContextT const& ctx, TokenT const& pragma_token,
- std::string const& filename)
+ std::string filename)
     {
+ using boost::wave::util::impl::escape_lit;
+
+#if defined(BOOST_WINDOWS)
+ filename = replace_slashes(filename);
+#endif
+
         BOOST_WAVETEST_OSSTREAM strm;
         strm << "20: " << repr(pragma_token.get_position()) << ": "
- << pragma_token.get_value() << ": " << filename << std::endl;
+ << pragma_token.get_value() << ": "
+ << escape_lit(filename) << std::endl;
         hooks_trace += BOOST_WAVETEST_GETSTRING(strm);
     }
 #endif

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_001.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_001.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_001.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_002.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_002.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_002.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_003.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_003.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_003.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_004.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_004.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_004.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_005.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_005.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_005.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_006.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_006.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_006.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_007.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_007.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_007.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_008.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_008.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_008.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_009.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_009.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_009.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_010.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_010.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_010.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_011.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_011.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_011.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_012.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_012.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_012.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_013.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_013.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_013.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_014.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_014.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_014.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_015.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_015.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_015.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_016.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_016.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_016.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_017.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_017.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_017.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_018.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_018.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_018.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_019.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_019.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_019.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_020.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_020.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_020.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_021.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_021.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_021.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_022.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_022.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_022.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_023.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_023.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_023.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_024.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_024.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_024.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_025.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_025.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_025.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_026.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_026.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_026.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_027.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_027.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_027.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_028.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_028.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_028.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_029.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_029.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_029.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_030.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_030.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_030.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_031.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_031.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_031.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_032.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_032.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_032.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_033.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_033.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_033.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_034.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_034.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_034.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_035.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_035.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_035.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_036.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_036.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_036.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_037.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_037.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_037.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_1_038.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_1_038.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_1_038.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_001.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_001.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_001.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_002.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_002.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_002.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_003.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_003.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_003.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_004.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_004.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_004.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_005.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_005.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_005.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_006.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_006.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_006.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_007.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_007.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_007.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_008.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_008.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_008.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_009.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_009.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_009.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_010.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_010.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_010.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_011.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_011.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_011.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_012.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_012.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_012.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_013.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_013.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_013.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_014.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_014.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_014.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_015.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_015.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_015.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_016.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_016.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_016.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_017.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_017.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_017.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_018.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_018.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_018.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_019.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_019.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_019.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_019_001.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_019_001.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_019_001.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_019_002.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_019_002.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_019_002.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_019_003.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_019_003.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_019_003.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_2_020.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_2_020.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_020.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Copied: branches/release/libs/wave/test/testwave/testfiles/t_2_021.cpp (from r67119, /trunk/libs/wave/test/testwave/testfiles/t_2_021.cpp)
==============================================================================
--- /trunk/libs/wave/test/testwave/testfiles/t_2_021.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_2_021.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_3_001.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_3_001.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_3_001.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_3_002.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_3_002.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_3_002.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_3_003.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_3_003.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_3_003.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_3_004.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_3_004.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_3_004.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_4_001.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_4_001.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_4_001.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_4_002.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_4_002.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_4_002.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_4_003.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_4_003.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_4_003.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_4_004.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_4_004.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_4_004.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_001.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_001.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_001.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_002.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_002.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_002.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_003.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_003.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_003.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_004.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_004.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_004.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_005.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_005.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_005.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_006.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_006.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_006.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_007.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_007.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_007.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_007.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_007.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_007.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_008.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_008.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_008.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_009.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_009.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_009.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_010.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_010.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_010.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_011.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_011.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_011.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_012.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_012.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_012.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_013.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_013.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_013.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_014.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_014.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_014.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_015.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_015.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_015.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_016.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_016.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_016.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_017.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_017.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_017.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_018.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_018.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_018.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_019.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_019.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_019.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_020.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_020.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_020.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_021.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_021.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_021.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_022.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_022.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_022.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_023.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_023.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_023.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_024.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_024.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_024.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_025.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_025.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_025.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_026.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_026.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_026.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_027.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_027.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_027.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_028.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_028.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_028.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_029.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_029.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_029.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_030.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_030.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_030.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_031.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_031.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_031.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_031.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_031.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_031.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_032.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_032.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_032.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_033.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_033.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_033.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_034.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_034.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_034.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_01.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_01.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_01.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_02.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_02.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_02.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_03.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_03.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_03.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_04.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_04.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_04.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_05.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_05.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_05.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_06.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_06.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_06.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_07.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_07.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_07.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_08.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_08.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_08.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_09.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_09.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_09.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_10.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_10.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_10.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_11.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_11.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_11.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_12.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_12.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_12.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_13.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_13.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_13.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_14.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_14.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_14.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_5_035_15.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_5_035_15.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_5_035_15.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_001.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_001.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_001.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_002.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_002.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_002.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_003.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_003.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_003.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_004.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_004.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_004.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_005.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_005.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_005.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_006.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_006.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_006.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_007.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_007.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_007.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_008.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_008.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_008.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_009.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_009.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_009.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_010.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_010.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_010.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_011.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_011.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_011.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_012.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_012.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_012.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_013.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_013.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_013.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_014.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_014.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_014.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_015.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_015.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_015.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_016.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_016.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_016.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_017.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_017.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_017.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_018.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_018.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_018.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_019.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_019.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_019.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_020.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_020.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_020.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_021.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_021.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_021.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_022.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_022.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_022.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_023.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_023.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_023.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_024.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_024.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_024.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_025.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_025.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_025.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_026.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_026.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_026.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_027.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_027.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_027.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_028.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_028.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_028.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_029.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_029.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_029.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_029.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_029.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_029.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_030.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_030.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_030.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_030.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_030.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_030.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_031.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_031.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_031.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_032.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_032.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_032.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_033.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_033.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_033.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_034.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_034.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_034.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_035.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_035.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_035.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_036.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_036.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_036.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_037.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_037.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_037.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_038.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_038.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_038.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_039.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_039.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_039.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_040.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_040.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_040.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_041.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_041.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_041.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_042.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_042.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_042.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_043.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_043.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_043.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_044.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_044.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_044.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_045.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_045.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_045.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_046.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_046.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_046.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_047.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_047.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_047.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_048.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_048.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_048.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_049.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_049.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_049.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_050.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_050.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_050.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_051.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_051.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_051.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_052.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_052.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_052.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_053.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_053.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_053.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_054.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_054.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_054.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_055.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_055.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_055.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_056.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_056.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_056.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_057.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_057.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_057.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_058.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_058.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_058.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_059.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_059.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_059.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_060.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_060.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_060.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_061.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_061.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_061.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_062.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_062.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_062.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_063.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_063.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_063.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_063.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_063.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_063.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_064.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_064.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_064.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_065.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_065.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_065.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_066.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_066.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_066.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_066.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_066.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_066.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_067.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_067.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_067.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_067.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_067.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_067.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_068.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_068.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_068.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Modified: branches/release/libs/wave/test/testwave/testfiles/t_6_069.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_6_069.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_6_069.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 

Copied: branches/release/libs/wave/test/testwave/testfiles/t_7_001.cpp (from r67119, /trunk/libs/wave/test/testwave/testfiles/t_7_001.cpp)
==============================================================================
--- /trunk/libs/wave/test/testwave/testfiles/t_7_001.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_7_001.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_001.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_001.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_001.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_002.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_002.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_002.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_003.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_003.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_003.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_004.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_004.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_004.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_005.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_005.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_005.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_006.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_006.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_006.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_007.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_007.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_007.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_008.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_008.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_008.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_009.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_009.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_009.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_010.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_010.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_010.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_011.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_011.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_011.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_012.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_012.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_012.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_013.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_013.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_013.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_014.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_014.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_014.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_015.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_015.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_015.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_016.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_016.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_016.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_016.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_016.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_016.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_017.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_017.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_017.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_018.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_018.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_018.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_019.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_019.cpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_019.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/t_9_019.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/t_9_019.hpp (original)
+++ branches/release/libs/wave/test/testwave/testfiles/t_9_019.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testfiles/test.cfg
==============================================================================
--- branches/release/libs/wave/test/testwave/testfiles/test.cfg (original)
+++ branches/release/libs/wave/test/testwave/testfiles/test.cfg 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
 # Boost.Wave: A Standard compliant C++ preprocessor library
 # http://www.boost.org/
 #
-# Copyright (c) 2003-2009 Hartmut Kaiser. Distributed under the Boost
+# Copyright (c) 2003-2011 Hartmut Kaiser. 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)
 #
@@ -73,6 +73,7 @@
 t_2_018.cpp
 t_2_019.cpp
 t_2_020.cpp
+t_2_021.cpp
 
 #
 # t_3: Predefined macros
@@ -207,6 +208,11 @@
 t_6_069.cpp
 
 #
+# t_7: C++0x testing
+#
+t_7_001.cpp
+
+#
 # t_9: General preprocessing problems
 #
 t_9_001.cpp

Modified: branches/release/libs/wave/test/testwave/testwave.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testwave.cpp (original)
+++ branches/release/libs/wave/test/testwave/testwave.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -181,7 +181,7 @@
                          iit != iend; ++iit)
                     {
                     // correct the file name (pre-pend the config file path)
- fs::path cfgpath = fs::complete(
+ fs::path cfgpath = boost::wave::util::complete_path(
                             boost::wave::util::create_path(*cit),
                             boost::wave::util::current_path());
                         fs::path filepath =

Modified: branches/release/libs/wave/test/testwave/testwave_app.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testwave_app.cpp (original)
+++ branches/release/libs/wave/test/testwave/testwave_app.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -18,6 +18,7 @@
 
 // include boost
 #include <boost/config.hpp>
+#include <boost/assert.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
@@ -53,7 +54,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // testwave version definitions
 #define TESTWAVE_VERSION_MAJOR 0
-#define TESTWAVE_VERSION_MINOR 5
+#define TESTWAVE_VERSION_MINOR 6
 #define TESTWAVE_VERSION_SUBMINOR 0
 
 namespace {
@@ -191,7 +192,7 @@
             case 'B': // same as 'P', but forward slashes on Windows
                 {
                     fs::path fullpath (
- fs::complete(
+ boost::wave::util::complete_path(
                             boost::wave::util::create_path(filename),
                             boost::wave::util::current_path())
                         );
@@ -210,13 +211,27 @@
                             boost::wave::util::create_path(base);
                         full_result += expected.substr(pos, pos1-pos);
                         if ('P' == expected[pos1+1]) {
- full_result += escape_lit(
+#if defined(BOOST_WINDOWS)
+ std::string p = replace_slashes(
+ boost::wave::util::native_file_string(
+ boost::wave::util::normalize(fullpath)),
+ "/", '\\');
+#else
+ std::string p (
                                 boost::wave::util::native_file_string(
                                     boost::wave::util::normalize(fullpath)));
+#endif
+ full_result += escape_lit(p);
                         }
                         else {
- full_result += escape_lit(
+#if defined(BOOST_WINDOWS)
+ std::string p = replace_slashes(
+ boost::wave::util::normalize(fullpath).string());
+#else
+ std::string p (
                                 boost::wave::util::normalize(fullpath).string());
+#endif
+ full_result += escape_lit(p);
                         }
                         pos1 = expected.find_first_of ("$",
                             pos = pos1 + 4 + base.size());
@@ -229,6 +244,11 @@
                                 boost::wave::util::native_file_string(fullpath));
                         }
                         else {
+#if defined(BOOST_WINDOWS)
+ std::string p = replace_slashes(fullpath.string());
+#else
+ std::string p (fullpath.string());
+#endif
                             full_result += escape_lit(fullpath.string());
                         }
                         pos1 = expected.find_first_of ("$", pos = pos1 + 2);
@@ -264,8 +284,14 @@
                                     boost::wave::util::normalize(relpath)));
                         }
                         else {
- full_result += escape_lit(
+#if defined(BOOST_WINDOWS)
+ std::string p = replace_slashes(
                                 boost::wave::util::normalize(relpath).string());
+#else
+ std::string p (
+ boost::wave::util::normalize(relpath).string());
+#endif
+ full_result += escape_lit(p);
                         }
                         pos1 = expected.find_first_of ("$",
                             pos = pos1 + 4 + base.size());
@@ -278,7 +304,12 @@
                                 boost::wave::util::native_file_string(relpath));
                         }
                         else {
- full_result += escape_lit(relpath.string());
+#if defined(BOOST_WINDOWS)
+ std::string p = replace_slashes(relpath.string());
+#else
+ std::string p (relpath.string());
+#endif
+ full_result += escape_lit(p);
                         }
                         pos1 = expected.find_first_of ("$", pos = pos1 + 2);
                     }
@@ -337,6 +368,9 @@
         ("noguard,G", "disable include guard detection")
 #endif
         ("skipped_token_hooks", "record skipped_token hook calls")
+#if BOOST_WAVE_SUPPORT_CPP0X != 0
+ ("c++0x", "enable C99 mode (implies --variadics and --long_long)")
+#endif
     ;
 }
 
@@ -557,7 +591,7 @@
         "Testwave: A test driver for the Boost.Wave C++ preprocessor library",
         "http://www.boost.org/",
         "",
- "Copyright (c) 2001-2010 Hartmut Kaiser, Distributed under the Boost",
+ "Copyright (c) 2001-2011 Hartmut Kaiser, 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)",
         0
@@ -619,7 +653,7 @@
             value.clear();
         else {
             std::string::size_type last = value.find_last_not_of(" \t");
- assert(std::string::npos != last);
+ BOOST_ASSERT(std::string::npos != last);
             value = value.substr(first, last-first+1);
         }
         return value;
@@ -877,6 +911,28 @@
     }
 #endif // BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS != 0
 
+#if BOOST_WAVE_SUPPORT_CPP0X
+ if (vm.count("c++0x")) {
+ if (9 == debuglevel) {
+ std::cerr << "initialise_options: option: c++0x" << std::endl;
+ }
+ ctx.set_language(
+ boost::wave::language_support(
+ boost::wave::support_cpp0x
+ | boost::wave::support_option_convert_trigraphs
+ | boost::wave::support_option_long_long
+ | boost::wave::support_option_emit_line_directives
+#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
+ | boost::wave::support_option_include_guard_detection
+#endif
+#if BOOST_WAVE_EMIT_PRAGMA_DIRECTIVES != 0
+ | boost::wave::support_option_emit_pragma_directives
+#endif
+ | boost::wave::support_option_insert_whitespace
+ ));
+ }
+#endif
+
 // enable long_long mode, if appropriate
     if (vm.count("long_long")) {
         if (9 == debuglevel) {

Modified: branches/release/libs/wave/test/testwave/testwave_app.hpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testwave_app.hpp (original)
+++ branches/release/libs/wave/test/testwave/testwave_app.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testwave_app_dll.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testwave_app_dll.cpp (original)
+++ branches/release/libs/wave/test/testwave/testwave_app_dll.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/libs/wave/test/testwave/testwave_dll.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testwave_dll.cpp (original)
+++ branches/release/libs/wave/test/testwave/testwave_dll.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/tools/build/v2/tools/pathscale.jam
==============================================================================
--- branches/release/tools/build/v2/tools/pathscale.jam (original)
+++ branches/release/tools/build/v2/tools/pathscale.jam 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -21,9 +21,19 @@
 
 rule init ( version ? : command * : options * )
 {
- local condition = [ common.check-init-parameters pathscale : version $(version) ] ;
-
- command = [ common.get-invocation-command pathscale : pathCC : $(command) ] ;
+ command = [ common.get-invocation-command pathscale : pathCC : $(command)
+ : /opt/ekopath/bin ] ;
+
+ # Determine the version
+ local command-string = $(command:J=" ") ;
+ if $(command)
+ {
+ version ?= [ MATCH "^([0-9.]+)"
+ : [ SHELL "$(command-string) -dumpversion" ] ] ;
+ }
+
+ local condition = [ common.check-init-parameters pathscale
+ : version $(version) ] ;
 
   common.handle-options pathscale : $(condition) : $(command) : $(options) ;
     
@@ -56,12 +66,12 @@
 flags pathscale.compile OPTIONS <debug-symbols>on : -g ;
 flags pathscale.compile OPTIONS <profiling>on : -pg ;
 flags pathscale.compile OPTIONS <link>shared : -fPIC ;
-flags pathscale.compile OPTIONS <optimization>speed : -O2 ;
+flags pathscale.compile OPTIONS <optimization>speed : -O3 ;
 flags pathscale.compile OPTIONS <optimization>space : -Os ;
 flags pathscale.compile OPTIONS <address-model>32 : -m32 ;
 flags pathscale.compile OPTIONS <address-model>64 : -m64 ;
 
-flags pathscale.compile OPTIONS <warnings>off : -woffall ;
+flags pathscale.compile OPTIONS <warnings>off : -woffall -Wno-uninitialized ;
 flags pathscale.compile OPTIONS <warnings>on : -Wall ;
 flags pathscale.compile OPTIONS <warnings>all : -Wall ;
 

Modified: branches/release/tools/wave/build/Jamfile.v2
==============================================================================
--- branches/release/tools/wave/build/Jamfile.v2 (original)
+++ branches/release/tools/wave/build/Jamfile.v2 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -8,6 +8,22 @@
 # Software License, Version 1.0. (See accompanying file
 # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+# Make sure all of Wave is compiled with threading disabled. We still need
+# to link with Boost.Thread, but no multi-threaded features are being used
+# in the Wave tool anyway.
+
+import feature ;
+
+feature.feature wavetool
+ : on
+ : optional composite propagated
+ ;
+
+feature.compose <wavetool>on
+ : <define>BOOST_WAVE_SUPPORT_THREADING=0
+ ;
+
+###############################################################################
 project
     : requirements
       <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
@@ -27,6 +43,7 @@
     :
     <threading>multi
 # <debug-symbols>on
+ <wavetool>on
     :
     release
     ;

Modified: branches/release/tools/wave/cpp.cpp
==============================================================================
--- branches/release/tools/wave/cpp.cpp (original)
+++ branches/release/tools/wave/cpp.cpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -138,7 +138,7 @@
         "Wave: A Standard conformant C++ preprocessor based on the Boost.Wave library",
         "http://www.boost.org/",
         "",
- "Copyright (c) 2001-2010 Hartmut Kaiser, Distributed under the Boost",
+ "Copyright (c) 2001-2011 Hartmut Kaiser, 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)",
         0
@@ -539,7 +539,7 @@
         fs::path macronames_file (boost::wave::util::create_path(filename));
 
         if (macronames_file != "-") {
- macronames_file = fs::complete(macronames_file);
+ macronames_file = boost::wave::util::complete_path(macronames_file);
             fs::create_directories(boost::wave::util::branch_path(macronames_file));
             macronames_out.open(macronames_file.string().c_str());
             if (!macronames_out.is_open()) {
@@ -608,7 +608,7 @@
         fs::path macrocounts_file (boost::wave::util::create_path(filename));
 
         if (macrocounts_file != "-") {
- macrocounts_file = fs::complete(macrocounts_file);
+ macrocounts_file = boost::wave::util::complete_path(macrocounts_file);
             fs::create_directories(boost::wave::util::branch_path(macrocounts_file));
             macrocounts_out.open(macrocounts_file.string().c_str());
             if (!macrocounts_out.is_open()) {
@@ -752,22 +752,31 @@
     // enable preserving comments mode
     bool preserve_comments = false;
     bool preserve_whitespace = false;
+ bool preserve_bol_whitespace = false;
 
         if (vm.count("preserve")) {
         int preserve = vm["preserve"].as<int>();
 
             switch(preserve) {
- case 0: break;
- case 2:
+ case 0: break; // preserve no whitespace
+ case 3: // preserve all whitespace
                 preserve_whitespace = true;
- /* fall through */
- case 1:
                 preserve_comments = true;
+ preserve_bol_whitespace = true;
+ break;
+
+ case 2: // preserve comments and BOL whitespace only
+ preserve_comments = true;
+ preserve_bol_whitespace = true;
+ break;
+
+ case 1: // preserve BOL whitespace only
+ preserve_bol_whitespace = true;
                 break;
 
             default:
                 cerr << "wave: bogus preserve whitespace option value: "
- << preserve << ", should be 0, 1, or 2" << endl;
+ << preserve << ", should be 0, 1, 2, or 3" << endl;
                 return -1;
             }
         }
@@ -785,8 +794,9 @@
     bool allow_output = true; // will be manipulated from inside the hooks object
     std::string default_outfile; // will be used from inside the hooks object
     trace_macro_expansion<token_type> hooks(preserve_whitespace,
- output, traceout, includelistout, listguardsout, enable_trace,
- enable_system_command, allow_output, default_outfile);
+ preserve_bol_whitespace, output, traceout, includelistout,
+ listguardsout, enable_trace, enable_system_command, allow_output,
+ default_outfile);
 
     // enable macro invocation count, if appropriate
         if (vm.count("macrocounts"))
@@ -797,6 +807,13 @@
 #if BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS != 0
     // enable C99 mode, if appropriate (implies variadics)
         if (vm.count("c99")) {
+#if BOOST_WAVE_SUPPORT_CPP0X != 0
+ if (vm.count("c++0x")) {
+ cerr << "wave: multiple language options specified: --c99 "
+ "and --c++0x" << endl;
+ return -1;
+ }
+#endif
             ctx.set_language(
                 boost::wave::language_support(
                     boost::wave::support_c99
@@ -816,6 +833,29 @@
             ctx.set_language(boost::wave::enable_variadics(ctx.get_language()));
         }
 #endif // BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS != 0
+#if BOOST_WAVE_SUPPORT_CPP0X != 0
+ if (vm.count("c++0x")) {
+ if (vm.count("c99")) {
+ cerr << "wave: multiple language options specified: --c99 "
+ "and --c++0x" << endl;
+ return -1;
+ }
+ ctx.set_language(
+ boost::wave::language_support(
+ boost::wave::support_cpp0x
+ | boost::wave::support_option_convert_trigraphs
+ | boost::wave::support_option_long_long
+ | boost::wave::support_option_emit_line_directives
+#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
+ | boost::wave::support_option_include_guard_detection
+#endif
+#if BOOST_WAVE_EMIT_PRAGMA_DIRECTIVES != 0
+ | boost::wave::support_option_emit_pragma_directives
+#endif
+ | boost::wave::support_option_insert_whitespace
+ ));
+ }
+#endif // BOOST_WAVE_SUPPORT_CPP0X != 0
 
     // enable long long support, if appropriate
         if (vm.count("long_long")) {
@@ -961,7 +1001,7 @@
                 default_outfile = "-";
             }
             else {
- out_file = fs::complete(out_file);
+ out_file = boost::wave::util::complete_path(out_file);
                 fs::create_directories(boost::wave::util::branch_path(out_file));
                 output.open(out_file.string().c_str());
                 if (!output.is_open()) {
@@ -1212,6 +1252,9 @@
             ("variadics", "enable certain C99 extensions in C++ mode")
             ("c99", "enable C99 mode (implies --variadics)")
 #endif
+#if BOOST_WAVE_SUPPORT_CPP0X != 0
+ ("c++0x", "enable C++0x mode (implies --variadics and --long_long)")
+#endif
             ("listincludes,l", po::value<std::string>(),
                 "list names of included files to a file [arg] or to stdout [-]")
             ("macronames,m", po::value<std::string>(),
@@ -1221,8 +1264,9 @@
             ("preserve,p", po::value<int>()->default_value(0),
                 "preserve whitespace\n"
                             "0: no whitespace is preserved (default),\n"
- "1: comments are preserved,\n"
- "2: all whitespace is preserved")
+ "1: begin of line whitespace is preserved,\n"
+ "2: comments and begin of line whitespace is preserved,\n"
+ "3: all whitespace is preserved")
             ("line,L", po::value<int>()->default_value(1),
                 "control the generation of #line directives\n"
                             "0: no #line directives are generated,\n"
@@ -1284,7 +1328,7 @@
     // file for all files in a certain project.
         if (arguments.size() > 0 && arguments[0].value[0] != "-") {
         // construct full path of input file
- fs::path input_dir (fs::complete(
+ fs::path input_dir (boost::wave::util::complete_path(
                 boost::wave::util::create_path(arguments[0].value[0])));
 
         // chop of file name

Modified: branches/release/tools/wave/cpp.hpp
==============================================================================
--- branches/release/tools/wave/cpp.hpp (original)
+++ branches/release/tools/wave/cpp.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -3,7 +3,7 @@
 
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/tools/wave/cpp_config.hpp
==============================================================================
--- branches/release/tools/wave/cpp_config.hpp (original)
+++ branches/release/tools/wave/cpp_config.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -4,7 +4,7 @@
     
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/tools/wave/cpp_version.hpp
==============================================================================
--- branches/release/tools/wave/cpp_version.hpp (original)
+++ branches/release/tools/wave/cpp_version.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -19,7 +19,7 @@
 
 #define CPP_VERSION_FULL_STR BOOST_PP_STRINGIZE(CPP_VERSION_FULL)
 
-#define CPP_VERSION_DATE 20100324L
-#define CPP_VERSION_DATE_STR "20100324"
+#define CPP_VERSION_DATE 20110109L
+#define CPP_VERSION_DATE_STR "20110109"
 
 #endif // !defined(CPP_VERSION_HPP_CE4FE67F_63F9_468D_8364_C855F89D3C5D_INCLUDED)

Modified: branches/release/tools/wave/stop_watch.hpp
==============================================================================
--- branches/release/tools/wave/stop_watch.hpp (original)
+++ branches/release/tools/wave/stop_watch.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/

Modified: branches/release/tools/wave/trace_macro_expansion.hpp
==============================================================================
--- branches/release/tools/wave/trace_macro_expansion.hpp (original)
+++ branches/release/tools/wave/trace_macro_expansion.hpp 2011-01-11 18:19:22 EST (Tue, 11 Jan 2011)
@@ -2,7 +2,7 @@
     Boost.Wave: A Standard compliant C++ preprocessor library
     http://www.boost.org/
 
- Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Copyright (c) 2001-2011 Hartmut Kaiser. 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)
 =============================================================================*/
@@ -145,7 +145,8 @@
     typedef boost::wave::context_policies::eat_whitespace<TokenT> base_type;
 
 public:
- trace_macro_expansion(bool preserve_whitespace_,
+ trace_macro_expansion(
+ bool preserve_whitespace_, bool preserve_bol_whitespace_,
             std::ofstream &output_, std::ostream &tracestrm_,
             std::ostream &includestrm_, std::ostream &guardstrm_,
             trace_flags flags_, bool enable_system_command_,
@@ -155,6 +156,7 @@
         level(0), flags(flags_), logging_flags(trace_nothing),
         enable_system_command(enable_system_command_),
         preserve_whitespace(preserve_whitespace_),
+ preserve_bol_whitespace(preserve_bol_whitespace_),
         generate_output(generate_output_),
         default_outfile(default_outfile_),
         emit_relative_filenames(false)
@@ -741,7 +743,9 @@
     bool may_skip_whitespace(ContextT const &ctx, TokenT &token,
         bool &skipped_newline)
     {
- return this->base_type::may_skip_whitespace(ctx, token, skipped_newline) ?
+ return this->base_type::may_skip_whitespace(
+ ctx, token, need_preserve_comments(ctx.get_language()),
+ preserve_bol_whitespace, skipped_newline) ?
             !preserve_whitespace : false;
     }
 
@@ -781,7 +785,7 @@
         using namespace boost::wave;
         if (e.get_errorcode() != preprocess_exception::ill_formed_directive)
             return false;
-
+
         // the error string is formatted as 'severity: error: directive'
         std::string error(e.description());
         std::string::size_type p = error.find_last_of(":");
@@ -841,24 +845,44 @@
     }
 
     ///////////////////////////////////////////////////////////////////////////
- // interpret the pragma wave option(preserve: [0|1|2|push|pop]) directive
+ // interpret the pragma wave option(preserve: [0|1|2|3|push|pop]) directive
     template <typename ContextT>
     static bool
     interpret_pragma_option_preserve_set(int mode, bool &preserve_whitespace,
- ContextT &ctx)
+ bool& preserve_bol_whitespace, ContextT &ctx)
     {
         switch(mode) {
- case 0:
+ // preserve no whitespace
+ case 0:
             preserve_whitespace = false;
+ preserve_bol_whitespace = false;
             ctx.set_language(
                 enable_preserve_comments(ctx.get_language(), false),
                 false);
             break;
 
+ // preserve BOL whitespace only
+ case 1:
+ preserve_whitespace = false;
+ preserve_bol_whitespace = true;
+ ctx.set_language(
+ enable_preserve_comments(ctx.get_language(), false),
+ false);
+ break;
+
+ // preserve comments and BOL whitespace only
         case 2:
+ preserve_whitespace = false;
+ preserve_bol_whitespace = true;
+ ctx.set_language(
+ enable_preserve_comments(ctx.get_language()),
+ false);
+ break;
+
+ // preserve all whitespace
+ case 3:
             preserve_whitespace = true;
- /* fall through */
- case 1:
+ preserve_bol_whitespace = true;
             ctx.set_language(
                 enable_preserve_comments(ctx.get_language()),
                 false);
@@ -885,15 +909,18 @@
         if (T_IDENTIFIER == id) {
             if ((*it).get_value() == "push") {
             // push current preserve option onto the internal option stack
- if (preserve_whitespace) {
- if (need_preserve_comments(ctx.get_language()))
- preserve_options.push(2);
+ if (need_preserve_comments(ctx.get_language())) {
+ if (preserve_whitespace)
+ preserve_options.push(3);
                     else
- preserve_options.push(1);
+ preserve_options.push(2);
+ }
+ else if (preserve_bol_whitespace) {
+ preserve_options.push(1);
                 }
                 else {
                     preserve_options.push(0);
- }
+ }
                 return true;
             }
             else if ((*it).get_value() == "pop") {
@@ -903,10 +930,11 @@
                         pragma_mismatched_push_pop, "preserve",
                         act_token.get_position());
                 }
-
+
             // pop output preserve from the internal option stack
                 bool result = interpret_pragma_option_preserve_set(
- preserve_options.top(), preserve_whitespace, ctx);
+ preserve_options.top(), preserve_whitespace,
+ preserve_bol_whitespace, ctx);
                 preserve_options.pop();
                 return result;
             }
@@ -918,10 +946,11 @@
 
         using namespace std; // some platforms have atoi in namespace std
         return interpret_pragma_option_preserve_set(
- atoi((*it).get_value().c_str()), preserve_whitespace, ctx);
+ atoi((*it).get_value().c_str()), preserve_whitespace,
+ preserve_bol_whitespace, ctx);
     }
 
- // interpret the pragma wave option(line: [0|1|push|pop]) directive
+ // interpret the pragma wave option(line: [0|1|2|push|pop]) directive
     template <typename ContextT, typename IteratorT>
     bool
     interpret_pragma_option_line(ContextT &ctx, IteratorT &it,
@@ -970,7 +999,7 @@
 
         using namespace std; // some platforms have atoi in namespace std
         int emit_lines = atoi((*it).get_value().c_str());
- if (0 == emit_lines || 1 == emit_lines) {
+ if (0 == emit_lines || 1 == emit_lines || 2 == emit_lines) {
             // set the new emit #line directive mode
             ctx.set_language(
                 enable_emit_line_directives(ctx.get_language(), emit_lines),
@@ -1045,7 +1074,7 @@
             string_type fname ((*it).get_value());
             fs::path fpath (boost::wave::util::create_path(
                 util::impl::unescape_lit(fname.substr(1, fname.size()-2)).c_str()));
- fpath = fs::complete(fpath, ctx.get_current_directory());
+ fpath = boost::wave::util::complete_path(fpath, ctx.get_current_directory());
             result = interpret_pragma_option_output_open(fpath, ctx, act_token);
         }
         else if (T_IDENTIFIER == id) {
@@ -1058,8 +1087,8 @@
                 if (output_options.empty() && current_outfile.empty() &&
                     !default_outfile.empty() && default_outfile != "-")
                 {
- current_outfile = fs::complete(default_outfile,
- ctx.get_current_directory());
+ current_outfile = boost::wave::util::complete_path(
+ default_outfile, ctx.get_current_directory());
                 }
 
             // push current output option onto the internal option stack
@@ -1133,12 +1162,12 @@
 
             token_type const &value = *it;
             if (value.get_value() == "preserve") {
- // #pragma wave option(preserve: [0|1|2|push|pop])
+ // #pragma wave option(preserve: [0|1|2|3|push|pop])
                 valid_option = interpret_pragma_option_preserve(ctx, it, end,
                     act_token);
             }
             else if (value.get_value() == "line") {
- // #pragma wave option(line: [0|1|push|pop])
+ // #pragma wave option(line: [0|1|2|push|pop])
                 valid_option = interpret_pragma_option_line(ctx, it, end,
                     act_token);
             }
@@ -1336,6 +1365,7 @@
     trace_flags logging_flags; // enabled by a #pragma
     bool enable_system_command; // enable #pragma wave system() command
     bool preserve_whitespace; // enable whitespace preservation
+ bool preserve_bol_whitespace; // enable begin of line whitespace preservation
     bool& generate_output; // allow generated tokens to be streamed to output
     std::string const& default_outfile; // name of the output file given on command line
     boost::filesystem::path current_outfile; // name of the current output file


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