From f631c8d5121f508303ec596181fd59d6728ab2bc Mon Sep 17 00:00:00 2001
From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
Date: Tue, 26 Apr 2005 19:21:49 +0000
Subject: [PATCH] Switched to the most recent version of re2c (V0.9.7.dev).

[SVN r28491]
---
 ChangeLog                           |    3 +-
 samples/waveidl/idllexer/idl.re     |    2 -
 samples/waveidl/idllexer/idl_re.cpp | 1136 ++++++++--------
 src/cpplexer/re2clex/cpp.re         |    2 -
 src/cpplexer/re2clex/cpp_re.cpp     | 1852 +++++++++++++++------------
 test/build/Jamfile                  |    2 +-
 6 files changed, 1636 insertions(+), 1361 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f67ab5..d800df7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,7 +35,8 @@ CHANGELOG
   config files were not found.
 - Fixed a command line parsing problem caused by a change in the parameter
   handling inside in the program_options library.
-  
+- Switched to the most recent version of re2c (V0.9.7.dev).
+
 Thu Apr  7 10:07:45 WEDT 2005
 Version 1.1.16
 - Fixed a bug in the white space eating component, which prevented a C++ 
diff --git a/samples/waveidl/idllexer/idl.re b/samples/waveidl/idllexer/idl.re
index 25197fc..bb30288 100644
--- a/samples/waveidl/idllexer/idl.re
+++ b/samples/waveidl/idllexer/idl.re
@@ -521,7 +521,6 @@ ccomment:
     "\000"
     {
         using namespace std;      // some systems have printf in std
-        yyaccept = 0;   /* avoid warning about unreferenced variable */
         if(cursor == s->eof) 
         {
             if (s->error_proc)
@@ -559,7 +558,6 @@ cppcomment:
     "\000"
     {
         using namespace std;      // some systems have printf in std
-        yyaccept = 0;   /* avoid warning about unreferenced variable */
         if(cursor != s->eof) 
         {
             if (s->error_proc)
diff --git a/samples/waveidl/idllexer/idl_re.cpp b/samples/waveidl/idllexer/idl_re.cpp
index d58c660..094ab2b 100644
--- a/samples/waveidl/idllexer/idl_re.cpp
+++ b/samples/waveidl/idllexer/idl_re.cpp
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.5 on Tue Apr  5 10:52:48 2005 */
+/* Generated by re2c 0.9.7.dev on Tue Apr 26 21:15:22 2005 */
 #line 1 "idl.re"
 /*=============================================================================
     Boost.Wave: A Standard compliant C++ preprocessor library
@@ -369,48 +369,50 @@ scan(boost::wave::cpplexer::re2clex::Scanner *s)
 
     uchar *cursor = s->tok = s->cur;
 
-#line 387
+#line 387 "idl.re"
 
 
+
+#line 377 "idl_re.cpp"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
 	goto yy0;
-yy1:	++YYCURSOR;
+	++YYCURSOR;
 yy0:
 	if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy70;
-	case '\001':
-	case '\002':
-	case '\003':
-	case '\004':
-	case '\005':
-	case '\006':
-	case '\a':
-	case '\b':	case '\016':
-	case '\017':
-	case '\020':
-	case '\021':
-	case '\022':
-	case '\023':
-	case '\024':
-	case '\025':
-	case '\026':
-	case '\027':
-	case '\030':
-	case '\031':
-	case '\032':
-	case '\033':
-	case '\034':
-	case '\035':
-	case '\036':
-	case '\037':	goto yy2;
-	case '\t':	case '\v':
-	case '\f':	case ' ':	goto yy65;
-	case '\n':	goto yy67;
-	case '\r':	goto yy69;
+	case 0x00:	goto yy70;
+	case 0x01:
+	case 0x02:
+	case 0x03:
+	case 0x04:
+	case 0x05:
+	case 0x06:
+	case 0x07:
+	case 0x08:	case 0x0E:
+	case 0x0F:
+	case 0x10:
+	case 0x11:
+	case 0x12:
+	case 0x13:
+	case 0x14:
+	case 0x15:
+	case 0x16:
+	case 0x17:
+	case 0x18:
+	case 0x19:
+	case 0x1A:
+	case 0x1B:
+	case 0x1C:
+	case 0x1D:
+	case 0x1E:
+	case 0x1F:	goto yy2;
+	case 0x09:	case 0x0B:
+	case 0x0C:	case ' ':	goto yy65;
+	case 0x0A:	goto yy67;
+	case 0x0D:	goto yy69;
 	case '!':	goto yy46;
 	case '"':	goto yy64;
 	case '#':	goto yy16;
@@ -515,50 +517,56 @@ yy2:	YYCURSOR = YYMARKER;
 	case 9:	goto yy294;
 	case 4:	goto yy59;
 	}
-yy3:	yych = *++YYCURSOR;
-	if(yych == '*')	goto yy356;
+yy3:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '*')	goto yy356;
 	if(yych == '/')	goto yy354;
 	goto yy4;
 yy4:
-#line 411
-	{ RET(T_DIVIDE); }
+#line 411 "idl.re"
+{ RET(T_DIVIDE); }
+#line 528 "idl_re.cpp"
 yy5:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'R')	goto yy350;
 	goto yy202;
 yy6:
-#line 434
-	{ RET(T_IDENTIFIER); }
+#line 434 "idl.re"
+{ RET(T_IDENTIFIER); }
+#line 536 "idl_re.cpp"
 yy7:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'A')	goto yy345;
 	goto yy202;
-yy8:	yych = *++YYCURSOR;
+yy8:	++YYCURSOR;
 	goto yy9;
 yy9:
-#line 396
-	{ RET(T_LEFTBRACE); }
-yy10:	yych = *++YYCURSOR;
+#line 396 "idl.re"
+{ RET(T_LEFTBRACE); }
+#line 546 "idl_re.cpp"
+yy10:	++YYCURSOR;
 	goto yy11;
 yy11:
-#line 397
-	{ RET(T_RIGHTBRACE); }
-yy12:	yych = *++YYCURSOR;
+#line 397 "idl.re"
+{ RET(T_RIGHTBRACE); }
+#line 552 "idl_re.cpp"
+yy12:	++YYCURSOR;
 	goto yy13;
 yy13:
-#line 398
-	{ RET(T_LEFTBRACKET); }
-yy14:	yych = *++YYCURSOR;
+#line 398 "idl.re"
+{ RET(T_LEFTBRACKET); }
+#line 558 "idl_re.cpp"
+yy14:	++YYCURSOR;
 	goto yy15;
 yy15:
-#line 399
-	{ RET(T_RIGHTBRACKET); }
+#line 399 "idl.re"
+{ RET(T_RIGHTBRACKET); }
+#line 564 "idl_re.cpp"
 yy16:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'e'){
 		if(yych <= '"'){
-			if(yych <= '\t'){
-				if(yych >= '\t')	goto yy239;
+			if(yych <= 0x09){
+				if(yych >= 0x09)	goto yy239;
 				goto yy17;
 			} else {
 				if(yych == ' ')	goto yy239;
@@ -595,121 +603,141 @@ yy16:	yyaccept = 1;
 		}
 	}
 yy17:
-#line 400
-	{ RET(T_POUND); }
-yy18:	yych = *++YYCURSOR;
+#line 400 "idl.re"
+{ RET(T_POUND); }
+#line 609 "idl_re.cpp"
+yy18:	++YYCURSOR;
 	goto yy19;
 yy19:
-#line 402
-	{ RET(T_LEFTPAREN); }
-yy20:	yych = *++YYCURSOR;
+#line 402 "idl.re"
+{ RET(T_LEFTPAREN); }
+#line 615 "idl_re.cpp"
+yy20:	++YYCURSOR;
 	goto yy21;
 yy21:
-#line 403
-	{ RET(T_RIGHTPAREN); }
-yy22:	yych = *++YYCURSOR;
+#line 403 "idl.re"
+{ RET(T_RIGHTPAREN); }
+#line 621 "idl_re.cpp"
+yy22:	++YYCURSOR;
 	goto yy23;
 yy23:
-#line 404
-	{ RET(T_SEMICOLON); }
-yy24:	yych = *++YYCURSOR;
+#line 404 "idl.re"
+{ RET(T_SEMICOLON); }
+#line 627 "idl_re.cpp"
+yy24:	++YYCURSOR;
 	goto yy25;
 yy25:
-#line 405
-	{ RET(T_COLON); }
+#line 405 "idl.re"
+{ RET(T_COLON); }
+#line 633 "idl_re.cpp"
 yy26:	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == '?')	goto yy341;
 	goto yy27;
 yy27:
-#line 406
-	{ RET(T_QUESTION_MARK); }
-yy28:	yych = *++YYCURSOR;
-	if(yych <= '/')	goto yy29;
+#line 406 "idl.re"
+{ RET(T_QUESTION_MARK); }
+#line 641 "idl_re.cpp"
+yy28:	++YYCURSOR;
+	if((yych = *YYCURSOR) <= '/')	goto yy29;
 	if(yych <= '9')	goto yy168;
 	goto yy29;
 yy29:
-#line 407
-	{ RET(T_DOT); }
-yy30:	yych = *++YYCURSOR;
-	if(yych == '+')	goto yy339;
+#line 407 "idl.re"
+{ RET(T_DOT); }
+#line 649 "idl_re.cpp"
+yy30:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '+')	goto yy339;
 	goto yy31;
 yy31:
-#line 408
-	{ RET(T_PLUS); }
-yy32:	yych = *++YYCURSOR;
-	if(yych == '-')	goto yy337;
+#line 408 "idl.re"
+{ RET(T_PLUS); }
+#line 656 "idl_re.cpp"
+yy32:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '-')	goto yy337;
 	goto yy33;
 yy33:
-#line 409
-	{ RET(T_MINUS); }
-yy34:	yych = *++YYCURSOR;
+#line 409 "idl.re"
+{ RET(T_MINUS); }
+#line 663 "idl_re.cpp"
+yy34:	++YYCURSOR;
 	goto yy35;
 yy35:
-#line 410
-	{ RET(T_STAR); }
+#line 410 "idl.re"
+{ RET(T_STAR); }
+#line 669 "idl_re.cpp"
 yy36:	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == ':')	goto yy238;
 	goto yy37;
 yy37:
-#line 412
-	{ RET(T_PERCENT); }
-yy38:	yych = *++YYCURSOR;
+#line 412 "idl.re"
+{ RET(T_PERCENT); }
+#line 677 "idl_re.cpp"
+yy38:	++YYCURSOR;
 	goto yy39;
 yy39:
-#line 413
-	{ RET(T_XOR); }
-yy40:	yych = *++YYCURSOR;
-	if(yych == '&')	goto yy236;
+#line 413 "idl.re"
+{ RET(T_XOR); }
+#line 683 "idl_re.cpp"
+yy40:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '&')	goto yy236;
 	goto yy41;
 yy41:
-#line 414
-	{ RET(T_AND); }
-yy42:	yych = *++YYCURSOR;
-	if(yych == '|')	goto yy234;
+#line 414 "idl.re"
+{ RET(T_AND); }
+#line 690 "idl_re.cpp"
+yy42:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '|')	goto yy234;
 	goto yy43;
 yy43:
-#line 415
-	{ RET(T_OR); }
-yy44:	yych = *++YYCURSOR;
+#line 415 "idl.re"
+{ RET(T_OR); }
+#line 697 "idl_re.cpp"
+yy44:	++YYCURSOR;
 	goto yy45;
 yy45:
-#line 416
-	{ RET(T_COMPL); }
-yy46:	yych = *++YYCURSOR;
-	if(yych == '=')	goto yy232;
+#line 416 "idl.re"
+{ RET(T_COMPL); }
+#line 703 "idl_re.cpp"
+yy46:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '=')	goto yy232;
 	goto yy47;
 yy47:
-#line 417
-	{ RET(T_NOT); }
-yy48:	yych = *++YYCURSOR;
-	if(yych == '=')	goto yy230;
+#line 417 "idl.re"
+{ RET(T_NOT); }
+#line 710 "idl_re.cpp"
+yy48:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '=')	goto yy230;
 	goto yy49;
 yy49:
-#line 418
-	{ RET(T_ASSIGN); }
-yy50:	yych = *++YYCURSOR;
-	if(yych <= ';')	goto yy51;
+#line 418 "idl.re"
+{ RET(T_ASSIGN); }
+#line 717 "idl_re.cpp"
+yy50:	++YYCURSOR;
+	if((yych = *YYCURSOR) <= ';')	goto yy51;
 	if(yych <= '<')	goto yy228;
 	if(yych <= '=')	goto yy226;
 	goto yy51;
 yy51:
-#line 419
-	{ RET(T_LESS); }
-yy52:	yych = *++YYCURSOR;
-	if(yych <= '<')	goto yy53;
+#line 419 "idl.re"
+{ RET(T_LESS); }
+#line 726 "idl_re.cpp"
+yy52:	++YYCURSOR;
+	if((yych = *YYCURSOR) <= '<')	goto yy53;
 	if(yych <= '=')	goto yy222;
 	if(yych <= '>')	goto yy224;
 	goto yy53;
 yy53:
-#line 420
-	{ RET(T_GREATER); }
-yy54:	yych = *++YYCURSOR;
+#line 420 "idl.re"
+{ RET(T_GREATER); }
+#line 735 "idl_re.cpp"
+yy54:	++YYCURSOR;
 	goto yy55;
 yy55:
-#line 431
-	{ RET(T_COMMA); }
+#line 431 "idl.re"
+{ RET(T_COMMA); }
+#line 741 "idl_re.cpp"
 yy56:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	goto yy202;
@@ -749,8 +777,8 @@ yy58:	yyaccept = 4;
 	if(yych == 'u')	goto yy192;
 	goto yy59;
 yy59:
-#line 498
-	{
+#line 498 "idl.re"
+{
         /* if (0 != s->error_proc)
             (*s->error_proc)(s, "Unexpected character: '%c'", *s->tok);
         else
@@ -758,6 +786,7 @@ yy59:
         */
         RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType));
     }
+#line 790 "idl_re.cpp"
 yy60:	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'U'){
@@ -803,8 +832,9 @@ yy60:	yyaccept = 5;
 		}
 	}
 yy61:
-#line 437
-	{ RET(T_INTLIT); }
+#line 437 "idl.re"
+{ RET(T_INTLIT); }
+#line 838 "idl_re.cpp"
 yy62:	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'L'){
@@ -844,46 +874,49 @@ yy62:	yyaccept = 5;
 	}
 yy63:	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych <= '\f'){
-		if(yych == '\t')	goto yy121;
-		if(yych <= '\n')	goto yy59;
+	if(yych <= 0x0C){
+		if(yych == 0x09)	goto yy121;
+		if(yych <= 0x0A)	goto yy59;
 		goto yy121;
 	} else {
-		if(yych <= '\037')	goto yy59;
+		if(yych <= 0x1F)	goto yy59;
 		if(yych == '\'')	goto yy59;
 		goto yy121;
 	}
 yy64:	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych <= '\n'){
-		if(yych == '\t')	goto yy77;
+	if(yych <= 0x0A){
+		if(yych == 0x09)	goto yy77;
 		goto yy59;
 	} else {
-		if(yych <= '\f')	goto yy77;
-		if(yych <= '\037')	goto yy59;
+		if(yych <= 0x0C)	goto yy77;
+		if(yych <= 0x1F)	goto yy59;
 		goto yy77;
 	}
-yy65:	yych = *++YYCURSOR;
+yy65:	++YYCURSOR;
+	yych = *YYCURSOR;
 	goto yy75;
 yy66:
-#line 476
-	{ RET(T_SPACE); }
-yy67:	yych = *++YYCURSOR;
+#line 476 "idl.re"
+{ RET(T_SPACE); }
+#line 903 "idl_re.cpp"
+yy67:	++YYCURSOR;
 	goto yy68;
 yy68:
-#line 479
-	{
+#line 479 "idl.re"
+{
         s->line++;
         RET(T_NEWLINE);
     }
+#line 912 "idl_re.cpp"
 yy69:	yych = *++YYCURSOR;
-	if(yych == '\n')	goto yy73;
+	if(yych == 0x0A)	goto yy73;
 	goto yy68;
-yy70:	yych = *++YYCURSOR;
+yy70:	++YYCURSOR;
 	goto yy71;
 yy71:
-#line 485
-	{
+#line 485 "idl.re"
+{
         if(cursor != s->eof) 
         {
             using namespace std;      // some systems have printf in std
@@ -894,6 +927,7 @@ yy71:
         }
         RET(T_EOF);
     }
+#line 931 "idl_re.cpp"
 yy72:	yych = *++YYCURSOR;
 	goto yy59;
 yy73:	yych = *++YYCURSOR;
@@ -902,11 +936,11 @@ yy74:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy75;
-yy75:	if(yych <= '\n'){
-		if(yych == '\t')	goto yy74;
+yy75:	if(yych <= 0x0A){
+		if(yych == 0x09)	goto yy74;
 		goto yy66;
 	} else {
-		if(yych <= '\f')	goto yy74;
+		if(yych <= 0x0C)	goto yy74;
 		if(yych == ' ')	goto yy74;
 		goto yy66;
 	}
@@ -915,12 +949,12 @@ yy76:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy77;
 yy77:	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy76;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy76;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy76;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy76;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy76;
 		}
 	} else {
@@ -937,12 +971,12 @@ yy78:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy76;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy76;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy76;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy76;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy76;
 		}
 	} else {
@@ -1001,11 +1035,12 @@ yy79:	++YYCURSOR;
 			}
 		}
 	}
-yy80:	yych = *++YYCURSOR;
+yy80:	++YYCURSOR;
 	goto yy81;
 yy81:
-#line 449
-	{ RET(T_STRINGLIT); }
+#line 449 "idl.re"
+{ RET(T_STRINGLIT); }
+#line 1044 "idl_re.cpp"
 yy82:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
@@ -1036,12 +1071,12 @@ yy84:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy76;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy76;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy76;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy76;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy76;
 		}
 	} else {
@@ -1071,12 +1106,12 @@ yy86:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '"'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy76;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy76;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy76;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy76;
+			if(yych <= 0x1F)	goto yy2;
 			if(yych <= '!')	goto yy76;
 			goto yy80;
 		}
