Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r67118 - in trunk/libs/wave: src/cpplexer/re2clex test/testwave/testfiles
From: hartmut.kaiser_at_[hidden]
Date: 2010-12-08 22:01:35


Author: hkaiser
Date: 2010-12-08 22:01:33 EST (Wed, 08 Dec 2010)
New Revision: 67118
URL: http://svn.boost.org/trac/boost/changeset/67118

Log:
Wave: fixed lexing errors introduced with the last commit, added new use case
Added:
   trunk/libs/wave/test/testwave/testfiles/t_2_021.cpp (contents, props changed)
Text files modified:
   trunk/libs/wave/src/cpplexer/re2clex/cpp.re | 12
   trunk/libs/wave/src/cpplexer/re2clex/cpp_re.inc | 2150 +++++++++++++++++++--------------------
   trunk/libs/wave/src/cpplexer/re2clex/strict_cpp.re | 14
   trunk/libs/wave/src/cpplexer/re2clex/strict_cpp_re.inc | 2148 +++++++++++++++++++--------------------
   trunk/libs/wave/test/testwave/testfiles/test.cfg | 1
   5 files changed, 2072 insertions(+), 2253 deletions(-)

Modified: trunk/libs/wave/src/cpplexer/re2clex/cpp.re
==============================================================================
--- trunk/libs/wave/src/cpplexer/re2clex/cpp.re (original)
+++ trunk/libs/wave/src/cpplexer/re2clex/cpp.re 2010-12-08 22:01:33 EST (Wed, 08 Dec 2010)
@@ -441,20 +441,14 @@
     /*!re2c
         "."? Digit (Digit | NonDigit | ExponentStart | ".")*
             { BOOST_WAVE_RET(T_PP_NUMBER); }
-
- any
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
     */
     }
     else {
     /*!re2c
         ((FractionalConstant ExponentPart?) | (Digit+ ExponentPart)) FloatingSuffix?
             { BOOST_WAVE_RET(T_FLOATLIT); }
-
- Integer { goto integer_suffix; }
 
- any
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
+ Integer { goto integer_suffix; }
     */
     }
 }
@@ -470,8 +464,6 @@
         IntegerSuffix?
             { BOOST_WAVE_RET(T_INTLIT); }
 
