From 1a1703241715f0a619196a6af7ec57e367c941a0 Mon Sep 17 00:00:00 2001 From: Ulya Trofimovich Date: Fri, 2 Dec 2016 13:37:59 +0000 Subject: [PATCH] Retry tunnel optimization if the first attempt is unsuccessful. This is probably a decades-old typo (misplaced 'break' statement). Surely the author intended to try all successors, not just the first one. --- re2c/src/ir/adfa/prepare.cc | 5 +- .../bug57_original.bi--case-insensitive.c | 28 +-- re2c/test/c.c | 172 +++++++-------- re2c/test/cmmap.c | 172 +++++++-------- re2c/test/cnokw.c | 108 ++++----- re2c/test/cunroll.c | 140 ++++++------ .../test/input_custom_mjson.--input(custom).c | 99 ++------- ...t_custom_mjson.--skeleton--input(custom).c | 69 +----- re2c/test/parse_date.b.c | 166 +++----------- re2c/test/parse_date.c | 208 ++---------------- re2c/test/parse_date.db.c | 108 ++------- re2c/test/parse_date.g.c | 166 +++----------- re2c/test/parse_date.s.c | 166 +++----------- re2c/test/parse_date_1_78.db.c | 76 ++----- ..._zend_language_scanner.igcd--flex-syntax.c | 41 +--- ..._language_scanner_crlf.igcd--flex-syntax.c | 41 +--- re2c/test/php20150211_parse_date.ig.c | 80 +------ re2c/test/php20150211_parse_date_crlf.ig.c | 80 +------ ....c--emit-dot--flex-syntax--case-inverted.c | 5 +- ...scanner.igcd--flex-syntax--case-inverted.c | 65 +++--- ...cd--skeleton--flex-syntax--case-inverted.c | 65 +++--- re2c/test/tags/cond_star1.ci--input(custom).c | 4 +- re2c/test/tags/cond_star1.ci.c | 4 +- 23 files changed, 576 insertions(+), 1492 deletions(-) diff --git a/re2c/src/ir/adfa/prepare.cc b/re2c/src/ir/adfa/prepare.cc index d6afd06c..a4334086 100644 --- a/re2c/src/ir/adfa/prepare.cc +++ b/re2c/src/ir/adfa/prepare.cc @@ -18,7 +18,7 @@ void DFA::split(State *s) addState(move, s); move->action.set_move (); move->rule = s->rule; - move->fill = s->fill; + move->fill = s->fill; /* used by tunneling, ignored by codegen */ move->go = s->go; move->rule_tags = s->rule_tags; move->fall_tags = s->fall_tags; @@ -89,9 +89,8 @@ void DFA::findBaseState() s->go.nSpans = nSpans; s->go.span = allocate (nSpans); memcpy(s->go.span, span, nSpans*sizeof(Span)); + break; } - - break; } } } diff --git a/re2c/test/bug57_original.bi--case-insensitive.c b/re2c/test/bug57_original.bi--case-insensitive.c index ba1bfc93..d0223a61 100644 --- a/re2c/test/bug57_original.bi--case-insensitive.c +++ b/re2c/test/bug57_original.bi--case-insensitive.c @@ -5168,25 +5168,24 @@ yy488: goto yy498; yy489: yych = *(marker = ++p); - if (yybm[0+yych] & 1) { - goto yy500; - } - if (yych <= '>') { - if (yych <= '/') { - if (yych <= '.') goto yy484; - goto yy502; + if (yych <= '9') { + if (yych <= 0x1F) { + if (yych <= 0x08) goto yy484; + if (yych <= '\r') goto yy504; + goto yy484; } else { - if (yych <= '9') goto yy503; - if (yych <= '=') goto yy484; - goto yy505; + if (yych <= ' ') goto yy504; + if (yych <= '.') goto yy484; + goto yy504; } } else { - if (yych <= 'Z') { - if (yych <= '@') goto yy484; - goto yy503; + if (yych <= '@') { + if (yych == '>') goto yy504; + goto yy484; } else { + if (yych <= 'Z') goto yy504; if (yych <= '`') goto yy484; - if (yych <= 'z') goto yy503; + if (yych <= 'z') goto yy504; goto yy484; } } @@ -5271,6 +5270,7 @@ yy502: yy503: ++p; yych = *p; +yy504: if (yybm[0+yych] & 1) { goto yy500; } diff --git a/re2c/test/c.c b/re2c/test/c.c index ab3c94f7..0632c996 100644 --- a/re2c/test/c.c +++ b/re2c/test/c.c @@ -391,36 +391,20 @@ yy33: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy112; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': goto yy35; - case 'E': - case 'e': goto yy119; - case 'L': - case 'U': - case 'l': - case 'u': goto yy120; case 'X': case 'x': goto yy122; - default: goto yy34; + default: goto yy36; } yy34: #line 175 "c.re" { RET(ICON); } -#line 419 "c.c" +#line 402 "c.c" yy35: yyaccept = 2; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); yych = *YYCURSOR; +yy36: switch (yych) { case '.': goto yy112; case '0': @@ -445,12 +429,12 @@ yy37: ++YYCURSOR; #line 209 "c.re" { RET(':'); } -#line 449 "c.c" +#line 433 "c.c" yy39: ++YYCURSOR; #line 205 "c.re" { RET(';'); } -#line 454 "c.c" +#line 438 "c.c" yy41: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -461,7 +445,7 @@ yy41: yy42: #line 224 "c.re" { RET('<'); } -#line 465 "c.c" +#line 449 "c.c" yy43: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -471,7 +455,7 @@ yy43: yy44: #line 210 "c.re" { RET('='); } -#line 475 "c.c" +#line 459 "c.c" yy45: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -482,12 +466,12 @@ yy45: yy46: #line 225 "c.re" { RET('>'); } -#line 486 "c.c" +#line 470 "c.c" yy47: ++YYCURSOR; #line 228 "c.re" { RET('?'); } -#line 491 "c.c" +#line 475 "c.c" yy49: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -562,17 +546,17 @@ yy50: yy51: #line 171 "c.re" { RET(ID); } -#line 566 "c.c" +#line 550 "c.c" yy52: ++YYCURSOR; #line 213 "c.re" { RET('['); } -#line 571 "c.c" +#line 555 "c.c" yy54: ++YYCURSOR; #line 214 "c.re" { RET(']'); } -#line 576 "c.c" +#line 560 "c.c" yy56: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -582,7 +566,7 @@ yy56: yy57: #line 226 "c.re" { RET('^'); } -#line 586 "c.c" +#line 570 "c.c" yy58: yych = *++YYCURSOR; switch (yych) { @@ -687,7 +671,7 @@ yy73: ++YYCURSOR; #line 206 "c.re" { RET('{'); } -#line 691 "c.c" +#line 675 "c.c" yy75: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -698,22 +682,22 @@ yy75: yy76: #line 227 "c.re" { RET('|'); } -#line 702 "c.c" +#line 686 "c.c" yy77: ++YYCURSOR; #line 207 "c.re" { RET('}'); } -#line 707 "c.c" +#line 691 "c.c" yy79: ++YYCURSOR; #line 218 "c.re" { RET('~'); } -#line 712 "c.c" +#line 696 "c.c" yy81: ++YYCURSOR; #line 204 "c.re" { RET(NEQ); } -#line 717 "c.c" +#line 701 "c.c" yy83: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -737,7 +721,7 @@ yy86: ++YYCURSOR; #line 181 "c.re" { RET(SCON); } -#line 741 "c.c" +#line 725 "c.c" yy88: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -769,17 +753,17 @@ yy89: ++YYCURSOR; #line 190 "c.re" { RET(MODEQ); } -#line 773 "c.c" +#line 757 "c.c" yy91: ++YYCURSOR; #line 199 "c.re" { RET(ANDAND); } -#line 778 "c.c" +#line 762 "c.c" yy93: ++YYCURSOR; #line 191 "c.re" { RET(ANDEQ); } -#line 783 "c.c" +#line 767 "c.c" yy95: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -825,32 +809,32 @@ yy99: ++YYCURSOR; #line 188 "c.re" { RET(MULEQ); } -#line 829 "c.c" +#line 813 "c.c" yy101: ++YYCURSOR; #line 196 "c.re" { RET(INCR); } -#line 834 "c.c" +#line 818 "c.c" yy103: ++YYCURSOR; #line 186 "c.re" { RET(ADDEQ); } -#line 839 "c.c" +#line 823 "c.c" yy105: ++YYCURSOR; #line 197 "c.re" { RET(DECR); } -#line 844 "c.c" +#line 828 "c.c" yy107: ++YYCURSOR; #line 187 "c.re" { RET(SUBEQ); } -#line 849 "c.c" +#line 833 "c.c" yy109: ++YYCURSOR; #line 198 "c.re" { RET(DEREF); } -#line 854 "c.c" +#line 838 "c.c" yy111: yych = *++YYCURSOR; switch (yych) { @@ -884,17 +868,17 @@ yy112: yy114: #line 178 "c.re" { RET(FCON); } -#line 888 "c.c" +#line 872 "c.c" yy115: ++YYCURSOR; #line 136 "c.re" { goto comment; } -#line 893 "c.c" +#line 877 "c.c" yy117: ++YYCURSOR; #line 189 "c.re" { RET(DIVEQ); } -#line 898 "c.c" +#line 882 "c.c" yy119: yych = *++YYCURSOR; switch (yych) { @@ -959,22 +943,22 @@ yy123: yy124: #line 195 "c.re" { RET(LSHIFT); } -#line 963 "c.c" +#line 947 "c.c" yy125: ++YYCURSOR; #line 201 "c.re" { RET(LEQ); } -#line 968 "c.c" +#line 952 "c.c" yy127: ++YYCURSOR; #line 203 "c.re" { RET(EQL); } -#line 973 "c.c" +#line 957 "c.c" yy129: ++YYCURSOR; #line 202 "c.re" { RET(GEQ); } -#line 978 "c.c" +#line 962 "c.c" yy131: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -984,12 +968,12 @@ yy131: yy132: #line 194 "c.re" { RET(RSHIFT); } -#line 988 "c.c" +#line 972 "c.c" yy133: ++YYCURSOR; #line 192 "c.re" { RET(XOREQ); } -#line 993 "c.c" +#line 977 "c.c" yy135: yych = *++YYCURSOR; switch (yych) { @@ -1097,7 +1081,7 @@ yy141: yy142: #line 145 "c.re" { RET(DO); } -#line 1101 "c.c" +#line 1085 "c.c" yy143: yych = *++YYCURSOR; switch (yych) { @@ -1205,7 +1189,7 @@ yy149: yy150: #line 153 "c.re" { RET(IF); } -#line 1209 "c.c" +#line 1193 "c.c" yy151: yych = *++YYCURSOR; switch (yych) { @@ -1281,12 +1265,12 @@ yy162: ++YYCURSOR; #line 193 "c.re" { RET(OREQ); } -#line 1285 "c.c" +#line 1269 "c.c" yy164: ++YYCURSOR; #line 200 "c.re" { RET(OROR); } -#line 1290 "c.c" +#line 1274 "c.c" yy166: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -1349,7 +1333,7 @@ yy168: ++YYCURSOR; #line 183 "c.re" { RET(ELLIPSIS); } -#line 1353 "c.c" +#line 1337 "c.c" yy170: yych = *++YYCURSOR; goto yy114; @@ -1426,12 +1410,12 @@ yy176: ++YYCURSOR; #line 185 "c.re" { RET(LSHIFTEQ); } -#line 1430 "c.c" +#line 1414 "c.c" yy178: ++YYCURSOR; #line 184 "c.re" { RET(RSHIFTEQ); } -#line 1435 "c.c" +#line 1419 "c.c" yy180: yych = *++YYCURSOR; switch (yych) { @@ -1570,7 +1554,7 @@ yy191: yy192: #line 151 "c.re" { RET(FOR); } -#line 1574 "c.c" +#line 1558 "c.c" yy193: yych = *++YYCURSOR; switch (yych) { @@ -1648,7 +1632,7 @@ yy194: yy195: #line 154 "c.re" { RET(INT); } -#line 1652 "c.c" +#line 1636 "c.c" yy196: yych = *++YYCURSOR; switch (yych) { @@ -1810,7 +1794,7 @@ yy211: yy212: #line 138 "c.re" { RET(AUTO); } -#line 1814 "c.c" +#line 1798 "c.c" yy213: yych = *++YYCURSOR; switch (yych) { @@ -1888,7 +1872,7 @@ yy214: yy215: #line 140 "c.re" { RET(CASE); } -#line 1892 "c.c" +#line 1876 "c.c" yy216: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1960,7 +1944,7 @@ yy216: yy217: #line 141 "c.re" { RET(CHAR); } -#line 1964 "c.c" +#line 1948 "c.c" yy218: yych = *++YYCURSOR; switch (yych) { @@ -2056,7 +2040,7 @@ yy222: yy223: #line 147 "c.re" { RET(ELSE); } -#line 2060 "c.c" +#line 2044 "c.c" yy224: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -2128,7 +2112,7 @@ yy224: yy225: #line 148 "c.re" { RET(ENUM); } -#line 2132 "c.c" +#line 2116 "c.c" yy226: yych = *++YYCURSOR; switch (yych) { @@ -2212,7 +2196,7 @@ yy228: yy229: #line 152 "c.re" { RET(GOTO); } -#line 2216 "c.c" +#line 2200 "c.c" yy230: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -2284,7 +2268,7 @@ yy230: yy231: #line 155 "c.re" { RET(LONG); } -#line 2288 "c.c" +#line 2272 "c.c" yy232: yych = *++YYCURSOR; switch (yych) { @@ -2422,7 +2406,7 @@ yy243: yy244: #line 167 "c.re" { RET(VOID); } -#line 2426 "c.c" +#line 2410 "c.c" yy245: yych = *++YYCURSOR; switch (yych) { @@ -2506,7 +2490,7 @@ yy247: yy248: #line 139 "c.re" { RET(BREAK); } -#line 2510 "c.c" +#line 2494 "c.c" yy249: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -2578,7 +2562,7 @@ yy249: yy250: #line 142 "c.re" { RET(CONST); } -#line 2582 "c.c" +#line 2566 "c.c" yy251: yych = *++YYCURSOR; switch (yych) { @@ -2674,7 +2658,7 @@ yy255: yy256: #line 150 "c.re" { RET(FLOAT); } -#line 2678 "c.c" +#line 2662 "c.c" yy257: yych = *++YYCURSOR; switch (yych) { @@ -2758,7 +2742,7 @@ yy259: yy260: #line 158 "c.re" { RET(SHORT); } -#line 2762 "c.c" +#line 2746 "c.c" yy261: yych = *++YYCURSOR; switch (yych) { @@ -2866,7 +2850,7 @@ yy267: yy268: #line 165 "c.re" { RET(UNION); } -#line 2870 "c.c" +#line 2854 "c.c" yy269: yych = *++YYCURSOR; switch (yych) { @@ -2950,7 +2934,7 @@ yy271: yy272: #line 169 "c.re" { RET(WHILE); } -#line 2954 "c.c" +#line 2938 "c.c" yy273: yych = *++YYCURSOR; switch (yych) { @@ -3034,7 +3018,7 @@ yy275: yy276: #line 146 "c.re" { RET(DOUBLE); } -#line 3038 "c.c" +#line 3022 "c.c" yy277: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3106,7 +3090,7 @@ yy277: yy278: #line 149 "c.re" { RET(EXTERN); } -#line 3110 "c.c" +#line 3094 "c.c" yy279: yych = *++YYCURSOR; switch (yych) { @@ -3184,7 +3168,7 @@ yy280: yy281: #line 157 "c.re" { RET(RETURN); } -#line 3188 "c.c" +#line 3172 "c.c" yy282: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3256,7 +3240,7 @@ yy282: yy283: #line 159 "c.re" { RET(SIGNED); } -#line 3260 "c.c" +#line 3244 "c.c" yy284: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3328,7 +3312,7 @@ yy284: yy285: #line 160 "c.re" { RET(SIZEOF); } -#line 3332 "c.c" +#line 3316 "c.c" yy286: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3400,7 +3384,7 @@ yy286: yy287: #line 161 "c.re" { RET(STATIC); } -#line 3404 "c.c" +#line 3388 "c.c" yy288: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3472,7 +3456,7 @@ yy288: yy289: #line 162 "c.re" { RET(STRUCT); } -#line 3476 "c.c" +#line 3460 "c.c" yy290: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3544,7 +3528,7 @@ yy290: yy291: #line 163 "c.re" { RET(SWITCH); } -#line 3548 "c.c" +#line 3532 "c.c" yy292: yych = *++YYCURSOR; switch (yych) { @@ -3640,7 +3624,7 @@ yy296: yy297: #line 144 "c.re" { RET(DEFAULT); } -#line 3644 "c.c" +#line 3628 "c.c" yy298: yych = *++YYCURSOR; switch (yych) { @@ -3718,7 +3702,7 @@ yy299: yy300: #line 164 "c.re" { RET(TYPEDEF); } -#line 3722 "c.c" +#line 3706 "c.c" yy301: yych = *++YYCURSOR; switch (yych) { @@ -3802,7 +3786,7 @@ yy303: yy304: #line 143 "c.re" { RET(CONTINUE); } -#line 3806 "c.c" +#line 3790 "c.c" yy305: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3874,7 +3858,7 @@ yy305: yy306: #line 156 "c.re" { RET(REGISTER); } -#line 3878 "c.c" +#line 3862 "c.c" yy307: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3946,7 +3930,7 @@ yy307: yy308: #line 166 "c.re" { RET(UNSIGNED); } -#line 3950 "c.c" +#line 3934 "c.c" yy309: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -4018,14 +4002,14 @@ yy309: yy310: #line 168 "c.re" { RET(VOLATILE); } -#line 4022 "c.c" +#line 4006 "c.c" } #line 245 "c.re" comment: -#line 4029 "c.c" +#line 4013 "c.c" { YYCTYPE yych; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); @@ -4040,7 +4024,7 @@ yy313: yy314: #line 256 "c.re" { goto comment; } -#line 4044 "c.c" +#line 4028 "c.c" yy315: ++YYCURSOR; #line 251 "c.re" @@ -4049,7 +4033,7 @@ yy315: s->tok = s->pos = cursor; s->line++; goto comment; } -#line 4053 "c.c" +#line 4037 "c.c" yy317: yych = *++YYCURSOR; switch (yych) { @@ -4060,7 +4044,7 @@ yy318: ++YYCURSOR; #line 249 "c.re" { goto std; } -#line 4064 "c.c" +#line 4048 "c.c" } #line 257 "c.re" diff --git a/re2c/test/cmmap.c b/re2c/test/cmmap.c index 04d7ac83..633037a8 100644 --- a/re2c/test/cmmap.c +++ b/re2c/test/cmmap.c @@ -374,36 +374,20 @@ yy33: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy112; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': goto yy35; - case 'E': - case 'e': goto yy119; - case 'L': - case 'U': - case 'l': - case 'u': goto yy120; case 'X': case 'x': goto yy122; - default: goto yy34; + default: goto yy36; } yy34: #line 158 "cmmap.re" { RET(ICON); } -#line 402 "cmmap.c" +#line 385 "cmmap.c" yy35: yyaccept = 2; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); yych = *YYCURSOR; +yy36: switch (yych) { case '.': goto yy112; case '0': @@ -428,12 +412,12 @@ yy37: ++YYCURSOR; #line 192 "cmmap.re" { RET(':'); } -#line 432 "cmmap.c" +#line 416 "cmmap.c" yy39: ++YYCURSOR; #line 188 "cmmap.re" { RET(';'); } -#line 437 "cmmap.c" +#line 421 "cmmap.c" yy41: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -444,7 +428,7 @@ yy41: yy42: #line 207 "cmmap.re" { RET('<'); } -#line 448 "cmmap.c" +#line 432 "cmmap.c" yy43: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -454,7 +438,7 @@ yy43: yy44: #line 193 "cmmap.re" { RET('='); } -#line 458 "cmmap.c" +#line 442 "cmmap.c" yy45: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -465,12 +449,12 @@ yy45: yy46: #line 208 "cmmap.re" { RET('>'); } -#line 469 "cmmap.c" +#line 453 "cmmap.c" yy47: ++YYCURSOR; #line 211 "cmmap.re" { RET('?'); } -#line 474 "cmmap.c" +#line 458 "cmmap.c" yy49: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -545,17 +529,17 @@ yy50: yy51: #line 154 "cmmap.re" { RET(ID); } -#line 549 "cmmap.c" +#line 533 "cmmap.c" yy52: ++YYCURSOR; #line 196 "cmmap.re" { RET('['); } -#line 554 "cmmap.c" +#line 538 "cmmap.c" yy54: ++YYCURSOR; #line 197 "cmmap.re" { RET(']'); } -#line 559 "cmmap.c" +#line 543 "cmmap.c" yy56: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -565,7 +549,7 @@ yy56: yy57: #line 209 "cmmap.re" { RET('^'); } -#line 569 "cmmap.c" +#line 553 "cmmap.c" yy58: yych = *++YYCURSOR; switch (yych) { @@ -670,7 +654,7 @@ yy73: ++YYCURSOR; #line 189 "cmmap.re" { RET('{'); } -#line 674 "cmmap.c" +#line 658 "cmmap.c" yy75: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -681,22 +665,22 @@ yy75: yy76: #line 210 "cmmap.re" { RET('|'); } -#line 685 "cmmap.c" +#line 669 "cmmap.c" yy77: ++YYCURSOR; #line 190 "cmmap.re" { RET('}'); } -#line 690 "cmmap.c" +#line 674 "cmmap.c" yy79: ++YYCURSOR; #line 201 "cmmap.re" { RET('~'); } -#line 695 "cmmap.c" +#line 679 "cmmap.c" yy81: ++YYCURSOR; #line 187 "cmmap.re" { RET(NEQ); } -#line 700 "cmmap.c" +#line 684 "cmmap.c" yy83: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -720,7 +704,7 @@ yy86: ++YYCURSOR; #line 164 "cmmap.re" { RET(SCON); } -#line 724 "cmmap.c" +#line 708 "cmmap.c" yy88: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -752,17 +736,17 @@ yy89: ++YYCURSOR; #line 173 "cmmap.re" { RET(MODEQ); } -#line 756 "cmmap.c" +#line 740 "cmmap.c" yy91: ++YYCURSOR; #line 182 "cmmap.re" { RET(ANDAND); } -#line 761 "cmmap.c" +#line 745 "cmmap.c" yy93: ++YYCURSOR; #line 174 "cmmap.re" { RET(ANDEQ); } -#line 766 "cmmap.c" +#line 750 "cmmap.c" yy95: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -808,32 +792,32 @@ yy99: ++YYCURSOR; #line 171 "cmmap.re" { RET(MULEQ); } -#line 812 "cmmap.c" +#line 796 "cmmap.c" yy101: ++YYCURSOR; #line 179 "cmmap.re" { RET(INCR); } -#line 817 "cmmap.c" +#line 801 "cmmap.c" yy103: ++YYCURSOR; #line 169 "cmmap.re" { RET(ADDEQ); } -#line 822 "cmmap.c" +#line 806 "cmmap.c" yy105: ++YYCURSOR; #line 180 "cmmap.re" { RET(DECR); } -#line 827 "cmmap.c" +#line 811 "cmmap.c" yy107: ++YYCURSOR; #line 170 "cmmap.re" { RET(SUBEQ); } -#line 832 "cmmap.c" +#line 816 "cmmap.c" yy109: ++YYCURSOR; #line 181 "cmmap.re" { RET(DEREF); } -#line 837 "cmmap.c" +#line 821 "cmmap.c" yy111: yych = *++YYCURSOR; switch (yych) { @@ -867,17 +851,17 @@ yy112: yy114: #line 161 "cmmap.re" { RET(FCON); } -#line 871 "cmmap.c" +#line 855 "cmmap.c" yy115: ++YYCURSOR; #line 119 "cmmap.re" { goto comment; } -#line 876 "cmmap.c" +#line 860 "cmmap.c" yy117: ++YYCURSOR; #line 172 "cmmap.re" { RET(DIVEQ); } -#line 881 "cmmap.c" +#line 865 "cmmap.c" yy119: yych = *++YYCURSOR; switch (yych) { @@ -942,22 +926,22 @@ yy123: yy124: #line 178 "cmmap.re" { RET(LSHIFT); } -#line 946 "cmmap.c" +#line 930 "cmmap.c" yy125: ++YYCURSOR; #line 184 "cmmap.re" { RET(LEQ); } -#line 951 "cmmap.c" +#line 935 "cmmap.c" yy127: ++YYCURSOR; #line 186 "cmmap.re" { RET(EQL); } -#line 956 "cmmap.c" +#line 940 "cmmap.c" yy129: ++YYCURSOR; #line 185 "cmmap.re" { RET(GEQ); } -#line 961 "cmmap.c" +#line 945 "cmmap.c" yy131: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -967,12 +951,12 @@ yy131: yy132: #line 177 "cmmap.re" { RET(RSHIFT); } -#line 971 "cmmap.c" +#line 955 "cmmap.c" yy133: ++YYCURSOR; #line 175 "cmmap.re" { RET(XOREQ); } -#line 976 "cmmap.c" +#line 960 "cmmap.c" yy135: yych = *++YYCURSOR; switch (yych) { @@ -1080,7 +1064,7 @@ yy141: yy142: #line 128 "cmmap.re" { RET(DO); } -#line 1084 "cmmap.c" +#line 1068 "cmmap.c" yy143: yych = *++YYCURSOR; switch (yych) { @@ -1188,7 +1172,7 @@ yy149: yy150: #line 136 "cmmap.re" { RET(IF); } -#line 1192 "cmmap.c" +#line 1176 "cmmap.c" yy151: yych = *++YYCURSOR; switch (yych) { @@ -1264,12 +1248,12 @@ yy162: ++YYCURSOR; #line 176 "cmmap.re" { RET(OREQ); } -#line 1268 "cmmap.c" +#line 1252 "cmmap.c" yy164: ++YYCURSOR; #line 183 "cmmap.re" { RET(OROR); } -#line 1273 "cmmap.c" +#line 1257 "cmmap.c" yy166: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -1332,7 +1316,7 @@ yy168: ++YYCURSOR; #line 166 "cmmap.re" { RET(ELLIPSIS); } -#line 1336 "cmmap.c" +#line 1320 "cmmap.c" yy170: yych = *++YYCURSOR; goto yy114; @@ -1409,12 +1393,12 @@ yy176: ++YYCURSOR; #line 168 "cmmap.re" { RET(LSHIFTEQ); } -#line 1413 "cmmap.c" +#line 1397 "cmmap.c" yy178: ++YYCURSOR; #line 167 "cmmap.re" { RET(RSHIFTEQ); } -#line 1418 "cmmap.c" +#line 1402 "cmmap.c" yy180: yych = *++YYCURSOR; switch (yych) { @@ -1553,7 +1537,7 @@ yy191: yy192: #line 134 "cmmap.re" { RET(FOR); } -#line 1557 "cmmap.c" +#line 1541 "cmmap.c" yy193: yych = *++YYCURSOR; switch (yych) { @@ -1631,7 +1615,7 @@ yy194: yy195: #line 137 "cmmap.re" { RET(INT); } -#line 1635 "cmmap.c" +#line 1619 "cmmap.c" yy196: yych = *++YYCURSOR; switch (yych) { @@ -1793,7 +1777,7 @@ yy211: yy212: #line 121 "cmmap.re" { RET(AUTO); } -#line 1797 "cmmap.c" +#line 1781 "cmmap.c" yy213: yych = *++YYCURSOR; switch (yych) { @@ -1871,7 +1855,7 @@ yy214: yy215: #line 123 "cmmap.re" { RET(CASE); } -#line 1875 "cmmap.c" +#line 1859 "cmmap.c" yy216: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1943,7 +1927,7 @@ yy216: yy217: #line 124 "cmmap.re" { RET(CHAR); } -#line 1947 "cmmap.c" +#line 1931 "cmmap.c" yy218: yych = *++YYCURSOR; switch (yych) { @@ -2039,7 +2023,7 @@ yy222: yy223: #line 130 "cmmap.re" { RET(ELSE); } -#line 2043 "cmmap.c" +#line 2027 "cmmap.c" yy224: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -2111,7 +2095,7 @@ yy224: yy225: #line 131 "cmmap.re" { RET(ENUM); } -#line 2115 "cmmap.c" +#line 2099 "cmmap.c" yy226: yych = *++YYCURSOR; switch (yych) { @@ -2195,7 +2179,7 @@ yy228: yy229: #line 135 "cmmap.re" { RET(GOTO); } -#line 2199 "cmmap.c" +#line 2183 "cmmap.c" yy230: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -2267,7 +2251,7 @@ yy230: yy231: #line 138 "cmmap.re" { RET(LONG); } -#line 2271 "cmmap.c" +#line 2255 "cmmap.c" yy232: yych = *++YYCURSOR; switch (yych) { @@ -2405,7 +2389,7 @@ yy243: yy244: #line 150 "cmmap.re" { RET(VOID); } -#line 2409 "cmmap.c" +#line 2393 "cmmap.c" yy245: yych = *++YYCURSOR; switch (yych) { @@ -2489,7 +2473,7 @@ yy247: yy248: #line 122 "cmmap.re" { RET(BREAK); } -#line 2493 "cmmap.c" +#line 2477 "cmmap.c" yy249: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -2561,7 +2545,7 @@ yy249: yy250: #line 125 "cmmap.re" { RET(CONST); } -#line 2565 "cmmap.c" +#line 2549 "cmmap.c" yy251: yych = *++YYCURSOR; switch (yych) { @@ -2657,7 +2641,7 @@ yy255: yy256: #line 133 "cmmap.re" { RET(FLOAT); } -#line 2661 "cmmap.c" +#line 2645 "cmmap.c" yy257: yych = *++YYCURSOR; switch (yych) { @@ -2741,7 +2725,7 @@ yy259: yy260: #line 141 "cmmap.re" { RET(SHORT); } -#line 2745 "cmmap.c" +#line 2729 "cmmap.c" yy261: yych = *++YYCURSOR; switch (yych) { @@ -2849,7 +2833,7 @@ yy267: yy268: #line 148 "cmmap.re" { RET(UNION); } -#line 2853 "cmmap.c" +#line 2837 "cmmap.c" yy269: yych = *++YYCURSOR; switch (yych) { @@ -2933,7 +2917,7 @@ yy271: yy272: #line 152 "cmmap.re" { RET(WHILE); } -#line 2937 "cmmap.c" +#line 2921 "cmmap.c" yy273: yych = *++YYCURSOR; switch (yych) { @@ -3017,7 +3001,7 @@ yy275: yy276: #line 129 "cmmap.re" { RET(DOUBLE); } -#line 3021 "cmmap.c" +#line 3005 "cmmap.c" yy277: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3089,7 +3073,7 @@ yy277: yy278: #line 132 "cmmap.re" { RET(EXTERN); } -#line 3093 "cmmap.c" +#line 3077 "cmmap.c" yy279: yych = *++YYCURSOR; switch (yych) { @@ -3167,7 +3151,7 @@ yy280: yy281: #line 140 "cmmap.re" { RET(RETURN); } -#line 3171 "cmmap.c" +#line 3155 "cmmap.c" yy282: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3239,7 +3223,7 @@ yy282: yy283: #line 142 "cmmap.re" { RET(SIGNED); } -#line 3243 "cmmap.c" +#line 3227 "cmmap.c" yy284: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3311,7 +3295,7 @@ yy284: yy285: #line 143 "cmmap.re" { RET(SIZEOF); } -#line 3315 "cmmap.c" +#line 3299 "cmmap.c" yy286: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3383,7 +3367,7 @@ yy286: yy287: #line 144 "cmmap.re" { RET(STATIC); } -#line 3387 "cmmap.c" +#line 3371 "cmmap.c" yy288: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3455,7 +3439,7 @@ yy288: yy289: #line 145 "cmmap.re" { RET(STRUCT); } -#line 3459 "cmmap.c" +#line 3443 "cmmap.c" yy290: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3527,7 +3511,7 @@ yy290: yy291: #line 146 "cmmap.re" { RET(SWITCH); } -#line 3531 "cmmap.c" +#line 3515 "cmmap.c" yy292: yych = *++YYCURSOR; switch (yych) { @@ -3623,7 +3607,7 @@ yy296: yy297: #line 127 "cmmap.re" { RET(DEFAULT); } -#line 3627 "cmmap.c" +#line 3611 "cmmap.c" yy298: yych = *++YYCURSOR; switch (yych) { @@ -3701,7 +3685,7 @@ yy299: yy300: #line 147 "cmmap.re" { RET(TYPEDEF); } -#line 3705 "cmmap.c" +#line 3689 "cmmap.c" yy301: yych = *++YYCURSOR; switch (yych) { @@ -3785,7 +3769,7 @@ yy303: yy304: #line 126 "cmmap.re" { RET(CONTINUE); } -#line 3789 "cmmap.c" +#line 3773 "cmmap.c" yy305: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3857,7 +3841,7 @@ yy305: yy306: #line 139 "cmmap.re" { RET(REGISTER); } -#line 3861 "cmmap.c" +#line 3845 "cmmap.c" yy307: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -3929,7 +3913,7 @@ yy307: yy308: #line 149 "cmmap.re" { RET(UNSIGNED); } -#line 3933 "cmmap.c" +#line 3917 "cmmap.c" yy309: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -4001,14 +3985,14 @@ yy309: yy310: #line 151 "cmmap.re" { RET(VOLATILE); } -#line 4005 "cmmap.c" +#line 3989 "cmmap.c" } #line 228 "cmmap.re" comment: -#line 4012 "cmmap.c" +#line 3996 "cmmap.c" { YYCTYPE yych; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); @@ -4023,7 +4007,7 @@ yy313: yy314: #line 239 "cmmap.re" { goto comment; } -#line 4027 "cmmap.c" +#line 4011 "cmmap.c" yy315: ++YYCURSOR; #line 234 "cmmap.re" @@ -4032,7 +4016,7 @@ yy315: s->tok = s->pos = cursor; s->line++; goto comment; } -#line 4036 "cmmap.c" +#line 4020 "cmmap.c" yy317: yych = *++YYCURSOR; switch (yych) { @@ -4043,7 +4027,7 @@ yy318: ++YYCURSOR; #line 232 "cmmap.re" { goto std; } -#line 4047 "cmmap.c" +#line 4031 "cmmap.c" } #line 240 "cmmap.re" diff --git a/re2c/test/cnokw.c b/re2c/test/cnokw.c index 789507c3..987d1cc2 100644 --- a/re2c/test/cnokw.c +++ b/re2c/test/cnokw.c @@ -391,36 +391,20 @@ yy33: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy97; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': goto yy35; - case 'E': - case 'e': goto yy104; - case 'L': - case 'U': - case 'l': - case 'u': goto yy105; case 'X': case 'x': goto yy107; - default: goto yy34; + default: goto yy36; } yy34: #line 142 "cnokw.re" { RET(ICON); } -#line 419 "cnokw.c" +#line 402 "cnokw.c" yy35: yyaccept = 2; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); yych = *YYCURSOR; +yy36: switch (yych) { case '.': goto yy97; case '0': @@ -445,12 +429,12 @@ yy37: ++YYCURSOR; #line 176 "cnokw.re" { RET(':'); } -#line 449 "cnokw.c" +#line 433 "cnokw.c" yy39: ++YYCURSOR; #line 172 "cnokw.re" { RET(';'); } -#line 454 "cnokw.c" +#line 438 "cnokw.c" yy41: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -461,7 +445,7 @@ yy41: yy42: #line 191 "cnokw.re" { RET('<'); } -#line 465 "cnokw.c" +#line 449 "cnokw.c" yy43: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -471,7 +455,7 @@ yy43: yy44: #line 177 "cnokw.re" { RET('='); } -#line 475 "cnokw.c" +#line 459 "cnokw.c" yy45: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -482,12 +466,12 @@ yy45: yy46: #line 192 "cnokw.re" { RET('>'); } -#line 486 "cnokw.c" +#line 470 "cnokw.c" yy47: ++YYCURSOR; #line 195 "cnokw.re" { RET('?'); } -#line 491 "cnokw.c" +#line 475 "cnokw.c" yy49: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -561,17 +545,17 @@ yy49: yy51: #line 138 "cnokw.re" { RET(ID); } -#line 565 "cnokw.c" +#line 549 "cnokw.c" yy52: ++YYCURSOR; #line 180 "cnokw.re" { RET('['); } -#line 570 "cnokw.c" +#line 554 "cnokw.c" yy54: ++YYCURSOR; #line 181 "cnokw.re" { RET(']'); } -#line 575 "cnokw.c" +#line 559 "cnokw.c" yy56: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -581,12 +565,12 @@ yy56: yy57: #line 193 "cnokw.re" { RET('^'); } -#line 585 "cnokw.c" +#line 569 "cnokw.c" yy58: ++YYCURSOR; #line 173 "cnokw.re" { RET('{'); } -#line 590 "cnokw.c" +#line 574 "cnokw.c" yy60: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -597,22 +581,22 @@ yy60: yy61: #line 194 "cnokw.re" { RET('|'); } -#line 601 "cnokw.c" +#line 585 "cnokw.c" yy62: ++YYCURSOR; #line 174 "cnokw.re" { RET('}'); } -#line 606 "cnokw.c" +#line 590 "cnokw.c" yy64: ++YYCURSOR; #line 185 "cnokw.re" { RET('~'); } -#line 611 "cnokw.c" +#line 595 "cnokw.c" yy66: ++YYCURSOR; #line 171 "cnokw.re" { RET(NEQ); } -#line 616 "cnokw.c" +#line 600 "cnokw.c" yy68: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -636,7 +620,7 @@ yy71: ++YYCURSOR; #line 148 "cnokw.re" { RET(SCON); } -#line 640 "cnokw.c" +#line 624 "cnokw.c" yy73: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -668,17 +652,17 @@ yy74: ++YYCURSOR; #line 157 "cnokw.re" { RET(MODEQ); } -#line 672 "cnokw.c" +#line 656 "cnokw.c" yy76: ++YYCURSOR; #line 166 "cnokw.re" { RET(ANDAND); } -#line 677 "cnokw.c" +#line 661 "cnokw.c" yy78: ++YYCURSOR; #line 158 "cnokw.re" { RET(ANDEQ); } -#line 682 "cnokw.c" +#line 666 "cnokw.c" yy80: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -724,32 +708,32 @@ yy84: ++YYCURSOR; #line 155 "cnokw.re" { RET(MULEQ); } -#line 728 "cnokw.c" +#line 712 "cnokw.c" yy86: ++YYCURSOR; #line 163 "cnokw.re" { RET(INCR); } -#line 733 "cnokw.c" +#line 717 "cnokw.c" yy88: ++YYCURSOR; #line 153 "cnokw.re" { RET(ADDEQ); } -#line 738 "cnokw.c" +#line 722 "cnokw.c" yy90: ++YYCURSOR; #line 164 "cnokw.re" { RET(DECR); } -#line 743 "cnokw.c" +#line 727 "cnokw.c" yy92: ++YYCURSOR; #line 154 "cnokw.re" { RET(SUBEQ); } -#line 748 "cnokw.c" +#line 732 "cnokw.c" yy94: ++YYCURSOR; #line 165 "cnokw.re" { RET(DEREF); } -#line 753 "cnokw.c" +#line 737 "cnokw.c" yy96: yych = *++YYCURSOR; switch (yych) { @@ -783,17 +767,17 @@ yy97: yy99: #line 145 "cnokw.re" { RET(FCON); } -#line 787 "cnokw.c" +#line 771 "cnokw.c" yy100: ++YYCURSOR; #line 136 "cnokw.re" { goto comment; } -#line 792 "cnokw.c" +#line 776 "cnokw.c" yy102: ++YYCURSOR; #line 156 "cnokw.re" { RET(DIVEQ); } -#line 797 "cnokw.c" +#line 781 "cnokw.c" yy104: yych = *++YYCURSOR; switch (yych) { @@ -858,22 +842,22 @@ yy108: yy109: #line 162 "cnokw.re" { RET(LSHIFT); } -#line 862 "cnokw.c" +#line 846 "cnokw.c" yy110: ++YYCURSOR; #line 168 "cnokw.re" { RET(LEQ); } -#line 867 "cnokw.c" +#line 851 "cnokw.c" yy112: ++YYCURSOR; #line 170 "cnokw.re" { RET(EQL); } -#line 872 "cnokw.c" +#line 856 "cnokw.c" yy114: ++YYCURSOR; #line 169 "cnokw.re" { RET(GEQ); } -#line 877 "cnokw.c" +#line 861 "cnokw.c" yy116: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -883,22 +867,22 @@ yy116: yy117: #line 161 "cnokw.re" { RET(RSHIFT); } -#line 887 "cnokw.c" +#line 871 "cnokw.c" yy118: ++YYCURSOR; #line 159 "cnokw.re" { RET(XOREQ); } -#line 892 "cnokw.c" +#line 876 "cnokw.c" yy120: ++YYCURSOR; #line 160 "cnokw.re" { RET(OREQ); } -#line 897 "cnokw.c" +#line 881 "cnokw.c" yy122: ++YYCURSOR; #line 167 "cnokw.re" { RET(OROR); } -#line 902 "cnokw.c" +#line 886 "cnokw.c" yy124: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -961,7 +945,7 @@ yy126: ++YYCURSOR; #line 150 "cnokw.re" { RET(ELLIPSIS); } -#line 965 "cnokw.c" +#line 949 "cnokw.c" yy128: yych = *++YYCURSOR; goto yy99; @@ -1038,19 +1022,19 @@ yy134: ++YYCURSOR; #line 152 "cnokw.re" { RET(LSHIFTEQ); } -#line 1042 "cnokw.c" +#line 1026 "cnokw.c" yy136: ++YYCURSOR; #line 151 "cnokw.re" { RET(RSHIFTEQ); } -#line 1047 "cnokw.c" +#line 1031 "cnokw.c" } #line 212 "cnokw.re" comment: -#line 1054 "cnokw.c" +#line 1038 "cnokw.c" { YYCTYPE yych; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); @@ -1065,7 +1049,7 @@ yy140: yy141: #line 223 "cnokw.re" { goto comment; } -#line 1069 "cnokw.c" +#line 1053 "cnokw.c" yy142: ++YYCURSOR; #line 218 "cnokw.re" @@ -1074,7 +1058,7 @@ yy142: s->tok = s->pos = cursor; s->line++; goto comment; } -#line 1078 "cnokw.c" +#line 1062 "cnokw.c" yy144: yych = *++YYCURSOR; switch (yych) { @@ -1085,7 +1069,7 @@ yy145: ++YYCURSOR; #line 216 "cnokw.re" { goto std; } -#line 1089 "cnokw.c" +#line 1073 "cnokw.c" } #line 224 "cnokw.re" diff --git a/re2c/test/cunroll.c b/re2c/test/cunroll.c index c8e9a1dc..a5b6330e 100644 --- a/re2c/test/cunroll.c +++ b/re2c/test/cunroll.c @@ -391,36 +391,20 @@ yy33: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy96; - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': goto yy35; - case 'E': - case 'e': goto yy103; - case 'L': - case 'U': - case 'l': - case 'u': goto yy104; case 'X': case 'x': goto yy106; - default: goto yy34; + default: goto yy36; } yy34: #line 153 "cunroll.re" { RET(ICON); } -#line 419 "cunroll.c" +#line 402 "cunroll.c" yy35: yyaccept = 2; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); yych = *YYCURSOR; +yy36: switch (yych) { case '.': goto yy96; case '0': @@ -445,12 +429,12 @@ yy37: ++YYCURSOR; #line 187 "cunroll.re" { RET(':'); } -#line 449 "cunroll.c" +#line 433 "cunroll.c" yy39: ++YYCURSOR; #line 183 "cunroll.re" { RET(';'); } -#line 454 "cunroll.c" +#line 438 "cunroll.c" yy41: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -461,7 +445,7 @@ yy41: yy42: #line 202 "cunroll.re" { RET('<'); } -#line 465 "cunroll.c" +#line 449 "cunroll.c" yy43: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -471,7 +455,7 @@ yy43: yy44: #line 188 "cunroll.re" { RET('='); } -#line 475 "cunroll.c" +#line 459 "cunroll.c" yy45: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -482,12 +466,12 @@ yy45: yy46: #line 203 "cunroll.re" { RET('>'); } -#line 486 "cunroll.c" +#line 470 "cunroll.c" yy47: ++YYCURSOR; #line 206 "cunroll.re" { RET('?'); } -#line 491 "cunroll.c" +#line 475 "cunroll.c" yy49: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -559,17 +543,17 @@ yy49: yy50: #line 141 "cunroll.re" { RET(ID); } -#line 563 "cunroll.c" +#line 547 "cunroll.c" yy51: ++YYCURSOR; #line 191 "cunroll.re" { RET('['); } -#line 568 "cunroll.c" +#line 552 "cunroll.c" yy53: ++YYCURSOR; #line 192 "cunroll.re" { RET(']'); } -#line 573 "cunroll.c" +#line 557 "cunroll.c" yy55: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -579,12 +563,12 @@ yy55: yy56: #line 204 "cunroll.re" { RET('^'); } -#line 583 "cunroll.c" +#line 567 "cunroll.c" yy57: ++YYCURSOR; #line 184 "cunroll.re" { RET('{'); } -#line 588 "cunroll.c" +#line 572 "cunroll.c" yy59: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -595,22 +579,22 @@ yy59: yy60: #line 205 "cunroll.re" { RET('|'); } -#line 599 "cunroll.c" +#line 583 "cunroll.c" yy61: ++YYCURSOR; #line 185 "cunroll.re" { RET('}'); } -#line 604 "cunroll.c" +#line 588 "cunroll.c" yy63: ++YYCURSOR; #line 196 "cunroll.re" { RET('~'); } -#line 609 "cunroll.c" +#line 593 "cunroll.c" yy65: ++YYCURSOR; #line 182 "cunroll.re" { RET(NEQ); } -#line 614 "cunroll.c" +#line 598 "cunroll.c" yy67: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -634,7 +618,7 @@ yy70: ++YYCURSOR; #line 159 "cunroll.re" { RET(SCON); } -#line 638 "cunroll.c" +#line 622 "cunroll.c" yy72: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -666,17 +650,17 @@ yy73: ++YYCURSOR; #line 168 "cunroll.re" { RET(MODEQ); } -#line 670 "cunroll.c" +#line 654 "cunroll.c" yy75: ++YYCURSOR; #line 177 "cunroll.re" { RET(ANDAND); } -#line 675 "cunroll.c" +#line 659 "cunroll.c" yy77: ++YYCURSOR; #line 169 "cunroll.re" { RET(ANDEQ); } -#line 680 "cunroll.c" +#line 664 "cunroll.c" yy79: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -722,32 +706,32 @@ yy83: ++YYCURSOR; #line 166 "cunroll.re" { RET(MULEQ); } -#line 726 "cunroll.c" +#line 710 "cunroll.c" yy85: ++YYCURSOR; #line 174 "cunroll.re" { RET(INCR); } -#line 731 "cunroll.c" +#line 715 "cunroll.c" yy87: ++YYCURSOR; #line 164 "cunroll.re" { RET(ADDEQ); } -#line 736 "cunroll.c" +#line 720 "cunroll.c" yy89: ++YYCURSOR; #line 175 "cunroll.re" { RET(DECR); } -#line 741 "cunroll.c" +#line 725 "cunroll.c" yy91: ++YYCURSOR; #line 165 "cunroll.re" { RET(SUBEQ); } -#line 746 "cunroll.c" +#line 730 "cunroll.c" yy93: ++YYCURSOR; #line 176 "cunroll.re" { RET(DEREF); } -#line 751 "cunroll.c" +#line 735 "cunroll.c" yy95: yych = *++YYCURSOR; switch (yych) { @@ -781,17 +765,17 @@ yy96: yy98: #line 156 "cunroll.re" { RET(FCON); } -#line 785 "cunroll.c" +#line 769 "cunroll.c" yy99: ++YYCURSOR; #line 138 "cunroll.re" { goto comment; } -#line 790 "cunroll.c" +#line 774 "cunroll.c" yy101: ++YYCURSOR; #line 167 "cunroll.re" { RET(DIVEQ); } -#line 795 "cunroll.c" +#line 779 "cunroll.c" yy103: yych = *++YYCURSOR; switch (yych) { @@ -856,22 +840,22 @@ yy107: yy108: #line 173 "cunroll.re" { RET(LSHIFT); } -#line 860 "cunroll.c" +#line 844 "cunroll.c" yy109: ++YYCURSOR; #line 179 "cunroll.re" { RET(LEQ); } -#line 865 "cunroll.c" +#line 849 "cunroll.c" yy111: ++YYCURSOR; #line 181 "cunroll.re" { RET(EQL); } -#line 870 "cunroll.c" +#line 854 "cunroll.c" yy113: ++YYCURSOR; #line 180 "cunroll.re" { RET(GEQ); } -#line 875 "cunroll.c" +#line 859 "cunroll.c" yy115: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -881,7 +865,7 @@ yy115: yy116: #line 172 "cunroll.re" { RET(RSHIFT); } -#line 885 "cunroll.c" +#line 869 "cunroll.c" yy117: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -953,22 +937,22 @@ yy117: yy118: #line 142 "cunroll.re" { RET(ID); } -#line 957 "cunroll.c" +#line 941 "cunroll.c" yy119: ++YYCURSOR; #line 170 "cunroll.re" { RET(XOREQ); } -#line 962 "cunroll.c" +#line 946 "cunroll.c" yy121: ++YYCURSOR; #line 171 "cunroll.re" { RET(OREQ); } -#line 967 "cunroll.c" +#line 951 "cunroll.c" yy123: ++YYCURSOR; #line 178 "cunroll.re" { RET(OROR); } -#line 972 "cunroll.c" +#line 956 "cunroll.c" yy125: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -1031,7 +1015,7 @@ yy127: ++YYCURSOR; #line 161 "cunroll.re" { RET(ELLIPSIS); } -#line 1035 "cunroll.c" +#line 1019 "cunroll.c" yy129: yych = *++YYCURSOR; goto yy98; @@ -1108,12 +1092,12 @@ yy135: ++YYCURSOR; #line 163 "cunroll.re" { RET(LSHIFTEQ); } -#line 1112 "cunroll.c" +#line 1096 "cunroll.c" yy137: ++YYCURSOR; #line 162 "cunroll.re" { RET(RSHIFTEQ); } -#line 1117 "cunroll.c" +#line 1101 "cunroll.c" yy139: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1185,7 +1169,7 @@ yy139: yy140: #line 143 "cunroll.re" { RET(ID); } -#line 1189 "cunroll.c" +#line 1173 "cunroll.c" yy141: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1257,7 +1241,7 @@ yy141: yy142: #line 144 "cunroll.re" { RET(ID); } -#line 1261 "cunroll.c" +#line 1245 "cunroll.c" yy143: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1329,7 +1313,7 @@ yy143: yy144: #line 145 "cunroll.re" { RET(ID); } -#line 1333 "cunroll.c" +#line 1317 "cunroll.c" yy145: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1401,7 +1385,7 @@ yy145: yy146: #line 146 "cunroll.re" { RET(ID); } -#line 1405 "cunroll.c" +#line 1389 "cunroll.c" yy147: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1473,7 +1457,7 @@ yy147: yy148: #line 147 "cunroll.re" { RET(ID); } -#line 1477 "cunroll.c" +#line 1461 "cunroll.c" yy149: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1545,7 +1529,7 @@ yy149: yy150: #line 148 "cunroll.re" { RET(ID); } -#line 1549 "cunroll.c" +#line 1533 "cunroll.c" yy151: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -1619,14 +1603,14 @@ yy151: yy153: #line 149 "cunroll.re" { RET(ID); } -#line 1623 "cunroll.c" +#line 1607 "cunroll.c" } #line 223 "cunroll.re" comment: -#line 1630 "cunroll.c" +#line 1614 "cunroll.c" { YYCTYPE yych; if ((YYLIMIT - YYCURSOR) < 8) YYFILL(8); @@ -1647,7 +1631,7 @@ yy156: yy157: #line 234 "cunroll.re" { goto comment; } -#line 1651 "cunroll.c" +#line 1635 "cunroll.c" yy158: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1662,7 +1646,7 @@ yy159: s->tok = s->pos = cursor; s->line++; goto comment; } -#line 1666 "cunroll.c" +#line 1650 "cunroll.c" yy160: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1672,7 +1656,7 @@ yy160: yy161: #line 242 "cunroll.re" { goto comment; } -#line 1676 "cunroll.c" +#line 1660 "cunroll.c" yy162: yych = *++YYCURSOR; goto yy161; @@ -1686,12 +1670,12 @@ yy163: yy164: #line 235 "cunroll.re" { goto comment; } -#line 1690 "cunroll.c" +#line 1674 "cunroll.c" yy165: ++YYCURSOR; #line 227 "cunroll.re" { goto std; } -#line 1695 "cunroll.c" +#line 1679 "cunroll.c" yy167: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1702,7 +1686,7 @@ yy167: yy168: #line 236 "cunroll.re" { goto comment; } -#line 1706 "cunroll.c" +#line 1690 "cunroll.c" yy169: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1713,7 +1697,7 @@ yy169: yy170: #line 237 "cunroll.re" { goto comment; } -#line 1717 "cunroll.c" +#line 1701 "cunroll.c" yy171: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1724,7 +1708,7 @@ yy171: yy172: #line 238 "cunroll.re" { goto comment; } -#line 1728 "cunroll.c" +#line 1712 "cunroll.c" yy173: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1735,7 +1719,7 @@ yy173: yy174: #line 239 "cunroll.re" { goto comment; } -#line 1739 "cunroll.c" +#line 1723 "cunroll.c" yy175: ++YYCURSOR; switch ((yych = *YYCURSOR)) { @@ -1746,12 +1730,12 @@ yy175: yy176: #line 240 "cunroll.re" { goto comment; } -#line 1750 "cunroll.c" +#line 1734 "cunroll.c" yy177: ++YYCURSOR; #line 241 "cunroll.re" { goto comment; } -#line 1755 "cunroll.c" +#line 1739 "cunroll.c" } #line 243 "cunroll.re" diff --git a/re2c/test/input_custom_mjson.--input(custom).c b/re2c/test/input_custom_mjson.--input(custom).c index 953acea3..6a5e5f37 100644 --- a/re2c/test/input_custom_mjson.--input(custom).c +++ b/re2c/test/input_custom_mjson.--input(custom).c @@ -671,7 +671,7 @@ yy14: yy15: YYSKIP (); switch ((yych = YYPEEK ())) { - case '.': goto yy47; + case '.': case '0': case '1': case '2': @@ -679,13 +679,14 @@ yy15: case '4': case '5': case '6': - case '7': goto yy54; + case '7': case '8': - case '9': goto yy57; + case '9': case 'A': case 'B': case 'C': case 'D': + case 'E': case 'F': case 'G': case 'H': @@ -711,6 +712,7 @@ yy15: case 'b': case 'c': case 'd': + case 'e': case 'f': case 'g': case 'h': @@ -730,9 +732,7 @@ yy15: case 'v': case 'w': case 'y': - case 'z': goto yy60; - case 'E': - case 'e': goto yy62; + case 'z': goto yy55; case 'X': case 'x': goto yy63; default: goto yy16; @@ -1106,6 +1106,7 @@ yy52: yy54: YYSKIP (); yych = YYPEEK (); +yy55: switch (yych) { case '.': goto yy47; case '0': @@ -1179,7 +1180,7 @@ yy56: token = TOK_OCT_NUMBER; goto done; } -#line 1183 "input_custom_mjson.--input(custom).c" +#line 1184 "input_custom_mjson.--input(custom).c" yy57: YYSKIP (); yych = YYPEEK (); @@ -1256,10 +1257,11 @@ yy59: context->token = TOK_INVALID; return; } -#line 1260 "input_custom_mjson.--input(custom).c" +#line 1261 "input_custom_mjson.--input(custom).c" yy60: YYSKIP (); yych = YYPEEK (); +yy61: switch (yych) { case '0': case '1': @@ -1344,60 +1346,7 @@ yy62: case '7': case '8': case '9': goto yy77; - case 'A': - case 'B': - case 'C': - case 'D': - case 'E': - case 'F': - case 'G': - case 'H': - case 'I': - case 'J': - case 'K': - case 'L': - case 'M': - case 'N': - case 'O': - case 'P': - case 'Q': - case 'R': - case 'S': - case 'T': - case 'U': - case 'V': - case 'W': - case 'X': - case 'Y': - case 'Z': - case '_': - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - case 'g': - case 'h': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 'r': - case 's': - case 't': - case 'u': - case 'v': - case 'w': - case 'x': - case 'y': - case 'z': goto yy60; - default: goto yy59; + default: goto yy61; } yy63: YYSKIP (); @@ -1578,7 +1527,7 @@ yy74: { continue; } -#line 1582 "input_custom_mjson.--input(custom).c" +#line 1531 "input_custom_mjson.--input(custom).c" yy76: YYSKIP (); yych = YYPEEK (); @@ -1740,7 +1689,7 @@ yy81: token = TOK_HEX_NUMBER; goto done; } -#line 1744 "input_custom_mjson.--input(custom).c" +#line 1693 "input_custom_mjson.--input(custom).c" yy82: YYSKIP (); yych = YYPEEK (); @@ -1769,7 +1718,7 @@ yy85: token = TOK_STRING; goto done; } -#line 1773 "input_custom_mjson.--input(custom).c" +#line 1722 "input_custom_mjson.--input(custom).c" yy87: YYSKIP (); yych = YYPEEK (); @@ -1830,7 +1779,7 @@ yy93: { continue; } -#line 1834 "input_custom_mjson.--input(custom).c" +#line 1783 "input_custom_mjson.--input(custom).c" yy94: YYSKIP (); yych = YYPEEK (); @@ -1912,7 +1861,7 @@ yy96: token = TOK_NULL; goto done; } -#line 1916 "input_custom_mjson.--input(custom).c" +#line 1865 "input_custom_mjson.--input(custom).c" yy97: YYSKIP (); switch ((yych = YYPEEK ())) { @@ -1987,7 +1936,7 @@ yy98: token = TOK_TRUE; goto done; } -#line 1991 "input_custom_mjson.--input(custom).c" +#line 1940 "input_custom_mjson.--input(custom).c" yy99: YYSKIP (); yych = YYPEEK (); @@ -2100,7 +2049,7 @@ yy102: token = TOK_FALSE; goto done; } -#line 2104 "input_custom_mjson.--input(custom).c" +#line 2053 "input_custom_mjson.--input(custom).c" yy103: YYSKIP (); yych = YYPEEK (); @@ -2250,7 +2199,7 @@ static int parse_string(mjson_parser_t *context, uint32_t id) s = c; -#line 2254 "input_custom_mjson.--input(custom).c" +#line 2203 "input_custom_mjson.--input(custom).c" { YYCTYPE yych; yych = YYPEEK (); @@ -2267,7 +2216,7 @@ yy107: { assert(!"reachable"); } -#line 2271 "input_custom_mjson.--input(custom).c" +#line 2220 "input_custom_mjson.--input(custom).c" yy108: YYSKIP (); yych = YYPEEK (); @@ -2288,7 +2237,7 @@ yy110: continue; } -#line 2292 "input_custom_mjson.--input(custom).c" +#line 2241 "input_custom_mjson.--input(custom).c" yy111: YYSKIP (); #line 801 "input_custom_mjson.--input(custom).re" @@ -2300,7 +2249,7 @@ yy111: return 1; } -#line 2304 "input_custom_mjson.--input(custom).c" +#line 2253 "input_custom_mjson.--input(custom).c" yy113: YYSKIP (); YYBACKUP (); @@ -2350,7 +2299,7 @@ yy114: continue; } -#line 2354 "input_custom_mjson.--input(custom).c" +#line 2303 "input_custom_mjson.--input(custom).c" yy116: YYSKIP (); yych = YYPEEK (); @@ -2482,7 +2431,7 @@ yy121: continue; } -#line 2486 "input_custom_mjson.--input(custom).c" +#line 2435 "input_custom_mjson.--input(custom).c" } #line 813 "input_custom_mjson.--input(custom).re" diff --git a/re2c/test/input_custom_mjson.--skeleton--input(custom).c b/re2c/test/input_custom_mjson.--skeleton--input(custom).c index f2d29bb1..a21304a0 100644 --- a/re2c/test/input_custom_mjson.--skeleton--input(custom).c +++ b/re2c/test/input_custom_mjson.--skeleton--input(custom).c @@ -325,7 +325,7 @@ yy14: yy15: YYSKIP (); switch ((yych = YYPEEK ())) { - case '.': goto yy47; + case '.': case '0': case '1': case '2': @@ -333,13 +333,14 @@ yy15: case '4': case '5': case '6': - case '7': goto yy54; + case '7': case '8': - case '9': goto yy57; + case '9': case 'A': case 'B': case 'C': case 'D': + case 'E': case 'F': case 'G': case 'H': @@ -365,6 +366,7 @@ yy15: case 'b': case 'c': case 'd': + case 'e': case 'f': case 'g': case 'h': @@ -384,9 +386,7 @@ yy15: case 'v': case 'w': case 'y': - case 'z': goto yy60; - case 'E': - case 'e': goto yy62; + case 'z': goto yy55; case 'X': case 'x': goto yy63; default: goto yy16; @@ -739,6 +739,7 @@ yy54: YYSKIP (); if (YYLESSTHAN (3)) YYFILL(3); yych = YYPEEK (); +yy55: switch (yych) { case '.': goto yy47; case '0': @@ -889,6 +890,7 @@ yy60: YYSKIP (); if (YYLESSTHAN (1)) YYFILL(1); yych = YYPEEK (); +yy61: switch (yych) { case '0': case '1': @@ -973,60 +975,7 @@ yy62: case '7': case '8': case '9': goto yy77; - case 'A': - case 'B': - case 'C': - case 'D': - case 'E': - case 'F': - case 'G': - case 'H': - case 'I': - case 'J': - case 'K': - case 'L': - case 'M': - case 'N': - case 'O': - case 'P': - case 'Q': - case 'R': - case 'S': - case 'T': - case 'U': - case 'V': - case 'W': - case 'X': - case 'Y': - case 'Z': - case '_': - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - case 'g': - case 'h': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 'r': - case 's': - case 't': - case 'u': - case 'v': - case 'w': - case 'x': - case 'y': - case 'z': goto yy60; - default: goto yy59; + default: goto yy61; } yy63: YYSKIP (); diff --git a/re2c/test/parse_date.b.c b/re2c/test/parse_date.b.c index bb8de452..eca8bfb0 100644 --- a/re2c/test/parse_date.b.c +++ b/re2c/test/parse_date.b.c @@ -10059,25 +10059,9 @@ yy561: } yy562: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'T') goto yy125; - goto yy53; - } - } else { - if (yych <= 's') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 't') goto yy561; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'T') goto yy125; + if (yych == 't') goto yy561; + goto yy560; yy563: yych = *++YYCURSOR; if (yych == 'B') goto yy609; @@ -10187,25 +10171,9 @@ yy573: goto yy560; yy574: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'H') goto yy565; - goto yy53; - } - } else { - if (yych <= 'g') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 'h') goto yy568; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'H') goto yy565; + if (yych == 'h') goto yy568; + goto yy560; yy575: yych = *++YYCURSOR; if (yych == 'Y') goto yy704; @@ -10294,7 +10262,7 @@ yy583: TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } -#line 10298 "parse_date.b.c" +#line 10266 "parse_date.b.c" yy584: yych = *++YYCURSOR; if (yych <= '/') goto yy583; @@ -10337,7 +10305,7 @@ yy586: TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } -#line 10341 "parse_date.b.c" +#line 10309 "parse_date.b.c" yy587: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); @@ -10588,25 +10556,9 @@ yy617: goto yy560; yy618: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'D') goto yy565; - goto yy53; - } - } else { - if (yych <= 'c') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 'd') goto yy568; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'D') goto yy565; + if (yych == 'd') goto yy568; + goto yy560; yy619: yych = *++YYCURSOR; if (yych == 'M') goto yy563; @@ -10629,7 +10581,7 @@ yy622: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 10633 "parse_date.b.c" +#line 10585 "parse_date.b.c" yy623: yych = *++YYCURSOR; if (yych == 'R') goto yy746; @@ -10723,7 +10675,7 @@ yy638: TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } -#line 10727 "parse_date.b.c" +#line 10679 "parse_date.b.c" yy639: yych = *++YYCURSOR; if (yych <= '/') goto yy197; @@ -10919,7 +10871,7 @@ yy663: TIMELIB_DEINIT; return TIMELIB_ISO_NOCOLON; } -#line 10923 "parse_date.b.c" +#line 10875 "parse_date.b.c" yy664: yyaccept = 18; yych = *(YYMARKER = ++YYCURSOR); @@ -11399,25 +11351,9 @@ yy712: goto yy53; yy713: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'Y') goto yy125; - goto yy53; - } - } else { - if (yych <= 'x') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 'y') goto yy561; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'Y') goto yy125; + if (yych == 'y') goto yy561; + goto yy560; yy714: yych = *++YYCURSOR; if (yych == 'Y') goto yy802; @@ -11579,25 +11515,9 @@ yy742: goto yy53; yy743: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'R') goto yy125; - goto yy53; - } - } else { - if (yych <= 'q') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 'r') goto yy561; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'R') goto yy125; + if (yych == 'r') goto yy561; + goto yy560; yy744: yych = *++YYCURSOR; if (yych == 'U') goto yy829; @@ -11821,7 +11741,7 @@ yy775: TIMELIB_DEINIT; return TIMELIB_PG_YEARDAY; } -#line 11825 "parse_date.b.c" +#line 11745 "parse_date.b.c" yy776: yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); @@ -12005,7 +11925,7 @@ yy791: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 12009 "parse_date.b.c" +#line 11929 "parse_date.b.c" yy792: yych = *++YYCURSOR; if (yych == 'G') goto yy871; @@ -12088,7 +12008,7 @@ yy803: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 12092 "parse_date.b.c" +#line 12012 "parse_date.b.c" yy804: yych = *++YYCURSOR; if (yych == 'T') goto yy880; @@ -12418,25 +12338,9 @@ yy829: goto yy53; yy830: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'S') goto yy565; - goto yy53; - } - } else { - if (yych <= 'r') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 's') goto yy568; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'S') goto yy565; + if (yych == 's') goto yy568; + goto yy560; yy831: yych = *++YYCURSOR; if (yych == 'W') goto yy899; @@ -12684,7 +12588,7 @@ yy855: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 12688 "parse_date.b.c" +#line 12592 "parse_date.b.c" yy856: yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); @@ -12764,7 +12668,7 @@ yy860: TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } -#line 12768 "parse_date.b.c" +#line 12672 "parse_date.b.c" yy861: yych = *++YYCURSOR; if (yych <= '/') goto yy53; @@ -12826,7 +12730,7 @@ yy869: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 12830 "parse_date.b.c" +#line 12734 "parse_date.b.c" yy871: yych = *++YYCURSOR; if (yych == 'H') goto yy926; @@ -12864,7 +12768,7 @@ yy876: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 12868 "parse_date.b.c" +#line 12772 "parse_date.b.c" yy877: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); @@ -13050,7 +12954,7 @@ yy900: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 13054 "parse_date.b.c" +#line 12958 "parse_date.b.c" yy901: yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); @@ -13327,7 +13231,7 @@ yy927: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 13331 "parse_date.b.c" +#line 13235 "parse_date.b.c" yy929: yych = *++YYCURSOR; if (yych <= '/') goto yy876; @@ -13455,7 +13359,7 @@ yy947: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 13459 "parse_date.b.c" +#line 13363 "parse_date.b.c" yy948: yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); @@ -13962,7 +13866,7 @@ yy1020: TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } -#line 13966 "parse_date.b.c" +#line 13870 "parse_date.b.c" yy1021: yych = *++YYCURSOR; if (yych != '0') goto yy1020; @@ -14096,7 +14000,7 @@ yy1043: TIMELIB_DEINIT; return TIMELIB_CLF; } -#line 14100 "parse_date.b.c" +#line 14004 "parse_date.b.c" yy1044: yych = *++YYCURSOR; if (yych <= '5') { diff --git a/re2c/test/parse_date.c b/re2c/test/parse_date.c index e8711dde..eaef8cc0 100644 --- a/re2c/test/parse_date.c +++ b/re2c/test/parse_date.c @@ -17879,36 +17879,9 @@ yy561: yy562: yych = *++YYCURSOR; switch (yych) { - case '/': - case '_': goto yy259; case 'T': goto yy125; - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - case 'g': - case 'h': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 'r': - case 's': - case 'u': - case 'v': - case 'w': - case 'x': - case 'y': - case 'z': goto yy559; case 't': goto yy561; - default: goto yy53; + default: goto yy560; } yy563: yych = *++YYCURSOR; @@ -18027,36 +18000,9 @@ yy573: yy574: yych = *++YYCURSOR; switch (yych) { - case '/': - case '_': goto yy259; case 'H': goto yy565; - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - case 'g': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 'r': - case 's': - case 't': - case 'u': - case 'v': - case 'w': - case 'x': - case 'y': - case 'z': goto yy559; case 'h': goto yy568; - default: goto yy53; + default: goto yy560; } yy575: yych = *++YYCURSOR; @@ -18201,7 +18147,7 @@ yy583: TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } -#line 18205 "parse_date.c" +#line 18151 "parse_date.c" yy584: yych = *++YYCURSOR; switch (yych) { @@ -18263,7 +18209,7 @@ yy586: TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } -#line 18267 "parse_date.c" +#line 18213 "parse_date.c" yy587: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); @@ -18513,36 +18459,9 @@ yy617: yy618: yych = *++YYCURSOR; switch (yych) { - case '/': - case '_': goto yy259; case 'D': goto yy565; - case 'a': - case 'b': - case 'c': - case 'e': - case 'f': - case 'g': - case 'h': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 'r': - case 's': - case 't': - case 'u': - case 'v': - case 'w': - case 'x': - case 'y': - case 'z': goto yy559; case 'd': goto yy568; - default: goto yy53; + default: goto yy560; } yy619: yych = *++YYCURSOR; @@ -18570,7 +18489,7 @@ yy622: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 18574 "parse_date.c" +#line 18493 "parse_date.c" yy623: yych = *++YYCURSOR; switch (yych) { @@ -18739,7 +18658,7 @@ yy638: TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } -#line 18743 "parse_date.c" +#line 18662 "parse_date.c" yy639: yych = *++YYCURSOR; switch (yych) { @@ -19013,7 +18932,7 @@ yy663: TIMELIB_DEINIT; return TIMELIB_ISO_NOCOLON; } -#line 19017 "parse_date.c" +#line 18936 "parse_date.c" yy664: yyaccept = 18; yych = *(YYMARKER = ++YYCURSOR); @@ -19623,36 +19542,9 @@ yy712: yy713: yych = *++YYCURSOR; switch (yych) { - case '/': - case '_': goto yy259; case 'Y': goto yy125; - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - case 'g': - case 'h': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 'r': - case 's': - case 't': - case 'u': - case 'v': - case 'w': - case 'x': - case 'z': goto yy559; case 'y': goto yy561; - default: goto yy53; + default: goto yy560; } yy714: yych = *++YYCURSOR; @@ -19864,36 +19756,9 @@ yy742: yy743: yych = *++YYCURSOR; switch (yych) { - case '/': - case '_': goto yy259; case 'R': goto yy125; - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - case 'g': - case 'h': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 's': - case 't': - case 'u': - case 'v': - case 'w': - case 'x': - case 'y': - case 'z': goto yy559; case 'r': goto yy561; - default: goto yy53; + default: goto yy560; } yy744: yych = *++YYCURSOR; @@ -20212,7 +20077,7 @@ yy775: TIMELIB_DEINIT; return TIMELIB_PG_YEARDAY; } -#line 20216 "parse_date.c" +#line 20081 "parse_date.c" yy776: yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); @@ -20427,7 +20292,7 @@ yy791: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 20431 "parse_date.c" +#line 20296 "parse_date.c" yy792: yych = *++YYCURSOR; switch (yych) { @@ -20548,7 +20413,7 @@ yy803: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 20552 "parse_date.c" +#line 20417 "parse_date.c" yy804: yych = *++YYCURSOR; switch (yych) { @@ -21003,36 +20868,9 @@ yy829: yy830: yych = *++YYCURSOR; switch (yych) { - case '/': - case '_': goto yy259; case 'S': goto yy565; - case 'a': - case 'b': - case 'c': - case 'd': - case 'e': - case 'f': - case 'g': - case 'h': - case 'i': - case 'j': - case 'k': - case 'l': - case 'm': - case 'n': - case 'o': - case 'p': - case 'q': - case 'r': - case 't': - case 'u': - case 'v': - case 'w': - case 'x': - case 'y': - case 'z': goto yy559; case 's': goto yy568; - default: goto yy53; + default: goto yy560; } yy831: yych = *++YYCURSOR; @@ -21275,7 +21113,7 @@ yy855: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 21279 "parse_date.c" +#line 21117 "parse_date.c" yy856: yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); @@ -21358,7 +21196,7 @@ yy860: TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } -#line 21362 "parse_date.c" +#line 21200 "parse_date.c" yy861: yych = *++YYCURSOR; switch (yych) { @@ -21437,7 +21275,7 @@ yy869: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 21441 "parse_date.c" +#line 21279 "parse_date.c" yy871: yych = *++YYCURSOR; switch (yych) { @@ -21509,7 +21347,7 @@ yy876: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 21513 "parse_date.c" +#line 21351 "parse_date.c" yy877: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); @@ -21817,7 +21655,7 @@ yy900: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 21821 "parse_date.c" +#line 21659 "parse_date.c" yy901: yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); @@ -22155,7 +21993,7 @@ yy927: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 22159 "parse_date.c" +#line 21997 "parse_date.c" yy929: yych = *++YYCURSOR; switch (yych) { @@ -22506,7 +22344,7 @@ yy947: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 22510 "parse_date.c" +#line 22348 "parse_date.c" yy948: yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); @@ -23625,7 +23463,7 @@ yy1020: TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } -#line 23629 "parse_date.c" +#line 23467 "parse_date.c" yy1021: yych = *++YYCURSOR; switch (yych) { @@ -23870,7 +23708,7 @@ yy1043: TIMELIB_DEINIT; return TIMELIB_CLF; } -#line 23874 "parse_date.c" +#line 23712 "parse_date.c" yy1044: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/parse_date.db.c b/re2c/test/parse_date.db.c index 191b04d9..18e534a5 100644 --- a/re2c/test/parse_date.db.c +++ b/re2c/test/parse_date.db.c @@ -16728,25 +16728,9 @@ yy869: yy870: YYDEBUG(870, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy265; - } else { - if (yych == 'R') goto yy125; - goto yy53; - } - } else { - if (yych <= 'q') { - if (yych <= '_') goto yy265; - if (yych <= '`') goto yy53; - goto yy867; - } else { - if (yych <= 'r') goto yy914; - if (yych <= 'z') goto yy867; - goto yy53; - } - } + if (yych == 'R') goto yy125; + if (yych == 'r') goto yy914; + goto yy868; yy871: YYDEBUG(871, *YYCURSOR); yych = *++YYCURSOR; @@ -16926,25 +16910,9 @@ yy897: yy898: YYDEBUG(898, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy265; - } else { - if (yych == 'H') goto yy606; - goto yy53; - } - } else { - if (yych <= 'g') { - if (yych <= '_') goto yy265; - if (yych <= '`') goto yy53; - goto yy867; - } else { - if (yych <= 'h') goto yy948; - if (yych <= 'z') goto yy867; - goto yy53; - } - } + if (yych == 'H') goto yy606; + if (yych == 'h') goto yy948; + goto yy868; yy899: YYDEBUG(899, *YYCURSOR); yych = *++YYCURSOR; @@ -16954,25 +16922,9 @@ yy899: yy900: YYDEBUG(900, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy265; - } else { - if (yych == 'Y') goto yy125; - goto yy53; - } - } else { - if (yych <= 'x') { - if (yych <= '_') goto yy265; - if (yych <= '`') goto yy53; - goto yy867; - } else { - if (yych <= 'y') goto yy914; - if (yych <= 'z') goto yy867; - goto yy53; - } - } + if (yych == 'Y') goto yy125; + if (yych == 'y') goto yy914; + goto yy868; yy901: YYDEBUG(901, *YYCURSOR); yych = *++YYCURSOR; @@ -17141,7 +17093,7 @@ yy916: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 17145 "parse_date.db.c" +#line 17097 "parse_date.db.c" yy917: YYDEBUG(917, *YYCURSOR); yych = *++YYCURSOR; @@ -17498,25 +17450,9 @@ yy942: yy943: YYDEBUG(943, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy265; - } else { - if (yych == 'S') goto yy606; - goto yy53; - } - } else { - if (yych <= 'r') { - if (yych <= '_') goto yy265; - if (yych <= '`') goto yy53; - goto yy867; - } else { - if (yych <= 's') goto yy948; - if (yych <= 'z') goto yy867; - goto yy53; - } - } + if (yych == 'S') goto yy606; + if (yych == 's') goto yy948; + goto yy868; yy944: YYDEBUG(944, *YYCURSOR); yych = *++YYCURSOR; @@ -17889,7 +17825,7 @@ yy978: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 17893 "parse_date.db.c" +#line 17829 "parse_date.db.c" yy979: YYDEBUG(979, *YYCURSOR); yyaccept = 22; @@ -18003,7 +17939,7 @@ yy983: TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } -#line 18007 "parse_date.db.c" +#line 17943 "parse_date.db.c" yy984: YYDEBUG(984, *YYCURSOR); yych = *++YYCURSOR; @@ -18075,7 +18011,7 @@ yy992: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 18079 "parse_date.db.c" +#line 18015 "parse_date.db.c" yy994: YYDEBUG(994, *YYCURSOR); yych = *++YYCURSOR; @@ -18119,7 +18055,7 @@ yy999: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 18123 "parse_date.db.c" +#line 18059 "parse_date.db.c" yy1000: YYDEBUG(1000, *YYCURSOR); yyaccept = 16; @@ -18356,7 +18292,7 @@ yy1025: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 18360 "parse_date.db.c" +#line 18296 "parse_date.db.c" yy1026: YYDEBUG(1026, *YYCURSOR); yyaccept = 24; @@ -18661,7 +18597,7 @@ yy1052: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 18665 "parse_date.db.c" +#line 18601 "parse_date.db.c" yy1054: YYDEBUG(1054, *YYCURSOR); yych = *++YYCURSOR; @@ -18808,7 +18744,7 @@ yy1072: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 18812 "parse_date.db.c" +#line 18748 "parse_date.db.c" yy1073: YYDEBUG(1073, *YYCURSOR); yyaccept = 25; @@ -19422,7 +19358,7 @@ yy1145: TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } -#line 19426 "parse_date.db.c" +#line 19362 "parse_date.db.c" yy1146: YYDEBUG(1146, *YYCURSOR); yych = *++YYCURSOR; @@ -19625,7 +19561,7 @@ yy1172: TIMELIB_DEINIT; return TIMELIB_CLF; } -#line 19629 "parse_date.db.c" +#line 19565 "parse_date.db.c" yy1173: YYDEBUG(1173, *YYCURSOR); yych = *++YYCURSOR; diff --git a/re2c/test/parse_date.g.c b/re2c/test/parse_date.g.c index 7564865b..41f5577d 100644 --- a/re2c/test/parse_date.g.c +++ b/re2c/test/parse_date.g.c @@ -10041,25 +10041,9 @@ yy561: } yy562: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'T') goto yy125; - goto yy53; - } - } else { - if (yych <= 's') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 't') goto yy561; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'T') goto yy125; + if (yych == 't') goto yy561; + goto yy560; yy563: yych = *++YYCURSOR; if (yych == 'B') goto yy609; @@ -10183,25 +10167,9 @@ yy573: goto yy560; yy574: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'H') goto yy565; - goto yy53; - } - } else { - if (yych <= 'g') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 'h') goto yy568; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'H') goto yy565; + if (yych == 'h') goto yy568; + goto yy560; yy575: yych = *++YYCURSOR; if (yych == 'Y') goto yy704; @@ -10290,7 +10258,7 @@ yy583: TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } -#line 10294 "parse_date.g.c" +#line 10262 "parse_date.g.c" yy584: yych = *++YYCURSOR; if (yych <= '/') goto yy583; @@ -10333,7 +10301,7 @@ yy586: TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } -#line 10337 "parse_date.g.c" +#line 10305 "parse_date.g.c" yy587: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); @@ -10584,25 +10552,9 @@ yy617: goto yy560; yy618: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'D') goto yy565; - goto yy53; - } - } else { - if (yych <= 'c') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 'd') goto yy568; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'D') goto yy565; + if (yych == 'd') goto yy568; + goto yy560; yy619: yych = *++YYCURSOR; if (yych == 'M') goto yy563; @@ -10625,7 +10577,7 @@ yy622: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 10629 "parse_date.g.c" +#line 10581 "parse_date.g.c" yy623: yych = *++YYCURSOR; if (yych == 'R') goto yy746; @@ -10719,7 +10671,7 @@ yy638: TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } -#line 10723 "parse_date.g.c" +#line 10675 "parse_date.g.c" yy639: yych = *++YYCURSOR; if (yych <= '/') goto yy197; @@ -10922,7 +10874,7 @@ yy663: TIMELIB_DEINIT; return TIMELIB_ISO_NOCOLON; } -#line 10926 "parse_date.g.c" +#line 10878 "parse_date.g.c" yy664: yyaccept = 18; yych = *(YYMARKER = ++YYCURSOR); @@ -11412,25 +11364,9 @@ yy712: goto yy53; yy713: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'Y') goto yy125; - goto yy53; - } - } else { - if (yych <= 'x') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 'y') goto yy561; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'Y') goto yy125; + if (yych == 'y') goto yy561; + goto yy560; yy714: yych = *++YYCURSOR; if (yych == 'Y') goto yy802; @@ -11592,25 +11528,9 @@ yy742: goto yy53; yy743: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'R') goto yy125; - goto yy53; - } - } else { - if (yych <= 'q') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 'r') goto yy561; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'R') goto yy125; + if (yych == 'r') goto yy561; + goto yy560; yy744: yych = *++YYCURSOR; if (yych == 'U') goto yy829; @@ -11831,7 +11751,7 @@ yy775: TIMELIB_DEINIT; return TIMELIB_PG_YEARDAY; } -#line 11835 "parse_date.g.c" +#line 11755 "parse_date.g.c" yy776: yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); @@ -12036,7 +11956,7 @@ yy791: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 12040 "parse_date.g.c" +#line 11960 "parse_date.g.c" yy792: yych = *++YYCURSOR; if (yych == 'G') goto yy871; @@ -12119,7 +12039,7 @@ yy803: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 12123 "parse_date.g.c" +#line 12043 "parse_date.g.c" yy804: yych = *++YYCURSOR; if (yych == 'T') goto yy880; @@ -12449,25 +12369,9 @@ yy829: goto yy53; yy830: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'S') goto yy565; - goto yy53; - } - } else { - if (yych <= 'r') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 's') goto yy568; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'S') goto yy565; + if (yych == 's') goto yy568; + goto yy560; yy831: yych = *++YYCURSOR; if (yych == 'W') goto yy899; @@ -12715,7 +12619,7 @@ yy855: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 12719 "parse_date.g.c" +#line 12623 "parse_date.g.c" yy856: yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); @@ -12809,7 +12713,7 @@ yy860: TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } -#line 12813 "parse_date.g.c" +#line 12717 "parse_date.g.c" yy861: yych = *++YYCURSOR; if (yych <= '/') goto yy53; @@ -12871,7 +12775,7 @@ yy869: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 12875 "parse_date.g.c" +#line 12779 "parse_date.g.c" yy871: yych = *++YYCURSOR; if (yych == 'H') goto yy926; @@ -12909,7 +12813,7 @@ yy876: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 12913 "parse_date.g.c" +#line 12817 "parse_date.g.c" yy877: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); @@ -13110,7 +13014,7 @@ yy900: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 13114 "parse_date.g.c" +#line 13018 "parse_date.g.c" yy901: yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); @@ -13387,7 +13291,7 @@ yy927: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 13391 "parse_date.g.c" +#line 13295 "parse_date.g.c" yy929: yych = *++YYCURSOR; if (yych <= '/') goto yy876; @@ -13515,7 +13419,7 @@ yy947: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 13519 "parse_date.g.c" +#line 13423 "parse_date.g.c" yy948: yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); @@ -14022,7 +13926,7 @@ yy1020: TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } -#line 14026 "parse_date.g.c" +#line 13930 "parse_date.g.c" yy1021: yych = *++YYCURSOR; if (yych != '0') goto yy1020; @@ -14156,7 +14060,7 @@ yy1043: TIMELIB_DEINIT; return TIMELIB_CLF; } -#line 14160 "parse_date.g.c" +#line 14064 "parse_date.g.c" yy1044: yych = *++YYCURSOR; if (yych <= '5') { diff --git a/re2c/test/parse_date.s.c b/re2c/test/parse_date.s.c index b0570d85..03bf2616 100644 --- a/re2c/test/parse_date.s.c +++ b/re2c/test/parse_date.s.c @@ -10053,25 +10053,9 @@ yy561: } yy562: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'T') goto yy125; - goto yy53; - } - } else { - if (yych <= 's') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 't') goto yy561; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'T') goto yy125; + if (yych == 't') goto yy561; + goto yy560; yy563: yych = *++YYCURSOR; if (yych == 'B') goto yy609; @@ -10181,25 +10165,9 @@ yy573: goto yy560; yy574: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'H') goto yy565; - goto yy53; - } - } else { - if (yych <= 'g') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 'h') goto yy568; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'H') goto yy565; + if (yych == 'h') goto yy568; + goto yy560; yy575: yych = *++YYCURSOR; if (yych == 'Y') goto yy704; @@ -10288,7 +10256,7 @@ yy583: TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } -#line 10292 "parse_date.s.c" +#line 10260 "parse_date.s.c" yy584: yych = *++YYCURSOR; if (yych <= '/') goto yy583; @@ -10331,7 +10299,7 @@ yy586: TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } -#line 10335 "parse_date.s.c" +#line 10303 "parse_date.s.c" yy587: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); @@ -10582,25 +10550,9 @@ yy617: goto yy560; yy618: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'D') goto yy565; - goto yy53; - } - } else { - if (yych <= 'c') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 'd') goto yy568; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'D') goto yy565; + if (yych == 'd') goto yy568; + goto yy560; yy619: yych = *++YYCURSOR; if (yych == 'M') goto yy563; @@ -10623,7 +10575,7 @@ yy622: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 10627 "parse_date.s.c" +#line 10579 "parse_date.s.c" yy623: yych = *++YYCURSOR; if (yych == 'R') goto yy746; @@ -10717,7 +10669,7 @@ yy638: TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } -#line 10721 "parse_date.s.c" +#line 10673 "parse_date.s.c" yy639: yych = *++YYCURSOR; if (yych <= '/') goto yy197; @@ -10913,7 +10865,7 @@ yy663: TIMELIB_DEINIT; return TIMELIB_ISO_NOCOLON; } -#line 10917 "parse_date.s.c" +#line 10869 "parse_date.s.c" yy664: yyaccept = 18; yych = *(YYMARKER = ++YYCURSOR); @@ -11375,25 +11327,9 @@ yy712: goto yy53; yy713: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'Y') goto yy125; - goto yy53; - } - } else { - if (yych <= 'x') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 'y') goto yy561; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'Y') goto yy125; + if (yych == 'y') goto yy561; + goto yy560; yy714: yych = *++YYCURSOR; if (yych == 'Y') goto yy802; @@ -11555,25 +11491,9 @@ yy742: goto yy53; yy743: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'R') goto yy125; - goto yy53; - } - } else { - if (yych <= 'q') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 'r') goto yy561; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'R') goto yy125; + if (yych == 'r') goto yy561; + goto yy560; yy744: yych = *++YYCURSOR; if (yych == 'U') goto yy829; @@ -11787,7 +11707,7 @@ yy775: TIMELIB_DEINIT; return TIMELIB_PG_YEARDAY; } -#line 11791 "parse_date.s.c" +#line 11711 "parse_date.s.c" yy776: yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); @@ -11971,7 +11891,7 @@ yy791: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 11975 "parse_date.s.c" +#line 11895 "parse_date.s.c" yy792: yych = *++YYCURSOR; if (yych == 'G') goto yy871; @@ -12054,7 +11974,7 @@ yy803: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 12058 "parse_date.s.c" +#line 11978 "parse_date.s.c" yy804: yych = *++YYCURSOR; if (yych == 'T') goto yy880; @@ -12384,25 +12304,9 @@ yy829: goto yy53; yy830: yych = *++YYCURSOR; - if (yych <= '^') { - if (yych <= '/') { - if (yych <= '.') goto yy53; - goto yy259; - } else { - if (yych == 'S') goto yy565; - goto yy53; - } - } else { - if (yych <= 'r') { - if (yych <= '_') goto yy259; - if (yych <= '`') goto yy53; - goto yy559; - } else { - if (yych <= 's') goto yy568; - if (yych <= 'z') goto yy559; - goto yy53; - } - } + if (yych == 'S') goto yy565; + if (yych == 's') goto yy568; + goto yy560; yy831: yych = *++YYCURSOR; if (yych == 'W') goto yy899; @@ -12650,7 +12554,7 @@ yy855: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 12654 "parse_date.s.c" +#line 12558 "parse_date.s.c" yy856: yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); @@ -12737,7 +12641,7 @@ yy860: TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } -#line 12741 "parse_date.s.c" +#line 12645 "parse_date.s.c" yy861: yych = *++YYCURSOR; if (yych <= '/') goto yy53; @@ -12799,7 +12703,7 @@ yy869: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 12803 "parse_date.s.c" +#line 12707 "parse_date.s.c" yy871: yych = *++YYCURSOR; if (yych == 'H') goto yy926; @@ -12837,7 +12741,7 @@ yy876: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 12841 "parse_date.s.c" +#line 12745 "parse_date.s.c" yy877: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); @@ -13023,7 +12927,7 @@ yy900: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 13027 "parse_date.s.c" +#line 12931 "parse_date.s.c" yy901: yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); @@ -13300,7 +13204,7 @@ yy927: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 13304 "parse_date.s.c" +#line 13208 "parse_date.s.c" yy929: yych = *++YYCURSOR; if (yych <= '/') goto yy876; @@ -13428,7 +13332,7 @@ yy947: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 13432 "parse_date.s.c" +#line 13336 "parse_date.s.c" yy948: yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); @@ -13935,7 +13839,7 @@ yy1020: TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } -#line 13939 "parse_date.s.c" +#line 13843 "parse_date.s.c" yy1021: yych = *++YYCURSOR; if (yych != '0') goto yy1020; @@ -14069,7 +13973,7 @@ yy1043: TIMELIB_DEINIT; return TIMELIB_CLF; } -#line 14073 "parse_date.s.c" +#line 13977 "parse_date.s.c" yy1044: yych = *++YYCURSOR; if (yych <= '5') { diff --git a/re2c/test/parse_date_1_78.db.c b/re2c/test/parse_date_1_78.db.c index eb1aa67a..60e16157 100644 --- a/re2c/test/parse_date_1_78.db.c +++ b/re2c/test/parse_date_1_78.db.c @@ -17342,25 +17342,9 @@ yy949: yy950: YYDEBUG(950, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '.') { - if (yych <= '\t') { - if (yych <= 0x08) goto yy54; - goto yy786; - } else { - if (yych == ' ') goto yy786; - goto yy54; - } - } else { - if (yych <= '_') { - if (yych <= '/') goto yy272; - if (yych <= '^') goto yy54; - goto yy272; - } else { - if (yych <= '`') goto yy54; - if (yych <= 'z') goto yy901; - goto yy54; - } - } + if (yych == '\t') goto yy786; + if (yych == ' ') goto yy786; + goto yy902; yy951: YYDEBUG(951, *YYCURSOR); yych = *++YYCURSOR; @@ -17467,7 +17451,7 @@ yy963: TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } -#line 17471 "parse_date_1_78.db.c" +#line 17455 "parse_date_1_78.db.c" yy965: YYDEBUG(965, *YYCURSOR); yych = *++YYCURSOR; @@ -17508,7 +17492,7 @@ yy968: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 17512 "parse_date_1_78.db.c" +#line 17496 "parse_date_1_78.db.c" yy969: YYDEBUG(969, *YYCURSOR); yyaccept = 15; @@ -17739,7 +17723,7 @@ yy986: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 17743 "parse_date_1_78.db.c" +#line 17727 "parse_date_1_78.db.c" yy987: YYDEBUG(987, *YYCURSOR); yyaccept = 26; @@ -17849,7 +17833,7 @@ yy991: TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } -#line 17853 "parse_date_1_78.db.c" +#line 17837 "parse_date_1_78.db.c" yy992: YYDEBUG(992, *YYCURSOR); yych = *++YYCURSOR; @@ -17925,7 +17909,7 @@ yy1001: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 17929 "parse_date_1_78.db.c" +#line 17913 "parse_date_1_78.db.c" yy1003: YYDEBUG(1003, *YYCURSOR); yych = *++YYCURSOR; @@ -17988,7 +17972,7 @@ yy1010: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 17992 "parse_date_1_78.db.c" +#line 17976 "parse_date_1_78.db.c" yy1011: YYDEBUG(1011, *YYCURSOR); yych = *++YYCURSOR; @@ -18197,7 +18181,7 @@ yy1020: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 18201 "parse_date_1_78.db.c" +#line 18185 "parse_date_1_78.db.c" yy1021: YYDEBUG(1021, *YYCURSOR); yych = *++YYCURSOR; @@ -18330,7 +18314,7 @@ yy1033: TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } -#line 18334 "parse_date_1_78.db.c" +#line 18318 "parse_date_1_78.db.c" yy1034: YYDEBUG(1034, *YYCURSOR); yych = *++YYCURSOR; @@ -18357,25 +18341,9 @@ yy1036: yy1037: YYDEBUG(1037, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '.') { - if (yych <= '\t') { - if (yych <= 0x08) goto yy54; - goto yy663; - } else { - if (yych == ' ') goto yy663; - goto yy54; - } - } else { - if (yych <= '_') { - if (yych <= '/') goto yy272; - if (yych <= '^') goto yy54; - goto yy272; - } else { - if (yych <= '`') goto yy54; - if (yych <= 'z') goto yy901; - goto yy54; - } - } + if (yych == '\t') goto yy663; + if (yych == ' ') goto yy663; + goto yy902; yy1038: YYDEBUG(1038, *YYCURSOR); ++YYCURSOR; @@ -18392,7 +18360,7 @@ yy1039: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 18396 "parse_date_1_78.db.c" +#line 18364 "parse_date_1_78.db.c" yy1040: YYDEBUG(1040, *YYCURSOR); yyaccept = 30; @@ -18700,7 +18668,7 @@ yy1068: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 18704 "parse_date_1_78.db.c" +#line 18672 "parse_date_1_78.db.c" yy1070: YYDEBUG(1070, *YYCURSOR); yych = *++YYCURSOR; @@ -18925,7 +18893,7 @@ yy1083: TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } -#line 18929 "parse_date_1_78.db.c" +#line 18897 "parse_date_1_78.db.c" yy1085: YYDEBUG(1085, *YYCURSOR); yych = *++YYCURSOR; @@ -19043,7 +19011,7 @@ yy1097: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 19047 "parse_date_1_78.db.c" +#line 19015 "parse_date_1_78.db.c" yy1098: YYDEBUG(1098, *YYCURSOR); yych = *++YYCURSOR; @@ -19066,7 +19034,7 @@ yy1100: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 19070 "parse_date_1_78.db.c" +#line 19038 "parse_date_1_78.db.c" yy1101: YYDEBUG(1101, *YYCURSOR); yyaccept = 32; @@ -19685,7 +19653,7 @@ yy1168: TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } -#line 19689 "parse_date_1_78.db.c" +#line 19657 "parse_date_1_78.db.c" yy1170: YYDEBUG(1170, *YYCURSOR); yych = *++YYCURSOR; @@ -19888,7 +19856,7 @@ yy1190: TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } -#line 19892 "parse_date_1_78.db.c" +#line 19860 "parse_date_1_78.db.c" yy1191: YYDEBUG(1191, *YYCURSOR); yych = *++YYCURSOR; @@ -20104,7 +20072,7 @@ yy1218: TIMELIB_DEINIT; return TIMELIB_CLF; } -#line 20108 "parse_date_1_78.db.c" +#line 20076 "parse_date_1_78.db.c" yy1219: YYDEBUG(1219, *YYCURSOR); yych = *++YYCURSOR; diff --git a/re2c/test/php20140822_zend_language_scanner.igcd--flex-syntax.c b/re2c/test/php20140822_zend_language_scanner.igcd--flex-syntax.c index 76f2a3aa..00411238 100644 --- a/re2c/test/php20140822_zend_language_scanner.igcd--flex-syntax.c +++ b/re2c/test/php20140822_zend_language_scanner.igcd--flex-syntax.c @@ -2638,43 +2638,9 @@ yy147: YYDEBUG(147, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - { - static void *yytarget[256] = { - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy228, &&yy148, - &&yy149, &&yy149, &&yy149, &&yy149, &&yy149, &&yy149, &&yy149, &&yy149, - &&yy149, &&yy149, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy237, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy238, &&yy148, &&yy148, &&yy237, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy239, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148 - }; - goto *yytarget[yych]; - } + if (yych == 'b') goto yy238; + if (yych == 'x') goto yy239; + goto yy150; yy148: YYDEBUG(148, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); @@ -2704,6 +2670,7 @@ yy149: YYMARKER = ++YYCURSOR; YYFILL(3); yych = *YYCURSOR; +yy150: YYDEBUG(150, *YYCURSOR); if (yybm[0+yych] & 8) { goto yy149; diff --git a/re2c/test/php20140822_zend_language_scanner_crlf.igcd--flex-syntax.c b/re2c/test/php20140822_zend_language_scanner_crlf.igcd--flex-syntax.c index 186812ec..64adabdf 100644 --- a/re2c/test/php20140822_zend_language_scanner_crlf.igcd--flex-syntax.c +++ b/re2c/test/php20140822_zend_language_scanner_crlf.igcd--flex-syntax.c @@ -2638,43 +2638,9 @@ yy147: YYDEBUG(147, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - { - static void *yytarget[256] = { - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy228, &&yy148, - &&yy149, &&yy149, &&yy149, &&yy149, &&yy149, &&yy149, &&yy149, &&yy149, - &&yy149, &&yy149, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy237, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy238, &&yy148, &&yy148, &&yy237, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy239, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, - &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148, &&yy148 - }; - goto *yytarget[yych]; - } + if (yych == 'b') goto yy238; + if (yych == 'x') goto yy239; + goto yy150; yy148: YYDEBUG(148, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); @@ -2704,6 +2670,7 @@ yy149: YYMARKER = ++YYCURSOR; YYFILL(3); yych = *YYCURSOR; +yy150: YYDEBUG(150, *YYCURSOR); if (yybm[0+yych] & 8) { goto yy149; diff --git a/re2c/test/php20150211_parse_date.ig.c b/re2c/test/php20150211_parse_date.ig.c index 93b9fb35..bde1fded 100644 --- a/re2c/test/php20150211_parse_date.ig.c +++ b/re2c/test/php20150211_parse_date.ig.c @@ -22675,43 +22675,9 @@ yy974: goto yy925; yy975: yych = *++YYCURSOR; - { - static void *yytarget[256] = { - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy810, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy810, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy276, &&yy56, &&yy276, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy276, - &&yy56, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, - &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, - &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, - &&yy924, &&yy924, &&yy924, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56 - }; - goto *yytarget[yych]; - } + if (yych == '\t') goto yy810; + if (yych == ' ') goto yy810; + goto yy925; yy976: yych = *++YYCURSOR; goto yy755; @@ -24031,43 +23997,9 @@ yy1061: goto yy56; yy1062: yych = *++YYCURSOR; - { - static void *yytarget[256] = { - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy685, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy685, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy276, &&yy56, &&yy276, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy276, - &&yy56, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, - &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, - &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, - &&yy924, &&yy924, &&yy924, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56 - }; - goto *yytarget[yych]; - } + if (yych == '\t') goto yy685; + if (yych == ' ') goto yy685; + goto yy925; yy1063: ++YYCURSOR; yy1064: diff --git a/re2c/test/php20150211_parse_date_crlf.ig.c b/re2c/test/php20150211_parse_date_crlf.ig.c index fc229a50..2c7c7634 100644 --- a/re2c/test/php20150211_parse_date_crlf.ig.c +++ b/re2c/test/php20150211_parse_date_crlf.ig.c @@ -22675,43 +22675,9 @@ yy974: goto yy925; yy975: yych = *++YYCURSOR; - { - static void *yytarget[256] = { - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy810, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy810, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy276, &&yy56, &&yy276, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy276, - &&yy56, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, - &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, - &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, - &&yy924, &&yy924, &&yy924, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56 - }; - goto *yytarget[yych]; - } + if (yych == '\t') goto yy810; + if (yych == ' ') goto yy810; + goto yy925; yy976: yych = *++YYCURSOR; goto yy755; @@ -24031,43 +23997,9 @@ yy1061: goto yy56; yy1062: yych = *++YYCURSOR; - { - static void *yytarget[256] = { - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy685, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy685, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy276, &&yy56, &&yy276, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy276, - &&yy56, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, - &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, - &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, &&yy924, - &&yy924, &&yy924, &&yy924, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, - &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56, &&yy56 - }; - goto *yytarget[yych]; - } + if (yych == '\t') goto yy685; + if (yych == ' ') goto yy685; + goto yy925; yy1063: ++YYCURSOR; yy1064: diff --git a/re2c/test/php20150211_zend_language_scanner.c--emit-dot--flex-syntax--case-inverted.c b/re2c/test/php20150211_zend_language_scanner.c--emit-dot--flex-syntax--case-inverted.c index 7e6a0bc7..79498f02 100644 --- a/re2c/test/php20150211_zend_language_scanner.c--emit-dot--flex-syntax--case-inverted.c +++ b/re2c/test/php20150211_zend_language_scanner.c--emit-dot--flex-syntax--case-inverted.c @@ -230,11 +230,8 @@ ST_IN_SCRIPTING -> 86 109 -> 196 [label="[*]"] 109 -> 96 [label="[/]"] 109 -> 198 [label="[=]"] -110 -> 111 [label="[0x00--][/][:-A][C-D][F-W][Y-a][c-d][f-w][y-0xFF]"] -110 -> 191 [label="[.]"] -110 -> 112 [label="[0-9]"] +110 -> 113 [label="[0x00-A][C-W][Y-a][c-w][y-0xFF]"] 110 -> 200 [label="[B][b]"] -110 -> 201 [label="[E][e]"] 110 -> 202 [label="[X][x]"] 111 [label="php20150211_zend_language_scanner.c--emit-dot--flex-syntax--case-inverted.re:1614"] 112 -> 113 diff --git a/re2c/test/php20150211_zend_language_scanner.igcd--flex-syntax--case-inverted.c b/re2c/test/php20150211_zend_language_scanner.igcd--flex-syntax--case-inverted.c index 36eba869..6519dd39 100644 --- a/re2c/test/php20150211_zend_language_scanner.igcd--flex-syntax--case-inverted.c +++ b/re2c/test/php20150211_zend_language_scanner.igcd--flex-syntax--case-inverted.c @@ -2344,38 +2344,38 @@ yy110: yych = *(YYMARKER = ++YYCURSOR); { static void *yytarget[256] = { - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy191, &&yy111, - &&yy112, &&yy112, &&yy112, &&yy112, &&yy112, &&yy112, &&yy112, &&yy112, - &&yy112, &&yy112, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy200, &&yy111, &&yy111, &&yy201, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy202, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy200, &&yy111, &&yy111, &&yy201, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy202, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, - &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111, &&yy111 + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy200, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy202, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy200, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy202, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, + &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113, &&yy113 }; goto *yytarget[yych]; } @@ -2426,6 +2426,7 @@ yy112: YYMARKER = ++YYCURSOR; YYFILL(3); yych = *YYCURSOR; +yy113: YYDEBUG(113, *YYCURSOR); if (yybm[0+yych] & 8) { goto yy112; diff --git a/re2c/test/php20150211_zend_language_scanner.igcd--skeleton--flex-syntax--case-inverted.c b/re2c/test/php20150211_zend_language_scanner.igcd--skeleton--flex-syntax--case-inverted.c index 674ac1d3..0c0a899e 100644 --- a/re2c/test/php20150211_zend_language_scanner.igcd--skeleton--flex-syntax--case-inverted.c +++ b/re2c/test/php20150211_zend_language_scanner.igcd--skeleton--flex-syntax--case-inverted.c @@ -1572,38 +1572,38 @@ yy115: yych = YYPEEK (); { static void *yytarget[256] = { - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy196, &&yy116, - &&yy117, &&yy117, &&yy117, &&yy117, &&yy117, &&yy117, &&yy117, &&yy117, - &&yy117, &&yy117, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy205, &&yy116, &&yy116, &&yy206, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy207, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy205, &&yy116, &&yy116, &&yy206, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy207, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, - &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116, &&yy116 + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy205, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy207, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy205, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy207, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, + &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118, &&yy118 }; goto *yytarget[yych]; } @@ -1617,6 +1617,7 @@ yy117: YYBACKUP (); if (YYLESSTHAN (3)) YYFILL(3); yych = YYPEEK (); +yy118: if (yybm[0+yych] & 8) { goto yy117; } diff --git a/re2c/test/tags/cond_star1.ci--input(custom).c b/re2c/test/tags/cond_star1.ci--input(custom).c index 5643eb0e..48f7c9fa 100644 --- a/re2c/test/tags/cond_star1.ci--input(custom).c +++ b/re2c/test/tags/cond_star1.ci--input(custom).c @@ -73,8 +73,7 @@ yy17: YYBACKUPCTX (); switch ((yych = YYPEEK ())) { case 'b': goto yy19; - case 'c': goto yy22; - default: goto yy18; + default: goto yy23; } yy18: YYRESTORECTX (); @@ -94,6 +93,7 @@ yy22: YYSKIP (); if (YYLESSTHAN (1)) YYFILL(1); yych = YYPEEK (); +yy23: switch (yych) { case 'c': goto yy22; default: goto yy18; diff --git a/re2c/test/tags/cond_star1.ci.c b/re2c/test/tags/cond_star1.ci.c index adc00d3b..78af9b95 100644 --- a/re2c/test/tags/cond_star1.ci.c +++ b/re2c/test/tags/cond_star1.ci.c @@ -73,8 +73,7 @@ yy17: YYCTXMARKER = YYCURSOR; switch ((yych = *YYCURSOR)) { case 'b': goto yy19; - case 'c': goto yy22; - default: goto yy18; + default: goto yy23; } yy18: YYCURSOR = YYCTXMARKER; @@ -94,6 +93,7 @@ yy22: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = *YYCURSOR; +yy23: switch (yych) { case 'c': goto yy22; default: goto yy18; -- 2.40.0