Boost logo

Boost-Commit :

From: hartmut.kaiser_at_[hidden]
Date: 2008-04-13 18:39:19


Author: hkaiser
Date: 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
New Revision: 44381
URL: http://svn.boost.org/trac/boost/changeset/44381

Log:
Wave: Updated to use new Spirit Classic library structure and namespace. Lots' of minor changes and adjustments. Switched version to 2.0 since this version is not backwards compatible anymore with earlier versions.
Text files modified:
   trunk/boost/wave/cpp_context.hpp | 80
   trunk/boost/wave/cpp_iteration_context.hpp | 38
   trunk/boost/wave/cpplexer/cpp_lex_interface.hpp | 3
   trunk/boost/wave/cpplexer/cpp_lex_interface_generator.hpp | 1
   trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp | 108
   trunk/boost/wave/cpplexer/cpp_lex_token.hpp | 43
   trunk/boost/wave/cpplexer/detect_include_guards.hpp | 48
   trunk/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp | 21
   trunk/boost/wave/grammars/cpp_chlit_grammar.hpp | 43
   trunk/boost/wave/grammars/cpp_defined_grammar.hpp | 37
   trunk/boost/wave/grammars/cpp_defined_grammar_gen.hpp | 6
   trunk/boost/wave/grammars/cpp_expression_grammar.hpp | 47
   trunk/boost/wave/grammars/cpp_grammar.hpp | 151
   trunk/boost/wave/grammars/cpp_grammar_gen.hpp | 8
   trunk/boost/wave/grammars/cpp_intlit_grammar.hpp | 45
   trunk/boost/wave/grammars/cpp_predef_macros_gen.hpp | 4
   trunk/boost/wave/grammars/cpp_predef_macros_grammar.hpp | 19
   trunk/boost/wave/preprocessing_hooks.hpp | 4
   trunk/boost/wave/token_ids.hpp | 2
   trunk/boost/wave/util/cpp_iterator.hpp | 510 +++-
   trunk/boost/wave/util/cpp_macromap.hpp | 38
   trunk/boost/wave/util/cpp_macromap_utils.hpp | 52
   trunk/boost/wave/util/file_position.hpp | 22
   trunk/boost/wave/util/flex_string.hpp | 1
   trunk/boost/wave/util/functor_input.hpp | 4
   trunk/boost/wave/util/interpret_pragma.hpp | 23
   trunk/boost/wave/util/macro_definition.hpp | 22
   trunk/boost/wave/util/macro_helpers.hpp | 34
   trunk/boost/wave/util/pattern_parser.hpp | 5
   trunk/boost/wave/util/symbol_table.hpp | 6
   trunk/boost/wave/util/time_conversion_helper.hpp | 33
   trunk/boost/wave/util/unput_queue_iterator.hpp | 34
   trunk/boost/wave/wave_config.hpp | 44
   trunk/boost/wave/wave_version.hpp | 6
   trunk/libs/filesystem/src/exception.cpp | 2
   trunk/libs/wave/ChangeLog | 8
   trunk/libs/wave/samples/cpp_tokens/cpp_tokens.cpp | 2
   trunk/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp | 8
   trunk/libs/wave/samples/cpp_tokens/slex/lexer.hpp | 16
   trunk/libs/wave/samples/cpp_tokens/slex_iterator.hpp | 9
   trunk/libs/wave/samples/hannibal/hannibal.cpp | 14
   trunk/libs/wave/samples/hannibal/translation_unit_parser.h | 18
   trunk/libs/wave/samples/hannibal/translation_unit_skipper.h | 12
   trunk/libs/wave/samples/list_includes/lexertl_iterator.hpp | 9
   trunk/libs/wave/samples/list_includes/list_includes.cpp | 2
   trunk/libs/wave/samples/quick_start/quick_start.cpp | 17
   trunk/libs/wave/samples/token_statistics/token_statistics.cpp | 2
   trunk/libs/wave/samples/token_statistics/xlex/xlex_lexer.hpp | 2
   trunk/libs/wave/samples/token_statistics/xlex_iterator.hpp | 9
   trunk/libs/wave/samples/waveidl/idl.cpp | 2
   trunk/libs/wave/samples/waveidl/idllexer/idl_lex_iterator.hpp | 9
   trunk/libs/wave/samples/waveidl/idllexer/idl_re2c_lexer.hpp | 2
   trunk/libs/wave/src/cpplexer/re2clex/cpp_re.inc | 4718 ++++++++++++++++++++--------------------
   trunk/libs/wave/src/cpplexer/re2clex/strict_cpp_re.inc | 4718 ++++++++++++++++++++--------------------
   trunk/libs/wave/src/instantiate_cpp_exprgrammar.cpp | 2
   trunk/libs/wave/src/instantiate_cpp_grammar.cpp | 3
   trunk/libs/wave/src/instantiate_cpp_literalgrs.cpp | 1
   trunk/libs/wave/src/instantiate_defined_grammar.cpp | 8
   trunk/libs/wave/src/instantiate_predef_macros.cpp | 8
   trunk/libs/wave/src/instantiate_re2c_lexer.cpp | 2
   trunk/libs/wave/test/testwave/testfiles/t_6_023.cpp | 2
   trunk/libs/wave/test/testwave/testwave_app.cpp | 2
   trunk/tools/wave/cpp.cpp | 15
   trunk/tools/wave/cpp_config.hpp | 2
   trunk/tools/wave/cpp_version.hpp | 4
   65 files changed, 5749 insertions(+), 5421 deletions(-)

Modified: trunk/boost/wave/cpp_context.hpp
==============================================================================
--- trunk/boost/wave/cpp_context.hpp (original)
+++ trunk/boost/wave/cpp_context.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -21,6 +21,7 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include <boost/pool/pool_alloc.hpp>
 
 #include <boost/wave/wave_config.hpp>
 #if BOOST_WAVE_SERIALIZATION != 0
@@ -71,6 +72,10 @@
 // defaults to the
 // context_policies::default_preprocessing_hooks
 // type.
+// DerivedT The type of the type being derived from the context
+// type (if any). This template parameter is optional and
+// defaults to 'this_type', which means that the context
+// type will be used assuming no derived type exists.
 //
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -98,6 +103,7 @@
     
 // public typedefs
     typedef typename LexIteratorT::token_type token_type;
+ typedef typename token_type::string_type string_type;
     
     typedef IteratorT target_iterator_type;
     typedef LexIteratorT lexer_type;
@@ -106,11 +112,10 @@
     typedef InputPolicyT input_policy_type;
     typedef typename token_type::position_type position_type;
 
-
 // type of a token sequence
     typedef std::list<token_type, boost::fast_pool_allocator<token_type> >
         token_sequence_type;
-// types of the policies
+// type of the policies
     typedef HooksT hook_policy_type;
     
 private:
@@ -190,41 +195,54 @@
 
 // maintain defined macros
 #if BOOST_WAVE_ENABLE_COMMANDLINE_MACROS != 0
- bool add_macro_definition(std::string macrostring,
- bool is_predefined = false)
- { return boost::wave::util::add_macro_definition(*this, macrostring,
- is_predefined, get_language()); }
+ template <typename StringT>
+ bool add_macro_definition(StringT macrostring, bool is_predefined = false)
+ {
+ return boost::wave::util::add_macro_definition(*this,
+ util::to_string<std::string>(macrostring), is_predefined,
+ get_language());
+ }
 #endif
- bool add_macro_definition(token_type const &name, bool has_params,
- std::vector<token_type> &parameters, token_sequence_type &definition,
- bool is_predefined = false)
- { return macros.add_macro(name, has_params, parameters, definition,
- is_predefined); }
+// Define and undefine macros, macro introspection
+ template <typename StringT>
+ bool add_macro_definition(StringT const &name, position_type const& pos,
+ bool has_params, std::vector<token_type> &parameters,
+ token_sequence_type &definition, bool is_predefined = false)
+ {
+ return macros.add_macro(
+ token_type(T_IDENTIFIER, util::to_string<string_type>(name), pos),
+ has_params, parameters, definition, is_predefined);
+ }
     template <typename StringT>
     bool is_defined_macro(StringT const &str) const
- { return macros.is_defined(str); }
- bool get_macro_definition(typename token_type::string_type const &name,
+ {
+ return macros.is_defined(util::to_string<string_type>(str));
+ }
+ template <typename StringT>
+ bool get_macro_definition(StringT const &name,
             bool &has_params, bool &is_predefined, position_type &pos,
             std::vector<token_type> &parameters,
             token_sequence_type &definition) const
         {
- return macros.get_macro(name, has_params, is_predefined, pos,
- parameters, definition);
+ return macros.get_macro(util::to_string<string_type>(name),
+ has_params, is_predefined, pos, parameters, definition);
         }
- bool remove_macro_definition(typename token_type::string_type const &name,
+ template <typename StringT>
+ bool remove_macro_definition(StringT const &name,
             bool even_predefined = false)
         {
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
             // ensure this gets removed from the list of include guards as well
- includes.remove_pragma_once_header(std::string(name.c_str()));
+ includes.remove_pragma_once_header(
+ util::to_string<std::string>(name));
 #endif
- return macros.remove_macro(
- token_type(T_IDENTIFIER, name, macros.get_main_pos()),
- even_predefined);
+ return macros.remove_macro(util::to_string<string_type>(name),
+ macros.get_main_pos(), even_predefined);
         }
     void reset_macro_definitions()
         { macros.reset_macromap(); macros.init_predefined_macros(); }
 
+// Iterate over names of defined macros
     typedef boost::wave::util::macromap<context> macromap_type;
     typedef typename macromap_type::name_iterator name_iterator;
     typedef typename macromap_type::const_name_iterator const_name_iterator;
@@ -234,16 +252,26 @@
     const_name_iterator macro_names_begin() const { return macros.begin(); }
     const_name_iterator macro_names_end() const { return macros.end(); }
 
+// This version now is used internally mainly, but since it was a documented
+// API function we leave it in the public interface.
+ bool add_macro_definition(token_type const &name, bool has_params,
+ std::vector<token_type> &parameters, token_sequence_type &definition,
+ bool is_predefined = false)
+ {
+ return macros.add_macro(name, has_params, parameters, definition,
+ is_predefined);
+ }
+
 // get the Wave version information
     static std::string get_version()
     {
         boost::wave::util::predefined_macros p;
- return p.get_fullversion().c_str();
+ return util::to_string<std::string>(p.get_fullversion());
     }
     static std::string get_version_string()
     {
         boost::wave::util::predefined_macros p;
- return p.get_versionstr().c_str();
+ return util::to_string<std::string>(p.get_versionstr());
     }
 
 // access current language options
@@ -277,10 +305,8 @@
 
 #if !defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
 protected:
- friend class boost::wave::pp_iterator<
- boost::wave::context<IteratorT, lexer_type, InputPolicyT, HooksT> >;
- friend class boost::wave::impl::pp_iterator_functor<
- boost::wave::context<IteratorT, lexer_type, InputPolicyT, HooksT> >;
+ friend class boost::wave::pp_iterator<context>;
+ friend class boost::wave::impl::pp_iterator_functor<context>;
 #endif
 
 // make sure the context has been initialized
@@ -391,7 +417,6 @@
     void save(Archive & ar, const unsigned int version) const
     {
         using namespace boost::serialization;
- typedef typename token_type::string_type string_type;
         
         string_type cfg(BOOST_PP_STRINGIZE(BOOST_WAVE_CONFIG));
         string_type kwd(BOOST_WAVE_PRAGMA_KEYWORD);
@@ -416,7 +441,6 @@
         }
         
         // check compatibility of the stored information
- typedef typename token_type::string_type string_type;
         string_type config, pragma_keyword, string_type_str;
         
         // BOOST_PP_STRINGIZE(BOOST_WAVE_CONFIG)

Modified: trunk/boost/wave/cpp_iteration_context.hpp
==============================================================================
--- trunk/boost/wave/cpp_iteration_context.hpp (original)
+++ trunk/boost/wave/cpp_iteration_context.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -22,7 +22,7 @@
 #include <boost/wave/cpp_exceptions.hpp>
 #include <boost/wave/language_support.hpp>
 #include <boost/wave/util/file_position.hpp>
-#include <boost/spirit/iterator/multi_pass.hpp> // make_multi_pass
+// #include <boost/spirit/include/iterator/classic_multi_pass.hpp> // make_multi_pass
 
 // this must occur after all of the includes and before any code appears
 #ifdef BOOST_HAS_ABI_HEADERS
@@ -60,10 +60,11 @@
             template <typename PositionT>
             static
             void init_iterators(IterContextT &iter_ctx,
- PositionT const &act_pos)
+ PositionT const &act_pos, language_support language)
             {
                 typedef typename IterContextT::iterator_type iterator_type;
                 
+ // read in the file
                 std::ifstream instream(iter_ctx.filename.c_str());
                 if (!instream.is_open()) {
                     BOOST_WAVE_THROW_CTX(iter_ctx.ctx, preprocess_exception,
@@ -72,20 +73,13 @@
                 }
                 instream.unsetf(std::ios::skipws);
                 
-#if defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)
- // this is known to be very slow for large files on some systems
- std::copy (istream_iterator<char>(instream),
- istream_iterator<char>(),
- std::inserter(iter_ctx.instring, iter_ctx.instring.end()));
-#else
- iter_ctx.instring = std::string(
+ iter_ctx.instring.assign(
                     std::istreambuf_iterator<char>(instream.rdbuf()),
                     std::istreambuf_iterator<char>());
-#endif // defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)
 
- iter_ctx.first = iterator_type(iter_ctx.instring.begin(),
- iter_ctx.instring.end(), PositionT(iter_ctx.filename),
- iter_ctx.language);
+ iter_ctx.first = iterator_type(
+ iter_ctx.instring.begin(), iter_ctx.instring.end(),
+ PositionT(iter_ctx.filename), language);
                 iter_ctx.last = iterator_type();
             }
 
@@ -113,7 +107,7 @@
             template <typename PositionT>
             static
             void init_iterators(IterContextT &iter_ctx,
- PositionT const &act_pos)
+ PositionT const &act_pos, language_support language)
             {
                 typedef typename IterContextT::iterator_type iterator_type;
                 
@@ -125,12 +119,12 @@
                 }
                 iter_ctx.instream.unsetf(std::ios::skipws);
 
- using boost::spirit::make_multi_pass;
+ using boost::spirit::classic::make_multi_pass;
                 iter_ctx.first = iterator_type(
- make_multi_pass(std::istreambuf_iterator<char>(
+ /*make_multi_pass*/(std::istreambuf_iterator<char>(
                         iter_ctx.instream.rdbuf())),
- make_multi_pass(std::istreambuf_iterator<char>()),
- PositionT(iter_ctx.filename), iter_ctx.language);
+ /*make_multi_pass*/(std::istreambuf_iterator<char>()),
+ PositionT(iter_ctx.filename), language);
                 iter_ctx.last = iterator_type();
             }
 
@@ -189,13 +183,11 @@
     iteration_context(ContextT& ctx, BOOST_WAVE_STRINGTYPE const &fname,
             position_type const &act_pos,
             boost::wave::language_support language_)
- : base_iteration_context<ContextT, IteratorT>(ctx, fname),
- language(language_)
+ : base_iteration_context<ContextT, IteratorT>(ctx, fname)
     {
- InputPolicyT::template inner<self_type>::init_iterators(*this, act_pos);
+ InputPolicyT::template inner<self_type>::init_iterators(
+ *this, act_pos, language_);
     }
-
- boost::wave::language_support language;
 };
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/wave/cpplexer/cpp_lex_interface.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/cpp_lex_interface.hpp (original)
+++ trunk/boost/wave/cpplexer/cpp_lex_interface.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -46,9 +46,10 @@
 {
     typedef typename TokenT::position_type position_type;
     
+ lex_input_interface() {}
     virtual ~lex_input_interface() {}
     
- virtual TokenT get() = 0;
+ virtual TokenT& get(TokenT&) = 0;
     virtual void set_position(position_type const &pos) = 0;
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
     virtual bool has_include_guards(std::string& guard_name) const = 0;

Modified: trunk/boost/wave/cpplexer/cpp_lex_interface_generator.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/cpp_lex_interface_generator.hpp (original)
+++ trunk/boost/wave/cpplexer/cpp_lex_interface_generator.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -76,6 +76,7 @@
 {
     typedef typename lex_input_interface<TokenT>::position_type position_type;
     
+ lex_input_interface_generator() {}
     ~lex_input_interface_generator() {}
     
 // The new_lexer function allows the opaque generation of a new lexer object.

Modified: trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp (original)
+++ trunk/boost/wave/cpplexer/cpp_lex_iterator.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -14,13 +14,13 @@
 #define CPP_LEX_ITERATOR_HPP_AF0C37E3_CBD8_4F33_A225_51CF576FA61F_INCLUDED
 
 #include <string>
-#include <iostream>
 
 #include <boost/assert.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/spirit/iterator/multi_pass.hpp>
+#include <boost/intrusive_ptr.hpp>
 
 #include <boost/wave/wave_config.hpp>
+#include <boost/spirit/include/support_multi_pass.hpp>
+
 #include <boost/wave/util/file_position.hpp>
 #include <boost/wave/util/functor_input.hpp>
 #include <boost/wave/cpplexer/cpp_lex_interface_generator.hpp>
@@ -32,7 +32,7 @@
 #include BOOST_ABI_PREFIX
 #endif
 
-#if 0 != __COMO_VERSION__
+#if 0 != __COMO_VERSION__ || !BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
 #define BOOST_WAVE_EOF_PREFIX static
 #else
 #define BOOST_WAVE_EOF_PREFIX
@@ -56,45 +56,50 @@
     typedef typename TokenT::position_type position_type;
 
 public:
- template <typename IteratorT>
- lex_iterator_functor_shim(IteratorT const &first, IteratorT const &last,
- position_type const &pos, boost::wave::language_support language)
- : functor_ptr(lex_input_interface_generator<TokenT>
- ::new_lexer(first, last, pos, language))
+ lex_iterator_functor_shim()
 #if 0 != __DECCXX_VER || BOOST_INTEL_CXX_VERSION > 900 || defined(__PGI)
       , eof()
-#endif // 0 != __DECCXX_VER
+#endif
     {}
 
-// interface to the boost::spirit::multi_pass_policies::functor_input policy
+// interface to the multi_pass_policies::split_functor_input policy
     typedef TokenT result_type;
+ typedef lex_iterator_functor_shim unique;
+ typedef lex_input_interface<TokenT>* shared;
 
     BOOST_WAVE_EOF_PREFIX result_type const eof;
     
- result_type operator()()
+ template <typename MultiPass>
+ static result_type& get_next(MultiPass& mp, result_type& result)
     {
- BOOST_ASSERT(0 != functor_ptr.get());
- return functor_ptr->get();
+ return mp.shared->ftor->get(result);
+ }
+
+ // this will be called whenever the last reference to a multi_pass will
+ // be released
+ template <typename MultiPass>
+ static void destroy(MultiPass& mp_shared)
+ {
+ delete mp_shared->ftor;
     }
- void set_position(position_type const &pos)
+
+ template <typename MultiPass>
+ static void set_position(MultiPass& mp, position_type const &pos)
     {
- BOOST_ASSERT(0 != functor_ptr.get());
- functor_ptr->set_position(pos);
+ mp.shared->ftor->set_position(pos);
     }
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
- bool has_include_guards(std::string& guard_name) const
+ template <typename MultiPass>
+ static bool has_include_guards(MultiPass& mp, std::string& guard_name)
     {
- return functor_ptr->has_include_guards(guard_name);
+ return mp.shared->ftor->has_include_guards(guard_name);
     }
 #endif
-
-private:
- boost::shared_ptr<lex_input_interface<TokenT> > functor_ptr;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // eof token
-#if 0 != __COMO_VERSION__
+#if 0 != __COMO_VERSION__ || !BOOST_WORKAROUND(BOOST_MSVC, <= 1310)
 template <typename TokenT>
 typename lex_iterator_functor_shim<TokenT>::result_type const
     lex_iterator_functor_shim<TokenT>::eof;
@@ -127,18 +132,45 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+///////////////////////////////////////////////////////////////////////////////
+// Divide the given functor type into its components (unique and shared)
+// and build a std::pair from these parts
+template <typename FunctorData>
+struct make_multi_pass
+{
+ typedef
+ std::pair<typename FunctorData::unique, typename FunctorData::shared>
+ functor_data_type;
+ typedef typename FunctorData::result_type result_type;
+
+ typedef boost::spirit::multi_pass_policies::split_functor_input input_policy;
+ typedef boost::spirit::multi_pass_policies::ref_counted ownership_policy;
+#if defined(BOOST_WAVE_DEBUG)
+ typedef boost::spirit::multi_pass_policies::buf_id_check check_policy;
+#else
+ typedef boost::spirit::multi_pass_policies::no_check check_policy;
+#endif
+ typedef boost::spirit::multi_pass_policies::split_std_deque storage_policy;
+
+ typedef boost::spirit::multi_pass_policies::default_policy<
+ input_policy, ownership_policy, check_policy, storage_policy>
+ policy_type;
+ typedef boost::spirit::multi_pass<functor_data_type, policy_type> type;
+};
+
+///////////////////////////////////////////////////////////////////////////////
 template <typename TokenT>
 class lex_iterator
-: public boost::spirit::multi_pass<
- impl::lex_iterator_functor_shim<TokenT>,
- boost::wave::util::functor_input
- >
+: public make_multi_pass<impl::lex_iterator_functor_shim<TokenT> >::type
 {
     typedef impl::lex_iterator_functor_shim<TokenT> input_policy_type;
- typedef
- boost::spirit::multi_pass<input_policy_type,
- boost::wave::util::functor_input>
- base_type;
+
+ typedef typename make_multi_pass<input_policy_type>::type base_type;
+ typedef typename make_multi_pass<input_policy_type>::functor_data_type
+ functor_data_type;
+
+ typedef typename input_policy_type::unique unique_functor_type;
+ typedef typename input_policy_type::shared shared_functor_type;
     
 public:
     typedef TokenT token_type;
@@ -150,7 +182,13 @@
     lex_iterator(IteratorT const &first, IteratorT const &last,
             typename TokenT::position_type const &pos,
             boost::wave::language_support language)
- : base_type(input_policy_type(first, last, pos, language))
+ : base_type(
+ functor_data_type(
+ unique_functor_type(),
+ lex_input_interface_generator<TokenT>
+ ::new_lexer(first, last, pos, language)
+ )
+ )
     {}
 
     void set_position(typename TokenT::position_type const &pos)
@@ -158,7 +196,7 @@
         typedef typename TokenT::position_type position_type;
         
     // set the new position in the current token
- token_type& currtoken = base_type::get_input();
+ token_type& currtoken = this->base_type::dereference(*this);
     position_type currpos = currtoken.get_position();
 
         currpos.set_file(pos.get_file());
@@ -171,7 +209,7 @@
         {
             currpos.set_line(pos.get_line() + 1);
         }
- base_type::get_functor().set_position(currpos);
+ unique_functor_type::set_position(*this, currpos);
     }
     
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
@@ -180,7 +218,7 @@
     // completely
     bool has_include_guards(std::string& guard_name) const
     {
- return base_type::get_functor().has_include_guards(guard_name);
+ return unique_functor_type::has_include_guards(*this, guard_name);
     }
 #endif
 };

Modified: trunk/boost/wave/cpplexer/cpp_lex_token.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/cpp_lex_token.hpp (original)
+++ trunk/boost/wave/cpplexer/cpp_lex_token.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -77,6 +77,22 @@
         return (lhs.id == rhs.id && lhs.value == rhs.value) ? true : false;
     }
     
+ void init(token_id id_, string_type const &value_, position_type const &pos_)
+ {
+ BOOST_ASSERT(refcnt == 1);
+ id = id_;
+ value = value_;
+ pos = pos_;
+ }
+
+ void init(token_data const& rhs)
+ {
+ BOOST_ASSERT(refcnt == 1);
+ id = rhs.id;
+ value = rhs.value;
+ pos = rhs.pos;
+ }
+
     static void *operator new(std::size_t size);
     static void operator delete(void *p, std::size_t size);
     
@@ -168,23 +184,28 @@
     typedef BOOST_WAVE_STRINGTYPE string_type;
     typedef PositionT position_type;
     
+private:
+ typedef impl::token_data<string_type, position_type> data_type;
+
+public:
     lex_token()
- : data(new impl::token_data<string_type, position_type>())
+ : data(0)
     {}
     
     lex_token(lex_token const& rhs)
     : data(rhs.data)
     {
+ if (0 != data)
         data->addref();
     }
 
     lex_token(token_id id_, string_type const &value_, PositionT const &pos_)
- : data(new impl::token_data<string_type, position_type>(id_, value_, pos_))
+ : data(new data_type(id_, value_, pos_))
     {}
 
     ~lex_token()
     {
- if (0 == data->release())
+ if (0 != data && 0 == data->release())
             delete data;
         data = 0;
     }
@@ -192,20 +213,21 @@
     lex_token& operator=(lex_token const& rhs)
     {
         if (&rhs != this) {
- if (0 == data->release())
+ if (0 != data && 0 == data->release())
                 delete data;
             
             data = rhs.data;
+ if (0 != data)
             data->addref();
         }
         return *this;
     }
     
 // accessors
- operator token_id() const { return token_id(*data); }
+ operator token_id() const { return 0 != data ? token_id(*data) : T_EOI; }
     string_type const &get_value() const { return data->get_value(); }
     position_type const &get_position() const { return data->get_position(); }
- bool is_eoi() const { return token_id(*data) == T_EOI; }
+ bool is_eoi() const { return 0 == data || token_id(*data) == T_EOI; }
     
     void set_token_id (token_id id_) { make_unique(); data->set_token_id(id_); }
     void set_value (string_type const &value_) { make_unique(); data->set_value(value_); }
@@ -213,6 +235,10 @@
 
     friend bool operator== (lex_token const& lhs, lex_token const& rhs)
     {
+ if (0 == rhs.data)
+ return 0 == lhs.data;
+ if (0 == lhs.data)
+ return false;
         return *(lhs.data) == *(rhs.data);
     }
     
@@ -249,14 +275,13 @@
         if (1 == data->get_refcnt())
             return;
         
- impl::token_data<string_type, position_type> *newdata =
- new impl::token_data<string_type, position_type>(*data);
+ data_type* newdata = new data_type(*data) ;
 
         data->release(); // release this reference, can't get zero
         data = newdata;
     }
     
- impl::token_data<string_type, position_type> *data;
+ data_type* data;
 };
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/wave/cpplexer/detect_include_guards.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/detect_include_guards.hpp (original)
+++ trunk/boost/wave/cpplexer/detect_include_guards.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -51,7 +51,7 @@
         current_state(true), if_depth(0)
     {}
 
- Token const& detect_guard(Token const& t)
+ Token& detect_guard(Token& t)
         { return current_state ? (this->*state)(t) : t; }
     bool detected(std::string& guard_name_) const
     {
@@ -63,7 +63,7 @@
     }
     
 private:
- typedef Token const& state_type(Token const& t);
+ typedef Token& state_type(Token& t);
     state_type include_guards::* state;
 
     bool detected_guards;
@@ -85,8 +85,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // state 0: beginning of a file, tries to recognize #ifndef or #if tokens
 template <typename Token>
-inline Token const&
-include_guards<Token>::state_0(Token const& t)
+inline Token&
+include_guards<Token>::state_0(Token& t)
 {
     token_id id = token_id(t);
     if (T_PP_IFNDEF == id)
@@ -101,8 +101,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // state 1: found #ifndef, looking for T_IDENTIFIER
 template <typename Token>
-inline Token const&
-include_guards<Token>::state_1(Token const& t)
+inline Token&
+include_guards<Token>::state_1(Token& t)
 {
     token_id id = token_id(t);
     if (T_IDENTIFIER == id) {
@@ -117,8 +117,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // state 1a: found T_PP_IF, looking for T_NOT ("!")
 template <typename Token>
-inline Token const&
-include_guards<Token>::state_1a(Token const& t)
+inline Token&
+include_guards<Token>::state_1a(Token& t)
 {
     token_id id = token_id(t);
     if (T_NOT == BASE_TOKEN(id))
@@ -131,8 +131,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // state 1b: found T_NOT, looking for 'defined'
 template <typename Token>
-inline Token const&
-include_guards<Token>::state_1b(Token const& t)
+inline Token&
+include_guards<Token>::state_1b(Token& t)
 {
     token_id id = token_id(t);
     if (T_IDENTIFIER == id && t.get_value() == "defined")
@@ -145,8 +145,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // state 1c: found 'defined', looking for (optional) T_LEFTPAREN
 template <typename Token>
-inline Token const&
-include_guards<Token>::state_1c(Token const& t)
+inline Token&
+include_guards<Token>::state_1c(Token& t)
 {
     token_id id = token_id(t);
     if (T_LEFTPAREN == id)
@@ -163,8 +163,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // state 1d: found T_LEFTPAREN, looking for T_IDENTIFIER guard
 template <typename Token>
-inline Token const&
-include_guards<Token>::state_1d(Token const& t)
+inline Token&
+include_guards<Token>::state_1d(Token& t)
 {
     token_id id = token_id(t);
     if (T_IDENTIFIER == id) {
@@ -179,8 +179,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // state 1e: found T_IDENTIFIER guard, looking for T_RIGHTPAREN
 template <typename Token>
-inline Token const&
-include_guards<Token>::state_1e(Token const& t)
+inline Token&
+include_guards<Token>::state_1e(Token& t)
 {
     token_id id = token_id(t);
     if (T_RIGHTPAREN == id)
@@ -193,8 +193,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // state 2: found T_IDENTIFIER, looking for #define
 template <typename Token>
-inline Token const&
-include_guards<Token>::state_2(Token const& t)
+inline Token&
+include_guards<Token>::state_2(Token& t)
 {
     token_id id = token_id(t);
     if (T_PP_DEFINE == id)
@@ -207,8 +207,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // state 3: found #define, looking for T_IDENTIFIER as recognized by state 1
 template <typename Token>
-inline Token const&
-include_guards<Token>::state_3(Token const& t)
+inline Token&
+include_guards<Token>::state_3(Token& t)
 {
     token_id id = token_id(t);
     if (T_IDENTIFIER == id && t.get_value() == guard_name)
@@ -221,8 +221,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // state 4: found guard T_IDENTIFIER, looking for #endif
 template <typename Token>
-inline Token const&
-include_guards<Token>::state_4(Token const& t)
+inline Token&
+include_guards<Token>::state_4(Token& t)
 {
     token_id id = token_id(t);
     if (T_PP_IF == id || T_PP_IFDEF == id || T_PP_IFNDEF == id)
@@ -239,8 +239,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 // state 5: found final #endif, looking for T_EOF
 template <typename Token>
-inline Token const&
-include_guards<Token>::state_5(Token const& t)
+inline Token&
+include_guards<Token>::state_5(Token& t)
 {
     token_id id = token_id(t);
     if (T_EOF == id)

Modified: trunk/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
==============================================================================
--- trunk/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp (original)
+++ trunk/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -22,7 +22,7 @@
 
 #include <boost/concept_check.hpp>
 #include <boost/assert.hpp>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/classic_core.hpp>
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/language_support.hpp>
@@ -70,7 +70,7 @@
         PositionT const &pos, boost::wave::language_support language_);
     ~lexer();
 
- lex_token<PositionT> get();
+ lex_token<PositionT>& get(lex_token<PositionT>&);
     void set_position(PositionT const &pos)
     {
         // set position has to change the file name and line number only
@@ -157,11 +157,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 // get the next token from the input stream
 template <typename IteratorT, typename PositionT>
-inline lex_token<PositionT>
-lexer<IteratorT, PositionT>::get()
+inline lex_token<PositionT>&
+lexer<IteratorT, PositionT>::get(lex_token<PositionT>& result)
 {
     if (at_eof)
- return lex_token<PositionT>(); // return T_EOI
+ return result = lex_token<PositionT>(); // return T_EOI
 
     unsigned int actline = scanner.line;
     token_id id = token_id(scan(&scanner));
@@ -281,11 +281,11 @@
 
     // the re2c lexer reports the new line number for newline tokens
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
- return guards.detect_guard(lex_token<PositionT>(id, value,
- PositionT(filename, actline, scanner.column)));
+ result = token_type(id, value, PositionT(filename, actline, scanner.column));
+ return guards.detect_guard(result);
 #else
- return lex_token<PositionT>(id, value,
- PositionT(filename, actline, scanner.column));
+ result = token_type(id, value, PositionT(filename, actline, scanner.column));
+ return result;
 #endif
 }
 
@@ -324,7 +324,6 @@
>
 {
 public:
-
     typedef typename lexer<IteratorT, PositionT>::token_type token_type;
     
     lex_functor(IteratorT const &first, IteratorT const &last,
@@ -334,7 +333,7 @@
     virtual ~lex_functor() {}
     
 // get the next token from the input stream
- token_type get() { return re2c_lexer.get(); }
+ token_type& get(token_type& result) { return re2c_lexer.get(result); }
     void set_position(PositionT const &pos) { re2c_lexer.set_position(pos); }
 #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0
     bool has_include_guards(std::string& guard_name) const

Modified: trunk/boost/wave/grammars/cpp_chlit_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_chlit_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_chlit_grammar.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -19,30 +19,23 @@
 #include <boost/static_assert.hpp>
 #include <boost/cstdint.hpp>
 
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute/closure.hpp>
-#include <boost/spirit/dynamic/if.hpp>
-#if SPIRIT_VERSION >= 0x1700
-#include <boost/spirit/actor/assign_actor.hpp>
-#include <boost/spirit/actor/push_back_actor.hpp>
-#endif // SPIRIT_VERSION >= 0x1700
-
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/statements.hpp>
-#include <boost/spirit/phoenix/functions.hpp>
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_closure.hpp>
+#include <boost/spirit/include/classic_if.hpp>
+#include <boost/spirit/include/classic_assign_actor.hpp>
+#include <boost/spirit/include/classic_push_back_actor.hpp>
+
+#include <boost/spirit/include/phoenix1_operators.hpp>
+#include <boost/spirit/include/phoenix1_primitives.hpp>
+#include <boost/spirit/include/phoenix1_statements.hpp>
+#include <boost/spirit/include/phoenix1_functions.hpp>
 
 #include <boost/wave/cpp_exceptions.hpp>
 #include <boost/wave/grammars/cpp_literal_grammar_gen.hpp>
 
 #if !defined(spirit_append_actor)
-#if SPIRIT_VERSION >= 0x1700
-#define spirit_append_actor(actor) boost::spirit::push_back_a(actor)
-#define spirit_assign_actor(actor) boost::spirit::assign_a(actor)
-#else
-#define spirit_append_actor(actor) boost::spirit::append(actor)
-#define spirit_assign_actor(actor) boost::spirit::assign(actor)
-#endif // SPIRIT_VERSION >= 0x1700
+#define spirit_append_actor(actor) boost::spirit::classic::push_back_a(actor)
+#define spirit_assign_actor(actor) boost::spirit::classic::assign_a(actor)
 #endif // !defined(spirit_append_actor)
 
 // this must occur after all of the includes and before any code appears
@@ -62,7 +55,7 @@
 namespace closures {
 
     struct chlit_closure
- : boost::spirit::closure<chlit_closure, boost::uint32_t, bool>
+ : boost::spirit::classic::closure<chlit_closure, boost::uint32_t, bool>
     {
         member1 value;
         member2 long_lit;
@@ -135,7 +128,7 @@
     /**/
 
 struct chlit_grammar :
- public boost::spirit::grammar<chlit_grammar,
+ public boost::spirit::classic::grammar<chlit_grammar,
         closures::chlit_closure::context_t>
 {
     chlit_grammar()
@@ -152,15 +145,15 @@
     template <typename ScannerT>
     struct definition
     {
- typedef
- boost::spirit::rule<ScannerT, closures::chlit_closure::context_t>
+ typedef boost::spirit::classic::rule<
+ ScannerT, closures::chlit_closure::context_t>
             rule_t;
 
         rule_t ch_lit;
 
         definition(chlit_grammar const &self)
         {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
             using phoenix::var;
             using phoenix::val;
             using phoenix::arg1;
@@ -312,7 +305,7 @@
 unsigned int
 chlit_grammar_gen<TokenT>::evaluate(TokenT const &token, value_error &status)
 {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
     
 chlit_grammar g;
 boost::uint32_t result = 0;

Modified: trunk/boost/wave/grammars/cpp_defined_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_defined_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_defined_grammar.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -14,25 +14,18 @@
 #include <boost/wave/wave_config.hpp>
 
 #include <boost/assert.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute/closure.hpp>
-#if SPIRIT_VERSION >= 0x1700
-#include <boost/spirit/actor/assign_actor.hpp>
-#include <boost/spirit/actor/push_back_actor.hpp>
-#endif // SPIRIT_VERSION >= 0x1700
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_closure.hpp>
+#include <boost/spirit/include/classic_assign_actor.hpp>
+#include <boost/spirit/include/classic_push_back_actor.hpp>
 
 #include <boost/wave/token_ids.hpp>
 #include <boost/wave/util/pattern_parser.hpp>
 #include <boost/wave/grammars/cpp_defined_grammar_gen.hpp>
 
 #if !defined(spirit_append_actor)
-#if SPIRIT_VERSION >= 0x1700
-#define spirit_append_actor(actor) boost::spirit::push_back_a(actor)
-#define spirit_assign_actor(actor) boost::spirit::assign_a(actor)
-#else
-#define spirit_append_actor(actor) boost::spirit::append(actor)
-#define spirit_assign_actor(actor) boost::spirit::assign(actor)
-#endif // SPIRIT_VERSION >= 0x1700
+#define spirit_append_actor(actor) boost::spirit::classic::push_back_a(actor)
+#define spirit_assign_actor(actor) boost::spirit::classic::assign_a(actor)
 #endif // !defined(spirit_append_actor)
 
 // this must occur after all of the includes and before any code appears
@@ -53,7 +46,7 @@
 
 template <typename ContainerT>
 struct defined_grammar :
- public boost::spirit::grammar<defined_grammar<ContainerT> >
+ public boost::spirit::classic::grammar<defined_grammar<ContainerT> >
 {
     defined_grammar(ContainerT &result_seq_)
     : result_seq(result_seq_)
@@ -65,14 +58,14 @@
     template <typename ScannerT>
     struct definition
     {
- typedef boost::spirit::rule<ScannerT> rule_t;
+ typedef boost::spirit::classic::rule<ScannerT> rule_t;
 
         rule_t defined_op;
         rule_t identifier;
 
         definition(defined_grammar const &self)
         {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
             using namespace boost::wave;
             using namespace boost::wave::util;
 
@@ -144,35 +137,35 @@
 
 template <typename LexIteratorT>
 BOOST_WAVE_DEFINED_GRAMMAR_GEN_INLINE
-boost::spirit::parse_info<
+boost::spirit::classic::parse_info<
     typename defined_grammar_gen<LexIteratorT>::iterator1_type
>
 defined_grammar_gen<LexIteratorT>::parse_operator_defined (
     iterator1_type const &first, iterator1_type const &last,
     token_sequence_type &found_qualified_name)
 {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
     using namespace boost::wave;
     
     defined_grammar<token_sequence_type> g(found_qualified_name);
- return boost::spirit::parse (
+ return boost::spirit::classic::parse (
         first, last, g, ch_p(T_SPACE) | ch_p(T_CCOMMENT));
 }
 
 template <typename LexIteratorT>
 BOOST_WAVE_DEFINED_GRAMMAR_GEN_INLINE
-boost::spirit::parse_info<
+boost::spirit::classic::parse_info<
     typename defined_grammar_gen<LexIteratorT>::iterator2_type
>
 defined_grammar_gen<LexIteratorT>::parse_operator_defined (
     iterator2_type const &first, iterator2_type const &last,
     token_sequence_type &found_qualified_name)
 {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
     using namespace boost::wave;
     
     defined_grammar<token_sequence_type> g(found_qualified_name);
- return boost::spirit::parse (
+ return boost::spirit::classic::parse (
         first, last, g, ch_p(T_SPACE) | ch_p(T_CCOMMENT));
 }
 

Modified: trunk/boost/wave/grammars/cpp_defined_grammar_gen.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_defined_grammar_gen.hpp (original)
+++ trunk/boost/wave/grammars/cpp_defined_grammar_gen.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -15,7 +15,7 @@
 
 #include <list>
 
-#include <boost/spirit/core/parser.hpp>
+#include <boost/spirit/include/classic_parser.hpp>
 #include <boost/pool/pool_alloc.hpp>
 
 #include <boost/wave/util/unput_queue_iterator.hpp>
@@ -59,11 +59,11 @@
         iterator2_type;
         
 // parse the operator defined and return the found qualified name
- static boost::spirit::parse_info<iterator1_type>
+ static boost::spirit::classic::parse_info<iterator1_type>
     parse_operator_defined (iterator1_type const &first,
         iterator1_type const &last, token_sequence_type &found_qualified_name);
 
- static boost::spirit::parse_info<iterator2_type>
+ static boost::spirit::classic::parse_info<iterator2_type>
     parse_operator_defined (iterator2_type const &first,
         iterator2_type const &last, token_sequence_type &found_qualified_name);
 };

Modified: trunk/boost/wave/grammars/cpp_expression_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_expression_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_expression_grammar.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -14,19 +14,17 @@
 #include <boost/wave/wave_config.hpp>
 
 #include <boost/assert.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute/closure.hpp>
-#include <boost/spirit/dynamic/if.hpp>
-#if SPIRIT_VERSION >= 0x1700
-#include <boost/spirit/actor/assign_actor.hpp>
-#include <boost/spirit/actor/push_back_actor.hpp>
-#endif // SPIRIT_VERSION >= 0x1700
-
-#include <boost/spirit/phoenix/functions.hpp>
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/statements.hpp>
-#include <boost/spirit/phoenix/casts.hpp>
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_closure.hpp>
+#include <boost/spirit/include/classic_if.hpp>
+#include <boost/spirit/include/classic_assign_actor.hpp>
+#include <boost/spirit/include/classic_push_back_actor.hpp>
+
+#include <boost/spirit/include/phoenix1_functions.hpp>
+#include <boost/spirit/include/phoenix1_operators.hpp>
+#include <boost/spirit/include/phoenix1_primitives.hpp>
+#include <boost/spirit/include/phoenix1_statements.hpp>
+#include <boost/spirit/include/phoenix1_casts.hpp>
 
 #include <boost/wave/token_ids.hpp>
 
@@ -38,13 +36,8 @@
 #include <boost/wave/util/macro_helpers.hpp>
 
 #if !defined(spirit_append_actor)
-#if SPIRIT_VERSION >= 0x1700
-#define spirit_append_actor(actor) boost::spirit::push_back_a(actor)
-#define spirit_assign_actor(actor) boost::spirit::assign_a(actor)
-#else
-#define spirit_append_actor(actor) boost::spirit::append(actor)
-#define spirit_assign_actor(actor) boost::spirit::assign(actor)
-#endif // SPIRIT_VERSION >= 0x1700
+#define spirit_append_actor(actor) boost::spirit::classic::push_back_a(actor)
+#define spirit_assign_actor(actor) boost::spirit::classic::assign_a(actor)
 #endif // !defined(spirit_append_actor)
 
 // this must occur after all of the includes and before any code appears
@@ -73,7 +66,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
     struct cpp_expr_closure
- : boost::spirit::closure<cpp_expr_closure, closure_value>
+ : boost::spirit::classic::closure<cpp_expr_closure, closure_value>
     {
         member1 val;
     };
@@ -276,7 +269,7 @@
     /**/
 
 struct expression_grammar :
- public boost::spirit::grammar<
+ public boost::spirit::classic::grammar<
         expression_grammar,
         closures::cpp_expr_closure::context_t
>
@@ -295,8 +288,8 @@
     struct definition
     {
         typedef closures::cpp_expr_closure closure_type;
- typedef boost::spirit::rule<ScannerT, closure_type::context_t> rule_t;
- typedef boost::spirit::rule<ScannerT> simple_rule_t;
+ typedef boost::spirit::classic::rule<ScannerT, closure_type::context_t> rule_t;
+ typedef boost::spirit::classic::rule<ScannerT> simple_rule_t;
 
         simple_rule_t pp_expression;
         
@@ -316,11 +309,11 @@
         rule_t add_exp_nocalc, multiply_exp_nocalc;
         rule_t unary_exp_nocalc, primary_exp_nocalc, constant_nocalc;
 
- boost::spirit::subrule<0, closure_type::context_t> const_exp_subrule;
+ boost::spirit::classic::subrule<0, closure_type::context_t> const_exp_subrule;
 
         definition(expression_grammar const &self)
         {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
             using namespace phoenix;
             using namespace boost::wave;
             using boost::wave::util::pattern_p;
@@ -750,7 +743,7 @@
     typename token_type::position_type const &act_pos,
     bool if_block_status, value_error &status)
 {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
     using namespace boost::wave;
     using namespace boost::wave::grammars::closures;
     

Modified: trunk/boost/wave/grammars/cpp_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_grammar.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -11,18 +11,18 @@
 #if !defined(CPP_GRAMMAR_HPP_FEAEBC2E_2734_428B_A7CA_85E5A415E23E_INCLUDED)
 #define CPP_GRAMMAR_HPP_FEAEBC2E_2734_428B_A7CA_85E5A415E23E_INCLUDED
 
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/tree/parse_tree.hpp>
-#include <boost/spirit/tree/parse_tree_utils.hpp>
-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/lists.hpp>
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_parse_tree.hpp>
+#include <boost/spirit/include/classic_parse_tree_utils.hpp>
+#include <boost/spirit/include/classic_confix.hpp>
+#include <boost/spirit/include/classic_lists.hpp>
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/pool/pool_alloc.hpp>
 
 #if BOOST_WAVE_DUMP_PARSE_TREE != 0
 #include <map>
-#include <boost/spirit/tree/tree_to_xml.hpp>
+#include <boost/spirit/include/classic_tree_to_xml.hpp>
 #endif
 
 #include <boost/wave/token_ids.hpp>
@@ -125,12 +125,12 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
     struct flush_underlying_parser
- : public boost::spirit::parser<flush_underlying_parser>
+ : public boost::spirit::classic::parser<flush_underlying_parser>
     {
         typedef flush_underlying_parser this_t;
 
         template <typename ScannerT>
- typename boost::spirit::parser_result<this_t, ScannerT>::type
+ typename boost::spirit::classic::parser_result<this_t, ScannerT>::type
         parse(ScannerT const& scan) const
         {
             scan.first.clear_queue();
@@ -153,7 +153,7 @@
 // Encapsulation of the C++ preprocessor grammar.
 template <typename TokenT, typename ContainerT>
 struct cpp_grammar :
- public boost::spirit::grammar<cpp_grammar<TokenT, ContainerT> >
+ public boost::spirit::classic::grammar<cpp_grammar<TokenT, ContainerT> >
 {
     typedef typename TokenT::position_type position_type;
     typedef cpp_grammar<TokenT, ContainerT> grammar_type;
@@ -166,29 +166,32 @@
     {
     // non-parse_tree generating rule type
         typedef typename ScannerT::iteration_policy_t iteration_policy_t;
- typedef boost::spirit::match_policy match_policy_t;
+ typedef boost::spirit::classic::match_policy match_policy_t;
         typedef typename ScannerT::action_policy_t action_policy_t;
         typedef
- boost::spirit::scanner_policies<
+ boost::spirit::classic::scanner_policies<
                 iteration_policy_t, match_policy_t, action_policy_t>
             policies_t;
         typedef
- boost::spirit::scanner<typename ScannerT::iterator_t, policies_t>
+ boost::spirit::classic::scanner<typename ScannerT::iterator_t, policies_t>
             non_tree_scanner_t;
         typedef
- boost::spirit::rule<non_tree_scanner_t, boost::spirit::dynamic_parser_tag>
+ boost::spirit::classic::rule<
+ non_tree_scanner_t, boost::spirit::classic::dynamic_parser_tag>
             no_tree_rule_type;
 
     // 'normal' (parse_tree generating) rule type
         typedef
- boost::spirit::rule<ScannerT, boost::spirit::dynamic_parser_tag>
+ boost::spirit::classic::rule<
+ ScannerT, boost::spirit::classic::dynamic_parser_tag>
             rule_type;
 
- rule_type pp_statement;
- rule_type include_file, system_include_file, macro_include_file;
+ rule_type pp_statement, macro_include_file;
+// rule_type include_file, system_include_file;
         rule_type plain_define, macro_definition, macro_parameters;
         rule_type undefine;
- rule_type ppifdef, ppifndef, ppif, ppelse, ppelif, ppendif;
+ rule_type ppifdef, ppifndef, ppif, ppelif;
+// rule_type ppelse, ppendif;
         rule_type ppline;
         rule_type pperror;
         rule_type ppwarning;
@@ -205,14 +208,14 @@
         definition(cpp_grammar const &self)
         {
         // import the spirit and cpplexer namespaces here
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
             using namespace boost::wave;
             using namespace boost::wave::util;
 
         // set the rule id's for later use
             pp_statement.set_id(BOOST_WAVE_PP_STATEMENT_ID);
- include_file.set_id(BOOST_WAVE_INCLUDE_FILE_ID);
- system_include_file.set_id(BOOST_WAVE_SYSINCLUDE_FILE_ID);
+// include_file.set_id(BOOST_WAVE_INCLUDE_FILE_ID);
+// system_include_file.set_id(BOOST_WAVE_SYSINCLUDE_FILE_ID);
             macro_include_file.set_id(BOOST_WAVE_MACROINCLUDE_FILE_ID);
             plain_define.set_id(BOOST_WAVE_PLAIN_DEFINE_ID);
             macro_parameters.set_id(BOOST_WAVE_MACRO_PARAMETERS_ID);
@@ -222,8 +225,8 @@
             ppifndef.set_id(BOOST_WAVE_IFNDEF_ID);
             ppif.set_id(BOOST_WAVE_IF_ID);
             ppelif.set_id(BOOST_WAVE_ELIF_ID);
- ppelse.set_id(BOOST_WAVE_ELSE_ID);
- ppendif.set_id(BOOST_WAVE_ENDIF_ID);
+// ppelse.set_id(BOOST_WAVE_ELSE_ID);
+// ppendif.set_id(BOOST_WAVE_ENDIF_ID);
             ppline.set_id(BOOST_WAVE_LINE_ID);
             pperror.set_id(BOOST_WAVE_ERROR_ID);
             ppwarning.set_id(BOOST_WAVE_WARNING_ID);
@@ -252,20 +255,20 @@
 
             pp_statement
                 = ( plain_define
- | include_file
- | system_include_file
+// | include_file
+// | system_include_file
                     | ppif
                     | ppelif
                     | ppifndef
                     | ppifdef
                     | undefine
- | ppelse
+// | ppelse
                     | macro_include_file
                     | ppline
                     | pppragma
                     | pperror
                     | ppwarning
- | ppendif
+// | ppendif
 #if BOOST_WAVE_SUPPORT_MS_EXTENSIONS != 0
                     | ppregion
                     | ppendregion
@@ -285,24 +288,24 @@
 #endif // !(defined(BOOST_SPIRIT_DEBUG) &&
                 ;
 
- // #include ...
- include_file // include "..."
- = ch_p(T_PP_QHEADER)
- [ store_found_directive_type(self.found_directive) ]
-#if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
- | ch_p(T_PP_QHEADER_NEXT)
- [ store_found_directive_type(self.found_directive) ]
-#endif
- ;
-
- system_include_file // include <...>
- = ch_p(T_PP_HHEADER)
- [ store_found_directive_type(self.found_directive) ]
-#if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
- | ch_p(T_PP_HHEADER_NEXT)
- [ store_found_directive_type(self.found_directive) ]
-#endif
- ;
+// // #include ...
+// include_file // include "..."
+// = ch_p(T_PP_QHEADER)
+// [ store_found_directive_type(self.found_directive) ]
+// #if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
+// | ch_p(T_PP_QHEADER_NEXT)
+// [ store_found_directive_type(self.found_directive) ]
+// #endif
+// ;
+
+// system_include_file // include <...>
+// = ch_p(T_PP_HHEADER)
+// [ store_found_directive_type(self.found_directive) ]
+// #if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
+// | ch_p(T_PP_HHEADER_NEXT)
+// [ store_found_directive_type(self.found_directive) ]
+// #endif
+// ;
 
             macro_include_file // include ...anything else...
                 = no_node_d
@@ -421,13 +424,13 @@
                         )
                 ;
 
- ppelse
- = no_node_d
- [
- ch_p(T_PP_ELSE)
- [ store_found_directive_type(self.found_directive) ]
- ]
- ;
+// ppelse
+// = no_node_d
+// [
+// ch_p(T_PP_ELSE)
+// [ store_found_directive_type(self.found_directive) ]
+// ]
+// ;
 
             ppelif
                 = no_node_d
@@ -441,13 +444,13 @@
                         )
                 ;
 
- ppendif
- = no_node_d
- [
- ch_p(T_PP_ENDIF)
- [ store_found_directive_type(self.found_directive) ]
- ]
- ;
+// ppendif
+// = no_node_d
+// [
+// ch_p(T_PP_ENDIF)
+// [ store_found_directive_type(self.found_directive) ]
+// ]
+// ;
 
         // #line ...
             ppline
@@ -571,8 +574,8 @@
                 ;
 
             BOOST_SPIRIT_DEBUG_TRACE_RULE(pp_statement, TRACE_CPP_GRAMMAR);
- BOOST_SPIRIT_DEBUG_TRACE_RULE(include_file, TRACE_CPP_GRAMMAR);
- BOOST_SPIRIT_DEBUG_TRACE_RULE(system_include_file, TRACE_CPP_GRAMMAR);
+// BOOST_SPIRIT_DEBUG_TRACE_RULE(include_file, TRACE_CPP_GRAMMAR);
+// BOOST_SPIRIT_DEBUG_TRACE_RULE(system_include_file, TRACE_CPP_GRAMMAR);
             BOOST_SPIRIT_DEBUG_TRACE_RULE(macro_include_file, TRACE_CPP_GRAMMAR);
             BOOST_SPIRIT_DEBUG_TRACE_RULE(plain_define, TRACE_CPP_GRAMMAR);
             BOOST_SPIRIT_DEBUG_TRACE_RULE(macro_definition, TRACE_CPP_GRAMMAR);
@@ -581,8 +584,8 @@
             BOOST_SPIRIT_DEBUG_TRACE_RULE(ppifdef, TRACE_CPP_GRAMMAR);
             BOOST_SPIRIT_DEBUG_TRACE_RULE(ppifndef, TRACE_CPP_GRAMMAR);
             BOOST_SPIRIT_DEBUG_TRACE_RULE(ppif, TRACE_CPP_GRAMMAR);
- BOOST_SPIRIT_DEBUG_TRACE_RULE(ppelse, TRACE_CPP_GRAMMAR);
- BOOST_SPIRIT_DEBUG_TRACE_RULE(ppelif, TRACE_CPP_GRAMMAR);
+// BOOST_SPIRIT_DEBUG_TRACE_RULE(ppelse, TRACE_CPP_GRAMMAR);
+// BOOST_SPIRIT_DEBUG_TRACE_RULE(ppelif, TRACE_CPP_GRAMMAR);
             BOOST_SPIRIT_DEBUG_TRACE_RULE(ppendif, TRACE_CPP_GRAMMAR);
             BOOST_SPIRIT_DEBUG_TRACE_RULE(ppline, TRACE_CPP_GRAMMAR);
             BOOST_SPIRIT_DEBUG_TRACE_RULE(pperror, TRACE_CPP_GRAMMAR);
@@ -618,9 +621,9 @@
 #if BOOST_WAVE_DUMP_PARSE_TREE != 0
 // helper function and data to get readable names of the rules known to us
     struct map_ruleid_to_name :
- public std::map<boost::spirit::parser_id, std::string>
+ public std::map<boost::spirit::classic::parser_id, std::string>
     {
- typedef std::map<boost::spirit::parser_id, std::string> base_type;
+ typedef std::map<boost::spirit::classic::parser_id, std::string> base_type;
 
         void init_rule_id_to_name_map(cpp_grammar const &self)
         {
@@ -630,8 +633,8 @@
             }
             init_ruleid_name_map[] = {
                 { BOOST_WAVE_PP_STATEMENT_ID, "pp_statement" },
- { BOOST_WAVE_INCLUDE_FILE_ID, "include_file" },
- { BOOST_WAVE_SYSINCLUDE_FILE_ID, "system_include_file" },
+// { BOOST_WAVE_INCLUDE_FILE_ID, "include_file" },
+// { BOOST_WAVE_SYSINCLUDE_FILE_ID, "system_include_file" },
                 { BOOST_WAVE_MACROINCLUDE_FILE_ID, "macro_include_file" },
                 { BOOST_WAVE_PLAIN_DEFINE_ID, "plain_define" },
                 { BOOST_WAVE_MACRO_PARAMETERS_ID, "macro_parameters" },
@@ -641,8 +644,8 @@
                 { BOOST_WAVE_IFNDEF_ID, "ppifndef" },
                 { BOOST_WAVE_IF_ID, "ppif" },
                 { BOOST_WAVE_ELIF_ID, "ppelif" },
- { BOOST_WAVE_ELSE_ID, "ppelse" },
- { BOOST_WAVE_ENDIF_ID, "ppendif" },
+// { BOOST_WAVE_ELSE_ID, "ppelse" },
+// { BOOST_WAVE_ENDIF_ID, "ppendif" },
                 { BOOST_WAVE_LINE_ID, "ppline" },
                 { BOOST_WAVE_ERROR_ID, "pperror" },
                 { BOOST_WAVE_WARNING_ID, "ppwarning" },
@@ -660,7 +663,7 @@
         // initialize parser_id to rule_name map
             for (int i = 0; 0 != init_ruleid_name_map[i].parser_id; ++i)
                 base_type::insert(base_type::value_type(
- boost::spirit::parser_id(init_ruleid_name_map[i].parser_id),
+ boost::spirit::classic::parser_id(init_ruleid_name_map[i].parser_id),
                     std::string(init_ruleid_name_map[i].rule_name))
                 );
         }
@@ -678,11 +681,11 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 template <typename NodeFactoryT, typename IteratorT, typename ParserT>
-inline boost::spirit::tree_parse_info<IteratorT, NodeFactoryT>
+inline boost::spirit::classic::tree_parse_info<IteratorT, NodeFactoryT>
 parsetree_parse(IteratorT const& first_, IteratorT const& last,
- boost::spirit::parser<ParserT> const& p)
+ boost::spirit::classic::parser<ParserT> const& p)
 {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
     
     typedef pt_match_policy<IteratorT, NodeFactoryT> pt_match_policy_type;
     typedef scanner_policies<iteration_policy, pt_match_policy_type>
@@ -712,7 +715,7 @@
 
 template <typename LexIteratorT, typename TokenContainerT>
 BOOST_WAVE_GRAMMAR_GEN_INLINE
-boost::spirit::tree_parse_info<
+boost::spirit::classic::tree_parse_info<
     LexIteratorT,
     typename cpp_grammar_gen<LexIteratorT, TokenContainerT>::node_factory_type
>
@@ -721,7 +724,7 @@
     position_type const &act_pos, bool &found_eof,
     token_type &found_directive, token_container_type &found_eoltokens)
 {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
     using namespace boost::wave;
     
     cpp_grammar<token_type, TokenContainerT> g(found_eof, found_directive, found_eoltokens);

Modified: trunk/boost/wave/grammars/cpp_grammar_gen.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_grammar_gen.hpp (original)
+++ trunk/boost/wave/grammars/cpp_grammar_gen.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -14,8 +14,8 @@
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/language_support.hpp>
 
-#include <boost/spirit/core/nil.hpp>
-#include <boost/spirit/tree/parse_tree.hpp>
+#include <boost/spirit/include/classic_nil.hpp>
+#include <boost/spirit/include/classic_parse_tree.hpp>
 
 #include <boost/pool/pool_alloc.hpp>
 
@@ -81,13 +81,13 @@
     typedef typename LexIteratorT::token_type token_type;
     typedef TokenContainerT token_container_type;
     typedef typename token_type::position_type position_type;
- typedef boost::spirit::node_val_data_factory<
+ typedef boost::spirit::classic::node_val_data_factory<
 // boost::spirit::nil_t,
 // boost::pool_allocator<boost::spirit::nil_t>
> node_factory_type;
     
 // parse the cpp_grammar and return the resulting parse tree
- static boost::spirit::tree_parse_info<iterator_type, node_factory_type>
+ static boost::spirit::classic::tree_parse_info<iterator_type, node_factory_type>
     parse_cpp_grammar (iterator_type const &first, iterator_type const &last,
         position_type const &act_pos, bool &found_eof,
         token_type &found_directive, token_container_type &found_eoltokens);

Modified: trunk/boost/wave/grammars/cpp_intlit_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_intlit_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_intlit_grammar.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -13,28 +13,21 @@
 
 #include <boost/wave/wave_config.hpp>
 
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/attribute/closure.hpp>
-#if SPIRIT_VERSION >= 0x1700
-#include <boost/spirit/actor/assign_actor.hpp>
-#include <boost/spirit/actor/push_back_actor.hpp>
-#endif // SPIRIT_VERSION >= 0x1700
-
-#include <boost/spirit/phoenix/operators.hpp>
-#include <boost/spirit/phoenix/primitives.hpp>
-#include <boost/spirit/phoenix/statements.hpp>
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_closure.hpp>
+#include <boost/spirit/include/classic_assign_actor.hpp>
+#include <boost/spirit/include/classic_push_back_actor.hpp>
+
+#include <boost/spirit/include/phoenix1_operators.hpp>
+#include <boost/spirit/include/phoenix1_primitives.hpp>
+#include <boost/spirit/include/phoenix1_statements.hpp>
 
 #include <boost/wave/cpp_exceptions.hpp>
 #include <boost/wave/grammars/cpp_literal_grammar_gen.hpp>
 
 #if !defined(spirit_append_actor)
-#if SPIRIT_VERSION >= 0x1700
-#define spirit_append_actor(actor) boost::spirit::push_back_a(actor)
-#define spirit_assign_actor(actor) boost::spirit::assign_a(actor)
-#else
-#define spirit_append_actor(actor) boost::spirit::append(actor)
-#define spirit_assign_actor(actor) boost::spirit::assign(actor)
-#endif // SPIRIT_VERSION >= 0x1700
+#define spirit_append_actor(actor) boost::spirit::classic::push_back_a(actor)
+#define spirit_assign_actor(actor) boost::spirit::classic::assign_a(actor)
 #endif // !defined(spirit_append_actor)
 
 // this must occur after all of the includes and before any code appears
@@ -55,7 +48,7 @@
 namespace closures {
 
     struct intlit_closure
- : boost::spirit::closure<intlit_closure, uint_literal_type>
+ : boost::spirit::classic::closure<intlit_closure, uint_literal_type>
     {
         member1 val;
     };
@@ -68,7 +61,7 @@
     /**/
 
 struct intlit_grammar :
- boost::spirit::grammar<intlit_grammar, closures::intlit_closure::context_t>
+ boost::spirit::classic::grammar<intlit_grammar, closures::intlit_closure::context_t>
 {
     intlit_grammar(bool &is_unsigned_) : is_unsigned(is_unsigned_)
     {
@@ -79,17 +72,17 @@
     template <typename ScannerT>
     struct definition
     {
- typedef boost::spirit::rule<ScannerT> rule_t;
+ typedef boost::spirit::classic::rule<ScannerT> rule_t;
 
         rule_t int_lit;
- boost::spirit::subrule<0> sub_int_lit;
- boost::spirit::subrule<1> oct_lit;
- boost::spirit::subrule<2> hex_lit;
- boost::spirit::subrule<3> dec_lit;
+ boost::spirit::classic::subrule<0> sub_int_lit;
+ boost::spirit::classic::subrule<1> oct_lit;
+ boost::spirit::classic::subrule<2> hex_lit;
+ boost::spirit::classic::subrule<3> dec_lit;
 
         definition(intlit_grammar const &self)
         {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
             using phoenix::var;
             using phoenix::arg1;
  
@@ -166,7 +159,7 @@
 intlit_grammar_gen<TokenT>::evaluate(TokenT const &token,
     bool &is_unsigned)
 {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
     
 intlit_grammar g(is_unsigned);
 uint_literal_type result = 0;

Modified: trunk/boost/wave/grammars/cpp_predef_macros_gen.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_predef_macros_gen.hpp (original)
+++ trunk/boost/wave/grammars/cpp_predef_macros_gen.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -11,7 +11,7 @@
 #if !defined(CPP_PREDEF_MACROS_GEN_HPP_CADB6D2C_76A4_4988_83E1_EFFC6902B9A2_INCLUDED)
 #define CPP_PREDEF_MACROS_GEN_HPP_CADB6D2C_76A4_4988_83E1_EFFC6902B9A2_INCLUDED
 
-#include <boost/spirit/tree/parse_tree.hpp>
+#include <boost/spirit/include/classic_parse_tree.hpp>
 
 #include <boost/wave/wave_config.hpp>
 
@@ -59,7 +59,7 @@
     typedef LexIteratorT iterator_type;
 
 // parse the cpp_grammar and return the resulting parse tree
- static boost::spirit::tree_parse_info<iterator_type>
+ static boost::spirit::classic::tree_parse_info<iterator_type>
     parse_predefined_macro (iterator_type const &first, iterator_type const &last);
 };
 

Modified: trunk/boost/wave/grammars/cpp_predef_macros_grammar.hpp
==============================================================================
--- trunk/boost/wave/grammars/cpp_predef_macros_grammar.hpp (original)
+++ trunk/boost/wave/grammars/cpp_predef_macros_grammar.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -11,10 +11,10 @@
 #if !defined(CPP_PREDEF_MACROS_GRAMMAR_HPP_53858C9A_C202_4D60_AD92_DC9CAE4DBB43_INCLUDED)
 #define CPP_PREDEF_MACROS_GRAMMAR_HPP_53858C9A_C202_4D60_AD92_DC9CAE4DBB43_INCLUDED
 
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/tree/parse_tree.hpp>
-#include <boost/spirit/utility/confix.hpp>
-#include <boost/spirit/utility/lists.hpp>
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_parse_tree.hpp>
+#include <boost/spirit/include/classic_confix.hpp>
+#include <boost/spirit/include/classic_lists.hpp>
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/token_ids.hpp>
@@ -40,13 +40,14 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Encapsulation of the grammar for command line driven predefined macros.
 struct predefined_macros_grammar :
- public boost::spirit::grammar<predefined_macros_grammar>
+ public boost::spirit::classic::grammar<predefined_macros_grammar>
 {
     template <typename ScannerT>
     struct definition
     {
     // 'normal' (parse_tree generating) rule type
- typedef boost::spirit::rule<ScannerT, boost::spirit::dynamic_parser_tag>
+ typedef boost::spirit::classic::rule<
+ ScannerT, boost::spirit::classic::dynamic_parser_tag>
             rule_type;
 
         rule_type plain_define, macro_definition, macro_parameters;
@@ -54,7 +55,7 @@
         definition(predefined_macros_grammar const &/*self*/)
         {
         // import the spirit and cpplexer namespaces here
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
             using namespace boost::wave;
             using namespace boost::wave::util;
             
@@ -150,12 +151,12 @@
 
 template <typename LexIteratorT>
 BOOST_WAVE_PREDEF_MACROS_GRAMMAR_GEN_INLINE
-boost::spirit::tree_parse_info<LexIteratorT>
+boost::spirit::classic::tree_parse_info<LexIteratorT>
 predefined_macros_grammar_gen<LexIteratorT>::parse_predefined_macro (
     LexIteratorT const &first, LexIteratorT const &last)
 {
     predefined_macros_grammar g;
- return boost::spirit::pt_parse (first, last, g);
+ return boost::spirit::classic::pt_parse (first, last, g);
 }
 
 #undef BOOST_WAVE_PREDEF_MACROS_GRAMMAR_GEN_INLINE

Modified: trunk/boost/wave/preprocessing_hooks.hpp
==============================================================================
--- trunk/boost/wave/preprocessing_hooks.hpp (original)
+++ trunk/boost/wave/preprocessing_hooks.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -263,9 +263,9 @@
 
     ///////////////////////////////////////////////////////////////////////////
     //
- // The function 'interpret_pragma' is called, whenever a #pragma command
+ // The function 'interpret_pragma' is called, whenever a '#pragma command'
     // directive is found which isn't known to the core Wave library, where
- // command is the value defined as the BOOST_WAVE_PRAGMA_KEYWORD constant
+ // 'command' is the value defined as the BOOST_WAVE_PRAGMA_KEYWORD constant
     // which defaults to "wave".
     //
     // The parameter 'ctx' is a reference to the context object used for

Modified: trunk/boost/wave/token_ids.hpp
==============================================================================
--- trunk/boost/wave/token_ids.hpp (original)
+++ trunk/boost/wave/token_ids.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -295,7 +295,7 @@
     T_PLACEHOLDER = TOKEN_FROM_ID(T_LAST_TOKEN+2, WhiteSpaceTokenType),
     T_PLACEMARKER = TOKEN_FROM_ID(T_LAST_TOKEN+3, InternalTokenType),
     T_PARAMETERBASE = TOKEN_FROM_ID(T_LAST_TOKEN+4, ParameterTokenType),
- T_EXTPARAMETERBASE = TOKEN_FROM_ID(T_LAST_TOKEN+5, ExtParameterTokenType)
+ T_EXTPARAMETERBASE = TOKEN_FROM_ID(T_LAST_TOKEN+4, ExtParameterTokenType)
 };
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/wave/util/cpp_iterator.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_iterator.hpp (original)
+++ trunk/boost/wave/util/cpp_iterator.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -23,8 +23,8 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <boost/spirit/iterator/multi_pass.hpp>
-#include <boost/spirit/tree/parse_tree_utils.hpp>
+#include <boost/spirit/include/classic_multi_pass.hpp>
+#include <boost/spirit/include/classic_parse_tree_utils.hpp>
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/pool/pool_alloc.hpp>
@@ -65,12 +65,12 @@
>
 inline bool
 retrieve_macroname(ContextT& ctx, ParseNodeT const &node,
- boost::spirit::parser_id id, TokenT &macroname, PositionT& act_pos,
+ boost::spirit::classic::parser_id id, TokenT &macroname, PositionT& act_pos,
     bool update_position)
 {
 ParseNodeT const *name_node = 0;
 
- using boost::spirit::find_node;
+ using boost::spirit::classic::find_node;
     if (!find_node(node, id, &name_node))
     {
         // ill formed define statement (unexpected, should not happen)
@@ -104,7 +104,7 @@
 template <typename ParseNodeT, typename ContainerT, typename PositionT>
 inline bool
 retrieve_macrodefinition(
- ParseNodeT const &node, boost::spirit::parser_id id,
+ ParseNodeT const &node, boost::spirit::classic::parser_id id,
     ContainerT &macrodefinition, PositionT& act_pos, bool update_position)
 {
     using namespace boost::wave;
@@ -113,7 +113,7 @@
 // find macro parameters/macro definition inside the parse tree
 std::pair<const_tree_iterator, const_tree_iterator> nodes;
 
- using boost::spirit::get_node_range;
+ using boost::spirit::classic::get_node_range;
     if (get_node_range(node, id, nodes)) {
     // copy all parameters to the supplied container
         typename ContainerT::iterator last_nonwhite = macrodefinition.end();
@@ -177,7 +177,7 @@
         
 // parse the macro definition
 position_type act_pos("<command line>");
-boost::spirit::tree_parse_info<lexer_type> hit =
+boost::spirit::classic::tree_parse_info<lexer_type> hit =
     predef_macros_type::parse_predefined_macro(
         lexer_type(begin, end, position_type(), language), lexer_type());
 
@@ -233,7 +233,7 @@
 class pp_iterator_functor {
 
 public:
-// interface to the boost::spirit::multi_pass_policies::functor_input policy
+// interface to the boost::spirit::classic::multi_pass_policies::functor_input policy
     typedef typename ContextT::token_type result_type;
 
 // eof token
@@ -257,9 +257,9 @@
 
 // parse tree related types
     typedef typename cpp_grammar_type::node_factory_type node_factory_type;
- typedef boost::spirit::tree_parse_info<lexer_type, node_factory_type>
+ typedef boost::spirit::classic::tree_parse_info<lexer_type, node_factory_type>
         tree_parse_info_type;
- typedef boost::spirit::tree_match<lexer_type, node_factory_type>
+ typedef boost::spirit::classic::tree_match<lexer_type, node_factory_type>
         parse_tree_match_type;
     typedef typename parse_tree_match_type::node_t parse_node_type; // tree_node<node_val_data<> >
     typedef typename parse_tree_match_type::parse_node_t parse_node_value_type; // node_val_data<>
@@ -301,9 +301,16 @@
     result_type const &get_next_token();
     result_type const &pp_token();
 
+ template <typename IteratorT>
+ bool extract_identifier(IteratorT &it);
+ template <typename IteratorT>
+ bool ensure_is_last_on_line(IteratorT& it);
+ template <typename IteratorT>
+ bool skip_to_eol_with_check(IteratorT &it);
+
     bool pp_directive();
     template <typename IteratorT>
- bool can_ignore_pp_directive(IteratorT &it);
+ bool handle_pp_directive(IteratorT &it);
     bool dispatch_directive(tree_parse_info_type const &hit,
         result_type const& found_directive,
         token_sequence_type const& found_eoltokens);
@@ -314,14 +321,12 @@
         typename parse_tree_type::const_iterator const &end, bool include_next);
 
     void on_define(parse_node_type const &node);
- void on_undefine(result_type const &t);
+ void on_undefine(lexer_type const &it);
     
- void on_ifdef(result_type const& found_directive,
- typename parse_tree_type::const_iterator const &begin,
- typename parse_tree_type::const_iterator const &end);
- void on_ifndef(result_type const& found_directive,
- typename parse_tree_type::const_iterator const &begin,
- typename parse_tree_type::const_iterator const &end);
+ void on_ifdef(result_type const& found_directive, lexer_type const &it);
+// typename parse_tree_type::const_iterator const &end);
+ void on_ifndef(result_type const& found_directive, lexer_type const& it);
+// typename parse_tree_type::const_iterator const &end);
     void on_else();
     void on_endif();
     void on_illformed(typename result_type::string_type s);
@@ -547,11 +552,14 @@
         {
             token_sequence_type rescanned;
             
- std::string pp_number(act_token.get_value().c_str());
+ std::string pp_number(
+ util::to_string<std::string>(act_token.get_value()));
+
             lexer_type it = lexer_type(pp_number.begin(),
                 pp_number.end(), act_token.get_position(),
                 ctx.get_language());
             lexer_type end = lexer_type();
+
             for (/**/; it != end && T_EOF != token_id(*it); ++it)
                 rescanned.push_back(*it);
                 
@@ -614,12 +622,11 @@
                 return act_token = pending_queue.front();
             }
             
- // fetch the current token
- act_token = *iter_ctx->first;
-
         // adjust the current position (line and column)
         bool was_seen_newline = seen_newline || returned_from_include_file;
 
+ // fetch the current token
+ act_token = *iter_ctx->first;
             act_pos = act_token.get_position();
             
         // act accordingly on the current token
@@ -844,8 +851,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace impl {
 
- template <typename ContexT, typename IteratorT>
- bool next_token_is_pp_directive(ContexT &ctx, IteratorT &it, IteratorT const &end)
+ template <typename ContextT, typename IteratorT>
+ bool next_token_is_pp_directive(ContextT &ctx, IteratorT &it, IteratorT const &end)
     {
         using namespace boost::wave;
         
@@ -868,27 +875,51 @@
         return it != end && IS_CATEGORY(id, PPTokenType);
     }
     
- template <typename ContexT, typename IteratorT>
- bool pp_is_last_on_line(ContexT &ctx, IteratorT &it, IteratorT const &end)
+ // call 'found_directive' preprocessing hook
+ template <typename ContextT>
+ bool call_found_directive_hook(ContextT& ctx,
+ typename ContextT::token_type const& found_directive)
+ {
+#if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
+ ctx.get_hooks().found_directive(found_directive);
+#else
+ if (ctx.get_hooks().found_directive(ctx.derived(), found_directive))
+ return true; // skip this directive and return newline only
+#endif
+ return false;
+ }
+
+ // call 'skipped_token' preprocessing hook
+ template <typename ContextT>
+ void call_skipped_token_hook(ContextT& ctx,
+ typename ContextT::token_type const& skipped)
     {
- using namespace boost::wave;
- // this token get's skipped
 #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
- ctx.get_hooks().skipped_token(*it);
+ ctx.get_hooks().skipped_token(skipped);
 #else
- ctx.get_hooks().skipped_token(ctx.derived(), *it);
+ ctx.get_hooks().skipped_token(ctx.derived(), skipped);
 #endif
+ }
+
+ // verify that there is'nt anything significant left on the line
+ template <typename ContextT, typename IteratorT>
+ bool pp_is_last_on_line(ContextT &ctx, IteratorT &it, IteratorT const &end,
+ bool call_hook = true)
+ {
+ using namespace boost::wave;
+
+ // this token get's skipped
+ if (call_hook)
+ call_skipped_token_hook(ctx, *it);
 
         for (++it; it != end; ++it) {
             token_id id = token_id(*it);
+
             if (T_CPPCOMMENT == id || T_NEWLINE == id ||
                 context_policies::util::ccomment_has_newline(*it))
             {
-#if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
- ctx.get_hooks().skipped_token(*it);
-#else
- ctx.get_hooks().skipped_token(ctx.derived(), *it);
-#endif
+ if (call_hook)
+ call_skipped_token_hook(ctx, *it);
                 ++it; // skip eol/C/C++ comment
                 return true; // no more significant tokens on this line
             }
@@ -897,28 +928,22 @@
                 break;
 
             // this token get's skipped
-#if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
- ctx.get_hooks().skipped_token(*it);
-#else
- ctx.get_hooks().skipped_token(ctx.derived(), *it);
-#endif
+ if (call_hook)
+ call_skipped_token_hook(ctx, *it);
         }
         return false;
     }
 
- template <typename ContexT, typename IteratorT>
- bool skip_to_eol(ContexT &ctx, IteratorT &it, IteratorT const &end)
+ ///////////////////////////////////////////////////////////////////////////
+ template <typename ContextT, typename IteratorT>
+ bool skip_to_eol(ContextT &ctx, IteratorT &it, IteratorT const &end)
     {
         using namespace boost::wave;
         
         for (/**/; it != end; ++it) {
         token_id id = token_id(*it);
         
-#if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
- ctx.get_hooks().skipped_token(*it);
-#else
- ctx.get_hooks().skipped_token(ctx.derived(), *it);
-#endif
+ call_skipped_token_hook(ctx, *it);
             if (T_CPPCOMMENT == id || T_NEWLINE == id ||
                 context_policies::util::ccomment_has_newline(*it))
             {
@@ -928,20 +953,113 @@
         }
         return false;
     }
+
+}
+
+///////////////////////////////////////////////////////////////////////////////
+template <typename ContextT>
+template <typename IteratorT>
+inline bool
+pp_iterator_functor<ContextT>::extract_identifier(IteratorT &it)
+{
+ token_id id = util::impl::skip_whitespace(it, iter_ctx->last);
+ if (T_IDENTIFIER == id || IS_CATEGORY(id, KeywordTokenType) ||
+ IS_EXTCATEGORY(id, OperatorTokenType|AltExtTokenType) ||
+ IS_CATEGORY(id, BoolLiteralTokenType))
+ {
+ IteratorT save = it;
+ if (impl::pp_is_last_on_line(ctx, save, iter_ctx->last, false))
+ return true;
+ }
+
+ // report the ill formed directive
+ impl::skip_to_eol(ctx, it, iter_ctx->last);
+
+string_type str(util::impl::as_string<string_type>(iter_ctx->first, it));
+
+ seen_newline = true;
+ iter_ctx->first = it;
+ on_illformed(str);
+ return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+template <typename ContextT>
+template <typename IteratorT>
+inline bool
+pp_iterator_functor<ContextT>::ensure_is_last_on_line(IteratorT& it)
+{
+ if (!impl::pp_is_last_on_line(ctx, it, iter_ctx->last, false))
+ {
+ // enable error recovery (start over with the next line)
+ impl::skip_to_eol(ctx, it, iter_ctx->last);
+
+ string_type str(util::impl::as_string<string_type>(
+ iter_ctx->first, it));
+
+ seen_newline = true;
+ iter_ctx->first = it;
+
+ // report an invalid directive
+ on_illformed(str);
+ return false;
+ }
+
+ if (it == iter_ctx->last && !need_single_line(ctx.get_language()))
+ {
+ // The line doesn't end with an eol but eof token.
+ seen_newline = true; // allow to resume after warning
+ iter_ctx->first = it;
+
+ // Trigger a warning that the last line was not terminated with a
+ // newline.
+ BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
+ last_line_not_terminated, "", act_pos);
+
+ return false;
+ }
+ return true;
 }
 
+template <typename ContextT>
+template <typename IteratorT>
+inline bool
+pp_iterator_functor<ContextT>::skip_to_eol_with_check(IteratorT &it)
+{
+ typename ContextT::string_type value ((*it).get_value());
+ if (!impl::skip_to_eol(ctx, it, iter_ctx->last) &&
+ !need_single_line(ctx.get_language()))
+ {
+ // The line doesn't end with an eol but eof token.
+ seen_newline = true; // allow to resume after warning
+ iter_ctx->first = it;
+
+ // Trigger a warning, that the last line was not terminated with a
+ // newline.
+ BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
+ last_line_not_terminated, "", act_pos);
+ return false;
+ }
+
+// normal line ending reached, adjust iterator and flag
+ seen_newline = true;
+ iter_ctx->first = it;
+ return true;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
-// can_ignore_pp_directive: handle certain pp_directives if if_block_status is
-// false
+// handle_pp_directive: handle certain pp_directives
 template <typename ContextT>
 template <typename IteratorT>
 inline bool
-pp_iterator_functor<ContextT>::can_ignore_pp_directive(IteratorT &it)
+pp_iterator_functor<ContextT>::handle_pp_directive(IteratorT &it)
 {
+ token_id id = token_id(*it);
     bool can_exit = true;
+ if (!ctx.get_if_block_status()) {
     if (IS_EXTCATEGORY(*it, PPConditionalTokenType)) {
     // simulate the if block hierarchy
- switch (static_cast<unsigned int>(token_id(*it))) {
+ switch (static_cast<unsigned int>(id)) {
         case T_PP_IFDEF: // #ifdef
         case T_PP_IFNDEF: // #ifndef
         case T_PP_IF: // #if
@@ -971,49 +1089,143 @@
                 else
                     on_endif();
 
- // make sure, there are no (non-whitespace) tokens left on this line
- string_type value ((*it).get_value());
- if (!impl::pp_is_last_on_line(ctx, it, iter_ctx->last)) {
- // enable error recovery (start over with the next line)
- impl::skip_to_eol(ctx, it, iter_ctx->last);
+ // make sure, there are no (non-whitespace) tokens left on
+ // this line
+ ensure_is_last_on_line(it);
+
+ // we skipped to the end of this line already
                     seen_newline = true;
                     iter_ctx->first = it;
+ }
+ return true;
                 
- // report an invalid #else directive
- on_illformed(value);
+ default: // #something else
+ on_illformed((*it).get_value());
                     break;
                 }
+ }
+ }
+ else {
+ // try to handle the simple pp directives without parsing
+ result_type directive = *it;
+ bool include_next = false;
+ switch (static_cast<unsigned int>(id)) {
+ case T_PP_QHEADER: // #include "..."
+#if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
+ case T_PP_QHEADER_NEXT:
+#endif
+ include_next = (T_PP_QHEADER_NEXT == id) ? true : false;
+ if (!impl::call_found_directive_hook(ctx, *it))
+ {
+ string_type dir((*it).get_value());
 
- // we skipped to the end of this line already
+ // make sure, there are no (non-whitespace) tokens left on
+ // this line
+ if (ensure_is_last_on_line(it))
+ {
+ seen_newline = true;
+ iter_ctx->first = it;
+ on_include (dir, false, include_next);
+ }
+ return true;
+ }
+ break;
+
+ case T_PP_HHEADER: // #include <...>
+#if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
+ case T_PP_HHEADER_NEXT:
+#endif
+ include_next = (T_PP_HHEADER_NEXT == id) ? true : false;
+ if (!impl::call_found_directive_hook(ctx, *it))
+ {
+ string_type dir((*it).get_value());
+
+ // make sure, there are no (non-whitespace) tokens left on
+ // this line
+ if (ensure_is_last_on_line(it))
+ {
                 seen_newline = true;
                 iter_ctx->first = it;
+ on_include (dir, true, include_next);
             }
             return true;
+ }
+ break;
+
+ case T_PP_ELSE: // #else
+ case T_PP_ENDIF: // #endif
+ if (!impl::call_found_directive_hook(ctx, *it))
+ {
+ // handle this directive
+ if (T_PP_ELSE == token_id(*it))
+ on_else();
+ else
+ on_endif();
+
+ // make sure, there are no (non-whitespace) tokens left on
+ // this line
+ ensure_is_last_on_line(it);
               
- default: // #something else
- on_illformed((*it).get_value());
+ // we skipped to the end of this line already
+ seen_newline = true;
+ iter_ctx->first = it;
+ return true;
+ }
             break;
+
+ // extract everything on this line as arguments
+// case T_PP_IF: // #if
+// case T_PP_ELIF: // #elif
+// case T_PP_ERROR: // #error
+// case T_PP_WARNING: // #warning
+// case T_PP_PRAGMA: // #pragma
+// case T_PP_LINE: // #line
+// break;
+
+ // extract first non-whitespace token as argument
+ case T_PP_UNDEF: // #undef
+ if (!impl::call_found_directive_hook(ctx, *it) &&
+ extract_identifier(it))
+ {
+ on_undefine(it);
         }
+ break;
+
+ case T_PP_IFDEF: // #ifdef
+ if (!impl::call_found_directive_hook(ctx, *it) &&
+ extract_identifier(it))
+ {
+ on_ifdef(directive, it);
     }
+ break;
 
-// start over with the next line, if only possible
- if (can_exit) {
- string_type value ((*it).get_value());
- if (!impl::skip_to_eol(ctx, it, iter_ctx->last) &&
- !need_single_line(ctx.get_language()))
+ case T_PP_IFNDEF: // #ifndef
+ if (!impl::call_found_directive_hook(ctx, *it) &&
+ extract_identifier(it))
         {
- // The line doesn't end with an eol but eof token.
- seen_newline = true; // allow to resume after warning
- iter_ctx->first = it;
+ on_ifndef(directive, it);
+ }
+ break;
+
+#if BOOST_WAVE_SUPPORT_MS_EXTENSIONS != 0
+// case T_MSEXT_PP_REGION: // #region ...
+// break;
+//
+// case T_MSEXT_PP_ENDREGION: // #endregion
+// break;
+#endif
             
- // Trigger a warning, that the last line was not terminated with a
- // newline.
- BOOST_WAVE_THROW_CTX(ctx, preprocess_exception,
- last_line_not_terminated, "", act_pos);
+ default:
+ can_exit = false;
+ break;
+ }
         }
+
+// start over with the next line, if only possible
+ if (can_exit) {
+ skip_to_eol_with_check(it);
         return true; // may be safely ignored
     }
-
     return false; // do not ignore this pp directive
 }
 
@@ -1029,7 +1241,7 @@
 lexer_type it = iter_ctx->first;
 
     if (!impl::next_token_is_pp_directive(ctx, it, iter_ctx->last)) {
- // eventually skip null pp directive (no need to do it via the parser)
+ // skip null pp directive (no need to do it via the parser)
         if (it != iter_ctx->last && T_POUND == BASE_TOKEN(token_id(*it))) {
             if (impl::pp_is_last_on_line(ctx, it, iter_ctx->last)) {
             // start over with the next line
@@ -1053,11 +1265,10 @@
 
 // ignore/handle all pp directives not related to conditional compilation while
 // if block status is false
- if (!ctx.get_if_block_status() && can_ignore_pp_directive(it)) {
- // we may skip pp directives only, if the current if block status is false
- seen_newline = true;
- iter_ctx->first = it;
- return true; // the pp directive was handled/skipped
+ if (handle_pp_directive(it)) {
+ // we may skip pp directives only if the current if block status is
+ // false or if it was a #include directive we could handle directly
+ return true; // the pp directive has been handled/skipped
     }
     
 // found a pp directive, so try to identify it, start with the pp_token
@@ -1132,29 +1343,25 @@
 token_id id = token_id(found_directive);
 
     // call preprocessing hook
-#if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
- ctx.get_hooks().found_directive(found_directive);
-#else
- if (ctx.get_hooks().found_directive(ctx.derived(), found_directive))
+ if (impl::call_found_directive_hook(ctx, found_directive))
         return true; // skip this directive and return newline only
-#endif
     
     switch (static_cast<unsigned int>(id)) {
- case T_PP_QHEADER: // #include "..."
-#if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
- case T_PP_QHEADER_NEXT: // #include_next "..."
-#endif
- on_include ((*nodeval.begin()).get_value(), false,
- T_PP_QHEADER_NEXT == id);
- break;
-
- case T_PP_HHEADER: // #include <...>
-#if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
- case T_PP_HHEADER_NEXT: // #include_next <...>
-#endif
- on_include ((*nodeval.begin()).get_value(), true,
- T_PP_HHEADER_NEXT == id);
- break;
+// case T_PP_QHEADER: // #include "..."
+// #if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
+// case T_PP_QHEADER_NEXT: // #include_next "..."
+// #endif
+// on_include ((*nodeval.begin()).get_value(), false,
+// T_PP_QHEADER_NEXT == id);
+// break;
+
+// case T_PP_HHEADER: // #include <...>
+// #if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
+// case T_PP_HHEADER_NEXT: // #include_next <...>
+// #endif
+// on_include ((*nodeval.begin()).get_value(), true,
+// T_PP_HHEADER_NEXT == id);
+// break;
     
     case T_PP_INCLUDE: // #include ...
 #if BOOST_WAVE_SUPPORT_INCLUDE_NEXT != 0
@@ -1167,17 +1374,17 @@
         on_define (*begin);
         break;
 
- case T_PP_UNDEF: // #undef
- on_undefine(*nodeval.begin());
- break;
-
- case T_PP_IFDEF: // #ifdef
- on_ifdef(found_directive, begin_child_it, end_child_it);
- break;
-
- case T_PP_IFNDEF: // #ifndef
- on_ifndef(found_directive, begin_child_it, end_child_it);
- break;
+// case T_PP_UNDEF: // #undef
+// on_undefine(*nodeval.begin());
+// break;
+//
+// case T_PP_IFDEF: // #ifdef
+// on_ifdef(found_directive, begin_child_it, end_child_it);
+// break;
+//
+// case T_PP_IFNDEF: // #ifndef
+// on_ifndef(found_directive, begin_child_it, end_child_it);
+// break;
 
     case T_PP_IF: // #if
         on_if(found_directive, begin_child_it, end_child_it);
@@ -1187,13 +1394,13 @@
         on_elif(found_directive, begin_child_it, end_child_it, found_eoltokens);
         break;
 
- case T_PP_ELSE: // #else
- on_else();
- break;
-
- case T_PP_ENDIF: // #endif
- on_endif();
- break;
+// case T_PP_ELSE: // #else
+// on_else();
+// break;
+
+// case T_PP_ENDIF: // #endif
+// on_endif();
+// break;
 
     case T_PP_LINE: // #line
         on_line(begin_child_it, end_child_it);
@@ -1535,12 +1742,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 template <typename ContextT>
 inline void
-pp_iterator_functor<ContextT>::on_undefine (result_type const &token)
+pp_iterator_functor<ContextT>::on_undefine (lexer_type const &it)
 {
     BOOST_ASSERT(ctx.get_if_block_status());
 
 // retrieve the macro name to undefine from the parse tree
- ctx.remove_macro_definition(token.get_value()); // throws for predefined macros
+ ctx.remove_macro_definition((*it).get_value()); // throws for predefined macros
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1551,27 +1758,30 @@
 template <typename ContextT>
 inline void
 pp_iterator_functor<ContextT>::on_ifdef(
- result_type const& found_directive,
- typename parse_tree_type::const_iterator const &begin,
- typename parse_tree_type::const_iterator const &end)
+ result_type const& found_directive, lexer_type const &it)
+// typename parse_tree_type::const_iterator const &it)
+// typename parse_tree_type::const_iterator const &end)
 {
-get_token_value<result_type, parse_node_type> get_value;
-token_sequence_type toexpand;
-
- std::copy(make_ref_transform_iterator((*begin).children.begin(), get_value),
- make_ref_transform_iterator((*begin).children.end(), get_value),
- std::inserter(toexpand, toexpand.end()));
+// get_token_value<result_type, parse_node_type> get_value;
+// token_sequence_type toexpand;
+//
+// std::copy(make_ref_transform_iterator((*begin).children.begin(), get_value),
+// make_ref_transform_iterator((*begin).children.end(), get_value),
+// std::inserter(toexpand, toexpand.end()));
 
 bool is_defined = false;
+token_sequence_type directive;
+
+ directive.insert(directive.end(), *it);
 
 #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
- is_defined = ctx.is_defined_macro(toexpand.begin(), toexpand.end());
- ctx.get_hooks().evaluated_conditional_expression(toexpand, is_defined);
+ is_defined = ctx.is_defined_macro((*it).get_value()); // toexpand.begin(), toexpand.end());
+ ctx.get_hooks().evaluated_conditional_expression(directive, is_defined);
 #else
     do {
- is_defined = ctx.is_defined_macro(toexpand.begin(), toexpand.end());
+ is_defined = ctx.is_defined_macro((*it).get_value()); // toexpand.begin(), toexpand.end());
     } while (ctx.get_hooks().evaluated_conditional_expression(ctx.derived(),
- found_directive, toexpand, is_defined));
+ found_directive, directive, is_defined));
 #endif
     ctx.enter_if_block(is_defined);
 }
@@ -1584,27 +1794,31 @@
 template <typename ContextT>
 inline void
 pp_iterator_functor<ContextT>::on_ifndef(
- result_type const& found_directive,
- typename parse_tree_type::const_iterator const &begin,
- typename parse_tree_type::const_iterator const &end)
+ result_type const& found_directive, lexer_type const &it)
+// typename parse_tree_type::const_iterator const &it)
+// typename parse_tree_type::const_iterator const &end)
 {
-get_token_value<result_type, parse_node_type> get_value;
-token_sequence_type toexpand;
+// get_token_value<result_type, parse_node_type> get_value;
+// token_sequence_type toexpand;
+//
+// std::copy(make_ref_transform_iterator((*begin).children.begin(), get_value),
+// make_ref_transform_iterator((*begin).children.end(), get_value),
+// std::inserter(toexpand, toexpand.end()));
 
- std::copy(make_ref_transform_iterator((*begin).children.begin(), get_value),
- make_ref_transform_iterator((*begin).children.end(), get_value),
- std::inserter(toexpand, toexpand.end()));
 
 bool is_defined = false;
+token_sequence_type directive;
+
+ directive.insert(directive.end(), *it);
 
 #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
- is_defined = ctx.is_defined_macro(toexpand.begin(), toexpand.end());
- ctx.get_hooks().evaluated_conditional_expression(toexpand, is_defined);
+ is_defined = ctx.is_defined_macro((*it).get_value()); // toexpand.begin(), toexpand.end());
+ ctx.get_hooks().evaluated_conditional_expression(directive, is_defined);
 #else
     do {
- is_defined = ctx.is_defined_macro(toexpand.begin(), toexpand.end());
+ is_defined = ctx.is_defined_macro((*it).get_value()); // toexpand.begin(), toexpand.end());
     } while (ctx.get_hooks().evaluated_conditional_expression(ctx.derived(),
- found_directive, toexpand, is_defined));
+ found_directive, directive, is_defined));
 #endif
     ctx.enter_if_block(!is_defined);
 }
@@ -1902,7 +2116,7 @@
                 error = preprocess_exception::bad_line_number;
 
         // re-extract line number with spirit to diagnose overflow
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
             if (!parse((*first).get_value().c_str(), int_p).full)
                 error = preprocess_exception::bad_line_number;
                 
@@ -2228,7 +2442,7 @@
 
 template <typename ContextT>
 class pp_iterator
-: public boost::spirit::multi_pass<
+: public boost::spirit::classic::multi_pass<
         boost::wave::impl::pp_iterator_functor<ContextT>,
         boost::wave::util::functor_input
>
@@ -2238,7 +2452,7 @@
 
 private:
     typedef
- boost::spirit::multi_pass<input_policy_type, boost::wave::util::functor_input>
+ boost::spirit::classic::multi_pass<input_policy_type, boost::wave::util::functor_input>
         base_type;
     typedef pp_iterator<ContextT> self_type;
     typedef boost::wave::util::functor_input functor_input_type;

Modified: trunk/boost/wave/util/cpp_macromap.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_macromap.hpp (original)
+++ trunk/boost/wave/util/cpp_macromap.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -100,13 +100,12 @@
         typename defined_macros_type::iterator &it,
         defined_macros_type *scope = 0) const;
         
- // expects a token sequence as its parameters
+// expects a token sequence as its parameters
     template <typename IteratorT>
     bool is_defined(IteratorT const &begin, IteratorT const &end) const;
     
- // expects an arbitrary string as its parameter
- template<typename StringT>
- bool is_defined(StringT const &str) const;
+// expects an arbitrary string as its parameter
+ bool is_defined(string_type const &str) const;
 
 // Get the macro definition for the given macro scope
     bool get_macro(string_type const &name, bool &has_parameters,
@@ -116,7 +115,8 @@
         defined_macros_type *scope = 0) const;
         
 // Remove a macro name from the given macro scope
- bool remove_macro(token_type const &token, bool even_predefined = false);
+ bool remove_macro(string_type const &name, position_type const& pos,
+ bool even_predefined = false);
     
     template <typename IteratorT, typename ContainerT>
     token_type const &expand_tokensequence(IteratorT &first,
@@ -309,9 +309,10 @@
 
     if (it != current_scope->end()) {
     // redefinition, should not be different
- if ((*it).second->is_functionlike != has_parameters ||
- !impl::parameters_equal((*it).second->macroparameters, parameters) ||
- !impl::definition_equals((*it).second->macrodefinition, definition))
+ macro_definition_type* macrodef = (*it).second.get();
+ if (macrodef->is_functionlike != has_parameters ||
+ !impl::parameters_equal(macrodef->macroparameters, parameters) ||
+ !impl::definition_equals(macrodef->macrodefinition, definition))
         {
             BOOST_WAVE_THROW_NAME_CTX(ctx, macro_handling_exception,
                 macro_redefinition, name.get_value().c_str(), main_pos,
@@ -440,13 +441,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 // same as above, only takes an arbitrary string type as its parameter
 template <typename ContextT>
-template<typename StringT>
 inline bool
-macromap<ContextT>::is_defined(StringT const &str) const
+macromap<ContextT>::is_defined(string_type const &str) const
 {
- string_type name(str.c_str());
     typename defined_macros_type::iterator cit;
- return is_defined(name, cit, 0);
+ return is_defined(str, cit, 0);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -483,10 +482,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 template <typename ContextT>
 inline bool
-macromap<ContextT>::remove_macro(token_type const &token,
- bool even_predefined)
+macromap<ContextT>::remove_macro(string_type const &name,
+ position_type const& pos, bool even_predefined)
 {
- string_type name (token.get_value());
     typename defined_macros_type::iterator it = current_macros->find(name);
     
     if (it != current_macros->end()) {
@@ -500,16 +498,18 @@
         current_macros->erase(it);
         
     // call the context supplied preprocessing hook function
+ token_type tok(T_IDENTIFIER, name, pos);
+
 #if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0
- ctx.get_hooks().undefined_macro(token);
+ ctx.get_hooks().undefined_macro(tok);
 #else
- ctx.get_hooks().undefined_macro(ctx.derived(), token);
+ ctx.get_hooks().undefined_macro(ctx.derived(), tok);
 #endif
         return true;
     }
     else if (impl::is_special_macroname(name)) {
         BOOST_WAVE_THROW_CTX(ctx, preprocess_exception, bad_undefine_statement,
- name.c_str(), main_pos);
+ name.c_str(), pos);
     }
     return false; // macro was not defined
 }
@@ -1451,7 +1451,7 @@
 
 ContainerT result;
 IteratorT start = first;
-boost::spirit::parse_info<IteratorT> hit =
+boost::spirit::classic::parse_info<IteratorT> hit =
     defined_grammar_gen<typename ContextT::lexer_type>::
         parse_operator_defined(start, last, result);
     

Modified: trunk/boost/wave/util/cpp_macromap_utils.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_macromap_utils.hpp (original)
+++ trunk/boost/wave/util/cpp_macromap_utils.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -171,13 +171,7 @@
 {
     using namespace boost::wave;
     
-#if BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS != 0
- if (T_PARAMETERBASE == token_id(left) ||
- T_EXTPARAMETERBASE == token_id(left))
-#else
- if (T_PARAMETERBASE == token_id(left))
-#endif
- {
+ if (IS_CATEGORY(left, ParameterTokenType)) {
     // if the existing token is of type T_PARAMETERBASE, then the right token
     // must be of type T_IDENTIFIER or a keyword
     token_id id = token_id(right);
@@ -501,8 +495,52 @@
 };
 
 ///////////////////////////////////////////////////////////////////////////////
+// Convert a string of an arbitrary string compatible type to a internal
+// string (BOOST_WAVE_STRING)
+template <typename Target, typename Src>
+struct to_string_helper
+{
+ typedef Target type;
+
+ static Target call(Src const& str)
+ {
+ return Target(str.c_str());
+ }
+};
+
+// do nothing if types are equal
+template <typename Src>
+struct to_string_helper<Src, Src>
+{
+ typedef Src const& type;
+
+ static Src const& call(Src const& str)
+ {
+ return str;
+ }
+};
+
+template <typename Target>
+struct to_string_helper<Target, char const*>
+{
+ typedef Target type;
+
+ static Target call(char const* str)
+ {
+ return Target(str);
+ }
+};
+
+///////////////////////////////////////////////////////////////////////////////
 } // namespace impl
 
+template <typename Target, typename Src>
+inline typename impl::to_string_helper<Target, Src>::type
+to_string(Src const& src)
+{
+ return impl::to_string_helper<Target, Src>::call(src);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 } // namespace util
 } // namespace wave

Modified: trunk/boost/wave/util/file_position.hpp
==============================================================================
--- trunk/boost/wave/util/file_position.hpp (original)
+++ trunk/boost/wave/util/file_position.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -17,8 +17,8 @@
 #include <ostream>
 
 #include <boost/assert.hpp>
-#include <boost/spirit/version.hpp>
-#include <boost/spirit/iterator/position_iterator.hpp>
+#include <boost/spirit/include/classic_version.hpp>
+#include <boost/spirit/include/classic_position_iterator.hpp>
 #include <boost/wave/wave_config.hpp>
 #if BOOST_WAVE_SERIALIZATION != 0
 #include <boost/serialization/serialization.hpp>
@@ -144,16 +144,16 @@
 //
 // The position_iterator used by Wave is now based on the corresponding Spirit
 // type. This type is used with our own file_position though. The needed
-// specialization of the boost::spirit::position_policy class is provided
-// below.
+// specialization of the boost::spirit::classic::position_policy class is
+// provided below.
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 template <typename IteratorT, typename PositionT>
 struct position_iterator
-: boost::spirit::position_iterator<IteratorT, PositionT>
+: boost::spirit::classic::position_iterator<IteratorT, PositionT>
 {
- typedef boost::spirit::position_iterator<IteratorT, PositionT> base_type;
+ typedef boost::spirit::classic::position_iterator<IteratorT, PositionT> base_type;
     
     position_iterator()
     {
@@ -172,13 +172,11 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-#if SPIRIT_VERSION >= 0x1700
-
-namespace spirit {
+namespace spirit { namespace classic {
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-// The boost::spirit::position_policy has to be specialized for our
+// The boost::spirit::classic::position_policy has to be specialized for our
 // file_position class
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -218,9 +216,7 @@
     };
 
 ///////////////////////////////////////////////////////////////////////////////
-} // namespace spirit
-
-#endif // SPIRIT_VERSION >= 0x1700
+}} // namespace spirit::classic
 
 } // namespace boost
 

Modified: trunk/boost/wave/util/flex_string.hpp
==============================================================================
--- trunk/boost/wave/util/flex_string.hpp (original)
+++ trunk/boost/wave/util/flex_string.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -1430,7 +1430,6 @@
 
     struct Invariant;
     friend struct Invariant;
-
     struct Invariant
     {
         Invariant(const flex_string& s) : s_(s)

Modified: trunk/boost/wave/util/functor_input.hpp
==============================================================================
--- trunk/boost/wave/util/functor_input.hpp (original)
+++ trunk/boost/wave/util/functor_input.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -12,7 +12,7 @@
 #define FUNCTOR_INPUT_HPP_ED3A4C21_8F8A_453F_B438_08214FAC106A_INCLUDED
 
 #include <boost/assert.hpp>
-#include <boost/spirit/iterator/multi_pass.hpp>
+#include <boost/spirit/include/classic_multi_pass.hpp>
 #include <boost/wave/wave_config.hpp>
 
 // this must occur after all of the includes and before any code appears
@@ -100,7 +100,7 @@
 
         void swap(inner &x)
         {
- boost::spirit::impl::mp_swap(data, x.data);
+ boost::spirit::classic::impl::mp_swap(data, x.data);
         }
         
         void ensure_initialized() const

Modified: trunk/boost/wave/util/interpret_pragma.hpp
==============================================================================
--- trunk/boost/wave/util/interpret_pragma.hpp (original)
+++ trunk/boost/wave/util/interpret_pragma.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -14,12 +14,10 @@
 #include <string>
 #include <list>
 
-#include <boost/spirit/core.hpp>
-#if SPIRIT_VERSION >= 0x1700
-#include <boost/spirit/actor/assign_actor.hpp>
-#include <boost/spirit/actor/push_back_actor.hpp>
-#endif // SPIRIT_VERSION >= 0x1700
-#include <boost/spirit/utility/confix.hpp>
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_assign_actor.hpp>
+#include <boost/spirit/include/classic_push_back_actor.hpp>
+#include <boost/spirit/include/classic_confix.hpp>
 
 #include <boost/wave/wave_config.hpp>
 
@@ -32,13 +30,8 @@
 #include <boost/wave/language_support.hpp>
 
 #if !defined(spirit_append_actor)
-#if SPIRIT_VERSION >= 0x1700
-#define spirit_append_actor(actor) boost::spirit::push_back_a(actor)
-#define spirit_assign_actor(actor) boost::spirit::assign_a(actor)
-#else
-#define spirit_append_actor(actor) boost::spirit::append(actor)
-#define spirit_assign_actor(actor) boost::spirit::assign(actor)
-#endif // SPIRIT_VERSION >= 0x1700
+#define spirit_append_actor(actor) boost::spirit::classic::push_back_a(actor)
+#define spirit_assign_actor(actor) boost::spirit::classic::assign_a(actor)
 #endif // !defined(spirit_append_actor)
 
 // this must occur after all of the includes and before any code appears
@@ -83,7 +76,7 @@
         //
         // All recognized #pragma operators are forwarded to the supplied
         // preprocessing hook.
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
             token_type option;
             ContainerT values;
             
@@ -156,7 +149,7 @@
 #if BOOST_WAVE_SUPPORT_PRAGMA_MESSAGE != 0
         else if ((*it).get_value() == "message") {
         // #pragma message(...) or #pragma message ...
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
             ContainerT values;
             
             if (!parse (++it, end,

Modified: trunk/boost/wave/util/macro_definition.hpp
==============================================================================
--- trunk/boost/wave/util/macro_definition.hpp (original)
+++ trunk/boost/wave/util/macro_definition.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -14,6 +14,9 @@
 #include <vector>
 #include <list>
 
+#include <boost/detail/atomic_count.hpp>
+#include <boost/intrusive_ptr.hpp>
+
 #include <boost/wave/wave_config.hpp>
 #if BOOST_WAVE_SERIALIZATION != 0
 #include <boost/serialization/serialization.hpp>
@@ -59,6 +62,7 @@
 #if BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS != 0
         , has_ellipsis(false)
 #endif
+ , use_count(0)
     {
     }
     // generated copy constructor
@@ -131,6 +135,7 @@
 #if BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS != 0
     bool has_ellipsis;
 #endif
+ boost::detail::atomic_count use_count;
 
 #if BOOST_WAVE_SERIALIZATION != 0
     // default constructor is needed for serialization only
@@ -140,6 +145,7 @@
 #if BOOST_WAVE_SUPPORT_VARIADICS_PLACEMARKERS != 0
       , has_ellipsis(false)
 #endif
+ , use_count(0)
     {}
 
 private:
@@ -164,6 +170,22 @@
 };
 
 ///////////////////////////////////////////////////////////////////////////////
+template <typename TokenT, typename ContainerT>
+inline void
+intrusive_ptr_add_ref(macro_definition<TokenT, ContainerT>* p)
+{
+ ++p->use_count;
+}
+
+template <typename TokenT, typename ContainerT>
+inline void
+intrusive_ptr_release(macro_definition<TokenT, ContainerT>* p)
+{
+ if (--p->use_count == 0)
+ delete p;
+}
+
+///////////////////////////////////////////////////////////////////////////////
 } // namespace util
 } // namespace wave
 } // namespace boost

Modified: trunk/boost/wave/util/macro_helpers.hpp
==============================================================================
--- trunk/boost/wave/util/macro_helpers.hpp (original)
+++ trunk/boost/wave/util/macro_helpers.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -253,6 +253,40 @@
     }
 #endif
 
+ // Skip all whitespace characters and queue the skipped characters into the
+ // given container
+ template <typename IteratorT>
+ inline boost::wave::token_id
+ skip_whitespace(IteratorT &first, IteratorT const &last)
+ {
+ token_id id = next_token<IteratorT>::peek(first, last, false);
+ if (IS_CATEGORY(id, WhiteSpaceTokenType)) {
+ do {
+ ++first;
+ id = next_token<IteratorT>::peek(first, last, false);
+ } while (IS_CATEGORY(id, WhiteSpaceTokenType));
+ }
+ ++first;
+ return id;
+ }
+
+ template <typename IteratorT, typename ContainerT>
+ inline boost::wave::token_id
+ skip_whitespace(IteratorT &first, IteratorT const &last, ContainerT &queue)
+ {
+ queue.push_back (*first); // queue up the current token
+
+ token_id id = next_token<IteratorT>::peek(first, last, false);
+ if (IS_CATEGORY(id, WhiteSpaceTokenType)) {
+ do {
+ queue.push_back(*++first); // queue up the next whitespace
+ id = next_token<IteratorT>::peek(first, last, false);
+ } while (IS_CATEGORY(id, WhiteSpaceTokenType));
+ }
+ ++first;
+ return id;
+ }
+
 } // namespace impl
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/wave/util/pattern_parser.hpp
==============================================================================
--- trunk/boost/wave/util/pattern_parser.hpp (original)
+++ trunk/boost/wave/util/pattern_parser.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -13,7 +13,7 @@
 #if !defined(BOOST_SPIRIT_PATTERN_PARSER_HPP)
 #define BOOST_SPIRIT_PATTERN_PARSER_HPP
 
-#include <boost/spirit/core/primitives/primitives.hpp>
+#include <boost/spirit/include/classic_primitives.hpp>
 #include <boost/wave/wave_config.hpp>
 
 // this must occur after all of the includes and before any code appears
@@ -32,7 +32,8 @@
     //
     ///////////////////////////////////////////////////////////////////////////
     template <typename CharT = char>
- struct pattern_and : public boost::spirit::char_parser<pattern_and<CharT> >
+ struct pattern_and
+ : public boost::spirit::classic::char_parser<pattern_and<CharT> >
     {
         pattern_and(CharT pattern_, unsigned long pattern_mask_ = 0UL)
         : pattern(pattern_),

Modified: trunk/boost/wave/util/symbol_table.hpp
==============================================================================
--- trunk/boost/wave/util/symbol_table.hpp (original)
+++ trunk/boost/wave/util/symbol_table.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -14,7 +14,7 @@
 #include <map>
 
 #include <boost/wave/wave_config.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/intrusive_ptr.hpp>
 
 #if BOOST_WAVE_SERIALIZATION != 0
 #include <boost/serialization/serialization.hpp>
@@ -41,9 +41,9 @@
 
 template <typename StringT, typename MacroDefT>
 struct symbol_table
-: public std::map<StringT, boost::shared_ptr<MacroDefT> >
+: public std::map<StringT, boost::intrusive_ptr<MacroDefT> >
 {
- typedef std::map<StringT, boost::shared_ptr<MacroDefT> > base_type;
+ typedef std::map<StringT, boost::intrusive_ptr<MacroDefT> > base_type;
     typedef typename base_type::iterator iterator_type;
     typedef typename base_type::const_iterator const_iterator_type;
     

Modified: trunk/boost/wave/util/time_conversion_helper.hpp
==============================================================================
--- trunk/boost/wave/util/time_conversion_helper.hpp (original)
+++ trunk/boost/wave/util/time_conversion_helper.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -15,21 +15,14 @@
 #include <cstring>
 
 #include <boost/config.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/symbols.hpp>
-#if SPIRIT_VERSION >= 0x1700
-#include <boost/spirit/actor/assign_actor.hpp>
-#include <boost/spirit/actor/push_back_actor.hpp>
-#endif // SPIRIT_VERSION >= 0x1700
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_symbols.hpp>
+#include <boost/spirit/include/classic_assign_actor.hpp>
+#include <boost/spirit/include/classic_push_back_actor.hpp>
 
 #if !defined(spirit_append_actor)
-#if SPIRIT_VERSION >= 0x1700
-#define spirit_append_actor(actor) boost::spirit::push_back_a(actor)
-#define spirit_assign_actor(actor) boost::spirit::assign_a(actor)
-#else
-#define spirit_append_actor(actor) boost::spirit::append(actor)
-#define spirit_assign_actor(actor) boost::spirit::assign(actor)
-#endif // SPIRIT_VERSION >= 0x1700
+#define spirit_append_actor(actor) boost::spirit::classic::push_back_a(actor)
+#define spirit_assign_actor(actor) boost::spirit::classic::assign_a(actor)
 #endif // !defined(spirit_append_actor)
 
 // this must occur after all of the includes and before any code appears
@@ -56,7 +49,7 @@
 // Grammar for parsing a date/time string generated by the C++ compiler from
 // __DATE__ and __TIME__
     class time_conversion_grammar :
- public boost::spirit::grammar<time_conversion_grammar>
+ public boost::spirit::classic::grammar<time_conversion_grammar>
     {
     public:
         time_conversion_grammar() : fYearIsCorrected(false)
@@ -72,8 +65,8 @@
         
             definition(time_conversion_grammar const &self)
             {
- using boost::spirit::int_p;
- using boost::spirit::add;
+ using boost::spirit::classic::int_p;
+ using boost::spirit::classic::add;
                 
             char const *m[] = {
                     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
@@ -95,10 +88,10 @@
                 BOOST_SPIRIT_DEBUG_TRACE_RULE(time_rule, TRACE_CPP_TIME_CONVERSION);
             }
             
- boost::spirit::rule<ScannerT> time_rule;
- boost::spirit::symbols<> month;
+ boost::spirit::classic::rule<ScannerT> time_rule;
+ boost::spirit::classic::symbols<> month;
 
- boost::spirit::rule<ScannerT> const&
+ boost::spirit::classic::rule<ScannerT> const&
             start() const { return time_rule; }
         };
     
@@ -122,7 +115,7 @@
     public:
         time_conversion_helper(char const *act_time) : compile_time(0)
         {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
             
         time_conversion_grammar g;
         parse_info<> pi = parse (act_time, g, space_p);

Modified: trunk/boost/wave/util/unput_queue_iterator.hpp
==============================================================================
--- trunk/boost/wave/util/unput_queue_iterator.hpp (original)
+++ trunk/boost/wave/util/unput_queue_iterator.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -411,40 +411,6 @@
         }
     };
 
- // Skip all whitespace characters and queue the skipped characters into the
- // given container
- template <typename IteratorT>
- inline boost::wave::token_id
- skip_whitespace(IteratorT &first, IteratorT const &last)
- {
- token_id id = next_token<IteratorT>::peek(first, last, false);
- if (IS_CATEGORY(id, WhiteSpaceTokenType)) {
- do {
- ++first;
- id = next_token<IteratorT>::peek(first, last, false);
- } while (IS_CATEGORY(id, WhiteSpaceTokenType));
- }
- ++first;
- return id;
- }
-
- template <typename IteratorT, typename ContainerT>
- inline boost::wave::token_id
- skip_whitespace(IteratorT &first, IteratorT const &last, ContainerT &queue)
- {
- queue.push_back (*first); // queue up the current token
-
- token_id id = next_token<IteratorT>::peek(first, last, false);
- if (IS_CATEGORY(id, WhiteSpaceTokenType)) {
- do {
- queue.push_back(*++first); // queue up the next whitespace
- id = next_token<IteratorT>::peek(first, last, false);
- } while (IS_CATEGORY(id, WhiteSpaceTokenType));
- }
- ++first;
- return id;
- }
-
 ///////////////////////////////////////////////////////////////////////////////
 } // namespace impl
 

Modified: trunk/boost/wave/wave_config.hpp
==============================================================================
--- trunk/boost/wave/wave_config.hpp (original)
+++ trunk/boost/wave/wave_config.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -16,7 +16,7 @@
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 #include <boost/version.hpp>
-#include <boost/spirit/version.hpp>
+#include <boost/spirit/include/classic_version.hpp>
 #include <boost/wave/wave_version.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -177,44 +177,22 @@
 #endif
 
 #else
+
 // use the following, if you have a fast std::allocator<char>
-#define BOOST_WAVE_STRINGTYPE boost::wave::util::flex_string< \
- char, std::char_traits<char>, std::allocator<char>, \
- boost::wave::util::CowString</*char, */\
- boost::wave::util::AllocatorStringStorage<char> \
- > \
- > \
+#define BOOST_WAVE_STRINGTYPE boost::wave::util::flex_string< \
+ char, std::char_traits<char>, std::allocator<char>, \
+ boost::wave::util::CowString< \
+ boost::wave::util::AllocatorStringStorage<char> \
+ > \
+ > \
     /**/
     
-/* #define BOOST_WAVE_STRINGTYPE boost::wave::util::flex_string< \
- char, std::char_traits<char>, boost::fast_pool_allocator<char>, \
- boost::wave::util::CowString<char, \
- boost::wave::util::AllocatorStringStorage<char, \
- boost::fast_pool_allocator<char> \
- > \
- > \
- > \
-*/ /**/
-
 // This include is needed for the flex_string class used in the
 // BOOST_WAVE_STRINGTYPE above.
 #include <boost/wave/util/flex_string.hpp>
 
-// This include is needed for the boost::fast_allocator class used in the
-// BOOST_WAVE_STRINGTYPE above.
-// #include <boost/pool/pool_alloc.hpp>
-
-// Use the following, if you want to incorporate Maxim Yegorushkin's
-// const_string library (http://sourceforge.net/projects/conststring/), which
-// may be even faster than using the flex_string class from above
-//#define BOOST_WAVE_STRINGTYPE boost::const_string<char>
-//
-//#include <boost/const_string/const_string.hpp>
-//#include <boost/const_string/io.hpp>
-//#include <boost/const_string/concatenation.hpp>
-
-#endif // BOOST_WORKAROUND(_MSC_VER, <= 1300)
-#endif
+#endif // BOOST_WORKAROUND(_MSC_VER, <= 1300) et.al.
+#endif // !defined(BOOST_WAVE_STRINGTYPE)
 
 ///////////////////////////////////////////////////////////////////////////////
 // The following definition forces the Spirit tree code to use list's instead
@@ -417,7 +395,7 @@
 #define PHOENIX_LIMIT 6
 #endif
 #if PHOENIX_LIMIT < 6
-// boost/spirit/attribute.hpp sets PHOENIX_LIMIT to 3!
+// boost/home/classic/spirit/classic_attribute.hpp sets PHOENIX_LIMIT to 3!
 #error "Boost.Wave: the constant PHOENIX_LIMIT must be at least defined to 6" \
 " to compile the library."
 #endif

Modified: trunk/boost/wave/wave_version.hpp
==============================================================================
--- trunk/boost/wave/wave_version.hpp (original)
+++ trunk/boost/wave/wave_version.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -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 0x010400
+#define BOOST_WAVE_VERSION 0x020000
 
 // The following defines contain the same information as above
-#define BOOST_WAVE_VERSION_MAJOR 1
-#define BOOST_WAVE_VERSION_MINOR 4
+#define BOOST_WAVE_VERSION_MAJOR 2
+#define BOOST_WAVE_VERSION_MINOR 0
 #define BOOST_WAVE_VERSION_SUBMINOR 0
 
 #endif // !defined(WAVE_VERSION_H_9D79ABDB_AC54_4C0A_89B1_F70A2DCFE21E_INCLUDED)

Modified: trunk/libs/filesystem/src/exception.cpp
==============================================================================
--- trunk/libs/filesystem/src/exception.cpp (original)
+++ trunk/libs/filesystem/src/exception.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -16,7 +16,7 @@
 
 #include <boost/filesystem/config.hpp>
 #include <boost/filesystem/path.hpp>
-#include <boost/filesystem/cerrno.hpp>
+#include <boost/cerrno.hpp>
 
 namespace fs = boost::filesystem;
 

Modified: trunk/libs/wave/ChangeLog
==============================================================================
--- trunk/libs/wave/ChangeLog (original)
+++ trunk/libs/wave/ChangeLog 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -25,7 +25,7 @@
 CHANGELOG
 
 Boost V1.36
-- Wave Version 1.4
+- Wave Version 2.0
 - Added an additional template parameter to the context object, allowing to
   specify any possibly derived type. This change propagates to the preprocessing
   hooks, which now get passed the most derived context type as its first
@@ -41,6 +41,12 @@
   triggered an error in constructs like #ifndef __FILE__. Thanks to Daniel
   Wadehn for reporting and supplying a patch. Added corresponding regression
   test: t_2_018.cpp.
+- Fixed a bug which reported a valid macro definition as invalid if the macro
+ replacement text referred to a second or higher parameter of this macro.
+- Fixed a problem in the wave tool to allow two errors to occur while
+ preprocessing two consecutive tokens.
+- Adjusted Spirit header includes to point to conform to the new directory
+ structure, removed support for Spirit versions earlier than V1.7.
 
 Boost V1.35.0
 - Wave Version 1.3

Modified: trunk/libs/wave/samples/cpp_tokens/cpp_tokens.cpp
==============================================================================
--- trunk/libs/wave/samples/cpp_tokens/cpp_tokens.cpp (original)
+++ trunk/libs/wave/samples/cpp_tokens/cpp_tokens.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -32,7 +32,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // import required names
-using namespace boost::spirit;
+using namespace boost::spirit::classic;
 
 using std::string;
 using std::getline;

Modified: trunk/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp
==============================================================================
--- trunk/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp (original)
+++ trunk/libs/wave/samples/cpp_tokens/slex/cpp_slex_lexer.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -19,7 +19,7 @@
 #endif // defined(BOOST_SPIRIT_DEBUG)
 
 #include <boost/assert.hpp>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/classic_core.hpp>
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/language_support.hpp>
@@ -60,7 +60,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 //
-// encapsulation of the boost::spirit::slex based cpp lexer
+// encapsulation of the boost::spirit::classic::slex based cpp lexer
 //
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -69,14 +69,14 @@
 // bug (at least up to CW V9.5).
 template <typename IteratorT, typename PositionT>
 class lexer_base
-: public boost::spirit::lexer<
+: public boost::spirit::classic::lexer<
         boost::wave::util::position_iterator<IteratorT, PositionT> >
 {
 protected:
     typedef boost::wave::util::position_iterator<IteratorT, PositionT>
         iterator_type;
     typedef typename std::iterator_traits<IteratorT>::value_type char_type;
- typedef boost::spirit::lexer<iterator_type> base_type;
+ typedef boost::spirit::classic::lexer<iterator_type> base_type;
 
     lexer_base();
     

Modified: trunk/libs/wave/samples/cpp_tokens/slex/lexer.hpp
==============================================================================
--- trunk/libs/wave/samples/cpp_tokens/slex/lexer.hpp (original)
+++ trunk/libs/wave/samples/cpp_tokens/slex/lexer.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -42,10 +42,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include <boost/throw_exception.hpp>
 
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/symbols/symbols.hpp>
-#include <boost/spirit/utility/chset.hpp>
-#include <boost/spirit/utility/escape_char.hpp>
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_symbols.hpp>
+#include <boost/spirit/include/classic_chset.hpp>
+#include <boost/spirit/include/classic_escape_char.hpp>
 
 #include <set>
 #include <map>
@@ -57,10 +57,6 @@
 #include <boost/assert.hpp>
 #include <boost/limits.hpp>
 
-#if SPIRIT_VERSION < 0x1700 && defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
-#include <boost/spirit/core/impl/msvc.hpp>
-#endif
-
 #if defined(BOOST_NO_STD_ITERATOR_TRAITS)
 #define BOOST_SPIRIT_IT_NS impl
 #else
@@ -70,6 +66,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost {
 namespace spirit {
+namespace classic {
 
 typedef unsigned char uchar;
 typedef unsigned int node_id_t;
@@ -1887,7 +1884,7 @@
 // lexeme definitions passed to lexer::register_regex.
 //
 ///////////////////////////////////////////////////////////////////////////////
-class lexer_grammar : public boost::spirit::grammar<lexer_grammar>
+class lexer_grammar : public boost::spirit::classic::grammar<lexer_grammar>
 {
 public:
     lexer_grammar(std::stack<node*> &node_stack_)
@@ -2890,6 +2887,7 @@
     return m_ignore_current_token;
 }
 
+} // namespace classic
 } // namespace spirit
 } // namespace boost
 

Modified: trunk/libs/wave/samples/cpp_tokens/slex_iterator.hpp
==============================================================================
--- trunk/libs/wave/samples/cpp_tokens/slex_iterator.hpp (original)
+++ trunk/libs/wave/samples/cpp_tokens/slex_iterator.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -18,7 +18,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/spirit/iterator/multi_pass.hpp>
+#include <boost/spirit/include/classic_multi_pass.hpp>
 
 #include <boost/wave/language_support.hpp>
 #include <boost/wave/util/file_position.hpp>
@@ -60,7 +60,8 @@
 #endif // 0 != __DECCXX_VER
     {}
 
-// interface to the boost::spirit::multi_pass_policies::functor_input policy
+// interface to the boost::spirit::classic::multi_pass_policies::functor_input
+// policy
     typedef TokenT result_type;
 
     BOOST_WAVE_EOF_PREFIX result_type const eof;
@@ -122,14 +123,14 @@
 
 template <typename TokenT>
 class slex_iterator
-: public boost::spirit::multi_pass<
+: public boost::spirit::classic::multi_pass<
         impl::slex_iterator_functor_shim<TokenT>,
         boost::wave::util::functor_input
>
 {
     typedef impl::slex_iterator_functor_shim<TokenT> input_policy_type;
     typedef
- boost::spirit::multi_pass<input_policy_type,
+ boost::spirit::classic::multi_pass<input_policy_type,
                 boost::wave::util::functor_input>
         base_type;
     

Modified: trunk/libs/wave/samples/hannibal/hannibal.cpp
==============================================================================
--- trunk/libs/wave/samples/hannibal/hannibal.cpp (original)
+++ trunk/libs/wave/samples/hannibal/hannibal.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -18,8 +18,8 @@
 #include <string>
 #include <vector>
 
-#include <boost/spirit/tree/ast.hpp>
-#include <boost/spirit/tree/tree_to_xml.hpp>
+#include <boost/spirit/include/classic_ast.hpp>
+#include <boost/spirit/include/classic_tree_to_xml.hpp>
 #include <boost/program_options.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -244,20 +244,20 @@
     translation_unit_skipper s;
 
 #if HANNIBAL_DUMP_PARSE_TREE != 0
- typedef boost::spirit::tree_parse_info<context_type::iterator_type>
+ typedef boost::spirit::classic::tree_parse_info<context_type::iterator_type>
         result_type;
     translation_unit_grammar::rule_map_type rule_map;
     translation_unit_grammar g(&rule_map);
 
     // parse the input file
- result_type pi = boost::spirit::ast_parse(first, last, g, s);
+ result_type pi = boost::spirit::classic::ast_parse(first, last, g, s);
 #else
- typedef boost::spirit::parse_info<context_type::iterator_type>
+ typedef boost::spirit::classic::parse_info<context_type::iterator_type>
         result_type;
     translation_unit_grammar g;
 
     // parse the input file
- result_type pi = boost::spirit::parse(first, last, g, s);
+ result_type pi = boost::spirit::classic::parse(first, last, g, s);
 #endif
 
         if (pi.full) {
@@ -266,7 +266,7 @@
 
 #if HANNIBAL_DUMP_PARSE_TREE != 0
             // generate xml dump from parse tree, if requested
- boost::spirit::tree_to_xml(std::cerr, pi.trees, "", rule_map,
+ boost::spirit::classic::tree_to_xml(std::cerr, pi.trees, "", rule_map,
                 &get_token_id, &get_token_value);
 #endif
         }

Modified: trunk/libs/wave/samples/hannibal/translation_unit_parser.h
==============================================================================
--- trunk/libs/wave/samples/hannibal/translation_unit_parser.h (original)
+++ trunk/libs/wave/samples/hannibal/translation_unit_parser.h 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -15,8 +15,8 @@
 #include <map>
 
 #include <boost/assert.hpp>
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/confix.hpp>
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_confix.hpp>
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/token_ids.hpp>
@@ -99,7 +99,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 struct translation_unit_grammar
-: public boost::spirit::grammar<translation_unit_grammar>
+: public boost::spirit::classic::grammar<translation_unit_grammar>
 {
 #if HANNIBAL_DUMP_PARSE_TREE != 0
 //
@@ -110,7 +110,9 @@
 // Please Note: the lifetime of the rule map should at least extend beyond the
 // call of the definition constructor...
 //
- typedef std::map<boost::spirit::parser_id, std::string> rule_map_type;
+ typedef std::map<boost::spirit::classic::parser_id, std::string>
+ rule_map_type;
+
     translation_unit_grammar(rule_map_type *rule_map_ptr_ = 0)
     : rule_map_ptr(rule_map_ptr_)
 #else
@@ -125,7 +127,7 @@
     struct definition
     {
         // declare non-terminals
- typedef boost::spirit::rule<ScannerT> rule_type;
+ typedef boost::spirit::classic::rule<ScannerT> rule_type;
 
         rule_type constant_expression;
         rule_type logical_or_exp, logical_and_exp;
@@ -135,8 +137,8 @@
         rule_type add_exp, multiply_exp;
         rule_type unary_exp, primary_exp, constant;
 
- boost::spirit::subrule<0> const_exp_subrule;
- boost::spirit::subrule<1> shift_exp_clos;
+ boost::spirit::classic::subrule<0> const_exp_subrule;
+ boost::spirit::classic::subrule<1> shift_exp_clos;
 
         rule_type simple_type_name, class_keywords;
         rule_type storage_class_specifier, cv_qualifier, function_specifier;
@@ -250,7 +252,7 @@
 
         definition(translation_unit_grammar const& self)
         {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
             using namespace boost::wave;
             using boost::wave::util::pattern_p;
             

Modified: trunk/libs/wave/samples/hannibal/translation_unit_skipper.h
==============================================================================
--- trunk/libs/wave/samples/hannibal/translation_unit_skipper.h (original)
+++ trunk/libs/wave/samples/hannibal/translation_unit_skipper.h 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -12,8 +12,8 @@
 #if !defined(HANNIBAL_TRANSLATION_UNIT_SKIPPER_H_INCLUDED)
 #define HANNIBAL_TRANSLATION_UNIT_SKIPPER_H_INCLUDED
 
-#include <boost/spirit/core.hpp>
-#include <boost/spirit/utility/confix.hpp>
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_confix.hpp>
 
 #include <boost/wave/wave_config.hpp>
 #include <boost/wave/token_ids.hpp>
@@ -21,14 +21,14 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 struct translation_unit_skipper
-: public boost::spirit::grammar<translation_unit_skipper>
+: public boost::spirit::classic::grammar<translation_unit_skipper>
 {
     template <typename ScannerT>
     struct definition
     {
         definition(translation_unit_skipper const& /*self*/)
         {
- using namespace boost::spirit;
+ using namespace boost::spirit::classic;
             using namespace boost::wave;
             using boost::wave::util::pattern_p;
             
@@ -41,9 +41,9 @@
                 ;
         }
 
- boost::spirit::rule<ScannerT> skip;
+ boost::spirit::classic::rule<ScannerT> skip;
 
- boost::spirit::rule<ScannerT> const&
+ boost::spirit::classic::rule<ScannerT> const&
         start() const { return skip; }
     };
 };

Modified: trunk/libs/wave/samples/list_includes/lexertl_iterator.hpp
==============================================================================
--- trunk/libs/wave/samples/list_includes/lexertl_iterator.hpp (original)
+++ trunk/libs/wave/samples/list_includes/lexertl_iterator.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -17,7 +17,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/spirit/iterator/multi_pass.hpp>
+#include <boost/spirit/include/classic_multi_pass.hpp>
 
 #include <boost/wave/language_support.hpp>
 #include <boost/wave/util/file_position.hpp>
@@ -59,7 +59,8 @@
 #endif // 0 != __DECCXX_VER
     {}
 
-// interface to the boost::spirit::multi_pass_policies::functor_input policy
+// interface to the boost::spirit::classic::multi_pass_policies::functor_input
+// policy
     typedef TokenT result_type;
 
     BOOST_WAVE_EOF_PREFIX result_type const eof;
@@ -122,14 +123,14 @@
 
 template <typename TokenT>
 class lex_iterator
-: public boost::spirit::multi_pass<
+: public boost::spirit::classic::multi_pass<
         impl::iterator_functor_shim<TokenT>,
         boost::wave::util::functor_input
>
 {
     typedef impl::iterator_functor_shim<TokenT> input_policy_type;
     typedef
- boost::spirit::multi_pass<input_policy_type,
+ boost::spirit::classic::multi_pass<input_policy_type,
                 boost::wave::util::functor_input>
         base_type;
     typedef lex_iterator<TokenT> self_type;

Modified: trunk/libs/wave/samples/list_includes/list_includes.cpp
==============================================================================
--- trunk/libs/wave/samples/list_includes/list_includes.cpp (original)
+++ trunk/libs/wave/samples/list_includes/list_includes.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -44,7 +44,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // import required names
-using namespace boost::spirit;
+using namespace boost::spirit::classic;
 
 using std::string;
 using std::vector;

Modified: trunk/libs/wave/samples/quick_start/quick_start.cpp
==============================================================================
--- trunk/libs/wave/samples/quick_start/quick_start.cpp (original)
+++ trunk/libs/wave/samples/quick_start/quick_start.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -35,6 +35,8 @@
 boost::wave::util::file_position_type current_position;
 
     try {
+//[quick_start_main
+ // The following preprocesses the given input file (given by argv[1]).
     // Open and read in the specified input file.
     std::ifstream instream(argv[1]);
     std::string instring;
@@ -47,12 +49,14 @@
         instring = std::string(std::istreambuf_iterator<char>(instream.rdbuf()),
                                 std::istreambuf_iterator<char>());
             
- // The template boost::wave::cpplexer::lex_token<> is the token type to be
- // used by the Wave library.
+ // This token type is one of the central types used throughout the library,
+ // because it is a template parameter to some of the public classes and
+ // instances of this type are returned from the iterators.
         typedef boost::wave::cpplexer::lex_token<> token_type;
     
     // The template boost::wave::cpplexer::lex_iterator<> is the lexer type to
- // be used by the Wave library.
+ // to use as the token source for the preprocessing engine. It is
+ // parametrized with the token type.
         typedef boost::wave::cpplexer::lex_iterator<token_type> lex_iterator_type;
         
     // This is the resulting context type to use. The first template parameter
@@ -70,15 +74,20 @@
     // scenes during iteration over the context_type::iterator_type stream.
     context_type ctx (instring.begin(), instring.end(), argv[1]);
 
- // analyze the input file
+ // Get the preprocessor iterators and use them to generate
+ // the token sequence.
     context_type::iterator_type first = ctx.begin();
     context_type::iterator_type last = ctx.end();
         
+
+ // The input stream is preprocessed for you while iterating over the range
+ // [first, last)
         while (first != last) {
             current_position = (*first).get_position();
             std::cout << (*first).get_value();
             ++first;
         }
+//]
     }
     catch (boost::wave::cpp_exception const& e) {
     // some preprocessing error

Modified: trunk/libs/wave/samples/token_statistics/token_statistics.cpp
==============================================================================
--- trunk/libs/wave/samples/token_statistics/token_statistics.cpp (original)
+++ trunk/libs/wave/samples/token_statistics/token_statistics.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -28,7 +28,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // import required names
-using namespace boost::spirit;
+using namespace boost::spirit::classic;
 
 using std::string;
 using std::vector;

Modified: trunk/libs/wave/samples/token_statistics/xlex/xlex_lexer.hpp
==============================================================================
--- trunk/libs/wave/samples/token_statistics/xlex/xlex_lexer.hpp (original)
+++ trunk/libs/wave/samples/token_statistics/xlex/xlex_lexer.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -22,7 +22,7 @@
 
 #include <boost/concept_check.hpp>
 #include <boost/assert.hpp>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/classic_core.hpp>
 
 #include <boost/wave/token_ids.hpp>
 #include <boost/wave/language_support.hpp>

Modified: trunk/libs/wave/samples/token_statistics/xlex_iterator.hpp
==============================================================================
--- trunk/libs/wave/samples/token_statistics/xlex_iterator.hpp (original)
+++ trunk/libs/wave/samples/token_statistics/xlex_iterator.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -18,7 +18,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/spirit/iterator/multi_pass.hpp>
+#include <boost/spirit/include/classic_multi_pass.hpp>
 
 #include <boost/wave/language_support.hpp>
 #include <boost/wave/util/file_position.hpp>
@@ -51,7 +51,8 @@
             ::new_lexer(first, last, pos, language))
     {}
 
-// interface to the boost::spirit::multi_pass_policies::functor_input policy
+// interface to the boost::spirit::classic::multi_pass_policies::functor_input
+// policy
     typedef TokenT result_type;
 
     /*static*/ result_type const eof;
@@ -111,14 +112,14 @@
 
 template <typename TokenT>
 class xlex_iterator
-: public boost::spirit::multi_pass<
+: public boost::spirit::classic::multi_pass<
         impl::xlex_iterator_functor_shim<TokenT>,
         boost::wave::util::functor_input
>
 {
     typedef impl::xlex_iterator_functor_shim<TokenT> input_policy_type;
     typedef
- boost::spirit::multi_pass<input_policy_type,
+ boost::spirit::classic::multi_pass<input_policy_type,
                 boost::wave::util::functor_input>
         base_type;
     

Modified: trunk/libs/wave/samples/waveidl/idl.cpp
==============================================================================
--- trunk/libs/wave/samples/waveidl/idl.cpp (original)
+++ trunk/libs/wave/samples/waveidl/idl.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -47,7 +47,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // import required names
-using namespace boost::spirit;
+using namespace boost::spirit::classic;
 
 using std::string;
 using std::pair;

Modified: trunk/libs/wave/samples/waveidl/idllexer/idl_lex_iterator.hpp
==============================================================================
--- trunk/libs/wave/samples/waveidl/idllexer/idl_lex_iterator.hpp (original)
+++ trunk/libs/wave/samples/waveidl/idllexer/idl_lex_iterator.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -19,7 +19,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/spirit/iterator/multi_pass.hpp>
+#include <boost/spirit/include/classic_multi_pass.hpp>
 
 #include <boost/wave/language_support.hpp>
 #include <boost/wave/util/file_position.hpp>
@@ -58,7 +58,8 @@
     : functor_ptr(lex_input_interface_type::new_lexer(first, last, pos, language))
     {}
 
-// interface to the boost::spirit::multi_pass_policies::functor_input policy
+// interface to the boost::spirit::classic::multi_pass_policies::functor_input
+// policy
     typedef TokenT result_type;
 
     BOOST_WAVE_EOF_PREFIX result_type const eof;
@@ -110,14 +111,14 @@
 
 template <typename TokenT>
 class lex_iterator
-: public boost::spirit::multi_pass<
+: public boost::spirit::classic::multi_pass<
         impl::lex_iterator_functor_shim<TokenT>,
         boost::wave::util::functor_input
>
 {
     typedef impl::lex_iterator_functor_shim<TokenT> input_policy_type;
     typedef
- boost::spirit::multi_pass<input_policy_type,
+ boost::spirit::classic::multi_pass<input_policy_type,
                 boost::wave::util::functor_input>
         base_type;
     typedef lex_iterator<TokenT> self_type;

Modified: trunk/libs/wave/samples/waveidl/idllexer/idl_re2c_lexer.hpp
==============================================================================
--- trunk/libs/wave/samples/waveidl/idllexer/idl_re2c_lexer.hpp (original)
+++ trunk/libs/wave/samples/waveidl/idllexer/idl_re2c_lexer.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -22,7 +22,7 @@
 
 #include <boost/concept_check.hpp>
 #include <boost/assert.hpp>
-#include <boost/spirit/core.hpp>
+#include <boost/spirit/include/classic_core.hpp>
 
 #include <boost/wave/token_ids.hpp>
 #include <boost/wave/language_support.hpp>

Modified: trunk/libs/wave/src/cpplexer/re2clex/cpp_re.inc
==============================================================================
--- trunk/libs/wave/src/cpplexer/re2clex/cpp_re.inc (original)
+++ trunk/libs/wave/src/cpplexer/re2clex/cpp_re.inc 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.1 on Wed Nov 21 11:50:51 2007 */
+/* Generated by re2c 0.13.2 on Fri Apr 04 14:19:15 2008 */
 #line 1 "cpp.re"
 /*=============================================================================
     Boost.Wave: A Standard compliant C++ preprocessor library
@@ -94,9 +94,9 @@
          32, 32, 32, 32, 32, 32, 32, 32,
     };
 
- if((YYLIMIT - YYCURSOR) < 17) YYFILL(17);
+ if ((YYLIMIT - YYCURSOR) < 17) YYFILL(17);
     yych = *YYCURSOR;
- switch(yych) {
+ switch (yych) {
     case 0x00: goto yy88;
     case 0x01:
     case 0x02:
@@ -226,11 +226,11 @@
     }
 yy2:
     ++YYCURSOR;
- if((yych = *YYCURSOR) <= '.') {
- if(yych == '*') goto yy922;
+ if ((yych = *YYCURSOR) <= '.') {
+ if (yych == '*') goto yy922;
     } else {
- if(yych <= '/') goto yy920;
- if(yych == '=') goto yy918;
+ if (yych <= '/') goto yy920;
+ if (yych == '=') goto yy918;
     }
 #line 178 "cpp.re"
     { BOOST_WAVE_RET(T_DIVIDE); }
@@ -238,12 +238,12 @@
 yy4:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '-') {
- if(yych == '*') goto yy912;
+ if (yych <= '-') {
+ if (yych == '*') goto yy912;
     } else {
- if(yych <= '.') goto yy914;
- if(yych <= '/') goto yy5;
- if(yych <= '9') goto yy915;
+ if (yych <= '.') goto yy914;
+ if (yych <= '/') goto yy5;
+ if (yych <= '9') goto yy915;
     }
 yy5:
 #line 164 "cpp.re"
@@ -258,12 +258,12 @@
 yy8:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'r') {
- if(yych == 'n') goto yy898;
+ if (yych <= 'r') {
+ if (yych == 'n') goto yy898;
         goto yy195;
     } else {
- if(yych <= 's') goto yy899;
- if(yych == 'u') goto yy900;
+ if (yych <= 's') goto yy899;
+ if (yych == 'u') goto yy900;
         goto yy195;
     }
 yy9:
@@ -273,18 +273,18 @@
 yy10:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'n') {
- if(yych == 'i') goto yy880;
+ if (yych <= 'n') {
+ if (yych == 'i') goto yy880;
         goto yy195;
     } else {
- if(yych <= 'o') goto yy881;
- if(yych == 'r') goto yy882;
+ if (yych <= 'o') goto yy881;
+ if (yych == 'r') goto yy882;
         goto yy195;
     }
 yy11:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
+ switch (yych) {
     case 'a': goto yy842;
     case 'h': goto yy843;
     case 'l': goto yy844;
@@ -294,29 +294,29 @@
 yy12:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'n') {
- if(yych == 'e') goto yy811;
+ if (yych <= 'n') {
+ if (yych == 'e') goto yy811;
         goto yy195;
     } else {
- if(yych <= 'o') goto yy812;
- if(yych == 'y') goto yy814;
+ if (yych <= 'o') goto yy812;
+ if (yych == 'y') goto yy814;
         goto yy195;
     }
 yy13:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'm') {
- if(yych == 'l') goto yy786;
+ if (yych <= 'm') {
+ if (yych == 'l') goto yy786;
         goto yy195;
     } else {
- if(yych <= 'n') goto yy787;
- if(yych == 'x') goto yy788;
+ if (yych <= 'n') goto yy787;
+ if (yych == 'x') goto yy788;
         goto yy195;
     }
 yy14:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
+ switch (yych) {
     case 'a': goto yy767;
     case 'l': goto yy768;
     case 'o': goto yy769;
@@ -326,108 +326,108 @@
 yy15:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy763;
+ if (yych == 'o') goto yy763;
     goto yy195;
 yy16:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'l') {
- if(yych == 'f') goto yy747;
+ if (yych <= 'l') {
+ if (yych == 'f') goto yy747;
         goto yy195;
     } else {
- if(yych <= 'm') goto yy749;
- if(yych <= 'n') goto yy750;
+ if (yych <= 'm') goto yy749;
+ if (yych <= 'n') goto yy750;
         goto yy195;
     }
 yy17:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy743;
+ if (yych == 'o') goto yy743;
     goto yy195;
 yy18:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'u') goto yy736;
+ if (yych == 'u') goto yy736;
     goto yy195;
 yy19:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'd') {
- if(yych == 'a') goto yy717;
+ if (yych <= 'd') {
+ if (yych == 'a') goto yy717;
         goto yy195;
     } else {
- if(yych <= 'e') goto yy718;
- if(yych == 'o') goto yy719;
+ if (yych <= 'e') goto yy718;
+ if (yych == 'o') goto yy719;
         goto yy195;
     }
 yy20:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'p') goto yy703;
- if(yych == 'r') goto yy704;
+ if (yych == 'p') goto yy703;
+ if (yych == 'r') goto yy704;
     goto yy195;
 yy21:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'r') goto yy682;
- if(yych == 'u') goto yy683;
+ if (yych == 'r') goto yy682;
+ if (yych == 'u') goto yy683;
     goto yy195;
 yy22:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy654;
+ if (yych == 'e') goto yy654;
     goto yy195;
 yy23:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 's') {
- if(yych <= 'g') goto yy195;
- if(yych <= 'h') goto yy615;
- if(yych <= 'i') goto yy616;
+ 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;
+ if (yych <= 't') goto yy617;
+ if (yych == 'w') goto yy618;
         goto yy195;
     }
 yy24:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'h') {
- if(yych == 'e') goto yy578;
- if(yych <= 'g') goto yy195;
+ if (yych <= 'h') {
+ if (yych == 'e') goto yy578;
+ if (yych <= 'g') goto yy195;
         goto yy579;
     } else {
- if(yych <= 'r') {
- if(yych <= 'q') goto yy195;
+ if (yych <= 'r') {
+ if (yych <= 'q') goto yy195;
             goto yy580;
         } else {
- if(yych == 'y') goto yy581;
+ if (yych == 'y') goto yy581;
             goto yy195;
         }
     }
 yy25:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy561;
- if(yych == 's') goto yy562;
+ if (yych == 'n') goto yy561;
+ if (yych == 's') goto yy562;
     goto yy195;
 yy26:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy543;
- if(yych == 'o') goto yy544;
+ if (yych == 'i') goto yy543;
+ if (yych == 'o') goto yy544;
     goto yy195;
 yy27:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'c') goto yy531;
- if(yych == 'h') goto yy532;
+ if (yych == 'c') goto yy531;
+ if (yych == 'h') goto yy532;
     goto yy195;
 yy28:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
+ switch (yych) {
     case '_': goto yy442;
     case 'a': goto yy443;
     case 'b': goto yy444;
@@ -446,20 +446,20 @@
 yy31:
     yyaccept = 2;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == '?') goto yy407;
+ if (yych == '?') goto yy407;
 yy32:
 #line 153 "cpp.re"
     { BOOST_WAVE_RET(T_QUESTION_MARK); }
 #line 454 "cpp_re.inc"
 yy33:
     ++YYCURSOR;
- if((yych = *YYCURSOR) <= ':') {
- if(yych == '%') goto yy403;
- if(yych >= ':') goto yy401;
- } else {
- if(yych <= ';') goto yy34;
- if(yych <= '<') goto yy399;
- if(yych <= '=') goto yy397;
+ if ((yych = *YYCURSOR) <= ':') {
+ if (yych == '%') goto yy403;
+ if (yych >= ':') goto yy401;
+ } else {
+ if (yych <= ';') goto yy34;
+ if (yych <= '<') goto yy399;
+ if (yych <= '=') goto yy397;
     }
 yy34:
 #line 194 "cpp.re"
@@ -472,11 +472,11 @@
 #line 473 "cpp_re.inc"
 yy37:
     ++YYCURSOR;
- if((yych = *YYCURSOR) <= '<') {
- if(yych == ':') goto yy388;
+ if ((yych = *YYCURSOR) <= '<') {
+ if (yych == ':') goto yy388;
     } else {
- if(yych <= '=') goto yy390;
- if(yych <= '>') goto yy392;
+ if (yych <= '=') goto yy390;
+ if (yych <= '>') goto yy392;
     }
 #line 179 "cpp.re"
     { BOOST_WAVE_RET(T_PERCENT); }
@@ -493,45 +493,45 @@
 #line 494 "cpp_re.inc"
 yy43:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == ':') goto yy384;
- if(yych == '>') goto yy386;
+ if ((yych = *YYCURSOR) == ':') goto yy384;
+ if (yych == '>') goto yy386;
 #line 151 "cpp.re"
     { BOOST_WAVE_RET(T_COLON); }
 #line 501 "cpp_re.inc"
 yy45:
     yyaccept = 3;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'c') {
- if(yych <= ' ') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy261;
+ if (yych <= 'c') {
+ if (yych <= ' ') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy261;
             } else {
- if(yych <= 0x0C) goto yy261;
- if(yych >= ' ') goto yy261;
+ if (yych <= 0x0C) goto yy261;
+ if (yych >= ' ') goto yy261;
             }
         } else {
- if(yych <= '.') {
- if(yych == '#') goto yy272;
+ if (yych <= '.') {
+ if (yych == '#') goto yy272;
             } else {
- if(yych <= '/') goto yy261;
- if(yych == '?') goto yy271;
+ if (yych <= '/') goto yy261;
+ if (yych == '?') goto yy271;
             }
         }
     } else {
- if(yych <= 'p') {
- if(yych <= 'i') {
- if(yych <= 'e') goto yy261;
- if(yych >= 'i') goto yy261;
+ if (yych <= 'p') {
+ if (yych <= 'i') {
+ if (yych <= 'e') goto yy261;
+ if (yych >= 'i') goto yy261;
             } else {
- if(yych == 'l') goto yy261;
- if(yych >= 'p') goto yy261;
+ if (yych == 'l') goto yy261;
+ if (yych >= 'p') goto yy261;
             }
         } else {
- if(yych <= 't') {
- if(yych == 'r') goto yy261;
+ if (yych <= 't') {
+ if (yych == 'r') goto yy261;
             } else {
- if(yych == 'v') goto yy46;
- if(yych <= 'w') goto yy261;
+ if (yych == 'v') goto yy46;
+ if (yych <= 'w') goto yy261;
             }
         }
     }
@@ -556,54 +556,54 @@
 #line 557 "cpp_re.inc"
 yy53:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '+') goto yy256;
- if(yych == '=') goto yy258;
+ if ((yych = *YYCURSOR) == '+') goto yy256;
+ if (yych == '=') goto yy258;
 #line 175 "cpp.re"
     { BOOST_WAVE_RET(T_PLUS); }
 #line 564 "cpp_re.inc"
 yy55:
     ++YYCURSOR;
- if((yych = *YYCURSOR) <= '<') {
- if(yych == '-') goto yy250;
+ if ((yych = *YYCURSOR) <= '<') {
+ if (yych == '-') goto yy250;
     } else {
- if(yych <= '=') goto yy252;
- if(yych <= '>') goto yy248;
+ if (yych <= '=') goto yy252;
+ if (yych <= '>') goto yy248;
     }
 #line 176 "cpp.re"
     { BOOST_WAVE_RET(T_MINUS); }
 #line 575 "cpp_re.inc"
 yy57:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy246;
+ if ((yych = *YYCURSOR) == '=') goto yy246;
 #line 177 "cpp.re"
     { BOOST_WAVE_RET(T_STAR); }
 #line 581 "cpp_re.inc"
 yy59:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy244;
+ if ((yych = *YYCURSOR) == '=') goto yy244;
 #line 180 "cpp.re"
     { BOOST_WAVE_RET(T_XOR); }
 #line 587 "cpp_re.inc"
 yy61:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy237;
+ if (yych == 'o') goto yy237;
     goto yy195;
 yy62:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '&') goto yy233;
- if(yych == '=') goto yy235;
+ if ((yych = *YYCURSOR) == '&') goto yy233;
+ if (yych == '=') goto yy235;
 #line 183 "cpp.re"
     { BOOST_WAVE_RET(T_AND); }
 #line 599 "cpp_re.inc"
 yy64:
     yyaccept = 4;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '>') {
- if(yych == '=') goto yy228;
+ if (yych <= '>') {
+ if (yych == '=') goto yy228;
     } else {
- if(yych <= '?') goto yy225;
- if(yych == '|') goto yy226;
+ if (yych <= '?') goto yy225;
+ if (yych == '|') goto yy226;
     }
 yy65:
 #line 185 "cpp.re"
@@ -616,21 +616,21 @@
 #line 617 "cpp_re.inc"
 yy68:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy223;
+ if ((yych = *YYCURSOR) == '=') goto yy223;
 #line 191 "cpp.re"
     { BOOST_WAVE_RET(T_NOT); }
 #line 623 "cpp_re.inc"
 yy70:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy221;
+ if ((yych = *YYCURSOR) == '=') goto yy221;
 #line 193 "cpp.re"
     { BOOST_WAVE_RET(T_ASSIGN); }
 #line 629 "cpp_re.inc"
 yy72:
     ++YYCURSOR;
- if((yych = *YYCURSOR) <= '<') goto yy73;
- if(yych <= '=') goto yy215;
- if(yych <= '>') goto yy217;
+ if ((yych = *YYCURSOR) <= '<') goto yy73;
+ if (yych <= '=') goto yy215;
+ if (yych <= '>') goto yy217;
 yy73:
 #line 195 "cpp.re"
     { BOOST_WAVE_RET(T_GREATER); }
@@ -647,27 +647,27 @@
 yy77:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych <= '\'') {
- if(yych == '"') goto yy96;
- if(yych <= '&') goto yy9;
+ if (yych <= '\'') {
+ if (yych == '"') goto yy96;
+ if (yych <= '&') goto yy9;
         goto yy214;
     } else {
- if(yych <= '?') {
- if(yych <= '>') goto yy9;
+ if (yych <= '?') {
+ if (yych <= '>') goto yy9;
             goto yy197;
         } else {
- if(yych == '\\') goto yy196;
+ if (yych == '\\') goto yy196;
             goto yy9;
         }
     }
 yy78:
     yyaccept = 5;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'U') goto yy186;
- if(yych == 'u') goto yy185;
+ if (yych == 'U') goto yy186;
+ if (yych == 'u') goto yy185;
 yy79:
 #line 299 "cpp.re"
     { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
@@ -675,24 +675,24 @@
 yy80:
     yyaccept = 5;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy142;
- if(yych <= 0x0A) goto yy79;
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy142;
+ if (yych <= 0x0A) goto yy79;
         goto yy142;
     } else {
- if(yych <= 0x1F) goto yy79;
- if(yych == '\'') goto yy79;
+ if (yych <= 0x1F) goto yy79;
+ if (yych == '\'') goto yy79;
         goto yy142;
     }
 yy81:
     yyaccept = 5;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy97;
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy97;
         goto yy79;
     } else {
- if(yych <= 0x0C) goto yy97;
- if(yych <= 0x1F) goto yy79;
+ if (yych <= 0x0C) goto yy97;
+ if (yych <= 0x1F) goto yy79;
         goto yy97;
     }
 yy82:
@@ -718,7 +718,7 @@
 #line 719 "cpp_re.inc"
 yy87:
     yych = *++YYCURSOR;
- if(yych == 0x0A) goto yy93;
+ if (yych == 0x0A) goto yy93;
     goto yy86;
 yy88:
     ++YYCURSOR;
@@ -751,48 +751,48 @@
     goto yy86;
 yy94:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy95:
- if(yybm[256+yych] & 16) {
+ if (yybm[256+yych] & 16) {
         goto yy94;
     }
     goto yy83;
 yy96:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy97:
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy99;
     goto yy100;
 yy98:
     YYCURSOR = YYMARKER;
- if(yyaccept <= 51) {
- if(yyaccept <= 25) {
- if(yyaccept <= 12) {
- if(yyaccept <= 6) {
- if(yyaccept <= 3) {
- if(yyaccept <= 1) {
- if(yyaccept <= 0) {
+ if (yyaccept <= 51) {
+ if (yyaccept <= 25) {
+ if (yyaccept <= 12) {
+ if (yyaccept <= 6) {
+ if (yyaccept <= 3) {
+ if (yyaccept <= 1) {
+ if (yyaccept <= 0) {
                                 goto yy5;
                             } else {
                                 goto yy9;
                             }
                         } else {
- if(yyaccept <= 2) {
+ if (yyaccept <= 2) {
                                 goto yy32;
                             } else {
                                 goto yy46;
                             }
                         }
                     } else {
- if(yyaccept <= 5) {
- if(yyaccept <= 4) {
+ if (yyaccept <= 5) {
+ if (yyaccept <= 4) {
                                 goto yy65;
                             } else {
                                 goto yy79;
@@ -802,9 +802,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 9) {
- if(yyaccept <= 8) {
- if(yyaccept <= 7) {
+ if (yyaccept <= 9) {
+ if (yyaccept <= 8) {
+ if (yyaccept <= 7) {
                                 goto yy152;
                             } else {
                                 goto yy239;
@@ -813,8 +813,8 @@
                             goto yy243;
                         }
                     } else {
- if(yyaccept <= 11) {
- if(yyaccept <= 10) {
+ if (yyaccept <= 11) {
+ if (yyaccept <= 10) {
                                 goto yy279;
                             } else {
                                 goto yy294;
@@ -825,24 +825,24 @@
                     }
                 }
             } else {
- if(yyaccept <= 19) {
- if(yyaccept <= 16) {
- if(yyaccept <= 14) {
- if(yyaccept <= 13) {
+ if (yyaccept <= 19) {
+ if (yyaccept <= 16) {
+ if (yyaccept <= 14) {
+ if (yyaccept <= 13) {
                                 goto yy417;
                             } else {
                                 goto yy421;
                             }
                         } else {
- if(yyaccept <= 15) {
+ if (yyaccept <= 15) {
                                 goto yy425;
                             } else {
                                 goto yy456;
                             }
                         }
                     } else {
- if(yyaccept <= 18) {
- if(yyaccept <= 17) {
+ if (yyaccept <= 18) {
+ if (yyaccept <= 17) {
                                 goto yy462;
                             } else {
                                 goto yy470;
@@ -852,9 +852,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 22) {
- if(yyaccept <= 21) {
- if(yyaccept <= 20) {
+ if (yyaccept <= 22) {
+ if (yyaccept <= 21) {
+ if (yyaccept <= 20) {
                                 goto yy483;
                             } else {
                                 goto yy488;
@@ -863,8 +863,8 @@
                             goto yy491;
                         }
                     } else {
- if(yyaccept <= 24) {
- if(yyaccept <= 23) {
+ if (yyaccept <= 24) {
+ if (yyaccept <= 23) {
                                 goto yy501;
                             } else {
                                 goto yy507;
@@ -876,25 +876,25 @@
                 }
             }
         } else {
- if(yyaccept <= 38) {
- if(yyaccept <= 32) {
- if(yyaccept <= 29) {
- if(yyaccept <= 27) {
- if(yyaccept <= 26) {
+ if (yyaccept <= 38) {
+ if (yyaccept <= 32) {
+ if (yyaccept <= 29) {
+ if (yyaccept <= 27) {
+ if (yyaccept <= 26) {
                                 goto yy517;
                             } else {
                                 goto yy524;
                             }
                         } else {
- if(yyaccept <= 28) {
+ if (yyaccept <= 28) {
                                 goto yy526;
                             } else {
                                 goto yy528;
                             }
                         }
                     } else {
- if(yyaccept <= 31) {
- if(yyaccept <= 30) {
+ if (yyaccept <= 31) {
+ if (yyaccept <= 30) {
                                 goto yy530;
                             } else {
                                 goto yy536;
@@ -904,9 +904,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 35) {
- if(yyaccept <= 34) {
- if(yyaccept <= 33) {
+ if (yyaccept <= 35) {
+ if (yyaccept <= 34) {
+ if (yyaccept <= 33) {
                                 goto yy552;
                             } else {
                                 goto yy554;
@@ -915,8 +915,8 @@
                             goto yy560;
                         }
                     } else {
- if(yyaccept <= 37) {
- if(yyaccept <= 36) {
+ if (yyaccept <= 37) {
+ if (yyaccept <= 36) {
                                 goto yy566;
                             } else {
                                 goto yy574;
@@ -927,24 +927,24 @@
                     }
                 }
             } else {
- if(yyaccept <= 45) {
- if(yyaccept <= 42) {
- if(yyaccept <= 40) {
- if(yyaccept <= 39) {
+ if (yyaccept <= 45) {
+ if (yyaccept <= 42) {
+ if (yyaccept <= 40) {
+ if (yyaccept <= 39) {
                                 goto yy590;
                             } else {
                                 goto yy592;
                             }
                         } else {
- if(yyaccept <= 41) {
+ if (yyaccept <= 41) {
                                 goto yy595;
                             } else {
                                 goto yy598;
                             }
                         }
                     } else {
- if(yyaccept <= 44) {
- if(yyaccept <= 43) {
+ if (yyaccept <= 44) {
+ if (yyaccept <= 43) {
                                 goto yy600;
                             } else {
                                 goto yy605;
@@ -954,9 +954,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 48) {
- if(yyaccept <= 47) {
- if(yyaccept <= 46) {
+ if (yyaccept <= 48) {
+ if (yyaccept <= 47) {
+ if (yyaccept <= 46) {
                                 goto yy614;
                             } else {
                                 goto yy623;
@@ -965,8 +965,8 @@
                             goto yy629;
                         }
                     } else {
- if(yyaccept <= 50) {
- if(yyaccept <= 49) {
+ if (yyaccept <= 50) {
+ if (yyaccept <= 49) {
                                 goto yy633;
                             } else {
                                 goto yy639;
@@ -979,26 +979,26 @@
             }
         }
     } else {
- if(yyaccept <= 77) {
- if(yyaccept <= 64) {
- if(yyaccept <= 58) {
- if(yyaccept <= 55) {
- if(yyaccept <= 53) {
- if(yyaccept <= 52) {
+ if (yyaccept <= 77) {
+ if (yyaccept <= 64) {
+ if (yyaccept <= 58) {
+ if (yyaccept <= 55) {
+ if (yyaccept <= 53) {
+ if (yyaccept <= 52) {
                                 goto yy649;
                             } else {
                                 goto yy653;
                             }
                         } else {
- if(yyaccept <= 54) {
+ if (yyaccept <= 54) {
                                 goto yy661;
                             } else {
                                 goto yy675;
                             }
                         }
                     } else {
- if(yyaccept <= 57) {
- if(yyaccept <= 56) {
+ if (yyaccept <= 57) {
+ if (yyaccept <= 56) {
                                 goto yy681;
                             } else {
                                 goto yy688;
@@ -1008,9 +1008,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 61) {
- if(yyaccept <= 60) {
- if(yyaccept <= 59) {
+ if (yyaccept <= 61) {
+ if (yyaccept <= 60) {
+ if (yyaccept <= 59) {
                                 goto yy702;
                             } else {
                                 goto yy705;
@@ -1019,8 +1019,8 @@
                             goto yy709;
                         }
                     } else {
- if(yyaccept <= 63) {
- if(yyaccept <= 62) {
+ if (yyaccept <= 63) {
+ if (yyaccept <= 62) {
                                 goto yy716;
                             } else {
                                 goto yy721;
@@ -1031,24 +1031,24 @@
                     }
                 }
             } else {
- if(yyaccept <= 71) {
- if(yyaccept <= 68) {
- if(yyaccept <= 66) {
- if(yyaccept <= 65) {
+ if (yyaccept <= 71) {
+ if (yyaccept <= 68) {
+ if (yyaccept <= 66) {
+ if (yyaccept <= 65) {
                                 goto yy727;
                             } else {
                                 goto yy735;
                             }
                         } else {
- if(yyaccept <= 67) {
+ if (yyaccept <= 67) {
                                 goto yy742;
                             } else {
                                 goto yy746;
                             }
                         }
                     } else {
- if(yyaccept <= 70) {
- if(yyaccept <= 69) {
+ if (yyaccept <= 70) {
+ if (yyaccept <= 69) {
                                 goto yy748;
                             } else {
                                 goto yy753;
@@ -1058,9 +1058,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 74) {
- if(yyaccept <= 73) {
- if(yyaccept <= 72) {
+ if (yyaccept <= 74) {
+ if (yyaccept <= 73) {
+ if (yyaccept <= 72) {
                                 goto yy762;
                             } else {
                                 goto yy766;
@@ -1069,8 +1069,8 @@
                             goto yy775;
                         }
                     } else {
- if(yyaccept <= 76) {
- if(yyaccept <= 75) {
+ if (yyaccept <= 76) {
+ if (yyaccept <= 75) {
                                 goto yy777;
                             } else {
                                 goto yy781;
@@ -1082,25 +1082,25 @@
                 }
             }
         } else {
- if(yyaccept <= 90) {
- if(yyaccept <= 84) {
- if(yyaccept <= 81) {
- if(yyaccept <= 79) {
- if(yyaccept <= 78) {
+ if (yyaccept <= 90) {
+ if (yyaccept <= 84) {
+ if (yyaccept <= 81) {
+ if (yyaccept <= 79) {
+ if (yyaccept <= 78) {
                                 goto yy794;
                             } else {
                                 goto yy799;
                             }
                         } else {
- if(yyaccept <= 80) {
+ if (yyaccept <= 80) {
                                 goto yy804;
                             } else {
                                 goto yy807;
                             }
                         }
                     } else {
- if(yyaccept <= 83) {
- if(yyaccept <= 82) {
+ if (yyaccept <= 83) {
+ if (yyaccept <= 82) {
                                 goto yy810;
                             } else {
                                 goto yy813;
@@ -1110,9 +1110,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 87) {
- if(yyaccept <= 86) {
- if(yyaccept <= 85) {
+ if (yyaccept <= 87) {
+ if (yyaccept <= 86) {
+ if (yyaccept <= 85) {
                                 goto yy830;
                             } else {
                                 goto yy836;
@@ -1121,8 +1121,8 @@
                             goto yy841;
                         }
                     } else {
- if(yyaccept <= 89) {
- if(yyaccept <= 88) {
+ if (yyaccept <= 89) {
+ if (yyaccept <= 88) {
                                 goto yy850;
                             } else {
                                 goto yy857;
@@ -1133,24 +1133,24 @@
                     }
                 }
             } else {
- if(yyaccept <= 97) {
- if(yyaccept <= 94) {
- if(yyaccept <= 92) {
- if(yyaccept <= 91) {
+ if (yyaccept <= 97) {
+ if (yyaccept <= 94) {
+ if (yyaccept <= 92) {
+ if (yyaccept <= 91) {
                                 goto yy865;
                             } else {
                                 goto yy869;
                             }
                         } else {
- if(yyaccept <= 93) {
+ if (yyaccept <= 93) {
                                 goto yy872;
                             } else {
                                 goto yy877;
                             }
                         }
                     } else {
- if(yyaccept <= 96) {
- if(yyaccept <= 95) {
+ if (yyaccept <= 96) {
+ if (yyaccept <= 95) {
                                 goto yy879;
                             } else {
                                 goto yy886;
@@ -1160,9 +1160,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 100) {
- if(yyaccept <= 99) {
- if(yyaccept <= 98) {
+ if (yyaccept <= 100) {
+ if (yyaccept <= 99) {
+ if (yyaccept <= 98) {
                                 goto yy894;
                             } else {
                                 goto yy897;
@@ -1171,8 +1171,8 @@
                             goto yy903;
                         }
                     } else {
- if(yyaccept <= 102) {
- if(yyaccept <= 101) {
+ if (yyaccept <= 102) {
+ if (yyaccept <= 101) {
                                 goto yy905;
                             } else {
                                 goto yy907;
@@ -1187,57 +1187,57 @@
     }
 yy99:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy112;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy112;
 yy100:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '`') {
- if(yych <= '7') {
- if(yych <= '&') {
- if(yych == '"') goto yy96;
+ if (yych <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy96;
                 goto yy98;
             } else {
- if(yych <= '\'') goto yy96;
- if(yych <= '/') goto yy98;
+ if (yych <= '\'') goto yy96;
+ if (yych <= '/') goto yy98;
                 goto yy107;
             }
         } else {
- if(yych <= 'T') {
- if(yych == '?') goto yy105;
+ if (yych <= 'T') {
+ if (yych == '?') goto yy105;
                 goto yy98;
             } else {
- if(yych <= 'U') goto yy104;
- if(yych == '\\') goto yy96;
+ if (yych <= 'U') goto yy104;
+ if (yych == '\\') goto yy96;
                 goto yy98;
             }
         }
     } else {
- if(yych <= 'r') {
- if(yych <= 'f') {
- if(yych <= 'b') goto yy96;
- if(yych <= 'e') goto yy98;
+ 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;
+ if (yych == 'n') goto yy96;
+ if (yych <= 'q') goto yy98;
                 goto yy96;
             }
         } else {
- if(yych <= 'u') {
- if(yych <= 's') goto yy98;
- if(yych <= 't') goto yy96;
+ 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;
+ if (yych <= 'v') goto yy96;
+ if (yych == 'x') goto yy106;
                 goto yy98;
             }
         }
@@ -1250,247 +1250,247 @@
 #line 1251 "cpp_re.inc"
 yy103:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy138;
+ 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;
+ if (yych <= 'F') goto yy138;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy138;
         goto yy98;
     }
 yy104:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy131;
+ 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;
+ if (yych <= 'F') goto yy131;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy131;
         goto yy98;
     }
 yy105:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy111;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy111;
     goto yy100;
 yy106:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
+ if (yybm[256+yych] & 64) {
         goto yy109;
     }
     goto yy98;
 yy107:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '"') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy96;
+ if (yych <= '"') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy96;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy96;
- if(yych <= 0x1F) goto yy98;
- if(yych <= '!') goto yy96;
+ if (yych <= 0x0C) goto yy96;
+ if (yych <= 0x1F) goto yy98;
+ if (yych <= '!') goto yy96;
             goto yy101;
         }
     } else {
- if(yych <= '>') {
- if(yych <= '/') goto yy96;
- if(yych >= '8') goto yy96;
+ if (yych <= '>') {
+ if (yych <= '/') goto yy96;
+ if (yych >= '8') goto yy96;
         } else {
- if(yych <= '?') goto yy99;
- if(yych == '\\') goto yy100;
+ if (yych <= '?') goto yy99;
+ if (yych == '\\') goto yy100;
             goto yy96;
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy99;
     goto yy100;
 yy109:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
+ if (yybm[256+yych] & 64) {
         goto yy109;
     }
- if(yych <= '!') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy96;
+ if (yych <= '!') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy96;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy96;
- if(yych <= 0x1F) goto yy98;
+ if (yych <= 0x0C) goto yy96;
+ if (yych <= 0x1F) goto yy98;
             goto yy96;
         }
     } else {
- if(yych <= '?') {
- if(yych <= '"') goto yy101;
- if(yych <= '>') goto yy96;
+ if (yych <= '?') {
+ if (yych <= '"') goto yy101;
+ if (yych <= '>') goto yy96;
             goto yy99;
         } else {
- if(yych == '\\') goto yy100;
+ if (yych == '\\') goto yy100;
             goto yy96;
         }
     }
 yy111:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych >= '\\') goto yy100;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych >= '\\') goto yy100;
 yy112:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 128) {
+ if (yybm[256+yych] & 128) {
         goto yy112;
     }
- if(yych <= '!') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy96;
+ if (yych <= '!') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy96;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy96;
- if(yych <= 0x1F) goto yy98;
+ if (yych <= 0x0C) goto yy96;
+ if (yych <= 0x1F) goto yy98;
             goto yy96;
         }
     } else {
- if(yych <= '/') {
- if(yych <= '"') goto yy101;
- if(yych <= '.') goto yy96;
+ if (yych <= '/') {
+ if (yych <= '"') goto yy101;
+ if (yych <= '.') goto yy96;
         } else {
- if(yych == '\\') goto yy100;
+ if (yych == '\\') goto yy100;
             goto yy96;
         }
     }
 yy114:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 1) {
+ if (yybm[0+yych] & 1) {
         goto yy114;
     }
- if(yych <= '7') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '7') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy118;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy118;
+ if (yych <= '/') goto yy96;
                 goto yy107;
             }
         }
     } else {
- if(yych <= 'U') {
- if(yych == '?') goto yy119;
- if(yych <= 'T') goto yy96;
+ if (yych <= 'U') {
+ if (yych == '?') goto yy119;
+ if (yych <= 'T') goto yy96;
             goto yy117;
         } else {
- if(yych <= 'u') {
- if(yych <= 't') goto yy96;
+ if (yych <= 'u') {
+ if (yych <= 't') goto yy96;
             } else {
- if(yych == 'x') goto yy109;
+ if (yych == 'x') goto yy109;
                 goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
                 goto yy128;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
             goto yy128;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych <= 'f') goto yy128;
+ if (yych <= '`') goto yy96;
+ if (yych <= 'f') goto yy128;
                 goto yy96;
             }
         }
     }
 yy117:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
                 goto yy121;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
             goto yy121;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych <= 'f') goto yy121;
+ if (yych <= '`') goto yy96;
+ if (yych <= 'f') goto yy121;
                 goto yy96;
             }
         }
@@ -1498,596 +1498,596 @@
 yy118:
     yyaccept = 6;
     YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy102;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
+ if (yych <= '!') goto yy102;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy99;
     goto yy100;
 yy119:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych >= '\\') goto yy100;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych >= '\\') goto yy100;
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 128) {
+ if (yybm[256+yych] & 128) {
         goto yy112;
     }
- if(yych <= '!') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy96;
+ if (yych <= '!') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy96;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy96;
- if(yych <= 0x1F) goto yy98;
+ if (yych <= 0x0C) goto yy96;
+ if (yych <= 0x1F) goto yy98;
             goto yy96;
         }
     } else {
- if(yych <= '/') {
- if(yych <= '"') goto yy101;
- if(yych <= '.') goto yy96;
+ if (yych <= '/') {
+ if (yych <= '"') goto yy101;
+ if (yych <= '.') goto yy96;
             goto yy114;
         } else {
- if(yych == '\\') goto yy100;
+ if (yych == '\\') goto yy100;
             goto yy96;
         }
     }
 yy121:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy99;
     goto yy100;
 yy128:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy99;
     goto yy100;
 yy131:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy132;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy132;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy132:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy133;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy133;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy133:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy134;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy134;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy134:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy135;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy135;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy135:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy136;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy136;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy136:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy137;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy137;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy137:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy96;
+ 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;
+ if (yych <= 'F') goto yy96;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy96;
         goto yy98;
     }
 yy138:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy139;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy139;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy139:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy140;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy140;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy140:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy96;
+ 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;
+ if (yych <= 'F') goto yy96;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy96;
         goto yy98;
     }
 yy141:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy142:
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych >= '\\') goto yy144;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych >= '\\') goto yy144;
 yy143:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy156;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '[') goto yy156;
 yy144:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '`') {
- if(yych <= '7') {
- if(yych <= '&') {
- if(yych == '"') goto yy141;
+ if (yych <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy141;
                 goto yy98;
             } else {
- if(yych <= '\'') goto yy141;
- if(yych <= '/') goto yy98;
+ if (yych <= '\'') goto yy141;
+ if (yych <= '/') goto yy98;
                 goto yy149;
             }
         } else {
- if(yych <= 'T') {
- if(yych == '?') goto yy147;
+ if (yych <= 'T') {
+ if (yych == '?') goto yy147;
                 goto yy98;
             } else {
- if(yych <= 'U') goto yy146;
- if(yych == '\\') goto yy141;
+ if (yych <= 'U') goto yy146;
+ if (yych == '\\') goto yy141;
                 goto yy98;
             }
         }
     } else {
- if(yych <= 'r') {
- if(yych <= 'f') {
- if(yych <= 'b') goto yy141;
- if(yych <= 'e') goto yy98;
+ 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;
+ if (yych == 'n') goto yy141;
+ if (yych <= 'q') goto yy98;
                 goto yy141;
             }
         } else {
- if(yych <= 'u') {
- if(yych <= 's') goto yy98;
- if(yych <= 't') goto yy141;
+ if (yych <= 'u') {
+ if (yych <= 's') goto yy98;
+ if (yych <= 't') goto yy141;
             } else {
- if(yych <= 'v') goto yy141;
- if(yych == 'x') goto yy148;
+ if (yych <= 'v') goto yy141;
+ if (yych == 'x') goto yy148;
                 goto yy98;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy182;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych <= '9') goto yy182;
         goto yy98;
     } else {
- if(yych <= 'F') goto yy182;
- if(yych <= '`') goto yy98;
- if(yych <= 'f') goto yy182;
+ if (yych <= 'F') goto yy182;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy182;
         goto yy98;
     }
 yy146:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy175;
+ 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;
+ if (yych <= 'F') goto yy175;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy175;
         goto yy98;
     }
 yy147:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy155;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '[') goto yy155;
     goto yy144;
 yy148:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy153;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych <= '9') goto yy153;
         goto yy98;
     } else {
- if(yych <= 'F') goto yy153;
- if(yych <= '`') goto yy98;
- if(yych <= 'f') goto yy153;
+ if (yych <= 'F') goto yy153;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy153;
         goto yy98;
     }
 yy149:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '\'') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy141;
+ if (yych <= '\'') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy141;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy141;
- if(yych <= 0x1F) goto yy98;
- if(yych <= '&') goto yy141;
+ if (yych <= 0x0C) goto yy141;
+ if (yych <= 0x1F) goto yy98;
+ if (yych <= '&') goto yy141;
             goto yy151;
         }
     } else {
- if(yych <= '>') {
- if(yych <= '/') goto yy141;
- if(yych >= '8') goto yy141;
+ if (yych <= '>') {
+ if (yych <= '/') goto yy141;
+ if (yych >= '8') goto yy141;
         } else {
- if(yych <= '?') goto yy143;
- if(yych == '\\') goto yy144;
+ if (yych <= '?') goto yy143;
+ if (yych == '\\') goto yy144;
             goto yy141;
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy143;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '[') goto yy143;
     goto yy144;
 yy151:
     ++YYCURSOR;
@@ -2097,180 +2097,180 @@
 #line 2098 "cpp_re.inc"
 yy153:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
                 goto yy153;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
             goto yy153;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych <= 'f') goto yy153;
+ if (yych <= '`') goto yy141;
+ if (yych <= 'f') goto yy153;
                 goto yy141;
             }
         }
     }
 yy155:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych >= '\\') goto yy144;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych >= '\\') goto yy144;
 yy156:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '\'') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy141;
+ if (yych <= '\'') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy141;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy141;
- if(yych <= 0x1F) goto yy98;
- if(yych <= '&') goto yy141;
+ if (yych <= 0x0C) goto yy141;
+ if (yych <= 0x1F) goto yy98;
+ if (yych <= '&') goto yy141;
             goto yy151;
         }
     } else {
- if(yych <= '>') {
- if(yych != '/') goto yy141;
+ if (yych <= '>') {
+ if (yych != '/') goto yy141;
         } else {
- if(yych <= '?') goto yy156;
- if(yych == '\\') goto yy144;
+ if (yych <= '?') goto yy156;
+ if (yych == '\\') goto yy144;
             goto yy141;
         }
     }
 yy158:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '>') {
- if(yych <= 0x1F) {
- if(yych <= 0x09) {
- if(yych <= 0x08) goto yy98;
+ if (yych <= '>') {
+ if (yych <= 0x1F) {
+ if (yych <= 0x09) {
+ if (yych <= 0x08) goto yy98;
                 goto yy141;
             } else {
- if(yych <= 0x0A) goto yy98;
- if(yych <= 0x0C) goto yy141;
+ if (yych <= 0x0A) goto yy98;
+ if (yych <= 0x0C) goto yy141;
                 goto yy98;
             }
         } else {
- if(yych <= '\'') {
- if(yych <= '&') goto yy141;
+ if (yych <= '\'') {
+ if (yych <= '&') goto yy141;
                 goto yy162;
             } else {
- if(yych <= '/') goto yy141;
- if(yych <= '7') goto yy149;
+ if (yych <= '/') goto yy141;
+ if (yych <= '7') goto yy149;
                 goto yy141;
             }
         }
     } else {
- if(yych <= '\\') {
- if(yych <= 'T') {
- if(yych <= '?') goto yy163;
+ if (yych <= '\\') {
+ if (yych <= 'T') {
+ if (yych <= '?') goto yy163;
                 goto yy141;
             } else {
- if(yych <= 'U') goto yy161;
- if(yych <= '[') goto yy141;
+ if (yych <= 'U') goto yy161;
+ if (yych <= '[') goto yy141;
                 goto yy158;
             }
         } else {
- if(yych <= 'u') {
- if(yych <= 't') goto yy141;
+ if (yych <= 'u') {
+ if (yych <= 't') goto yy141;
             } else {
- if(yych == 'x') goto yy153;
+ if (yych == 'x') goto yy153;
                 goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
                 goto yy172;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
             goto yy172;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych <= 'f') goto yy172;
+ if (yych <= '`') goto yy141;
+ if (yych <= 'f') goto yy172;
                 goto yy141;
             }
         }
     }
 yy161:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
                 goto yy165;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
             goto yy165;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych <= 'f') goto yy165;
+ if (yych <= '`') goto yy141;
+ if (yych <= 'f') goto yy165;
                 goto yy141;
             }
         }
@@ -2278,747 +2278,747 @@
 yy162:
     yyaccept = 7;
     YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy152;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy143;
+ if (yych <= '&') goto yy152;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '[') goto yy143;
     goto yy144;
 yy163:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych >= '\\') goto yy144;
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '\'') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy141;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych >= '\\') goto yy144;
+ ++YYCURSOR;
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '\'') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy141;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy141;
- if(yych <= 0x1F) goto yy98;
- if(yych <= '&') goto yy141;
+ if (yych <= 0x0C) goto yy141;
+ if (yych <= 0x1F) goto yy98;
+ if (yych <= '&') goto yy141;
             goto yy151;
         }
     } else {
- if(yych <= '>') {
- if(yych == '/') goto yy158;
+ if (yych <= '>') {
+ if (yych == '/') goto yy158;
             goto yy141;
         } else {
- if(yych <= '?') goto yy156;
- if(yych == '\\') goto yy144;
+ if (yych <= '?') goto yy156;
+ if (yych == '\\') goto yy144;
             goto yy141;
         }
     }
 yy165:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy143;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '[') goto yy143;
     goto yy144;
 yy172:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy143;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '[') goto yy143;
     goto yy144;
 yy175:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy176;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy176;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy176:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy177;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy177;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy177:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy178;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy178;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy178:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy179;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy179;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy179:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy180;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy180;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy180:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy181;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy181;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy181:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy141;
+ 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;
+ if (yych <= 'F') goto yy141;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy141;
         goto yy98;
     }
 yy182:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy183;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy183;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy183:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy184;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy184;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy184:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy141;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
- } else {
- if(yych <= 'F') goto yy194;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ 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;
     }
 yy194:
     yyaccept = 1;
     YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy195:
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych != '\\') goto yy9;
+ if (yych == '?') goto yy197;
+ if (yych != '\\') goto yy9;
 yy196:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych == 'U') goto yy200;
- if(yych == 'u') goto yy199;
+ if (yych == 'U') goto yy200;
+ if (yych == 'u') goto yy199;
     goto yy98;
 yy197:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych != '?') goto yy98;
+ if (yych != '?') goto yy98;
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych == '/') goto yy196;
+ if (yych == '/') goto yy196;
     goto yy98;
 yy199:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy208;
+ 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;
+ if (yych <= 'F') goto yy208;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy208;
         goto yy98;
     }
 yy200:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy206;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy206;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy206:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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;
     }
 yy207:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy194;
+ 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;
+ if (yych <= 'F') goto yy194;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy194;
         goto yy98;
     }
 yy208:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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);
+ 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;
+ 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);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy194;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ if (yych <= 'F') goto yy194;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy194;
         goto yy98;
     }
 yy214:
     yych = *++YYCURSOR;
- if(yych == '\'') goto yy98;
+ if (yych == '\'') goto yy98;
     goto yy142;
 yy215:
     ++YYCURSOR;
@@ -3027,7 +3027,7 @@
 #line 3028 "cpp_re.inc"
 yy217:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy219;
+ if ((yych = *YYCURSOR) == '=') goto yy219;
 #line 210 "cpp.re"
     { BOOST_WAVE_RET(T_SHIFTRIGHT); }
 #line 3034 "cpp_re.inc"
@@ -3048,7 +3048,7 @@
 #line 3049 "cpp_re.inc"
 yy225:
     yych = *++YYCURSOR;
- if(yych == '?') goto yy230;
+ if (yych == '?') goto yy230;
     goto yy98;
 yy226:
     ++YYCURSOR;
@@ -3062,7 +3062,7 @@
 #line 3063 "cpp_re.inc"
 yy230:
     yych = *++YYCURSOR;
- if(yych != '!') goto yy98;
+ if (yych != '!') goto yy98;
     ++YYCURSOR;
 #line 222 "cpp.re"
     { BOOST_WAVE_RET(T_OROR_TRIGRAPH); }
@@ -3080,24 +3080,24 @@
 yy237:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 8;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '@') {
- if(yych <= '/') {
- if(yych == '$') goto yy194;
+ if (yych <= '@') {
+ if (yych <= '/') {
+ if (yych == '$') goto yy194;
         } else {
- if(yych <= '9') goto yy194;
- if(yych == '?') goto yy197;
+ if (yych <= '9') goto yy194;
+ if (yych == '?') goto yy197;
         }
     } else {
- if(yych <= '^') {
- if(yych <= 'Z') goto yy194;
- if(yych == '\\') goto yy196;
+ 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;
+ if (yych <= '_') goto yy240;
+ if (yych <= '`') goto yy239;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy239:
@@ -3107,17 +3107,17 @@
 yy240:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'q') goto yy195;
+ if (yych != 'q') goto yy195;
     yyaccept = 9;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ 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); }
@@ -3134,7 +3134,7 @@
 #line 3135 "cpp_re.inc"
 yy248:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '*') goto yy254;
+ if ((yych = *YYCURSOR) == '*') goto yy254;
 #line 238 "cpp.re"
     { BOOST_WAVE_RET(T_ARROW); }
 #line 3141 "cpp_re.inc"
@@ -3173,96 +3173,96 @@
 #line 3174 "cpp_re.inc"
 yy260:
     ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
+ if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
     yych = *YYCURSOR;
 yy261:
- if(yych <= 'h') {
- if(yych <= ' ') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy260;
+ if (yych <= 'h') {
+ if (yych <= ' ') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy260;
                 goto yy98;
             } else {
- if(yych <= 0x0C) goto yy260;
- if(yych <= 0x1F) goto yy98;
+ if (yych <= 0x0C) goto yy260;
+ if (yych <= 0x1F) goto yy98;
                 goto yy260;
             }
         } else {
- if(yych <= 'c') {
- if(yych != '/') goto yy98;
+ if (yych <= 'c') {
+ if (yych != '/') goto yy98;
             } else {
- if(yych <= 'd') goto yy269;
- if(yych <= 'e') goto yy263;
+ if (yych <= 'd') goto yy269;
+ if (yych <= 'e') goto yy263;
                 goto yy98;
             }
         }
     } else {
- if(yych <= 'q') {
- if(yych <= 'l') {
- if(yych <= 'i') goto yy270;
- if(yych <= 'k') goto yy98;
+ if (yych <= 'q') {
+ if (yych <= 'l') {
+ if (yych <= 'i') goto yy270;
+ if (yych <= 'k') goto yy98;
                 goto yy267;
             } else {
- if(yych == 'p') goto yy266;
+ if (yych == 'p') goto yy266;
                 goto yy98;
             }
         } else {
- if(yych <= 'u') {
- if(yych <= 'r') goto yy264;
- if(yych <= 't') goto yy98;
+ if (yych <= 'u') {
+ if (yych <= 'r') goto yy264;
+ if (yych <= 't') goto yy98;
                 goto yy268;
             } else {
- if(yych == 'w') goto yy265;
+ if (yych == 'w') goto yy265;
                 goto yy98;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych == '*') goto yy377;
+ if (yych == '*') goto yy377;
     goto yy98;
 yy263:
     yych = *++YYCURSOR;
- if(yych <= 'm') {
- if(yych == 'l') goto yy353;
+ if (yych <= 'm') {
+ if (yych == 'l') goto yy353;
         goto yy98;
     } else {
- if(yych <= 'n') goto yy354;
- if(yych == 'r') goto yy355;
+ if (yych <= 'n') goto yy354;
+ if (yych == 'r') goto yy355;
         goto yy98;
     }
 yy264:
     yych = *++YYCURSOR;
- if(yych == 'e') goto yy347;
+ if (yych == 'e') goto yy347;
     goto yy98;
 yy265:
     yych = *++YYCURSOR;
- if(yych == 'a') goto yy340;
+ if (yych == 'a') goto yy340;
     goto yy98;
 yy266:
     yych = *++YYCURSOR;
- if(yych == 'r') goto yy334;
+ if (yych == 'r') goto yy334;
     goto yy98;
 yy267:
     yych = *++YYCURSOR;
- if(yych == 'i') goto yy330;
+ if (yych == 'i') goto yy330;
     goto yy98;
 yy268:
     yych = *++YYCURSOR;
- if(yych == 'n') goto yy325;
+ if (yych == 'n') goto yy325;
     goto yy98;
 yy269:
     yych = *++YYCURSOR;
- if(yych == 'e') goto yy319;
+ if (yych == 'e') goto yy319;
     goto yy98;
 yy270:
     yych = *++YYCURSOR;
- if(yych == 'f') goto yy278;
- if(yych == 'n') goto yy277;
+ if (yych == 'f') goto yy278;
+ if (yych == 'n') goto yy277;
     goto yy98;
 yy271:
     yych = *++YYCURSOR;
- if(yych == '?') goto yy274;
+ if (yych == '?') goto yy274;
     goto yy98;
 yy272:
     ++YYCURSOR;
@@ -3271,58 +3271,58 @@
 #line 3272 "cpp_re.inc"
 yy274:
     yych = *++YYCURSOR;
- if(yych != '=') goto yy98;
+ if (yych != '=') goto yy98;
     ++YYCURSOR;
 #line 144 "cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_TRIGRAPH); }
 #line 3279 "cpp_re.inc"
 yy277:
     yych = *++YYCURSOR;
- if(yych == 'c') goto yy289;
+ if (yych == 'c') goto yy289;
     goto yy98;
 yy278:
     yyaccept = 10;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'd') goto yy281;
- if(yych == 'n') goto yy280;
+ if (yych == 'd') goto yy281;
+ if (yych == 'n') goto yy280;
 yy279:
 #line 261 "cpp.re"
     { BOOST_WAVE_RET(T_PP_IF); }
 #line 3292 "cpp_re.inc"
 yy280:
     yych = *++YYCURSOR;
- if(yych == 'd') goto yy285;
+ if (yych == 'd') goto yy285;
     goto yy98;
 yy281:
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'f') goto yy98;
+ if (yych != 'f') goto yy98;
     ++YYCURSOR;
 #line 262 "cpp.re"
     { BOOST_WAVE_RET(T_PP_IFDEF); }
 #line 3305 "cpp_re.inc"
 yy285:
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'f') goto yy98;
+ if (yych != 'f') goto yy98;
     ++YYCURSOR;
 #line 263 "cpp.re"
     { BOOST_WAVE_RET(T_PP_IFNDEF); }
 #line 3314 "cpp_re.inc"
 yy289:
     yych = *++YYCURSOR;
- if(yych != 'l') goto yy98;
+ if (yych != 'l') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'u') goto yy98;
+ if (yych != 'u') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'd') goto yy98;
+ if (yych != 'd') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     yyaccept = 11;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == '_') goto yy295;
+ if (yych == '_') goto yy295;
     goto yy297;
 yy294:
 #line 259 "cpp.re"
@@ -3330,238 +3330,238 @@
 #line 3331 "cpp_re.inc"
 yy295:
     yych = *++YYCURSOR;
- if(yych == 'n') goto yy316;
+ if (yych == 'n') goto yy316;
     goto yy98;
 yy296:
     yyaccept = 11;
     YYMARKER = ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
 yy297:
- if(yych <= ' ') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy296;
+ if (yych <= ' ') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy296;
             goto yy294;
         } else {
- if(yych <= 0x0C) goto yy296;
- if(yych <= 0x1F) goto yy294;
+ if (yych <= 0x0C) goto yy296;
+ if (yych <= 0x1F) goto yy294;
             goto yy296;
         }
     } else {
- if(yych <= '.') {
- if(yych == '"') goto yy300;
+ if (yych <= '.') {
+ if (yych == '"') goto yy300;
             goto yy294;
         } else {
- if(yych <= '/') goto yy298;
- if(yych == '<') goto yy299;
+ if (yych <= '/') goto yy298;
+ if (yych == '<') goto yy299;
             goto yy294;
         }
     }
 yy298:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych == '*') goto yy309;
+ if (yych == '*') goto yy309;
     goto yy98;
 yy299:
     yych = *++YYCURSOR;
- if(yych == '>') goto yy98;
+ if (yych == '>') goto yy98;
     goto yy306;
 yy300:
     yych = *++YYCURSOR;
- if(yych == '"') goto yy98;
+ if (yych == '"') goto yy98;
     goto yy302;
 yy301:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy302:
- if(yybm[0+yych] & 8) {
+ if (yybm[0+yych] & 8) {
         goto yy301;
     }
- if(yych <= '!') goto yy98;
+ if (yych <= '!') goto yy98;
     ++YYCURSOR;
 #line 256 "cpp.re"
     { BOOST_WAVE_RET(T_PP_QHEADER); }
 #line 3387 "cpp_re.inc"
 yy305:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy306:
- if(yybm[0+yych] & 16) {
+ if (yybm[0+yych] & 16) {
         goto yy305;
     }
- if(yych <= '=') goto yy98;
+ if (yych <= '=') goto yy98;
     ++YYCURSOR;
 #line 253 "cpp.re"
     { BOOST_WAVE_RET(T_PP_HHEADER); }
 #line 3400 "cpp_re.inc"
 yy309:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 32) {
+ if (yybm[0+yych] & 32) {
         goto yy309;
     }
- if(yych == 0x0D) goto yy311;
- if(yych <= ')') goto yy98;
+ if (yych == 0x0D) goto yy311;
+ if (yych <= ')') goto yy98;
     goto yy313;
 yy311:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 32) {
+ if (yybm[0+yych] & 32) {
         goto yy309;
     }
- if(yych == 0x0D) goto yy311;
- if(yych <= ')') goto yy98;
+ if (yych == 0x0D) goto yy311;
+ if (yych <= ')') goto yy98;
 yy313:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 128) {
+ if (yybm[0+yych] & 128) {
         goto yy313;
     }
- if(yych <= 0x0D) {
- if(yych <= 0x08) goto yy98;
- if(yych <= 0x0C) goto yy309;
+ if (yych <= 0x0D) {
+ if (yych <= 0x08) goto yy98;
+ if (yych <= 0x0C) goto yy309;
     } else {
- if(yych <= 0x1F) goto yy98;
- if(yych == '/') goto yy296;
+ if (yych <= 0x1F) goto yy98;
+ if (yych == '/') goto yy296;
         goto yy309;
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 32) {
+ if (yybm[0+yych] & 32) {
         goto yy309;
     }
- if(yych == 0x0D) goto yy311;
- if(yych <= ')') goto yy98;
+ if (yych == 0x0D) goto yy311;
+ if (yych <= ')') goto yy98;
     goto yy313;
 yy316:
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'x') goto yy98;
+ if (yych != 'x') goto yy98;
     yych = *++YYCURSOR;
- if(yych == 't') goto yy296;
+ if (yych == 't') goto yy296;
     goto yy98;
 yy319:
     yych = *++YYCURSOR;
- if(yych != 'f') goto yy98;
+ if (yych != 'f') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'i') goto yy98;
+ if (yych != 'i') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'n') goto yy98;
+ if (yych != 'n') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     ++YYCURSOR;
 #line 267 "cpp.re"
     { BOOST_WAVE_RET(T_PP_DEFINE); }
 #line 3464 "cpp_re.inc"
 yy325:
     yych = *++YYCURSOR;
- if(yych != 'd') goto yy98;
+ if (yych != 'd') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'f') goto yy98;
+ if (yych != 'f') goto yy98;
     ++YYCURSOR;
 #line 268 "cpp.re"
     { BOOST_WAVE_RET(T_PP_UNDEF); }
 #line 3475 "cpp_re.inc"
 yy330:
     yych = *++YYCURSOR;
- if(yych != 'n') goto yy98;
+ if (yych != 'n') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     ++YYCURSOR;
 #line 269 "cpp.re"
     { BOOST_WAVE_RET(T_PP_LINE); }
 #line 3484 "cpp_re.inc"
 yy334:
     yych = *++YYCURSOR;
- if(yych != 'a') goto yy98;
+ if (yych != 'a') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'g') goto yy98;
+ if (yych != 'g') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'm') goto yy98;
+ if (yych != 'm') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'a') goto yy98;
+ if (yych != 'a') goto yy98;
     ++YYCURSOR;
 #line 271 "cpp.re"
     { BOOST_WAVE_RET(T_PP_PRAGMA); }
 #line 3497 "cpp_re.inc"
 yy340:
     yych = *++YYCURSOR;
- if(yych != 'r') goto yy98;
+ if (yych != 'r') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'n') goto yy98;
+ if (yych != 'n') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'i') goto yy98;
+ if (yych != 'i') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'n') goto yy98;
+ if (yych != 'n') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'g') goto yy98;
+ if (yych != 'g') goto yy98;
     ++YYCURSOR;
 #line 273 "cpp.re"
     { BOOST_WAVE_RET(T_PP_WARNING); }
 #line 3512 "cpp_re.inc"
 yy347:
     yych = *++YYCURSOR;
- if(yych != 'g') goto yy98;
+ if (yych != 'g') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'i') goto yy98;
+ if (yych != 'i') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'o') goto yy98;
+ if (yych != 'o') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'n') goto yy98;
+ if (yych != 'n') goto yy98;
     ++YYCURSOR;
 #line 275 "cpp.re"
     { BOOST_WAVE_RET(T_MSEXT_PP_REGION); }
 #line 3525 "cpp_re.inc"
 yy353:
     yych = *++YYCURSOR;
- if(yych == 'i') goto yy371;
- if(yych == 's') goto yy372;
+ if (yych == 'i') goto yy371;
+ if (yych == 's') goto yy372;
     goto yy98;
 yy354:
     yych = *++YYCURSOR;
- if(yych == 'd') goto yy360;
+ if (yych == 'd') goto yy360;
     goto yy98;
 yy355:
     yych = *++YYCURSOR;
- if(yych != 'r') goto yy98;
+ if (yych != 'r') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'o') goto yy98;
+ if (yych != 'o') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'r') goto yy98;
+ if (yych != 'r') goto yy98;
     ++YYCURSOR;
 #line 270 "cpp.re"
     { BOOST_WAVE_RET(T_PP_ERROR); }
 #line 3545 "cpp_re.inc"
 yy360:
     yych = *++YYCURSOR;
- if(yych == 'i') goto yy361;
- if(yych == 'r') goto yy362;
+ if (yych == 'i') goto yy361;
+ if (yych == 'r') goto yy362;
     goto yy98;
 yy361:
     yych = *++YYCURSOR;
- if(yych == 'f') goto yy369;
+ if (yych == 'f') goto yy369;
     goto yy98;
 yy362:
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'g') goto yy98;
+ if (yych != 'g') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'i') goto yy98;
+ if (yych != 'i') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'o') goto yy98;
+ if (yych != 'o') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'n') goto yy98;
+ if (yych != 'n') goto yy98;
     ++YYCURSOR;
 #line 276 "cpp.re"
     { BOOST_WAVE_RET(T_MSEXT_PP_ENDREGION); }
@@ -3573,11 +3573,11 @@
 #line 3574 "cpp_re.inc"
 yy371:
     yych = *++YYCURSOR;
- if(yych == 'f') goto yy375;
+ if (yych == 'f') goto yy375;
     goto yy98;
 yy372:
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     ++YYCURSOR;
 #line 264 "cpp.re"
     { BOOST_WAVE_RET(T_PP_ELSE); }
@@ -3589,55 +3589,55 @@
 #line 3590 "cpp_re.inc"
 yy377:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= 0x0D) {
- if(yych <= 0x08) goto yy98;
- if(yych <= 0x0C) goto yy377;
+ if (yych <= 0x0D) {
+ if (yych <= 0x08) goto yy98;
+ if (yych <= 0x0C) goto yy377;
     } else {
- if(yych <= 0x1F) goto yy98;
- if(yych == '*') goto yy381;
+ if (yych <= 0x1F) goto yy98;
+ if (yych == '*') goto yy381;
         goto yy377;
     }
 yy379:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= 0x0D) {
- if(yych <= 0x08) goto yy98;
- if(yych <= 0x0C) goto yy377;
+ if (yych <= 0x0D) {
+ if (yych <= 0x08) goto yy98;
+ if (yych <= 0x0C) goto yy377;
         goto yy379;
     } else {
- if(yych <= 0x1F) goto yy98;
- if(yych != '*') goto yy377;
+ if (yych <= 0x1F) goto yy98;
+ if (yych != '*') goto yy377;
     }
 yy381:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= 0x1F) {
- if(yych <= 0x08) goto yy98;
- if(yych <= 0x0C) goto yy377;
- if(yych >= 0x0E) goto yy98;
+ if (yych <= 0x1F) {
+ if (yych <= 0x08) goto yy98;
+ if (yych <= 0x0C) goto yy377;
+ if (yych >= 0x0E) goto yy98;
     } else {
- if(yych <= '*') {
- if(yych <= ')') goto yy377;
+ if (yych <= '*') {
+ if (yych <= ')') goto yy377;
             goto yy381;
         } else {
- if(yych == '/') goto yy260;
+ if (yych == '/') goto yy260;
             goto yy377;
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= 0x0D) {
- if(yych <= 0x08) goto yy98;
- if(yych <= 0x0C) goto yy377;
+ if (yych <= 0x0D) {
+ if (yych <= 0x08) goto yy98;
+ if (yych <= 0x0C) goto yy377;
         goto yy379;
     } else {
- if(yych <= 0x1F) goto yy98;
- if(yych == '*') goto yy381;
+ if (yych <= 0x1F) goto yy98;
+ if (yych == '*') goto yy381;
         goto yy377;
     }
 yy384:
@@ -3661,36 +3661,36 @@
 yy388:
     yyaccept = 12;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'e') {
- if(yych <= ' ') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy261;
+ if (yych <= 'e') {
+ if (yych <= ' ') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy261;
             } else {
- if(yych <= 0x0C) goto yy261;
- if(yych >= ' ') goto yy261;
+ if (yych <= 0x0C) goto yy261;
+ if (yych >= ' ') goto yy261;
             }
         } else {
- if(yych <= '.') {
- if(yych == '%') goto yy394;
+ if (yych <= '.') {
+ if (yych == '%') goto yy394;
             } else {
- if(yych <= '/') goto yy261;
- if(yych >= 'd') goto yy261;
+ if (yych <= '/') goto yy261;
+ if (yych >= 'd') goto yy261;
             }
         }
     } else {
- if(yych <= 'p') {
- if(yych <= 'k') {
- if(yych == 'i') goto yy261;
+ if (yych <= 'p') {
+ if (yych <= 'k') {
+ if (yych == 'i') goto yy261;
             } else {
- if(yych <= 'l') goto yy261;
- if(yych >= 'p') goto yy261;
+ if (yych <= 'l') goto yy261;
+ if (yych >= 'p') goto yy261;
             }
         } else {
- if(yych <= 't') {
- if(yych == 'r') goto yy261;
+ if (yych <= 't') {
+ if (yych == 'r') goto yy261;
             } else {
- if(yych == 'v') goto yy389;
- if(yych <= 'w') goto yy261;
+ if (yych == 'v') goto yy389;
+ if (yych <= 'w') goto yy261;
             }
         }
     }
@@ -3710,7 +3710,7 @@
 #line 3711 "cpp_re.inc"
 yy394:
     yych = *++YYCURSOR;
- if(yych != ':') goto yy98;
+ if (yych != ':') goto yy98;
     ++YYCURSOR;
 #line 147 "cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_ALT); }
@@ -3722,7 +3722,7 @@
 #line 3723 "cpp_re.inc"
 yy399:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy405;
+ if ((yych = *YYCURSOR) == '=') goto yy405;
 #line 209 "cpp.re"
     { BOOST_WAVE_RET(T_SHIFTLEFT); }
 #line 3729 "cpp_re.inc"
@@ -3743,7 +3743,7 @@
 #line 3744 "cpp_re.inc"
 yy407:
     yych = *++YYCURSOR;
- switch(yych) {
+ switch (yych) {
     case '!': goto yy420;
     case '\'': goto yy418;
     case '(': goto yy412;
@@ -3778,37 +3778,37 @@
 yy416:
     yyaccept = 13;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'c') {
- if(yych <= ' ') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy261;
+ if (yych <= 'c') {
+ if (yych <= ' ') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy261;
             } else {
- if(yych <= 0x0C) goto yy261;
- if(yych >= ' ') goto yy261;
+ if (yych <= 0x0C) goto yy261;
+ if (yych >= ' ') goto yy261;
             }
         } else {
- if(yych <= '.') {
- if(yych == '#') goto yy437;
+ if (yych <= '.') {
+ if (yych == '#') goto yy437;
             } else {
- if(yych <= '/') goto yy261;
- if(yych == '?') goto yy436;
+ if (yych <= '/') goto yy261;
+ if (yych == '?') goto yy436;
             }
         }
     } else {
- if(yych <= 'p') {
- if(yych <= 'i') {
- if(yych <= 'e') goto yy261;
- if(yych >= 'i') goto yy261;
+ if (yych <= 'p') {
+ if (yych <= 'i') {
+ if (yych <= 'e') goto yy261;
+ if (yych >= 'i') goto yy261;
             } else {
- if(yych == 'l') goto yy261;
- if(yych >= 'p') goto yy261;
+ if (yych == 'l') goto yy261;
+ if (yych >= 'p') goto yy261;
             }
         } else {
- if(yych <= 't') {
- if(yych == 'r') goto yy261;
+ if (yych <= 't') {
+ if (yych == 'r') goto yy261;
             } else {
- if(yych == 'v') goto yy417;
- if(yych <= 'w') goto yy261;
+ if (yych == 'v') goto yy417;
+ if (yych <= 'w') goto yy261;
             }
         }
     }
@@ -3818,18 +3818,18 @@
 #line 3819 "cpp_re.inc"
 yy418:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy434;
+ if ((yych = *YYCURSOR) == '=') goto yy434;
 #line 181 "cpp.re"
     { BOOST_WAVE_RET(T_XOR_TRIGRAPH); }
 #line 3825 "cpp_re.inc"
 yy420:
     yyaccept = 14;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '>') {
- if(yych == '=') goto yy429;
+ if (yych <= '>') {
+ if (yych == '=') goto yy429;
     } else {
- if(yych <= '?') goto yy426;
- if(yych == '|') goto yy427;
+ if (yych <= '?') goto yy426;
+ if (yych == '|') goto yy427;
     }
 yy421:
 #line 187 "cpp.re"
@@ -3843,15 +3843,15 @@
 yy424:
     yyaccept = 15;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'U') goto yy186;
- if(yych == 'u') goto yy185;
+ if (yych == 'U') goto yy186;
+ if (yych == 'u') goto yy185;
 yy425:
 #line 239 "cpp.re"
     { BOOST_WAVE_RET(T_ANY_TRIGRAPH); }
 #line 3852 "cpp_re.inc"
 yy426:
     yych = *++YYCURSOR;
- if(yych == '?') goto yy431;
+ if (yych == '?') goto yy431;
     goto yy98;
 yy427:
     ++YYCURSOR;
@@ -3865,7 +3865,7 @@
 #line 3866 "cpp_re.inc"
 yy431:
     yych = *++YYCURSOR;
- if(yych != '!') goto yy98;
+ if (yych != '!') goto yy98;
     ++YYCURSOR;
 #line 224 "cpp.re"
     { BOOST_WAVE_RET(T_OROR_TRIGRAPH); }
@@ -3877,7 +3877,7 @@
 #line 3878 "cpp_re.inc"
 yy436:
     yych = *++YYCURSOR;
- if(yych == '?') goto yy439;
+ if (yych == '?') goto yy439;
     goto yy98;
 yy437:
     ++YYCURSOR;
@@ -3886,7 +3886,7 @@
 #line 3887 "cpp_re.inc"
 yy439:
     yych = *++YYCURSOR;
- if(yych != '=') goto yy98;
+ if (yych != '=') goto yy98;
     ++YYCURSOR;
 #line 146 "cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_TRIGRAPH); }
@@ -3894,7 +3894,7 @@
 yy442:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
+ switch (yych) {
     case 'a': goto yy443;
     case 'b': goto yy444;
     case 'c': goto yy445;
@@ -3910,59 +3910,59 @@
 yy443:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 's') goto yy489;
+ if (yych == 's') goto yy489;
     goto yy195;
 yy444:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy484;
+ if (yych == 'a') goto yy484;
     goto yy195;
 yy445:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'd') goto yy479;
+ if (yych == 'd') goto yy479;
     goto yy195;
 yy446:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy471;
+ if (yych == 'e') goto yy471;
     goto yy195;
 yy447:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy463;
+ if (yych == 'a') goto yy463;
     goto yy195;
 yy448:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy457;
+ if (yych == 'n') goto yy457;
     goto yy195;
 yy449:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 16;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy456:
 #line 120 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_STDCALL : T_IDENTIFIER); }
@@ -3970,24 +3970,24 @@
 yy457:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
 yy458:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 17;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy462:
 #line 125 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INLINE : T_IDENTIFIER); }
@@ -3995,29 +3995,29 @@
 yy463:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 18;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy470:
 #line 119 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_FASTCALL : T_IDENTIFIER); }
@@ -4025,29 +4025,29 @@
 yy471:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 19;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy478:
 #line 117 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_DECLSPEC : T_IDENTIFIER); }
@@ -4055,20 +4055,20 @@
 yy479:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 20;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy483:
 #line 118 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_CDECL : T_IDENTIFIER); }
@@ -4076,20 +4076,20 @@
 yy484:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 21;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy488:
 #line 116 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_BASED : T_IDENTIFIER); }
@@ -4097,14 +4097,14 @@
 yy489:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'm') goto yy195;
+ if (yych != 'm') goto yy195;
     yyaccept = 22;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy491:
 #line 126 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_ASM : T_IDENTIFIER); }
@@ -4112,44 +4112,44 @@
 yy492:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy518;
+ if (yych == 'n') goto yy518;
     goto yy195;
 yy493:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy463;
- if(yych == 'i') goto yy511;
+ if (yych == 'a') goto yy463;
+ if (yych == 'i') goto yy511;
     goto yy195;
 yy494:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'r') goto yy508;
+ if (yych == 'r') goto yy508;
     goto yy195;
 yy495:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'x') goto yy502;
+ if (yych == 'x') goto yy502;
     goto yy195;
 yy496:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'v') goto yy195;
+ if (yych != 'v') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 23;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy501:
 #line 124 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_LEAVE : T_IDENTIFIER); }
@@ -4157,23 +4157,23 @@
 yy502:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 24;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy507:
 #line 122 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_EXCEPT : T_IDENTIFIER); }
@@ -4181,14 +4181,14 @@
 yy508:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'y') goto yy195;
+ if (yych != 'y') goto yy195;
     yyaccept = 25;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy510:
 #line 121 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_TRY : T_IDENTIFIER); }
@@ -4196,26 +4196,26 @@
 yy511:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'y') goto yy195;
+ if (yych != 'y') goto yy195;
     yyaccept = 26;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy517:
 #line 123 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_FINALLY : T_IDENTIFIER); }
@@ -4223,11 +4223,11 @@
 yy518:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'l') goto yy458;
- if(yych != 't') goto yy195;
+ if (yych == 'l') goto yy458;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
+ switch (yych) {
     case '1': goto yy520;
     case '3': goto yy521;
     case '6': goto yy522;
@@ -4237,26 +4237,26 @@
 yy520:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == '6') goto yy529;
+ if (yych == '6') goto yy529;
     goto yy195;
 yy521:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == '2') goto yy527;
+ if (yych == '2') goto yy527;
     goto yy195;
 yy522:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == '4') goto yy525;
+ if (yych == '4') goto yy525;
     goto yy195;
 yy523:
     yyaccept = 27;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy524:
 #line 112 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT8 : T_IDENTIFIER); }
@@ -4264,11 +4264,11 @@
 yy525:
     yyaccept = 28;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy526:
 #line 115 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT64 : T_IDENTIFIER); }
@@ -4276,11 +4276,11 @@
 yy527:
     yyaccept = 29;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy528:
 #line 114 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT32 : T_IDENTIFIER); }
@@ -4288,11 +4288,11 @@
 yy529:
     yyaccept = 30;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy530:
 #line 113 "cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT16 : T_IDENTIFIER); }
@@ -4300,25 +4300,25 @@
 yy531:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'h') goto yy537;
+ if (yych == 'h') goto yy537;
     goto yy195;
 yy532:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 31;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy536:
 #line 110 "cpp.re"
     { BOOST_WAVE_RET(T_WHILE); }
@@ -4326,23 +4326,23 @@
 yy537:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != '_') goto yy195;
+ if (yych != '_') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 32;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy542:
 #line 109 "cpp.re"
     { BOOST_WAVE_RET(T_WCHART); }
@@ -4350,42 +4350,42 @@
 yy543:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'r') goto yy555;
+ if (yych == 'r') goto yy555;
     goto yy195;
 yy544:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy545;
- if(yych == 'l') goto yy546;
+ if (yych == 'i') goto yy545;
+ if (yych == 'l') goto yy546;
     goto yy195;
 yy545:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'd') goto yy553;
+ if (yych == 'd') goto yy553;
     goto yy195;
 yy546:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 33;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy552:
 #line 108 "cpp.re"
     { BOOST_WAVE_RET(T_VOLATILE); }
@@ -4393,11 +4393,11 @@
 yy553:
     yyaccept = 34;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy554:
 #line 107 "cpp.re"
     { BOOST_WAVE_RET(T_VOID); }
@@ -4405,23 +4405,23 @@
 yy555:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'u') goto yy195;
+ if (yych != 'u') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 35;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy560:
 #line 106 "cpp.re"
     { BOOST_WAVE_RET(T_VIRTUAL); }
@@ -4429,26 +4429,26 @@
 yy561:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy567;
- if(yych == 's') goto yy568;
+ if (yych == 'i') goto yy567;
+ if (yych == 's') goto yy568;
     goto yy195;
 yy562:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'g') goto yy195;
+ if (yych != 'g') goto yy195;
     yyaccept = 36;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy566:
 #line 105 "cpp.re"
     { BOOST_WAVE_RET(T_USING); }
@@ -4456,31 +4456,31 @@
 yy567:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy575;
+ if (yych == 'o') goto yy575;
     goto yy195;
 yy568:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'g') goto yy195;
+ if (yych != 'g') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 37;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy574:
 #line 104 "cpp.re"
     { BOOST_WAVE_RET(T_UNSIGNED); }
@@ -4488,14 +4488,14 @@
 yy575:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 38;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy577:
 #line 103 "cpp.re"
     { BOOST_WAVE_RET(T_UNION); }
@@ -4503,62 +4503,62 @@
 yy578:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'm') goto yy608;
+ if (yych == 'm') goto yy608;
     goto yy195;
 yy579:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy601;
- if(yych == 'r') goto yy602;
+ if (yych == 'i') goto yy601;
+ if (yych == 'r') goto yy602;
     goto yy195;
 yy580:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'u') goto yy596;
- if(yych == 'y') goto yy597;
+ if (yych == 'u') goto yy596;
+ if (yych == 'y') goto yy597;
     goto yy195;
 yy581:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'h') {
- if(yych != 'd') goto yy195;
+ if (yych <= 'h') {
+ if (yych != 'd') goto yy195;
     } else {
- if(yych <= 'i') goto yy585;
- if(yych == 'n') goto yy586;
+ if (yych <= 'i') goto yy585;
+ if (yych == 'n') goto yy586;
         goto yy195;
     }
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy593;
+ if (yych == 'e') goto yy593;
     goto yy195;
 yy585:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'd') goto yy591;
+ if (yych == 'd') goto yy591;
     goto yy195;
 yy586:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'm') goto yy195;
+ if (yych != 'm') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 39;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy590:
 #line 102 "cpp.re"
     { BOOST_WAVE_RET(T_TYPENAME); }
@@ -4566,11 +4566,11 @@
 yy591:
     yyaccept = 40;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy592:
 #line 101 "cpp.re"
     { BOOST_WAVE_RET(T_TYPEID); }
@@ -4578,14 +4578,14 @@
 yy593:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'f') goto yy195;
+ if (yych != 'f') goto yy195;
     yyaccept = 41;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy595:
 #line 100 "cpp.re"
     { BOOST_WAVE_RET(T_TYPEDEF); }
@@ -4593,16 +4593,16 @@
 yy596:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy599;
+ if (yych == 'e') goto yy599;
     goto yy195;
 yy597:
     yyaccept = 42;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy598:
 #line 99 "cpp.re"
     { BOOST_WAVE_RET(T_TRY); }
@@ -4610,11 +4610,11 @@
 yy599:
     yyaccept = 43;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy600:
 #line 98 "cpp.re"
     { BOOST_WAVE_RET(T_TRUE); }
@@ -4622,22 +4622,22 @@
 yy601:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 's') goto yy606;
+ if (yych == 's') goto yy606;
     goto yy195;
 yy602:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'o') goto yy195;
+ if (yych != 'o') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'w') goto yy195;
+ if (yych != 'w') goto yy195;
     yyaccept = 44;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy605:
 #line 97 "cpp.re"
     { BOOST_WAVE_RET(T_THROW); }
@@ -4645,11 +4645,11 @@
 yy606:
     yyaccept = 45;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy607:
 #line 96 "cpp.re"
     { BOOST_WAVE_RET(T_THIS); }
@@ -4657,26 +4657,26 @@
 yy608:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 46;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy614:
 #line 95 "cpp.re"
     { BOOST_WAVE_RET(T_TEMPLATE); }
@@ -4684,40 +4684,40 @@
 yy615:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy650;
+ if (yych == 'o') goto yy650;
     goto yy195;
 yy616:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'g') goto yy640;
- if(yych == 'z') goto yy641;
+ if (yych == 'g') goto yy640;
+ if (yych == 'z') goto yy641;
     goto yy195;
 yy617:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy624;
- if(yych == 'r') goto yy625;
+ if (yych == 'a') goto yy624;
+ if (yych == 'r') goto yy625;
     goto yy195;
 yy618:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'h') goto yy195;
+ if (yych != 'h') goto yy195;
     yyaccept = 47;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy623:
 #line 94 "cpp.re"
     { BOOST_WAVE_RET(T_SWITCH); }
@@ -4725,25 +4725,25 @@
 yy624:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 't') goto yy630;
+ if (yych == 't') goto yy630;
     goto yy195;
 yy625:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'u') goto yy195;
+ if (yych != 'u') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 48;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy629:
 #line 93 "cpp.re"
     { BOOST_WAVE_RET(T_STRUCT); }
@@ -4751,27 +4751,27 @@
 yy630:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 49;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '@') {
- if(yych <= '/') {
- if(yych == '$') goto yy194;
+ if (yych <= '@') {
+ if (yych <= '/') {
+ if (yych == '$') goto yy194;
         } else {
- if(yych <= '9') goto yy194;
- if(yych == '?') goto yy197;
+ if (yych <= '9') goto yy194;
+ if (yych == '?') goto yy197;
         }
     } else {
- if(yych <= '^') {
- if(yych <= 'Z') goto yy194;
- if(yych == '\\') goto yy196;
+ if (yych <= '^') {
+ if (yych <= 'Z') goto yy194;
+ if (yych == '\\') goto yy196;
         } else {
- if(yych <= '_') goto yy634;
- if(yych <= '`') goto yy633;
- if(yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy634;
+ if (yych <= '`') goto yy633;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy633:
@@ -4781,23 +4781,23 @@
 yy634:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 50;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy639:
 #line 92 "cpp.re"
     { BOOST_WAVE_RET(T_STATICCAST); }
@@ -4805,25 +4805,25 @@
 yy640:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy646;
+ if (yych == 'n') goto yy646;
     goto yy195;
 yy641:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'o') goto yy195;
+ if (yych != 'o') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'f') goto yy195;
+ if (yych != 'f') goto yy195;
     yyaccept = 51;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy645:
 #line 90 "cpp.re"
     { BOOST_WAVE_RET(T_SIZEOF); }
@@ -4831,17 +4831,17 @@
 yy646:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 52;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy649:
 #line 89 "cpp.re"
     { BOOST_WAVE_RET(T_SIGNED); }
@@ -4849,17 +4849,17 @@
 yy650:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 53;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy653:
 #line 88 "cpp.re"
     { BOOST_WAVE_RET(T_SHORT); }
@@ -4867,39 +4867,39 @@
 yy654:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'h') {
- if(yych != 'g') goto yy195;
+ if (yych <= 'h') {
+ if (yych != 'g') goto yy195;
     } else {
- if(yych <= 'i') goto yy656;
- if(yych == 't') goto yy657;
+ if (yych <= 'i') goto yy656;
+ if (yych == 't') goto yy657;
         goto yy195;
     }
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy676;
+ if (yych == 'i') goto yy676;
     goto yy195;
 yy656:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy662;
+ if (yych == 'n') goto yy662;
     goto yy195;
 yy657:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'u') goto yy195;
+ if (yych != 'u') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 54;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy661:
 #line 87 "cpp.re"
     { BOOST_WAVE_RET(T_RETURN); }
@@ -4907,47 +4907,47 @@
 yy662:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != '_') goto yy195;
+ if (yych != '_') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 55;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy675:
 #line 86 "cpp.re"
     { BOOST_WAVE_RET(T_REINTERPRETCAST); }
@@ -4955,23 +4955,23 @@
 yy676:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 56;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy681:
 #line 85 "cpp.re"
     { BOOST_WAVE_RET(T_REGISTER); }
@@ -4979,29 +4979,29 @@
 yy682:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy689;
- if(yych == 'o') goto yy690;
+ if (yych == 'i') goto yy689;
+ if (yych == 'o') goto yy690;
     goto yy195;
 yy683:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'b') goto yy195;
+ if (yych != 'b') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 57;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy688:
 #line 84 "cpp.re"
     { BOOST_WAVE_RET(T_PUBLIC); }
@@ -5009,34 +5009,34 @@
 yy689:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'v') goto yy698;
+ if (yych == 'v') goto yy698;
     goto yy195;
 yy690:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 58;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy697:
 #line 83 "cpp.re"
     { BOOST_WAVE_RET(T_PROTECTED); }
@@ -5044,20 +5044,20 @@
 yy698:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 59;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy702:
 #line 82 "cpp.re"
     { BOOST_WAVE_RET(T_PRIVATE); }
@@ -5065,26 +5065,26 @@
 yy703:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy710;
+ if (yych == 'e') goto yy710;
     goto yy195;
 yy704:
     yyaccept = 60;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '@') {
- if(yych <= '/') {
- if(yych == '$') goto yy194;
+ if (yych <= '@') {
+ if (yych <= '/') {
+ if (yych == '$') goto yy194;
         } else {
- if(yych <= '9') goto yy194;
- if(yych == '?') goto yy197;
+ if (yych <= '9') goto yy194;
+ if (yych == '?') goto yy197;
         }
     } else {
- if(yych <= '^') {
- if(yych <= 'Z') goto yy194;
- if(yych == '\\') goto yy196;
+ if (yych <= '^') {
+ if (yych <= 'Z') goto yy194;
+ if (yych == '\\') goto yy196;
         } else {
- if(yych <= '_') goto yy706;
- if(yych <= '`') goto yy705;
- if(yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy706;
+ if (yych <= '`') goto yy705;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy705:
@@ -5094,17 +5094,17 @@
 yy706:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'q') goto yy195;
+ if (yych != 'q') goto yy195;
     yyaccept = 61;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy709:
 #line 207 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ORASSIGN_ALT); }
@@ -5112,26 +5112,26 @@
 yy710:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'o') goto yy195;
+ if (yych != 'o') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 62;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy716:
 #line 81 "cpp.re"
     { BOOST_WAVE_RET(T_OPERATOR); }
@@ -5139,34 +5139,34 @@
 yy717:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'm') goto yy728;
+ if (yych == 'm') goto yy728;
     goto yy195;
 yy718:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'w') goto yy726;
+ if (yych == 'w') goto yy726;
     goto yy195;
 yy719:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 63;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '@') {
- if(yych <= '/') {
- if(yych == '$') goto yy194;
+ if (yych <= '@') {
+ if (yych <= '/') {
+ if (yych == '$') goto yy194;
         } else {
- if(yych <= '9') goto yy194;
- if(yych == '?') goto yy197;
+ if (yych <= '9') goto yy194;
+ if (yych == '?') goto yy197;
         }
     } else {
- if(yych <= '^') {
- if(yych <= 'Z') goto yy194;
- if(yych == '\\') goto yy196;
+ if (yych <= '^') {
+ if (yych <= 'Z') goto yy194;
+ if (yych == '\\') goto yy196;
         } else {
- if(yych <= '_') goto yy722;
- if(yych <= '`') goto yy721;
- if(yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy722;
+ if (yych <= '`') goto yy721;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy721:
@@ -5176,17 +5176,17 @@
 yy722:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'q') goto yy195;
+ if (yych != 'q') goto yy195;
     yyaccept = 64;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy725:
 #line 215 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_NOTEQUAL_ALT); }
@@ -5194,11 +5194,11 @@
 yy726:
     yyaccept = 65;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy727:
 #line 80 "cpp.re"
     { BOOST_WAVE_RET(T_NEW); }
@@ -5206,29 +5206,29 @@
 yy728:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 66;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy735:
 #line 79 "cpp.re"
     { BOOST_WAVE_RET(T_NAMESPACE); }
@@ -5236,26 +5236,26 @@
 yy736:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'b') goto yy195;
+ if (yych != 'b') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 67;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy742:
 #line 78 "cpp.re"
     { BOOST_WAVE_RET(T_MUTABLE); }
@@ -5263,17 +5263,17 @@
 yy743:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'g') goto yy195;
+ if (yych != 'g') goto yy195;
     yyaccept = 68;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy746:
 #line 77 "cpp.re"
     { BOOST_WAVE_RET(T_LONG); }
@@ -5281,11 +5281,11 @@
 yy747:
     yyaccept = 69;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy748:
 #line 73 "cpp.re"
     { BOOST_WAVE_RET(T_IF); }
@@ -5293,27 +5293,27 @@
 yy749:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'p') goto yy758;
+ if (yych == 'p') goto yy758;
     goto yy195;
 yy750:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'l') goto yy751;
- if(yych == 't') goto yy752;
+ if (yych == 'l') goto yy751;
+ if (yych == 't') goto yy752;
     goto yy195;
 yy751:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy754;
+ if (yych == 'i') goto yy754;
     goto yy195;
 yy752:
     yyaccept = 70;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy753:
 #line 76 "cpp.re"
     { BOOST_WAVE_RET(T_INT); }
@@ -5321,17 +5321,17 @@
 yy754:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 71;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy757:
 #line 75 "cpp.re"
     { BOOST_WAVE_RET(T_INLINE); }
@@ -5339,20 +5339,20 @@
 yy758:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'o') goto yy195;
+ if (yych != 'o') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 72;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy762:
 #line 74 "cpp.re"
     { BOOST_WAVE_RET(s->enable_import_keyword ? T_IMPORT : T_IDENTIFIER); }
@@ -5360,17 +5360,17 @@
 yy763:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'o') goto yy195;
+ if (yych != 'o') goto yy195;
     yyaccept = 73;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy766:
 #line 72 "cpp.re"
     { BOOST_WAVE_RET(T_GOTO); }
@@ -5378,38 +5378,38 @@
 yy767:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'l') goto yy782;
+ if (yych == 'l') goto yy782;
     goto yy195;
 yy768:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy778;
+ if (yych == 'o') goto yy778;
     goto yy195;
 yy769:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'r') goto yy776;
+ if (yych == 'r') goto yy776;
     goto yy195;
 yy770:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 74;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy775:
 #line 71 "cpp.re"
     { BOOST_WAVE_RET(T_FRIEND); }
@@ -5417,11 +5417,11 @@
 yy776:
     yyaccept = 75;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy777:
 #line 70 "cpp.re"
     { BOOST_WAVE_RET(T_FOR); }
@@ -5429,17 +5429,17 @@
 yy778:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 76;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy781:
 #line 69 "cpp.re"
     { BOOST_WAVE_RET(T_FLOAT); }
@@ -5447,17 +5447,17 @@
 yy782:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 77;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy785:
 #line 68 "cpp.re"
     { BOOST_WAVE_RET(T_FALSE); }
@@ -5465,42 +5465,42 @@
 yy786:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 's') goto yy808;
+ if (yych == 's') goto yy808;
     goto yy195;
 yy787:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'u') goto yy805;
+ if (yych == 'u') goto yy805;
     goto yy195;
 yy788:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'p') goto yy789;
- if(yych == 't') goto yy790;
+ if (yych == 'p') goto yy789;
+ if (yych == 't') goto yy790;
     goto yy195;
 yy789:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'l') goto yy795;
- if(yych == 'o') goto yy796;
+ if (yych == 'l') goto yy795;
+ if (yych == 'o') goto yy796;
     goto yy195;
 yy790:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 78;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy794:
 #line 67 "cpp.re"
     { BOOST_WAVE_RET(T_EXTERN); }
@@ -5508,22 +5508,22 @@
 yy795:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy800;
+ if (yych == 'i') goto yy800;
     goto yy195;
 yy796:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 79;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy799:
 #line 66 "cpp.re"
     { BOOST_WAVE_RET(T_EXPORT); }
@@ -5531,20 +5531,20 @@
 yy800:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 80;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy804:
 #line 65 "cpp.re"
     { BOOST_WAVE_RET(T_EXPLICIT); }
@@ -5552,14 +5552,14 @@
 yy805:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'm') goto yy195;
+ if (yych != 'm') goto yy195;
     yyaccept = 81;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy807:
 #line 64 "cpp.re"
     { BOOST_WAVE_RET(T_ENUM); }
@@ -5567,14 +5567,14 @@
 yy808:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 82;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy810:
 #line 63 "cpp.re"
     { BOOST_WAVE_RET(T_ELSE); }
@@ -5582,30 +5582,30 @@
 yy811:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'f') goto yy831;
- if(yych == 'l') goto yy832;
+ if (yych == 'f') goto yy831;
+ if (yych == 'l') goto yy832;
     goto yy195;
 yy812:
     yyaccept = 83;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'Z') {
- if(yych <= '9') {
- if(yych == '$') goto yy194;
- if(yych >= '0') goto yy194;
+ if (yych <= 'Z') {
+ if (yych <= '9') {
+ if (yych == '$') goto yy194;
+ if (yych >= '0') goto yy194;
         } else {
- if(yych == '?') goto yy197;
- if(yych >= 'A') goto yy194;
+ if (yych == '?') goto yy197;
+ if (yych >= 'A') goto yy194;
         }
     } else {
- if(yych <= '_') {
- if(yych == '\\') goto yy196;
- if(yych >= '_') goto yy194;
+ if (yych <= '_') {
+ if (yych == '\\') goto yy196;
+ if (yych >= '_') goto yy194;
         } else {
- if(yych <= 't') {
- if(yych >= 'a') goto yy194;
+ if (yych <= 't') {
+ if (yych >= 'a') goto yy194;
             } else {
- if(yych <= 'u') goto yy826;
- if(yych <= 'z') goto yy194;
+ if (yych <= 'u') goto yy826;
+ if (yych <= 'z') goto yy194;
             }
         }
     }
@@ -5616,41 +5616,41 @@
 yy814:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'm') goto yy195;
+ if (yych != 'm') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != '_') goto yy195;
+ if (yych != '_') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 84;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy825:
 #line 62 "cpp.re"
     { BOOST_WAVE_RET(T_DYNAMICCAST); }
@@ -5658,20 +5658,20 @@
 yy826:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'b') goto yy195;
+ if (yych != 'b') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 85;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy830:
 #line 61 "cpp.re"
     { BOOST_WAVE_RET(T_DOUBLE); }
@@ -5679,25 +5679,25 @@
 yy831:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy837;
+ if (yych == 'a') goto yy837;
     goto yy195;
 yy832:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 86;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy836:
 #line 59 "cpp.re"
     { BOOST_WAVE_RET(T_DELETE); }
@@ -5705,20 +5705,20 @@
 yy837:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'u') goto yy195;
+ if (yych != 'u') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 87;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy841:
 #line 58 "cpp.re"
     { BOOST_WAVE_RET(T_DEFAULT); }
@@ -5726,46 +5726,46 @@
 yy842:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'r') goto yy195;
- if(yych <= 's') goto yy873;
- if(yych <= 't') goto yy874;
+ if (yych <= 'r') goto yy195;
+ if (yych <= 's') goto yy873;
+ if (yych <= 't') goto yy874;
     goto yy195;
 yy843:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy870;
+ if (yych == 'a') goto yy870;
     goto yy195;
 yy844:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy866;
+ if (yych == 'a') goto yy866;
     goto yy195;
 yy845:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'l') goto yy195;
- if(yych <= 'm') goto yy847;
- if(yych >= 'o') goto yy195;
+ if (yych <= 'l') goto yy195;
+ if (yych <= 'm') goto yy847;
+ if (yych >= 'o') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'r') goto yy195;
- if(yych <= 's') goto yy851;
- if(yych <= 't') goto yy852;
+ if (yych <= 'r') goto yy195;
+ if (yych <= 's') goto yy851;
+ if (yych <= 't') goto yy852;
     goto yy195;
 yy847:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 88;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy850:
 #line 190 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_COMPL_ALT); }
@@ -5773,28 +5773,28 @@
 yy851:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 't') goto yy858;
+ if (yych == 't') goto yy858;
     goto yy195;
 yy852:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'u') goto yy195;
+ if (yych != 'u') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 89;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy857:
 #line 57 "cpp.re"
     { BOOST_WAVE_RET(T_CONTINUE); }
@@ -5802,21 +5802,21 @@
 yy858:
     yyaccept = 90;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '@') {
- if(yych <= '/') {
- if(yych == '$') goto yy194;
+ if (yych <= '@') {
+ if (yych <= '/') {
+ if (yych == '$') goto yy194;
         } else {
- if(yych <= '9') goto yy194;
- if(yych == '?') goto yy197;
+ if (yych <= '9') goto yy194;
+ if (yych == '?') goto yy197;
         }
     } else {
- if(yych <= '^') {
- if(yych <= 'Z') goto yy194;
- if(yych == '\\') goto yy196;
+ if (yych <= '^') {
+ if (yych <= 'Z') goto yy194;
+ if (yych == '\\') goto yy196;
         } else {
- if(yych <= '_') goto yy860;
- if(yych <= '`') goto yy859;
- if(yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy860;
+ if (yych <= '`') goto yy859;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy859:
@@ -5826,23 +5826,23 @@
 yy860:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 91;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy865:
 #line 56 "cpp.re"
     { BOOST_WAVE_RET(T_CONSTCAST); }
@@ -5850,17 +5850,17 @@
 yy866:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 92;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy869:
 #line 54 "cpp.re"
     { BOOST_WAVE_RET(T_CLASS); }
@@ -5868,14 +5868,14 @@
 yy870:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 93;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy872:
 #line 53 "cpp.re"
     { BOOST_WAVE_RET(T_CHAR); }
@@ -5883,22 +5883,22 @@
 yy873:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy878;
+ if (yych == 'e') goto yy878;
     goto yy195;
 yy874:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'h') goto yy195;
+ if (yych != 'h') goto yy195;
     yyaccept = 94;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy877:
 #line 52 "cpp.re"
     { BOOST_WAVE_RET(T_CATCH); }
@@ -5906,11 +5906,11 @@
 yy878:
     yyaccept = 95;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy879:
 #line 51 "cpp.re"
     { BOOST_WAVE_RET(T_CASE); }
@@ -5918,30 +5918,30 @@
 yy880:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 't') goto yy890;
+ if (yych == 't') goto yy890;
     goto yy195;
 yy881:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy887;
+ if (yych == 'o') goto yy887;
     goto yy195;
 yy882:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'k') goto yy195;
+ if (yych != 'k') goto yy195;
     yyaccept = 96;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy886:
 #line 50 "cpp.re"
     { BOOST_WAVE_RET(T_BREAK); }
@@ -5949,14 +5949,14 @@
 yy887:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 97;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy889:
 #line 49 "cpp.re"
     { BOOST_WAVE_RET(T_BOOL); }
@@ -5964,25 +5964,25 @@
 yy890:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy891;
- if(yych == 'o') goto yy892;
+ if (yych == 'a') goto yy891;
+ if (yych == 'o') goto yy892;
     goto yy195;
 yy891:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy895;
+ if (yych == 'n') goto yy895;
     goto yy195;
 yy892:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 98;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy894:
 #line 186 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_OR_ALT); }
@@ -5990,14 +5990,14 @@
 yy895:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 99;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy897:
 #line 184 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_AND_ALT); }
@@ -6005,27 +6005,27 @@
 yy898:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'd') goto yy906;
+ if (yych == 'd') goto yy906;
     goto yy195;
 yy899:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'm') goto yy904;
+ if (yych == 'm') goto yy904;
     goto yy195;
 yy900:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'o') goto yy195;
+ if (yych != 'o') goto yy195;
     yyaccept = 100;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy903:
 #line 48 "cpp.re"
     { BOOST_WAVE_RET(T_AUTO); }
@@ -6033,11 +6033,11 @@
 yy904:
     yyaccept = 101;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy905:
 #line 47 "cpp.re"
     { BOOST_WAVE_RET(T_ASM); }
@@ -6045,21 +6045,21 @@
 yy906:
     yyaccept = 102;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '@') {
- if(yych <= '/') {
- if(yych == '$') goto yy194;
+ if (yych <= '@') {
+ if (yych <= '/') {
+ if (yych == '$') goto yy194;
         } else {
- if(yych <= '9') goto yy194;
- if(yych == '?') goto yy197;
+ if (yych <= '9') goto yy194;
+ if (yych == '?') goto yy197;
         }
     } else {
- if(yych <= '^') {
- if(yych <= 'Z') goto yy194;
- if(yych == '\\') goto yy196;
+ if (yych <= '^') {
+ if (yych <= 'Z') goto yy194;
+ if (yych == '\\') goto yy196;
         } else {
- if(yych <= '_') goto yy908;
- if(yych <= '`') goto yy907;
- if(yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy908;
+ if (yych <= '`') goto yy907;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy907:
@@ -6069,17 +6069,17 @@
 yy908:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'q') goto yy195;
+ if (yych != 'q') goto yy195;
     yyaccept = 103;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy911:
 #line 205 "cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ANDASSIGN_ALT); }
@@ -6099,7 +6099,7 @@
 #line 6100 "cpp_re.inc"
 yy914:
     yych = *++YYCURSOR;
- if(yych == '.') goto yy916;
+ if (yych == '.') goto yy916;
     goto yy98;
 yy915:
     yych = *++YYCURSOR;
@@ -6133,26 +6133,26 @@
 #line 6134 "cpp_re.inc"
 {
     YYCTYPE yych;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if(yych <= 0x0C) {
- if(yych <= 0x08) {
- if(yych <= 0x00) goto yy933;
+ if (yych <= 0x0C) {
+ if (yych <= 0x08) {
+ if (yych <= 0x00) goto yy933;
             goto yy935;
         } else {
- if(yych == 0x0A) goto yy928;
+ if (yych == 0x0A) goto yy928;
             goto yy931;
         }
     } else {
- if(yych <= 0x1F) {
- if(yych <= 0x0D) goto yy930;
+ if (yych <= 0x1F) {
+ if (yych <= 0x0D) goto yy930;
             goto yy935;
         } else {
- if(yych != '*') goto yy932;
+ if (yych != '*') goto yy932;
         }
     }
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '/') goto yy938;
+ if ((yych = *YYCURSOR) == '/') goto yy938;
 yy927:
 #line 323 "cpp.re"
     { goto ccomment; }
@@ -6171,7 +6171,7 @@
 #line 6172 "cpp_re.inc"
 yy930:
     yych = *++YYCURSOR;
- if(yych == 0x0A) goto yy937;
+ if (yych == 0x0A) goto yy937;
     goto yy929;
 yy931:
     yych = *++YYCURSOR;
@@ -6225,16 +6225,16 @@
 #line 6226 "cpp_re.inc"
 {
     YYCTYPE yych;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if(yych <= 0x0A) {
- if(yych <= 0x00) goto yy948;
- if(yych <= 0x08) goto yy950;
- if(yych <= 0x09) goto yy945;
- } else {
- if(yych <= 0x0C) goto yy945;
- if(yych <= 0x0D) goto yy944;
- if(yych <= 0x1F) goto yy950;
+ if (yych <= 0x0A) {
+ if (yych <= 0x00) goto yy948;
+ if (yych <= 0x08) goto yy950;
+ if (yych <= 0x09) goto yy945;
+ } else {
+ if (yych <= 0x0C) goto yy945;
+ if (yych <= 0x0D) goto yy944;
+ if (yych <= 0x1F) goto yy950;
         goto yy947;
     }
     ++YYCURSOR;
@@ -6250,7 +6250,7 @@
 #line 6251 "cpp_re.inc"
 yy944:
     yych = *++YYCURSOR;
- if(yych == 0x0A) goto yy952;
+ if (yych == 0x0A) goto yy952;
     goto yy943;
 yy945:
     ++YYCURSOR;
@@ -6347,33 +6347,33 @@
           0, 0, 0, 0, 0, 0, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0,
     };
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if(yych == '.') goto yy956;
- if(yych <= '/') goto yy955;
- if(yych <= '9') goto yy957;
+ if (yych == '.') goto yy956;
+ if (yych <= '/') goto yy955;
+ if (yych <= '9') goto yy957;
 yy955:
     YYCURSOR = YYMARKER;
     goto yy959;
 yy956:
     yych = *++YYCURSOR;
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
 yy957:
     YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 64) {
+ if (yybm[0+yych] & 64) {
         goto yy957;
     }
- if(yych <= 'Z') {
- if(yych == '?') goto yy963;
- if(yych >= 'A') goto yy960;
+ if (yych <= 'Z') {
+ if (yych == '?') goto yy963;
+ if (yych >= 'A') goto yy960;
     } else {
- if(yych <= '\\') {
- if(yych >= '\\') goto yy962;
+ if (yych <= '\\') {
+ if (yych >= '\\') goto yy962;
         } else {
- if(yych == 'e') goto yy960;
+ if (yych == 'e') goto yy960;
         }
     }
 yy959:
@@ -6382,211 +6382,211 @@
 #line 6383 "cpp_re.inc"
 yy960:
     YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 128) {
+ if (yybm[0+yych] & 128) {
         goto yy960;
     }
- if(yych <= '>') {
- if(yych <= '+') {
- if(yych == '$') goto yy957;
- if(yych <= '*') goto yy959;
+ if (yych <= '>') {
+ if (yych <= '+') {
+ if (yych == '$') goto yy957;
+ if (yych <= '*') goto yy959;
             goto yy957;
         } else {
- if(yych <= '.') {
- if(yych <= ',') goto yy959;
+ if (yych <= '.') {
+ if (yych <= ',') goto yy959;
                 goto yy957;
             } else {
- if(yych <= '/') goto yy959;
- if(yych <= '9') goto yy957;
+ if (yych <= '/') goto yy959;
+ if (yych <= '9') goto yy957;
                 goto yy959;
             }
         }
     } else {
- if(yych <= '\\') {
- if(yych <= '@') {
- if(yych <= '?') goto yy963;
+ if (yych <= '\\') {
+ if (yych <= '@') {
+ if (yych <= '?') goto yy963;
                 goto yy959;
             } else {
- if(yych <= 'Z') goto yy957;
- if(yych <= '[') goto yy959;
+ if (yych <= 'Z') goto yy957;
+ if (yych <= '[') goto yy959;
             }
         } else {
- if(yych <= '_') {
- if(yych <= '^') goto yy959;
+ if (yych <= '_') {
+ if (yych <= '^') goto yy959;
                 goto yy957;
             } else {
- if(yych <= '`') goto yy959;
- if(yych <= 'z') goto yy957;
+ if (yych <= '`') goto yy959;
+ if (yych <= 'z') goto yy957;
                 goto yy959;
             }
         }
     }
 yy962:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych == 'U') goto yy966;
- if(yych == 'u') goto yy965;
+ if (yych == 'U') goto yy966;
+ if (yych == 'u') goto yy965;
     goto yy955;
 yy963:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych != '?') goto yy955;
+ if (yych != '?') goto yy955;
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych == '/') goto yy962;
+ if (yych == '/') goto yy962;
     goto yy955;
 yy965:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych <= '9') goto yy974;
+ 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;
+ if (yych <= 'F') goto yy974;
+ if (yych <= '`') goto yy955;
+ if (yych <= 'f') goto yy974;
         goto yy955;
     }
 yy966:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy967;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy967;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy967:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy968;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy968;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy968:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy969;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy969;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy969:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy970;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy970;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy970:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy971;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy971;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy971:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy972;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy972;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy972:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy973;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy973;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy973:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych <= '9') goto yy957;
+ 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;
+ if (yych <= 'F') goto yy957;
+ if (yych <= '`') goto yy955;
+ if (yych <= 'f') goto yy957;
         goto yy955;
     }
 yy974:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy975;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy975;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy975:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy976;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy976;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy976:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych <= '9') goto yy957;
+ 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;
+ if (yych <= 'F') goto yy957;
+ if (yych <= '`') goto yy955;
+ if (yych <= 'f') goto yy957;
         goto yy955;
     }
 }
@@ -6633,17 +6633,17 @@
           0, 0, 0, 0, 0, 0, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0,
     };
- if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+ if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
     yych = *YYCURSOR;
- if(yych <= '/') {
- if(yych == '.') goto yy984;
+ if (yych <= '/') {
+ if (yych == '.') goto yy984;
     } else {
- if(yych <= '0') goto yy980;
- if(yych <= '9') goto yy982;
+ if (yych <= '0') goto yy980;
+ if (yych <= '9') goto yy982;
     }
 yy979:
     YYCURSOR = YYMARKER;
- if(yyaccept <= 0) {
+ if (yyaccept <= 0) {
         goto yy981;
     } else {
         goto yy987;
@@ -6651,22 +6651,22 @@
 yy980:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 64) {
+ if (yybm[0+yych] & 64) {
         goto yy999;
     }
- if(yych <= 'E') {
- if(yych <= '/') {
- if(yych == '.') goto yy985;
+ if (yych <= 'E') {
+ if (yych <= '/') {
+ if (yych == '.') goto yy985;
         } else {
- if(yych <= '9') goto yy1002;
- if(yych >= 'E') goto yy995;
+ if (yych <= '9') goto yy1002;
+ if (yych >= 'E') goto yy995;
         }
     } else {
- if(yych <= 'd') {
- if(yych == 'X') goto yy1001;
+ if (yych <= 'd') {
+ if (yych == 'X') goto yy1001;
         } else {
- if(yych <= 'e') goto yy995;
- if(yych == 'x') goto yy1001;
+ if (yych <= 'e') goto yy995;
+ if (yych == 'x') goto yy1001;
         }
     }
 yy981:
@@ -6676,43 +6676,43 @@
 yy982:
     yyaccept = 0;
     YYMARKER = ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 32) {
+ if (yybm[0+yych] & 32) {
         goto yy982;
     }
- if(yych <= 'D') {
- if(yych == '.') goto yy985;
+ if (yych <= 'D') {
+ if (yych == '.') goto yy985;
         goto yy981;
     } else {
- if(yych <= 'E') goto yy995;
- if(yych == 'e') goto yy995;
+ if (yych <= 'E') goto yy995;
+ if (yych == 'e') goto yy995;
         goto yy981;
     }
 yy984:
     yych = *++YYCURSOR;
- if(yych <= '/') goto yy979;
- if(yych >= ':') goto yy979;
+ if (yych <= '/') goto yy979;
+ if (yych >= ':') goto yy979;
 yy985:
     yyaccept = 1;
     YYMARKER = ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ 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 <= 'K') {
+ if (yych <= 'D') {
+ if (yych <= '/') goto yy987;
+ if (yych <= '9') goto yy985;
         } else {
- if(yych <= 'E') goto yy988;
- if(yych <= 'F') goto yy989;
+ if (yych <= 'E') goto yy988;
+ if (yych <= 'F') goto yy989;
         }
     } else {
- if(yych <= 'e') {
- if(yych <= 'L') goto yy990;
- if(yych >= 'e') goto yy988;
+ if (yych <= 'e') {
+ if (yych <= 'L') goto yy990;
+ if (yych >= 'e') goto yy988;
         } else {
- if(yych <= 'f') goto yy989;
- if(yych == 'l') goto yy990;
+ if (yych <= 'f') goto yy989;
+ if (yych == 'l') goto yy990;
         }
     }
 yy987:
@@ -6721,138 +6721,138 @@
 #line 6722 "cpp_re.inc"
 yy988:
     yych = *++YYCURSOR;
- if(yych <= ',') {
- if(yych == '+') goto yy992;
+ if (yych <= ',') {
+ if (yych == '+') goto yy992;
         goto yy979;
     } else {
- if(yych <= '-') goto yy992;
- if(yych <= '/') goto yy979;
- if(yych <= '9') goto yy993;
+ 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;
+ 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;
+ 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;
+ if (yych <= '/') goto yy979;
+ if (yych >= ':') goto yy979;
 yy993:
     ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if(yych <= 'K') {
- if(yych <= '9') {
- if(yych <= '/') goto yy987;
+ if (yych <= 'K') {
+ if (yych <= '9') {
+ if (yych <= '/') goto yy987;
             goto yy993;
         } else {
- if(yych == 'F') goto yy989;
+ if (yych == 'F') goto yy989;
             goto yy987;
         }
     } else {
- if(yych <= 'f') {
- if(yych <= 'L') goto yy990;
- if(yych <= 'e') goto yy987;
+ if (yych <= 'f') {
+ if (yych <= 'L') goto yy990;
+ if (yych <= 'e') goto yy987;
             goto yy989;
         } else {
- if(yych == 'l') goto yy990;
+ if (yych == 'l') goto yy990;
             goto yy987;
         }
     }
 yy995:
     yych = *++YYCURSOR;
- if(yych <= ',') {
- if(yych != '+') goto yy979;
+ if (yych <= ',') {
+ if (yych != '+') goto yy979;
     } else {
- if(yych <= '-') goto yy996;
- if(yych <= '/') goto yy979;
- if(yych <= '9') goto yy997;
+ 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;
+ if (yych <= '/') goto yy979;
+ if (yych >= ':') goto yy979;
 yy997:
     ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if(yych <= 'K') {
- if(yych <= '9') {
- if(yych <= '/') goto yy987;
+ if (yych <= 'K') {
+ if (yych <= '9') {
+ if (yych <= '/') goto yy987;
             goto yy997;
         } else {
- if(yych == 'F') goto yy989;
+ if (yych == 'F') goto yy989;
             goto yy987;
         }
     } else {
- if(yych <= 'f') {
- if(yych <= 'L') goto yy990;
- if(yych <= 'e') goto yy987;
+ if (yych <= 'f') {
+ if (yych <= 'L') goto yy990;
+ if (yych <= 'e') goto yy987;
             goto yy989;
         } else {
- if(yych == 'l') goto yy990;
+ if (yych == 'l') goto yy990;
             goto yy987;
         }
     }
 yy999:
     yyaccept = 0;
     YYMARKER = ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 64) {
+ if (yybm[0+yych] & 64) {
         goto yy999;
     }
- if(yych <= '9') {
- if(yych == '.') goto yy985;
- if(yych <= '/') goto yy981;
+ if (yych <= '9') {
+ if (yych == '.') goto yy985;
+ if (yych <= '/') goto yy981;
         goto yy1002;
     } else {
- if(yych <= 'E') {
- if(yych <= 'D') goto yy981;
+ if (yych <= 'E') {
+ if (yych <= 'D') goto yy981;
             goto yy995;
         } else {
- if(yych == 'e') goto yy995;
+ if (yych == 'e') goto yy995;
             goto yy981;
         }
     }
 yy1001:
     yych = *++YYCURSOR;
- if(yybm[0+yych] & 128) {
+ if (yybm[0+yych] & 128) {
         goto yy1004;
     }
     goto yy979;
 yy1002:
     ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych == '.') goto yy985;
- if(yych <= '/') goto yy979;
+ if (yych <= '9') {
+ if (yych == '.') goto yy985;
+ if (yych <= '/') goto yy979;
         goto yy1002;
     } else {
- if(yych <= 'E') {
- if(yych <= 'D') goto yy979;
+ if (yych <= 'E') {
+ if (yych <= 'D') goto yy979;
             goto yy995;
         } else {
- if(yych == 'e') goto yy995;
+ if (yych == 'e') goto yy995;
             goto yy979;
         }
     }
 yy1004:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 128) {
+ if (yybm[0+yych] & 128) {
         goto yy1004;
     }
     goto yy981;
@@ -6870,20 +6870,20 @@
 #line 6871 "cpp_re.inc"
 {
     YYCTYPE yych;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *(YYMARKER = YYCURSOR);
- if(yych <= 'h') {
- if(yych <= 'L') {
- if(yych >= 'L') goto yy1010;
+ if (yych <= 'h') {
+ if (yych <= 'L') {
+ if (yych >= 'L') goto yy1010;
         } else {
- if(yych == 'U') goto yy1009;
+ if (yych == 'U') goto yy1009;
         }
     } else {
- if(yych <= 'l') {
- if(yych <= 'i') goto yy1011;
- if(yych >= 'l') goto yy1010;
+ if (yych <= 'l') {
+ if (yych <= 'i') goto yy1011;
+ if (yych >= 'l') goto yy1010;
         } else {
- if(yych == 'u') goto yy1009;
+ if (yych == 'u') goto yy1009;
         }
     }
 yy1008:
@@ -6892,33 +6892,33 @@
 #line 6893 "cpp_re.inc"
 yy1009:
     yych = *++YYCURSOR;
- if(yych == 'L') goto yy1018;
- if(yych == 'l') goto yy1018;
+ if (yych == 'L') goto yy1018;
+ if (yych == 'l') goto yy1018;
     goto yy1008;
 yy1010:
     yych = *++YYCURSOR;
- if(yych <= 'U') {
- if(yych == 'L') goto yy1017;
- if(yych <= 'T') goto yy1008;
+ if (yych <= 'U') {
+ if (yych == 'L') goto yy1017;
+ if (yych <= 'T') goto yy1008;
         goto yy1016;
     } else {
- if(yych <= 'l') {
- if(yych <= 'k') goto yy1008;
+ if (yych <= 'l') {
+ if (yych <= 'k') goto yy1008;
             goto yy1017;
         } else {
- if(yych == 'u') goto yy1016;
+ if (yych == 'u') goto yy1016;
             goto yy1008;
         }
     }
 yy1011:
     yych = *++YYCURSOR;
- if(yych == '6') goto yy1013;
+ if (yych == '6') goto yy1013;
 yy1012:
     YYCURSOR = YYMARKER;
     goto yy1008;
 yy1013:
     yych = *++YYCURSOR;
- if(yych != '4') goto yy1012;
+ if (yych != '4') goto yy1012;
 yy1014:
     ++YYCURSOR;
 yy1015:
@@ -6930,13 +6930,13 @@
     goto yy1008;
 yy1017:
     yych = *++YYCURSOR;
- if(yych == 'U') goto yy1014;
- if(yych == 'u') goto yy1014;
+ 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;
+ if ((yych = *YYCURSOR) == 'L') goto yy1014;
+ if (yych == 'l') goto yy1014;
     goto yy1008;
 }
 #line 426 "cpp.re"
@@ -6947,16 +6947,16 @@
 #line 6948 "cpp_re.inc"
 {
     YYCTYPE yych;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
- if(yych <= 'U') {
- if(yych == 'L') goto yy1023;
- if(yych >= 'U') goto yy1022;
+ if (yych <= 'U') {
+ if (yych == 'L') goto yy1023;
+ if (yych >= 'U') goto yy1022;
     } else {
- if(yych <= 'l') {
- if(yych >= 'l') goto yy1023;
+ if (yych <= 'l') {
+ if (yych >= 'l') goto yy1023;
         } else {
- if(yych == 'u') goto yy1022;
+ if (yych == 'u') goto yy1022;
         }
     }
 yy1021:
@@ -6965,28 +6965,28 @@
 #line 6966 "cpp_re.inc"
 yy1022:
     yych = *++YYCURSOR;
- if(yych == 'L') goto yy1028;
- if(yych == 'l') goto yy1028;
+ if (yych == 'L') goto yy1028;
+ if (yych == 'l') goto yy1028;
     goto yy1021;
 yy1023:
     yych = *++YYCURSOR;
- if(yych <= 'U') {
- if(yych == 'L') goto yy1025;
- if(yych <= 'T') goto yy1021;
+ if (yych <= 'U') {
+ if (yych == 'L') goto yy1025;
+ if (yych <= 'T') goto yy1021;
     } else {
- if(yych <= 'l') {
- if(yych <= 'k') goto yy1021;
+ if (yych <= 'l') {
+ if (yych <= 'k') goto yy1021;
             goto yy1025;
         } else {
- if(yych != 'u') goto yy1021;
+ if (yych != 'u') goto yy1021;
         }
     }
     yych = *++YYCURSOR;
     goto yy1021;
 yy1025:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == 'U') goto yy1027;
- if(yych == 'u') goto yy1027;
+ if ((yych = *YYCURSOR) == 'U') goto yy1027;
+ if (yych == 'u') goto yy1027;
 yy1026:
 #line 431 "cpp.re"
     { BOOST_WAVE_RET(T_LONGINTLIT); }
@@ -6996,8 +6996,8 @@
     goto yy1026;
 yy1028:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == 'L') goto yy1027;
- if(yych == 'l') goto yy1027;
+ if ((yych = *YYCURSOR) == 'L') goto yy1027;
+ if (yych == 'l') goto yy1027;
     goto yy1021;
 }
 #line 435 "cpp.re"

Modified: trunk/libs/wave/src/cpplexer/re2clex/strict_cpp_re.inc
==============================================================================
--- trunk/libs/wave/src/cpplexer/re2clex/strict_cpp_re.inc (original)
+++ trunk/libs/wave/src/cpplexer/re2clex/strict_cpp_re.inc 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.1 on Wed Nov 21 11:51:32 2007 */
+/* Generated by re2c 0.13.2 on Fri Apr 04 14:19:15 2008 */
 #line 1 "strict_cpp.re"
 /*=============================================================================
     Boost.Wave: A Standard compliant C++ preprocessor library
@@ -94,9 +94,9 @@
          32, 32, 32, 32, 32, 32, 32, 32,
     };
 
- if((YYLIMIT - YYCURSOR) < 17) YYFILL(17);
+ if ((YYLIMIT - YYCURSOR) < 17) YYFILL(17);
     yych = *YYCURSOR;
- switch(yych) {
+ switch (yych) {
     case 0x00: goto yy88;
     case 0x01:
     case 0x02:
@@ -225,11 +225,11 @@
     }
 yy2:
     ++YYCURSOR;
- if((yych = *YYCURSOR) <= '.') {
- if(yych == '*') goto yy922;
+ if ((yych = *YYCURSOR) <= '.') {
+ if (yych == '*') goto yy922;
     } else {
- if(yych <= '/') goto yy920;
- if(yych == '=') goto yy918;
+ if (yych <= '/') goto yy920;
+ if (yych == '=') goto yy918;
     }
 #line 178 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DIVIDE); }
@@ -237,12 +237,12 @@
 yy4:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '-') {
- if(yych == '*') goto yy912;
+ if (yych <= '-') {
+ if (yych == '*') goto yy912;
     } else {
- if(yych <= '.') goto yy914;
- if(yych <= '/') goto yy5;
- if(yych <= '9') goto yy915;
+ if (yych <= '.') goto yy914;
+ if (yych <= '/') goto yy5;
+ if (yych <= '9') goto yy915;
     }
 yy5:
 #line 164 "strict_cpp.re"
@@ -257,12 +257,12 @@
 yy8:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'r') {
- if(yych == 'n') goto yy898;
+ if (yych <= 'r') {
+ if (yych == 'n') goto yy898;
         goto yy195;
     } else {
- if(yych <= 's') goto yy899;
- if(yych == 'u') goto yy900;
+ if (yych <= 's') goto yy899;
+ if (yych == 'u') goto yy900;
         goto yy195;
     }
 yy9:
@@ -272,18 +272,18 @@
 yy10:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'n') {
- if(yych == 'i') goto yy880;
+ if (yych <= 'n') {
+ if (yych == 'i') goto yy880;
         goto yy195;
     } else {
- if(yych <= 'o') goto yy881;
- if(yych == 'r') goto yy882;
+ if (yych <= 'o') goto yy881;
+ if (yych == 'r') goto yy882;
         goto yy195;
     }
 yy11:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
+ switch (yych) {
     case 'a': goto yy842;
     case 'h': goto yy843;
     case 'l': goto yy844;
@@ -293,29 +293,29 @@
 yy12:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'n') {
- if(yych == 'e') goto yy811;
+ if (yych <= 'n') {
+ if (yych == 'e') goto yy811;
         goto yy195;
     } else {
- if(yych <= 'o') goto yy812;
- if(yych == 'y') goto yy814;
+ if (yych <= 'o') goto yy812;
+ if (yych == 'y') goto yy814;
         goto yy195;
     }
 yy13:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'm') {
- if(yych == 'l') goto yy786;
+ if (yych <= 'm') {
+ if (yych == 'l') goto yy786;
         goto yy195;
     } else {
- if(yych <= 'n') goto yy787;
- if(yych == 'x') goto yy788;
+ if (yych <= 'n') goto yy787;
+ if (yych == 'x') goto yy788;
         goto yy195;
     }
 yy14:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
+ switch (yych) {
     case 'a': goto yy767;
     case 'l': goto yy768;
     case 'o': goto yy769;
@@ -325,108 +325,108 @@
 yy15:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy763;
+ if (yych == 'o') goto yy763;
     goto yy195;
 yy16:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'l') {
- if(yych == 'f') goto yy747;
+ if (yych <= 'l') {
+ if (yych == 'f') goto yy747;
         goto yy195;
     } else {
- if(yych <= 'm') goto yy749;
- if(yych <= 'n') goto yy750;
+ if (yych <= 'm') goto yy749;
+ if (yych <= 'n') goto yy750;
         goto yy195;
     }
 yy17:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy743;
+ if (yych == 'o') goto yy743;
     goto yy195;
 yy18:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'u') goto yy736;
+ if (yych == 'u') goto yy736;
     goto yy195;
 yy19:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'd') {
- if(yych == 'a') goto yy717;
+ if (yych <= 'd') {
+ if (yych == 'a') goto yy717;
         goto yy195;
     } else {
- if(yych <= 'e') goto yy718;
- if(yych == 'o') goto yy719;
+ if (yych <= 'e') goto yy718;
+ if (yych == 'o') goto yy719;
         goto yy195;
     }
 yy20:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'p') goto yy703;
- if(yych == 'r') goto yy704;
+ if (yych == 'p') goto yy703;
+ if (yych == 'r') goto yy704;
     goto yy195;
 yy21:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'r') goto yy682;
- if(yych == 'u') goto yy683;
+ if (yych == 'r') goto yy682;
+ if (yych == 'u') goto yy683;
     goto yy195;
 yy22:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy654;
+ if (yych == 'e') goto yy654;
     goto yy195;
 yy23:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 's') {
- if(yych <= 'g') goto yy195;
- if(yych <= 'h') goto yy615;
- if(yych <= 'i') goto yy616;
+ 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;
+ if (yych <= 't') goto yy617;
+ if (yych == 'w') goto yy618;
         goto yy195;
     }
 yy24:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'h') {
- if(yych == 'e') goto yy578;
- if(yych <= 'g') goto yy195;
+ if (yych <= 'h') {
+ if (yych == 'e') goto yy578;
+ if (yych <= 'g') goto yy195;
         goto yy579;
     } else {
- if(yych <= 'r') {
- if(yych <= 'q') goto yy195;
+ if (yych <= 'r') {
+ if (yych <= 'q') goto yy195;
             goto yy580;
         } else {
- if(yych == 'y') goto yy581;
+ if (yych == 'y') goto yy581;
             goto yy195;
         }
     }
 yy25:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy561;
- if(yych == 's') goto yy562;
+ if (yych == 'n') goto yy561;
+ if (yych == 's') goto yy562;
     goto yy195;
 yy26:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy543;
- if(yych == 'o') goto yy544;
+ if (yych == 'i') goto yy543;
+ if (yych == 'o') goto yy544;
     goto yy195;
 yy27:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'c') goto yy531;
- if(yych == 'h') goto yy532;
+ if (yych == 'c') goto yy531;
+ if (yych == 'h') goto yy532;
     goto yy195;
 yy28:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
+ switch (yych) {
     case '_': goto yy442;
     case 'a': goto yy443;
     case 'b': goto yy444;
@@ -445,20 +445,20 @@
 yy31:
     yyaccept = 2;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == '?') goto yy407;
+ if (yych == '?') goto yy407;
 yy32:
 #line 153 "strict_cpp.re"
     { BOOST_WAVE_RET(T_QUESTION_MARK); }
 #line 453 "strict_cpp_re.inc"
 yy33:
     ++YYCURSOR;
- if((yych = *YYCURSOR) <= ':') {
- if(yych == '%') goto yy403;
- if(yych >= ':') goto yy401;
- } else {
- if(yych <= ';') goto yy34;
- if(yych <= '<') goto yy399;
- if(yych <= '=') goto yy397;
+ if ((yych = *YYCURSOR) <= ':') {
+ if (yych == '%') goto yy403;
+ if (yych >= ':') goto yy401;
+ } else {
+ if (yych <= ';') goto yy34;
+ if (yych <= '<') goto yy399;
+ if (yych <= '=') goto yy397;
     }
 yy34:
 #line 194 "strict_cpp.re"
@@ -471,11 +471,11 @@
 #line 472 "strict_cpp_re.inc"
 yy37:
     ++YYCURSOR;
- if((yych = *YYCURSOR) <= '<') {
- if(yych == ':') goto yy388;
+ if ((yych = *YYCURSOR) <= '<') {
+ if (yych == ':') goto yy388;
     } else {
- if(yych <= '=') goto yy390;
- if(yych <= '>') goto yy392;
+ if (yych <= '=') goto yy390;
+ if (yych <= '>') goto yy392;
     }
 #line 179 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PERCENT); }
@@ -492,45 +492,45 @@
 #line 493 "strict_cpp_re.inc"
 yy43:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == ':') goto yy384;
- if(yych == '>') goto yy386;
+ if ((yych = *YYCURSOR) == ':') goto yy384;
+ if (yych == '>') goto yy386;
 #line 151 "strict_cpp.re"
     { BOOST_WAVE_RET(T_COLON); }
 #line 500 "strict_cpp_re.inc"
 yy45:
     yyaccept = 3;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'c') {
- if(yych <= ' ') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy261;
+ if (yych <= 'c') {
+ if (yych <= ' ') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy261;
             } else {
- if(yych <= 0x0C) goto yy261;
- if(yych >= ' ') goto yy261;
+ if (yych <= 0x0C) goto yy261;
+ if (yych >= ' ') goto yy261;
             }
         } else {
- if(yych <= '.') {
- if(yych == '#') goto yy272;
+ if (yych <= '.') {
+ if (yych == '#') goto yy272;
             } else {
- if(yych <= '/') goto yy261;
- if(yych == '?') goto yy271;
+ if (yych <= '/') goto yy261;
+ if (yych == '?') goto yy271;
             }
         }
     } else {
- if(yych <= 'p') {
- if(yych <= 'i') {
- if(yych <= 'e') goto yy261;
- if(yych >= 'i') goto yy261;
+ if (yych <= 'p') {
+ if (yych <= 'i') {
+ if (yych <= 'e') goto yy261;
+ if (yych >= 'i') goto yy261;
             } else {
- if(yych == 'l') goto yy261;
- if(yych >= 'p') goto yy261;
+ if (yych == 'l') goto yy261;
+ if (yych >= 'p') goto yy261;
             }
         } else {
- if(yych <= 't') {
- if(yych == 'r') goto yy261;
+ if (yych <= 't') {
+ if (yych == 'r') goto yy261;
             } else {
- if(yych == 'v') goto yy46;
- if(yych <= 'w') goto yy261;
+ if (yych == 'v') goto yy46;
+ if (yych <= 'w') goto yy261;
             }
         }
     }
@@ -555,54 +555,54 @@
 #line 556 "strict_cpp_re.inc"
 yy53:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '+') goto yy256;
- if(yych == '=') goto yy258;
+ if ((yych = *YYCURSOR) == '+') goto yy256;
+ if (yych == '=') goto yy258;
 #line 175 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PLUS); }
 #line 563 "strict_cpp_re.inc"
 yy55:
     ++YYCURSOR;
- if((yych = *YYCURSOR) <= '<') {
- if(yych == '-') goto yy250;
+ if ((yych = *YYCURSOR) <= '<') {
+ if (yych == '-') goto yy250;
     } else {
- if(yych <= '=') goto yy252;
- if(yych <= '>') goto yy248;
+ if (yych <= '=') goto yy252;
+ if (yych <= '>') goto yy248;
     }
 #line 176 "strict_cpp.re"
     { BOOST_WAVE_RET(T_MINUS); }
 #line 574 "strict_cpp_re.inc"
 yy57:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy246;
+ if ((yych = *YYCURSOR) == '=') goto yy246;
 #line 177 "strict_cpp.re"
     { BOOST_WAVE_RET(T_STAR); }
 #line 580 "strict_cpp_re.inc"
 yy59:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy244;
+ if ((yych = *YYCURSOR) == '=') goto yy244;
 #line 180 "strict_cpp.re"
     { BOOST_WAVE_RET(T_XOR); }
 #line 586 "strict_cpp_re.inc"
 yy61:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy237;
+ if (yych == 'o') goto yy237;
     goto yy195;
 yy62:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '&') goto yy233;
- if(yych == '=') goto yy235;
+ if ((yych = *YYCURSOR) == '&') goto yy233;
+ if (yych == '=') goto yy235;
 #line 183 "strict_cpp.re"
     { BOOST_WAVE_RET(T_AND); }
 #line 598 "strict_cpp_re.inc"
 yy64:
     yyaccept = 4;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '>') {
- if(yych == '=') goto yy228;
+ if (yych <= '>') {
+ if (yych == '=') goto yy228;
     } else {
- if(yych <= '?') goto yy225;
- if(yych == '|') goto yy226;
+ if (yych <= '?') goto yy225;
+ if (yych == '|') goto yy226;
     }
 yy65:
 #line 185 "strict_cpp.re"
@@ -615,21 +615,21 @@
 #line 616 "strict_cpp_re.inc"
 yy68:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy223;
+ if ((yych = *YYCURSOR) == '=') goto yy223;
 #line 191 "strict_cpp.re"
     { BOOST_WAVE_RET(T_NOT); }
 #line 622 "strict_cpp_re.inc"
 yy70:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy221;
+ if ((yych = *YYCURSOR) == '=') goto yy221;
 #line 193 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ASSIGN); }
 #line 628 "strict_cpp_re.inc"
 yy72:
     ++YYCURSOR;
- if((yych = *YYCURSOR) <= '<') goto yy73;
- if(yych <= '=') goto yy215;
- if(yych <= '>') goto yy217;
+ if ((yych = *YYCURSOR) <= '<') goto yy73;
+ if (yych <= '=') goto yy215;
+ if (yych <= '>') goto yy217;
 yy73:
 #line 195 "strict_cpp.re"
     { BOOST_WAVE_RET(T_GREATER); }
@@ -646,27 +646,27 @@
 yy77:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych <= '\'') {
- if(yych == '"') goto yy96;
- if(yych <= '&') goto yy9;
+ if (yych <= '\'') {
+ if (yych == '"') goto yy96;
+ if (yych <= '&') goto yy9;
         goto yy214;
     } else {
- if(yych <= '?') {
- if(yych <= '>') goto yy9;
+ if (yych <= '?') {
+ if (yych <= '>') goto yy9;
             goto yy197;
         } else {
- if(yych == '\\') goto yy196;
+ if (yych == '\\') goto yy196;
             goto yy9;
         }
     }
 yy78:
     yyaccept = 5;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'U') goto yy186;
- if(yych == 'u') goto yy185;
+ if (yych == 'U') goto yy186;
+ if (yych == 'u') goto yy185;
 yy79:
 #line 299 "strict_cpp.re"
     { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
@@ -674,24 +674,24 @@
 yy80:
     yyaccept = 5;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy142;
- if(yych <= 0x0A) goto yy79;
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy142;
+ if (yych <= 0x0A) goto yy79;
         goto yy142;
     } else {
- if(yych <= 0x1F) goto yy79;
- if(yych == '\'') goto yy79;
+ if (yych <= 0x1F) goto yy79;
+ if (yych == '\'') goto yy79;
         goto yy142;
     }
 yy81:
     yyaccept = 5;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy97;
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy97;
         goto yy79;
     } else {
- if(yych <= 0x0C) goto yy97;
- if(yych <= 0x1F) goto yy79;
+ if (yych <= 0x0C) goto yy97;
+ if (yych <= 0x1F) goto yy79;
         goto yy97;
     }
 yy82:
@@ -717,7 +717,7 @@
 #line 718 "strict_cpp_re.inc"
 yy87:
     yych = *++YYCURSOR;
- if(yych == 0x0A) goto yy93;
+ if (yych == 0x0A) goto yy93;
     goto yy86;
 yy88:
     ++YYCURSOR;
@@ -750,48 +750,48 @@
     goto yy86;
 yy94:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy95:
- if(yybm[256+yych] & 16) {
+ if (yybm[256+yych] & 16) {
         goto yy94;
     }
     goto yy83;
 yy96:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy97:
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy99;
     goto yy100;
 yy98:
     YYCURSOR = YYMARKER;
- if(yyaccept <= 51) {
- if(yyaccept <= 25) {
- if(yyaccept <= 12) {
- if(yyaccept <= 6) {
- if(yyaccept <= 3) {
- if(yyaccept <= 1) {
- if(yyaccept <= 0) {
+ if (yyaccept <= 51) {
+ if (yyaccept <= 25) {
+ if (yyaccept <= 12) {
+ if (yyaccept <= 6) {
+ if (yyaccept <= 3) {
+ if (yyaccept <= 1) {
+ if (yyaccept <= 0) {
                                 goto yy5;
                             } else {
                                 goto yy9;
                             }
                         } else {
- if(yyaccept <= 2) {
+ if (yyaccept <= 2) {
                                 goto yy32;
                             } else {
                                 goto yy46;
                             }
                         }
                     } else {
- if(yyaccept <= 5) {
- if(yyaccept <= 4) {
+ if (yyaccept <= 5) {
+ if (yyaccept <= 4) {
                                 goto yy65;
                             } else {
                                 goto yy79;
@@ -801,9 +801,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 9) {
- if(yyaccept <= 8) {
- if(yyaccept <= 7) {
+ if (yyaccept <= 9) {
+ if (yyaccept <= 8) {
+ if (yyaccept <= 7) {
                                 goto yy152;
                             } else {
                                 goto yy239;
@@ -812,8 +812,8 @@
                             goto yy243;
                         }
                     } else {
- if(yyaccept <= 11) {
- if(yyaccept <= 10) {
+ if (yyaccept <= 11) {
+ if (yyaccept <= 10) {
                                 goto yy279;
                             } else {
                                 goto yy294;
@@ -824,24 +824,24 @@
                     }
                 }
             } else {
- if(yyaccept <= 19) {
- if(yyaccept <= 16) {
- if(yyaccept <= 14) {
- if(yyaccept <= 13) {
+ if (yyaccept <= 19) {
+ if (yyaccept <= 16) {
+ if (yyaccept <= 14) {
+ if (yyaccept <= 13) {
                                 goto yy417;
                             } else {
                                 goto yy421;
                             }
                         } else {
- if(yyaccept <= 15) {
+ if (yyaccept <= 15) {
                                 goto yy425;
                             } else {
                                 goto yy456;
                             }
                         }
                     } else {
- if(yyaccept <= 18) {
- if(yyaccept <= 17) {
+ if (yyaccept <= 18) {
+ if (yyaccept <= 17) {
                                 goto yy462;
                             } else {
                                 goto yy470;
@@ -851,9 +851,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 22) {
- if(yyaccept <= 21) {
- if(yyaccept <= 20) {
+ if (yyaccept <= 22) {
+ if (yyaccept <= 21) {
+ if (yyaccept <= 20) {
                                 goto yy483;
                             } else {
                                 goto yy488;
@@ -862,8 +862,8 @@
                             goto yy491;
                         }
                     } else {
- if(yyaccept <= 24) {
- if(yyaccept <= 23) {
+ if (yyaccept <= 24) {
+ if (yyaccept <= 23) {
                                 goto yy501;
                             } else {
                                 goto yy507;
@@ -875,25 +875,25 @@
                 }
             }
         } else {
- if(yyaccept <= 38) {
- if(yyaccept <= 32) {
- if(yyaccept <= 29) {
- if(yyaccept <= 27) {
- if(yyaccept <= 26) {
+ if (yyaccept <= 38) {
+ if (yyaccept <= 32) {
+ if (yyaccept <= 29) {
+ if (yyaccept <= 27) {
+ if (yyaccept <= 26) {
                                 goto yy517;
                             } else {
                                 goto yy524;
                             }
                         } else {
- if(yyaccept <= 28) {
+ if (yyaccept <= 28) {
                                 goto yy526;
                             } else {
                                 goto yy528;
                             }
                         }
                     } else {
- if(yyaccept <= 31) {
- if(yyaccept <= 30) {
+ if (yyaccept <= 31) {
+ if (yyaccept <= 30) {
                                 goto yy530;
                             } else {
                                 goto yy536;
@@ -903,9 +903,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 35) {
- if(yyaccept <= 34) {
- if(yyaccept <= 33) {
+ if (yyaccept <= 35) {
+ if (yyaccept <= 34) {
+ if (yyaccept <= 33) {
                                 goto yy552;
                             } else {
                                 goto yy554;
@@ -914,8 +914,8 @@
                             goto yy560;
                         }
                     } else {
- if(yyaccept <= 37) {
- if(yyaccept <= 36) {
+ if (yyaccept <= 37) {
+ if (yyaccept <= 36) {
                                 goto yy566;
                             } else {
                                 goto yy574;
@@ -926,24 +926,24 @@
                     }
                 }
             } else {
- if(yyaccept <= 45) {
- if(yyaccept <= 42) {
- if(yyaccept <= 40) {
- if(yyaccept <= 39) {
+ if (yyaccept <= 45) {
+ if (yyaccept <= 42) {
+ if (yyaccept <= 40) {
+ if (yyaccept <= 39) {
                                 goto yy590;
                             } else {
                                 goto yy592;
                             }
                         } else {
- if(yyaccept <= 41) {
+ if (yyaccept <= 41) {
                                 goto yy595;
                             } else {
                                 goto yy598;
                             }
                         }
                     } else {
- if(yyaccept <= 44) {
- if(yyaccept <= 43) {
+ if (yyaccept <= 44) {
+ if (yyaccept <= 43) {
                                 goto yy600;
                             } else {
                                 goto yy605;
@@ -953,9 +953,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 48) {
- if(yyaccept <= 47) {
- if(yyaccept <= 46) {
+ if (yyaccept <= 48) {
+ if (yyaccept <= 47) {
+ if (yyaccept <= 46) {
                                 goto yy614;
                             } else {
                                 goto yy623;
@@ -964,8 +964,8 @@
                             goto yy629;
                         }
                     } else {
- if(yyaccept <= 50) {
- if(yyaccept <= 49) {
+ if (yyaccept <= 50) {
+ if (yyaccept <= 49) {
                                 goto yy633;
                             } else {
                                 goto yy639;
@@ -978,26 +978,26 @@
             }
         }
     } else {
- if(yyaccept <= 77) {
- if(yyaccept <= 64) {
- if(yyaccept <= 58) {
- if(yyaccept <= 55) {
- if(yyaccept <= 53) {
- if(yyaccept <= 52) {
+ if (yyaccept <= 77) {
+ if (yyaccept <= 64) {
+ if (yyaccept <= 58) {
+ if (yyaccept <= 55) {
+ if (yyaccept <= 53) {
+ if (yyaccept <= 52) {
                                 goto yy649;
                             } else {
                                 goto yy653;
                             }
                         } else {
- if(yyaccept <= 54) {
+ if (yyaccept <= 54) {
                                 goto yy661;
                             } else {
                                 goto yy675;
                             }
                         }
                     } else {
- if(yyaccept <= 57) {
- if(yyaccept <= 56) {
+ if (yyaccept <= 57) {
+ if (yyaccept <= 56) {
                                 goto yy681;
                             } else {
                                 goto yy688;
@@ -1007,9 +1007,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 61) {
- if(yyaccept <= 60) {
- if(yyaccept <= 59) {
+ if (yyaccept <= 61) {
+ if (yyaccept <= 60) {
+ if (yyaccept <= 59) {
                                 goto yy702;
                             } else {
                                 goto yy705;
@@ -1018,8 +1018,8 @@
                             goto yy709;
                         }
                     } else {
- if(yyaccept <= 63) {
- if(yyaccept <= 62) {
+ if (yyaccept <= 63) {
+ if (yyaccept <= 62) {
                                 goto yy716;
                             } else {
                                 goto yy721;
@@ -1030,24 +1030,24 @@
                     }
                 }
             } else {
- if(yyaccept <= 71) {
- if(yyaccept <= 68) {
- if(yyaccept <= 66) {
- if(yyaccept <= 65) {
+ if (yyaccept <= 71) {
+ if (yyaccept <= 68) {
+ if (yyaccept <= 66) {
+ if (yyaccept <= 65) {
                                 goto yy727;
                             } else {
                                 goto yy735;
                             }
                         } else {
- if(yyaccept <= 67) {
+ if (yyaccept <= 67) {
                                 goto yy742;
                             } else {
                                 goto yy746;
                             }
                         }
                     } else {
- if(yyaccept <= 70) {
- if(yyaccept <= 69) {
+ if (yyaccept <= 70) {
+ if (yyaccept <= 69) {
                                 goto yy748;
                             } else {
                                 goto yy753;
@@ -1057,9 +1057,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 74) {
- if(yyaccept <= 73) {
- if(yyaccept <= 72) {
+ if (yyaccept <= 74) {
+ if (yyaccept <= 73) {
+ if (yyaccept <= 72) {
                                 goto yy762;
                             } else {
                                 goto yy766;
@@ -1068,8 +1068,8 @@
                             goto yy775;
                         }
                     } else {
- if(yyaccept <= 76) {
- if(yyaccept <= 75) {
+ if (yyaccept <= 76) {
+ if (yyaccept <= 75) {
                                 goto yy777;
                             } else {
                                 goto yy781;
@@ -1081,25 +1081,25 @@
                 }
             }
         } else {
- if(yyaccept <= 90) {
- if(yyaccept <= 84) {
- if(yyaccept <= 81) {
- if(yyaccept <= 79) {
- if(yyaccept <= 78) {
+ if (yyaccept <= 90) {
+ if (yyaccept <= 84) {
+ if (yyaccept <= 81) {
+ if (yyaccept <= 79) {
+ if (yyaccept <= 78) {
                                 goto yy794;
                             } else {
                                 goto yy799;
                             }
                         } else {
- if(yyaccept <= 80) {
+ if (yyaccept <= 80) {
                                 goto yy804;
                             } else {
                                 goto yy807;
                             }
                         }
                     } else {
- if(yyaccept <= 83) {
- if(yyaccept <= 82) {
+ if (yyaccept <= 83) {
+ if (yyaccept <= 82) {
                                 goto yy810;
                             } else {
                                 goto yy813;
@@ -1109,9 +1109,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 87) {
- if(yyaccept <= 86) {
- if(yyaccept <= 85) {
+ if (yyaccept <= 87) {
+ if (yyaccept <= 86) {
+ if (yyaccept <= 85) {
                                 goto yy830;
                             } else {
                                 goto yy836;
@@ -1120,8 +1120,8 @@
                             goto yy841;
                         }
                     } else {
- if(yyaccept <= 89) {
- if(yyaccept <= 88) {
+ if (yyaccept <= 89) {
+ if (yyaccept <= 88) {
                                 goto yy850;
                             } else {
                                 goto yy857;
@@ -1132,24 +1132,24 @@
                     }
                 }
             } else {
- if(yyaccept <= 97) {
- if(yyaccept <= 94) {
- if(yyaccept <= 92) {
- if(yyaccept <= 91) {
+ if (yyaccept <= 97) {
+ if (yyaccept <= 94) {
+ if (yyaccept <= 92) {
+ if (yyaccept <= 91) {
                                 goto yy865;
                             } else {
                                 goto yy869;
                             }
                         } else {
- if(yyaccept <= 93) {
+ if (yyaccept <= 93) {
                                 goto yy872;
                             } else {
                                 goto yy877;
                             }
                         }
                     } else {
- if(yyaccept <= 96) {
- if(yyaccept <= 95) {
+ if (yyaccept <= 96) {
+ if (yyaccept <= 95) {
                                 goto yy879;
                             } else {
                                 goto yy886;
@@ -1159,9 +1159,9 @@
                         }
                     }
                 } else {
- if(yyaccept <= 100) {
- if(yyaccept <= 99) {
- if(yyaccept <= 98) {
+ if (yyaccept <= 100) {
+ if (yyaccept <= 99) {
+ if (yyaccept <= 98) {
                                 goto yy894;
                             } else {
                                 goto yy897;
@@ -1170,8 +1170,8 @@
                             goto yy903;
                         }
                     } else {
- if(yyaccept <= 102) {
- if(yyaccept <= 101) {
+ if (yyaccept <= 102) {
+ if (yyaccept <= 101) {
                                 goto yy905;
                             } else {
                                 goto yy907;
@@ -1186,57 +1186,57 @@
     }
 yy99:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy112;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy112;
 yy100:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '`') {
- if(yych <= '7') {
- if(yych <= '&') {
- if(yych == '"') goto yy96;
+ if (yych <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy96;
                 goto yy98;
             } else {
- if(yych <= '\'') goto yy96;
- if(yych <= '/') goto yy98;
+ if (yych <= '\'') goto yy96;
+ if (yych <= '/') goto yy98;
                 goto yy107;
             }
         } else {
- if(yych <= 'T') {
- if(yych == '?') goto yy105;
+ if (yych <= 'T') {
+ if (yych == '?') goto yy105;
                 goto yy98;
             } else {
- if(yych <= 'U') goto yy104;
- if(yych == '\\') goto yy96;
+ if (yych <= 'U') goto yy104;
+ if (yych == '\\') goto yy96;
                 goto yy98;
             }
         }
     } else {
- if(yych <= 'r') {
- if(yych <= 'f') {
- if(yych <= 'b') goto yy96;
- if(yych <= 'e') goto yy98;
+ 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;
+ if (yych == 'n') goto yy96;
+ if (yych <= 'q') goto yy98;
                 goto yy96;
             }
         } else {
- if(yych <= 'u') {
- if(yych <= 's') goto yy98;
- if(yych <= 't') goto yy96;
+ 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;
+ if (yych <= 'v') goto yy96;
+ if (yych == 'x') goto yy106;
                 goto yy98;
             }
         }
@@ -1249,247 +1249,247 @@
 #line 1250 "strict_cpp_re.inc"
 yy103:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy138;
+ 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;
+ if (yych <= 'F') goto yy138;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy138;
         goto yy98;
     }
 yy104:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy131;
+ 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;
+ if (yych <= 'F') goto yy131;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy131;
         goto yy98;
     }
 yy105:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy111;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy111;
     goto yy100;
 yy106:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
+ if (yybm[256+yych] & 64) {
         goto yy109;
     }
     goto yy98;
 yy107:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '"') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy96;
+ if (yych <= '"') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy96;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy96;
- if(yych <= 0x1F) goto yy98;
- if(yych <= '!') goto yy96;
+ if (yych <= 0x0C) goto yy96;
+ if (yych <= 0x1F) goto yy98;
+ if (yych <= '!') goto yy96;
             goto yy101;
         }
     } else {
- if(yych <= '>') {
- if(yych <= '/') goto yy96;
- if(yych >= '8') goto yy96;
+ if (yych <= '>') {
+ if (yych <= '/') goto yy96;
+ if (yych >= '8') goto yy96;
         } else {
- if(yych <= '?') goto yy99;
- if(yych == '\\') goto yy100;
+ if (yych <= '?') goto yy99;
+ if (yych == '\\') goto yy100;
             goto yy96;
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy99;
     goto yy100;
 yy109:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 64) {
+ if (yybm[256+yych] & 64) {
         goto yy109;
     }
- if(yych <= '!') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy96;
+ if (yych <= '!') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy96;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy96;
- if(yych <= 0x1F) goto yy98;
+ if (yych <= 0x0C) goto yy96;
+ if (yych <= 0x1F) goto yy98;
             goto yy96;
         }
     } else {
- if(yych <= '?') {
- if(yych <= '"') goto yy101;
- if(yych <= '>') goto yy96;
+ if (yych <= '?') {
+ if (yych <= '"') goto yy101;
+ if (yych <= '>') goto yy96;
             goto yy99;
         } else {
- if(yych == '\\') goto yy100;
+ if (yych == '\\') goto yy100;
             goto yy96;
         }
     }
 yy111:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych >= '\\') goto yy100;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych >= '\\') goto yy100;
 yy112:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 128) {
+ if (yybm[256+yych] & 128) {
         goto yy112;
     }
- if(yych <= '!') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy96;
+ if (yych <= '!') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy96;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy96;
- if(yych <= 0x1F) goto yy98;
+ if (yych <= 0x0C) goto yy96;
+ if (yych <= 0x1F) goto yy98;
             goto yy96;
         }
     } else {
- if(yych <= '/') {
- if(yych <= '"') goto yy101;
- if(yych <= '.') goto yy96;
+ if (yych <= '/') {
+ if (yych <= '"') goto yy101;
+ if (yych <= '.') goto yy96;
         } else {
- if(yych == '\\') goto yy100;
+ if (yych == '\\') goto yy100;
             goto yy96;
         }
     }
 yy114:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 1) {
+ if (yybm[0+yych] & 1) {
         goto yy114;
     }
- if(yych <= '7') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '7') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy118;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy118;
+ if (yych <= '/') goto yy96;
                 goto yy107;
             }
         }
     } else {
- if(yych <= 'U') {
- if(yych == '?') goto yy119;
- if(yych <= 'T') goto yy96;
+ if (yych <= 'U') {
+ if (yych == '?') goto yy119;
+ if (yych <= 'T') goto yy96;
             goto yy117;
         } else {
- if(yych <= 'u') {
- if(yych <= 't') goto yy96;
+ if (yych <= 'u') {
+ if (yych <= 't') goto yy96;
             } else {
- if(yych == 'x') goto yy109;
+ if (yych == 'x') goto yy109;
                 goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
                 goto yy128;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
             goto yy128;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych <= 'f') goto yy128;
+ if (yych <= '`') goto yy96;
+ if (yych <= 'f') goto yy128;
                 goto yy96;
             }
         }
     }
 yy117:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
                 goto yy121;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
             goto yy121;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych <= 'f') goto yy121;
+ if (yych <= '`') goto yy96;
+ if (yych <= 'f') goto yy121;
                 goto yy96;
             }
         }
@@ -1497,596 +1497,596 @@
 yy118:
     yyaccept = 6;
     YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy102;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
+ if (yych <= '!') goto yy102;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy99;
     goto yy100;
 yy119:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych >= '\\') goto yy100;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych >= '\\') goto yy100;
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 128) {
+ if (yybm[256+yych] & 128) {
         goto yy112;
     }
- if(yych <= '!') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy96;
+ if (yych <= '!') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy96;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy96;
- if(yych <= 0x1F) goto yy98;
+ if (yych <= 0x0C) goto yy96;
+ if (yych <= 0x1F) goto yy98;
             goto yy96;
         }
     } else {
- if(yych <= '/') {
- if(yych <= '"') goto yy101;
- if(yych <= '.') goto yy96;
+ if (yych <= '/') {
+ if (yych <= '"') goto yy101;
+ if (yych <= '.') goto yy96;
             goto yy114;
         } else {
- if(yych == '\\') goto yy100;
+ if (yych == '\\') goto yy100;
             goto yy96;
         }
     }
 yy121:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy99;
     goto yy100;
 yy128:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy96;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy96;
+ if (yych <= 0x0A) goto yy98;
             goto yy96;
         } else {
- if(yych <= '!') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '!') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy96;
             } else {
- if(yych <= '"') goto yy101;
- if(yych <= '/') goto yy96;
+ if (yych <= '"') goto yy101;
+ if (yych <= '/') goto yy96;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy99;
- if(yych <= '@') goto yy96;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy99;
+ if (yych <= '@') goto yy96;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy96;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy96;
                 goto yy100;
             } else {
- if(yych <= '`') goto yy96;
- if(yych >= 'g') goto yy96;
+ if (yych <= '`') goto yy96;
+ if (yych >= 'g') goto yy96;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[256+yych] & 32) {
+ if (yybm[256+yych] & 32) {
         goto yy96;
     }
- if(yych <= '!') goto yy98;
- if(yych <= '"') goto yy101;
- if(yych <= '[') goto yy99;
+ if (yych <= '!') goto yy98;
+ if (yych <= '"') goto yy101;
+ if (yych <= '[') goto yy99;
     goto yy100;
 yy131:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy132;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy132;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy132:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy133;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy133;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy133:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy134;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy134;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy134:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy135;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy135;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy135:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy136;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy136;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy136:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy137;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy137;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy137:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy96;
+ 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;
+ if (yych <= 'F') goto yy96;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy96;
         goto yy98;
     }
 yy138:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy139;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy139;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy139:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy140;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy140;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy140:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy96;
+ 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;
+ if (yych <= 'F') goto yy96;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy96;
         goto yy98;
     }
 yy141:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy142:
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych >= '\\') goto yy144;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych >= '\\') goto yy144;
 yy143:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy156;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '[') goto yy156;
 yy144:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '`') {
- if(yych <= '7') {
- if(yych <= '&') {
- if(yych == '"') goto yy141;
+ if (yych <= '`') {
+ if (yych <= '7') {
+ if (yych <= '&') {
+ if (yych == '"') goto yy141;
                 goto yy98;
             } else {
- if(yych <= '\'') goto yy141;
- if(yych <= '/') goto yy98;
+ if (yych <= '\'') goto yy141;
+ if (yych <= '/') goto yy98;
                 goto yy149;
             }
         } else {
- if(yych <= 'T') {
- if(yych == '?') goto yy147;
+ if (yych <= 'T') {
+ if (yych == '?') goto yy147;
                 goto yy98;
             } else {
- if(yych <= 'U') goto yy146;
- if(yych == '\\') goto yy141;
+ if (yych <= 'U') goto yy146;
+ if (yych == '\\') goto yy141;
                 goto yy98;
             }
         }
     } else {
- if(yych <= 'r') {
- if(yych <= 'f') {
- if(yych <= 'b') goto yy141;
- if(yych <= 'e') goto yy98;
+ 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;
+ if (yych == 'n') goto yy141;
+ if (yych <= 'q') goto yy98;
                 goto yy141;
             }
         } else {
- if(yych <= 'u') {
- if(yych <= 's') goto yy98;
- if(yych <= 't') goto yy141;
+ if (yych <= 'u') {
+ if (yych <= 's') goto yy98;
+ if (yych <= 't') goto yy141;
             } else {
- if(yych <= 'v') goto yy141;
- if(yych == 'x') goto yy148;
+ if (yych <= 'v') goto yy141;
+ if (yych == 'x') goto yy148;
                 goto yy98;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy182;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych <= '9') goto yy182;
         goto yy98;
     } else {
- if(yych <= 'F') goto yy182;
- if(yych <= '`') goto yy98;
- if(yych <= 'f') goto yy182;
+ if (yych <= 'F') goto yy182;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy182;
         goto yy98;
     }
 yy146:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy175;
+ 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;
+ if (yych <= 'F') goto yy175;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy175;
         goto yy98;
     }
 yy147:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy155;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '[') goto yy155;
     goto yy144;
 yy148:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy153;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych <= '9') goto yy153;
         goto yy98;
     } else {
- if(yych <= 'F') goto yy153;
- if(yych <= '`') goto yy98;
- if(yych <= 'f') goto yy153;
+ if (yych <= 'F') goto yy153;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy153;
         goto yy98;
     }
 yy149:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '\'') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy141;
+ if (yych <= '\'') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy141;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy141;
- if(yych <= 0x1F) goto yy98;
- if(yych <= '&') goto yy141;
+ if (yych <= 0x0C) goto yy141;
+ if (yych <= 0x1F) goto yy98;
+ if (yych <= '&') goto yy141;
             goto yy151;
         }
     } else {
- if(yych <= '>') {
- if(yych <= '/') goto yy141;
- if(yych >= '8') goto yy141;
+ if (yych <= '>') {
+ if (yych <= '/') goto yy141;
+ if (yych >= '8') goto yy141;
         } else {
- if(yych <= '?') goto yy143;
- if(yych == '\\') goto yy144;
+ if (yych <= '?') goto yy143;
+ if (yych == '\\') goto yy144;
             goto yy141;
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy143;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '[') goto yy143;
     goto yy144;
 yy151:
     ++YYCURSOR;
@@ -2096,180 +2096,180 @@
 #line 2097 "strict_cpp_re.inc"
 yy153:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
                 goto yy153;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
             goto yy153;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych <= 'f') goto yy153;
+ if (yych <= '`') goto yy141;
+ if (yych <= 'f') goto yy153;
                 goto yy141;
             }
         }
     }
 yy155:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych >= '\\') goto yy144;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych >= '\\') goto yy144;
 yy156:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '\'') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy141;
+ if (yych <= '\'') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy141;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy141;
- if(yych <= 0x1F) goto yy98;
- if(yych <= '&') goto yy141;
+ if (yych <= 0x0C) goto yy141;
+ if (yych <= 0x1F) goto yy98;
+ if (yych <= '&') goto yy141;
             goto yy151;
         }
     } else {
- if(yych <= '>') {
- if(yych != '/') goto yy141;
+ if (yych <= '>') {
+ if (yych != '/') goto yy141;
         } else {
- if(yych <= '?') goto yy156;
- if(yych == '\\') goto yy144;
+ if (yych <= '?') goto yy156;
+ if (yych == '\\') goto yy144;
             goto yy141;
         }
     }
 yy158:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '>') {
- if(yych <= 0x1F) {
- if(yych <= 0x09) {
- if(yych <= 0x08) goto yy98;
+ if (yych <= '>') {
+ if (yych <= 0x1F) {
+ if (yych <= 0x09) {
+ if (yych <= 0x08) goto yy98;
                 goto yy141;
             } else {
- if(yych <= 0x0A) goto yy98;
- if(yych <= 0x0C) goto yy141;
+ if (yych <= 0x0A) goto yy98;
+ if (yych <= 0x0C) goto yy141;
                 goto yy98;
             }
         } else {
- if(yych <= '\'') {
- if(yych <= '&') goto yy141;
+ if (yych <= '\'') {
+ if (yych <= '&') goto yy141;
                 goto yy162;
             } else {
- if(yych <= '/') goto yy141;
- if(yych <= '7') goto yy149;
+ if (yych <= '/') goto yy141;
+ if (yych <= '7') goto yy149;
                 goto yy141;
             }
         }
     } else {
- if(yych <= '\\') {
- if(yych <= 'T') {
- if(yych <= '?') goto yy163;
+ if (yych <= '\\') {
+ if (yych <= 'T') {
+ if (yych <= '?') goto yy163;
                 goto yy141;
             } else {
- if(yych <= 'U') goto yy161;
- if(yych <= '[') goto yy141;
+ if (yych <= 'U') goto yy161;
+ if (yych <= '[') goto yy141;
                 goto yy158;
             }
         } else {
- if(yych <= 'u') {
- if(yych <= 't') goto yy141;
+ if (yych <= 'u') {
+ if (yych <= 't') goto yy141;
             } else {
- if(yych == 'x') goto yy153;
+ if (yych == 'x') goto yy153;
                 goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
                 goto yy172;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
             goto yy172;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych <= 'f') goto yy172;
+ if (yych <= '`') goto yy141;
+ if (yych <= 'f') goto yy172;
                 goto yy141;
             }
         }
     }
 yy161:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
                 goto yy165;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
             goto yy165;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych <= 'f') goto yy165;
+ if (yych <= '`') goto yy141;
+ if (yych <= 'f') goto yy165;
                 goto yy141;
             }
         }
@@ -2277,747 +2277,747 @@
 yy162:
     yyaccept = 7;
     YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy152;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy143;
+ if (yych <= '&') goto yy152;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '[') goto yy143;
     goto yy144;
 yy163:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych >= '\\') goto yy144;
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yych <= '\'') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy141;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych >= '\\') goto yy144;
+ ++YYCURSOR;
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yych <= '\'') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy141;
             goto yy98;
         } else {
- if(yych <= 0x0C) goto yy141;
- if(yych <= 0x1F) goto yy98;
- if(yych <= '&') goto yy141;
+ if (yych <= 0x0C) goto yy141;
+ if (yych <= 0x1F) goto yy98;
+ if (yych <= '&') goto yy141;
             goto yy151;
         }
     } else {
- if(yych <= '>') {
- if(yych == '/') goto yy158;
+ if (yych <= '>') {
+ if (yych == '/') goto yy158;
             goto yy141;
         } else {
- if(yych <= '?') goto yy156;
- if(yych == '\\') goto yy144;
+ if (yych <= '?') goto yy156;
+ if (yych == '\\') goto yy144;
             goto yy141;
         }
     }
 yy165:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy143;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '[') goto yy143;
     goto yy144;
 yy172:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych <= 0x0C) {
- if(yych == 0x09) goto yy141;
- if(yych <= 0x0A) goto yy98;
+ if (yych <= '9') {
+ if (yych <= 0x0C) {
+ if (yych == 0x09) goto yy141;
+ if (yych <= 0x0A) goto yy98;
             goto yy141;
         } else {
- if(yych <= '&') {
- if(yych <= 0x1F) goto yy98;
+ if (yych <= '&') {
+ if (yych <= 0x1F) goto yy98;
                 goto yy141;
             } else {
- if(yych <= '\'') goto yy151;
- if(yych <= '/') goto yy141;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '/') goto yy141;
             }
         }
     } else {
- if(yych <= 'F') {
- if(yych == '?') goto yy143;
- if(yych <= '@') goto yy141;
+ if (yych <= 'F') {
+ if (yych == '?') goto yy143;
+ if (yych <= '@') goto yy141;
         } else {
- if(yych <= '\\') {
- if(yych <= '[') goto yy141;
+ if (yych <= '\\') {
+ if (yych <= '[') goto yy141;
                 goto yy144;
             } else {
- if(yych <= '`') goto yy141;
- if(yych >= 'g') goto yy141;
+ if (yych <= '`') goto yy141;
+ if (yych >= 'g') goto yy141;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 2) {
+ if (yybm[0+yych] & 2) {
         goto yy141;
     }
- if(yych <= '&') goto yy98;
- if(yych <= '\'') goto yy151;
- if(yych <= '[') goto yy143;
+ if (yych <= '&') goto yy98;
+ if (yych <= '\'') goto yy151;
+ if (yych <= '[') goto yy143;
     goto yy144;
 yy175:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy176;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy176;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy176:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy177;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy177;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy177:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy178;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy178;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy178:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy179;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy179;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy179:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy180;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy180;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy180:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy181;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy181;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy181:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy141;
+ 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;
+ if (yych <= 'F') goto yy141;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy141;
         goto yy98;
     }
 yy182:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy183;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy183;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy183:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy184;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy184;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy184:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy141;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
- } else {
- if(yych <= 'F') goto yy194;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ 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;
     }
 yy194:
     yyaccept = 1;
     YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy195:
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych != '\\') goto yy9;
+ if (yych == '?') goto yy197;
+ if (yych != '\\') goto yy9;
 yy196:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych == 'U') goto yy200;
- if(yych == 'u') goto yy199;
+ if (yych == 'U') goto yy200;
+ if (yych == 'u') goto yy199;
     goto yy98;
 yy197:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych != '?') goto yy98;
+ if (yych != '?') goto yy98;
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych == '/') goto yy196;
+ if (yych == '/') goto yy196;
     goto yy98;
 yy199:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy208;
+ 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;
+ if (yych <= 'F') goto yy208;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy208;
         goto yy98;
     }
 yy200:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych >= ':') goto yy98;
- } else {
- if(yych <= 'F') goto yy206;
- if(yych <= '`') goto yy98;
- if(yych >= 'g') goto yy98;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy98;
+ if (yych >= ':') goto yy98;
+ } else {
+ if (yych <= 'F') goto yy206;
+ if (yych <= '`') goto yy98;
+ if (yych >= 'g') goto yy98;
     }
 yy206:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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;
     }
 yy207:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy194;
+ 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;
+ if (yych <= 'F') goto yy194;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy194;
         goto yy98;
     }
 yy208:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ 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;
+ 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);
+ 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;
+ 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);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy98;
- if(yych <= '9') goto yy194;
+ 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;
+ 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;
+ 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;
+ 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;
+ 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;
+ if (yych <= 'F') goto yy194;
+ if (yych <= '`') goto yy98;
+ if (yych <= 'f') goto yy194;
         goto yy98;
     }
 yy214:
     yych = *++YYCURSOR;
- if(yych == '\'') goto yy98;
+ if (yych == '\'') goto yy98;
     goto yy142;
 yy215:
     ++YYCURSOR;
@@ -3026,7 +3026,7 @@
 #line 3027 "strict_cpp_re.inc"
 yy217:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy219;
+ if ((yych = *YYCURSOR) == '=') goto yy219;
 #line 210 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SHIFTRIGHT); }
 #line 3033 "strict_cpp_re.inc"
@@ -3047,7 +3047,7 @@
 #line 3048 "strict_cpp_re.inc"
 yy225:
     yych = *++YYCURSOR;
- if(yych == '?') goto yy230;
+ if (yych == '?') goto yy230;
     goto yy98;
 yy226:
     ++YYCURSOR;
@@ -3061,7 +3061,7 @@
 #line 3062 "strict_cpp_re.inc"
 yy230:
     yych = *++YYCURSOR;
- if(yych != '!') goto yy98;
+ if (yych != '!') goto yy98;
     ++YYCURSOR;
 #line 222 "strict_cpp.re"
     { BOOST_WAVE_RET(T_OROR_TRIGRAPH); }
@@ -3079,24 +3079,24 @@
 yy237:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 8;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'Z') {
- if(yych <= '>') {
- if(yych <= '/') goto yy239;
- if(yych <= '9') goto yy194;
+ if (yych <= 'Z') {
+ if (yych <= '>') {
+ if (yych <= '/') goto yy239;
+ if (yych <= '9') goto yy194;
         } else {
- if(yych <= '?') goto yy197;
- if(yych >= 'A') goto yy194;
+ if (yych <= '?') goto yy197;
+ if (yych >= 'A') goto yy194;
         }
     } else {
- if(yych <= '^') {
- if(yych == '\\') goto yy196;
+ if (yych <= '^') {
+ if (yych == '\\') goto yy196;
         } else {
- if(yych <= '_') goto yy240;
- if(yych <= '`') goto yy239;
- if(yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy240;
+ if (yych <= '`') goto yy239;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy239:
@@ -3106,17 +3106,17 @@
 yy240:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'q') goto yy195;
+ if (yych != 'q') goto yy195;
     yyaccept = 9;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy243:
 #line 202 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_XORASSIGN_ALT); }
@@ -3133,7 +3133,7 @@
 #line 3134 "strict_cpp_re.inc"
 yy248:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '*') goto yy254;
+ if ((yych = *YYCURSOR) == '*') goto yy254;
 #line 238 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ARROW); }
 #line 3140 "strict_cpp_re.inc"
@@ -3172,96 +3172,96 @@
 #line 3173 "strict_cpp_re.inc"
 yy260:
     ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
+ if ((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
     yych = *YYCURSOR;
 yy261:
- if(yych <= 'h') {
- if(yych <= ' ') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy260;
+ if (yych <= 'h') {
+ if (yych <= ' ') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy260;
                 goto yy98;
             } else {
- if(yych <= 0x0C) goto yy260;
- if(yych <= 0x1F) goto yy98;
+ if (yych <= 0x0C) goto yy260;
+ if (yych <= 0x1F) goto yy98;
                 goto yy260;
             }
         } else {
- if(yych <= 'c') {
- if(yych != '/') goto yy98;
+ if (yych <= 'c') {
+ if (yych != '/') goto yy98;
             } else {
- if(yych <= 'd') goto yy269;
- if(yych <= 'e') goto yy263;
+ if (yych <= 'd') goto yy269;
+ if (yych <= 'e') goto yy263;
                 goto yy98;
             }
         }
     } else {
- if(yych <= 'q') {
- if(yych <= 'l') {
- if(yych <= 'i') goto yy270;
- if(yych <= 'k') goto yy98;
+ if (yych <= 'q') {
+ if (yych <= 'l') {
+ if (yych <= 'i') goto yy270;
+ if (yych <= 'k') goto yy98;
                 goto yy267;
             } else {
- if(yych == 'p') goto yy266;
+ if (yych == 'p') goto yy266;
                 goto yy98;
             }
         } else {
- if(yych <= 'u') {
- if(yych <= 'r') goto yy264;
- if(yych <= 't') goto yy98;
+ if (yych <= 'u') {
+ if (yych <= 'r') goto yy264;
+ if (yych <= 't') goto yy98;
                 goto yy268;
             } else {
- if(yych == 'w') goto yy265;
+ if (yych == 'w') goto yy265;
                 goto yy98;
             }
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych == '*') goto yy377;
+ if (yych == '*') goto yy377;
     goto yy98;
 yy263:
     yych = *++YYCURSOR;
- if(yych <= 'm') {
- if(yych == 'l') goto yy353;
+ if (yych <= 'm') {
+ if (yych == 'l') goto yy353;
         goto yy98;
     } else {
- if(yych <= 'n') goto yy354;
- if(yych == 'r') goto yy355;
+ if (yych <= 'n') goto yy354;
+ if (yych == 'r') goto yy355;
         goto yy98;
     }
 yy264:
     yych = *++YYCURSOR;
- if(yych == 'e') goto yy347;
+ if (yych == 'e') goto yy347;
     goto yy98;
 yy265:
     yych = *++YYCURSOR;
- if(yych == 'a') goto yy340;
+ if (yych == 'a') goto yy340;
     goto yy98;
 yy266:
     yych = *++YYCURSOR;
- if(yych == 'r') goto yy334;
+ if (yych == 'r') goto yy334;
     goto yy98;
 yy267:
     yych = *++YYCURSOR;
- if(yych == 'i') goto yy330;
+ if (yych == 'i') goto yy330;
     goto yy98;
 yy268:
     yych = *++YYCURSOR;
- if(yych == 'n') goto yy325;
+ if (yych == 'n') goto yy325;
     goto yy98;
 yy269:
     yych = *++YYCURSOR;
- if(yych == 'e') goto yy319;
+ if (yych == 'e') goto yy319;
     goto yy98;
 yy270:
     yych = *++YYCURSOR;
- if(yych == 'f') goto yy278;
- if(yych == 'n') goto yy277;
+ if (yych == 'f') goto yy278;
+ if (yych == 'n') goto yy277;
     goto yy98;
 yy271:
     yych = *++YYCURSOR;
- if(yych == '?') goto yy274;
+ if (yych == '?') goto yy274;
     goto yy98;
 yy272:
     ++YYCURSOR;
@@ -3270,58 +3270,58 @@
 #line 3271 "strict_cpp_re.inc"
 yy274:
     yych = *++YYCURSOR;
- if(yych != '=') goto yy98;
+ if (yych != '=') goto yy98;
     ++YYCURSOR;
 #line 144 "strict_cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_TRIGRAPH); }
 #line 3278 "strict_cpp_re.inc"
 yy277:
     yych = *++YYCURSOR;
- if(yych == 'c') goto yy289;
+ if (yych == 'c') goto yy289;
     goto yy98;
 yy278:
     yyaccept = 10;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'd') goto yy281;
- if(yych == 'n') goto yy280;
+ if (yych == 'd') goto yy281;
+ if (yych == 'n') goto yy280;
 yy279:
 #line 261 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_IF); }
 #line 3291 "strict_cpp_re.inc"
 yy280:
     yych = *++YYCURSOR;
- if(yych == 'd') goto yy285;
+ if (yych == 'd') goto yy285;
     goto yy98;
 yy281:
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'f') goto yy98;
+ if (yych != 'f') goto yy98;
     ++YYCURSOR;
 #line 262 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_IFDEF); }
 #line 3304 "strict_cpp_re.inc"
 yy285:
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'f') goto yy98;
+ if (yych != 'f') goto yy98;
     ++YYCURSOR;
 #line 263 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_IFNDEF); }
 #line 3313 "strict_cpp_re.inc"
 yy289:
     yych = *++YYCURSOR;
- if(yych != 'l') goto yy98;
+ if (yych != 'l') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'u') goto yy98;
+ if (yych != 'u') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'd') goto yy98;
+ if (yych != 'd') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     yyaccept = 11;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == '_') goto yy295;
+ if (yych == '_') goto yy295;
     goto yy297;
 yy294:
 #line 259 "strict_cpp.re"
@@ -3329,238 +3329,238 @@
 #line 3330 "strict_cpp_re.inc"
 yy295:
     yych = *++YYCURSOR;
- if(yych == 'n') goto yy316;
+ if (yych == 'n') goto yy316;
     goto yy98;
 yy296:
     yyaccept = 11;
     YYMARKER = ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
 yy297:
- if(yych <= ' ') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy296;
+ if (yych <= ' ') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy296;
             goto yy294;
         } else {
- if(yych <= 0x0C) goto yy296;
- if(yych <= 0x1F) goto yy294;
+ if (yych <= 0x0C) goto yy296;
+ if (yych <= 0x1F) goto yy294;
             goto yy296;
         }
     } else {
- if(yych <= '.') {
- if(yych == '"') goto yy300;
+ if (yych <= '.') {
+ if (yych == '"') goto yy300;
             goto yy294;
         } else {
- if(yych <= '/') goto yy298;
- if(yych == '<') goto yy299;
+ if (yych <= '/') goto yy298;
+ if (yych == '<') goto yy299;
             goto yy294;
         }
     }
 yy298:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych == '*') goto yy309;
+ if (yych == '*') goto yy309;
     goto yy98;
 yy299:
     yych = *++YYCURSOR;
- if(yych == '>') goto yy98;
+ if (yych == '>') goto yy98;
     goto yy306;
 yy300:
     yych = *++YYCURSOR;
- if(yych == '"') goto yy98;
+ if (yych == '"') goto yy98;
     goto yy302;
 yy301:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy302:
- if(yybm[0+yych] & 8) {
+ if (yybm[0+yych] & 8) {
         goto yy301;
     }
- if(yych <= '!') goto yy98;
+ if (yych <= '!') goto yy98;
     ++YYCURSOR;
 #line 256 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_QHEADER); }
 #line 3386 "strict_cpp_re.inc"
 yy305:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
 yy306:
- if(yybm[0+yych] & 16) {
+ if (yybm[0+yych] & 16) {
         goto yy305;
     }
- if(yych <= '=') goto yy98;
+ if (yych <= '=') goto yy98;
     ++YYCURSOR;
 #line 253 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_HHEADER); }
 #line 3399 "strict_cpp_re.inc"
 yy309:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 32) {
+ if (yybm[0+yych] & 32) {
         goto yy309;
     }
- if(yych == 0x0D) goto yy311;
- if(yych <= ')') goto yy98;
+ if (yych == 0x0D) goto yy311;
+ if (yych <= ')') goto yy98;
     goto yy313;
 yy311:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 32) {
+ if (yybm[0+yych] & 32) {
         goto yy309;
     }
- if(yych == 0x0D) goto yy311;
- if(yych <= ')') goto yy98;
+ if (yych == 0x0D) goto yy311;
+ if (yych <= ')') goto yy98;
 yy313:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 128) {
+ if (yybm[0+yych] & 128) {
         goto yy313;
     }
- if(yych <= 0x0D) {
- if(yych <= 0x08) goto yy98;
- if(yych <= 0x0C) goto yy309;
+ if (yych <= 0x0D) {
+ if (yych <= 0x08) goto yy98;
+ if (yych <= 0x0C) goto yy309;
     } else {
- if(yych <= 0x1F) goto yy98;
- if(yych == '/') goto yy296;
+ if (yych <= 0x1F) goto yy98;
+ if (yych == '/') goto yy296;
         goto yy309;
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 32) {
+ if (yybm[0+yych] & 32) {
         goto yy309;
     }
- if(yych == 0x0D) goto yy311;
- if(yych <= ')') goto yy98;
+ if (yych == 0x0D) goto yy311;
+ if (yych <= ')') goto yy98;
     goto yy313;
 yy316:
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'x') goto yy98;
+ if (yych != 'x') goto yy98;
     yych = *++YYCURSOR;
- if(yych == 't') goto yy296;
+ if (yych == 't') goto yy296;
     goto yy98;
 yy319:
     yych = *++YYCURSOR;
- if(yych != 'f') goto yy98;
+ if (yych != 'f') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'i') goto yy98;
+ if (yych != 'i') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'n') goto yy98;
+ if (yych != 'n') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     ++YYCURSOR;
 #line 267 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_DEFINE); }
 #line 3463 "strict_cpp_re.inc"
 yy325:
     yych = *++YYCURSOR;
- if(yych != 'd') goto yy98;
+ if (yych != 'd') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'f') goto yy98;
+ if (yych != 'f') goto yy98;
     ++YYCURSOR;
 #line 268 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_UNDEF); }
 #line 3474 "strict_cpp_re.inc"
 yy330:
     yych = *++YYCURSOR;
- if(yych != 'n') goto yy98;
+ if (yych != 'n') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     ++YYCURSOR;
 #line 269 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_LINE); }
 #line 3483 "strict_cpp_re.inc"
 yy334:
     yych = *++YYCURSOR;
- if(yych != 'a') goto yy98;
+ if (yych != 'a') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'g') goto yy98;
+ if (yych != 'g') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'm') goto yy98;
+ if (yych != 'm') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'a') goto yy98;
+ if (yych != 'a') goto yy98;
     ++YYCURSOR;
 #line 271 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_PRAGMA); }
 #line 3496 "strict_cpp_re.inc"
 yy340:
     yych = *++YYCURSOR;
- if(yych != 'r') goto yy98;
+ if (yych != 'r') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'n') goto yy98;
+ if (yych != 'n') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'i') goto yy98;
+ if (yych != 'i') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'n') goto yy98;
+ if (yych != 'n') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'g') goto yy98;
+ if (yych != 'g') goto yy98;
     ++YYCURSOR;
 #line 273 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_WARNING); }
 #line 3511 "strict_cpp_re.inc"
 yy347:
     yych = *++YYCURSOR;
- if(yych != 'g') goto yy98;
+ if (yych != 'g') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'i') goto yy98;
+ if (yych != 'i') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'o') goto yy98;
+ if (yych != 'o') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'n') goto yy98;
+ if (yych != 'n') goto yy98;
     ++YYCURSOR;
 #line 275 "strict_cpp.re"
     { BOOST_WAVE_RET(T_MSEXT_PP_REGION); }
 #line 3524 "strict_cpp_re.inc"
 yy353:
     yych = *++YYCURSOR;
- if(yych == 'i') goto yy371;
- if(yych == 's') goto yy372;
+ if (yych == 'i') goto yy371;
+ if (yych == 's') goto yy372;
     goto yy98;
 yy354:
     yych = *++YYCURSOR;
- if(yych == 'd') goto yy360;
+ if (yych == 'd') goto yy360;
     goto yy98;
 yy355:
     yych = *++YYCURSOR;
- if(yych != 'r') goto yy98;
+ if (yych != 'r') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'o') goto yy98;
+ if (yych != 'o') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'r') goto yy98;
+ if (yych != 'r') goto yy98;
     ++YYCURSOR;
 #line 270 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_ERROR); }
 #line 3544 "strict_cpp_re.inc"
 yy360:
     yych = *++YYCURSOR;
- if(yych == 'i') goto yy361;
- if(yych == 'r') goto yy362;
+ if (yych == 'i') goto yy361;
+ if (yych == 'r') goto yy362;
     goto yy98;
 yy361:
     yych = *++YYCURSOR;
- if(yych == 'f') goto yy369;
+ if (yych == 'f') goto yy369;
     goto yy98;
 yy362:
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'g') goto yy98;
+ if (yych != 'g') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'i') goto yy98;
+ if (yych != 'i') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'o') goto yy98;
+ if (yych != 'o') goto yy98;
     yych = *++YYCURSOR;
- if(yych != 'n') goto yy98;
+ if (yych != 'n') goto yy98;
     ++YYCURSOR;
 #line 276 "strict_cpp.re"
     { BOOST_WAVE_RET(T_MSEXT_PP_ENDREGION); }
@@ -3572,11 +3572,11 @@
 #line 3573 "strict_cpp_re.inc"
 yy371:
     yych = *++YYCURSOR;
- if(yych == 'f') goto yy375;
+ if (yych == 'f') goto yy375;
     goto yy98;
 yy372:
     yych = *++YYCURSOR;
- if(yych != 'e') goto yy98;
+ if (yych != 'e') goto yy98;
     ++YYCURSOR;
 #line 264 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PP_ELSE); }
@@ -3588,55 +3588,55 @@
 #line 3589 "strict_cpp_re.inc"
 yy377:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= 0x0D) {
- if(yych <= 0x08) goto yy98;
- if(yych <= 0x0C) goto yy377;
+ if (yych <= 0x0D) {
+ if (yych <= 0x08) goto yy98;
+ if (yych <= 0x0C) goto yy377;
     } else {
- if(yych <= 0x1F) goto yy98;
- if(yych == '*') goto yy381;
+ if (yych <= 0x1F) goto yy98;
+ if (yych == '*') goto yy381;
         goto yy377;
     }
 yy379:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= 0x0D) {
- if(yych <= 0x08) goto yy98;
- if(yych <= 0x0C) goto yy377;
+ if (yych <= 0x0D) {
+ if (yych <= 0x08) goto yy98;
+ if (yych <= 0x0C) goto yy377;
         goto yy379;
     } else {
- if(yych <= 0x1F) goto yy98;
- if(yych != '*') goto yy377;
+ if (yych <= 0x1F) goto yy98;
+ if (yych != '*') goto yy377;
     }
 yy381:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= 0x1F) {
- if(yych <= 0x08) goto yy98;
- if(yych <= 0x0C) goto yy377;
- if(yych >= 0x0E) goto yy98;
+ if (yych <= 0x1F) {
+ if (yych <= 0x08) goto yy98;
+ if (yych <= 0x0C) goto yy377;
+ if (yych >= 0x0E) goto yy98;
     } else {
- if(yych <= '*') {
- if(yych <= ')') goto yy377;
+ if (yych <= '*') {
+ if (yych <= ')') goto yy377;
             goto yy381;
         } else {
- if(yych == '/') goto yy260;
+ if (yych == '/') goto yy260;
             goto yy377;
         }
     }
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= 0x0D) {
- if(yych <= 0x08) goto yy98;
- if(yych <= 0x0C) goto yy377;
+ if (yych <= 0x0D) {
+ if (yych <= 0x08) goto yy98;
+ if (yych <= 0x0C) goto yy377;
         goto yy379;
     } else {
- if(yych <= 0x1F) goto yy98;
- if(yych == '*') goto yy381;
+ if (yych <= 0x1F) goto yy98;
+ if (yych == '*') goto yy381;
         goto yy377;
     }
 yy384:
@@ -3660,36 +3660,36 @@
 yy388:
     yyaccept = 12;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'e') {
- if(yych <= ' ') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy261;
+ if (yych <= 'e') {
+ if (yych <= ' ') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy261;
             } else {
- if(yych <= 0x0C) goto yy261;
- if(yych >= ' ') goto yy261;
+ if (yych <= 0x0C) goto yy261;
+ if (yych >= ' ') goto yy261;
             }
         } else {
- if(yych <= '.') {
- if(yych == '%') goto yy394;
+ if (yych <= '.') {
+ if (yych == '%') goto yy394;
             } else {
- if(yych <= '/') goto yy261;
- if(yych >= 'd') goto yy261;
+ if (yych <= '/') goto yy261;
+ if (yych >= 'd') goto yy261;
             }
         }
     } else {
- if(yych <= 'p') {
- if(yych <= 'k') {
- if(yych == 'i') goto yy261;
+ if (yych <= 'p') {
+ if (yych <= 'k') {
+ if (yych == 'i') goto yy261;
             } else {
- if(yych <= 'l') goto yy261;
- if(yych >= 'p') goto yy261;
+ if (yych <= 'l') goto yy261;
+ if (yych >= 'p') goto yy261;
             }
         } else {
- if(yych <= 't') {
- if(yych == 'r') goto yy261;
+ if (yych <= 't') {
+ if (yych == 'r') goto yy261;
             } else {
- if(yych == 'v') goto yy389;
- if(yych <= 'w') goto yy261;
+ if (yych == 'v') goto yy389;
+ if (yych <= 'w') goto yy261;
             }
         }
     }
@@ -3709,7 +3709,7 @@
 #line 3710 "strict_cpp_re.inc"
 yy394:
     yych = *++YYCURSOR;
- if(yych != ':') goto yy98;
+ if (yych != ':') goto yy98;
     ++YYCURSOR;
 #line 147 "strict_cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_ALT); }
@@ -3721,7 +3721,7 @@
 #line 3722 "strict_cpp_re.inc"
 yy399:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy405;
+ if ((yych = *YYCURSOR) == '=') goto yy405;
 #line 209 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SHIFTLEFT); }
 #line 3728 "strict_cpp_re.inc"
@@ -3742,7 +3742,7 @@
 #line 3743 "strict_cpp_re.inc"
 yy407:
     yych = *++YYCURSOR;
- switch(yych) {
+ switch (yych) {
     case '!': goto yy420;
     case '\'': goto yy418;
     case '(': goto yy412;
@@ -3777,37 +3777,37 @@
 yy416:
     yyaccept = 13;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'c') {
- if(yych <= ' ') {
- if(yych <= 0x0A) {
- if(yych == 0x09) goto yy261;
+ if (yych <= 'c') {
+ if (yych <= ' ') {
+ if (yych <= 0x0A) {
+ if (yych == 0x09) goto yy261;
             } else {
- if(yych <= 0x0C) goto yy261;
- if(yych >= ' ') goto yy261;
+ if (yych <= 0x0C) goto yy261;
+ if (yych >= ' ') goto yy261;
             }
         } else {
- if(yych <= '.') {
- if(yych == '#') goto yy437;
+ if (yych <= '.') {
+ if (yych == '#') goto yy437;
             } else {
- if(yych <= '/') goto yy261;
- if(yych == '?') goto yy436;
+ if (yych <= '/') goto yy261;
+ if (yych == '?') goto yy436;
             }
         }
     } else {
- if(yych <= 'p') {
- if(yych <= 'i') {
- if(yych <= 'e') goto yy261;
- if(yych >= 'i') goto yy261;
+ if (yych <= 'p') {
+ if (yych <= 'i') {
+ if (yych <= 'e') goto yy261;
+ if (yych >= 'i') goto yy261;
             } else {
- if(yych == 'l') goto yy261;
- if(yych >= 'p') goto yy261;
+ if (yych == 'l') goto yy261;
+ if (yych >= 'p') goto yy261;
             }
         } else {
- if(yych <= 't') {
- if(yych == 'r') goto yy261;
+ if (yych <= 't') {
+ if (yych == 'r') goto yy261;
             } else {
- if(yych == 'v') goto yy417;
- if(yych <= 'w') goto yy261;
+ if (yych == 'v') goto yy417;
+ if (yych <= 'w') goto yy261;
             }
         }
     }
@@ -3817,18 +3817,18 @@
 #line 3818 "strict_cpp_re.inc"
 yy418:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '=') goto yy434;
+ if ((yych = *YYCURSOR) == '=') goto yy434;
 #line 181 "strict_cpp.re"
     { BOOST_WAVE_RET(T_XOR_TRIGRAPH); }
 #line 3824 "strict_cpp_re.inc"
 yy420:
     yyaccept = 14;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '>') {
- if(yych == '=') goto yy429;
+ if (yych <= '>') {
+ if (yych == '=') goto yy429;
     } else {
- if(yych <= '?') goto yy426;
- if(yych == '|') goto yy427;
+ if (yych <= '?') goto yy426;
+ if (yych == '|') goto yy427;
     }
 yy421:
 #line 187 "strict_cpp.re"
@@ -3842,15 +3842,15 @@
 yy424:
     yyaccept = 15;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'U') goto yy186;
- if(yych == 'u') goto yy185;
+ if (yych == 'U') goto yy186;
+ if (yych == 'u') goto yy185;
 yy425:
 #line 239 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ANY_TRIGRAPH); }
 #line 3851 "strict_cpp_re.inc"
 yy426:
     yych = *++YYCURSOR;
- if(yych == '?') goto yy431;
+ if (yych == '?') goto yy431;
     goto yy98;
 yy427:
     ++YYCURSOR;
@@ -3864,7 +3864,7 @@
 #line 3865 "strict_cpp_re.inc"
 yy431:
     yych = *++YYCURSOR;
- if(yych != '!') goto yy98;
+ if (yych != '!') goto yy98;
     ++YYCURSOR;
 #line 224 "strict_cpp.re"
     { BOOST_WAVE_RET(T_OROR_TRIGRAPH); }
@@ -3876,7 +3876,7 @@
 #line 3877 "strict_cpp_re.inc"
 yy436:
     yych = *++YYCURSOR;
- if(yych == '?') goto yy439;
+ if (yych == '?') goto yy439;
     goto yy98;
 yy437:
     ++YYCURSOR;
@@ -3885,7 +3885,7 @@
 #line 3886 "strict_cpp_re.inc"
 yy439:
     yych = *++YYCURSOR;
- if(yych != '=') goto yy98;
+ if (yych != '=') goto yy98;
     ++YYCURSOR;
 #line 146 "strict_cpp.re"
     { BOOST_WAVE_RET(T_POUND_POUND_TRIGRAPH); }
@@ -3893,7 +3893,7 @@
 yy442:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
+ switch (yych) {
     case 'a': goto yy443;
     case 'b': goto yy444;
     case 'c': goto yy445;
@@ -3909,59 +3909,59 @@
 yy443:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 's') goto yy489;
+ if (yych == 's') goto yy489;
     goto yy195;
 yy444:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy484;
+ if (yych == 'a') goto yy484;
     goto yy195;
 yy445:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'd') goto yy479;
+ if (yych == 'd') goto yy479;
     goto yy195;
 yy446:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy471;
+ if (yych == 'e') goto yy471;
     goto yy195;
 yy447:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy463;
+ if (yych == 'a') goto yy463;
     goto yy195;
 yy448:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy457;
+ if (yych == 'n') goto yy457;
     goto yy195;
 yy449:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 16;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy456:
 #line 120 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_STDCALL : T_IDENTIFIER); }
@@ -3969,24 +3969,24 @@
 yy457:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
 yy458:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 17;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy462:
 #line 125 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INLINE : T_IDENTIFIER); }
@@ -3994,29 +3994,29 @@
 yy463:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 18;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy470:
 #line 119 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_FASTCALL : T_IDENTIFIER); }
@@ -4024,29 +4024,29 @@
 yy471:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 19;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy478:
 #line 117 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_DECLSPEC : T_IDENTIFIER); }
@@ -4054,20 +4054,20 @@
 yy479:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 20;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy483:
 #line 118 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_CDECL : T_IDENTIFIER); }
@@ -4075,20 +4075,20 @@
 yy484:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 21;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy488:
 #line 116 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_BASED : T_IDENTIFIER); }
@@ -4096,14 +4096,14 @@
 yy489:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'm') goto yy195;
+ if (yych != 'm') goto yy195;
     yyaccept = 22;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy491:
 #line 126 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_ASM : T_IDENTIFIER); }
@@ -4111,44 +4111,44 @@
 yy492:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy518;
+ if (yych == 'n') goto yy518;
     goto yy195;
 yy493:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy463;
- if(yych == 'i') goto yy511;
+ if (yych == 'a') goto yy463;
+ if (yych == 'i') goto yy511;
     goto yy195;
 yy494:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'r') goto yy508;
+ if (yych == 'r') goto yy508;
     goto yy195;
 yy495:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'x') goto yy502;
+ if (yych == 'x') goto yy502;
     goto yy195;
 yy496:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'v') goto yy195;
+ if (yych != 'v') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 23;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy501:
 #line 124 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_LEAVE : T_IDENTIFIER); }
@@ -4156,23 +4156,23 @@
 yy502:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 24;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy507:
 #line 122 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_EXCEPT : T_IDENTIFIER); }
@@ -4180,14 +4180,14 @@
 yy508:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'y') goto yy195;
+ if (yych != 'y') goto yy195;
     yyaccept = 25;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy510:
 #line 121 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_TRY : T_IDENTIFIER); }
@@ -4195,26 +4195,26 @@
 yy511:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'y') goto yy195;
+ if (yych != 'y') goto yy195;
     yyaccept = 26;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy517:
 #line 123 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_FINALLY : T_IDENTIFIER); }
@@ -4222,11 +4222,11 @@
 yy518:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'l') goto yy458;
- if(yych != 't') goto yy195;
+ if (yych == 'l') goto yy458;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- switch(yych) {
+ switch (yych) {
     case '1': goto yy520;
     case '3': goto yy521;
     case '6': goto yy522;
@@ -4236,26 +4236,26 @@
 yy520:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == '6') goto yy529;
+ if (yych == '6') goto yy529;
     goto yy195;
 yy521:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == '2') goto yy527;
+ if (yych == '2') goto yy527;
     goto yy195;
 yy522:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == '4') goto yy525;
+ if (yych == '4') goto yy525;
     goto yy195;
 yy523:
     yyaccept = 27;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy524:
 #line 112 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT8 : T_IDENTIFIER); }
@@ -4263,11 +4263,11 @@
 yy525:
     yyaccept = 28;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy526:
 #line 115 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT64 : T_IDENTIFIER); }
@@ -4275,11 +4275,11 @@
 yy527:
     yyaccept = 29;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy528:
 #line 114 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT32 : T_IDENTIFIER); }
@@ -4287,11 +4287,11 @@
 yy529:
     yyaccept = 30;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy530:
 #line 113 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_ms_extensions ? T_MSEXT_INT16 : T_IDENTIFIER); }
@@ -4299,25 +4299,25 @@
 yy531:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'h') goto yy537;
+ if (yych == 'h') goto yy537;
     goto yy195;
 yy532:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 31;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy536:
 #line 110 "strict_cpp.re"
     { BOOST_WAVE_RET(T_WHILE); }
@@ -4325,23 +4325,23 @@
 yy537:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != '_') goto yy195;
+ if (yych != '_') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 32;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy542:
 #line 109 "strict_cpp.re"
     { BOOST_WAVE_RET(T_WCHART); }
@@ -4349,42 +4349,42 @@
 yy543:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'r') goto yy555;
+ if (yych == 'r') goto yy555;
     goto yy195;
 yy544:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy545;
- if(yych == 'l') goto yy546;
+ if (yych == 'i') goto yy545;
+ if (yych == 'l') goto yy546;
     goto yy195;
 yy545:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'd') goto yy553;
+ if (yych == 'd') goto yy553;
     goto yy195;
 yy546:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 33;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy552:
 #line 108 "strict_cpp.re"
     { BOOST_WAVE_RET(T_VOLATILE); }
@@ -4392,11 +4392,11 @@
 yy553:
     yyaccept = 34;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy554:
 #line 107 "strict_cpp.re"
     { BOOST_WAVE_RET(T_VOID); }
@@ -4404,23 +4404,23 @@
 yy555:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'u') goto yy195;
+ if (yych != 'u') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 35;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy560:
 #line 106 "strict_cpp.re"
     { BOOST_WAVE_RET(T_VIRTUAL); }
@@ -4428,26 +4428,26 @@
 yy561:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy567;
- if(yych == 's') goto yy568;
+ if (yych == 'i') goto yy567;
+ if (yych == 's') goto yy568;
     goto yy195;
 yy562:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'g') goto yy195;
+ if (yych != 'g') goto yy195;
     yyaccept = 36;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy566:
 #line 105 "strict_cpp.re"
     { BOOST_WAVE_RET(T_USING); }
@@ -4455,31 +4455,31 @@
 yy567:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy575;
+ if (yych == 'o') goto yy575;
     goto yy195;
 yy568:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'g') goto yy195;
+ if (yych != 'g') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 37;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy574:
 #line 104 "strict_cpp.re"
     { BOOST_WAVE_RET(T_UNSIGNED); }
@@ -4487,14 +4487,14 @@
 yy575:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 38;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy577:
 #line 103 "strict_cpp.re"
     { BOOST_WAVE_RET(T_UNION); }
@@ -4502,62 +4502,62 @@
 yy578:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'm') goto yy608;
+ if (yych == 'm') goto yy608;
     goto yy195;
 yy579:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy601;
- if(yych == 'r') goto yy602;
+ if (yych == 'i') goto yy601;
+ if (yych == 'r') goto yy602;
     goto yy195;
 yy580:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'u') goto yy596;
- if(yych == 'y') goto yy597;
+ if (yych == 'u') goto yy596;
+ if (yych == 'y') goto yy597;
     goto yy195;
 yy581:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'h') {
- if(yych != 'd') goto yy195;
+ if (yych <= 'h') {
+ if (yych != 'd') goto yy195;
     } else {
- if(yych <= 'i') goto yy585;
- if(yych == 'n') goto yy586;
+ if (yych <= 'i') goto yy585;
+ if (yych == 'n') goto yy586;
         goto yy195;
     }
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy593;
+ if (yych == 'e') goto yy593;
     goto yy195;
 yy585:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'd') goto yy591;
+ if (yych == 'd') goto yy591;
     goto yy195;
 yy586:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'm') goto yy195;
+ if (yych != 'm') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 39;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy590:
 #line 102 "strict_cpp.re"
     { BOOST_WAVE_RET(T_TYPENAME); }
@@ -4565,11 +4565,11 @@
 yy591:
     yyaccept = 40;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy592:
 #line 101 "strict_cpp.re"
     { BOOST_WAVE_RET(T_TYPEID); }
@@ -4577,14 +4577,14 @@
 yy593:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'f') goto yy195;
+ if (yych != 'f') goto yy195;
     yyaccept = 41;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy595:
 #line 100 "strict_cpp.re"
     { BOOST_WAVE_RET(T_TYPEDEF); }
@@ -4592,16 +4592,16 @@
 yy596:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy599;
+ if (yych == 'e') goto yy599;
     goto yy195;
 yy597:
     yyaccept = 42;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy598:
 #line 99 "strict_cpp.re"
     { BOOST_WAVE_RET(T_TRY); }
@@ -4609,11 +4609,11 @@
 yy599:
     yyaccept = 43;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy600:
 #line 98 "strict_cpp.re"
     { BOOST_WAVE_RET(T_TRUE); }
@@ -4621,22 +4621,22 @@
 yy601:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 's') goto yy606;
+ if (yych == 's') goto yy606;
     goto yy195;
 yy602:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'o') goto yy195;
+ if (yych != 'o') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'w') goto yy195;
+ if (yych != 'w') goto yy195;
     yyaccept = 44;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy605:
 #line 97 "strict_cpp.re"
     { BOOST_WAVE_RET(T_THROW); }
@@ -4644,11 +4644,11 @@
 yy606:
     yyaccept = 45;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy607:
 #line 96 "strict_cpp.re"
     { BOOST_WAVE_RET(T_THIS); }
@@ -4656,26 +4656,26 @@
 yy608:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 46;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy614:
 #line 95 "strict_cpp.re"
     { BOOST_WAVE_RET(T_TEMPLATE); }
@@ -4683,40 +4683,40 @@
 yy615:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy650;
+ if (yych == 'o') goto yy650;
     goto yy195;
 yy616:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'g') goto yy640;
- if(yych == 'z') goto yy641;
+ if (yych == 'g') goto yy640;
+ if (yych == 'z') goto yy641;
     goto yy195;
 yy617:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy624;
- if(yych == 'r') goto yy625;
+ if (yych == 'a') goto yy624;
+ if (yych == 'r') goto yy625;
     goto yy195;
 yy618:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'h') goto yy195;
+ if (yych != 'h') goto yy195;
     yyaccept = 47;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy623:
 #line 94 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SWITCH); }
@@ -4724,25 +4724,25 @@
 yy624:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 't') goto yy630;
+ if (yych == 't') goto yy630;
     goto yy195;
 yy625:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'u') goto yy195;
+ if (yych != 'u') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 48;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy629:
 #line 93 "strict_cpp.re"
     { BOOST_WAVE_RET(T_STRUCT); }
@@ -4750,27 +4750,27 @@
 yy630:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 49;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'Z') {
- if(yych <= '>') {
- if(yych <= '/') goto yy633;
- if(yych <= '9') goto yy194;
+ if (yych <= 'Z') {
+ if (yych <= '>') {
+ if (yych <= '/') goto yy633;
+ if (yych <= '9') goto yy194;
         } else {
- if(yych <= '?') goto yy197;
- if(yych >= 'A') goto yy194;
+ if (yych <= '?') goto yy197;
+ if (yych >= 'A') goto yy194;
         }
     } else {
- if(yych <= '^') {
- if(yych == '\\') goto yy196;
+ if (yych <= '^') {
+ if (yych == '\\') goto yy196;
         } else {
- if(yych <= '_') goto yy634;
- if(yych <= '`') goto yy633;
- if(yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy634;
+ if (yych <= '`') goto yy633;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy633:
@@ -4780,23 +4780,23 @@
 yy634:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 50;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy639:
 #line 92 "strict_cpp.re"
     { BOOST_WAVE_RET(T_STATICCAST); }
@@ -4804,25 +4804,25 @@
 yy640:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy646;
+ if (yych == 'n') goto yy646;
     goto yy195;
 yy641:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'o') goto yy195;
+ if (yych != 'o') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'f') goto yy195;
+ if (yych != 'f') goto yy195;
     yyaccept = 51;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy645:
 #line 90 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SIZEOF); }
@@ -4830,17 +4830,17 @@
 yy646:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 52;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy649:
 #line 89 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SIGNED); }
@@ -4848,17 +4848,17 @@
 yy650:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 53;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy653:
 #line 88 "strict_cpp.re"
     { BOOST_WAVE_RET(T_SHORT); }
@@ -4866,39 +4866,39 @@
 yy654:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'h') {
- if(yych != 'g') goto yy195;
+ if (yych <= 'h') {
+ if (yych != 'g') goto yy195;
     } else {
- if(yych <= 'i') goto yy656;
- if(yych == 't') goto yy657;
+ if (yych <= 'i') goto yy656;
+ if (yych == 't') goto yy657;
         goto yy195;
     }
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy676;
+ if (yych == 'i') goto yy676;
     goto yy195;
 yy656:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy662;
+ if (yych == 'n') goto yy662;
     goto yy195;
 yy657:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'u') goto yy195;
+ if (yych != 'u') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 54;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy661:
 #line 87 "strict_cpp.re"
     { BOOST_WAVE_RET(T_RETURN); }
@@ -4906,47 +4906,47 @@
 yy662:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != '_') goto yy195;
+ if (yych != '_') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 55;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy675:
 #line 86 "strict_cpp.re"
     { BOOST_WAVE_RET(T_REINTERPRETCAST); }
@@ -4954,23 +4954,23 @@
 yy676:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 56;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy681:
 #line 85 "strict_cpp.re"
     { BOOST_WAVE_RET(T_REGISTER); }
@@ -4978,29 +4978,29 @@
 yy682:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy689;
- if(yych == 'o') goto yy690;
+ if (yych == 'i') goto yy689;
+ if (yych == 'o') goto yy690;
     goto yy195;
 yy683:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'b') goto yy195;
+ if (yych != 'b') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 57;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy688:
 #line 84 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PUBLIC); }
@@ -5008,34 +5008,34 @@
 yy689:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'v') goto yy698;
+ if (yych == 'v') goto yy698;
     goto yy195;
 yy690:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 58;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy697:
 #line 83 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PROTECTED); }
@@ -5043,20 +5043,20 @@
 yy698:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 59;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy702:
 #line 82 "strict_cpp.re"
     { BOOST_WAVE_RET(T_PRIVATE); }
@@ -5064,26 +5064,26 @@
 yy703:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy710;
+ if (yych == 'e') goto yy710;
     goto yy195;
 yy704:
     yyaccept = 60;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'Z') {
- if(yych <= '>') {
- if(yych <= '/') goto yy705;
- if(yych <= '9') goto yy194;
+ if (yych <= 'Z') {
+ if (yych <= '>') {
+ if (yych <= '/') goto yy705;
+ if (yych <= '9') goto yy194;
         } else {
- if(yych <= '?') goto yy197;
- if(yych >= 'A') goto yy194;
+ if (yych <= '?') goto yy197;
+ if (yych >= 'A') goto yy194;
         }
     } else {
- if(yych <= '^') {
- if(yych == '\\') goto yy196;
+ if (yych <= '^') {
+ if (yych == '\\') goto yy196;
         } else {
- if(yych <= '_') goto yy706;
- if(yych <= '`') goto yy705;
- if(yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy706;
+ if (yych <= '`') goto yy705;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy705:
@@ -5093,17 +5093,17 @@
 yy706:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'q') goto yy195;
+ if (yych != 'q') goto yy195;
     yyaccept = 61;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy709:
 #line 207 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ORASSIGN_ALT); }
@@ -5111,26 +5111,26 @@
 yy710:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'o') goto yy195;
+ if (yych != 'o') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 62;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy716:
 #line 81 "strict_cpp.re"
     { BOOST_WAVE_RET(T_OPERATOR); }
@@ -5138,34 +5138,34 @@
 yy717:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'm') goto yy728;
+ if (yych == 'm') goto yy728;
     goto yy195;
 yy718:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'w') goto yy726;
+ if (yych == 'w') goto yy726;
     goto yy195;
 yy719:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 63;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'Z') {
- if(yych <= '>') {
- if(yych <= '/') goto yy721;
- if(yych <= '9') goto yy194;
+ if (yych <= 'Z') {
+ if (yych <= '>') {
+ if (yych <= '/') goto yy721;
+ if (yych <= '9') goto yy194;
         } else {
- if(yych <= '?') goto yy197;
- if(yych >= 'A') goto yy194;
+ if (yych <= '?') goto yy197;
+ if (yych >= 'A') goto yy194;
         }
     } else {
- if(yych <= '^') {
- if(yych == '\\') goto yy196;
+ if (yych <= '^') {
+ if (yych == '\\') goto yy196;
         } else {
- if(yych <= '_') goto yy722;
- if(yych <= '`') goto yy721;
- if(yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy722;
+ if (yych <= '`') goto yy721;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy721:
@@ -5175,17 +5175,17 @@
 yy722:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'q') goto yy195;
+ if (yych != 'q') goto yy195;
     yyaccept = 64;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy725:
 #line 215 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_NOTEQUAL_ALT); }
@@ -5193,11 +5193,11 @@
 yy726:
     yyaccept = 65;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy727:
 #line 80 "strict_cpp.re"
     { BOOST_WAVE_RET(T_NEW); }
@@ -5205,29 +5205,29 @@
 yy728:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 66;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy735:
 #line 79 "strict_cpp.re"
     { BOOST_WAVE_RET(T_NAMESPACE); }
@@ -5235,26 +5235,26 @@
 yy736:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'b') goto yy195;
+ if (yych != 'b') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 67;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy742:
 #line 78 "strict_cpp.re"
     { BOOST_WAVE_RET(T_MUTABLE); }
@@ -5262,17 +5262,17 @@
 yy743:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'g') goto yy195;
+ if (yych != 'g') goto yy195;
     yyaccept = 68;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy746:
 #line 77 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LONG); }
@@ -5280,11 +5280,11 @@
 yy747:
     yyaccept = 69;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy748:
 #line 73 "strict_cpp.re"
     { BOOST_WAVE_RET(T_IF); }
@@ -5292,27 +5292,27 @@
 yy749:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'p') goto yy758;
+ if (yych == 'p') goto yy758;
     goto yy195;
 yy750:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'l') goto yy751;
- if(yych == 't') goto yy752;
+ if (yych == 'l') goto yy751;
+ if (yych == 't') goto yy752;
     goto yy195;
 yy751:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy754;
+ if (yych == 'i') goto yy754;
     goto yy195;
 yy752:
     yyaccept = 70;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy753:
 #line 76 "strict_cpp.re"
     { BOOST_WAVE_RET(T_INT); }
@@ -5320,17 +5320,17 @@
 yy754:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 71;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy757:
 #line 75 "strict_cpp.re"
     { BOOST_WAVE_RET(T_INLINE); }
@@ -5338,20 +5338,20 @@
 yy758:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'o') goto yy195;
+ if (yych != 'o') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 72;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy762:
 #line 74 "strict_cpp.re"
     { BOOST_WAVE_RET(s->enable_import_keyword ? T_IMPORT : T_IDENTIFIER); }
@@ -5359,17 +5359,17 @@
 yy763:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'o') goto yy195;
+ if (yych != 'o') goto yy195;
     yyaccept = 73;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy766:
 #line 72 "strict_cpp.re"
     { BOOST_WAVE_RET(T_GOTO); }
@@ -5377,38 +5377,38 @@
 yy767:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'l') goto yy782;
+ if (yych == 'l') goto yy782;
     goto yy195;
 yy768:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy778;
+ if (yych == 'o') goto yy778;
     goto yy195;
 yy769:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'r') goto yy776;
+ if (yych == 'r') goto yy776;
     goto yy195;
 yy770:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 74;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy775:
 #line 71 "strict_cpp.re"
     { BOOST_WAVE_RET(T_FRIEND); }
@@ -5416,11 +5416,11 @@
 yy776:
     yyaccept = 75;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy777:
 #line 70 "strict_cpp.re"
     { BOOST_WAVE_RET(T_FOR); }
@@ -5428,17 +5428,17 @@
 yy778:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 76;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy781:
 #line 69 "strict_cpp.re"
     { BOOST_WAVE_RET(T_FLOAT); }
@@ -5446,17 +5446,17 @@
 yy782:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 77;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy785:
 #line 68 "strict_cpp.re"
     { BOOST_WAVE_RET(T_FALSE); }
@@ -5464,42 +5464,42 @@
 yy786:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 's') goto yy808;
+ if (yych == 's') goto yy808;
     goto yy195;
 yy787:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'u') goto yy805;
+ if (yych == 'u') goto yy805;
     goto yy195;
 yy788:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'p') goto yy789;
- if(yych == 't') goto yy790;
+ if (yych == 'p') goto yy789;
+ if (yych == 't') goto yy790;
     goto yy195;
 yy789:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'l') goto yy795;
- if(yych == 'o') goto yy796;
+ if (yych == 'l') goto yy795;
+ if (yych == 'o') goto yy796;
     goto yy195;
 yy790:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 78;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy794:
 #line 67 "strict_cpp.re"
     { BOOST_WAVE_RET(T_EXTERN); }
@@ -5507,22 +5507,22 @@
 yy795:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'i') goto yy800;
+ if (yych == 'i') goto yy800;
     goto yy195;
 yy796:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 79;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy799:
 #line 66 "strict_cpp.re"
     { BOOST_WAVE_RET(T_EXPORT); }
@@ -5530,20 +5530,20 @@
 yy800:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 80;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy804:
 #line 65 "strict_cpp.re"
     { BOOST_WAVE_RET(T_EXPLICIT); }
@@ -5551,14 +5551,14 @@
 yy805:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'm') goto yy195;
+ if (yych != 'm') goto yy195;
     yyaccept = 81;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy807:
 #line 64 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ENUM); }
@@ -5566,14 +5566,14 @@
 yy808:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 82;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy810:
 #line 63 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ELSE); }
@@ -5581,28 +5581,28 @@
 yy811:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'f') goto yy831;
- if(yych == 'l') goto yy832;
+ if (yych == 'f') goto yy831;
+ if (yych == 'l') goto yy832;
     goto yy195;
 yy812:
     yyaccept = 83;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= '[') {
- if(yych <= '>') {
- if(yych <= '/') goto yy813;
- if(yych <= '9') goto yy194;
- } else {
- if(yych <= '?') goto yy197;
- if(yych <= '@') goto yy813;
- if(yych <= 'Z') goto yy194;
- }
- } else {
- if(yych <= '`') {
- if(yych <= '\\') goto yy196;
- if(yych == '_') goto yy194;
+ if (yych <= '[') {
+ if (yych <= '>') {
+ if (yych <= '/') goto yy813;
+ if (yych <= '9') goto yy194;
+ } else {
+ if (yych <= '?') goto yy197;
+ if (yych <= '@') goto yy813;
+ if (yych <= 'Z') goto yy194;
+ }
+ } else {
+ if (yych <= '`') {
+ if (yych <= '\\') goto yy196;
+ if (yych == '_') goto yy194;
         } else {
- if(yych == 'u') goto yy826;
- if(yych <= 'z') goto yy194;
+ if (yych == 'u') goto yy826;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy813:
@@ -5612,41 +5612,41 @@
 yy814:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'm') goto yy195;
+ if (yych != 'm') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != '_') goto yy195;
+ if (yych != '_') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 84;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy825:
 #line 62 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DYNAMICCAST); }
@@ -5654,20 +5654,20 @@
 yy826:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'b') goto yy195;
+ if (yych != 'b') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 85;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy830:
 #line 61 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DOUBLE); }
@@ -5675,25 +5675,25 @@
 yy831:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy837;
+ if (yych == 'a') goto yy837;
     goto yy195;
 yy832:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 86;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy836:
 #line 59 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DELETE); }
@@ -5701,20 +5701,20 @@
 yy837:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'u') goto yy195;
+ if (yych != 'u') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 87;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy841:
 #line 58 "strict_cpp.re"
     { BOOST_WAVE_RET(T_DEFAULT); }
@@ -5722,46 +5722,46 @@
 yy842:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'r') goto yy195;
- if(yych <= 's') goto yy873;
- if(yych <= 't') goto yy874;
+ if (yych <= 'r') goto yy195;
+ if (yych <= 's') goto yy873;
+ if (yych <= 't') goto yy874;
     goto yy195;
 yy843:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy870;
+ if (yych == 'a') goto yy870;
     goto yy195;
 yy844:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy866;
+ if (yych == 'a') goto yy866;
     goto yy195;
 yy845:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'l') goto yy195;
- if(yych <= 'm') goto yy847;
- if(yych >= 'o') goto yy195;
+ if (yych <= 'l') goto yy195;
+ if (yych <= 'm') goto yy847;
+ if (yych >= 'o') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'r') goto yy195;
- if(yych <= 's') goto yy851;
- if(yych <= 't') goto yy852;
+ if (yych <= 'r') goto yy195;
+ if (yych <= 's') goto yy851;
+ if (yych <= 't') goto yy852;
     goto yy195;
 yy847:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'p') goto yy195;
+ if (yych != 'p') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 88;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy850:
 #line 190 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_COMPL_ALT); }
@@ -5769,28 +5769,28 @@
 yy851:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 't') goto yy858;
+ if (yych == 't') goto yy858;
     goto yy195;
 yy852:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'i') goto yy195;
+ if (yych != 'i') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'n') goto yy195;
+ if (yych != 'n') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'u') goto yy195;
+ if (yych != 'u') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 89;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy857:
 #line 57 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CONTINUE); }
@@ -5798,21 +5798,21 @@
 yy858:
     yyaccept = 90;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'Z') {
- if(yych <= '>') {
- if(yych <= '/') goto yy859;
- if(yych <= '9') goto yy194;
+ if (yych <= 'Z') {
+ if (yych <= '>') {
+ if (yych <= '/') goto yy859;
+ if (yych <= '9') goto yy194;
         } else {
- if(yych <= '?') goto yy197;
- if(yych >= 'A') goto yy194;
+ if (yych <= '?') goto yy197;
+ if (yych >= 'A') goto yy194;
         }
     } else {
- if(yych <= '^') {
- if(yych == '\\') goto yy196;
+ if (yych <= '^') {
+ if (yych == '\\') goto yy196;
         } else {
- if(yych <= '_') goto yy860;
- if(yych <= '`') goto yy859;
- if(yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy860;
+ if (yych <= '`') goto yy859;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy859:
@@ -5822,23 +5822,23 @@
 yy860:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 91;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy865:
 #line 56 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CONSTCAST); }
@@ -5846,17 +5846,17 @@
 yy866:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 's') goto yy195;
+ if (yych != 's') goto yy195;
     yyaccept = 92;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy869:
 #line 54 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CLASS); }
@@ -5864,14 +5864,14 @@
 yy870:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 93;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy872:
 #line 53 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CHAR); }
@@ -5879,22 +5879,22 @@
 yy873:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'e') goto yy878;
+ if (yych == 'e') goto yy878;
     goto yy195;
 yy874:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'c') goto yy195;
+ if (yych != 'c') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'h') goto yy195;
+ if (yych != 'h') goto yy195;
     yyaccept = 94;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy877:
 #line 52 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CATCH); }
@@ -5902,11 +5902,11 @@
 yy878:
     yyaccept = 95;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy879:
 #line 51 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CASE); }
@@ -5914,30 +5914,30 @@
 yy880:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 't') goto yy890;
+ if (yych == 't') goto yy890;
     goto yy195;
 yy881:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'o') goto yy887;
+ if (yych == 'o') goto yy887;
     goto yy195;
 yy882:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'a') goto yy195;
+ if (yych != 'a') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'k') goto yy195;
+ if (yych != 'k') goto yy195;
     yyaccept = 96;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy886:
 #line 50 "strict_cpp.re"
     { BOOST_WAVE_RET(T_BREAK); }
@@ -5945,14 +5945,14 @@
 yy887:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'l') goto yy195;
+ if (yych != 'l') goto yy195;
     yyaccept = 97;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy889:
 #line 49 "strict_cpp.re"
     { BOOST_WAVE_RET(T_BOOL); }
@@ -5960,25 +5960,25 @@
 yy890:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'a') goto yy891;
- if(yych == 'o') goto yy892;
+ if (yych == 'a') goto yy891;
+ if (yych == 'o') goto yy892;
     goto yy195;
 yy891:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'n') goto yy895;
+ if (yych == 'n') goto yy895;
     goto yy195;
 yy892:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'r') goto yy195;
+ if (yych != 'r') goto yy195;
     yyaccept = 98;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy894:
 #line 186 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_OR_ALT); }
@@ -5986,14 +5986,14 @@
 yy895:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'd') goto yy195;
+ if (yych != 'd') goto yy195;
     yyaccept = 99;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy897:
 #line 184 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_AND_ALT); }
@@ -6001,27 +6001,27 @@
 yy898:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'd') goto yy906;
+ if (yych == 'd') goto yy906;
     goto yy195;
 yy899:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych == 'm') goto yy904;
+ if (yych == 'm') goto yy904;
     goto yy195;
 yy900:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 't') goto yy195;
+ if (yych != 't') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'o') goto yy195;
+ if (yych != 'o') goto yy195;
     yyaccept = 100;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy903:
 #line 48 "strict_cpp.re"
     { BOOST_WAVE_RET(T_AUTO); }
@@ -6029,11 +6029,11 @@
 yy904:
     yyaccept = 101;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy905:
 #line 47 "strict_cpp.re"
     { BOOST_WAVE_RET(T_ASM); }
@@ -6041,21 +6041,21 @@
 yy906:
     yyaccept = 102;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych <= 'Z') {
- if(yych <= '>') {
- if(yych <= '/') goto yy907;
- if(yych <= '9') goto yy194;
+ if (yych <= 'Z') {
+ if (yych <= '>') {
+ if (yych <= '/') goto yy907;
+ if (yych <= '9') goto yy194;
         } else {
- if(yych <= '?') goto yy197;
- if(yych >= 'A') goto yy194;
+ if (yych <= '?') goto yy197;
+ if (yych >= 'A') goto yy194;
         }
     } else {
- if(yych <= '^') {
- if(yych == '\\') goto yy196;
+ if (yych <= '^') {
+ if (yych == '\\') goto yy196;
         } else {
- if(yych <= '_') goto yy908;
- if(yych <= '`') goto yy907;
- if(yych <= 'z') goto yy194;
+ if (yych <= '_') goto yy908;
+ if (yych <= '`') goto yy907;
+ if (yych <= 'z') goto yy194;
         }
     }
 yy907:
@@ -6065,17 +6065,17 @@
 yy908:
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'e') goto yy195;
+ if (yych != 'e') goto yy195;
     yyaccept = 1;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yych != 'q') goto yy195;
+ if (yych != 'q') goto yy195;
     yyaccept = 103;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 4) {
+ if (yybm[0+yych] & 4) {
         goto yy194;
     }
- if(yych == '?') goto yy197;
- if(yych == '\\') goto yy196;
+ if (yych == '?') goto yy197;
+ if (yych == '\\') goto yy196;
 yy911:
 #line 205 "strict_cpp.re"
     { BOOST_WAVE_RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ANDASSIGN_ALT); }
@@ -6095,7 +6095,7 @@
 #line 6096 "strict_cpp_re.inc"
 yy914:
     yych = *++YYCURSOR;
- if(yych == '.') goto yy916;
+ if (yych == '.') goto yy916;
     goto yy98;
 yy915:
     yych = *++YYCURSOR;
@@ -6129,26 +6129,26 @@
 #line 6130 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if(yych <= 0x0C) {
- if(yych <= 0x08) {
- if(yych <= 0x00) goto yy933;
+ if (yych <= 0x0C) {
+ if (yych <= 0x08) {
+ if (yych <= 0x00) goto yy933;
             goto yy935;
         } else {
- if(yych == 0x0A) goto yy928;
+ if (yych == 0x0A) goto yy928;
             goto yy931;
         }
     } else {
- if(yych <= 0x1F) {
- if(yych <= 0x0D) goto yy930;
+ if (yych <= 0x1F) {
+ if (yych <= 0x0D) goto yy930;
             goto yy935;
         } else {
- if(yych != '*') goto yy932;
+ if (yych != '*') goto yy932;
         }
     }
     ++YYCURSOR;
- if((yych = *YYCURSOR) == '/') goto yy938;
+ if ((yych = *YYCURSOR) == '/') goto yy938;
 yy927:
 #line 323 "strict_cpp.re"
     { goto ccomment; }
@@ -6167,7 +6167,7 @@
 #line 6168 "strict_cpp_re.inc"
 yy930:
     yych = *++YYCURSOR;
- if(yych == 0x0A) goto yy937;
+ if (yych == 0x0A) goto yy937;
     goto yy929;
 yy931:
     yych = *++YYCURSOR;
@@ -6221,16 +6221,16 @@
 #line 6222 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if(yych <= 0x0A) {
- if(yych <= 0x00) goto yy948;
- if(yych <= 0x08) goto yy950;
- if(yych <= 0x09) goto yy945;
- } else {
- if(yych <= 0x0C) goto yy945;
- if(yych <= 0x0D) goto yy944;
- if(yych <= 0x1F) goto yy950;
+ if (yych <= 0x0A) {
+ if (yych <= 0x00) goto yy948;
+ if (yych <= 0x08) goto yy950;
+ if (yych <= 0x09) goto yy945;
+ } else {
+ if (yych <= 0x0C) goto yy945;
+ if (yych <= 0x0D) goto yy944;
+ if (yych <= 0x1F) goto yy950;
         goto yy947;
     }
     ++YYCURSOR;
@@ -6246,7 +6246,7 @@
 #line 6247 "strict_cpp_re.inc"
 yy944:
     yych = *++YYCURSOR;
- if(yych == 0x0A) goto yy952;
+ if (yych == 0x0A) goto yy952;
     goto yy943;
 yy945:
     ++YYCURSOR;
@@ -6343,33 +6343,33 @@
           0, 0, 0, 0, 0, 0, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0,
     };
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if(yych == '.') goto yy956;
- if(yych <= '/') goto yy955;
- if(yych <= '9') goto yy957;
+ if (yych == '.') goto yy956;
+ if (yych <= '/') goto yy955;
+ if (yych <= '9') goto yy957;
 yy955:
     YYCURSOR = YYMARKER;
     goto yy959;
 yy956:
     yych = *++YYCURSOR;
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
 yy957:
     YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 64) {
+ if (yybm[0+yych] & 64) {
         goto yy957;
     }
- if(yych <= 'Z') {
- if(yych == '?') goto yy963;
- if(yych >= 'A') goto yy960;
+ if (yych <= 'Z') {
+ if (yych == '?') goto yy963;
+ if (yych >= 'A') goto yy960;
     } else {
- if(yych <= '\\') {
- if(yych >= '\\') goto yy962;
+ if (yych <= '\\') {
+ if (yych >= '\\') goto yy962;
         } else {
- if(yych == 'e') goto yy960;
+ if (yych == 'e') goto yy960;
         }
     }
 yy959:
@@ -6378,203 +6378,203 @@
 #line 6379 "strict_cpp_re.inc"
 yy960:
     YYMARKER = ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 128) {
+ if (yybm[0+yych] & 128) {
         goto yy960;
     }
- if(yych <= '?') {
- if(yych <= '.') {
- if(yych == '+') goto yy957;
- if(yych <= ',') goto yy959;
+ 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;
+ if (yych <= '/') goto yy959;
+ if (yych <= '9') goto yy957;
+ if (yych <= '>') goto yy959;
             goto yy963;
         }
     } else {
- if(yych <= '\\') {
- if(yych <= '@') goto yy959;
- if(yych <= 'Z') goto yy957;
- if(yych <= '[') goto yy959;
+ if (yych <= '\\') {
+ if (yych <= '@') goto yy959;
+ if (yych <= 'Z') goto yy957;
+ if (yych <= '[') goto yy959;
         } else {
- if(yych <= '_') {
- if(yych <= '^') goto yy959;
+ if (yych <= '_') {
+ if (yych <= '^') goto yy959;
                 goto yy957;
             } else {
- if(yych <= '`') goto yy959;
- if(yych <= 'z') goto yy957;
+ if (yych <= '`') goto yy959;
+ if (yych <= 'z') goto yy957;
                 goto yy959;
             }
         }
     }
 yy962:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych == 'U') goto yy966;
- if(yych == 'u') goto yy965;
+ if (yych == 'U') goto yy966;
+ if (yych == 'u') goto yy965;
     goto yy955;
 yy963:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych != '?') goto yy955;
+ if (yych != '?') goto yy955;
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych == '/') goto yy962;
+ if (yych == '/') goto yy962;
     goto yy955;
 yy965:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych <= '9') goto yy974;
+ 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;
+ if (yych <= 'F') goto yy974;
+ if (yych <= '`') goto yy955;
+ if (yych <= 'f') goto yy974;
         goto yy955;
     }
 yy966:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy967;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy967;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy967:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy968;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy968;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy968:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy969;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy969;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy969:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy970;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy970;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy970:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy971;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy971;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy971:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy972;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy972;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy972:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy973;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy973;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy973:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych <= '9') goto yy957;
+ 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;
+ if (yych <= 'F') goto yy957;
+ if (yych <= '`') goto yy955;
+ if (yych <= 'f') goto yy957;
         goto yy955;
     }
 yy974:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy975;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy975;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy975:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych >= ':') goto yy955;
- } else {
- if(yych <= 'F') goto yy976;
- if(yych <= '`') goto yy955;
- if(yych >= 'g') goto yy955;
+ if (yych <= '@') {
+ if (yych <= '/') goto yy955;
+ if (yych >= ':') goto yy955;
+ } else {
+ if (yych <= 'F') goto yy976;
+ if (yych <= '`') goto yy955;
+ if (yych >= 'g') goto yy955;
     }
 yy976:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yych <= '@') {
- if(yych <= '/') goto yy955;
- if(yych <= '9') goto yy957;
+ 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;
+ if (yych <= 'F') goto yy957;
+ if (yych <= '`') goto yy955;
+ if (yych <= 'f') goto yy957;
         goto yy955;
     }
 }
@@ -6621,17 +6621,17 @@
           0, 0, 0, 0, 0, 0, 0, 0,
           0, 0, 0, 0, 0, 0, 0, 0,
     };
- if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
+ if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
     yych = *YYCURSOR;
- if(yych <= '/') {
- if(yych == '.') goto yy984;
+ if (yych <= '/') {
+ if (yych == '.') goto yy984;
     } else {
- if(yych <= '0') goto yy980;
- if(yych <= '9') goto yy982;
+ if (yych <= '0') goto yy980;
+ if (yych <= '9') goto yy982;
     }
 yy979:
     YYCURSOR = YYMARKER;
- if(yyaccept <= 0) {
+ if (yyaccept <= 0) {
         goto yy981;
     } else {
         goto yy987;
@@ -6639,22 +6639,22 @@
 yy980:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
- if(yybm[0+yych] & 64) {
+ if (yybm[0+yych] & 64) {
         goto yy999;
     }
- if(yych <= 'E') {
- if(yych <= '/') {
- if(yych == '.') goto yy985;
+ if (yych <= 'E') {
+ if (yych <= '/') {
+ if (yych == '.') goto yy985;
         } else {
- if(yych <= '9') goto yy1002;
- if(yych >= 'E') goto yy995;
+ if (yych <= '9') goto yy1002;
+ if (yych >= 'E') goto yy995;
         }
     } else {
- if(yych <= 'd') {
- if(yych == 'X') goto yy1001;
+ if (yych <= 'd') {
+ if (yych == 'X') goto yy1001;
         } else {
- if(yych <= 'e') goto yy995;
- if(yych == 'x') goto yy1001;
+ if (yych <= 'e') goto yy995;
+ if (yych == 'x') goto yy1001;
         }
     }
 yy981:
@@ -6664,43 +6664,43 @@
 yy982:
     yyaccept = 0;
     YYMARKER = ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 32) {
+ if (yybm[0+yych] & 32) {
         goto yy982;
     }
- if(yych <= 'D') {
- if(yych == '.') goto yy985;
+ if (yych <= 'D') {
+ if (yych == '.') goto yy985;
         goto yy981;
     } else {
- if(yych <= 'E') goto yy995;
- if(yych == 'e') goto yy995;
+ if (yych <= 'E') goto yy995;
+ if (yych == 'e') goto yy995;
         goto yy981;
     }
 yy984:
     yych = *++YYCURSOR;
- if(yych <= '/') goto yy979;
- if(yych >= ':') goto yy979;
+ if (yych <= '/') goto yy979;
+ if (yych >= ':') goto yy979;
 yy985:
     yyaccept = 1;
     YYMARKER = ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ 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 <= 'K') {
+ if (yych <= 'D') {
+ if (yych <= '/') goto yy987;
+ if (yych <= '9') goto yy985;
         } else {
- if(yych <= 'E') goto yy988;
- if(yych <= 'F') goto yy989;
+ if (yych <= 'E') goto yy988;
+ if (yych <= 'F') goto yy989;
         }
     } else {
- if(yych <= 'e') {
- if(yych <= 'L') goto yy990;
- if(yych >= 'e') goto yy988;
+ if (yych <= 'e') {
+ if (yych <= 'L') goto yy990;
+ if (yych >= 'e') goto yy988;
         } else {
- if(yych <= 'f') goto yy989;
- if(yych == 'l') goto yy990;
+ if (yych <= 'f') goto yy989;
+ if (yych == 'l') goto yy990;
         }
     }
 yy987:
@@ -6709,138 +6709,138 @@
 #line 6710 "strict_cpp_re.inc"
 yy988:
     yych = *++YYCURSOR;
- if(yych <= ',') {
- if(yych == '+') goto yy992;
+ if (yych <= ',') {
+ if (yych == '+') goto yy992;
         goto yy979;
     } else {
- if(yych <= '-') goto yy992;
- if(yych <= '/') goto yy979;
- if(yych <= '9') goto yy993;
+ 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;
+ 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;
+ 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;
+ if (yych <= '/') goto yy979;
+ if (yych >= ':') goto yy979;
 yy993:
     ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if(yych <= 'K') {
- if(yych <= '9') {
- if(yych <= '/') goto yy987;
+ if (yych <= 'K') {
+ if (yych <= '9') {
+ if (yych <= '/') goto yy987;
             goto yy993;
         } else {
- if(yych == 'F') goto yy989;
+ if (yych == 'F') goto yy989;
             goto yy987;
         }
     } else {
- if(yych <= 'f') {
- if(yych <= 'L') goto yy990;
- if(yych <= 'e') goto yy987;
+ if (yych <= 'f') {
+ if (yych <= 'L') goto yy990;
+ if (yych <= 'e') goto yy987;
             goto yy989;
         } else {
- if(yych == 'l') goto yy990;
+ if (yych == 'l') goto yy990;
             goto yy987;
         }
     }
 yy995:
     yych = *++YYCURSOR;
- if(yych <= ',') {
- if(yych != '+') goto yy979;
+ if (yych <= ',') {
+ if (yych != '+') goto yy979;
     } else {
- if(yych <= '-') goto yy996;
- if(yych <= '/') goto yy979;
- if(yych <= '9') goto yy997;
+ 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;
+ if (yych <= '/') goto yy979;
+ if (yych >= ':') goto yy979;
 yy997:
     ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+ if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if(yych <= 'K') {
- if(yych <= '9') {
- if(yych <= '/') goto yy987;
+ if (yych <= 'K') {
+ if (yych <= '9') {
+ if (yych <= '/') goto yy987;
             goto yy997;
         } else {
- if(yych == 'F') goto yy989;
+ if (yych == 'F') goto yy989;
             goto yy987;
         }
     } else {
- if(yych <= 'f') {
- if(yych <= 'L') goto yy990;
- if(yych <= 'e') goto yy987;
+ if (yych <= 'f') {
+ if (yych <= 'L') goto yy990;
+ if (yych <= 'e') goto yy987;
             goto yy989;
         } else {
- if(yych == 'l') goto yy990;
+ if (yych == 'l') goto yy990;
             goto yy987;
         }
     }
 yy999:
     yyaccept = 0;
     YYMARKER = ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 64) {
+ if (yybm[0+yych] & 64) {
         goto yy999;
     }
- if(yych <= '9') {
- if(yych == '.') goto yy985;
- if(yych <= '/') goto yy981;
+ if (yych <= '9') {
+ if (yych == '.') goto yy985;
+ if (yych <= '/') goto yy981;
         goto yy1002;
     } else {
- if(yych <= 'E') {
- if(yych <= 'D') goto yy981;
+ if (yych <= 'E') {
+ if (yych <= 'D') goto yy981;
             goto yy995;
         } else {
- if(yych == 'e') goto yy995;
+ if (yych == 'e') goto yy995;
             goto yy981;
         }
     }
 yy1001:
     yych = *++YYCURSOR;
- if(yybm[0+yych] & 128) {
+ if (yybm[0+yych] & 128) {
         goto yy1004;
     }
     goto yy979;
 yy1002:
     ++YYCURSOR;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
- if(yych <= '9') {
- if(yych == '.') goto yy985;
- if(yych <= '/') goto yy979;
+ if (yych <= '9') {
+ if (yych == '.') goto yy985;
+ if (yych <= '/') goto yy979;
         goto yy1002;
     } else {
- if(yych <= 'E') {
- if(yych <= 'D') goto yy979;
+ if (yych <= 'E') {
+ if (yych <= 'D') goto yy979;
             goto yy995;
         } else {
- if(yych == 'e') goto yy995;
+ if (yych == 'e') goto yy995;
             goto yy979;
         }
     }
 yy1004:
     ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
+ if (YYLIMIT == YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if(yybm[0+yych] & 128) {
+ if (yybm[0+yych] & 128) {
         goto yy1004;
     }
     goto yy981;
@@ -6858,20 +6858,20 @@
 #line 6859 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *(YYMARKER = YYCURSOR);
- if(yych <= 'h') {
- if(yych <= 'L') {
- if(yych >= 'L') goto yy1010;
+ if (yych <= 'h') {
+ if (yych <= 'L') {
+ if (yych >= 'L') goto yy1010;
         } else {
- if(yych == 'U') goto yy1009;
+ if (yych == 'U') goto yy1009;
         }
     } else {
- if(yych <= 'l') {
- if(yych <= 'i') goto yy1011;
- if(yych >= 'l') goto yy1010;
+ if (yych <= 'l') {
+ if (yych <= 'i') goto yy1011;
+ if (yych >= 'l') goto yy1010;
         } else {
- if(yych == 'u') goto yy1009;
+ if (yych == 'u') goto yy1009;
         }
     }
 yy1008:
@@ -6880,33 +6880,33 @@
 #line 6881 "strict_cpp_re.inc"
 yy1009:
     yych = *++YYCURSOR;
- if(yych == 'L') goto yy1018;
- if(yych == 'l') goto yy1018;
+ if (yych == 'L') goto yy1018;
+ if (yych == 'l') goto yy1018;
     goto yy1008;
 yy1010:
     yych = *++YYCURSOR;
- if(yych <= 'U') {
- if(yych == 'L') goto yy1017;
- if(yych <= 'T') goto yy1008;
+ if (yych <= 'U') {
+ if (yych == 'L') goto yy1017;
+ if (yych <= 'T') goto yy1008;
         goto yy1016;
     } else {
- if(yych <= 'l') {
- if(yych <= 'k') goto yy1008;
+ if (yych <= 'l') {
+ if (yych <= 'k') goto yy1008;
             goto yy1017;
         } else {
- if(yych == 'u') goto yy1016;
+ if (yych == 'u') goto yy1016;
             goto yy1008;
         }
     }
 yy1011:
     yych = *++YYCURSOR;
- if(yych == '6') goto yy1013;
+ if (yych == '6') goto yy1013;
 yy1012:
     YYCURSOR = YYMARKER;
     goto yy1008;
 yy1013:
     yych = *++YYCURSOR;
- if(yych != '4') goto yy1012;
+ if (yych != '4') goto yy1012;
 yy1014:
     ++YYCURSOR;
 yy1015:
@@ -6918,13 +6918,13 @@
     goto yy1008;
 yy1017:
     yych = *++YYCURSOR;
- if(yych == 'U') goto yy1014;
- if(yych == 'u') goto yy1014;
+ 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;
+ if ((yych = *YYCURSOR) == 'L') goto yy1014;
+ if (yych == 'l') goto yy1014;
     goto yy1008;
 }
 #line 426 "strict_cpp.re"
@@ -6935,16 +6935,16 @@
 #line 6936 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
- if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
- if(yych <= 'U') {
- if(yych == 'L') goto yy1023;
- if(yych >= 'U') goto yy1022;
+ if (yych <= 'U') {
+ if (yych == 'L') goto yy1023;
+ if (yych >= 'U') goto yy1022;
     } else {
- if(yych <= 'l') {
- if(yych >= 'l') goto yy1023;
+ if (yych <= 'l') {
+ if (yych >= 'l') goto yy1023;
         } else {
- if(yych == 'u') goto yy1022;
+ if (yych == 'u') goto yy1022;
         }
     }
 yy1021:
@@ -6953,28 +6953,28 @@
 #line 6954 "strict_cpp_re.inc"
 yy1022:
     yych = *++YYCURSOR;
- if(yych == 'L') goto yy1028;
- if(yych == 'l') goto yy1028;
+ if (yych == 'L') goto yy1028;
+ if (yych == 'l') goto yy1028;
     goto yy1021;
 yy1023:
     yych = *++YYCURSOR;
- if(yych <= 'U') {
- if(yych == 'L') goto yy1025;
- if(yych <= 'T') goto yy1021;
+ if (yych <= 'U') {
+ if (yych == 'L') goto yy1025;
+ if (yych <= 'T') goto yy1021;
     } else {
- if(yych <= 'l') {
- if(yych <= 'k') goto yy1021;
+ if (yych <= 'l') {
+ if (yych <= 'k') goto yy1021;
             goto yy1025;
         } else {
- if(yych != 'u') goto yy1021;
+ if (yych != 'u') goto yy1021;
         }
     }
     yych = *++YYCURSOR;
     goto yy1021;
 yy1025:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == 'U') goto yy1027;
- if(yych == 'u') goto yy1027;
+ if ((yych = *YYCURSOR) == 'U') goto yy1027;
+ if (yych == 'u') goto yy1027;
 yy1026:
 #line 431 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LONGINTLIT); }
@@ -6984,8 +6984,8 @@
     goto yy1026;
 yy1028:
     ++YYCURSOR;
- if((yych = *YYCURSOR) == 'L') goto yy1027;
- if(yych == 'l') goto yy1027;
+ if ((yych = *YYCURSOR) == 'L') goto yy1027;
+ if (yych == 'l') goto yy1027;
     goto yy1021;
 }
 #line 435 "strict_cpp.re"

Modified: trunk/libs/wave/src/instantiate_cpp_exprgrammar.cpp
==============================================================================
--- trunk/libs/wave/src/instantiate_cpp_exprgrammar.cpp (original)
+++ trunk/libs/wave/src/instantiate_cpp_exprgrammar.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -34,8 +34,10 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+// if you want to use your own token type the following line must be adjusted
 typedef boost::wave::cpplexer::lex_token<> token_type;
 
+// no need to change anything below
 template struct boost::wave::grammars::expression_grammar_gen<token_type>;
 
 // the suffix header occurs after all of the code

Modified: trunk/libs/wave/src/instantiate_cpp_grammar.cpp
==============================================================================
--- trunk/libs/wave/src/instantiate_cpp_grammar.cpp (original)
+++ trunk/libs/wave/src/instantiate_cpp_grammar.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -34,7 +34,10 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+// if you want to use your own token type the following line must be adjusted
 typedef boost::wave::cpplexer::lex_token<> token_type;
+
+// no need to change anything below
 typedef boost::wave::cpplexer::lex_iterator<token_type> lexer_type;
 typedef std::list<token_type, boost::fast_pool_allocator<token_type> >
     token_sequence_type;

Modified: trunk/libs/wave/src/instantiate_cpp_literalgrs.cpp
==============================================================================
--- trunk/libs/wave/src/instantiate_cpp_literalgrs.cpp (original)
+++ trunk/libs/wave/src/instantiate_cpp_literalgrs.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -36,6 +36,7 @@
 
 typedef boost::wave::cpplexer::lex_token<> token_type;
 
+// no need to change anything below
 template struct boost::wave::grammars::intlit_grammar_gen<token_type>;
 template struct boost::wave::grammars::chlit_grammar_gen<token_type>;
 

Modified: trunk/libs/wave/src/instantiate_defined_grammar.cpp
==============================================================================
--- trunk/libs/wave/src/instantiate_defined_grammar.cpp (original)
+++ trunk/libs/wave/src/instantiate_defined_grammar.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -33,9 +33,11 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-typedef boost::wave::cpplexer::lex_iterator<
- boost::wave::cpplexer::lex_token<> >
- lexer_type;
+// if you want to use your own token type the following line must be adjusted
+typedef boost::wave::cpplexer::lex_token<> token_type;
+
+// no need to change anything below
+typedef boost::wave::cpplexer::lex_iterator<token_type> lexer_type;
 template struct boost::wave::grammars::defined_grammar_gen<lexer_type>;
 
 // the suffix header occurs after all of the code

Modified: trunk/libs/wave/src/instantiate_predef_macros.cpp
==============================================================================
--- trunk/libs/wave/src/instantiate_predef_macros.cpp (original)
+++ trunk/libs/wave/src/instantiate_predef_macros.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -33,9 +33,11 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-typedef boost::wave::cpplexer::lex_iterator<
- boost::wave::cpplexer::lex_token<> >
- lexer_type;
+// if you want to use your own token type the following line must be adjusted
+typedef boost::wave::cpplexer::lex_token<> token_type;
+
+// no need to change anything below
+typedef boost::wave::cpplexer::lex_iterator<token_type> lexer_type;
 template struct boost::wave::grammars::predefined_macros_grammar_gen<lexer_type>;
 
 // the suffix header occurs after all of the code

Modified: trunk/libs/wave/src/instantiate_re2c_lexer.cpp
==============================================================================
--- trunk/libs/wave/src/instantiate_re2c_lexer.cpp (original)
+++ trunk/libs/wave/src/instantiate_re2c_lexer.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -47,6 +47,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
+// if you want to use another iterator type for the underlying input stream
+// a corresponding explicit template instantiation needs to be added below
 template struct boost::wave::cpplexer::new_lexer_gen<
     BOOST_WAVE_STRINGTYPE::iterator>;
 template struct boost::wave::cpplexer::new_lexer_gen<

Modified: trunk/libs/wave/test/testwave/testfiles/t_6_023.cpp
==============================================================================
--- trunk/libs/wave/test/testwave/testfiles/t_6_023.cpp (original)
+++ trunk/libs/wave/test/testwave/testfiles/t_6_023.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -16,7 +16,7 @@
 // Tests error reporting: Trailing junk of #else, #endif.
 
 // 16.1: Trailing junk of #else.
-//E t_6_023.cpp(22): error: ill formed preprocessor directive: #else
+//E t_6_023.cpp(22): error: ill formed preprocessor directive: #else MACRO_0
 #define MACRO_0 0
 #if MACRO_0
 #else MACRO_0

Modified: trunk/libs/wave/test/testwave/testwave_app.cpp
==============================================================================
--- trunk/libs/wave/test/testwave/testwave_app.cpp (original)
+++ trunk/libs/wave/test/testwave/testwave_app.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -124,7 +124,7 @@
 // $E: to the result of preprocessing the given expression
 // $F: to the passed full filepath
 // $P: to the full path
-// $B: to the full path (but using forward slahs '/' on Windows)
+// $B: to the full path (same as $P, but using forward slash '/' on Windows)
 // $V: to the current Boost version number
 //
 ///////////////////////////////////////////////////////////////////////////

Modified: trunk/tools/wave/cpp.cpp
==============================================================================
--- trunk/tools/wave/cpp.cpp (original)
+++ trunk/tools/wave/cpp.cpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -76,7 +76,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // Import required names
-using namespace boost::spirit;
+using namespace boost::spirit::classic;
 
 using std::string;
 using std::pair;
@@ -862,7 +862,7 @@
             for (vector<string>::const_iterator cit = undefmacros.begin();
                  cit != end; ++cit)
             {
- ctx.remove_macro_definition((*cit).c_str(), true);
+ ctx.remove_macro_definition(*cit, true);
             }
         }
 
@@ -977,8 +977,15 @@
                 first = ctx.begin(instring.begin(), instring.end());
             }
             
+ bool need_to_advanve = false;
+
             do {
                 try {
+ if (need_to_advanve) {
+ ++first;
+ need_to_advanve = false;
+ }
+
                     while (first != last) {
                     // store the last known good token position
                         current_position = (*first).get_position();
@@ -1006,7 +1013,7 @@
                 // some preprocessing error
                     if (is_interactive || boost::wave::is_recoverable(e)) {
                         error_count += report_error_message(ctx, e);
- ++first; // advance to the next token
+ need_to_advanve = true; // advance to the next token
                     }
                     else {
                         throw; // re-throw for non-recoverable errors
@@ -1018,7 +1025,7 @@
                         boost::wave::cpplexer::is_recoverable(e))
                     {
                         error_count += report_error_message(e);
- ++first; // advance to the next token
+ need_to_advanve = true; // advance to the next token
                     }
                     else {
                         throw; // re-throw for non-recoverable errors

Modified: trunk/tools/wave/cpp_config.hpp
==============================================================================
--- trunk/tools/wave/cpp_config.hpp (original)
+++ trunk/tools/wave/cpp_config.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -20,7 +20,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 // debug rules, subrules and grammars only, for possible flags see
-// spirit/debug.hpp
+// spirit/include/classic_debug.hpp
 #if defined(BOOST_SPIRIT_DEBUG)
 
 #define BOOST_SPIRIT_DEBUG_FLAGS ( \

Modified: trunk/tools/wave/cpp_version.hpp
==============================================================================
--- trunk/tools/wave/cpp_version.hpp (original)
+++ trunk/tools/wave/cpp_version.hpp 2008-04-13 18:39:12 EDT (Sun, 13 Apr 2008)
@@ -19,7 +19,7 @@
 
 #define CPP_VERSION_FULL_STR BOOST_PP_STRINGIZE(CPP_VERSION_FULL)
                                      
-#define CPP_VERSION_DATE 20070111L
-#define CPP_VERSION_DATE_STR "20070111"
+#define CPP_VERSION_DATE 20080407L
+#define CPP_VERSION_DATE_STR "20080407"
 
 #endif // !defined(CPP_VERSION_HPP_CE4FE67F_63F9_468D_8364_C855F89D3C5D_INCLUDED)


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