- any
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
     */
     }
     else {
@@ -482,8 +474,6 @@
         IntegerSuffix?
             { BOOST_WAVE_RET(T_INTLIT); }
 
- any
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
     */
     }
 }

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 2010-12-08 22:01:33 EST (Wed, 08 Dec 2010)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Dec 08 19:42:47 2010 */
+/* Generated by re2c 0.13.5 on Wed Dec 08 20:59:15 2010 */
 #line 1 "cpp.re"
 /*=============================================================================
     Boost.Wave: A Standard compliant C++ preprocessor library
@@ -6813,106 +6813,87 @@
     };
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if (yych <= '-') {
- if (yych <= 0x08) goto yy1031;
- if (yych <= '\r') goto yy1036;
- if (yych >= ' ') goto yy1036;
- } else {
- if (yych <= '.') goto yy1032;
- if (yych <= '/') goto yy1036;
- if (yych <= '9') goto yy1034;
- goto yy1036;
- }
+ if (yych == '.') goto yy1032;
+ if (yych <= '/') goto yy1031;
+ if (yych <= '9') goto yy1033;
 yy1031:
     YYCURSOR = YYMARKER;
     goto yy1035;
 yy1032:
- ++YYCURSOR;
- if ((yych = *YYCURSOR) <= '/') goto yy1033;
- if (yych <= '9') goto yy1037;
-yy1033:
-#line 446 "cpp.re"
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 6837 "cpp_re.inc"
-yy1034:
- yych = *(YYMARKER = ++YYCURSOR);
- goto yy1038;
-yy1035:
-#line 443 "cpp.re"
- { BOOST_WAVE_RET(T_PP_NUMBER); }
-#line 6844 "cpp_re.inc"
-yy1036:
     yych = *++YYCURSOR;
- goto yy1033;
-yy1037:
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
+yy1033:
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
-yy1038:
     if (yybm[0+yych] & 64) {
- goto yy1037;
+ goto yy1033;
     }
     if (yych <= 'Z') {
- if (yych == '?') goto yy1042;
- if (yych <= '@') goto yy1035;
+ if (yych == '?') goto yy1039;
+ if (yych >= 'A') goto yy1036;
     } else {
         if (yych <= '\\') {
- if (yych <= '[') goto yy1035;
- goto yy1041;
+ if (yych >= '\\') goto yy1038;
         } else {
- if (yych != 'e') goto yy1035;
+ if (yych == 'e') goto yy1036;
         }
     }
-yy1039:
+yy1035:
+#line 443 "cpp.re"
+ { BOOST_WAVE_RET(T_PP_NUMBER); }
+#line 6847 "cpp_re.inc"
+yy1036:
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1039;
+ goto yy1036;
     }
     if (yych <= '>') {
         if (yych <= '+') {
- if (yych == '$') goto yy1037;
+ if (yych == '$') goto yy1033;
             if (yych <= '*') goto yy1035;
- goto yy1037;
+ goto yy1033;
         } else {
             if (yych <= '.') {
                 if (yych <= ',') goto yy1035;
- goto yy1037;
+ goto yy1033;
             } else {
                 if (yych <= '/') goto yy1035;
- if (yych <= '9') goto yy1037;
+ if (yych <= '9') goto yy1033;
                 goto yy1035;
             }
         }
     } else {
         if (yych <= '\\') {
             if (yych <= '@') {
- if (yych <= '?') goto yy1042;
+ if (yych <= '?') goto yy1039;
                 goto yy1035;
             } else {
- if (yych <= 'Z') goto yy1037;
+ if (yych <= 'Z') goto yy1033;
                 if (yych <= '[') goto yy1035;
             }
         } else {
             if (yych <= '_') {
                 if (yych <= '^') goto yy1035;
- goto yy1037;
+ goto yy1033;
             } else {
                 if (yych <= '`') goto yy1035;
- if (yych <= 'z') goto yy1037;
+ if (yych <= 'z') goto yy1033;
                 goto yy1035;
             }
         }
     }
-yy1041:
+yy1038:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych == 'U') goto yy1045;
- if (yych == 'u') goto yy1044;
+ if (yych == 'U') goto yy1042;
+ if (yych == 'u') goto yy1041;
     goto yy1031;
-yy1042:
+yy1039:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6920,23 +6901,23 @@
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych == '/') goto yy1041;
+ if (yych == '/') goto yy1038;
     goto yy1031;
-yy1044:
+yy1041:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
         if (yych <= '/') goto yy1031;
- if (yych <= '9') goto yy1053;
+ if (yych <= '9') goto yy1050;
         goto yy1031;
     } else {
- if (yych <= 'F') goto yy1053;
+ if (yych <= 'F') goto yy1050;
         if (yych <= '`') goto yy1031;
- if (yych <= 'f') goto yy1053;
+ if (yych <= 'f') goto yy1050;
         goto yy1031;
     }
-yy1045:
+yy1042:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6944,11 +6925,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1046;
+ if (yych <= 'F') goto yy1043;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1046:
+yy1043:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6956,11 +6937,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1047;
+ if (yych <= 'F') goto yy1044;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1047:
+yy1044:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6968,11 +6949,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1048;
+ if (yych <= 'F') goto yy1045;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1048:
+yy1045:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6980,11 +6961,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1049;
+ if (yych <= 'F') goto yy1046;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1049:
+yy1046:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6992,11 +6973,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1050;
+ if (yych <= 'F') goto yy1047;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1050:
+yy1047:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -7004,11 +6985,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1051;
+ if (yych <= 'F') goto yy1048;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1051:
+yy1048:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -7016,25 +6997,25 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1052;
+ if (yych <= 'F') goto yy1049;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1052:
+yy1049:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
         if (yych <= '/') goto yy1031;
- if (yych <= '9') goto yy1037;
+ if (yych <= '9') goto yy1033;
         goto yy1031;
     } else {
- if (yych <= 'F') goto yy1037;
+ if (yych <= 'F') goto yy1033;
         if (yych <= '`') goto yy1031;
- if (yych <= 'f') goto yy1037;
+ if (yych <= 'f') goto yy1033;
         goto yy1031;
     }
-yy1053:
+yy1050:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -7042,11 +7023,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1054;
+ if (yych <= 'F') goto yy1051;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1054:
+yy1051:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -7054,31 +7035,31 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1055;
+ if (yych <= 'F') goto yy1052;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1055:
+yy1052:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
         if (yych <= '/') goto yy1031;
- if (yych <= '9') goto yy1037;
+ if (yych <= '9') goto yy1033;
         goto yy1031;
     } else {
- if (yych <= 'F') goto yy1037;
+ if (yych <= 'F') goto yy1033;
         if (yych <= '`') goto yy1031;
- if (yych <= 'f') goto yy1037;
+ if (yych <= 'f') goto yy1033;
         goto yy1031;
     }
 }
-#line 447 "cpp.re"
+#line 444 "cpp.re"
 
     }
     else {
     
-#line 7082 "cpp_re.inc"
+#line 7063 "cpp_re.inc"
 {
     YYCTYPE yych;
     unsigned int yyaccept = 0;
@@ -7118,263 +7099,229 @@
     };
     if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
     yych = *YYCURSOR;
- if (yych <= '-') {
- if (yych <= 0x08) goto yy1058;
- if (yych <= '\r') goto yy1064;
- if (yych >= ' ') goto yy1064;
+ if (yych <= '/') {
+ if (yych == '.') goto yy1060;
     } else {
- if (yych <= '/') {
- if (yych <= '.') goto yy1062;
- goto yy1064;
- } else {
- if (yych <= '0') goto yy1059;
- if (yych <= '9') goto yy1061;
- goto yy1064;
- }
+ if (yych <= '0') goto yy1056;
+ if (yych <= '9') goto yy1058;
     }
-yy1058:
+yy1055:
     YYCURSOR = YYMARKER;
     if (yyaccept <= 0) {
- goto yy1060;
+ goto yy1057;
     } else {
- goto yy1067;
+ goto yy1063;
     }
-yy1059:
+yy1056:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yybm[0+yych] & 64) {
- goto yy1081;
+ goto yy1075;
     }
     if (yych <= 'E') {
         if (yych <= '/') {
- if (yych == '.') goto yy1065;
+ if (yych == '.') goto yy1061;
         } else {
- if (yych <= '9') goto yy1084;
- if (yych >= 'E') goto yy1077;
+ if (yych <= '9') goto yy1078;
+ if (yych >= 'E') goto yy1071;
         }
     } else {
         if (yych <= 'd') {
- if (yych == 'X') goto yy1083;
+ if (yych == 'X') goto yy1077;
         } else {
- if (yych <= 'e') goto yy1077;
- if (yych == 'x') goto yy1083;
+ if (yych <= 'e') goto yy1071;
+ if (yych == 'x') goto yy1077;
         }
     }
-yy1060:
-#line 454 "cpp.re"
+yy1057:
+#line 451 "cpp.re"
     { goto integer_suffix; }
-#line 7167 "cpp_re.inc"
-yy1061:
+#line 7140 "cpp_re.inc"
+yy1058:
     yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= '9') {
- if (yych == '.') goto yy1065;
- if (yych <= '/') goto yy1060;
- goto yy1075;
- } else {
- if (yych <= 'E') {
- if (yych <= 'D') goto yy1060;
- goto yy1077;
- } else {
- if (yych == 'e') goto yy1077;
- goto yy1060;
- }
+ YYMARKER = ++YYCURSOR;
+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 32) {
+ goto yy1058;
     }
-yy1062:
- ++YYCURSOR;
- if (yybm[0+(yych = *YYCURSOR)] & 32) {
- goto yy1065;
+ if (yych <= 'D') {
+ if (yych == '.') goto yy1061;
+ goto yy1057;
+ } else {
+ if (yych <= 'E') goto yy1071;
+ if (yych == 'e') goto yy1071;
+ goto yy1057;
     }
-yy1063:
-#line 457 "cpp.re"
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 7192 "cpp_re.inc"
-yy1064:
+yy1060:
     yych = *++YYCURSOR;
- goto yy1063;
-yy1065:
+ if (yych <= '/') goto yy1055;
+ if (yych >= ':') goto yy1055;
+yy1061:
     yyaccept = 1;
     YYMARKER = ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 32) {
- goto yy1065;
- }
- if (yych <= 'L') {
- if (yych <= 'E') {
- if (yych >= 'E') goto yy1068;
+ if (yych <= 'K') {
+ if (yych <= 'D') {
+ if (yych <= '/') goto yy1063;
+ if (yych <= '9') goto yy1061;
         } else {
- if (yych <= 'F') goto yy1069;
- if (yych >= 'L') goto yy1070;
+ if (yych <= 'E') goto yy1064;
+ if (yych <= 'F') goto yy1065;
         }
     } else {
- if (yych <= 'f') {
- if (yych <= 'd') goto yy1067;
- if (yych <= 'e') goto yy1068;
- goto yy1069;
+ if (yych <= 'e') {
+ if (yych <= 'L') goto yy1066;
+ if (yych >= 'e') goto yy1064;
         } else {
- if (yych == 'l') goto yy1070;
+ if (yych <= 'f') goto yy1065;
+ if (yych == 'l') goto yy1066;
         }
     }
-yy1067:
-#line 452 "cpp.re"
+yy1063:
+#line 449 "cpp.re"
     { BOOST_WAVE_RET(T_FLOATLIT); }
-#line 7223 "cpp_re.inc"
-yy1068:
+#line 7186 "cpp_re.inc"
+yy1064:
     yych = *++YYCURSOR;
     if (yych <= ',') {
- if (yych == '+') goto yy1072;
- goto yy1058;
+ if (yych == '+') goto yy1068;
+ goto yy1055;
     } else {
- if (yych <= '-') goto yy1072;
- if (yych <= '/') goto yy1058;
- if (yych <= '9') goto yy1073;
- goto yy1058;
+ if (yych <= '-') goto yy1068;
+ if (yych <= '/') goto yy1055;
+ if (yych <= '9') goto yy1069;
+ goto yy1055;
     }
-yy1069:
+yy1065:
     yych = *++YYCURSOR;
- if (yych == 'L') goto yy1071;
- if (yych == 'l') goto yy1071;
- goto yy1067;
-yy1070:
+ if (yych == 'L') goto yy1067;
+ if (yych == 'l') goto yy1067;
+ goto yy1063;
+yy1066:
     yych = *++YYCURSOR;
- if (yych == 'F') goto yy1071;
- if (yych != 'f') goto yy1067;
-yy1071:
+ if (yych == 'F') goto yy1067;
+ if (yych != 'f') goto yy1063;
+yy1067:
     yych = *++YYCURSOR;
- goto yy1067;
-yy1072:
+ goto yy1063;
+yy1068:
     yych = *++YYCURSOR;
- if (yych <= '/') goto yy1058;
- if (yych >= ':') goto yy1058;
-yy1073:
+ if (yych <= '/') goto yy1055;
+ if (yych >= ':') goto yy1055;
+yy1069:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
     if (yych <= 'K') {
         if (yych <= '9') {
- if (yych <= '/') goto yy1067;
- goto yy1073;
- } else {
- if (yych == 'F') goto yy1069;
- goto yy1067;
- }
- } else {
- if (yych <= 'f') {
- if (yych <= 'L') goto yy1070;
- if (yych <= 'e') goto yy1067;
+ if (yych <= '/') goto yy1063;
             goto yy1069;
         } else {
- if (yych == 'l') goto yy1070;
- goto yy1067;
+ if (yych == 'F') goto yy1065;
+ goto yy1063;
         }
- }
-yy1075:
- yyaccept = 0;
- YYMARKER = ++YYCURSOR;
- if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
- yych = *YYCURSOR;
- if (yych <= '9') {
- if (yych == '.') goto yy1065;
- if (yych <= '/') goto yy1060;
- goto yy1075;
     } else {
- if (yych <= 'E') {
- if (yych <= 'D') goto yy1060;
+ if (yych <= 'f') {
+ if (yych <= 'L') goto yy1066;
+ if (yych <= 'e') goto yy1063;
+ goto yy1065;
         } else {
- if (yych != 'e') goto yy1060;
+ if (yych == 'l') goto yy1066;
+ goto yy1063;
         }
     }
-yy1077:
+yy1071:
     yych = *++YYCURSOR;
     if (yych <= ',') {
- if (yych != '+') goto yy1058;
+ if (yych != '+') goto yy1055;
     } else {
- if (yych <= '-') goto yy1078;
- if (yych <= '/') goto yy1058;
- if (yych <= '9') goto yy1079;
- goto yy1058;
+ if (yych <= '-') goto yy1072;
+ if (yych <= '/') goto yy1055;
+ if (yych <= '9') goto yy1073;
+ goto yy1055;
     }
-yy1078:
+yy1072:
     yych = *++YYCURSOR;
- if (yych <= '/') goto yy1058;
- if (yych >= ':') goto yy1058;
-yy1079:
+ if (yych <= '/') goto yy1055;
+ if (yych >= ':') goto yy1055;
+yy1073:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
     if (yych <= 'K') {
         if (yych <= '9') {
- if (yych <= '/') goto yy1067;
- goto yy1079;
+ if (yych <= '/') goto yy1063;
+ goto yy1073;
         } else {
- if (yych == 'F') goto yy1069;
- goto yy1067;
+ if (yych == 'F') goto yy1065;
+ goto yy1063;
         }
     } else {
         if (yych <= 'f') {
- if (yych <= 'L') goto yy1070;
- if (yych <= 'e') goto yy1067;
- goto yy1069;
+ if (yych <= 'L') goto yy1066;
+ if (yych <= 'e') goto yy1063;
+ goto yy1065;
         } else {
- if (yych == 'l') goto yy1070;
- goto yy1067;
+ if (yych == 'l') goto yy1066;
+ goto yy1063;
         }
     }
-yy1081:
+yy1075:
     yyaccept = 0;
     YYMARKER = ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 64) {
- goto yy1081;
+ goto yy1075;
     }
     if (yych <= '9') {
- if (yych == '.') goto yy1065;
- if (yych <= '/') goto yy1060;
- goto yy1084;
+ if (yych == '.') goto yy1061;
+ if (yych <= '/') goto yy1057;
+ goto yy1078;
     } else {
         if (yych <= 'E') {
- if (yych <= 'D') goto yy1060;
- goto yy1077;
+ if (yych <= 'D') goto yy1057;
+ goto yy1071;
         } else {
- if (yych == 'e') goto yy1077;
- goto yy1060;
+ if (yych == 'e') goto yy1071;
+ goto yy1057;
         }
     }
-yy1083:
+yy1077:
     yych = *++YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1086;
+ goto yy1080;
     }
- goto yy1058;
-yy1084:
+ goto yy1055;
+yy1078:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yych <= '9') {
- if (yych == '.') goto yy1065;
- if (yych <= '/') goto yy1058;
- goto yy1084;
+ if (yych == '.') goto yy1061;
+ if (yych <= '/') goto yy1055;
+ goto yy1078;
     } else {
         if (yych <= 'E') {
- if (yych <= 'D') goto yy1058;
- goto yy1077;
+ if (yych <= 'D') goto yy1055;
+ goto yy1071;
         } else {
- if (yych == 'e') goto yy1077;
- goto yy1058;
+ if (yych == 'e') goto yy1071;
+ goto yy1055;
         }
     }
-yy1086:
+yy1080:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1086;
+ goto yy1080;
     }
- goto yy1060;
+ goto yy1057;
 }
-#line 458 "cpp.re"
+#line 452 "cpp.re"
 
     }
 }
@@ -7384,167 +7331,140 @@
 {
     if (s->enable_ms_extensions) {
     
-#line 7388 "cpp_re.inc"
+#line 7335 "cpp_re.inc"
 {
     YYCTYPE yych;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
- yych = *YYCURSOR;
- if (yych <= 'U') {
- if (yych <= 0x1F) {
- if (yych <= 0x08) goto yy1090;
- if (yych <= '\r') goto yy1095;
+ yych = *(YYMARKER = YYCURSOR);
+ if (yych <= 'h') {
+ if (yych <= 'L') {
+ if (yych >= 'L') goto yy1086;
         } else {
- if (yych == 'L') goto yy1092;
- if (yych <= 'T') goto yy1095;
- goto yy1091;
+ if (yych == 'U') goto yy1085;
         }
     } else {
- if (yych <= 'k') {
- if (yych == 'i') goto yy1093;
- goto yy1095;
+ if (yych <= 'l') {
+ if (yych <= 'i') goto yy1087;
+ if (yych >= 'l') goto yy1086;
         } else {
- if (yych <= 'l') goto yy1092;
- if (yych == 'u') goto yy1091;
- goto yy1095;
+ if (yych == 'u') goto yy1085;
         }
     }
-yy1090:
-#line 471 "cpp.re"
+yy1084:
+#line 465 "cpp.re"
     { BOOST_WAVE_RET(T_INTLIT); }
-#line 7415 "cpp_re.inc"
-yy1091:
+#line 7357 "cpp_re.inc"
+yy1085:
     yych = *++YYCURSOR;
- if (yych == 'L') goto yy1102;
- if (yych == 'l') goto yy1102;
- goto yy1090;
-yy1092:
+ if (yych == 'L') goto yy1094;
+ if (yych == 'l') goto yy1094;
+ goto yy1084;
+yy1086:
     yych = *++YYCURSOR;
     if (yych <= 'U') {
- if (yych == 'L') goto yy1101;
- if (yych <= 'T') goto yy1090;
- goto yy1100;
+ if (yych == 'L') goto yy1093;
+ if (yych <= 'T') goto yy1084;
+ goto yy1092;
     } else {
         if (yych <= 'l') {
- if (yych <= 'k') goto yy1090;
- goto yy1101;
+ if (yych <= 'k') goto yy1084;
+ goto yy1093;
         } else {
- if (yych == 'u') goto yy1100;
- goto yy1090;
+ if (yych == 'u') goto yy1092;
+ goto yy1084;
         }
     }
-yy1093:
- yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '6') goto yy1096;
-yy1094:
-#line 474 "cpp.re"
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 7442 "cpp_re.inc"
-yy1095:
- yych = *++YYCURSOR;
- goto yy1094;
-yy1096:
+yy1087:
     yych = *++YYCURSOR;
- if (yych == '4') goto yy1098;
+ if (yych == '6') goto yy1089;
+yy1088:
     YYCURSOR = YYMARKER;
- goto yy1094;
-yy1098:
+ goto yy1084;
+yy1089:
+ yych = *++YYCURSOR;
+ if (yych != '4') goto yy1088;
+yy1090:
     ++YYCURSOR;
-yy1099:
-#line 468 "cpp.re"
+yy1091:
+#line 462 "cpp.re"
     { BOOST_WAVE_RET(T_LONGINTLIT); }
-#line 7456 "cpp_re.inc"
-yy1100:
+#line 7392 "cpp_re.inc"
+yy1092:
     yych = *++YYCURSOR;
- goto yy1090;
-yy1101:
+ goto yy1084;
+yy1093:
     yych = *++YYCURSOR;
- if (yych == 'U') goto yy1098;
- if (yych == 'u') goto yy1098;
- goto yy1099;
-yy1102:
+ if (yych == 'U') goto yy1090;
+ if (yych == 'u') goto yy1090;
+ goto yy1091;
+yy1094:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == 'L') goto yy1098;
- if (yych == 'l') goto yy1098;
- goto yy1090;
+ if ((yych = *YYCURSOR) == 'L') goto yy1090;
+ if (yych == 'l') goto yy1090;
+ goto yy1084;
 }
-#line 475 "cpp.re"
+#line 467 "cpp.re"
 
     }
     else {
     
-#line 7476 "cpp_re.inc"
+#line 7412 "cpp_re.inc"
 {
     YYCTYPE yych;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
- if (yych <= 'T') {
- if (yych <= 0x1F) {
- if (yych <= 0x08) goto yy1105;
- if (yych <= '\r') goto yy1108;
- } else {
- if (yych == 'L') goto yy1107;
- goto yy1108;
- }
+ if (yych <= 'U') {
+ if (yych == 'L') goto yy1099;
+ if (yych >= 'U') goto yy1098;
     } else {
         if (yych <= 'l') {
- if (yych <= 'U') goto yy1106;
- if (yych <= 'k') goto yy1108;
- goto yy1107;
+ if (yych >= 'l') goto yy1099;
         } else {
- if (yych == 'u') goto yy1106;
- goto yy1108;
+ if (yych == 'u') goto yy1098;
         }
     }
-yy1105:
-#line 483 "cpp.re"
+yy1097:
+#line 475 "cpp.re"
     { BOOST_WAVE_RET(T_INTLIT); }
-#line 7502 "cpp_re.inc"
-yy1106:
+#line 7430 "cpp_re.inc"
+yy1098:
     yych = *++YYCURSOR;
- if (yych == 'L') goto yy1114;
- if (yych == 'l') goto yy1114;
- goto yy1105;
-yy1107:
+ if (yych == 'L') goto yy1104;
+ if (yych == 'l') goto yy1104;
+ goto yy1097;
+yy1099:
     yych = *++YYCURSOR;
     if (yych <= 'U') {
- if (yych == 'L') goto yy1111;
- if (yych <= 'T') goto yy1105;
- goto yy1110;
+ if (yych == 'L') goto yy1101;
+ if (yych <= 'T') goto yy1097;
     } else {
         if (yych <= 'l') {
- if (yych <= 'k') goto yy1105;
- goto yy1111;
+ if (yych <= 'k') goto yy1097;
+ goto yy1101;
         } else {
- if (yych == 'u') goto yy1110;
- goto yy1105;
+ if (yych != 'u') goto yy1097;
         }
     }
-yy1108:
- ++YYCURSOR;
-#line 486 "cpp.re"
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 7527 "cpp_re.inc"
-yy1110:
     yych = *++YYCURSOR;
- goto yy1105;
-yy1111:
+ goto yy1097;
+yy1101:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == 'U') goto yy1113;
- if (yych == 'u') goto yy1113;
-yy1112:
-#line 480 "cpp.re"
+ if ((yych = *YYCURSOR) == 'U') goto yy1103;
+ if (yych == 'u') goto yy1103;
+yy1102:
+#line 472 "cpp.re"
     { BOOST_WAVE_RET(T_LONGINTLIT); }
-#line 7538 "cpp_re.inc"
-yy1113:
+#line 7458 "cpp_re.inc"
+yy1103:
     yych = *++YYCURSOR;
- goto yy1112;
-yy1114:
+ goto yy1102;
+yy1104:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == 'L') goto yy1113;
- if (yych == 'l') goto yy1113;
- goto yy1105;
+ if ((yych = *YYCURSOR) == 'L') goto yy1103;
+ if (yych == 'l') goto yy1103;
+ goto yy1097;
 }
-#line 487 "cpp.re"
+#line 477 "cpp.re"
 
     }
 }
@@ -7553,7 +7473,7 @@
 extcharlit:
 {
     
-#line 7557 "cpp_re.inc"
+#line 7477 "cpp_re.inc"
 {
     YYCTYPE yych;
     static const unsigned char yybm[] = {
@@ -7594,305 +7514,305 @@
     yych = *YYCURSOR;
     if (yych <= 0x1F) {
         if (yych <= '\n') {
- if (yych <= 0x08) goto yy1117;
- if (yych <= '\t') goto yy1118;
- goto yy1122;
+ if (yych <= 0x08) goto yy1107;
+ if (yych <= '\t') goto yy1108;
+ goto yy1112;
         } else {
- if (yych <= '\f') goto yy1118;
- if (yych <= '\r') goto yy1122;
+ if (yych <= '\f') goto yy1108;
+ if (yych <= '\r') goto yy1112;
         }
     } else {
         if (yych <= '>') {
- if (yych == '\'') goto yy1122;
- goto yy1118;
+ if (yych == '\'') goto yy1112;
+ goto yy1108;
         } else {
- if (yych <= '?') goto yy1120;
- if (yych == '\\') goto yy1121;
- goto yy1118;
+ if (yych <= '?') goto yy1110;
+ if (yych == '\\') goto yy1111;
+ goto yy1108;
         }
     }
-yy1117:
+yy1107:
     YYCURSOR = YYMARKER;
- goto yy1119;
-yy1118:
+ goto yy1109;
+yy1108:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '\'') goto yy1130;
-yy1119:
-#line 499 "cpp.re"
+ if ((yych = *YYCURSOR) == '\'') goto yy1120;
+yy1109:
+#line 489 "cpp.re"
     { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 7624 "cpp_re.inc"
-yy1120:
+#line 7544 "cpp_re.inc"
+yy1110:
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '\'') goto yy1130;
- if (yych == '?') goto yy1145;
- goto yy1119;
-yy1121:
+ if (yych == '\'') goto yy1120;
+ if (yych == '?') goto yy1135;
+ goto yy1109;
+yy1111:
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy1125;
- goto yy1119;
+ if (yych == '"') goto yy1115;
+ goto yy1109;
             } else {
- if (yych <= '\'') goto yy1125;
- if (yych <= '/') goto yy1119;
- goto yy1128;
+ if (yych <= '\'') goto yy1115;
+ if (yych <= '/') goto yy1109;
+ goto yy1118;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy1126;
- goto yy1119;
+ if (yych == '?') goto yy1116;
+ goto yy1109;
             } else {
- if (yych <= 'U') goto yy1124;
- if (yych == '\\') goto yy1125;
- goto yy1119;
+ if (yych <= 'U') goto yy1114;
+ if (yych == '\\') goto yy1115;
+ goto yy1109;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy1125;
- if (yych <= 'e') goto yy1119;
- goto yy1125;
- } else {
- if (yych == 'n') goto yy1125;
- if (yych <= 'q') goto yy1119;
- goto yy1125;
+ if (yych <= 'b') goto yy1115;
+ if (yych <= 'e') goto yy1109;
+ goto yy1115;
+ } else {
+ if (yych == 'n') goto yy1115;
+ if (yych <= 'q') goto yy1109;
+ goto yy1115;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy1119;
- if (yych <= 't') goto yy1125;
- goto yy1123;
- } else {
- if (yych <= 'v') goto yy1125;
- if (yych == 'x') goto yy1127;
- goto yy1119;
+ if (yych <= 's') goto yy1109;
+ if (yych <= 't') goto yy1115;
+ goto yy1113;
+ } else {
+ if (yych <= 'v') goto yy1115;
+ if (yych == 'x') goto yy1117;
+ goto yy1109;
             }
         }
     }
-yy1122:
+yy1112:
     yych = *++YYCURSOR;
- goto yy1119;
-yy1123:
+ goto yy1109;
+yy1113:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych <= '9') goto yy1142;
- goto yy1117;
- } else {
- if (yych <= 'F') goto yy1142;
- if (yych <= '`') goto yy1117;
- if (yych <= 'f') goto yy1142;
- goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1132;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1132;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1132;
+ goto yy1107;
     }
-yy1124:
+yy1114:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych <= '9') goto yy1135;
- goto yy1117;
- } else {
- if (yych <= 'F') goto yy1135;
- if (yych <= '`') goto yy1117;
- if (yych <= 'f') goto yy1135;
- goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1125;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1125;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1125;
+ goto yy1107;
     }
-yy1125:
+yy1115:
     yych = *++YYCURSOR;
- if (yych == '\'') goto yy1130;
- goto yy1117;
-yy1126:
+ if (yych == '\'') goto yy1120;
+ goto yy1107;
+yy1116:
     yych = *++YYCURSOR;
- if (yych == '\'') goto yy1130;
- if (yych == '?') goto yy1134;
- goto yy1117;
-yy1127:
+ if (yych == '\'') goto yy1120;
+ if (yych == '?') goto yy1124;
+ goto yy1107;
+yy1117:
     yych = *++YYCURSOR;
- if (yych == '\'') goto yy1117;
- goto yy1133;
-yy1128:
+ if (yych == '\'') goto yy1107;
+ goto yy1123;
+yy1118:
     yych = *++YYCURSOR;
- if (yych == '\'') goto yy1130;
- if (yych <= '/') goto yy1117;
- if (yych >= '8') goto yy1117;
- yych = *++YYCURSOR;
- if (yych == '\'') goto yy1130;
- if (yych <= '/') goto yy1117;
- if (yych <= '7') goto yy1125;
- goto yy1117;
-yy1130:
+ if (yych == '\'') goto yy1120;
+ if (yych <= '/') goto yy1107;
+ if (yych >= '8') goto yy1107;
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy1120;
+ if (yych <= '/') goto yy1107;
+ if (yych <= '7') goto yy1115;
+ goto yy1107;
+yy1120:
     ++YYCURSOR;
-#line 496 "cpp.re"
+#line 486 "cpp.re"
     { BOOST_WAVE_RET(T_CHARLIT); }
-#line 7729 "cpp_re.inc"
-yy1132:
+#line 7649 "cpp_re.inc"
+yy1122:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
-yy1133:
+yy1123:
     if (yybm[0+yych] & 128) {
- goto yy1132;
+ goto yy1122;
     }
- if (yych == '\'') goto yy1130;
- goto yy1117;
-yy1134:
+ if (yych == '\'') goto yy1120;
+ goto yy1107;
+yy1124:
     yych = *++YYCURSOR;
- if (yych == '/') goto yy1125;
- goto yy1117;
-yy1135:
+ if (yych == '/') goto yy1115;
+ goto yy1107;
+yy1125:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1136;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1126;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1136:
+yy1126:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1137;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1127;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1137:
+yy1127:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1138;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1128;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1138:
+yy1128:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1139;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1129;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1139:
+yy1129:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1140;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1130;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1140:
+yy1130:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1141;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1131;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1141:
+yy1131:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych <= '9') goto yy1125;
- goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1115;
+ goto yy1107;
     } else {
- if (yych <= 'F') goto yy1125;
- if (yych <= '`') goto yy1117;
- if (yych <= 'f') goto yy1125;
- goto yy1117;
+ if (yych <= 'F') goto yy1115;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1115;
+ goto yy1107;
     }
-yy1142:
+yy1132:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1143;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1133;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1143:
+yy1133:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1144;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1134;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1144:
+yy1134:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych <= '9') goto yy1125;
- goto yy1117;
- } else {
- if (yych <= 'F') goto yy1125;
- if (yych <= '`') goto yy1117;
- if (yych <= 'f') goto yy1125;
- goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1115;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1115;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1115;
+ goto yy1107;
     }
-yy1145:
+yy1135:
     yych = *++YYCURSOR;
- if (yych != '/') goto yy1117;
+ if (yych != '/') goto yy1107;
     ++YYCURSOR;
     if ((yych = *YYCURSOR) <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy1125;
- goto yy1117;
+ if (yych == '"') goto yy1115;
+ goto yy1107;
             } else {
- if (yych <= '\'') goto yy1125;
- if (yych <= '/') goto yy1117;
- goto yy1128;
+ if (yych <= '\'') goto yy1115;
+ if (yych <= '/') goto yy1107;
+ goto yy1118;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy1126;
- goto yy1117;
+ if (yych == '?') goto yy1116;
+ goto yy1107;
             } else {
- if (yych <= 'U') goto yy1124;
- if (yych == '\\') goto yy1125;
- goto yy1117;
+ if (yych <= 'U') goto yy1114;
+ if (yych == '\\') goto yy1115;
+ goto yy1107;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy1125;
- if (yych <= 'e') goto yy1117;
- goto yy1125;
- } else {
- if (yych == 'n') goto yy1125;
- if (yych <= 'q') goto yy1117;
- goto yy1125;
+ if (yych <= 'b') goto yy1115;
+ if (yych <= 'e') goto yy1107;
+ goto yy1115;
+ } else {
+ if (yych == 'n') goto yy1115;
+ if (yych <= 'q') goto yy1107;
+ goto yy1115;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy1117;
- if (yych <= 't') goto yy1125;
- goto yy1123;
- } else {
- if (yych <= 'v') goto yy1125;
- if (yych == 'x') goto yy1127;
- goto yy1117;
+ if (yych <= 's') goto yy1107;
+ if (yych <= 't') goto yy1115;
+ goto yy1113;
+ } else {
+ if (yych <= 'v') goto yy1115;
+ if (yych == 'x') goto yy1117;
+ goto yy1107;
             }
         }
     }
 }
-#line 500 "cpp.re"
+#line 490 "cpp.re"
 
 }
 
@@ -7900,7 +7820,7 @@
 extstringlit:
 {
     
-#line 7904 "cpp_re.inc"
+#line 7824 "cpp_re.inc"
 {
     YYCTYPE yych;
     unsigned int yyaccept = 0;
@@ -7942,323 +7862,323 @@
     yych = *YYCURSOR;
     if (yych <= 0x1F) {
         if (yych <= '\n') {
- if (yych <= 0x08) goto yy1149;
- if (yych <= '\t') goto yy1150;
- goto yy1156;
+ if (yych <= 0x08) goto yy1139;
+ if (yych <= '\t') goto yy1140;
+ goto yy1146;
         } else {
- if (yych <= '\f') goto yy1150;
- if (yych <= '\r') goto yy1156;
+ if (yych <= '\f') goto yy1140;
+ if (yych <= '\r') goto yy1146;
         }
     } else {
         if (yych <= '>') {
- if (yych == '"') goto yy1154;
- goto yy1150;
+ if (yych == '"') goto yy1144;
+ goto yy1140;
         } else {
- if (yych <= '?') goto yy1152;
- if (yych == '\\') goto yy1153;
- goto yy1150;
+ if (yych <= '?') goto yy1142;
+ if (yych == '\\') goto yy1143;
+ goto yy1140;
         }
     }
-yy1149:
+yy1139:
     YYCURSOR = YYMARKER;
     if (yyaccept <= 0) {
- goto yy1151;
+ goto yy1141;
     } else {
- goto yy1155;
+ goto yy1145;
     }
-yy1150:
+yy1140:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '\n') {
- if (yych == '\t') goto yy1160;
+ if (yych == '\t') goto yy1150;
     } else {
- if (yych <= '\f') goto yy1160;
- if (yych >= ' ') goto yy1160;
+ if (yych <= '\f') goto yy1150;
+ if (yych >= ' ') goto yy1150;
     }
-yy1151:
-#line 511 "cpp.re"
+yy1141:
+#line 501 "cpp.re"
     { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 7982 "cpp_re.inc"
-yy1152:
+#line 7902 "cpp_re.inc"
+yy1142:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yybm[0+yych] & 32) {
- goto yy1168;
+ goto yy1158;
     }
     if (yych <= '\n') {
- if (yych == '\t') goto yy1160;
- goto yy1151;
+ if (yych == '\t') goto yy1150;
+ goto yy1141;
     } else {
- if (yych <= '\f') goto yy1160;
- if (yych <= 0x1F) goto yy1151;
- goto yy1160;
+ if (yych <= '\f') goto yy1150;
+ if (yych <= 0x1F) goto yy1141;
+ goto yy1150;
     }
-yy1153:
+yy1143:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy1159;
- goto yy1151;
+ if (yych == '"') goto yy1149;
+ goto yy1141;
             } else {
- if (yych <= '\'') goto yy1159;
- if (yych <= '/') goto yy1151;
- goto yy1163;
+ if (yych <= '\'') goto yy1149;
+ if (yych <= '/') goto yy1141;
+ goto yy1153;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy1161;
- goto yy1151;
+ if (yych == '?') goto yy1151;
+ goto yy1141;
             } else {
- if (yych <= 'U') goto yy1158;
- if (yych == '\\') goto yy1159;
- goto yy1151;
+ if (yych <= 'U') goto yy1148;
+ if (yych == '\\') goto yy1149;
+ goto yy1141;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy1159;
- if (yych <= 'e') goto yy1151;
- goto yy1159;
- } else {
- if (yych == 'n') goto yy1159;
- if (yych <= 'q') goto yy1151;
- goto yy1159;
+ if (yych <= 'b') goto yy1149;
+ if (yych <= 'e') goto yy1141;
+ goto yy1149;
+ } else {
+ if (yych == 'n') goto yy1149;
+ if (yych <= 'q') goto yy1141;
+ goto yy1149;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy1151;
- if (yych <= 't') goto yy1159;
- goto yy1157;
- } else {
- if (yych <= 'v') goto yy1159;
- if (yych == 'x') goto yy1162;
- goto yy1151;
+ if (yych <= 's') goto yy1141;
+ if (yych <= 't') goto yy1149;
+ goto yy1147;
+ } else {
+ if (yych <= 'v') goto yy1149;
+ if (yych == 'x') goto yy1152;
+ goto yy1141;
             }
         }
     }
-yy1154:
+yy1144:
     ++YYCURSOR;
-yy1155:
-#line 508 "cpp.re"
+yy1145:
+#line 498 "cpp.re"
     { BOOST_WAVE_RET(T_STRINGLIT); }
-#line 8048 "cpp_re.inc"
-yy1156:
+#line 7968 "cpp_re.inc"
+yy1146:
     yych = *++YYCURSOR;
- goto yy1151;
-yy1157:
+ goto yy1141;
+yy1147:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych <= '9') goto yy1197;
- goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1187;
+ goto yy1139;
     } else {
- if (yych <= 'F') goto yy1197;
- if (yych <= '`') goto yy1149;
- if (yych <= 'f') goto yy1197;
- goto yy1149;
+ if (yych <= 'F') goto yy1187;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1187;
+ goto yy1139;
     }
-yy1158:
+yy1148:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych <= '9') goto yy1190;
- goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1180;
+ goto yy1139;
     } else {
- if (yych <= 'F') goto yy1190;
- if (yych <= '`') goto yy1149;
- if (yych <= 'f') goto yy1190;
- goto yy1149;
+ if (yych <= 'F') goto yy1180;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1180;
+ goto yy1139;
     }
-yy1159:
+yy1149:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
-yy1160:
+yy1150:
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1166;
- goto yy1167;
-yy1161:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1151:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1189;
- goto yy1167;
-yy1162:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1179;
+ goto yy1157;
+yy1152:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1176;
+ goto yy1166;
     }
- goto yy1149;
-yy1163:
+ goto yy1139;
+yy1153:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '"') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy1159;
- goto yy1149;
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
         } else {
- if (yych <= '\f') goto yy1159;
- if (yych <= 0x1F) goto yy1149;
- if (yych <= '!') goto yy1159;
- goto yy1165;
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ if (yych <= '!') goto yy1149;
+ goto yy1155;
         }
     } else {
         if (yych <= '>') {
- if (yych <= '/') goto yy1159;
- if (yych >= '8') goto yy1159;
+ if (yych <= '/') goto yy1149;
+ if (yych >= '8') goto yy1149;
         } else {
- if (yych <= '?') goto yy1166;
- if (yych == '\\') goto yy1167;
- goto yy1159;
+ if (yych <= '?') goto yy1156;
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1166;
- goto yy1167;
-yy1165:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1155:
     yych = *++YYCURSOR;
- goto yy1155;
-yy1166:
+ goto yy1145;
+yy1156:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1168;
-yy1167:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1158;
+yy1157:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy1159;
- goto yy1149;
+ if (yych == '"') goto yy1149;
+ goto yy1139;
             } else {
- if (yych <= '\'') goto yy1159;
- if (yych <= '/') goto yy1149;
- goto yy1163;
+ if (yych <= '\'') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ goto yy1153;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy1161;
- goto yy1149;
+ if (yych == '?') goto yy1151;
+ goto yy1139;
             } else {
- if (yych <= 'U') goto yy1158;
- if (yych == '\\') goto yy1159;
- goto yy1149;
+ if (yych <= 'U') goto yy1148;
+ if (yych == '\\') goto yy1149;
+ goto yy1139;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy1159;
- if (yych <= 'e') goto yy1149;
- goto yy1159;
- } else {
- if (yych == 'n') goto yy1159;
- if (yych <= 'q') goto yy1149;
- goto yy1159;
+ if (yych <= 'b') goto yy1149;
+ if (yych <= 'e') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych == 'n') goto yy1149;
+ if (yych <= 'q') goto yy1139;
+ goto yy1149;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy1149;
- if (yych <= 't') goto yy1159;
- goto yy1157;
- } else {
- if (yych <= 'v') goto yy1159;
- if (yych == 'x') goto yy1162;
- goto yy1149;
+ if (yych <= 's') goto yy1139;
+ if (yych <= 't') goto yy1149;
+ goto yy1147;
+ } else {
+ if (yych <= 'v') goto yy1149;
+ if (yych == 'x') goto yy1152;
+ goto yy1139;
             }
         }
     }
-yy1168:
+yy1158:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 32) {
- goto yy1168;
+ goto yy1158;
     }
     if (yych <= '!') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy1159;
- goto yy1149;
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
         } else {
- if (yych <= '\f') goto yy1159;
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
         }
     } else {
         if (yych <= '/') {
- if (yych <= '"') goto yy1165;
- if (yych <= '.') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '.') goto yy1149;
         } else {
- if (yych == '\\') goto yy1167;
- goto yy1159;
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
         }
     }
-yy1170:
+yy1160:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 64) {
- goto yy1170;
+ goto yy1160;
     }
     if (yych <= '7') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1174;
- if (yych <= '/') goto yy1159;
- goto yy1163;
+ if (yych <= '"') goto yy1164;
+ if (yych <= '/') goto yy1149;
+ goto yy1153;
             }
         }
     } else {
         if (yych <= 'U') {
- if (yych == '?') goto yy1175;
- if (yych <= 'T') goto yy1159;
- goto yy1173;
+ if (yych == '?') goto yy1165;
+ if (yych <= 'T') goto yy1149;
+ goto yy1163;
         } else {
             if (yych <= 'u') {
- if (yych <= 't') goto yy1159;
+ if (yych <= 't') goto yy1149;
             } else {
- if (yych == 'x') goto yy1176;
- goto yy1159;
+ if (yych == 'x') goto yy1166;
+ goto yy1149;
             }
         }
     }
@@ -8267,174 +8187,174 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
- goto yy1186;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ goto yy1176;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
- goto yy1186;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ goto yy1176;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych <= 'f') goto yy1186;
- goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych <= 'f') goto yy1176;
+ goto yy1149;
             }
         }
     }
-yy1173:
+yy1163:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
- goto yy1179;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ goto yy1169;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
- goto yy1179;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ goto yy1169;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych <= 'f') goto yy1179;
- goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych <= 'f') goto yy1169;
+ goto yy1149;
             }
         }
     }
-yy1174:
+yy1164:
     yyaccept = 1;
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1155;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1166;
- goto yy1167;
-yy1175:
+ if (yych <= '!') goto yy1145;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1165:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1178;
- goto yy1167;
-yy1176:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1168;
+ goto yy1157;
+yy1166:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1176;
+ goto yy1166;
     }
     if (yych <= '!') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy1159;
- goto yy1149;
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
         } else {
- if (yych <= '\f') goto yy1159;
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
         }
     } else {
         if (yych <= '?') {
- if (yych <= '"') goto yy1165;
- if (yych <= '>') goto yy1159;
- goto yy1166;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '>') goto yy1149;
+ goto yy1156;
         } else {
- if (yych == '\\') goto yy1167;
- goto yy1159;
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
         }
     }
-yy1178:
+yy1168:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 32) {
- goto yy1168;
+ goto yy1158;
     }
     if (yych <= '!') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy1159;
- goto yy1149;
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
         } else {
- if (yych <= '\f') goto yy1159;
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
         }
     } else {
         if (yych <= '/') {
- if (yych <= '"') goto yy1165;
- if (yych <= '.') goto yy1159;
- goto yy1170;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '.') goto yy1149;
+ goto yy1160;
         } else {
- if (yych == '\\') goto yy1167;
- goto yy1159;
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
         }
     }
-yy1179:
+yy1169:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8443,29 +8363,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8474,29 +8394,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8505,29 +8425,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8536,29 +8456,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8567,29 +8487,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8597,41 +8517,41 @@
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1166;
- goto yy1167;
-yy1186:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1176:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8640,29 +8560,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8670,156 +8590,156 @@
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1166;
- goto yy1167;
-yy1189:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1179:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1168;
- goto yy1167;
-yy1190:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1158;
+ goto yy1157;
+yy1180:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1191;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1181;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1191:
+yy1181:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1192;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1182;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1192:
+yy1182:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1193;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1183;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1193:
+yy1183:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1194;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1184;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1194:
+yy1184:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1195;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1185;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1195:
+yy1185:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1196;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1186;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1196:
+yy1186:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych <= '9') goto yy1159;
- goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1149;
+ goto yy1139;
     } else {
- if (yych <= 'F') goto yy1159;
- if (yych <= '`') goto yy1149;
- if (yych <= 'f') goto yy1159;
- goto yy1149;
+ if (yych <= 'F') goto yy1149;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1149;
+ goto yy1139;
     }
-yy1197:
+yy1187:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1198;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1188;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1198:
+yy1188:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1199;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1189;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1199:
+yy1189:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych <= '9') goto yy1159;
- goto yy1149;
- } else {
- if (yych <= 'F') goto yy1159;
- if (yych <= '`') goto yy1149;
- if (yych <= 'f') goto yy1159;
- goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1149;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1149;
+ goto yy1139;
     }
 }
-#line 512 "cpp.re"
+#line 502 "cpp.re"
 
 }
 
 extrawstringlit:
 {
     
-#line 8823 "cpp_re.inc"
+#line 8743 "cpp_re.inc"
 {
     YYCTYPE yych;
     static const unsigned char yybm[] = {
@@ -8860,265 +8780,265 @@
     yych = *YYCURSOR;
     if (yych <= 0x1F) {
         if (yych <= '\n') {
- if (yych <= 0x08) goto yy1202;
- if (yych <= '\t') goto yy1203;
- goto yy1207;
+ if (yych <= 0x08) goto yy1192;
+ if (yych <= '\t') goto yy1193;
+ goto yy1197;
         } else {
- if (yych <= '\f') goto yy1203;
- if (yych <= '\r') goto yy1209;
+ if (yych <= '\f') goto yy1193;
+ if (yych <= '\r') goto yy1199;
         }
     } else {
         if (yych <= '>') {
- if (yych == '"') goto yy1210;
- goto yy1203;
+ if (yych == '"') goto yy1200;
+ goto yy1193;
         } else {
- if (yych <= '?') goto yy1205;
- if (yych == '\\') goto yy1206;
- goto yy1203;
+ if (yych <= '?') goto yy1195;
+ if (yych == '\\') goto yy1196;
+ goto yy1193;
         }
     }
-yy1202:
+yy1192:
     YYCURSOR = YYMARKER;
- goto yy1204;
-yy1203:
+ goto yy1194;
+yy1193:
     ++YYCURSOR;
-yy1204:
-#line 519 "cpp.re"
+yy1194:
+#line 509 "cpp.re"
     {
             goto extrawstringlit;
         }
-#line 8891 "cpp_re.inc"
-yy1205:
+#line 8811 "cpp_re.inc"
+yy1195:
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '?') goto yy1231;
- goto yy1204;
-yy1206:
+ if (yych == '?') goto yy1221;
+ goto yy1194;
+yy1196:
     yych = *++YYCURSOR;
     if (yych <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy1203;
- goto yy1202;
+ if (yych == '"') goto yy1193;
+ goto yy1192;
             } else {
- if (yych <= '\'') goto yy1203;
- if (yych <= '/') goto yy1202;
- goto yy1216;
+ if (yych <= '\'') goto yy1193;
+ if (yych <= '/') goto yy1192;
+ goto yy1206;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy1214;
- goto yy1202;
+ if (yych == '?') goto yy1204;
+ goto yy1192;
             } else {
- if (yych <= 'U') goto yy1213;
- if (yych == '\\') goto yy1203;
- goto yy1202;
+ if (yych <= 'U') goto yy1203;
+ if (yych == '\\') goto yy1193;
+ goto yy1192;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy1203;
- if (yych <= 'e') goto yy1202;
- goto yy1203;
- } else {
- if (yych == 'n') goto yy1203;
- if (yych <= 'q') goto yy1202;
- goto yy1203;
+ if (yych <= 'b') goto yy1193;
+ if (yych <= 'e') goto yy1192;
+ goto yy1193;
+ } else {
+ if (yych == 'n') goto yy1193;
+ if (yych <= 'q') goto yy1192;
+ goto yy1193;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy1202;
- if (yych <= 't') goto yy1203;
- goto yy1212;
- } else {
- if (yych <= 'v') goto yy1203;
- if (yych == 'x') goto yy1215;
+ if (yych <= 's') goto yy1192;
+ if (yych <= 't') goto yy1193;
                 goto yy1202;
+ } else {
+ if (yych <= 'v') goto yy1193;
+ if (yych == 'x') goto yy1205;
+ goto yy1192;
             }
         }
     }
-yy1207:
+yy1197:
     ++YYCURSOR;
-yy1208:
-#line 524 "cpp.re"
+yy1198:
+#line 514 "cpp.re"
     {
             s->line += count_backslash_newlines(s, cursor) +1;
             cursor.column = 1;
             goto extrawstringlit;
         }
-#line 8950 "cpp_re.inc"
-yy1209:
+#line 8870 "cpp_re.inc"
+yy1199:
     yych = *++YYCURSOR;
- if (yych == '\n') goto yy1207;
- goto yy1208;
-yy1210:
+ if (yych == '\n') goto yy1197;
+ goto yy1198;
+yy1200:
     ++YYCURSOR;
-#line 530 "cpp.re"
+#line 520 "cpp.re"
     { BOOST_WAVE_RET(T_RAWSTRINGLIT); }
-#line 8959 "cpp_re.inc"
-yy1212:
+#line 8879 "cpp_re.inc"
+yy1202:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych <= '9') goto yy1228;
- goto yy1202;
- } else {
- if (yych <= 'F') goto yy1228;
- if (yych <= '`') goto yy1202;
- if (yych <= 'f') goto yy1228;
- goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1218;
+ goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1218;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1218;
+ goto yy1192;
     }
-yy1213:
+yy1203:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych <= '9') goto yy1221;
- goto yy1202;
- } else {
- if (yych <= 'F') goto yy1221;
- if (yych <= '`') goto yy1202;
- if (yych <= 'f') goto yy1221;
- goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1211;
+ goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1211;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1211;
+ goto yy1192;
     }
-yy1214:
+yy1204:
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '?') goto yy1220;
- goto yy1204;
-yy1215:
+ if (yych == '?') goto yy1210;
+ goto yy1194;
+yy1205:
     yych = *++YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1218;
+ goto yy1208;
     }
- goto yy1202;
-yy1216:
+ goto yy1192;
+yy1206:
     yych = *++YYCURSOR;
- if (yych <= '/') goto yy1204;
- if (yych >= '8') goto yy1204;
+ if (yych <= '/') goto yy1194;
+ if (yych >= '8') goto yy1194;
     yych = *++YYCURSOR;
- if (yych <= '/') goto yy1204;
- if (yych <= '7') goto yy1203;
- goto yy1204;
-yy1218:
+ if (yych <= '/') goto yy1194;
+ if (yych <= '7') goto yy1193;
+ goto yy1194;
+yy1208:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1218;
+ goto yy1208;
     }
- goto yy1204;
-yy1220:
+ goto yy1194;
+yy1210:
     yych = *++YYCURSOR;
- if (yych == '/') goto yy1203;
- goto yy1202;
-yy1221:
+ if (yych == '/') goto yy1193;
+ goto yy1192;
+yy1211:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1222;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1212;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1222:
+yy1212:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1223;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1213;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1223:
+yy1213:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1224;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1214;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1224:
+yy1214:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1225;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1215;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1225:
+yy1215:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1226;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1216;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1226:
+yy1216:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1227;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1217;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1227:
+yy1217:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych <= '9') goto yy1203;
- goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1193;
+ goto yy1192;
     } else {
- if (yych <= 'F') goto yy1203;
- if (yych <= '`') goto yy1202;
- if (yych <= 'f') goto yy1203;
- goto yy1202;
+ if (yych <= 'F') goto yy1193;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1193;
+ goto yy1192;
     }
-yy1228:
+yy1218:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1229;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1219;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1229:
+yy1219:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1230;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1220;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1230:
+yy1220:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych <= '9') goto yy1203;
- goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1193;
+ goto yy1192;
     } else {
- if (yych <= 'F') goto yy1203;
- if (yych <= '`') goto yy1202;
- if (yych <= 'f') goto yy1203;
- goto yy1202;
+ if (yych <= 'F') goto yy1193;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1193;
+ goto yy1192;
     }
-yy1231:
+yy1221:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '/') goto yy1206;
- goto yy1202;
+ if ((yych = *YYCURSOR) == '/') goto yy1196;
+ goto yy1192;
 }
-#line 531 "cpp.re"
+#line 521 "cpp.re"
 
 }

Modified: trunk/libs/wave/src/cpplexer/re2clex/strict_cpp.re
==============================================================================
--- trunk/libs/wave/src/cpplexer/re2clex/strict_cpp.re (original)
+++ trunk/libs/wave/src/cpplexer/re2clex/strict_cpp.re 2010-12-08 22:01:33 EST (Wed, 08 Dec 2010)
@@ -441,20 +441,14 @@
     /*!re2c
         "."? Digit (Digit | NonDigit | ExponentStart | ".")*
             { BOOST_WAVE_RET(T_PP_NUMBER); }
-
- any
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
     */
     }
     else {
     /*!re2c
         ((FractionalConstant ExponentPart?) | (Digit+ ExponentPart)) FloatingSuffix?
             { BOOST_WAVE_RET(T_FLOATLIT); }
-
- Integer { goto integer_suffix; }
 
- any
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
+ Integer { goto integer_suffix; }
     */
     }
 }