@@ -1095,12 +1130,12 @@ yy87:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy76;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy76;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy76;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy76;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy76;
 		}
 	} else {
@@ -1118,13 +1153,13 @@ yy88:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy89;
 yy89:	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy76;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy76;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy76;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy76;
 			} else {
 				if(yych <= '"')	goto yy80;
@@ -1152,12 +1187,12 @@ yy90:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy76;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy76;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy76;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy76;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy76;
 		}
 	} else {
@@ -1175,12 +1210,12 @@ yy91:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy92;
 yy92:	if(yych <= '"'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy76;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy76;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy76;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy76;
+			if(yych <= 0x1F)	goto yy2;
 			if(yych <= '!')	goto yy76;
 			goto yy80;
 		}
@@ -1199,13 +1234,13 @@ yy93:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy94;
 yy94:	if(yych <= '>'){
-		if(yych <= '\037'){
-			if(yych <= '\t'){
-				if(yych <= '\b')	goto yy2;
+		if(yych <= 0x1F){
+			if(yych <= 0x09){
+				if(yych <= 0x08)	goto yy2;
 				goto yy76;
 			} else {
-				if(yych <= '\n')	goto yy2;
-				if(yych <= '\f')	goto yy76;
+				if(yych <= 0x0A)	goto yy2;
+				if(yych <= 0x0C)	goto yy76;
 				goto yy2;
 			}
 		} else {
@@ -1242,13 +1277,13 @@ yy95:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy76;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy76;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy76;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy76;
 			} else {
 				if(yych <= '"')	goto yy80;
@@ -1276,13 +1311,13 @@ yy96:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy76;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy76;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy76;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy76;
 			} else {
 				if(yych <= '"')	goto yy80;
@@ -1311,12 +1346,12 @@ yy97:	yyaccept = 6;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy76;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy76;
 			goto yy81;
 		} else {
-			if(yych <= '\f')	goto yy76;
-			if(yych <= '\037')	goto yy81;
+			if(yych <= 0x0C)	goto yy76;
+			if(yych <= 0x1F)	goto yy81;
 			goto yy76;
 		}
 	} else {
@@ -1333,12 +1368,12 @@ yy98:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy76;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy76;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy76;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy76;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy76;
 		}
 	} else {
@@ -1355,12 +1390,12 @@ yy99:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '"'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy76;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy76;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy76;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy76;
+			if(yych <= 0x1F)	goto yy2;
 			if(yych <= '!')	goto yy76;
 			goto yy80;
 		}
@@ -1378,13 +1413,13 @@ yy100:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy76;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy76;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy76;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy76;
 			} else {
 				if(yych <= '"')	goto yy80;
@@ -1412,13 +1447,13 @@ yy101:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy76;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy76;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy76;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy76;
 			} else {
 				if(yych <= '"')	goto yy80;
@@ -1446,13 +1481,13 @@ yy102:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy76;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy76;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy76;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy76;
 			} else {
 				if(yych <= '"')	goto yy80;
@@ -1480,13 +1515,13 @@ yy103:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy76;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy76;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy76;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy76;
 			} else {
 				if(yych <= '"')	goto yy80;
@@ -1514,13 +1549,13 @@ yy104:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy76;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy76;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy76;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy76;
 			} else {
 				if(yych <= '"')	goto yy80;
@@ -1548,13 +1583,13 @@ yy105:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy76;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy76;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy76;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy76;
 			} else {
 				if(yych <= '"')	goto yy80;
@@ -1582,12 +1617,12 @@ yy106:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy76;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy76;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy76;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy76;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy76;
 		}
 	} else {
@@ -1604,13 +1639,13 @@ yy107:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy76;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy76;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy76;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy76;
 			} else {
 				if(yych <= '"')	goto yy80;
@@ -1638,13 +1673,13 @@ yy108:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy76;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy76;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy76;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy76;
 			} else {
 				if(yych <= '"')	goto yy80;
@@ -1672,12 +1707,12 @@ yy109:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy76;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy76;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy76;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy76;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy76;
 		}
 	} else {
@@ -1825,12 +1860,12 @@ yy120:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy121;
 yy121:	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy120;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy120;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy120;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy120;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy120;
 		}
 	} else {
@@ -1847,12 +1882,12 @@ yy122:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy120;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy120;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy120;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy120;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy120;
 		}
 	} else {
@@ -1941,12 +1976,12 @@ yy126:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy120;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy120;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy120;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy120;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy120;
 		}
 	} else {
@@ -1976,12 +2011,12 @@ yy128:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '\''){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy120;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy120;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy120;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy120;
+			if(yych <= 0x1F)	goto yy2;
 			if(yych <= '&')	goto yy120;
 			goto yy130;
 		}
@@ -2000,12 +2035,12 @@ yy129:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy120;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy120;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy120;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy120;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy120;
 		}
 	} else {
@@ -2018,23 +2053,24 @@ yy129:	++YYCURSOR;
 			goto yy120;
 		}
 	}
-yy130:	yych = *++YYCURSOR;
+yy130:	++YYCURSOR;
 	goto yy131;
 yy131:
-#line 446
-	{ RET(T_CHARLIT); }
+#line 446 "idl.re"
+{ RET(T_CHARLIT); }
+#line 2062 "idl_re.cpp"
 yy132:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy133;
 yy133:	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy120;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy120;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy120;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy120;
 			} else {
 				if(yych <= '\'')	goto yy130;
@@ -2062,12 +2098,12 @@ yy134:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy120;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy120;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy120;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy120;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy120;
 		}
 	} else {
@@ -2085,12 +2121,12 @@ yy135:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy136;
 yy136:	if(yych <= '\''){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy120;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy120;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy120;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy120;
+			if(yych <= 0x1F)	goto yy2;
 			if(yych <= '&')	goto yy120;
 			goto yy130;
 		}
@@ -2109,13 +2145,13 @@ yy137:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy138;
 yy138:	if(yych <= '>'){
-		if(yych <= '\037'){
-			if(yych <= '\t'){
-				if(yych <= '\b')	goto yy2;
+		if(yych <= 0x1F){
+			if(yych <= 0x09){
+				if(yych <= 0x08)	goto yy2;
 				goto yy120;
 			} else {
-				if(yych <= '\n')	goto yy2;
-				if(yych <= '\f')	goto yy120;
+				if(yych <= 0x0A)	goto yy2;
+				if(yych <= 0x0C)	goto yy120;
 				goto yy2;
 			}
 		} else {
@@ -2152,13 +2188,13 @@ yy139:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy120;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy120;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy120;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy120;
 			} else {
 				if(yych <= '\'')	goto yy130;
@@ -2186,13 +2222,13 @@ yy140:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy120;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy120;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy120;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy120;
 			} else {
 				if(yych <= '\'')	goto yy130;
@@ -2221,12 +2257,12 @@ yy141:	yyaccept = 7;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy120;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy120;
 			goto yy131;
 		} else {
-			if(yych <= '\f')	goto yy120;
-			if(yych <= '\037')	goto yy131;
+			if(yych <= 0x0C)	goto yy120;
+			if(yych <= 0x1F)	goto yy131;
 			goto yy120;
 		}
 	} else {
@@ -2243,12 +2279,12 @@ yy142:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy120;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy120;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy120;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy120;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy120;
 		}
 	} else {
@@ -2265,12 +2301,12 @@ yy143:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '\''){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy120;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy120;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy120;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy120;
+			if(yych <= 0x1F)	goto yy2;
 			if(yych <= '&')	goto yy120;
 			goto yy130;
 		}
@@ -2288,13 +2324,13 @@ yy144:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy120;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy120;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy120;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy120;
 			} else {
 				if(yych <= '\'')	goto yy130;
@@ -2322,13 +2358,13 @@ yy145:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy120;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy120;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy120;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy120;
 			} else {
 				if(yych <= '\'')	goto yy130;
@@ -2356,13 +2392,13 @@ yy146:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy120;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy120;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy120;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy120;
 			} else {
 				if(yych <= '\'')	goto yy130;
@@ -2390,13 +2426,13 @@ yy147:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy120;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy120;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy120;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy120;
 			} else {
 				if(yych <= '\'')	goto yy130;
@@ -2424,13 +2460,13 @@ yy148:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy120;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy120;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy120;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy120;
 			} else {
 				if(yych <= '\'')	goto yy130;
@@ -2458,13 +2494,13 @@ yy149:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy120;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy120;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy120;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy120;
 			} else {
 				if(yych <= '\'')	goto yy130;
@@ -2492,12 +2528,12 @@ yy150:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy120;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy120;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy120;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy120;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy120;
 		}
 	} else {
@@ -2514,13 +2550,13 @@ yy151:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy120;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy120;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy120;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy120;
 			} else {
 				if(yych <= '\'')	goto yy130;
@@ -2548,13 +2584,13 @@ yy152:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy120;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy120;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy120;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy120;
 			} else {
 				if(yych <= '\'')	goto yy130;
@@ -2582,12 +2618,12 @@ yy153:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy120;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy120;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy120;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy120;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy120;
 		}
 	} else {
@@ -2730,14 +2766,15 @@ yy163:	++YYCURSOR;
 		if(yych <= 'f')	goto yy120;
 		goto yy2;
 	}
-yy164:	yych = *++YYCURSOR;
+yy164:	++YYCURSOR;
 	goto yy165;
 yy165:
-#line 443
-	{ RET(T_FIXEDPOINTLIT); }
+#line 443 "idl.re"
+{ RET(T_FIXEDPOINTLIT); }
+#line 2775 "idl_re.cpp"
 yy166:	yyaccept = 5;
 	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	goto yy167;
 yy167:	if(yych <= 'L'){
@@ -2777,7 +2814,7 @@ yy167:	if(yych <= 'L'){
 	}
 yy168:	yyaccept = 8;
 	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	goto yy169;
 yy169:	if(yych <= 'K'){
@@ -2804,8 +2841,9 @@ yy169:	if(yych <= 'K'){
 		}
 	}
 yy170:
-#line 440
-	{ RET(T_FLOATLIT); }
+#line 440 "idl.re"
+{ RET(T_FLOATLIT); }
+#line 2847 "idl_re.cpp"
 yy171:	yych = *++YYCURSOR;
 	if(yych <= ','){
 		if(yych == '+')	goto yy175;
@@ -2831,7 +2869,7 @@ yy175:	yych = *++YYCURSOR;
 	if(yych >= ':')	goto yy2;
 	goto yy176;
 yy176:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	goto yy177;
 yy177:	if(yych <= 'K'){
@@ -3336,54 +3374,62 @@ yy220:	yych = *++YYCURSOR;
 yy221:	yych = *++YYCURSOR;
 	if(yych == '\'')	goto yy2;
 	goto yy121;
-yy222:	yych = *++YYCURSOR;
+yy222:	++YYCURSOR;
 	goto yy223;
 yy223:
-#line 426
-	{ RET(T_GREATEREQUAL); }
-yy224:	yych = *++YYCURSOR;
+#line 426 "idl.re"
+{ RET(T_GREATEREQUAL); }
+#line 3383 "idl_re.cpp"
+yy224:	++YYCURSOR;
 	goto yy225;
 yy225:
-#line 422
-	{ RET(T_SHIFTRIGHT); }
-yy226:	yych = *++YYCURSOR;
+#line 422 "idl.re"
+{ RET(T_SHIFTRIGHT); }
+#line 3389 "idl_re.cpp"
+yy226:	++YYCURSOR;
 	goto yy227;
 yy227:
-#line 425
-	{ RET(T_LESSEQUAL); }
-yy228:	yych = *++YYCURSOR;
+#line 425 "idl.re"
+{ RET(T_LESSEQUAL); }
+#line 3395 "idl_re.cpp"
+yy228:	++YYCURSOR;
 	goto yy229;
 yy229:
-#line 421
-	{ RET(T_SHIFTLEFT); }
-yy230:	yych = *++YYCURSOR;
+#line 421 "idl.re"
+{ RET(T_SHIFTLEFT); }
+#line 3401 "idl_re.cpp"
+yy230:	++YYCURSOR;
 	goto yy231;
 yy231:
-#line 423
-	{ RET(T_EQUAL); }
-yy232:	yych = *++YYCURSOR;
+#line 423 "idl.re"
+{ RET(T_EQUAL); }
+#line 3407 "idl_re.cpp"
+yy232:	++YYCURSOR;
 	goto yy233;
 yy233:
-#line 424
-	{ RET(T_NOTEQUAL); }
-yy234:	yych = *++YYCURSOR;
+#line 424 "idl.re"
+{ RET(T_NOTEQUAL); }
+#line 3413 "idl_re.cpp"
+yy234:	++YYCURSOR;
 	goto yy235;
 yy235:
-#line 428
-	{ RET(T_OROR); }
-yy236:	yych = *++YYCURSOR;
+#line 428 "idl.re"
+{ RET(T_OROR); }
+#line 3419 "idl_re.cpp"
+yy236:	++YYCURSOR;
 	goto yy237;
 yy237:
-#line 427
-	{ RET(T_ANDAND); }
+#line 427 "idl.re"
+{ RET(T_ANDAND); }
+#line 3425 "idl_re.cpp"
 yy238:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	if((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
 	yych = *YYCURSOR;
 	goto yy239;
 yy239:	if(yych <= 'h'){
 		if(yych <= '.'){
-			if(yych <= '\t'){
-				if(yych <= '\b')	goto yy2;
+			if(yych <= 0x09){
+				if(yych <= 0x08)	goto yy2;
 				goto yy238;
 			} else {
 				if(yych == ' ')	goto yy238;
@@ -3467,11 +3513,12 @@ yy251:	yych = *++YYCURSOR;
 yy252:	yych = *++YYCURSOR;
 	if(yych != 'g')	goto yy2;
 	goto yy253;
-yy253:	yych = *++YYCURSOR;
+yy253:	++YYCURSOR;
 	goto yy254;
 yy254:
-#line 473
-	{ RET(T_PP_WARNING); }
+#line 473 "idl.re"
+{ RET(T_PP_WARNING); }
+#line 3522 "idl_re.cpp"
 yy255:	yych = *++YYCURSOR;
 	if(yych != 'a')	goto yy2;
 	goto yy256;
@@ -3484,22 +3531,24 @@ yy257:	yych = *++YYCURSOR;
 yy258:	yych = *++YYCURSOR;
 	if(yych != 'a')	goto yy2;
 	goto yy259;
-yy259:	yych = *++YYCURSOR;
+yy259:	++YYCURSOR;
 	goto yy260;
 yy260:
-#line 471
-	{ RET(T_PP_PRAGMA); }
+#line 471 "idl.re"
+{ RET(T_PP_PRAGMA); }
+#line 3540 "idl_re.cpp"
 yy261:	yych = *++YYCURSOR;
 	if(yych != 'n')	goto yy2;
 	goto yy262;
 yy262:	yych = *++YYCURSOR;
 	if(yych != 'e')	goto yy2;
 	goto yy263;
-yy263:	yych = *++YYCURSOR;
+yy263:	++YYCURSOR;
 	goto yy264;
 yy264:
-#line 469
-	{ RET(T_PP_LINE); }
+#line 469 "idl.re"
+{ RET(T_PP_LINE); }
+#line 3552 "idl_re.cpp"
 yy265:	yych = *++YYCURSOR;
 	if(yych != 'd')	goto yy2;
 	goto yy266;
@@ -3509,11 +3558,12 @@ yy266:	yych = *++YYCURSOR;
 yy267:	yych = *++YYCURSOR;
 	if(yych != 'f')	goto yy2;
 	goto yy268;
-yy268:	yych = *++YYCURSOR;
+yy268:	++YYCURSOR;
 	goto yy269;
 yy269:
-#line 468
-	{ RET(T_PP_UNDEF); }
+#line 468 "idl.re"
+{ RET(T_PP_UNDEF); }
+#line 3567 "idl_re.cpp"
 yy270:	yych = *++YYCURSOR;
 	if(yych != 'f')	goto yy2;
 	goto yy271;
@@ -3526,11 +3576,12 @@ yy272:	yych = *++YYCURSOR;
 yy273:	yych = *++YYCURSOR;
 	if(yych != 'e')	goto yy2;
 	goto yy274;
-yy274:	yych = *++YYCURSOR;
+yy274:	++YYCURSOR;
 	goto yy275;
 yy275:
-#line 467
-	{ RET(T_PP_DEFINE); }
+#line 467 "idl.re"
+{ RET(T_PP_DEFINE); }
+#line 3585 "idl_re.cpp"
 yy276:	yych = *++YYCURSOR;
 	if(yych == 'r')	goto yy289;
 	goto yy2;
@@ -3547,46 +3598,51 @@ yy279:	yych = *++YYCURSOR;
 yy280:	yych = *++YYCURSOR;
 	if(yych != 'f')	goto yy2;
 	goto yy281;
-yy281:	yych = *++YYCURSOR;
+yy281:	++YYCURSOR;
 	goto yy282;
 yy282:
-#line 465
-	{ RET(T_PP_ELIF); }
-yy283:	yych = *++YYCURSOR;
+#line 465 "idl.re"
+{ RET(T_PP_ELIF); }
+#line 3607 "idl_re.cpp"
+yy283:	++YYCURSOR;
 	goto yy284;
 yy284:
-#line 464
-	{ RET(T_PP_ELSE); }
+#line 464 "idl.re"
+{ RET(T_PP_ELSE); }
+#line 3613 "idl_re.cpp"
 yy285:	yych = *++YYCURSOR;
 	if(yych != 'i')	goto yy2;
 	goto yy286;
 yy286:	yych = *++YYCURSOR;
 	if(yych != 'f')	goto yy2;
 	goto yy287;
-yy287:	yych = *++YYCURSOR;
+yy287:	++YYCURSOR;
 	goto yy288;
 yy288:
-#line 466
-	{ RET(T_PP_ENDIF); }
+#line 466 "idl.re"
+{ RET(T_PP_ENDIF); }
+#line 3625 "idl_re.cpp"
 yy289:	yych = *++YYCURSOR;
 	if(yych != 'o')	goto yy2;
 	goto yy290;
 yy290:	yych = *++YYCURSOR;
 	if(yych != 'r')	goto yy2;
 	goto yy291;
-yy291:	yych = *++YYCURSOR;
+yy291:	++YYCURSOR;
 	goto yy292;
 yy292:
-#line 470
-	{ RET(T_PP_ERROR); }
+#line 470 "idl.re"
+{ RET(T_PP_ERROR); }
+#line 3637 "idl_re.cpp"
 yy293:	yyaccept = 9;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'd')	goto yy321;
 	if(yych == 'n')	goto yy322;
 	goto yy294;
 yy294:
-#line 461
-	{ RET(T_PP_IF); }
+#line 461 "idl.re"
+{ RET(T_PP_IF); }
+#line 3646 "idl_re.cpp"
 yy295:	yych = *++YYCURSOR;
 	if(yych != 'c')	goto yy2;
 	goto yy296;
@@ -3604,12 +3660,12 @@ yy299:	yych = *++YYCURSOR;
 	goto yy300;
 yy300:	yyaccept = 10;
 	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	goto yy301;
 yy301:	if(yych <= '!'){
-		if(yych <= '\t'){
-			if(yych >= '\t')	goto yy300;
+		if(yych <= 0x09){
+			if(yych >= 0x09)	goto yy300;
 			goto yy302;
 		} else {
 			if(yych == ' ')	goto yy300;
@@ -3626,8 +3682,9 @@ yy301:	if(yych <= '!'){
 		}
 	}
 yy302:
-#line 459
-	{ RET(T_PP_INCLUDE); }
+#line 459 "idl.re"
+{ RET(T_PP_INCLUDE); }
+#line 3688 "idl_re.cpp"
 yy303:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
@@ -3643,48 +3700,50 @@ yy306:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy307;
-yy307:	if(yych <= '\f'){
-		if(yych == '\t')	goto yy306;
-		if(yych <= '\n')	goto yy2;
+yy307:	if(yych <= 0x0C){
+		if(yych == 0x09)	goto yy306;
+		if(yych <= 0x0A)	goto yy2;
 		goto yy306;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych != '>')	goto yy306;
 		goto yy308;
 	}
-yy308:	yych = *++YYCURSOR;
+yy308:	++YYCURSOR;
 	goto yy309;
 yy309:
-#line 453
-	{ RET(T_PP_HHEADER); }
+#line 453 "idl.re"
+{ RET(T_PP_HHEADER); }
+#line 3718 "idl_re.cpp"
 yy310:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy311;
-yy311:	if(yych <= '\f'){
-		if(yych == '\t')	goto yy310;
-		if(yych <= '\n')	goto yy2;
+yy311:	if(yych <= 0x0C){
+		if(yych == 0x09)	goto yy310;
+		if(yych <= 0x0A)	goto yy2;
 		goto yy310;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych != '"')	goto yy310;
 		goto yy312;
 	}
-yy312:	yych = *++YYCURSOR;
+yy312:	++YYCURSOR;
 	goto yy313;
 yy313:
-#line 456
-	{ RET(T_PP_QHEADER); }
+#line 456 "idl.re"
+{ RET(T_PP_QHEADER); }
+#line 3737 "idl_re.cpp"
 yy314:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy315;
-yy315:	if(yych <= '\r'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy314;
+yy315:	if(yych <= 0x0D){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy314;
 		goto yy316;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych == '*')	goto yy318;
 		goto yy314;
 	}
@@ -3692,12 +3751,12 @@ yy316:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy317;
-yy317:	if(yych <= '\r'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy314;
+yy317:	if(yych <= 0x0D){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy314;
 		goto yy316;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych != '*')	goto yy314;
 		goto yy318;
 	}
@@ -3705,10 +3764,10 @@ yy318:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy319;
-yy319:	if(yych <= '\037'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy314;
-		if(yych >= '\016')	goto yy2;
+yy319:	if(yych <= 0x1F){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy314;
+		if(yych >= 0x0E)	goto yy2;
 		goto yy320;
 	} else {
 		if(yych <= '*'){
@@ -3722,12 +3781,12 @@ yy319:	if(yych <= '\037'){
 yy320:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if(yych <= '\r'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy314;
+	if(yych <= 0x0D){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy314;
 		goto yy316;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych == '*')	goto yy318;
 		goto yy314;
 	}
@@ -3743,29 +3802,31 @@ yy323:	yych = *++YYCURSOR;
 yy324:	yych = *++YYCURSOR;
 	if(yych != 'f')	goto yy2;
 	goto yy325;
-yy325:	yych = *++YYCURSOR;
+yy325:	++YYCURSOR;
 	goto yy326;
 yy326:
-#line 463
-	{ RET(T_PP_IFNDEF); }
+#line 463 "idl.re"
+{ RET(T_PP_IFNDEF); }
+#line 3811 "idl_re.cpp"
 yy327:	yych = *++YYCURSOR;
 	if(yych != 'f')	goto yy2;
 	goto yy328;
-yy328:	yych = *++YYCURSOR;
+yy328:	++YYCURSOR;
 	goto yy329;
 yy329:
-#line 462
-	{ RET(T_PP_IFDEF); }
+#line 462 "idl.re"
+{ RET(T_PP_IFDEF); }
+#line 3820 "idl_re.cpp"
 yy330:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy331;
-yy331:	if(yych <= '\r'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy330;
+yy331:	if(yych <= 0x0D){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy330;
 		goto yy332;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych == '*')	goto yy334;
 		goto yy330;
 	}
@@ -3773,12 +3834,12 @@ yy332:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy333;
-yy333:	if(yych <= '\r'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy330;
+yy333:	if(yych <= 0x0D){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy330;
 		goto yy332;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych != '*')	goto yy330;
 		goto yy334;
 	}
@@ -3786,10 +3847,10 @@ yy334:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy335;
-yy335:	if(yych <= '\037'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy330;
-		if(yych >= '\016')	goto yy2;
+yy335:	if(yych <= 0x1F){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy330;
+		if(yych >= 0x0E)	goto yy2;
 		goto yy336;
 	} else {
 		if(yych <= '*'){
@@ -3803,25 +3864,27 @@ yy335:	if(yych <= '\037'){
 yy336:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if(yych <= '\r'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy330;
+	if(yych <= 0x0D){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy330;
 		goto yy332;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych == '*')	goto yy334;
 		goto yy330;
 	}
-yy337:	yych = *++YYCURSOR;
+yy337:	++YYCURSOR;
 	goto yy338;
 yy338:
-#line 430
-	{ RET(T_MINUSMINUS); }
-yy339:	yych = *++YYCURSOR;
+#line 430 "idl.re"
+{ RET(T_MINUSMINUS); }
+#line 3882 "idl_re.cpp"
+yy339:	++YYCURSOR;
 	goto yy340;
 yy340:
-#line 429
-	{ RET(T_PLUSPLUS); }
+#line 429 "idl.re"
+{ RET(T_PLUSPLUS); }
+#line 3888 "idl_re.cpp"
 yy341:	yych = *++YYCURSOR;
 	if(yych == '/')	goto yy342;
 	if(yych == '=')	goto yy238;
@@ -3830,11 +3893,12 @@ yy342:	yych = *++YYCURSOR;
 	if(yych == 'U')	goto yy193;
 	if(yych == 'u')	goto yy192;
 	goto yy2;
-yy343:	yych = *++YYCURSOR;
+yy343:	++YYCURSOR;
 	goto yy344;
 yy344:
-#line 401
-	{ RET(T_POUND_POUND); }
+#line 401 "idl.re"
+{ RET(T_POUND_POUND); }
+#line 3902 "idl_re.cpp"
 yy345:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'L')	goto yy202;
@@ -3870,8 +3934,9 @@ yy348:	yyaccept = 11;
 		}
 	}
 yy349:
-#line 394
-	{ RET(T_FALSE); }
+#line 394 "idl.re"
+{ RET(T_FALSE); }
+#line 3940 "idl_re.cpp"
 yy350:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'U')	goto yy202;
@@ -3903,76 +3968,81 @@ yy352:	yyaccept = 12;
 		}
 	}
 yy353:
-#line 393
-	{ RET(T_TRUE); }
-yy354:	yych = *++YYCURSOR;
+#line 393 "idl.re"
+{ RET(T_TRUE); }
+#line 3974 "idl_re.cpp"
+yy354:	++YYCURSOR;
 	goto yy355;
 yy355:
-#line 391
-	{ goto cppcomment; }
-yy356:	yych = *++YYCURSOR;
+#line 391 "idl.re"
+{ goto cppcomment; }
+#line 3980 "idl_re.cpp"
+yy356:	++YYCURSOR;
 	goto yy357;
 yy357:
-#line 390
-	{ goto ccomment; }
+#line 390 "idl.re"
+{ goto ccomment; }
+#line 3986 "idl_re.cpp"
 }
-#line 506
+#line 506 "idl.re"
 
 
 ccomment:
+
+#line 3993 "idl_re.cpp"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
 	goto yy358;
-yy359:	++YYCURSOR;
+	++YYCURSOR;
 yy358:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if(yych <= '\f'){
-		if(yych <= '\b'){
-			if(yych <= '\000')	goto yy367;
+	if(yych <= 0x0C){
+		if(yych <= 0x08){
+			if(yych <= 0x00)	goto yy367;
 			goto yy360;
 		} else {
-			if(yych == '\n')	goto yy363;
+			if(yych == 0x0A)	goto yy363;
 			goto yy366;
 		}
 	} else {
-		if(yych <= '\037'){
-			if(yych <= '\r')	goto yy365;
+		if(yych <= 0x1F){
+			if(yych <= 0x0D)	goto yy365;
 			goto yy360;
 		} else {
 			if(yych == '*')	goto yy361;
 			goto yy366;
 		}
 	}
-yy360:yy361:	yych = *++YYCURSOR;
-	if(yych == '/')	goto yy370;
+yy360:yy361:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '/')	goto yy370;
 	goto yy362;
 yy362:
-#line 519
-	{ goto ccomment; }
-yy363:	yych = *++YYCURSOR;
+#line 519 "idl.re"
+{ goto ccomment; }
+#line 4024 "idl_re.cpp"
+yy363:	++YYCURSOR;
 	goto yy364;
 yy364:
-#line 512
-	{
+#line 512 "idl.re"
+{
         /*if(cursor == s->eof) RET(T_EOF);*/
         /*s->tok = cursor; */
         s->line += count_backslash_newlines(s, cursor) +1;
         goto ccomment;
     }
+#line 4035 "idl_re.cpp"
 yy365:	yych = *++YYCURSOR;
-	if(yych == '\n')	goto yy369;
+	if(yych == 0x0A)	goto yy369;
 	goto yy364;
 yy366:	yych = *++YYCURSOR;
 	goto yy362;
-yy367:	yych = *++YYCURSOR;
+yy367:	++YYCURSOR;
 	goto yy368;
 yy368:
-#line 522
-	{
+#line 522 "idl.re"
+{
         using namespace std;      // some systems have printf in std
-        yyaccept = 0;   /* avoid warning about unreferenced variable */
         if(cursor == s->eof) 
         {
             if (s->error_proc)
@@ -3992,62 +4062,66 @@ yy368:
         /* the comment is unterminated, but nevertheless its a comment */
         RET(T_CCOMMENT);
     }
+#line 4066 "idl_re.cpp"
 yy369:	yych = *++YYCURSOR;
 	goto yy364;
-yy370:	yych = *++YYCURSOR;
+yy370:	++YYCURSOR;
 	goto yy371;
 yy371:
-#line 510
-	{ RET(T_CCOMMENT); }
+#line 510 "idl.re"
+{ RET(T_CCOMMENT); }
+#line 4074 "idl_re.cpp"
 }
-#line 545
+#line 544 "idl.re"
 
 
 cppcomment:
+
+#line 4081 "idl_re.cpp"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
 	goto yy372;
-yy373:	++YYCURSOR;
+	++YYCURSOR;
 yy372:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if(yych <= '\n'){
-		if(yych <= '\000')	goto yy380;
-		if(yych <= '\b')	goto yy374;
-		if(yych <= '\t')	goto yy378;
+	if(yych <= 0x0A){
+		if(yych <= 0x00)	goto yy380;
+		if(yych <= 0x08)	goto yy374;
+		if(yych <= 0x09)	goto yy378;
 		goto yy375;
 	} else {
-		if(yych <= '\f')	goto yy378;
-		if(yych <= '\r')	goto yy377;
+		if(yych <= 0x0C)	goto yy378;
+		if(yych <= 0x0D)	goto yy377;
 		if(yych >= ' ')	goto yy378;
 		goto yy374;
 	}
-yy374:yy375:	yych = *++YYCURSOR;
+yy374:yy375:	++YYCURSOR;
 	goto yy376;
 yy376:
-#line 550
-	{
+#line 549 "idl.re"
+{
         /*if(cursor == s->eof) RET(T_EOF); */
         /*s->tok = cursor; */
         s->line++;
         RET(T_CPPCOMMENT);
     }
+#line 4110 "idl_re.cpp"
 yy377:	yych = *++YYCURSOR;
-	if(yych == '\n')	goto yy382;
+	if(yych == 0x0A)	goto yy382;
 	goto yy376;
-yy378:	yych = *++YYCURSOR;
+yy378:	++YYCURSOR;
 	goto yy379;
 yy379:
-#line 557
-	{ goto cppcomment; }
-yy380:	yych = *++YYCURSOR;
+#line 556 "idl.re"
+{ goto cppcomment; }
+#line 4119 "idl_re.cpp"
+yy380:	++YYCURSOR;
 	goto yy381;
 yy381:
-#line 560
-	{
+#line 559 "idl.re"
+{
         using namespace std;      // some systems have printf in std
-        yyaccept = 0;   /* avoid warning about unreferenced variable */
         if(cursor != s->eof) 
         {
             if (s->error_proc)
@@ -4060,10 +4134,12 @@ yy381:
         /* the comment is unterminated, but nevertheless its a comment */
         RET(T_CPPCOMMENT);
     }
-yy382:	yych = *++YYCURSOR;
+#line 4138 "idl_re.cpp"
+yy382:	++YYCURSOR;
+	yych = *YYCURSOR;
 	goto yy376;
 }
-#line 575
+#line 573 "idl.re"
 
 
 } /* end of scan */
diff --git a/src/cpplexer/re2clex/cpp.re b/src/cpplexer/re2clex/cpp.re
index 2e76973..cd0b650 100644
--- a/src/cpplexer/re2clex/cpp.re
+++ b/src/cpplexer/re2clex/cpp.re
@@ -653,7 +653,6 @@ ccomment:
     "\000"
     {
         using namespace std;      // some systems have printf in std
-        yyaccept = 0;   /* avoid warning about unreferenced variable */
         if(cursor == s->eof) 
         {
             if (s->error_proc)
@@ -691,7 +690,6 @@ cppcomment:
     "\000"
     {
         using namespace std;      // some systems have printf in std
-        yyaccept = 0;   /* avoid warning about unreferenced variable */
         if(cursor != s->eof) 
         {
             if (s->error_proc)
diff --git a/src/cpplexer/re2clex/cpp_re.cpp b/src/cpplexer/re2clex/cpp_re.cpp
index 8a5aaef..5f297ee 100644
--- a/src/cpplexer/re2clex/cpp_re.cpp
+++ b/src/cpplexer/re2clex/cpp_re.cpp
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.5 on Wed Apr  6 08:26:01 2005 */
+/* Generated by re2c 0.9.7.dev on Tue Apr 26 21:14:51 2005 */
 #line 1 "cpp.re"
 /*=============================================================================
     Boost.Wave: A Standard compliant C++ preprocessor library
@@ -348,48 +348,50 @@ boost::wave::token_id scan(Scanner *s)
 {
     uchar *cursor = s->tok = s->cur;
 
-#line 365
+#line 365 "cpp.re"
 
 
+
+#line 356 "cpp_re.cpp"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
 	goto yy0;
-yy1:	++YYCURSOR;
+	++YYCURSOR;
 yy0:
 	if((YYLIMIT - YYCURSOR) < 17) YYFILL(17);
 	yych = *YYCURSOR;
 	switch(yych){
-	case '\000':	goto yy89;
-	case '\001':
-	case '\002':
-	case '\003':
-	case '\004':
-	case '\005':
-	case '\006':
-	case '\a':
-	case '\b':	case '\016':
-	case '\017':
-	case '\020':
-	case '\021':
-	case '\022':
-	case '\023':
-	case '\024':
-	case '\025':
-	case '\026':
-	case '\027':
-	case '\030':
-	case '\031':
-	case '\032':
-	case '\033':
-	case '\034':
-	case '\035':
-	case '\036':
-	case '\037':	goto yy2;
-	case '\t':	case '\v':
-	case '\f':	case ' ':	goto yy84;
-	case '\n':	goto yy86;
-	case '\r':	goto yy88;
+	case 0x00:	goto yy89;
+	case 0x01:
+	case 0x02:
+	case 0x03:
+	case 0x04:
+	case 0x05:
+	case 0x06:
+	case 0x07:
+	case 0x08:	case 0x0E:
+	case 0x0F:
+	case 0x10:
+	case 0x11:
+	case 0x12:
+	case 0x13:
+	case 0x14:
+	case 0x15:
+	case 0x16:
+	case 0x17:
+	case 0x18:
+	case 0x19:
+	case 0x1A:
+	case 0x1B:
+	case 0x1C:
+	case 0x1D:
+	case 0x1E:
+	case 0x1F:	goto yy2;
+	case 0x09:	case 0x0B:
+	case 0x0C:	case ' ':	goto yy84;
+	case 0x0A:	goto yy86;
+	case 0x0D:	goto yy88;
 	case '!':	goto yy67;
 	case '"':	goto yy83;
 	case '#':	goto yy42;
@@ -586,8 +588,8 @@ yy2:	YYCURSOR = YYMARKER;
 	case 12:	goto yy308;
 	case 5:	goto yy78;
 	}
-yy3:	yych = *++YYCURSOR;
-	if(yych <= '.'){
+yy3:	++YYCURSOR;
+	if((yych = *YYCURSOR) <= '.'){
 		if(yych == '*')	goto yy939;
 		goto yy4;
 	} else {
@@ -596,8 +598,9 @@ yy3:	yych = *++YYCURSOR;
 		goto yy4;
 	}
 yy4:
-#line 501
-	{ RET(T_DIVIDE); }
+#line 501 "cpp.re"
+{ RET(T_DIVIDE); }
+#line 604 "cpp_re.cpp"
 yy5:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'r'){
@@ -609,8 +612,9 @@ yy5:	yyaccept = 0;
 		goto yy219;
 	}
 yy6:
-#line 565
-	{ RET(T_IDENTIFIER); }
+#line 565 "cpp.re"
+{ RET(T_IDENTIFIER); }
+#line 618 "cpp_re.cpp"
 yy7:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
@@ -755,20 +759,22 @@ yy25:	yyaccept = 0;
 	case 's':	goto yy478;
 	default:	goto yy219;
 	}
-yy26:	yych = *++YYCURSOR;
+yy26:	++YYCURSOR;
 	goto yy27;
 yy27:
-#line 451
-	{ RET(T_LEFTBRACE); }
+#line 451 "cpp.re"
+{ RET(T_LEFTBRACE); }
+#line 768 "cpp_re.cpp"
 yy28:	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == '?')	goto yy436;
 	goto yy29;
 yy29:
-#line 476
-	{ RET(T_QUESTION_MARK); }
-yy30:	yych = *++YYCURSOR;
-	if(yych <= ':'){
+#line 476 "cpp.re"
+{ RET(T_QUESTION_MARK); }
+#line 776 "cpp_re.cpp"
+yy30:	++YYCURSOR;
+	if((yych = *YYCURSOR) <= ':'){
 		if(yych == '%')	goto yy432;
 		if(yych >= ':')	goto yy430;
 		goto yy31;
@@ -779,15 +785,17 @@ yy30:	yych = *++YYCURSOR;
 		goto yy31;
 	}
 yy31:
-#line 517
-	{ RET(T_LESS); }
-yy32:	yych = *++YYCURSOR;
+#line 517 "cpp.re"
+{ RET(T_LESS); }
+#line 791 "cpp_re.cpp"
+yy32:	++YYCURSOR;
 	goto yy33;
 yy33:
-#line 454
-	{ RET(T_RIGHTBRACE); }
-yy34:	yych = *++YYCURSOR;
-	if(yych <= '<'){
+#line 454 "cpp.re"
+{ RET(T_RIGHTBRACE); }
+#line 797 "cpp_re.cpp"
+yy34:	++YYCURSOR;
+	if((yych = *YYCURSOR) <= '<'){
 		if(yych == ':')	goto yy417;
 		goto yy35;
 	} else {
@@ -796,31 +804,35 @@ yy34:	yych = *++YYCURSOR;
 		goto yy35;
 	}
 yy35:
-#line 502
-	{ RET(T_PERCENT); }
-yy36:	yych = *++YYCURSOR;
+#line 502 "cpp.re"
+{ RET(T_PERCENT); }
+#line 810 "cpp_re.cpp"
+yy36:	++YYCURSOR;
 	goto yy37;
 yy37:
-#line 457
-	{ RET(T_LEFTBRACKET); }
-yy38:	yych = *++YYCURSOR;
+#line 457 "cpp.re"
+{ RET(T_LEFTBRACKET); }
+#line 816 "cpp_re.cpp"
+yy38:	++YYCURSOR;
 	goto yy39;
 yy39:
-#line 460
-	{ RET(T_RIGHTBRACKET); }
-yy40:	yych = *++YYCURSOR;
-	if(yych == ':')	goto yy413;
+#line 460 "cpp.re"
+{ RET(T_RIGHTBRACKET); }
+#line 822 "cpp_re.cpp"
+yy40:	++YYCURSOR;
+	if((yych = *YYCURSOR) == ':')	goto yy413;
 	if(yych == '>')	goto yy415;
 	goto yy41;
 yy41:
-#line 474
-	{ RET(T_COLON); }
+#line 474 "cpp.re"
+{ RET(T_COLON); }
+#line 830 "cpp_re.cpp"
 yy42:	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'e'){
 		if(yych <= '#'){
-			if(yych <= '\037'){
-				if(yych == '\t')	goto yy290;
+			if(yych <= 0x1F){
+				if(yych == 0x09)	goto yy290;
 				goto yy43;
 			} else {
 				if(yych <= ' ')	goto yy290;
@@ -859,23 +871,27 @@ yy42:	yyaccept = 2;
 		}
 	}
 yy43:
-#line 463
-	{ RET(T_POUND); }
-yy44:	yych = *++YYCURSOR;
+#line 463 "cpp.re"
+{ RET(T_POUND); }
+#line 877 "cpp_re.cpp"
+yy44:	++YYCURSOR;
 	goto yy45;
 yy45:
-#line 471
-	{ RET(T_LEFTPAREN); }
-yy46:	yych = *++YYCURSOR;
+#line 471 "cpp.re"
+{ RET(T_LEFTPAREN); }
+#line 883 "cpp_re.cpp"
+yy46:	++YYCURSOR;
 	goto yy47;
 yy47:
-#line 472
-	{ RET(T_RIGHTPAREN); }
-yy48:	yych = *++YYCURSOR;
+#line 472 "cpp.re"
+{ RET(T_RIGHTPAREN); }
+#line 889 "cpp_re.cpp"
+yy48:	++YYCURSOR;
 	goto yy49;
 yy49:
-#line 473
-	{ RET(T_SEMICOLON); }
+#line 473 "cpp.re"
+{ RET(T_SEMICOLON); }
+#line 895 "cpp_re.cpp"
 yy50:	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '-'){
@@ -888,17 +904,19 @@ yy50:	yyaccept = 3;
 		goto yy51;
 	}
 yy51:
-#line 487
-	{ RET(T_DOT); }
-yy52:	yych = *++YYCURSOR;
-	if(yych == '+')	goto yy280;
+#line 487 "cpp.re"
+{ RET(T_DOT); }
+#line 910 "cpp_re.cpp"
+yy52:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '+')	goto yy280;
 	if(yych == '=')	goto yy282;
 	goto yy53;
 yy53:
-#line 498
-	{ RET(T_PLUS); }
-yy54:	yych = *++YYCURSOR;
-	if(yych <= '<'){
+#line 498 "cpp.re"
+{ RET(T_PLUS); }
+#line 918 "cpp_re.cpp"
+yy54:	++YYCURSOR;
+	if((yych = *YYCURSOR) <= '<'){
 		if(yych == '-')	goto yy274;
 		goto yy55;
 	} else {
@@ -907,31 +925,35 @@ yy54:	yych = *++YYCURSOR;
 		goto yy55;
 	}
 yy55:
-#line 499
-	{ RET(T_MINUS); }
-yy56:	yych = *++YYCURSOR;
-	if(yych == '=')	goto yy270;
+#line 499 "cpp.re"
+{ RET(T_MINUS); }
+#line 931 "cpp_re.cpp"
+yy56:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '=')	goto yy270;
 	goto yy57;
 yy57:
-#line 500
-	{ RET(T_STAR); }
-yy58:	yych = *++YYCURSOR;
-	if(yych == '=')	goto yy268;
+#line 500 "cpp.re"
+{ RET(T_STAR); }
+#line 938 "cpp_re.cpp"
+yy58:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '=')	goto yy268;
 	goto yy59;
 yy59:
-#line 503
-	{ RET(T_XOR); }
+#line 503 "cpp.re"
+{ RET(T_XOR); }
+#line 945 "cpp_re.cpp"
 yy60:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'o')	goto yy261;
 	goto yy219;
-yy61:	yych = *++YYCURSOR;
-	if(yych == '&')	goto yy257;
+yy61:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '&')	goto yy257;
 	if(yych == '=')	goto yy259;
 	goto yy62;
 yy62:
-#line 506
-	{ RET(T_AND); }
+#line 506 "cpp.re"
+{ RET(T_AND); }
+#line 957 "cpp_re.cpp"
 yy63:	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '>'){
@@ -943,38 +965,44 @@ yy63:	yyaccept = 4;
 		goto yy64;
 	}
 yy64:
-#line 508
-	{ RET(T_OR); }
-yy65:	yych = *++YYCURSOR;
+#line 508 "cpp.re"
+{ RET(T_OR); }
+#line 971 "cpp_re.cpp"
+yy65:	++YYCURSOR;
 	goto yy66;
 yy66:
-#line 511
-	{ RET(T_COMPL); }
-yy67:	yych = *++YYCURSOR;
-	if(yych == '=')	goto yy247;
+#line 511 "cpp.re"
+{ RET(T_COMPL); }
+#line 977 "cpp_re.cpp"
+yy67:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '=')	goto yy247;
 	goto yy68;
 yy68:
-#line 514
-	{ RET(T_NOT); }
-yy69:	yych = *++YYCURSOR;
-	if(yych == '=')	goto yy245;
+#line 514 "cpp.re"
+{ RET(T_NOT); }
+#line 984 "cpp_re.cpp"
+yy69:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '=')	goto yy245;
 	goto yy70;
 yy70:
-#line 516
-	{ RET(T_ASSIGN); }
-yy71:	yych = *++YYCURSOR;
-	if(yych <= '<')	goto yy72;
+#line 516 "cpp.re"
+{ RET(T_ASSIGN); }
+#line 991 "cpp_re.cpp"
+yy71:	++YYCURSOR;
+	if((yych = *YYCURSOR) <= '<')	goto yy72;
 	if(yych <= '=')	goto yy239;
 	if(yych <= '>')	goto yy241;
 	goto yy72;
 yy72:
-#line 518
-	{ RET(T_GREATER); }
-yy73:	yych = *++YYCURSOR;
+#line 518 "cpp.re"
+{ RET(T_GREATER); }
+#line 1000 "cpp_re.cpp"
+yy73:	++YYCURSOR;
 	goto yy74;
 yy74:
-#line 550
-	{ RET(T_COMMA); }
+#line 550 "cpp.re"
+{ RET(T_COMMA); }
+#line 1006 "cpp_re.cpp"
 yy75:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	goto yy219;
@@ -1014,8 +1042,8 @@ yy77:	yyaccept = 5;
 	if(yych == 'u')	goto yy209;
 	goto yy78;
 yy78:
-#line 629
-	{
+#line 629 "cpp.re"
+{
         /* if (0 != s->error_proc)
             (*s->error_proc)(s, "Unexpected character: '%c'", *s->tok);
         else
@@ -1023,6 +1051,7 @@ yy78:
         */
         RET(TOKEN_FROM_ID(*s->tok, UnknownTokenType));
     }
+#line 1055 "cpp_re.cpp"
 yy79:	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'U'){
@@ -1066,8 +1095,9 @@ yy79:	yyaccept = 6;
 		}
 	}
 yy80:
-#line 568
-	{ RET(T_INTLIT); }
+#line 568 "cpp.re"
+{ RET(T_INTLIT); }
+#line 1101 "cpp_re.cpp"
 yy81:	yyaccept = 6;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'L'){
@@ -1097,46 +1127,49 @@ yy81:	yyaccept = 6;
 	}
 yy82:	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych <= '\f'){
-		if(yych == '\t')	goto yy140;
-		if(yych <= '\n')	goto yy78;
+	if(yych <= 0x0C){
+		if(yych == 0x09)	goto yy140;
+		if(yych <= 0x0A)	goto yy78;
 		goto yy140;
 	} else {
-		if(yych <= '\037')	goto yy78;
+		if(yych <= 0x1F)	goto yy78;
 		if(yych == '\'')	goto yy78;
 		goto yy140;
 	}
 yy83:	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych <= '\n'){
-		if(yych == '\t')	goto yy96;
+	if(yych <= 0x0A){
+		if(yych == 0x09)	goto yy96;
 		goto yy78;
 	} else {
-		if(yych <= '\f')	goto yy96;
-		if(yych <= '\037')	goto yy78;
+		if(yych <= 0x0C)	goto yy96;
+		if(yych <= 0x1F)	goto yy78;
 		goto yy96;
 	}
-yy84:	yych = *++YYCURSOR;
+yy84:	++YYCURSOR;
+	yych = *YYCURSOR;
 	goto yy94;
 yy85:
-#line 607
-	{ RET(T_SPACE); }
-yy86:	yych = *++YYCURSOR;
+#line 607 "cpp.re"
+{ RET(T_SPACE); }
+#line 1156 "cpp_re.cpp"
+yy86:	++YYCURSOR;
 	goto yy87;
 yy87:
-#line 610
-	{
+#line 610 "cpp.re"
+{
         s->line++;
         RET(T_NEWLINE);
     }
+#line 1165 "cpp_re.cpp"
 yy88:	yych = *++YYCURSOR;
-	if(yych == '\n')	goto yy92;
+	if(yych == 0x0A)	goto yy92;
 	goto yy87;
-yy89:	yych = *++YYCURSOR;
+yy89:	++YYCURSOR;
 	goto yy90;
 yy90:
-#line 616
-	{
+#line 616 "cpp.re"
+{
         if(cursor != s->eof) 
         {
             using namespace std;      // some systems have printf in std
@@ -1147,6 +1180,7 @@ yy90:
         }
         RET(T_EOF);
     }
+#line 1184 "cpp_re.cpp"
 yy91:	yych = *++YYCURSOR;
 	goto yy78;
 yy92:	yych = *++YYCURSOR;
@@ -1155,11 +1189,11 @@ yy93:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy94;
-yy94:	if(yych <= '\n'){
-		if(yych == '\t')	goto yy93;
+yy94:	if(yych <= 0x0A){
+		if(yych == 0x09)	goto yy93;
 		goto yy85;
 	} else {
-		if(yych <= '\f')	goto yy93;
+		if(yych <= 0x0C)	goto yy93;
 		if(yych == ' ')	goto yy93;
 		goto yy85;
 	}
@@ -1168,12 +1202,12 @@ yy95:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy96;
 yy96:	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy95;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy95;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy95;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy95;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy95;
 		}
 	} else {
@@ -1190,12 +1224,12 @@ yy97:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy95;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy95;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy95;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy95;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy95;
 		}
 	} else {
@@ -1254,11 +1288,12 @@ yy98:	++YYCURSOR;
 			}
 		}
 	}
-yy99:	yych = *++YYCURSOR;
+yy99:	++YYCURSOR;
 	goto yy100;
 yy100:
-#line 577
-	{ RET(T_STRINGLIT); }
+#line 577 "cpp.re"
+{ RET(T_STRINGLIT); }
+#line 1297 "cpp_re.cpp"
 yy101:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
@@ -1289,12 +1324,12 @@ yy103:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy95;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy95;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy95;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy95;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy95;
 		}
 	} else {
@@ -1324,12 +1359,12 @@ yy105:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '"'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy95;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy95;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy95;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy95;
+			if(yych <= 0x1F)	goto yy2;
 			if(yych <= '!')	goto yy95;
 			goto yy99;
 		}
@@ -1348,12 +1383,12 @@ yy106:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy95;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy95;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy95;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy95;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy95;
 		}
 	} else {
@@ -1371,13 +1406,13 @@ yy107:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy108;
 yy108:	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy95;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy95;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy95;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy95;
 			} else {
 				if(yych <= '"')	goto yy99;
@@ -1405,12 +1440,12 @@ yy109:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy95;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy95;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy95;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy95;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy95;
 		}
 	} else {
@@ -1428,12 +1463,12 @@ yy110:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy111;
 yy111:	if(yych <= '"'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy95;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy95;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy95;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy95;
+			if(yych <= 0x1F)	goto yy2;
 			if(yych <= '!')	goto yy95;
 			goto yy99;
 		}
@@ -1452,13 +1487,13 @@ yy112:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy113;
 yy113:	if(yych <= '>'){
-		if(yych <= '\037'){
-			if(yych <= '\t'){
-				if(yych <= '\b')	goto yy2;
+		if(yych <= 0x1F){
+			if(yych <= 0x09){
+				if(yych <= 0x08)	goto yy2;
 				goto yy95;
 			} else {
-				if(yych <= '\n')	goto yy2;
-				if(yych <= '\f')	goto yy95;
+				if(yych <= 0x0A)	goto yy2;
+				if(yych <= 0x0C)	goto yy95;
 				goto yy2;
 			}
 		} else {
@@ -1495,13 +1530,13 @@ yy114:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy95;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy95;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy95;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy95;
 			} else {
 				if(yych <= '"')	goto yy99;
@@ -1529,13 +1564,13 @@ yy115:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy95;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy95;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy95;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy95;
 			} else {
 				if(yych <= '"')	goto yy99;
@@ -1564,12 +1599,12 @@ yy116:	yyaccept = 7;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy95;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy95;
 			goto yy100;
 		} else {
-			if(yych <= '\f')	goto yy95;
-			if(yych <= '\037')	goto yy100;
+			if(yych <= 0x0C)	goto yy95;
+			if(yych <= 0x1F)	goto yy100;
 			goto yy95;
 		}
 	} else {
@@ -1586,12 +1621,12 @@ yy117:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy95;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy95;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy95;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy95;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy95;
 		}
 	} else {
@@ -1608,12 +1643,12 @@ yy118:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '"'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy95;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy95;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy95;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy95;
+			if(yych <= 0x1F)	goto yy2;
 			if(yych <= '!')	goto yy95;
 			goto yy99;
 		}
@@ -1631,13 +1666,13 @@ yy119:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy95;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy95;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy95;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy95;
 			} else {
 				if(yych <= '"')	goto yy99;
@@ -1665,13 +1700,13 @@ yy120:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy95;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy95;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy95;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy95;
 			} else {
 				if(yych <= '"')	goto yy99;
@@ -1699,13 +1734,13 @@ yy121:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy95;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy95;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy95;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy95;
 			} else {
 				if(yych <= '"')	goto yy99;
@@ -1733,13 +1768,13 @@ yy122:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy95;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy95;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy95;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy95;
 			} else {
 				if(yych <= '"')	goto yy99;
@@ -1767,13 +1802,13 @@ yy123:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy95;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy95;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy95;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy95;
 			} else {
 				if(yych <= '"')	goto yy99;
@@ -1801,13 +1836,13 @@ yy124:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy95;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy95;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy95;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy95;
 			} else {
 				if(yych <= '"')	goto yy99;
@@ -1835,12 +1870,12 @@ yy125:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy95;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy95;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy95;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy95;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy95;
 		}
 	} else {
@@ -1857,13 +1892,13 @@ yy126:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy95;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy95;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy95;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy95;
 			} else {
 				if(yych <= '"')	goto yy99;
@@ -1891,13 +1926,13 @@ yy127:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy95;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy95;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy95;
 		} else {
 			if(yych <= '!'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy95;
 			} else {
 				if(yych <= '"')	goto yy99;
@@ -1925,12 +1960,12 @@ yy128:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '!'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy95;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy95;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy95;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy95;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy95;
 		}
 	} else {
@@ -2078,12 +2113,12 @@ yy139:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy140;
 yy140:	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy139;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy139;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy139;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy139;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy139;
 		}
 	} else {
@@ -2100,12 +2135,12 @@ yy141:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy139;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy139;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy139;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy139;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy139;
 		}
 	} else {
@@ -2194,12 +2229,12 @@ yy145:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy139;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy139;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy139;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy139;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy139;
 		}
 	} else {
@@ -2229,12 +2264,12 @@ yy147:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '\''){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy139;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy139;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy139;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy139;
+			if(yych <= 0x1F)	goto yy2;
 			if(yych <= '&')	goto yy139;
 			goto yy149;
 		}
@@ -2253,12 +2288,12 @@ yy148:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy139;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy139;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy139;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy139;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy139;
 		}
 	} else {
@@ -2271,23 +2306,24 @@ yy148:	++YYCURSOR;
 			goto yy139;
 		}
 	}
-yy149:	yych = *++YYCURSOR;
+yy149:	++YYCURSOR;
 	goto yy150;
 yy150:
-#line 574
-	{ RET(T_CHARLIT); }
+#line 574 "cpp.re"
+{ RET(T_CHARLIT); }
+#line 2315 "cpp_re.cpp"
 yy151:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy152;
 yy152:	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy139;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy139;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy139;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy139;
 			} else {
 				if(yych <= '\'')	goto yy149;
@@ -2315,12 +2351,12 @@ yy153:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy139;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy139;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy139;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy139;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy139;
 		}
 	} else {
@@ -2338,12 +2374,12 @@ yy154:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy155;
 yy155:	if(yych <= '\''){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy139;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy139;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy139;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy139;
+			if(yych <= 0x1F)	goto yy2;
 			if(yych <= '&')	goto yy139;
 			goto yy149;
 		}
@@ -2362,13 +2398,13 @@ yy156:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy157;
 yy157:	if(yych <= '>'){
-		if(yych <= '\037'){
-			if(yych <= '\t'){
-				if(yych <= '\b')	goto yy2;
+		if(yych <= 0x1F){
+			if(yych <= 0x09){
+				if(yych <= 0x08)	goto yy2;
 				goto yy139;
 			} else {
-				if(yych <= '\n')	goto yy2;
-				if(yych <= '\f')	goto yy139;
+				if(yych <= 0x0A)	goto yy2;
+				if(yych <= 0x0C)	goto yy139;
 				goto yy2;
 			}
 		} else {
@@ -2405,13 +2441,13 @@ yy158:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy139;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy139;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy139;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy139;
 			} else {
 				if(yych <= '\'')	goto yy149;
@@ -2439,13 +2475,13 @@ yy159:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy139;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy139;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy139;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy139;
 			} else {
 				if(yych <= '\'')	goto yy149;
@@ -2474,12 +2510,12 @@ yy160:	yyaccept = 8;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy139;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy139;
 			goto yy150;
 		} else {
-			if(yych <= '\f')	goto yy139;
-			if(yych <= '\037')	goto yy150;
+			if(yych <= 0x0C)	goto yy139;
+			if(yych <= 0x1F)	goto yy150;
 			goto yy139;
 		}
 	} else {
@@ -2496,12 +2532,12 @@ yy161:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy139;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy139;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy139;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy139;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy139;
 		}
 	} else {
@@ -2518,12 +2554,12 @@ yy162:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '\''){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy139;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy139;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy139;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy139;
+			if(yych <= 0x1F)	goto yy2;
 			if(yych <= '&')	goto yy139;
 			goto yy149;
 		}
@@ -2541,13 +2577,13 @@ yy163:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy139;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy139;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy139;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy139;
 			} else {
 				if(yych <= '\'')	goto yy149;
@@ -2575,13 +2611,13 @@ yy164:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy139;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy139;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy139;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy139;
 			} else {
 				if(yych <= '\'')	goto yy149;
@@ -2609,13 +2645,13 @@ yy165:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy139;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy139;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy139;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy139;
 			} else {
 				if(yych <= '\'')	goto yy149;
@@ -2643,13 +2679,13 @@ yy166:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy139;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy139;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy139;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy139;
 			} else {
 				if(yych <= '\'')	goto yy149;
@@ -2677,13 +2713,13 @@ yy167:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy139;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy139;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy139;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy139;
 			} else {
 				if(yych <= '\'')	goto yy149;
@@ -2711,13 +2747,13 @@ yy168:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy139;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy139;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy139;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy139;
 			} else {
 				if(yych <= '\'')	goto yy149;
@@ -2745,12 +2781,12 @@ yy169:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy139;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy139;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy139;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy139;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy139;
 		}
 	} else {
@@ -2767,13 +2803,13 @@ yy170:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy139;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy139;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy139;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy139;
 			} else {
 				if(yych <= '\'')	goto yy149;
@@ -2801,13 +2837,13 @@ yy171:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '9'){
-		if(yych <= '\f'){
-			if(yych == '\t')	goto yy139;
-			if(yych <= '\n')	goto yy2;
+		if(yych <= 0x0C){
+			if(yych == 0x09)	goto yy139;
+			if(yych <= 0x0A)	goto yy2;
 			goto yy139;
 		} else {
 			if(yych <= '&'){
-				if(yych <= '\037')	goto yy2;
+				if(yych <= 0x1F)	goto yy2;
 				goto yy139;
 			} else {
 				if(yych <= '\'')	goto yy149;
@@ -2835,12 +2871,12 @@ yy172:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	if(yych <= '&'){
-		if(yych <= '\n'){
-			if(yych == '\t')	goto yy139;
+		if(yych <= 0x0A){
+			if(yych == 0x09)	goto yy139;
 			goto yy2;
 		} else {
-			if(yych <= '\f')	goto yy139;
-			if(yych <= '\037')	goto yy2;
+			if(yych <= 0x0C)	goto yy139;
+			if(yych <= 0x1F)	goto yy2;
 			goto yy139;
 		}
 	} else {
@@ -2995,7 +3031,7 @@ yy183:	yych = *++YYCURSOR;
 	}
 yy184:	yyaccept = 6;
 	YYMARKER = ++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	goto yy185;
 yy185:	if(yych <= 'L'){
@@ -3025,7 +3061,7 @@ yy185:	if(yych <= 'L'){
 	}
 yy186:	yyaccept = 9;
 	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	goto yy187;
 yy187:	if(yych <= 'K'){
@@ -3050,8 +3086,9 @@ yy187:	if(yych <= 'K'){
 		}
 	}
 yy188:
-#line 571
-	{ RET(T_FLOATLIT); }
+#line 571 "cpp.re"
+{ RET(T_FLOATLIT); }
+#line 3092 "cpp_re.cpp"
 yy189:	yych = *++YYCURSOR;
 	if(yych == 'L')	goto yy191;
 	if(yych == 'l')	goto yy191;
@@ -3555,63 +3592,73 @@ yy237:	yych = *++YYCURSOR;
 yy238:	yych = *++YYCURSOR;
 	if(yych == '\'')	goto yy2;
 	goto yy140;
-yy239:	yych = *++YYCURSOR;
+yy239:	++YYCURSOR;
 	goto yy240;
 yy240:
-#line 540
-	{ RET(T_GREATEREQUAL); }
-yy241:	yych = *++YYCURSOR;
-	if(yych == '=')	goto yy243;
+#line 540 "cpp.re"
+{ RET(T_GREATEREQUAL); }
+#line 3601 "cpp_re.cpp"
+yy241:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '=')	goto yy243;
 	goto yy242;
 yy242:
-#line 533
-	{ RET(T_SHIFTRIGHT); }
-yy243:	yych = *++YYCURSOR;
+#line 533 "cpp.re"
+{ RET(T_SHIFTRIGHT); }
+#line 3608 "cpp_re.cpp"
+yy243:	++YYCURSOR;
 	goto yy244;
 yy244:
-#line 534
-	{ RET(T_SHIFTRIGHTASSIGN); }
-yy245:	yych = *++YYCURSOR;
+#line 534 "cpp.re"
+{ RET(T_SHIFTRIGHTASSIGN); }
+#line 3614 "cpp_re.cpp"
+yy245:	++YYCURSOR;
 	goto yy246;
 yy246:
-#line 536
-	{ RET(T_EQUAL); }
-yy247:	yych = *++YYCURSOR;
+#line 536 "cpp.re"
+{ RET(T_EQUAL); }
+#line 3620 "cpp_re.cpp"
+yy247:	++YYCURSOR;
 	goto yy248;
 yy248:
-#line 537
-	{ RET(T_NOTEQUAL); }
+#line 537 "cpp.re"
+{ RET(T_NOTEQUAL); }
+#line 3626 "cpp_re.cpp"
 yy249:	yych = *++YYCURSOR;
 	if(yych == '?')	goto yy254;
 	goto yy2;
-yy250:	yych = *++YYCURSOR;
+yy250:	++YYCURSOR;
 	goto yy251;
 yy251:
-#line 543
-	{ RET(T_OROR); }
-yy252:	yych = *++YYCURSOR;
+#line 543 "cpp.re"
+{ RET(T_OROR); }
+#line 3635 "cpp_re.cpp"
+yy252:	++YYCURSOR;
 	goto yy253;
 yy253:
-#line 529
-	{ RET(T_ORASSIGN); }
+#line 529 "cpp.re"
+{ RET(T_ORASSIGN); }
+#line 3641 "cpp_re.cpp"
 yy254:	yych = *++YYCURSOR;
 	if(yych != '!')	goto yy2;
 	goto yy255;
-yy255:	yych = *++YYCURSOR;
+yy255:	++YYCURSOR;
 	goto yy256;
 yy256:
-#line 545
-	{ RET(T_OROR); }
-yy257:	yych = *++YYCURSOR;
+#line 545 "cpp.re"
+{ RET(T_OROR); }
+#line 3650 "cpp_re.cpp"
+yy257:	++YYCURSOR;
 	goto yy258;
 yy258:
-#line 541
-	{ RET(T_ANDAND); }
-yy259:	yych = *++YYCURSOR;
+#line 541 "cpp.re"
+{ RET(T_ANDAND); }
+#line 3656 "cpp_re.cpp"
+yy259:	++YYCURSOR;
 	goto yy260;
 yy260:
-#line 527
-	{ RET(T_ANDASSIGN); }
+#line 527 "cpp.re"
+{ RET(T_ANDASSIGN); }
+#line 3662 "cpp_re.cpp"
 yy261:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'r')	goto yy219;
@@ -3640,8 +3687,9 @@ yy262:	yyaccept = 10;
 		}
 	}
 yy263:
-#line 505
-	{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_XOR_ALT); }
+#line 505 "cpp.re"
+{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_XOR_ALT); }
+#line 3693 "cpp_re.cpp"
 yy264:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'e')	goto yy219;
@@ -3673,39 +3721,45 @@ yy266:	yyaccept = 11;
 		}
 	}
 yy267:
-#line 525
-	{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_XORASSIGN_ALT); }
-yy268:	yych = *++YYCURSOR;
+#line 525 "cpp.re"
+{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_XORASSIGN_ALT); }
+#line 3727 "cpp_re.cpp"
+yy268:	++YYCURSOR;
 	goto yy269;
 yy269:
-#line 524
-	{ RET(T_XORASSIGN); }
-yy270:	yych = *++YYCURSOR;
+#line 524 "cpp.re"
+{ RET(T_XORASSIGN); }
+#line 3733 "cpp_re.cpp"
+yy270:	++YYCURSOR;
 	goto yy271;
 yy271:
-#line 521
-	{ RET(T_STARASSIGN); }
-yy272:	yych = *++YYCURSOR;
-	if(yych == '*')	goto yy278;
+#line 521 "cpp.re"
+{ RET(T_STARASSIGN); }
+#line 3739 "cpp_re.cpp"
+yy272:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '*')	goto yy278;
 	goto yy273;
 yy273:
-#line 561
-	{ RET(T_ARROW); }
-yy274:	yych = *++YYCURSOR;
+#line 561 "cpp.re"
+{ RET(T_ARROW); }
+#line 3746 "cpp_re.cpp"
+yy274:	++YYCURSOR;
 	goto yy275;
 yy275:
-#line 549
-	{ RET(T_MINUSMINUS); }
-yy276:	yych = *++YYCURSOR;
+#line 549 "cpp.re"
+{ RET(T_MINUSMINUS); }
+#line 3752 "cpp_re.cpp"
+yy276:	++YYCURSOR;
 	goto yy277;
 yy277:
-#line 520
-	{ RET(T_MINUSASSIGN); }
-yy278:	yych = *++YYCURSOR;
+#line 520 "cpp.re"
+{ RET(T_MINUSASSIGN); }
+#line 3758 "cpp_re.cpp"
+yy278:	++YYCURSOR;
 	goto yy279;
 yy279:
-#line 552
-	{ 
+#line 552 "cpp.re"
+{ 
             if (s->act_in_c99_mode) {
                 --YYCURSOR;
                 RET(T_ARROW);
@@ -3714,21 +3768,24 @@ yy279:
                 RET(T_ARROWSTAR); 
             }
         }
-yy280:	yych = *++YYCURSOR;
+#line 3772 "cpp_re.cpp"
+yy280:	++YYCURSOR;
 	goto yy281;
 yy281:
-#line 548
-	{ RET(T_PLUSPLUS); }
-yy282:	yych = *++YYCURSOR;
+#line 548 "cpp.re"
+{ RET(T_PLUSPLUS); }
+#line 3778 "cpp_re.cpp"
+yy282:	++YYCURSOR;
 	goto yy283;
 yy283:
-#line 519
-	{ RET(T_PLUSASSIGN); }
-yy284:	yych = *++YYCURSOR;
+#line 519 "cpp.re"
+{ RET(T_PLUSASSIGN); }
+#line 3784 "cpp_re.cpp"
+yy284:	++YYCURSOR;
 	goto yy285;
 yy285:
-#line 489
-	{ 
+#line 489 "cpp.re"
+{ 
             if (s->act_in_c99_mode) {
                 --YYCURSOR;
                 RET(T_DOT);
@@ -3737,22 +3794,24 @@ yy285:
                 RET(T_DOTSTAR); 
             }
         }
+#line 3798 "cpp_re.cpp"
 yy286:	yych = *++YYCURSOR;
 	if(yych != '.')	goto yy2;
 	goto yy287;
-yy287:	yych = *++YYCURSOR;
+yy287:	++YYCURSOR;
 	goto yy288;
 yy288:
-#line 475
-	{ RET(T_ELLIPSIS); }
+#line 475 "cpp.re"
+{ RET(T_ELLIPSIS); }
+#line 3807 "cpp_re.cpp"
 yy289:	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	if((YYLIMIT - YYCURSOR) < 12) YYFILL(12);
 	yych = *YYCURSOR;
 	goto yy290;
 yy290:	if(yych <= 'i'){
 		if(yych <= '.'){
-			if(yych <= '\t'){
-				if(yych <= '\b')	goto yy2;
+			if(yych <= 0x09){
+				if(yych <= 0x08)	goto yy2;
 				goto yy289;
 			} else {
 				if(yych == ' ')	goto yy289;
@@ -3828,19 +3887,21 @@ yy299:	yych = *++YYCURSOR;
 yy300:	yych = *++YYCURSOR;
 	if(yych == '?')	goto yy303;
 	goto yy2;
-yy301:	yych = *++YYCURSOR;
+yy301:	++YYCURSOR;
 	goto yy302;
 yy302:
-#line 466
-	{ RET(T_POUND_POUND); }
+#line 466 "cpp.re"
+{ RET(T_POUND_POUND); }
+#line 3896 "cpp_re.cpp"
 yy303:	yych = *++YYCURSOR;
 	if(yych != '=')	goto yy2;
 	goto yy304;
-yy304:	yych = *++YYCURSOR;
+yy304:	++YYCURSOR;
 	goto yy305;
 yy305:
-#line 467
-	{ RET(T_POUND_POUND_TRIGRAPH); }
+#line 467 "cpp.re"
+{ RET(T_POUND_POUND_TRIGRAPH); }
+#line 3905 "cpp_re.cpp"
 yy306:	yych = *++YYCURSOR;
 	if(yych == 'c')	goto yy318;
 	goto yy2;
@@ -3850,8 +3911,9 @@ yy307:	yyaccept = 12;
 	if(yych == 'n')	goto yy309;
 	goto yy308;
 yy308:
-#line 589
-	{ RET(T_PP_IF); }
+#line 589 "cpp.re"
+{ RET(T_PP_IF); }
+#line 3917 "cpp_re.cpp"
 yy309:	yych = *++YYCURSOR;
 	if(yych == 'd')	goto yy314;
 	goto yy2;
@@ -3861,22 +3923,24 @@ yy310:	yych = *++YYCURSOR;
 yy311:	yych = *++YYCURSOR;
 	if(yych != 'f')	goto yy2;
 	goto yy312;
-yy312:	yych = *++YYCURSOR;
+yy312:	++YYCURSOR;
 	goto yy313;
 yy313:
-#line 590
-	{ RET(T_PP_IFDEF); }
+#line 590 "cpp.re"
+{ RET(T_PP_IFDEF); }
+#line 3932 "cpp_re.cpp"
 yy314:	yych = *++YYCURSOR;
 	if(yych != 'e')	goto yy2;
 	goto yy315;
 yy315:	yych = *++YYCURSOR;
 	if(yych != 'f')	goto yy2;
 	goto yy316;
-yy316:	yych = *++YYCURSOR;
+yy316:	++YYCURSOR;
 	goto yy317;
 yy317:
-#line 591
-	{ RET(T_PP_IFNDEF); }
+#line 591 "cpp.re"
+{ RET(T_PP_IFNDEF); }
+#line 3944 "cpp_re.cpp"
 yy318:	yych = *++YYCURSOR;
 	if(yych != 'l')	goto yy2;
 	goto yy319;
@@ -3894,19 +3958,20 @@ yy322:	yyaccept = 13;
 	if(yych == '_')	goto yy324;
 	goto yy326;
 yy323:
-#line 587
-	{ RET(T_PP_INCLUDE); }
+#line 587 "cpp.re"
+{ RET(T_PP_INCLUDE); }
+#line 3964 "cpp_re.cpp"
 yy324:	yych = *++YYCURSOR;
 	if(yych == 'n')	goto yy345;
 	goto yy2;
 yy325:	yyaccept = 13;
 	YYMARKER = ++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	goto yy326;
 yy326:	if(yych <= '!'){
-		if(yych <= '\t'){
-			if(yych <= '\b')	goto yy323;
+		if(yych <= 0x09){
+			if(yych <= 0x08)	goto yy323;
 			goto yy325;
 		} else {
 			if(yych == ' ')	goto yy325;
@@ -3937,48 +4002,50 @@ yy330:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy331;
-yy331:	if(yych <= '\f'){
-		if(yych == '\t')	goto yy330;
-		if(yych <= '\n')	goto yy2;
+yy331:	if(yych <= 0x0C){
+		if(yych == 0x09)	goto yy330;
+		if(yych <= 0x0A)	goto yy2;
 		goto yy330;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych != '"')	goto yy330;
 		goto yy332;
 	}
-yy332:	yych = *++YYCURSOR;
+yy332:	++YYCURSOR;
 	goto yy333;
 yy333:
-#line 584
-	{ RET(T_PP_QHEADER); }
+#line 584 "cpp.re"
+{ RET(T_PP_QHEADER); }
+#line 4020 "cpp_re.cpp"
 yy334:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy335;
-yy335:	if(yych <= '\f'){
-		if(yych == '\t')	goto yy334;
-		if(yych <= '\n')	goto yy2;
+yy335:	if(yych <= 0x0C){
+		if(yych == 0x09)	goto yy334;
+		if(yych <= 0x0A)	goto yy2;
 		goto yy334;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych != '>')	goto yy334;
 		goto yy336;
 	}
-yy336:	yych = *++YYCURSOR;
+yy336:	++YYCURSOR;
 	goto yy337;
 yy337:
-#line 581
-	{ RET(T_PP_HHEADER); }
+#line 581 "cpp.re"
+{ RET(T_PP_HHEADER); }
+#line 4039 "cpp_re.cpp"
 yy338:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy339;
-yy339:	if(yych <= '\r'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy338;
+yy339:	if(yych <= 0x0D){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy338;
 		goto yy340;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych == '*')	goto yy342;
 		goto yy338;
 	}
@@ -3986,12 +4053,12 @@ yy340:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy341;
-yy341:	if(yych <= '\r'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy338;
+yy341:	if(yych <= 0x0D){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy338;
 		goto yy340;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych != '*')	goto yy338;
 		goto yy342;
 	}
@@ -3999,10 +4066,10 @@ yy342:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy343;
-yy343:	if(yych <= '\037'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy338;
-		if(yych >= '\016')	goto yy2;
+yy343:	if(yych <= 0x1F){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy338;
+		if(yych >= 0x0E)	goto yy2;
 		goto yy344;
 	} else {
 		if(yych <= '*'){
@@ -4016,12 +4083,12 @@ yy343:	if(yych <= '\037'){
 yy344:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if(yych <= '\r'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy338;
+	if(yych <= 0x0D){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy338;
 		goto yy340;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych == '*')	goto yy342;
 		goto yy338;
 	}
@@ -4046,11 +4113,12 @@ yy350:	yych = *++YYCURSOR;
 yy351:	yych = *++YYCURSOR;
 	if(yych != 'e')	goto yy2;
 	goto yy352;
-yy352:	yych = *++YYCURSOR;
+yy352:	++YYCURSOR;
 	goto yy353;
 yy353:
-#line 595
-	{ RET(T_PP_DEFINE); }
+#line 595 "cpp.re"
+{ RET(T_PP_DEFINE); }
+#line 4122 "cpp_re.cpp"
 yy354:	yych = *++YYCURSOR;
 	if(yych != 'd')	goto yy2;
 	goto yy355;
@@ -4060,22 +4128,24 @@ yy355:	yych = *++YYCURSOR;
 yy356:	yych = *++YYCURSOR;
 	if(yych != 'f')	goto yy2;
 	goto yy357;
-yy357:	yych = *++YYCURSOR;
+yy357:	++YYCURSOR;
 	goto yy358;
 yy358:
-#line 596
-	{ RET(T_PP_UNDEF); }
+#line 596 "cpp.re"
+{ RET(T_PP_UNDEF); }
+#line 4137 "cpp_re.cpp"
 yy359:	yych = *++YYCURSOR;
 	if(yych != 'n')	goto yy2;
 	goto yy360;
 yy360:	yych = *++YYCURSOR;
 	if(yych != 'e')	goto yy2;
 	goto yy361;
-yy361:	yych = *++YYCURSOR;
+yy361:	++YYCURSOR;
 	goto yy362;
 yy362:
-#line 597
-	{ RET(T_PP_LINE); }
+#line 597 "cpp.re"
+{ RET(T_PP_LINE); }
+#line 4149 "cpp_re.cpp"
 yy363:	yych = *++YYCURSOR;
 	if(yych != 'a')	goto yy2;
 	goto yy364;
@@ -4088,11 +4158,12 @@ yy365:	yych = *++YYCURSOR;
 yy366:	yych = *++YYCURSOR;
 	if(yych != 'a')	goto yy2;
 	goto yy367;
-yy367:	yych = *++YYCURSOR;
+yy367:	++YYCURSOR;
 	goto yy368;
 yy368:
-#line 599
-	{ RET(T_PP_PRAGMA); }
+#line 599 "cpp.re"
+{ RET(T_PP_PRAGMA); }
+#line 4167 "cpp_re.cpp"
 yy369:	yych = *++YYCURSOR;
 	if(yych != 'r')	goto yy2;
 	goto yy370;
@@ -4108,11 +4179,12 @@ yy372:	yych = *++YYCURSOR;
 yy373:	yych = *++YYCURSOR;
 	if(yych != 'g')	goto yy2;
 	goto yy374;
-yy374:	yych = *++YYCURSOR;
+yy374:	++YYCURSOR;
 	goto yy375;
 yy375:
-#line 601
-	{ RET(T_PP_WARNING); }
+#line 601 "cpp.re"
+{ RET(T_PP_WARNING); }
+#line 4188 "cpp_re.cpp"
 yy376:	yych = *++YYCURSOR;
 	if(yych != 'g')	goto yy2;
 	goto yy377;
@@ -4125,11 +4197,12 @@ yy378:	yych = *++YYCURSOR;
 yy379:	yych = *++YYCURSOR;
 	if(yych != 'n')	goto yy2;
 	goto yy380;
-yy380:	yych = *++YYCURSOR;
+yy380:	++YYCURSOR;
 	goto yy381;
 yy381:
-#line 603
-	{ RET(T_MSEXT_PP_REGION); }
+#line 603 "cpp.re"
+{ RET(T_MSEXT_PP_REGION); }
+#line 4206 "cpp_re.cpp"
 yy382:	yych = *++YYCURSOR;
 	if(yych == 'i')	goto yy400;
 	if(yych == 's')	goto yy401;
@@ -4146,11 +4219,12 @@ yy385:	yych = *++YYCURSOR;
 yy386:	yych = *++YYCURSOR;
 	if(yych != 'r')	goto yy2;
 	goto yy387;
-yy387:	yych = *++YYCURSOR;
+yy387:	++YYCURSOR;
 	goto yy388;
 yy388:
-#line 598
-	{ RET(T_PP_ERROR); }
+#line 598 "cpp.re"
+{ RET(T_PP_ERROR); }
+#line 4228 "cpp_re.cpp"
 yy389:	yych = *++YYCURSOR;
 	if(yych == 'i')	goto yy390;
 	if(yych == 'r')	goto yy391;
@@ -4173,42 +4247,46 @@ yy394:	yych = *++YYCURSOR;
 yy395:	yych = *++YYCURSOR;
 	if(yych != 'n')	goto yy2;
 	goto yy396;
-yy396:	yych = *++YYCURSOR;
+yy396:	++YYCURSOR;
 	goto yy397;
 yy397:
-#line 604
-	{ RET(T_MSEXT_PP_ENDREGION); }
-yy398:	yych = *++YYCURSOR;
+#line 604 "cpp.re"
+{ RET(T_MSEXT_PP_ENDREGION); }
+#line 4256 "cpp_re.cpp"
+yy398:	++YYCURSOR;
 	goto yy399;
 yy399:
-#line 594
-	{ RET(T_PP_ENDIF); }
+#line 594 "cpp.re"
+{ RET(T_PP_ENDIF); }
+#line 4262 "cpp_re.cpp"
 yy400:	yych = *++YYCURSOR;
 	if(yych == 'f')	goto yy404;
 	goto yy2;
 yy401:	yych = *++YYCURSOR;
 	if(yych != 'e')	goto yy2;
 	goto yy402;
-yy402:	yych = *++YYCURSOR;
+yy402:	++YYCURSOR;
 	goto yy403;
 yy403:
-#line 592
-	{ RET(T_PP_ELSE); }
-yy404:	yych = *++YYCURSOR;
+#line 592 "cpp.re"
+{ RET(T_PP_ELSE); }
+#line 4274 "cpp_re.cpp"
+yy404:	++YYCURSOR;
 	goto yy405;
 yy405:
-#line 593
-	{ RET(T_PP_ELIF); }
+#line 593 "cpp.re"
+{ RET(T_PP_ELIF); }
+#line 4280 "cpp_re.cpp"
 yy406:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy407;
-yy407:	if(yych <= '\r'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy406;
+yy407:	if(yych <= 0x0D){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy406;
 		goto yy408;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych == '*')	goto yy410;
 		goto yy406;
 	}
@@ -4216,12 +4294,12 @@ yy408:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy409;
-yy409:	if(yych <= '\r'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy406;
+yy409:	if(yych <= 0x0D){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy406;
 		goto yy408;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych != '*')	goto yy406;
 		goto yy410;
 	}
@@ -4229,10 +4307,10 @@ yy410:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	goto yy411;
-yy411:	if(yych <= '\037'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy406;
-		if(yych >= '\016')	goto yy2;
+yy411:	if(yych <= 0x1F){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy406;
+		if(yych >= 0x0E)	goto yy2;
 		goto yy412;
 	} else {
 		if(yych <= '*'){
@@ -4246,20 +4324,20 @@ yy411:	if(yych <= '\037'){
 yy412:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if(yych <= '\r'){
-		if(yych <= '\b')	goto yy2;
-		if(yych <= '\f')	goto yy406;
+	if(yych <= 0x0D){
+		if(yych <= 0x08)	goto yy2;
+		if(yych <= 0x0C)	goto yy406;
 		goto yy408;
 	} else {
-		if(yych <= '\037')	goto yy2;
+		if(yych <= 0x1F)	goto yy2;
 		if(yych == '*')	goto yy410;
 		goto yy406;
 	}
-yy413:	yych = *++YYCURSOR;
+yy413:	++YYCURSOR;
 	goto yy414;
 yy414:
-#line 478
-	{ 
+#line 478 "cpp.re"
+{ 
             if (s->act_in_c99_mode) {
                 --YYCURSOR;
                 RET(T_COLON);
@@ -4268,17 +4346,19 @@ yy414:
                 RET(T_COLON_COLON); 
             }
         }
-yy415:	yych = *++YYCURSOR;
+#line 4350 "cpp_re.cpp"
+yy415:	++YYCURSOR;
 	goto yy416;
 yy416:
-#line 462
-	{ RET(T_RIGHTBRACKET_ALT); }
+#line 462 "cpp.re"
+{ RET(T_RIGHTBRACKET_ALT); }
+#line 4356 "cpp_re.cpp"
 yy417:	yyaccept = 14;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'h'){
 		if(yych <= '$'){
-			if(yych <= '\t'){
-				if(yych >= '\t')	goto yy290;
+			if(yych <= 0x09){
+				if(yych >= 0x09)	goto yy290;
 				goto yy418;
 			} else {
 				if(yych == ' ')	goto yy290;
@@ -4317,52 +4397,61 @@ yy417:	yyaccept = 14;
 		}
 	}
 yy418:
-#line 464
-	{ RET(T_POUND_ALT); }
-yy419:	yych = *++YYCURSOR;
+#line 464 "cpp.re"
+{ RET(T_POUND_ALT); }
+#line 4403 "cpp_re.cpp"
+yy419:	++YYCURSOR;
 	goto yy420;
 yy420:
-#line 523
-	{ RET(T_PERCENTASSIGN); }
-yy421:	yych = *++YYCURSOR;
+#line 523 "cpp.re"
+{ RET(T_PERCENTASSIGN); }
+#line 4409 "cpp_re.cpp"
+yy421:	++YYCURSOR;
 	goto yy422;
 yy422:
-#line 456
-	{ RET(T_RIGHTBRACE_ALT); }
+#line 456 "cpp.re"
+{ RET(T_RIGHTBRACE_ALT); }
+#line 4415 "cpp_re.cpp"
 yy423:	yych = *++YYCURSOR;
 	if(yych != ':')	goto yy2;
 	goto yy424;
-yy424:	yych = *++YYCURSOR;
+yy424:	++YYCURSOR;
 	goto yy425;
 yy425:
-#line 470
-	{ RET(T_POUND_POUND_ALT); }
-yy426:	yych = *++YYCURSOR;
+#line 470 "cpp.re"
+{ RET(T_POUND_POUND_ALT); }
+#line 4424 "cpp_re.cpp"
+yy426:	++YYCURSOR;
 	goto yy427;
 yy427:
-#line 539
-	{ RET(T_LESSEQUAL); }
-yy428:	yych = *++YYCURSOR;
-	if(yych == '=')	goto yy434;
+#line 539 "cpp.re"
+{ RET(T_LESSEQUAL); }
+#line 4430 "cpp_re.cpp"
+yy428:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '=')	goto yy434;
 	goto yy429;
 yy429:
-#line 532
-	{ RET(T_SHIFTLEFT); }
-yy430:	yych = *++YYCURSOR;
+#line 532 "cpp.re"
+{ RET(T_SHIFTLEFT); }
+#line 4437 "cpp_re.cpp"
+yy430:	++YYCURSOR;
 	goto yy431;
 yy431:
-#line 459
-	{ RET(T_LEFTBRACKET_ALT); }
-yy432:	yych = *++YYCURSOR;
+#line 459 "cpp.re"
+{ RET(T_LEFTBRACKET_ALT); }
+#line 4443 "cpp_re.cpp"
+yy432:	++YYCURSOR;
 	goto yy433;
 yy433:
-#line 453
-	{ RET(T_LEFTBRACE_ALT); }
-yy434:	yych = *++YYCURSOR;
+#line 453 "cpp.re"
+{ RET(T_LEFTBRACE_ALT); }
+#line 4449 "cpp_re.cpp"
+yy434:	++YYCURSOR;
 	goto yy435;
 yy435:
-#line 535
-	{ RET(T_SHIFTLEFTASSIGN); }
+#line 535 "cpp.re"
+{ RET(T_SHIFTLEFTASSIGN); }
+#line 4455 "cpp_re.cpp"
 yy436:	yych = *++YYCURSOR;
 	switch(yych){
 	case '!':	goto yy449;
@@ -4376,32 +4465,36 @@ yy436:	yych = *++YYCURSOR;
 	case '>':	goto yy439;
 	default:	goto yy2;
 	}
-yy437:	yych = *++YYCURSOR;
+yy437:	++YYCURSOR;
 	goto yy438;
 yy438:
-#line 452
-	{ RET(T_LEFTBRACE_TRIGRAPH); }
-yy439:	yych = *++YYCURSOR;
+#line 452 "cpp.re"
+{ RET(T_LEFTBRACE_TRIGRAPH); }
+#line 4474 "cpp_re.cpp"
+yy439:	++YYCURSOR;
 	goto yy440;
 yy440:
-#line 455
-	{ RET(T_RIGHTBRACE_TRIGRAPH); }
-yy441:	yych = *++YYCURSOR;
+#line 455 "cpp.re"
+{ RET(T_RIGHTBRACE_TRIGRAPH); }
+#line 4480 "cpp_re.cpp"
+yy441:	++YYCURSOR;
 	goto yy442;
 yy442:
-#line 458
-	{ RET(T_LEFTBRACKET_TRIGRAPH); }
-yy443:	yych = *++YYCURSOR;
+#line 458 "cpp.re"
+{ RET(T_LEFTBRACKET_TRIGRAPH); }
+#line 4486 "cpp_re.cpp"
+yy443:	++YYCURSOR;
 	goto yy444;
 yy444:
-#line 461
-	{ RET(T_RIGHTBRACKET_TRIGRAPH); }
+#line 461 "cpp.re"
+{ RET(T_RIGHTBRACKET_TRIGRAPH); }
+#line 4492 "cpp_re.cpp"
 yy445:	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'e'){
 		if(yych <= '#'){
-			if(yych <= '\037'){
-				if(yych == '\t')	goto yy290;
+			if(yych <= 0x1F){
+				if(yych == 0x09)	goto yy290;
 				goto yy446;
 			} else {
 				if(yych <= ' ')	goto yy290;
@@ -4440,14 +4533,16 @@ yy445:	yyaccept = 15;
 		}
 	}
 yy446:
-#line 465
-	{ RET(T_POUND_TRIGRAPH); }
-yy447:	yych = *++YYCURSOR;
-	if(yych == '=')	goto yy463;
+#line 465 "cpp.re"
+{ RET(T_POUND_TRIGRAPH); }
+#line 4539 "cpp_re.cpp"
+yy447:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '=')	goto yy463;
 	goto yy448;
 yy448:
-#line 504
-	{ RET(T_XOR_TRIGRAPH); }
+#line 504 "cpp.re"
+{ RET(T_XOR_TRIGRAPH); }
+#line 4546 "cpp_re.cpp"
 yy449:	yyaccept = 16;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '>'){
@@ -4459,63 +4554,72 @@ yy449:	yyaccept = 16;
 		goto yy450;
 	}
 yy450:
-#line 510
-	{ RET(T_OR_TRIGRAPH); }
-yy451:	yych = *++YYCURSOR;
+#line 510 "cpp.re"
+{ RET(T_OR_TRIGRAPH); }
+#line 4560 "cpp_re.cpp"
+yy451:	++YYCURSOR;
 	goto yy452;
 yy452:
-#line 512
-	{ RET(T_COMPL_TRIGRAPH); }
+#line 512 "cpp.re"
+{ RET(T_COMPL_TRIGRAPH); }
+#line 4566 "cpp_re.cpp"
 yy453:	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'U')	goto yy210;
 	if(yych == 'u')	goto yy209;
 	goto yy454;
 yy454:
-#line 562
-	{ RET(T_ANY_TRIGRAPH); }
+#line 562 "cpp.re"
+{ RET(T_ANY_TRIGRAPH); }
+#line 4575 "cpp_re.cpp"
 yy455:	yych = *++YYCURSOR;
 	if(yych == '?')	goto yy460;
 	goto yy2;
-yy456:	yych = *++YYCURSOR;
+yy456:	++YYCURSOR;
 	goto yy457;
 yy457:
-#line 544
-	{ RET(T_OROR); }
-yy458:	yych = *++YYCURSOR;
+#line 544 "cpp.re"
+{ RET(T_OROR); }
+#line 4584 "cpp_re.cpp"
+yy458:	++YYCURSOR;
 	goto yy459;
 yy459:
-#line 531
-	{ RET(T_ORASSIGN); }
+#line 531 "cpp.re"
+{ RET(T_ORASSIGN); }
+#line 4590 "cpp_re.cpp"
 yy460:	yych = *++YYCURSOR;
 	if(yych != '!')	goto yy2;
 	goto yy461;
-yy461:	yych = *++YYCURSOR;
+yy461:	++YYCURSOR;
 	goto yy462;
 yy462:
-#line 547
-	{ RET(T_OROR); }
-yy463:	yych = *++YYCURSOR;
+#line 547 "cpp.re"
+{ RET(T_OROR); }
+#line 4599 "cpp_re.cpp"
+yy463:	++YYCURSOR;
 	goto yy464;
 yy464:
-#line 526
-	{ RET(T_XORASSIGN); }
+#line 526 "cpp.re"
+{ RET(T_XORASSIGN); }
+#line 4605 "cpp_re.cpp"
 yy465:	yych = *++YYCURSOR;
 	if(yych == '?')	goto yy468;
 	goto yy2;
-yy466:	yych = *++YYCURSOR;
+yy466:	++YYCURSOR;
 	goto yy467;
 yy467:
-#line 468
-	{ RET(T_POUND_POUND_TRIGRAPH); }
+#line 468 "cpp.re"
+{ RET(T_POUND_POUND_TRIGRAPH); }
+#line 4614 "cpp_re.cpp"
 yy468:	yych = *++YYCURSOR;
 	if(yych != '=')	goto yy2;
 	goto yy469;
-yy469:	yych = *++YYCURSOR;
+yy469:	++YYCURSOR;
 	goto yy470;
 yy470:
-#line 469
-	{ RET(T_POUND_POUND_TRIGRAPH); }
+#line 469 "cpp.re"
+{ RET(T_POUND_POUND_TRIGRAPH); }
+#line 4623 "cpp_re.cpp"
 yy471:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
@@ -4602,8 +4706,9 @@ yy484:	yyaccept = 18;
 		}
 	}
 yy485:
-#line 443
-	{ RET(s->enable_ms_extensions ? T_MSEXT_STDCALL : T_IDENTIFIER); }
+#line 443 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_STDCALL : T_IDENTIFIER); }
+#line 4712 "cpp_re.cpp"
 yy486:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'l')	goto yy219;
@@ -4643,8 +4748,9 @@ yy490:	yyaccept = 19;
 		}
 	}
 yy491:
-#line 448
-	{ RET(s->enable_ms_extensions ? T_MSEXT_INLINE : T_IDENTIFIER); }
+#line 448 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_INLINE : T_IDENTIFIER); }
+#line 4754 "cpp_re.cpp"
 yy492:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 's')	goto yy219;
@@ -4692,8 +4798,9 @@ yy498:	yyaccept = 20;
 		}
 	}
 yy499:
-#line 442
-	{ RET(s->enable_ms_extensions ? T_MSEXT_FASTCALL : T_IDENTIFIER); }
+#line 442 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_FASTCALL : T_IDENTIFIER); }
+#line 4804 "cpp_re.cpp"
 yy500:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'c')	goto yy219;
@@ -4741,8 +4848,9 @@ yy506:	yyaccept = 21;
 		}
 	}
 yy507:
-#line 440
-	{ RET(s->enable_ms_extensions ? T_MSEXT_DECLSPEC : T_IDENTIFIER); }
+#line 440 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_DECLSPEC : T_IDENTIFIER); }
+#line 4854 "cpp_re.cpp"
 yy508:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'e')	goto yy219;
@@ -4778,8 +4886,9 @@ yy511:	yyaccept = 22;
 		}
 	}
 yy512:
-#line 441
-	{ RET(s->enable_ms_extensions ? T_MSEXT_CDECL : T_IDENTIFIER); }
+#line 441 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_CDECL : T_IDENTIFIER); }
+#line 4892 "cpp_re.cpp"
 yy513:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 's')	goto yy219;
@@ -4815,8 +4924,9 @@ yy516:	yyaccept = 23;
 		}
 	}
 yy517:
-#line 439
-	{ RET(s->enable_ms_extensions ? T_MSEXT_BASED : T_IDENTIFIER); }
+#line 439 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_BASED : T_IDENTIFIER); }
+#line 4930 "cpp_re.cpp"
 yy518:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'm')	goto yy219;
@@ -4844,8 +4954,9 @@ yy519:	yyaccept = 24;
 		}
 	}
 yy520:
-#line 449
-	{ RET(s->enable_ms_extensions ? T_MSEXT_ASM : T_IDENTIFIER); }
+#line 449 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_ASM : T_IDENTIFIER); }
+#line 4960 "cpp_re.cpp"
 yy521:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'n')	goto yy547;
@@ -4902,8 +5013,9 @@ yy529:	yyaccept = 25;
 		}
 	}
 yy530:
-#line 447
-	{ RET(s->enable_ms_extensions ? T_MSEXT_LEAVE : T_IDENTIFIER); }
+#line 447 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_LEAVE : T_IDENTIFIER); }
+#line 5019 "cpp_re.cpp"
 yy531:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'c')	goto yy219;
@@ -4943,8 +5055,9 @@ yy535:	yyaccept = 26;
 		}
 	}
 yy536:
-#line 445
-	{ RET(s->enable_ms_extensions ? T_MSEXT_EXCEPT : T_IDENTIFIER); }
+#line 445 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_EXCEPT : T_IDENTIFIER); }
+#line 5061 "cpp_re.cpp"
 yy537:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'y')	goto yy219;