@@ -469,9 +463,6 @@
 
         IntegerSuffix?
             { BOOST_WAVE_RET(T_INTLIT); }
-
- any
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
     */
     }
     else {
@@ -481,9 +472,6 @@
 
         IntegerSuffix?
             { BOOST_WAVE_RET(T_INTLIT); }
-
- any
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
     */
     }
 }

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 2010-12-08 22:01:33 EST (Wed, 08 Dec 2010)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Wed Dec 08 19:42:44 2010 */
+/* Generated by re2c 0.13.5 on Wed Dec 08 20:59:13 2010 */
 #line 1 "strict_cpp.re"
 /*=============================================================================
     Boost.Wave: A Standard compliant C++ preprocessor library
@@ -6794,98 +6794,79 @@
     };
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
- if (yych <= '-') {
- if (yych <= 0x08) goto yy1031;
- if (yych <= '\r') goto yy1036;
- if (yych >= ' ') goto yy1036;
- } else {
- if (yych <= '.') goto yy1032;
- if (yych <= '/') goto yy1036;
- if (yych <= '9') goto yy1034;
- goto yy1036;
- }
+ if (yych == '.') goto yy1032;
+ if (yych <= '/') goto yy1031;
+ if (yych <= '9') goto yy1033;
 yy1031:
     YYCURSOR = YYMARKER;
     goto yy1035;
 yy1032:
- ++YYCURSOR;
- if ((yych = *YYCURSOR) <= '/') goto yy1033;
- if (yych <= '9') goto yy1037;
-yy1033:
-#line 446 "strict_cpp.re"
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 6818 "strict_cpp_re.inc"
-yy1034:
- yych = *(YYMARKER = ++YYCURSOR);
- goto yy1038;
-yy1035:
-#line 443 "strict_cpp.re"
- { BOOST_WAVE_RET(T_PP_NUMBER); }
-#line 6825 "strict_cpp_re.inc"
-yy1036:
     yych = *++YYCURSOR;
- goto yy1033;
-yy1037:
+ if (yych <= '/') goto yy1031;
+ if (yych >= ':') goto yy1031;
+yy1033:
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
-yy1038:
     if (yybm[0+yych] & 64) {
- goto yy1037;
+ goto yy1033;
     }
     if (yych <= 'Z') {
- if (yych == '?') goto yy1042;
- if (yych <= '@') goto yy1035;
+ if (yych == '?') goto yy1039;
+ if (yych >= 'A') goto yy1036;
     } else {
         if (yych <= '\\') {
- if (yych <= '[') goto yy1035;
- goto yy1041;
+ if (yych >= '\\') goto yy1038;
         } else {
- if (yych != 'e') goto yy1035;
+ if (yych == 'e') goto yy1036;
         }
     }
-yy1039:
+yy1035:
+#line 443 "strict_cpp.re"
+ { BOOST_WAVE_RET(T_PP_NUMBER); }
+#line 6828 "strict_cpp_re.inc"
+yy1036:
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1039;
+ goto yy1036;
     }
     if (yych <= '?') {
         if (yych <= '.') {
- if (yych == '+') goto yy1037;
+ if (yych == '+') goto yy1033;
             if (yych <= ',') goto yy1035;
- goto yy1037;
+ goto yy1033;
         } else {
             if (yych <= '/') goto yy1035;
- if (yych <= '9') goto yy1037;
+ if (yych <= '9') goto yy1033;
             if (yych <= '>') goto yy1035;
- goto yy1042;
+ goto yy1039;
         }
     } else {
         if (yych <= '\\') {
             if (yych <= '@') goto yy1035;
- if (yych <= 'Z') goto yy1037;
+ if (yych <= 'Z') goto yy1033;
             if (yych <= '[') goto yy1035;
         } else {
             if (yych <= '_') {
                 if (yych <= '^') goto yy1035;
- goto yy1037;
+ goto yy1033;
             } else {
                 if (yych <= '`') goto yy1035;
- if (yych <= 'z') goto yy1037;
+ if (yych <= 'z') goto yy1033;
                 goto yy1035;
             }
         }
     }
-yy1041:
+yy1038:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych == 'U') goto yy1045;
- if (yych == 'u') goto yy1044;
+ if (yych == 'U') goto yy1042;
+ if (yych == 'u') goto yy1041;
     goto yy1031;
-yy1042:
+yy1039:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6893,23 +6874,23 @@
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
- if (yych == '/') goto yy1041;
+ if (yych == '/') goto yy1038;
     goto yy1031;
-yy1044:
+yy1041:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
         if (yych <= '/') goto yy1031;
- if (yych <= '9') goto yy1053;
+ if (yych <= '9') goto yy1050;
         goto yy1031;
     } else {
- if (yych <= 'F') goto yy1053;
+ if (yych <= 'F') goto yy1050;
         if (yych <= '`') goto yy1031;
- if (yych <= 'f') goto yy1053;
+ if (yych <= 'f') goto yy1050;
         goto yy1031;
     }
-yy1045:
+yy1042:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6917,11 +6898,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1046;
+ if (yych <= 'F') goto yy1043;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1046:
+yy1043:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6929,11 +6910,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1047;
+ if (yych <= 'F') goto yy1044;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1047:
+yy1044:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6941,11 +6922,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1048;
+ if (yych <= 'F') goto yy1045;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1048:
+yy1045:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6953,11 +6934,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1049;
+ if (yych <= 'F') goto yy1046;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1049:
+yy1046:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6965,11 +6946,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1050;
+ if (yych <= 'F') goto yy1047;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1050:
+yy1047:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6977,11 +6958,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1051;
+ if (yych <= 'F') goto yy1048;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1051:
+yy1048:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -6989,25 +6970,25 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1052;
+ if (yych <= 'F') goto yy1049;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1052:
+yy1049:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
         if (yych <= '/') goto yy1031;
- if (yych <= '9') goto yy1037;
+ if (yych <= '9') goto yy1033;
         goto yy1031;
     } else {
- if (yych <= 'F') goto yy1037;
+ if (yych <= 'F') goto yy1033;
         if (yych <= '`') goto yy1031;
- if (yych <= 'f') goto yy1037;
+ if (yych <= 'f') goto yy1033;
         goto yy1031;
     }
-yy1053:
+yy1050:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -7015,11 +6996,11 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1054;
+ if (yych <= 'F') goto yy1051;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1054:
+yy1051:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
@@ -7027,31 +7008,31 @@
         if (yych <= '/') goto yy1031;
         if (yych >= ':') goto yy1031;
     } else {
- if (yych <= 'F') goto yy1055;
+ if (yych <= 'F') goto yy1052;
         if (yych <= '`') goto yy1031;
         if (yych >= 'g') goto yy1031;
     }
-yy1055:
+yy1052:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
         if (yych <= '/') goto yy1031;
- if (yych <= '9') goto yy1037;
+ if (yych <= '9') goto yy1033;
         goto yy1031;
     } else {
- if (yych <= 'F') goto yy1037;
+ if (yych <= 'F') goto yy1033;
         if (yych <= '`') goto yy1031;
- if (yych <= 'f') goto yy1037;
+ if (yych <= 'f') goto yy1033;
         goto yy1031;
     }
 }
-#line 447 "strict_cpp.re"
+#line 444 "strict_cpp.re"
 
     }
     else {
     
-#line 7055 "strict_cpp_re.inc"
+#line 7036 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
     unsigned int yyaccept = 0;
@@ -7091,263 +7072,229 @@
     };
     if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
     yych = *YYCURSOR;
- if (yych <= '-') {
- if (yych <= 0x08) goto yy1058;
- if (yych <= '\r') goto yy1064;
- if (yych >= ' ') goto yy1064;
+ if (yych <= '/') {
+ if (yych == '.') goto yy1060;
     } else {
- if (yych <= '/') {
- if (yych <= '.') goto yy1062;
- goto yy1064;
- } else {
- if (yych <= '0') goto yy1059;
- if (yych <= '9') goto yy1061;
- goto yy1064;
- }
+ if (yych <= '0') goto yy1056;
+ if (yych <= '9') goto yy1058;
     }
-yy1058:
+yy1055:
     YYCURSOR = YYMARKER;
     if (yyaccept <= 0) {
- goto yy1060;
+ goto yy1057;
     } else {
- goto yy1067;
+ goto yy1063;
     }
-yy1059:
+yy1056:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yybm[0+yych] & 64) {
- goto yy1081;
+ goto yy1075;
     }
     if (yych <= 'E') {
         if (yych <= '/') {
- if (yych == '.') goto yy1065;
+ if (yych == '.') goto yy1061;
         } else {
- if (yych <= '9') goto yy1084;
- if (yych >= 'E') goto yy1077;
+ if (yych <= '9') goto yy1078;
+ if (yych >= 'E') goto yy1071;
         }
     } else {
         if (yych <= 'd') {
- if (yych == 'X') goto yy1083;
+ if (yych == 'X') goto yy1077;
         } else {
- if (yych <= 'e') goto yy1077;
- if (yych == 'x') goto yy1083;
+ if (yych <= 'e') goto yy1071;
+ if (yych == 'x') goto yy1077;
         }
     }
-yy1060:
-#line 454 "strict_cpp.re"
+yy1057:
+#line 451 "strict_cpp.re"
     { goto integer_suffix; }
-#line 7140 "strict_cpp_re.inc"
-yy1061:
+#line 7113 "strict_cpp_re.inc"
+yy1058:
     yyaccept = 0;
- yych = *(YYMARKER = ++YYCURSOR);
- if (yych <= '9') {
- if (yych == '.') goto yy1065;
- if (yych <= '/') goto yy1060;
- goto yy1075;
- } else {
- if (yych <= 'E') {
- if (yych <= 'D') goto yy1060;
- goto yy1077;
- } else {
- if (yych == 'e') goto yy1077;
- goto yy1060;
- }
+ YYMARKER = ++YYCURSOR;
+ if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 32) {
+ goto yy1058;
     }
-yy1062:
- ++YYCURSOR;
- if (yybm[0+(yych = *YYCURSOR)] & 32) {
- goto yy1065;
+ if (yych <= 'D') {
+ if (yych == '.') goto yy1061;
+ goto yy1057;
+ } else {
+ if (yych <= 'E') goto yy1071;
+ if (yych == 'e') goto yy1071;
+ goto yy1057;
     }
-yy1063:
-#line 457 "strict_cpp.re"
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 7165 "strict_cpp_re.inc"
-yy1064:
+yy1060:
     yych = *++YYCURSOR;
- goto yy1063;
-yy1065:
+ if (yych <= '/') goto yy1055;
+ if (yych >= ':') goto yy1055;
+yy1061:
     yyaccept = 1;
     YYMARKER = ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
- if (yybm[0+yych] & 32) {
- goto yy1065;
- }
- if (yych <= 'L') {
- if (yych <= 'E') {
- if (yych >= 'E') goto yy1068;
+ if (yych <= 'K') {
+ if (yych <= 'D') {
+ if (yych <= '/') goto yy1063;
+ if (yych <= '9') goto yy1061;
         } else {
- if (yych <= 'F') goto yy1069;
- if (yych >= 'L') goto yy1070;
+ if (yych <= 'E') goto yy1064;
+ if (yych <= 'F') goto yy1065;
         }
     } else {
- if (yych <= 'f') {
- if (yych <= 'd') goto yy1067;
- if (yych <= 'e') goto yy1068;
- goto yy1069;
+ if (yych <= 'e') {
+ if (yych <= 'L') goto yy1066;
+ if (yych >= 'e') goto yy1064;
         } else {
- if (yych == 'l') goto yy1070;
+ if (yych <= 'f') goto yy1065;
+ if (yych == 'l') goto yy1066;
         }
     }
-yy1067:
-#line 452 "strict_cpp.re"
+yy1063:
+#line 449 "strict_cpp.re"
     { BOOST_WAVE_RET(T_FLOATLIT); }
-#line 7196 "strict_cpp_re.inc"
-yy1068:
+#line 7159 "strict_cpp_re.inc"
+yy1064:
     yych = *++YYCURSOR;
     if (yych <= ',') {
- if (yych == '+') goto yy1072;
- goto yy1058;
+ if (yych == '+') goto yy1068;
+ goto yy1055;
     } else {
- if (yych <= '-') goto yy1072;
- if (yych <= '/') goto yy1058;
- if (yych <= '9') goto yy1073;
- goto yy1058;
+ if (yych <= '-') goto yy1068;
+ if (yych <= '/') goto yy1055;
+ if (yych <= '9') goto yy1069;
+ goto yy1055;
     }
-yy1069:
+yy1065:
     yych = *++YYCURSOR;
- if (yych == 'L') goto yy1071;
- if (yych == 'l') goto yy1071;
- goto yy1067;
-yy1070:
+ if (yych == 'L') goto yy1067;
+ if (yych == 'l') goto yy1067;
+ goto yy1063;
+yy1066:
     yych = *++YYCURSOR;
- if (yych == 'F') goto yy1071;
- if (yych != 'f') goto yy1067;
-yy1071:
+ if (yych == 'F') goto yy1067;
+ if (yych != 'f') goto yy1063;
+yy1067:
     yych = *++YYCURSOR;
- goto yy1067;
-yy1072:
+ goto yy1063;
+yy1068:
     yych = *++YYCURSOR;
- if (yych <= '/') goto yy1058;
- if (yych >= ':') goto yy1058;
-yy1073:
+ if (yych <= '/') goto yy1055;
+ if (yych >= ':') goto yy1055;
+yy1069:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
     if (yych <= 'K') {
         if (yych <= '9') {
- if (yych <= '/') goto yy1067;
- goto yy1073;
- } else {
- if (yych == 'F') goto yy1069;
- goto yy1067;
- }
- } else {
- if (yych <= 'f') {
- if (yych <= 'L') goto yy1070;
- if (yych <= 'e') goto yy1067;
+ if (yych <= '/') goto yy1063;
             goto yy1069;
         } else {
- if (yych == 'l') goto yy1070;
- goto yy1067;
+ if (yych == 'F') goto yy1065;
+ goto yy1063;
         }
- }
-yy1075:
- yyaccept = 0;
- YYMARKER = ++YYCURSOR;
- if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
- yych = *YYCURSOR;
- if (yych <= '9') {
- if (yych == '.') goto yy1065;
- if (yych <= '/') goto yy1060;
- goto yy1075;
     } else {
- if (yych <= 'E') {
- if (yych <= 'D') goto yy1060;
+ if (yych <= 'f') {
+ if (yych <= 'L') goto yy1066;
+ if (yych <= 'e') goto yy1063;
+ goto yy1065;
         } else {
- if (yych != 'e') goto yy1060;
+ if (yych == 'l') goto yy1066;
+ goto yy1063;
         }
     }
-yy1077:
+yy1071:
     yych = *++YYCURSOR;
     if (yych <= ',') {
- if (yych != '+') goto yy1058;
+ if (yych != '+') goto yy1055;
     } else {
- if (yych <= '-') goto yy1078;
- if (yych <= '/') goto yy1058;
- if (yych <= '9') goto yy1079;
- goto yy1058;
+ if (yych <= '-') goto yy1072;
+ if (yych <= '/') goto yy1055;
+ if (yych <= '9') goto yy1073;
+ goto yy1055;
     }
-yy1078:
+yy1072:
     yych = *++YYCURSOR;
- if (yych <= '/') goto yy1058;
- if (yych >= ':') goto yy1058;
-yy1079:
+ if (yych <= '/') goto yy1055;
+ if (yych >= ':') goto yy1055;
+yy1073:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
     yych = *YYCURSOR;
     if (yych <= 'K') {
         if (yych <= '9') {
- if (yych <= '/') goto yy1067;
- goto yy1079;
+ if (yych <= '/') goto yy1063;
+ goto yy1073;
         } else {
- if (yych == 'F') goto yy1069;
- goto yy1067;
+ if (yych == 'F') goto yy1065;
+ goto yy1063;
         }
     } else {
         if (yych <= 'f') {
- if (yych <= 'L') goto yy1070;
- if (yych <= 'e') goto yy1067;
- goto yy1069;
+ if (yych <= 'L') goto yy1066;
+ if (yych <= 'e') goto yy1063;
+ goto yy1065;
         } else {
- if (yych == 'l') goto yy1070;
- goto yy1067;
+ if (yych == 'l') goto yy1066;
+ goto yy1063;
         }
     }
-yy1081:
+yy1075:
     yyaccept = 0;
     YYMARKER = ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 64) {
- goto yy1081;
+ goto yy1075;
     }
     if (yych <= '9') {
- if (yych == '.') goto yy1065;
- if (yych <= '/') goto yy1060;
- goto yy1084;
+ if (yych == '.') goto yy1061;
+ if (yych <= '/') goto yy1057;
+ goto yy1078;
     } else {
         if (yych <= 'E') {
- if (yych <= 'D') goto yy1060;
- goto yy1077;
+ if (yych <= 'D') goto yy1057;
+ goto yy1071;
         } else {
- if (yych == 'e') goto yy1077;
- goto yy1060;
+ if (yych == 'e') goto yy1071;
+ goto yy1057;
         }
     }
-yy1083:
+yy1077:
     yych = *++YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1086;
+ goto yy1080;
     }
- goto yy1058;
-yy1084:
+ goto yy1055;
+yy1078:
     ++YYCURSOR;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
     if (yych <= '9') {
- if (yych == '.') goto yy1065;
- if (yych <= '/') goto yy1058;
- goto yy1084;
+ if (yych == '.') goto yy1061;
+ if (yych <= '/') goto yy1055;
+ goto yy1078;
     } else {
         if (yych <= 'E') {
- if (yych <= 'D') goto yy1058;
- goto yy1077;
+ if (yych <= 'D') goto yy1055;
+ goto yy1071;
         } else {
- if (yych == 'e') goto yy1077;
- goto yy1058;
+ if (yych == 'e') goto yy1071;
+ goto yy1055;
         }
     }
-yy1086:
+yy1080:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1086;
+ goto yy1080;
     }
- goto yy1060;
+ goto yy1057;
 }
-#line 458 "strict_cpp.re"
+#line 452 "strict_cpp.re"
 
     }
 }
@@ -7357,167 +7304,140 @@
 {
     if (s->enable_ms_extensions) {
     
-#line 7361 "strict_cpp_re.inc"
+#line 7308 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
- yych = *YYCURSOR;
- if (yych <= 'U') {
- if (yych <= 0x1F) {
- if (yych <= 0x08) goto yy1090;
- if (yych <= '\r') goto yy1095;
+ yych = *(YYMARKER = YYCURSOR);
+ if (yych <= 'h') {
+ if (yych <= 'L') {
+ if (yych >= 'L') goto yy1086;
         } else {
- if (yych == 'L') goto yy1092;
- if (yych <= 'T') goto yy1095;
- goto yy1091;
+ if (yych == 'U') goto yy1085;
         }
     } else {
- if (yych <= 'k') {
- if (yych == 'i') goto yy1093;
- goto yy1095;
+ if (yych <= 'l') {
+ if (yych <= 'i') goto yy1087;
+ if (yych >= 'l') goto yy1086;
         } else {
- if (yych <= 'l') goto yy1092;
- if (yych == 'u') goto yy1091;
- goto yy1095;
+ if (yych == 'u') goto yy1085;
         }
     }
-yy1090:
-#line 471 "strict_cpp.re"
+yy1084:
+#line 465 "strict_cpp.re"
     { BOOST_WAVE_RET(T_INTLIT); }
-#line 7388 "strict_cpp_re.inc"
-yy1091:
+#line 7330 "strict_cpp_re.inc"
+yy1085:
     yych = *++YYCURSOR;
- if (yych == 'L') goto yy1102;
- if (yych == 'l') goto yy1102;
- goto yy1090;
-yy1092:
+ if (yych == 'L') goto yy1094;
+ if (yych == 'l') goto yy1094;
+ goto yy1084;
+yy1086:
     yych = *++YYCURSOR;
     if (yych <= 'U') {
- if (yych == 'L') goto yy1101;
- if (yych <= 'T') goto yy1090;
- goto yy1100;
+ if (yych == 'L') goto yy1093;
+ if (yych <= 'T') goto yy1084;
+ goto yy1092;
     } else {
         if (yych <= 'l') {
- if (yych <= 'k') goto yy1090;
- goto yy1101;
+ if (yych <= 'k') goto yy1084;
+ goto yy1093;
         } else {
- if (yych == 'u') goto yy1100;
- goto yy1090;
+ if (yych == 'u') goto yy1092;
+ goto yy1084;
         }
     }
-yy1093:
- yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '6') goto yy1096;
-yy1094:
-#line 474 "strict_cpp.re"
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 7415 "strict_cpp_re.inc"
-yy1095:
- yych = *++YYCURSOR;
- goto yy1094;
-yy1096:
+yy1087:
     yych = *++YYCURSOR;
- if (yych == '4') goto yy1098;
+ if (yych == '6') goto yy1089;
+yy1088:
     YYCURSOR = YYMARKER;
- goto yy1094;
-yy1098:
+ goto yy1084;
+yy1089:
+ yych = *++YYCURSOR;
+ if (yych != '4') goto yy1088;
+yy1090:
     ++YYCURSOR;
-yy1099:
-#line 468 "strict_cpp.re"
+yy1091:
+#line 462 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LONGINTLIT); }
-#line 7429 "strict_cpp_re.inc"
-yy1100:
+#line 7365 "strict_cpp_re.inc"
+yy1092:
     yych = *++YYCURSOR;
- goto yy1090;
-yy1101:
+ goto yy1084;
+yy1093:
     yych = *++YYCURSOR;
- if (yych == 'U') goto yy1098;
- if (yych == 'u') goto yy1098;
- goto yy1099;
-yy1102:
+ if (yych == 'U') goto yy1090;
+ if (yych == 'u') goto yy1090;
+ goto yy1091;
+yy1094:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == 'L') goto yy1098;
- if (yych == 'l') goto yy1098;
- goto yy1090;
+ if ((yych = *YYCURSOR) == 'L') goto yy1090;
+ if (yych == 'l') goto yy1090;
+ goto yy1084;
 }
-#line 475 "strict_cpp.re"
+#line 466 "strict_cpp.re"
 
     }
     else {
     
-#line 7449 "strict_cpp_re.inc"
+#line 7385 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
     if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
     yych = *YYCURSOR;
- if (yych <= 'T') {
- if (yych <= 0x1F) {
- if (yych <= 0x08) goto yy1105;
- if (yych <= '\r') goto yy1108;
- } else {
- if (yych == 'L') goto yy1107;
- goto yy1108;
- }
+ if (yych <= 'U') {
+ if (yych == 'L') goto yy1099;
+ if (yych >= 'U') goto yy1098;
     } else {
         if (yych <= 'l') {
- if (yych <= 'U') goto yy1106;
- if (yych <= 'k') goto yy1108;
- goto yy1107;
+ if (yych >= 'l') goto yy1099;
         } else {
- if (yych == 'u') goto yy1106;
- goto yy1108;
+ if (yych == 'u') goto yy1098;
         }
     }
-yy1105:
-#line 483 "strict_cpp.re"
+yy1097:
+#line 474 "strict_cpp.re"
     { BOOST_WAVE_RET(T_INTLIT); }
-#line 7475 "strict_cpp_re.inc"
-yy1106:
+#line 7403 "strict_cpp_re.inc"
+yy1098:
     yych = *++YYCURSOR;
- if (yych == 'L') goto yy1114;
- if (yych == 'l') goto yy1114;
- goto yy1105;
-yy1107:
+ if (yych == 'L') goto yy1104;
+ if (yych == 'l') goto yy1104;
+ goto yy1097;
+yy1099:
     yych = *++YYCURSOR;
     if (yych <= 'U') {
- if (yych == 'L') goto yy1111;
- if (yych <= 'T') goto yy1105;
- goto yy1110;
+ if (yych == 'L') goto yy1101;
+ if (yych <= 'T') goto yy1097;
     } else {
         if (yych <= 'l') {
- if (yych <= 'k') goto yy1105;
- goto yy1111;
+ if (yych <= 'k') goto yy1097;
+ goto yy1101;
         } else {
- if (yych == 'u') goto yy1110;
- goto yy1105;
+ if (yych != 'u') goto yy1097;
         }
     }
-yy1108:
- ++YYCURSOR;
-#line 486 "strict_cpp.re"
- { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 7500 "strict_cpp_re.inc"
-yy1110:
     yych = *++YYCURSOR;
- goto yy1105;
-yy1111:
+ goto yy1097;
+yy1101:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == 'U') goto yy1113;
- if (yych == 'u') goto yy1113;
-yy1112:
-#line 480 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == 'U') goto yy1103;
+ if (yych == 'u') goto yy1103;
+yy1102:
+#line 471 "strict_cpp.re"
     { BOOST_WAVE_RET(T_LONGINTLIT); }
-#line 7511 "strict_cpp_re.inc"
-yy1113:
+#line 7431 "strict_cpp_re.inc"
+yy1103:
     yych = *++YYCURSOR;
- goto yy1112;
-yy1114:
+ goto yy1102;
+yy1104:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == 'L') goto yy1113;
- if (yych == 'l') goto yy1113;
- goto yy1105;
+ if ((yych = *YYCURSOR) == 'L') goto yy1103;
+ if (yych == 'l') goto yy1103;
+ goto yy1097;
 }
-#line 487 "strict_cpp.re"
+#line 475 "strict_cpp.re"
 
     }
 }
@@ -7526,7 +7446,7 @@
 extcharlit:
 {
     
-#line 7530 "strict_cpp_re.inc"
+#line 7450 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
     static const unsigned char yybm[] = {
@@ -7567,305 +7487,305 @@
     yych = *YYCURSOR;
     if (yych <= 0x1F) {
         if (yych <= '\n') {
- if (yych <= 0x08) goto yy1117;
- if (yych <= '\t') goto yy1118;
- goto yy1122;
+ if (yych <= 0x08) goto yy1107;
+ if (yych <= '\t') goto yy1108;
+ goto yy1112;
         } else {
- if (yych <= '\f') goto yy1118;
- if (yych <= '\r') goto yy1122;
+ if (yych <= '\f') goto yy1108;
+ if (yych <= '\r') goto yy1112;
         }
     } else {
         if (yych <= '>') {
- if (yych == '\'') goto yy1122;
- goto yy1118;
+ if (yych == '\'') goto yy1112;
+ goto yy1108;
         } else {
- if (yych <= '?') goto yy1120;
- if (yych == '\\') goto yy1121;
- goto yy1118;
+ if (yych <= '?') goto yy1110;
+ if (yych == '\\') goto yy1111;
+ goto yy1108;
         }
     }
-yy1117:
+yy1107:
     YYCURSOR = YYMARKER;
- goto yy1119;
-yy1118:
+ goto yy1109;
+yy1108:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '\'') goto yy1130;
-yy1119:
-#line 499 "strict_cpp.re"
+ if ((yych = *YYCURSOR) == '\'') goto yy1120;
+yy1109:
+#line 487 "strict_cpp.re"
     { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 7597 "strict_cpp_re.inc"
-yy1120:
+#line 7517 "strict_cpp_re.inc"
+yy1110:
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '\'') goto yy1130;
- if (yych == '?') goto yy1145;
- goto yy1119;
-yy1121:
+ if (yych == '\'') goto yy1120;
+ if (yych == '?') goto yy1135;
+ goto yy1109;
+yy1111:
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy1125;
- goto yy1119;
+ if (yych == '"') goto yy1115;
+ goto yy1109;
             } else {
- if (yych <= '\'') goto yy1125;
- if (yych <= '/') goto yy1119;
- goto yy1128;
+ if (yych <= '\'') goto yy1115;
+ if (yych <= '/') goto yy1109;
+ goto yy1118;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy1126;
- goto yy1119;
+ if (yych == '?') goto yy1116;
+ goto yy1109;
             } else {
- if (yych <= 'U') goto yy1124;
- if (yych == '\\') goto yy1125;
- goto yy1119;
+ if (yych <= 'U') goto yy1114;
+ if (yych == '\\') goto yy1115;
+ goto yy1109;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy1125;
- if (yych <= 'e') goto yy1119;
- goto yy1125;
- } else {
- if (yych == 'n') goto yy1125;
- if (yych <= 'q') goto yy1119;
- goto yy1125;
+ if (yych <= 'b') goto yy1115;
+ if (yych <= 'e') goto yy1109;
+ goto yy1115;
+ } else {
+ if (yych == 'n') goto yy1115;
+ if (yych <= 'q') goto yy1109;
+ goto yy1115;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy1119;
- if (yych <= 't') goto yy1125;
- goto yy1123;
- } else {
- if (yych <= 'v') goto yy1125;
- if (yych == 'x') goto yy1127;
- goto yy1119;
+ if (yych <= 's') goto yy1109;
+ if (yych <= 't') goto yy1115;
+ goto yy1113;
+ } else {
+ if (yych <= 'v') goto yy1115;
+ if (yych == 'x') goto yy1117;
+ goto yy1109;
             }
         }
     }
-yy1122:
+yy1112:
     yych = *++YYCURSOR;
- goto yy1119;
-yy1123:
+ goto yy1109;
+yy1113:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych <= '9') goto yy1142;
- goto yy1117;
- } else {
- if (yych <= 'F') goto yy1142;
- if (yych <= '`') goto yy1117;
- if (yych <= 'f') goto yy1142;
- goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1132;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1132;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1132;
+ goto yy1107;
     }
-yy1124:
+yy1114:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych <= '9') goto yy1135;
- goto yy1117;
- } else {
- if (yych <= 'F') goto yy1135;
- if (yych <= '`') goto yy1117;
- if (yych <= 'f') goto yy1135;
- goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1125;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1125;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1125;
+ goto yy1107;
     }
-yy1125:
+yy1115:
     yych = *++YYCURSOR;
- if (yych == '\'') goto yy1130;
- goto yy1117;
-yy1126:
+ if (yych == '\'') goto yy1120;
+ goto yy1107;
+yy1116:
     yych = *++YYCURSOR;
- if (yych == '\'') goto yy1130;
- if (yych == '?') goto yy1134;
- goto yy1117;
-yy1127:
+ if (yych == '\'') goto yy1120;
+ if (yych == '?') goto yy1124;
+ goto yy1107;
+yy1117:
     yych = *++YYCURSOR;
- if (yych == '\'') goto yy1117;
- goto yy1133;
-yy1128:
+ if (yych == '\'') goto yy1107;
+ goto yy1123;
+yy1118:
     yych = *++YYCURSOR;
- if (yych == '\'') goto yy1130;
- if (yych <= '/') goto yy1117;
- if (yych >= '8') goto yy1117;
- yych = *++YYCURSOR;
- if (yych == '\'') goto yy1130;
- if (yych <= '/') goto yy1117;
- if (yych <= '7') goto yy1125;
- goto yy1117;
-yy1130:
+ if (yych == '\'') goto yy1120;
+ if (yych <= '/') goto yy1107;
+ if (yych >= '8') goto yy1107;
+ yych = *++YYCURSOR;
+ if (yych == '\'') goto yy1120;
+ if (yych <= '/') goto yy1107;
+ if (yych <= '7') goto yy1115;
+ goto yy1107;
+yy1120:
     ++YYCURSOR;
-#line 496 "strict_cpp.re"
+#line 484 "strict_cpp.re"
     { BOOST_WAVE_RET(T_CHARLIT); }
-#line 7702 "strict_cpp_re.inc"
-yy1132:
+#line 7622 "strict_cpp_re.inc"
+yy1122:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
-yy1133:
+yy1123:
     if (yybm[0+yych] & 128) {
- goto yy1132;
+ goto yy1122;
     }
- if (yych == '\'') goto yy1130;
- goto yy1117;
-yy1134:
+ if (yych == '\'') goto yy1120;
+ goto yy1107;
+yy1124:
     yych = *++YYCURSOR;
- if (yych == '/') goto yy1125;
- goto yy1117;
-yy1135:
+ if (yych == '/') goto yy1115;
+ goto yy1107;
+yy1125:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1136;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1126;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1136:
+yy1126:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1137;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1127;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1137:
+yy1127:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1138;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1128;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1138:
+yy1128:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1139;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1129;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1139:
+yy1129:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1140;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1130;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1140:
+yy1130:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1141;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1131;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1141:
+yy1131:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych <= '9') goto yy1125;
- goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1115;
+ goto yy1107;
     } else {
- if (yych <= 'F') goto yy1125;
- if (yych <= '`') goto yy1117;
- if (yych <= 'f') goto yy1125;
- goto yy1117;
+ if (yych <= 'F') goto yy1115;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1115;
+ goto yy1107;
     }
-yy1142:
+yy1132:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1143;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1133;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1143:
+yy1133:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych >= ':') goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych >= ':') goto yy1107;
     } else {
- if (yych <= 'F') goto yy1144;
- if (yych <= '`') goto yy1117;
- if (yych >= 'g') goto yy1117;
+ if (yych <= 'F') goto yy1134;
+ if (yych <= '`') goto yy1107;
+ if (yych >= 'g') goto yy1107;
     }
-yy1144:
+yy1134:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1117;
- if (yych <= '9') goto yy1125;
- goto yy1117;
- } else {
- if (yych <= 'F') goto yy1125;
- if (yych <= '`') goto yy1117;
- if (yych <= 'f') goto yy1125;
- goto yy1117;
+ if (yych <= '/') goto yy1107;
+ if (yych <= '9') goto yy1115;
+ goto yy1107;
+ } else {
+ if (yych <= 'F') goto yy1115;
+ if (yych <= '`') goto yy1107;
+ if (yych <= 'f') goto yy1115;
+ goto yy1107;
     }
-yy1145:
+yy1135:
     yych = *++YYCURSOR;
- if (yych != '/') goto yy1117;
+ if (yych != '/') goto yy1107;
     ++YYCURSOR;
     if ((yych = *YYCURSOR) <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy1125;
- goto yy1117;
+ if (yych == '"') goto yy1115;
+ goto yy1107;
             } else {
- if (yych <= '\'') goto yy1125;
- if (yych <= '/') goto yy1117;
- goto yy1128;
+ if (yych <= '\'') goto yy1115;
+ if (yych <= '/') goto yy1107;
+ goto yy1118;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy1126;
- goto yy1117;
+ if (yych == '?') goto yy1116;
+ goto yy1107;
             } else {
- if (yych <= 'U') goto yy1124;
- if (yych == '\\') goto yy1125;
- goto yy1117;
+ if (yych <= 'U') goto yy1114;
+ if (yych == '\\') goto yy1115;
+ goto yy1107;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy1125;
- if (yych <= 'e') goto yy1117;
- goto yy1125;
- } else {
- if (yych == 'n') goto yy1125;
- if (yych <= 'q') goto yy1117;
- goto yy1125;
+ if (yych <= 'b') goto yy1115;
+ if (yych <= 'e') goto yy1107;
+ goto yy1115;
+ } else {
+ if (yych == 'n') goto yy1115;
+ if (yych <= 'q') goto yy1107;
+ goto yy1115;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy1117;
- if (yych <= 't') goto yy1125;
- goto yy1123;
- } else {
- if (yych <= 'v') goto yy1125;
- if (yych == 'x') goto yy1127;
- goto yy1117;
+ if (yych <= 's') goto yy1107;
+ if (yych <= 't') goto yy1115;
+ goto yy1113;
+ } else {
+ if (yych <= 'v') goto yy1115;
+ if (yych == 'x') goto yy1117;
+ goto yy1107;
             }
         }
     }
 }
-#line 500 "strict_cpp.re"
+#line 488 "strict_cpp.re"
 
 }
 
@@ -7873,7 +7793,7 @@
 extstringlit:
 {
     
-#line 7877 "strict_cpp_re.inc"
+#line 7797 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
     unsigned int yyaccept = 0;
@@ -7915,323 +7835,323 @@
     yych = *YYCURSOR;
     if (yych <= 0x1F) {
         if (yych <= '\n') {
- if (yych <= 0x08) goto yy1149;
- if (yych <= '\t') goto yy1150;
- goto yy1156;
+ if (yych <= 0x08) goto yy1139;
+ if (yych <= '\t') goto yy1140;
+ goto yy1146;
         } else {
- if (yych <= '\f') goto yy1150;
- if (yych <= '\r') goto yy1156;
+ if (yych <= '\f') goto yy1140;
+ if (yych <= '\r') goto yy1146;
         }
     } else {
         if (yych <= '>') {
- if (yych == '"') goto yy1154;
- goto yy1150;
+ if (yych == '"') goto yy1144;
+ goto yy1140;
         } else {
- if (yych <= '?') goto yy1152;
- if (yych == '\\') goto yy1153;
- goto yy1150;
+ if (yych <= '?') goto yy1142;
+ if (yych == '\\') goto yy1143;
+ goto yy1140;
         }
     }
-yy1149:
+yy1139:
     YYCURSOR = YYMARKER;
     if (yyaccept <= 0) {
- goto yy1151;
+ goto yy1141;
     } else {
- goto yy1155;
+ goto yy1145;
     }
-yy1150:
+yy1140:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '\n') {
- if (yych == '\t') goto yy1160;
+ if (yych == '\t') goto yy1150;
     } else {
- if (yych <= '\f') goto yy1160;
- if (yych >= ' ') goto yy1160;
+ if (yych <= '\f') goto yy1150;
+ if (yych >= ' ') goto yy1150;
     }
-yy1151:
-#line 511 "strict_cpp.re"
+yy1141:
+#line 499 "strict_cpp.re"
     { BOOST_WAVE_RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType)); }
-#line 7955 "strict_cpp_re.inc"
-yy1152:
+#line 7875 "strict_cpp_re.inc"
+yy1142:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yybm[0+yych] & 32) {
- goto yy1168;
+ goto yy1158;
     }
     if (yych <= '\n') {
- if (yych == '\t') goto yy1160;
- goto yy1151;
+ if (yych == '\t') goto yy1150;
+ goto yy1141;
     } else {
- if (yych <= '\f') goto yy1160;
- if (yych <= 0x1F) goto yy1151;
- goto yy1160;
+ if (yych <= '\f') goto yy1150;
+ if (yych <= 0x1F) goto yy1141;
+ goto yy1150;
     }
-yy1153:
+yy1143:
     yyaccept = 0;
     yych = *(YYMARKER = ++YYCURSOR);
     if (yych <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy1159;
- goto yy1151;
+ if (yych == '"') goto yy1149;
+ goto yy1141;
             } else {
- if (yych <= '\'') goto yy1159;
- if (yych <= '/') goto yy1151;
- goto yy1163;
+ if (yych <= '\'') goto yy1149;
+ if (yych <= '/') goto yy1141;
+ goto yy1153;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy1161;
- goto yy1151;
+ if (yych == '?') goto yy1151;
+ goto yy1141;
             } else {
- if (yych <= 'U') goto yy1158;
- if (yych == '\\') goto yy1159;
- goto yy1151;
+ if (yych <= 'U') goto yy1148;
+ if (yych == '\\') goto yy1149;
+ goto yy1141;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy1159;
- if (yych <= 'e') goto yy1151;
- goto yy1159;
- } else {
- if (yych == 'n') goto yy1159;
- if (yych <= 'q') goto yy1151;
- goto yy1159;
+ if (yych <= 'b') goto yy1149;
+ if (yych <= 'e') goto yy1141;
+ goto yy1149;
+ } else {
+ if (yych == 'n') goto yy1149;
+ if (yych <= 'q') goto yy1141;
+ goto yy1149;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy1151;
- if (yych <= 't') goto yy1159;
- goto yy1157;
- } else {
- if (yych <= 'v') goto yy1159;
- if (yych == 'x') goto yy1162;
- goto yy1151;
+ if (yych <= 's') goto yy1141;
+ if (yych <= 't') goto yy1149;
+ goto yy1147;
+ } else {
+ if (yych <= 'v') goto yy1149;
+ if (yych == 'x') goto yy1152;
+ goto yy1141;
             }
         }
     }
-yy1154:
+yy1144:
     ++YYCURSOR;
-yy1155:
-#line 508 "strict_cpp.re"
+yy1145:
+#line 496 "strict_cpp.re"
     { BOOST_WAVE_RET(T_STRINGLIT); }
-#line 8021 "strict_cpp_re.inc"
-yy1156:
+#line 7941 "strict_cpp_re.inc"
+yy1146:
     yych = *++YYCURSOR;
- goto yy1151;
-yy1157:
+ goto yy1141;
+yy1147:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych <= '9') goto yy1197;
- goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1187;
+ goto yy1139;
     } else {
- if (yych <= 'F') goto yy1197;
- if (yych <= '`') goto yy1149;
- if (yych <= 'f') goto yy1197;
- goto yy1149;
+ if (yych <= 'F') goto yy1187;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1187;
+ goto yy1139;
     }
-yy1158:
+yy1148:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych <= '9') goto yy1190;
- goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1180;
+ goto yy1139;
     } else {
- if (yych <= 'F') goto yy1190;
- if (yych <= '`') goto yy1149;
- if (yych <= 'f') goto yy1190;
- goto yy1149;
+ if (yych <= 'F') goto yy1180;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1180;
+ goto yy1139;
     }
-yy1159:
+yy1149:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
-yy1160:
+yy1150:
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1166;
- goto yy1167;
-yy1161:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1151:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1189;
- goto yy1167;
-yy1162:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1179;
+ goto yy1157;
+yy1152:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1176;
+ goto yy1166;
     }
- goto yy1149;
-yy1163:
+ goto yy1139;
+yy1153:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '"') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy1159;
- goto yy1149;
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
         } else {
- if (yych <= '\f') goto yy1159;
- if (yych <= 0x1F) goto yy1149;
- if (yych <= '!') goto yy1159;
- goto yy1165;
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ if (yych <= '!') goto yy1149;
+ goto yy1155;
         }
     } else {
         if (yych <= '>') {
- if (yych <= '/') goto yy1159;
- if (yych >= '8') goto yy1159;
+ if (yych <= '/') goto yy1149;
+ if (yych >= '8') goto yy1149;
         } else {
- if (yych <= '?') goto yy1166;
- if (yych == '\\') goto yy1167;
- goto yy1159;
+ if (yych <= '?') goto yy1156;
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
         }
     }
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1166;
- goto yy1167;
-yy1165:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1155:
     yych = *++YYCURSOR;
- goto yy1155;
-yy1166:
+ goto yy1145;
+yy1156:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1168;
-yy1167:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1158;
+yy1157:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy1159;
- goto yy1149;
+ if (yych == '"') goto yy1149;
+ goto yy1139;
             } else {
- if (yych <= '\'') goto yy1159;
- if (yych <= '/') goto yy1149;
- goto yy1163;
+ if (yych <= '\'') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ goto yy1153;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy1161;
- goto yy1149;
+ if (yych == '?') goto yy1151;
+ goto yy1139;
             } else {
- if (yych <= 'U') goto yy1158;
- if (yych == '\\') goto yy1159;
- goto yy1149;
+ if (yych <= 'U') goto yy1148;
+ if (yych == '\\') goto yy1149;
+ goto yy1139;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy1159;
- if (yych <= 'e') goto yy1149;
- goto yy1159;
- } else {
- if (yych == 'n') goto yy1159;
- if (yych <= 'q') goto yy1149;
- goto yy1159;
+ if (yych <= 'b') goto yy1149;
+ if (yych <= 'e') goto yy1139;
+ goto yy1149;
+ } else {
+ if (yych == 'n') goto yy1149;
+ if (yych <= 'q') goto yy1139;
+ goto yy1149;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy1149;
- if (yych <= 't') goto yy1159;
- goto yy1157;
- } else {
- if (yych <= 'v') goto yy1159;
- if (yych == 'x') goto yy1162;
- goto yy1149;
+ if (yych <= 's') goto yy1139;
+ if (yych <= 't') goto yy1149;
+ goto yy1147;
+ } else {
+ if (yych <= 'v') goto yy1149;
+ if (yych == 'x') goto yy1152;
+ goto yy1139;
             }
         }
     }
-yy1168:
+yy1158:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 32) {
- goto yy1168;
+ goto yy1158;
     }
     if (yych <= '!') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy1159;
- goto yy1149;
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
         } else {
- if (yych <= '\f') goto yy1159;
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
         }
     } else {
         if (yych <= '/') {
- if (yych <= '"') goto yy1165;
- if (yych <= '.') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '.') goto yy1149;
         } else {
- if (yych == '\\') goto yy1167;
- goto yy1159;
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
         }
     }
-yy1170:
+yy1160:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 64) {
- goto yy1170;
+ goto yy1160;
     }
     if (yych <= '7') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1174;
- if (yych <= '/') goto yy1159;
- goto yy1163;
+ if (yych <= '"') goto yy1164;
+ if (yych <= '/') goto yy1149;
+ goto yy1153;
             }
         }
     } else {
         if (yych <= 'U') {
- if (yych == '?') goto yy1175;
- if (yych <= 'T') goto yy1159;
- goto yy1173;
+ if (yych == '?') goto yy1165;
+ if (yych <= 'T') goto yy1149;
+ goto yy1163;
         } else {
             if (yych <= 'u') {
- if (yych <= 't') goto yy1159;
+ if (yych <= 't') goto yy1149;
             } else {
- if (yych == 'x') goto yy1176;
- goto yy1159;
+ if (yych == 'x') goto yy1166;
+ goto yy1149;
             }
         }
     }
@@ -8240,174 +8160,174 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
- goto yy1186;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ goto yy1176;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
- goto yy1186;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ goto yy1176;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych <= 'f') goto yy1186;
- goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych <= 'f') goto yy1176;
+ goto yy1149;
             }
         }
     }
-yy1173:
+yy1163:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
- goto yy1179;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
+ goto yy1169;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
- goto yy1179;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
+ goto yy1169;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych <= 'f') goto yy1179;
- goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych <= 'f') goto yy1169;
+ goto yy1149;
             }
         }
     }
-yy1174:
+yy1164:
     yyaccept = 1;
     YYMARKER = ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1155;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1166;
- goto yy1167;
-yy1175:
+ if (yych <= '!') goto yy1145;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1165:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1178;
- goto yy1167;
-yy1176:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1168;
+ goto yy1157;
+yy1166:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1176;
+ goto yy1166;
     }
     if (yych <= '!') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy1159;
- goto yy1149;
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
         } else {
- if (yych <= '\f') goto yy1159;
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
         }
     } else {
         if (yych <= '?') {
- if (yych <= '"') goto yy1165;
- if (yych <= '>') goto yy1159;
- goto yy1166;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '>') goto yy1149;
+ goto yy1156;
         } else {
- if (yych == '\\') goto yy1167;
- goto yy1159;
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
         }
     }
-yy1178:
+yy1168:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 32) {
- goto yy1168;
+ goto yy1158;
     }
     if (yych <= '!') {
         if (yych <= '\n') {
- if (yych == '\t') goto yy1159;
- goto yy1149;
+ if (yych == '\t') goto yy1149;
+ goto yy1139;
         } else {
- if (yych <= '\f') goto yy1159;
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= '\f') goto yy1149;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
         }
     } else {
         if (yych <= '/') {
- if (yych <= '"') goto yy1165;
- if (yych <= '.') goto yy1159;
- goto yy1170;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '.') goto yy1149;
+ goto yy1160;
         } else {
- if (yych == '\\') goto yy1167;
- goto yy1159;
+ if (yych == '\\') goto yy1157;
+ goto yy1149;
         }
     }
-yy1179:
+yy1169:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8416,29 +8336,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8447,29 +8367,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8478,29 +8398,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8509,29 +8429,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8540,29 +8460,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8570,41 +8490,41 @@
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1166;
- goto yy1167;
-yy1186:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1176:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8613,29 +8533,29 @@
     yych = *YYCURSOR;
     if (yych <= '9') {
         if (yych <= '\f') {
- if (yych == '\t') goto yy1159;
- if (yych <= '\n') goto yy1149;
- goto yy1159;
+ if (yych == '\t') goto yy1149;
+ if (yych <= '\n') goto yy1139;
+ goto yy1149;
         } else {
             if (yych <= '!') {
- if (yych <= 0x1F) goto yy1149;
- goto yy1159;
+ if (yych <= 0x1F) goto yy1139;
+ goto yy1149;
             } else {
- if (yych <= '"') goto yy1165;
- if (yych <= '/') goto yy1159;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '/') goto yy1149;
             }
         }
     } else {
         if (yych <= 'F') {
- if (yych == '?') goto yy1166;
- if (yych <= '@') goto yy1159;
+ if (yych == '?') goto yy1156;
+ if (yych <= '@') goto yy1149;
         } else {
             if (yych <= '\\') {
- if (yych <= '[') goto yy1159;
- goto yy1167;
+ if (yych <= '[') goto yy1149;
+ goto yy1157;
             } else {
- if (yych <= '`') goto yy1159;
- if (yych >= 'g') goto yy1159;
+ if (yych <= '`') goto yy1149;
+ if (yych >= 'g') goto yy1149;
             }
         }
     }
@@ -8643,156 +8563,156 @@
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1166;
- goto yy1167;
-yy1189:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1156;
+ goto yy1157;
+yy1179:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 16) {
- goto yy1159;
+ goto yy1149;
     }
- if (yych <= '!') goto yy1149;
- if (yych <= '"') goto yy1165;
- if (yych <= '[') goto yy1168;
- goto yy1167;
-yy1190:
+ if (yych <= '!') goto yy1139;
+ if (yych <= '"') goto yy1155;
+ if (yych <= '[') goto yy1158;
+ goto yy1157;
+yy1180:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1191;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1181;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1191:
+yy1181:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1192;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1182;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1192:
+yy1182:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1193;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1183;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1193:
+yy1183:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1194;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1184;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1194:
+yy1184:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1195;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1185;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1195:
+yy1185:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1196;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1186;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1196:
+yy1186:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych <= '9') goto yy1159;
- goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1149;
+ goto yy1139;
     } else {
- if (yych <= 'F') goto yy1159;
- if (yych <= '`') goto yy1149;
- if (yych <= 'f') goto yy1159;
- goto yy1149;
+ if (yych <= 'F') goto yy1149;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1149;
+ goto yy1139;
     }
-yy1197:
+yy1187:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1198;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1188;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1198:
+yy1188:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych >= ':') goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych >= ':') goto yy1139;
     } else {
- if (yych <= 'F') goto yy1199;
- if (yych <= '`') goto yy1149;
- if (yych >= 'g') goto yy1149;
+ if (yych <= 'F') goto yy1189;
+ if (yych <= '`') goto yy1139;
+ if (yych >= 'g') goto yy1139;
     }
-yy1199:
+yy1189:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1149;
- if (yych <= '9') goto yy1159;
- goto yy1149;
- } else {
- if (yych <= 'F') goto yy1159;
- if (yych <= '`') goto yy1149;
- if (yych <= 'f') goto yy1159;
- goto yy1149;
+ if (yych <= '/') goto yy1139;
+ if (yych <= '9') goto yy1149;
+ goto yy1139;
+ } else {
+ if (yych <= 'F') goto yy1149;
+ if (yych <= '`') goto yy1139;
+ if (yych <= 'f') goto yy1149;
+ goto yy1139;
     }
 }
-#line 512 "strict_cpp.re"
+#line 500 "strict_cpp.re"
 
 }
 
 extrawstringlit:
 {
     
-#line 8796 "strict_cpp_re.inc"
+#line 8716 "strict_cpp_re.inc"
 {
     YYCTYPE yych;
     static const unsigned char yybm[] = {
@@ -8833,265 +8753,265 @@
     yych = *YYCURSOR;
     if (yych <= 0x1F) {
         if (yych <= '\n') {
- if (yych <= 0x08) goto yy1202;
- if (yych <= '\t') goto yy1203;
- goto yy1207;
+ if (yych <= 0x08) goto yy1192;
+ if (yych <= '\t') goto yy1193;
+ goto yy1197;
         } else {
- if (yych <= '\f') goto yy1203;
- if (yych <= '\r') goto yy1209;
+ if (yych <= '\f') goto yy1193;
+ if (yych <= '\r') goto yy1199;
         }
     } else {
         if (yych <= '>') {
- if (yych == '"') goto yy1210;
- goto yy1203;
+ if (yych == '"') goto yy1200;
+ goto yy1193;
         } else {
- if (yych <= '?') goto yy1205;
- if (yych == '\\') goto yy1206;
- goto yy1203;
+ if (yych <= '?') goto yy1195;
+ if (yych == '\\') goto yy1196;
+ goto yy1193;
         }
     }
-yy1202:
+yy1192:
     YYCURSOR = YYMARKER;
- goto yy1204;
-yy1203:
+ goto yy1194;
+yy1193:
     ++YYCURSOR;
-yy1204:
-#line 519 "strict_cpp.re"
+yy1194:
+#line 507 "strict_cpp.re"
     {
             goto extrawstringlit;
         }
-#line 8864 "strict_cpp_re.inc"
-yy1205:
+#line 8784 "strict_cpp_re.inc"
+yy1195:
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '?') goto yy1231;
- goto yy1204;
-yy1206:
+ if (yych == '?') goto yy1221;
+ goto yy1194;
+yy1196:
     yych = *++YYCURSOR;
     if (yych <= '`') {
         if (yych <= '7') {
             if (yych <= '&') {
- if (yych == '"') goto yy1203;
- goto yy1202;
+ if (yych == '"') goto yy1193;
+ goto yy1192;
             } else {
- if (yych <= '\'') goto yy1203;
- if (yych <= '/') goto yy1202;
- goto yy1216;
+ if (yych <= '\'') goto yy1193;
+ if (yych <= '/') goto yy1192;
+ goto yy1206;
             }
         } else {
             if (yych <= 'T') {
- if (yych == '?') goto yy1214;
- goto yy1202;
+ if (yych == '?') goto yy1204;
+ goto yy1192;
             } else {
- if (yych <= 'U') goto yy1213;
- if (yych == '\\') goto yy1203;
- goto yy1202;
+ if (yych <= 'U') goto yy1203;
+ if (yych == '\\') goto yy1193;
+ goto yy1192;
             }
         }
     } else {
         if (yych <= 'r') {
             if (yych <= 'f') {
- if (yych <= 'b') goto yy1203;
- if (yych <= 'e') goto yy1202;
- goto yy1203;
- } else {
- if (yych == 'n') goto yy1203;
- if (yych <= 'q') goto yy1202;
- goto yy1203;
+ if (yych <= 'b') goto yy1193;
+ if (yych <= 'e') goto yy1192;
+ goto yy1193;
+ } else {
+ if (yych == 'n') goto yy1193;
+ if (yych <= 'q') goto yy1192;
+ goto yy1193;
             }
         } else {
             if (yych <= 'u') {
- if (yych <= 's') goto yy1202;
- if (yych <= 't') goto yy1203;
- goto yy1212;
- } else {
- if (yych <= 'v') goto yy1203;
- if (yych == 'x') goto yy1215;
+ if (yych <= 's') goto yy1192;
+ if (yych <= 't') goto yy1193;
                 goto yy1202;
+ } else {
+ if (yych <= 'v') goto yy1193;
+ if (yych == 'x') goto yy1205;
+ goto yy1192;
             }
         }
     }
-yy1207:
+yy1197:
     ++YYCURSOR;
-yy1208:
-#line 524 "strict_cpp.re"
+yy1198:
+#line 512 "strict_cpp.re"
     {
             s->line += count_backslash_newlines(s, cursor) +1;
             cursor.column = 1;
             goto extrawstringlit;
         }
-#line 8923 "strict_cpp_re.inc"
-yy1209:
+#line 8843 "strict_cpp_re.inc"
+yy1199:
     yych = *++YYCURSOR;
- if (yych == '\n') goto yy1207;
- goto yy1208;
-yy1210:
+ if (yych == '\n') goto yy1197;
+ goto yy1198;
+yy1200:
     ++YYCURSOR;
-#line 530 "strict_cpp.re"
+#line 518 "strict_cpp.re"
     { BOOST_WAVE_RET(T_RAWSTRINGLIT); }
-#line 8932 "strict_cpp_re.inc"
-yy1212:
+#line 8852 "strict_cpp_re.inc"
+yy1202:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych <= '9') goto yy1228;
- goto yy1202;
- } else {
- if (yych <= 'F') goto yy1228;
- if (yych <= '`') goto yy1202;
- if (yych <= 'f') goto yy1228;
- goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1218;
+ goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1218;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1218;
+ goto yy1192;
     }
-yy1213:
+yy1203:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych <= '9') goto yy1221;
- goto yy1202;
- } else {
- if (yych <= 'F') goto yy1221;
- if (yych <= '`') goto yy1202;
- if (yych <= 'f') goto yy1221;
- goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1211;
+ goto yy1192;
+ } else {
+ if (yych <= 'F') goto yy1211;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1211;
+ goto yy1192;
     }
-yy1214:
+yy1204:
     yych = *(YYMARKER = ++YYCURSOR);
- if (yych == '?') goto yy1220;
- goto yy1204;
-yy1215:
+ if (yych == '?') goto yy1210;
+ goto yy1194;
+yy1205:
     yych = *++YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1218;
+ goto yy1208;
     }
- goto yy1202;
-yy1216:
+ goto yy1192;
+yy1206:
     yych = *++YYCURSOR;
- if (yych <= '/') goto yy1204;
- if (yych >= '8') goto yy1204;
+ if (yych <= '/') goto yy1194;
+ if (yych >= '8') goto yy1194;
     yych = *++YYCURSOR;
- if (yych <= '/') goto yy1204;
- if (yych <= '7') goto yy1203;
- goto yy1204;
-yy1218:
+ if (yych <= '/') goto yy1194;
+ if (yych <= '7') goto yy1193;
+ goto yy1194;
+yy1208:
     ++YYCURSOR;
     if (YYLIMIT <= YYCURSOR) YYFILL(1);
     yych = *YYCURSOR;
     if (yybm[0+yych] & 128) {
- goto yy1218;
+ goto yy1208;
     }
- goto yy1204;
-yy1220:
+ goto yy1194;
+yy1210:
     yych = *++YYCURSOR;
- if (yych == '/') goto yy1203;
- goto yy1202;
-yy1221:
+ if (yych == '/') goto yy1193;
+ goto yy1192;
+yy1211:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1222;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1212;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1222:
+yy1212:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1223;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1213;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1223:
+yy1213:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1224;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1214;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1224:
+yy1214:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1225;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1215;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1225:
+yy1215:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1226;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1216;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1226:
+yy1216:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1227;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1217;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1227:
+yy1217:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych <= '9') goto yy1203;
- goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1193;
+ goto yy1192;
     } else {
- if (yych <= 'F') goto yy1203;
- if (yych <= '`') goto yy1202;
- if (yych <= 'f') goto yy1203;
- goto yy1202;
+ if (yych <= 'F') goto yy1193;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1193;
+ goto yy1192;
     }
-yy1228:
+yy1218:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1229;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1219;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1229:
+yy1219:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych >= ':') goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych >= ':') goto yy1192;
     } else {
- if (yych <= 'F') goto yy1230;
- if (yych <= '`') goto yy1202;
- if (yych >= 'g') goto yy1202;
+ if (yych <= 'F') goto yy1220;
+ if (yych <= '`') goto yy1192;
+ if (yych >= 'g') goto yy1192;
     }
-yy1230:
+yy1220:
     yych = *++YYCURSOR;
     if (yych <= '@') {
- if (yych <= '/') goto yy1202;
- if (yych <= '9') goto yy1203;
- goto yy1202;
+ if (yych <= '/') goto yy1192;
+ if (yych <= '9') goto yy1193;
+ goto yy1192;
     } else {
- if (yych <= 'F') goto yy1203;
- if (yych <= '`') goto yy1202;
- if (yych <= 'f') goto yy1203;
- goto yy1202;
+ if (yych <= 'F') goto yy1193;
+ if (yych <= '`') goto yy1192;
+ if (yych <= 'f') goto yy1193;
+ goto yy1192;
     }
-yy1231:
+yy1221:
     ++YYCURSOR;
- if ((yych = *YYCURSOR) == '/') goto yy1206;
- goto yy1202;
+ if ((yych = *YYCURSOR) == '/') goto yy1196;
+ goto yy1192;
 }
-#line 531 "strict_cpp.re"
+#line 519 "strict_cpp.re"
 
 }

Added: trunk/libs/wave/test/testwave/testfiles/t_2_021.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/wave/test/testwave/testfiles/t_2_021.cpp 2010-12-08 22:01:33 EST (Wed, 08 Dec 2010)
@@ -0,0 +1,50 @@
+/*=============================================================================
+ Boost.Wave: A Standard compliant C++ preprocessor library
+ http://www.boost.org/
+
+ Copyright (c) 2001-2010 Hartmut Kaiser. Distributed under the Boost
+ Software License, Version 1.0. (See accompanying file
+ LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+
+#define SIX (4 + 2.0)
+
+//R #line 14 "t_2_021.cpp"
+//R #pragma command option
+#pragma command option
+//R #line 17 "t_2_021.cpp"
+//R #pragma command option (4 + 2.0)
+#pragma command option SIX
+//R #line 20 "t_2_021.cpp"
+//R #pragma command option[(4 + 2.0)]
+#pragma command option[SIX]
+//R #line 23 "t_2_021.cpp"
+//R #pragma command option(5)
+#pragma command option(5)
+//R #line 26 "t_2_021.cpp"
+//R #pragma command option((4 + 2.0))
+#pragma command option(SIX)
+//R #line 29 "t_2_021.cpp"
+//R #pragma command (4 + 2.0)
+#pragma command SIX
+
+//H 10: t_2_021.cpp(10): #define
+//H 08: t_2_021.cpp(10): SIX=(4 + 2.0)
+//H 10: t_2_021.cpp(14): #pragma
+//H 10: t_2_021.cpp(17): #pragma
+//H 01: t_2_021.cpp(10): SIX
+//H 02: (4 + 2.0)
+//H 03: (4 + 2.0)
+//H 10: t_2_021.cpp(20): #pragma
+//H 01: t_2_021.cpp(10): SIX
+//H 02: (4 + 2.0)
+//H 03: (4 + 2.0)
+//H 10: t_2_021.cpp(23): #pragma
+//H 10: t_2_021.cpp(26): #pragma
+//H 01: t_2_021.cpp(10): SIX
+//H 02: (4 + 2.0)
+//H 03: (4 + 2.0)
+//H 10: t_2_021.cpp(29): #pragma
+//H 01: t_2_021.cpp(10): SIX
+//H 02: (4 + 2.0)
+//H 03: (4 + 2.0)

Modified: trunk/libs/wave/test/testwave/testfiles/test.cfg
==============================================================================
--- trunk/libs/wave/test/testwave/testfiles/test.cfg (original)
+++ trunk/libs/wave/test/testwave/testfiles/test.cfg 2010-12-08 22:01:33 EST (Wed, 08 Dec 2010)
@@ -73,6 +73,7 @@
 t_2_018.cpp
 t_2_019.cpp
 t_2_020.cpp
+t_2_021.cpp
 
 #
 # t_3: Predefined macros


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