@@ -4972,8 +5085,9 @@ yy538:	yyaccept = 27;
 		}
 	}
 yy539:
-#line 444
-	{ RET(s->enable_ms_extensions ? T_MSEXT_TRY : T_IDENTIFIER); }
+#line 444 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_TRY : T_IDENTIFIER); }
+#line 5091 "cpp_re.cpp"
 yy540:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'n')	goto yy219;
@@ -5017,8 +5131,9 @@ yy545:	yyaccept = 28;
 		}
 	}
 yy546:
-#line 446
-	{ RET(s->enable_ms_extensions ? T_MSEXT_FINALLY : T_IDENTIFIER); }
+#line 446 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_FINALLY : T_IDENTIFIER); }
+#line 5137 "cpp_re.cpp"
 yy547:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'l')	goto yy487;
@@ -5068,8 +5183,9 @@ yy552:	yyaccept = 29;
 		}
 	}
 yy553:
-#line 435
-	{ RET(s->enable_ms_extensions ? T_MSEXT_INT8 : T_IDENTIFIER); }
+#line 435 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_INT8 : T_IDENTIFIER); }
+#line 5189 "cpp_re.cpp"
 yy554:	yyaccept = 30;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -5093,8 +5209,9 @@ yy554:	yyaccept = 30;
 		}
 	}
 yy555:
-#line 438
-	{ RET(s->enable_ms_extensions ? T_MSEXT_INT64 : T_IDENTIFIER); }
+#line 438 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_INT64 : T_IDENTIFIER); }
+#line 5215 "cpp_re.cpp"
 yy556:	yyaccept = 31;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -5118,8 +5235,9 @@ yy556:	yyaccept = 31;
 		}
 	}
 yy557:
-#line 437
-	{ RET(s->enable_ms_extensions ? T_MSEXT_INT32 : T_IDENTIFIER); }
+#line 437 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_INT32 : T_IDENTIFIER); }
+#line 5241 "cpp_re.cpp"
 yy558:	yyaccept = 32;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -5143,8 +5261,9 @@ yy558:	yyaccept = 32;
 		}
 	}
 yy559:
-#line 436
-	{ RET(s->enable_ms_extensions ? T_MSEXT_INT16 : T_IDENTIFIER); }
+#line 436 "cpp.re"
+{ RET(s->enable_ms_extensions ? T_MSEXT_INT16 : T_IDENTIFIER); }
+#line 5267 "cpp_re.cpp"
 yy560:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'h')	goto yy566;
@@ -5184,8 +5303,9 @@ yy564:	yyaccept = 33;
 		}
 	}
 yy565:
-#line 433
-	{ RET(T_WHILE); }
+#line 433 "cpp.re"
+{ RET(T_WHILE); }
+#line 5309 "cpp_re.cpp"
 yy566:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'a')	goto yy219;
@@ -5225,8 +5345,9 @@ yy570:	yyaccept = 34;
 		}
 	}
 yy571:
-#line 432
-	{ RET(T_WCHART); }
+#line 432 "cpp.re"
+{ RET(T_WCHART); }
+#line 5351 "cpp_re.cpp"
 yy572:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'r')	goto yy584;
@@ -5283,8 +5404,9 @@ yy580:	yyaccept = 35;
 		}
 	}
 yy581:
-#line 431
-	{ RET(T_VOLATILE); }
+#line 431 "cpp.re"
+{ RET(T_VOLATILE); }
+#line 5410 "cpp_re.cpp"
 yy582:	yyaccept = 36;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -5308,8 +5430,9 @@ yy582:	yyaccept = 36;
 		}
 	}
 yy583:
-#line 430
-	{ RET(T_VOID); }
+#line 430 "cpp.re"
+{ RET(T_VOID); }
+#line 5436 "cpp_re.cpp"
 yy584:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 't')	goto yy219;
@@ -5349,8 +5472,9 @@ yy588:	yyaccept = 37;
 		}
 	}
 yy589:
-#line 429
-	{ RET(T_VIRTUAL); }
+#line 429 "cpp.re"
+{ RET(T_VIRTUAL); }
+#line 5478 "cpp_re.cpp"
 yy590:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'i')	goto yy596;
@@ -5391,8 +5515,9 @@ yy594:	yyaccept = 38;
 		}
 	}
 yy595:
-#line 428
-	{ RET(T_USING); }
+#line 428 "cpp.re"
+{ RET(T_USING); }
+#line 5521 "cpp_re.cpp"
 yy596:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'o')	goto yy604;
@@ -5440,8 +5565,9 @@ yy602:	yyaccept = 39;
 		}
 	}
 yy603:
-#line 427
-	{ RET(T_UNSIGNED); }
+#line 427 "cpp.re"
+{ RET(T_UNSIGNED); }
+#line 5571 "cpp_re.cpp"
 yy604:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'n')	goto yy219;
@@ -5469,8 +5595,9 @@ yy605:	yyaccept = 40;
 		}
 	}
 yy606:
-#line 426
-	{ RET(T_UNION); }
+#line 426 "cpp.re"
+{ RET(T_UNION); }
+#line 5601 "cpp_re.cpp"
 yy607:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'm')	goto yy637;
@@ -5546,8 +5673,9 @@ yy618:	yyaccept = 41;
 		}
 	}
 yy619:
-#line 425
-	{ RET(T_TYPENAME); }
+#line 425 "cpp.re"
+{ RET(T_TYPENAME); }
+#line 5679 "cpp_re.cpp"
 yy620:	yyaccept = 42;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -5571,8 +5699,9 @@ yy620:	yyaccept = 42;
 		}
 	}
 yy621:
-#line 424
-	{ RET(T_TYPEID); }
+#line 424 "cpp.re"
+{ RET(T_TYPEID); }
+#line 5705 "cpp_re.cpp"
 yy622:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'f')	goto yy219;
@@ -5600,8 +5729,9 @@ yy623:	yyaccept = 43;
 		}
 	}
 yy624:
-#line 423
-	{ RET(T_TYPEDEF); }
+#line 423 "cpp.re"
+{ RET(T_TYPEDEF); }
+#line 5735 "cpp_re.cpp"
 yy625:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'e')	goto yy628;
@@ -5629,8 +5759,9 @@ yy626:	yyaccept = 44;
 		}
 	}
 yy627:
-#line 422
-	{ RET(T_TRY); }
+#line 422 "cpp.re"
+{ RET(T_TRY); }
+#line 5765 "cpp_re.cpp"
 yy628:	yyaccept = 45;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -5654,8 +5785,9 @@ yy628:	yyaccept = 45;
 		}
 	}
 yy629:
-#line 421
-	{ RET(T_TRUE); }
+#line 421 "cpp.re"
+{ RET(T_TRUE); }
+#line 5791 "cpp_re.cpp"
 yy630:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 's')	goto yy635;
@@ -5691,8 +5823,9 @@ yy633:	yyaccept = 46;
 		}
 	}
 yy634:
-#line 420
-	{ RET(T_THROW); }
+#line 420 "cpp.re"
+{ RET(T_THROW); }
+#line 5829 "cpp_re.cpp"
 yy635:	yyaccept = 47;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -5716,8 +5849,9 @@ yy635:	yyaccept = 47;
 		}
 	}
 yy636:
-#line 419
-	{ RET(T_THIS); }
+#line 419 "cpp.re"
+{ RET(T_THIS); }
+#line 5855 "cpp_re.cpp"
 yy637:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'p')	goto yy219;
@@ -5761,8 +5895,9 @@ yy642:	yyaccept = 48;
 		}
 	}
 yy643:
-#line 418
-	{ RET(T_TEMPLATE); }
+#line 418 "cpp.re"
+{ RET(T_TEMPLATE); }
+#line 5901 "cpp_re.cpp"
 yy644:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'o')	goto yy679;
@@ -5816,8 +5951,9 @@ yy651:	yyaccept = 49;
 		}
 	}
 yy652:
-#line 417
-	{ RET(T_SWITCH); }
+#line 417 "cpp.re"
+{ RET(T_SWITCH); }
+#line 5957 "cpp_re.cpp"
 yy653:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 't')	goto yy659;
@@ -5857,8 +5993,9 @@ yy657:	yyaccept = 50;
 		}
 	}
 yy658:
-#line 416
-	{ RET(T_STRUCT); }
+#line 416 "cpp.re"
+{ RET(T_STRUCT); }
+#line 5999 "cpp_re.cpp"
 yy659:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'i')	goto yy219;
@@ -5891,8 +6028,9 @@ yy661:	yyaccept = 51;
 		}
 	}
 yy662:
-#line 414
-	{ RET(T_STATIC); }
+#line 414 "cpp.re"
+{ RET(T_STATIC); }
+#line 6034 "cpp_re.cpp"
 yy663:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'c')	goto yy219;
@@ -5932,8 +6070,9 @@ yy667:	yyaccept = 52;
 		}
 	}
 yy668:
-#line 415
-	{ RET(T_STATICCAST); }
+#line 415 "cpp.re"
+{ RET(T_STATICCAST); }
+#line 6076 "cpp_re.cpp"
 yy669:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'n')	goto yy675;
@@ -5973,8 +6112,9 @@ yy673:	yyaccept = 53;
 		}
 	}
 yy674:
-#line 413
-	{ RET(T_SIZEOF); }
+#line 413 "cpp.re"
+{ RET(T_SIZEOF); }
+#line 6118 "cpp_re.cpp"
 yy675:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'e')	goto yy219;
@@ -6006,8 +6146,9 @@ yy677:	yyaccept = 54;
 		}
 	}
 yy678:
-#line 412
-	{ RET(T_SIGNED); }
+#line 412 "cpp.re"
+{ RET(T_SIGNED); }
+#line 6152 "cpp_re.cpp"
 yy679:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'r')	goto yy219;
@@ -6039,8 +6180,9 @@ yy681:	yyaccept = 55;
 		}
 	}
 yy682:
-#line 411
-	{ RET(T_SHORT); }
+#line 411 "cpp.re"
+{ RET(T_SHORT); }
+#line 6186 "cpp_re.cpp"
 yy683:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'h'){
@@ -6094,8 +6236,9 @@ yy689:	yyaccept = 56;
 		}
 	}
 yy690:
-#line 410
-	{ RET(T_RETURN); }
+#line 410 "cpp.re"
+{ RET(T_RETURN); }
+#line 6242 "cpp_re.cpp"
 yy691:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 't')	goto yy219;
@@ -6167,8 +6310,9 @@ yy703:	yyaccept = 57;
 		}
 	}
 yy704:
-#line 409
-	{ RET(T_REINTERPRETCAST); }
+#line 409 "cpp.re"
+{ RET(T_REINTERPRETCAST); }
+#line 6316 "cpp_re.cpp"
 yy705:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 's')	goto yy219;
@@ -6208,8 +6352,9 @@ yy709:	yyaccept = 58;
 		}
 	}
 yy710:
-#line 408
-	{ RET(T_REGISTER); }
+#line 408 "cpp.re"
+{ RET(T_REGISTER); }
+#line 6358 "cpp_re.cpp"
 yy711:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'i')	goto yy718;
@@ -6254,8 +6399,9 @@ yy716:	yyaccept = 59;
 		}
 	}
 yy717:
-#line 407
-	{ RET(T_PUBLIC); }
+#line 407 "cpp.re"
+{ RET(T_PUBLIC); }
+#line 6405 "cpp_re.cpp"
 yy718:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'v')	goto yy727;
@@ -6307,8 +6453,9 @@ yy725:	yyaccept = 60;
 		}
 	}
 yy726:
-#line 406
-	{ RET(T_PROTECTED); }
+#line 406 "cpp.re"
+{ RET(T_PROTECTED); }
+#line 6459 "cpp_re.cpp"
 yy727:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'a')	goto yy219;
@@ -6344,8 +6491,9 @@ yy730:	yyaccept = 61;
 		}
 	}
 yy731:
-#line 405
-	{ RET(T_PRIVATE); }
+#line 405 "cpp.re"
+{ RET(T_PRIVATE); }
+#line 6497 "cpp_re.cpp"
 yy732:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'e')	goto yy739;
@@ -6374,8 +6522,9 @@ yy733:	yyaccept = 62;
 		}
 	}
 yy734:
-#line 546
-	{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_OROR_ALT); }
+#line 546 "cpp.re"
+{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_OROR_ALT); }
+#line 6528 "cpp_re.cpp"
 yy735:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'e')	goto yy219;
@@ -6407,8 +6556,9 @@ yy737:	yyaccept = 63;
 		}
 	}
 yy738:
-#line 530
-	{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ORASSIGN_ALT); }
+#line 530 "cpp.re"
+{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ORASSIGN_ALT); }
+#line 6562 "cpp_re.cpp"
 yy739:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'r')	goto yy219;
@@ -6452,8 +6602,9 @@ yy744:	yyaccept = 64;
 		}
 	}
 yy745:
-#line 404
-	{ RET(T_OPERATOR); }
+#line 404 "cpp.re"
+{ RET(T_OPERATOR); }
+#line 6608 "cpp_re.cpp"
 yy746:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'm')	goto yy757;
@@ -6490,8 +6641,9 @@ yy749:	yyaccept = 65;
 		}
 	}
 yy750:
-#line 515
-	{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_NOT_ALT); }
+#line 515 "cpp.re"
+{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_NOT_ALT); }
+#line 6647 "cpp_re.cpp"
 yy751:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'e')	goto yy219;
@@ -6523,8 +6675,9 @@ yy753:	yyaccept = 66;
 		}
 	}
 yy754:
-#line 538
-	{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_NOTEQUAL_ALT); }
+#line 538 "cpp.re"
+{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_NOTEQUAL_ALT); }
+#line 6681 "cpp_re.cpp"
 yy755:	yyaccept = 67;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -6548,8 +6701,9 @@ yy755:	yyaccept = 67;
 		}
 	}
 yy756:
-#line 403
-	{ RET(T_NEW); }
+#line 403 "cpp.re"
+{ RET(T_NEW); }
+#line 6707 "cpp_re.cpp"
 yy757:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'e')	goto yy219;
@@ -6597,8 +6751,9 @@ yy763:	yyaccept = 68;
 		}
 	}
 yy764:
-#line 402
-	{ RET(T_NAMESPACE); }
+#line 402 "cpp.re"
+{ RET(T_NAMESPACE); }
+#line 6757 "cpp_re.cpp"
 yy765:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 't')	goto yy219;
@@ -6642,8 +6797,9 @@ yy770:	yyaccept = 69;
 		}
 	}
 yy771:
-#line 401
-	{ RET(T_MUTABLE); }
+#line 401 "cpp.re"
+{ RET(T_MUTABLE); }
+#line 6803 "cpp_re.cpp"
 yy772:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'n')	goto yy219;
@@ -6675,8 +6831,9 @@ yy774:	yyaccept = 70;
 		}
 	}
 yy775:
-#line 400
-	{ RET(T_LONG); }
+#line 400 "cpp.re"
+{ RET(T_LONG); }
+#line 6837 "cpp_re.cpp"
 yy776:	yyaccept = 71;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -6700,8 +6857,9 @@ yy776:	yyaccept = 71;
 		}
 	}
 yy777:
-#line 397
-	{ RET(T_IF); }
+#line 397 "cpp.re"
+{ RET(T_IF); }
+#line 6863 "cpp_re.cpp"
 yy778:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'l')	goto yy779;
@@ -6734,8 +6892,9 @@ yy780:	yyaccept = 72;
 		}
 	}
 yy781:
-#line 399
-	{ RET(T_INT); }
+#line 399 "cpp.re"
+{ RET(T_INT); }
+#line 6898 "cpp_re.cpp"
 yy782:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'n')	goto yy219;
@@ -6767,8 +6926,9 @@ yy784:	yyaccept = 73;
 		}
 	}
 yy785:
-#line 398
-	{ RET(T_INLINE); }
+#line 398 "cpp.re"
+{ RET(T_INLINE); }
+#line 6932 "cpp_re.cpp"
 yy786:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 't')	goto yy219;
@@ -6800,8 +6960,9 @@ yy788:	yyaccept = 74;
 		}
 	}
 yy789:
-#line 396
-	{ RET(T_GOTO); }
+#line 396 "cpp.re"
+{ RET(T_GOTO); }
+#line 6966 "cpp_re.cpp"
 yy790:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'l')	goto yy805;
@@ -6853,8 +7014,9 @@ yy797:	yyaccept = 75;
 		}
 	}
 yy798:
-#line 395
-	{ RET(T_FRIEND); }
+#line 395 "cpp.re"
+{ RET(T_FRIEND); }
+#line 7020 "cpp_re.cpp"
 yy799:	yyaccept = 76;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -6878,8 +7040,9 @@ yy799:	yyaccept = 76;
 		}
 	}
 yy800:
-#line 394
-	{ RET(T_FOR); }
+#line 394 "cpp.re"
+{ RET(T_FOR); }
+#line 7046 "cpp_re.cpp"
 yy801:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'a')	goto yy219;
@@ -6911,8 +7074,9 @@ yy803:	yyaccept = 77;
 		}
 	}
 yy804:
-#line 393
-	{ RET(T_FLOAT); }
+#line 393 "cpp.re"
+{ RET(T_FLOAT); }
+#line 7080 "cpp_re.cpp"
 yy805:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 's')	goto yy219;
@@ -6944,8 +7108,9 @@ yy807:	yyaccept = 78;
 		}
 	}
 yy808:
-#line 392
-	{ RET(T_FALSE); }
+#line 392 "cpp.re"
+{ RET(T_FALSE); }
+#line 7114 "cpp_re.cpp"
 yy809:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 's')	goto yy831;
@@ -6999,8 +7164,9 @@ yy816:	yyaccept = 79;
 		}
 	}
 yy817:
-#line 391
-	{ RET(T_EXTERN); }
+#line 391 "cpp.re"
+{ RET(T_EXTERN); }
+#line 7170 "cpp_re.cpp"
 yy818:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'i')	goto yy823;
@@ -7036,8 +7202,9 @@ yy821:	yyaccept = 80;
 		}
 	}
 yy822:
-#line 390
-	{ RET(T_EXPORT); }
+#line 390 "cpp.re"
+{ RET(T_EXPORT); }
+#line 7208 "cpp_re.cpp"
 yy823:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'c')	goto yy219;
@@ -7073,8 +7240,9 @@ yy826:	yyaccept = 81;
 		}
 	}
 yy827:
-#line 389
-	{ RET(T_EXPLICIT); }
+#line 389 "cpp.re"
+{ RET(T_EXPLICIT); }
+#line 7246 "cpp_re.cpp"
 yy828:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'm')	goto yy219;
@@ -7102,8 +7270,9 @@ yy829:	yyaccept = 82;
 		}
 	}
 yy830:
-#line 388
-	{ RET(T_ENUM); }
+#line 388 "cpp.re"
+{ RET(T_ENUM); }
+#line 7276 "cpp_re.cpp"
 yy831:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'e')	goto yy219;
@@ -7131,8 +7300,9 @@ yy832:	yyaccept = 83;
 		}
 	}
 yy833:
-#line 387
-	{ RET(T_ELSE); }
+#line 387 "cpp.re"
+{ RET(T_ELSE); }
+#line 7306 "cpp_re.cpp"
 yy834:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'f')	goto yy854;
@@ -7163,8 +7333,9 @@ yy835:	yyaccept = 84;
 		}
 	}
 yy836:
-#line 384
-	{ RET(T_DO); }
+#line 384 "cpp.re"
+{ RET(T_DO); }
+#line 7339 "cpp_re.cpp"
 yy837:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'n')	goto yy219;
@@ -7228,8 +7399,9 @@ yy847:	yyaccept = 85;
 		}
 	}
 yy848:
-#line 386
-	{ RET(T_DYNAMICCAST); }
+#line 386 "cpp.re"
+{ RET(T_DYNAMICCAST); }
+#line 7405 "cpp_re.cpp"
 yy849:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'b')	goto yy219;
@@ -7265,8 +7437,9 @@ yy852:	yyaccept = 86;
 		}
 	}
 yy853:
-#line 385
-	{ RET(T_DOUBLE); }
+#line 385 "cpp.re"
+{ RET(T_DOUBLE); }
+#line 7443 "cpp_re.cpp"
 yy854:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'a')	goto yy860;
@@ -7306,8 +7479,9 @@ yy858:	yyaccept = 87;
 		}
 	}
 yy859:
-#line 383
-	{ RET(T_DELETE); }
+#line 383 "cpp.re"
+{ RET(T_DELETE); }
+#line 7485 "cpp_re.cpp"
 yy860:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'u')	goto yy219;
@@ -7343,8 +7517,9 @@ yy863:	yyaccept = 88;
 		}
 	}
 yy864:
-#line 382
-	{ RET(T_DEFAULT); }
+#line 382 "cpp.re"
+{ RET(T_DEFAULT); }
+#line 7523 "cpp_re.cpp"
 yy865:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'r')	goto yy219;
@@ -7402,8 +7577,9 @@ yy872:	yyaccept = 89;
 		}
 	}
 yy873:
-#line 513
-	{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_COMPL_ALT); }
+#line 513 "cpp.re"
+{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_COMPL_ALT); }
+#line 7583 "cpp_re.cpp"
 yy874:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 't')	goto yy881;
@@ -7447,8 +7623,9 @@ yy879:	yyaccept = 90;
 		}
 	}
 yy880:
-#line 381
-	{ RET(T_CONTINUE); }
+#line 381 "cpp.re"
+{ RET(T_CONTINUE); }
+#line 7629 "cpp_re.cpp"
 yy881:	yyaccept = 91;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -7473,8 +7650,9 @@ yy881:	yyaccept = 91;
 		}
 	}
 yy882:
-#line 379
-	{ RET(T_CONST); }
+#line 379 "cpp.re"
+{ RET(T_CONST); }
+#line 7656 "cpp_re.cpp"
 yy883:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'c')	goto yy219;
@@ -7514,8 +7692,9 @@ yy887:	yyaccept = 92;
 		}
 	}
 yy888:
-#line 380
-	{ RET(T_CONSTCAST); }
+#line 380 "cpp.re"
+{ RET(T_CONSTCAST); }
+#line 7698 "cpp_re.cpp"
 yy889:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 's')	goto yy219;
@@ -7547,8 +7726,9 @@ yy891:	yyaccept = 93;
 		}
 	}
 yy892:
-#line 378
-	{ RET(T_CLASS); }
+#line 378 "cpp.re"
+{ RET(T_CLASS); }
+#line 7732 "cpp_re.cpp"
 yy893:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'r')	goto yy219;
@@ -7576,8 +7756,9 @@ yy894:	yyaccept = 94;
 		}
 	}
 yy895:
-#line 377
-	{ RET(T_CHAR); }
+#line 377 "cpp.re"
+{ RET(T_CHAR); }
+#line 7762 "cpp_re.cpp"
 yy896:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'e')	goto yy901;
@@ -7613,8 +7794,9 @@ yy899:	yyaccept = 95;
 		}
 	}
 yy900:
-#line 376
-	{ RET(T_CATCH); }
+#line 376 "cpp.re"
+{ RET(T_CATCH); }
+#line 7800 "cpp_re.cpp"
 yy901:	yyaccept = 96;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -7638,8 +7820,9 @@ yy901:	yyaccept = 96;
 		}
 	}
 yy902:
-#line 375
-	{ RET(T_CASE); }
+#line 375 "cpp.re"
+{ RET(T_CASE); }
+#line 7826 "cpp_re.cpp"
 yy903:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 't')	goto yy913;
@@ -7683,8 +7866,9 @@ yy908:	yyaccept = 97;
 		}
 	}
 yy909:
-#line 374
-	{ RET(T_BREAK); }
+#line 374 "cpp.re"
+{ RET(T_BREAK); }
+#line 7872 "cpp_re.cpp"
 yy910:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'l')	goto yy219;
@@ -7712,8 +7896,9 @@ yy911:	yyaccept = 98;
 		}
 	}
 yy912:
-#line 373
-	{ RET(T_BOOL); }
+#line 373 "cpp.re"
+{ RET(T_BOOL); }
+#line 7902 "cpp_re.cpp"
 yy913:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'a')	goto yy914;
@@ -7750,8 +7935,9 @@ yy916:	yyaccept = 99;
 		}
 	}
 yy917:
-#line 509
-	{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_OR_ALT); }
+#line 509 "cpp.re"
+{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_OR_ALT); }
+#line 7941 "cpp_re.cpp"
 yy918:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'd')	goto yy219;
@@ -7779,8 +7965,9 @@ yy919:	yyaccept = 100;
 		}
 	}
 yy920:
-#line 507
-	{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_AND_ALT); }
+#line 507 "cpp.re"
+{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_AND_ALT); }
+#line 7971 "cpp_re.cpp"
 yy921:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == 'd')	goto yy929;
@@ -7820,8 +8007,9 @@ yy925:	yyaccept = 101;
 		}
 	}
 yy926:
-#line 372
-	{ RET(T_AUTO); }
+#line 372 "cpp.re"
+{ RET(T_AUTO); }
+#line 8013 "cpp_re.cpp"
 yy927:	yyaccept = 102;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -7845,8 +8033,9 @@ yy927:	yyaccept = 102;
 		}
 	}
 yy928:
-#line 371
-	{ RET(T_ASM); }
+#line 371 "cpp.re"
+{ RET(T_ASM); }
+#line 8039 "cpp_re.cpp"
 yy929:	yyaccept = 103;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Z'){
@@ -7871,8 +8060,9 @@ yy929:	yyaccept = 103;
 		}
 	}
 yy930:
-#line 542
-	{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ANDAND_ALT); }
+#line 542 "cpp.re"
+{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ANDAND_ALT); }
+#line 8066 "cpp_re.cpp"
 yy931:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != 'e')	goto yy219;
@@ -7904,81 +8094,87 @@ yy933:	yyaccept = 104;
 		}
 	}
 yy934:
-#line 528
-	{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ANDASSIGN_ALT); }
-yy935:	yych = *++YYCURSOR;
+#line 528 "cpp.re"
+{ RET(s->act_in_c99_mode ? T_IDENTIFIER : T_ANDASSIGN_ALT); }
+#line 8100 "cpp_re.cpp"
+yy935:	++YYCURSOR;
 	goto yy936;
 yy936:
-#line 522
-	{ RET(T_DIVIDEASSIGN); }
-yy937:	yych = *++YYCURSOR;
+#line 522 "cpp.re"
+{ RET(T_DIVIDEASSIGN); }
+#line 8106 "cpp_re.cpp"
+yy937:	++YYCURSOR;
 	goto yy938;
 yy938:
-#line 369
-	{ goto cppcomment; }
-yy939:	yych = *++YYCURSOR;
+#line 369 "cpp.re"
+{ goto cppcomment; }
+#line 8112 "cpp_re.cpp"
+yy939:	++YYCURSOR;
 	goto yy940;
 yy940:
-#line 368
-	{ goto ccomment; }
+#line 368 "cpp.re"
+{ goto ccomment; }
+#line 8118 "cpp_re.cpp"
 }
-#line 637
+#line 637 "cpp.re"
 
 
 ccomment:
+
+#line 8125 "cpp_re.cpp"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
 	goto yy941;
-yy942:	++YYCURSOR;
+	++YYCURSOR;
 yy941:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if(yych <= '\f'){
-		if(yych <= '\b'){
-			if(yych <= '\000')	goto yy950;
+	if(yych <= 0x0C){
+		if(yych <= 0x08){
+			if(yych <= 0x00)	goto yy950;
 			goto yy943;
 		} else {
-			if(yych == '\n')	goto yy946;
+			if(yych == 0x0A)	goto yy946;
 			goto yy949;
 		}
 	} else {
-		if(yych <= '\037'){
-			if(yych <= '\r')	goto yy948;
+		if(yych <= 0x1F){
+			if(yych <= 0x0D)	goto yy948;
 			goto yy943;
 		} else {
 			if(yych == '*')	goto yy944;
 			goto yy949;
 		}
 	}
-yy943:yy944:	yych = *++YYCURSOR;
-	if(yych == '/')	goto yy953;
+yy943:yy944:	++YYCURSOR;
+	if((yych = *YYCURSOR) == '/')	goto yy953;
 	goto yy945;
 yy945:
-#line 651
-	{ goto ccomment; }
-yy946:	yych = *++YYCURSOR;
+#line 651 "cpp.re"
+{ goto ccomment; }
+#line 8156 "cpp_re.cpp"
+yy946:	++YYCURSOR;
 	goto yy947;
 yy947:
-#line 644
-	{
+#line 644 "cpp.re"
+{
         /*if(cursor == s->eof) RET(T_EOF);*/
         /*s->tok = cursor; */
         s->line += count_backslash_newlines(s, cursor) +1;
         goto ccomment;
     }
+#line 8167 "cpp_re.cpp"
 yy948:	yych = *++YYCURSOR;
-	if(yych == '\n')	goto yy952;
+	if(yych == 0x0A)	goto yy952;
 	goto yy947;
 yy949:	yych = *++YYCURSOR;
 	goto yy945;
-yy950:	yych = *++YYCURSOR;
+yy950:	++YYCURSOR;
 	goto yy951;
 yy951:
-#line 654
-	{
+#line 654 "cpp.re"
+{
         using namespace std;      // some systems have printf in std
-        yyaccept = 0;   /* avoid warning about unreferenced variable */
         if(cursor == s->eof) 
         {
             if (s->error_proc)
@@ -7998,62 +8194,66 @@ yy951:
         /* the comment is unterminated, but nevertheless its a comment */
         RET(T_CCOMMENT);
     }
+#line 8198 "cpp_re.cpp"
 yy952:	yych = *++YYCURSOR;
 	goto yy947;
-yy953:	yych = *++YYCURSOR;
+yy953:	++YYCURSOR;
 	goto yy954;
 yy954:
-#line 641
-	{ RET(T_CCOMMENT); }
+#line 641 "cpp.re"
+{ RET(T_CCOMMENT); }
+#line 8206 "cpp_re.cpp"
 }
-#line 677
+#line 676 "cpp.re"
 
 
 cppcomment:
+
+#line 8213 "cpp_re.cpp"
 {
 	YYCTYPE yych;
-	unsigned int yyaccept;
 	goto yy955;
-yy956:	++YYCURSOR;
+	++YYCURSOR;
 yy955:
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if(yych <= '\n'){
-		if(yych <= '\000')	goto yy963;
-		if(yych <= '\b')	goto yy957;
-		if(yych <= '\t')	goto yy961;
+	if(yych <= 0x0A){
+		if(yych <= 0x00)	goto yy963;
+		if(yych <= 0x08)	goto yy957;
+		if(yych <= 0x09)	goto yy961;
 		goto yy958;
 	} else {
-		if(yych <= '\f')	goto yy961;
-		if(yych <= '\r')	goto yy960;
+		if(yych <= 0x0C)	goto yy961;
+		if(yych <= 0x0D)	goto yy960;
 		if(yych >= ' ')	goto yy961;
 		goto yy957;
 	}
-yy957:yy958:	yych = *++YYCURSOR;
+yy957:yy958:	++YYCURSOR;
 	goto yy959;
 yy959:
-#line 682
-	{
+#line 681 "cpp.re"
+{
         /*if(cursor == s->eof) RET(T_EOF); */
         /*s->tok = cursor; */
         s->line++;
         RET(T_CPPCOMMENT);
     }
+#line 8242 "cpp_re.cpp"
 yy960:	yych = *++YYCURSOR;
-	if(yych == '\n')	goto yy965;
+	if(yych == 0x0A)	goto yy965;
 	goto yy959;
-yy961:	yych = *++YYCURSOR;
+yy961:	++YYCURSOR;
 	goto yy962;
 yy962:
-#line 689
-	{ goto cppcomment; }
-yy963:	yych = *++YYCURSOR;
+#line 688 "cpp.re"
+{ goto cppcomment; }
+#line 8251 "cpp_re.cpp"
+yy963:	++YYCURSOR;
 	goto yy964;
 yy964:
-#line 692
-	{
+#line 691 "cpp.re"
+{
         using namespace std;      // some systems have printf in std
-        yyaccept = 0;   /* avoid warning about unreferenced variable */
         if(cursor != s->eof) 
         {
             if (s->error_proc)
@@ -8066,10 +8266,12 @@ yy964:
         /* the comment is unterminated, but nevertheless its a comment */
         RET(T_CPPCOMMENT);
     }
-yy965:	yych = *++YYCURSOR;
+#line 8270 "cpp_re.cpp"
+yy965:	++YYCURSOR;
+	yych = *YYCURSOR;
 	goto yy959;
 }
-#line 707
+#line 705 "cpp.re"
 
 
 } /* end of scan */
diff --git a/test/build/Jamfile b/test/build/Jamfile
index d1bab26..3057a5d 100644
--- a/test/build/Jamfile
+++ b/test/build/Jamfile
@@ -74,7 +74,7 @@ test-suite wave
             :
             # arguments
                 $(TESTWAVE_ARGUMENTS) 
-                --config-file=$(TESTWAVE_DIR)/$(TESTWAVE_FILES)
+                --config-file $(TESTWAVE_DIR)/$(TESTWAVE_FILES)
             :
             # input files
             :