From: Ulya Trofimovich Date: Thu, 10 Aug 2017 12:25:07 +0000 (+0100) Subject: Leave the definition of 'yynmatch' and 'yypmatch' to the user. X-Git-Tag: 1.0~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ecf949ec419b12d59f25acab0dfb361d83d9cd59;p=re2c Leave the definition of 'yynmatch' and 'yypmatch' to the user. With '--posix-captures' RE2C stores submatch results in 'yynmatch' (the total number of capturing groups for the matching rule) and 'yypmatch' (an array of submatch values for each group). These variables should be user-defined, so that users can override default implementation (e.g. make 'yypmatch' an array of integer offsets rather than an array of pointers). Overriding is only possible with generic API: if default API is used, then RE2C can autogenerate 'yynmatch' and 'yypmatch' (and so it did prior to this commit). However, it is better to have the same behavior with both APIs; also, it is coherent with '--tags' option (RE2C leaves tag definition to the user). --- diff --git a/re2c/bootstrap/src/ast/lex.cc b/re2c/bootstrap/src/ast/lex.cc index e5d21cc3..9c8be065 100644 --- a/re2c/bootstrap/src/ast/lex.cc +++ b/re2c/bootstrap/src/ast/lex.cc @@ -1,4 +1,4 @@ -/* Generated by re2c 0.16 on Sun Jul 30 18:04:13 2017 */ +/* Generated by re2c 0.16 on Thu Aug 10 12:29:00 2017 */ #line 1 "../src/ast/lex.re" #include "src/util/c99_stdint.h" #include @@ -90,7 +90,7 @@ echo: 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, }; - if ((YYLIMIT - YYCURSOR) < 16) YYFILL(16); + if ((YYLIMIT - YYCURSOR) < 17) YYFILL(17); yych = (YYCTYPE)*YYCURSOR; if (yych <= '\r') { if (yych <= '\t') { @@ -110,7 +110,7 @@ echo: } } ++YYCURSOR; -#line 128 "../src/ast/lex.re" +#line 135 "../src/ast/lex.re" { if (cur != eof) goto echo; out.wraw(tok, ptr); @@ -120,7 +120,7 @@ echo: yy4: ++YYCURSOR; yy5: -#line 145 "../src/ast/lex.re" +#line 152 "../src/ast/lex.re" { goto echo; } #line 126 "src/ast/lex.cc" yy6: @@ -131,7 +131,7 @@ yy6: } if (yych == '#') goto yy14; yy7: -#line 139 "../src/ast/lex.re" +#line 146 "../src/ast/lex.re" { cline++; pos = cur; @@ -296,10 +296,11 @@ yy41: yy42: yych = (YYCTYPE)*++YYCURSOR; if (yych == ':') goto yy53; + if (yych == 'n') goto yy54; goto yy13; yy43: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'g') goto yy54; + if (yych == 'g') goto yy55; goto yy13; yy44: yych = (YYCTYPE)*++YYCURSOR; @@ -307,19 +308,19 @@ yy44: goto yy13; yy45: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy55; + if (yych == 'e') goto yy56; goto yy13; yy46: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'g') goto yy56; + if (yych == 'g') goto yy57; goto yy13; yy47: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy57; + if (yych == 'e') goto yy58; goto yy13; yy48: yych = (YYCTYPE)*++YYCURSOR; - if (yych == ':') goto yy58; + if (yych == ':') goto yy59; goto yy13; yy49: ++YYCURSOR; @@ -334,210 +335,226 @@ yy50: if (yych <= '0') goto yy13; if (yych <= '9') { YYCTXMARKER = YYCURSOR; - goto yy59; + goto yy60; } goto yy13; } yy51: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 't') goto yy61; + if (yych == 't') goto yy62; goto yy13; yy52: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'r') goto yy62; + if (yych == 'r') goto yy63; goto yy13; yy53: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'r') goto yy63; + if (yych == 'r') goto yy64; goto yy13; yy54: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 's') goto yy64; + if (yych == 'm') goto yy65; goto yy13; yy55: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 's') goto yy65; + if (yych == 's') goto yy66; goto yy13; yy56: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 's') goto yy66; + if (yych == 's') goto yy67; goto yy13; yy57: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 's') goto yy67; + if (yych == 's') goto yy68; goto yy13; yy58: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'r') goto yy68; + if (yych == 's') goto yy69; goto yy13; yy59: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == 'r') goto yy70; + goto yy13; +yy60: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 64) { - goto yy59; + goto yy60; } if (yych <= '\f') { if (yych <= 0x08) goto yy13; - if (yych <= '\t') goto yy69; - if (yych <= '\n') goto yy71; + if (yych <= '\t') goto yy71; + if (yych <= '\n') goto yy73; goto yy13; } else { - if (yych <= '\r') goto yy73; - if (yych == ' ') goto yy69; + if (yych <= '\r') goto yy75; + if (yych == ' ') goto yy71; goto yy13; } -yy61: - yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'a') goto yy74; - goto yy13; yy62: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy75; + if (yych == 'a') goto yy76; goto yy13; yy63: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy76; + if (yych == 'e') goto yy77; goto yy13; yy64: yych = (YYCTYPE)*++YYCURSOR; - if (yych == ':') goto yy77; + if (yych == 'e') goto yy78; goto yy13; yy65: yych = (YYCTYPE)*++YYCURSOR; - if (yych == ':') goto yy78; + if (yych == 'a') goto yy79; goto yy13; yy66: yych = (YYCTYPE)*++YYCURSOR; - if (yych == ':') goto yy79; + if (yych == ':') goto yy80; goto yy13; yy67: yych = (YYCTYPE)*++YYCURSOR; - if (yych == ':') goto yy80; + if (yych == ':') goto yy81; goto yy13; yy68: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy81; + if (yych == ':') goto yy82; goto yy13; yy69: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == ':') goto yy83; + goto yy13; +yy70: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == 'e') goto yy84; + goto yy13; +yy71: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yych <= 0x1F) { - if (yych == '\t') goto yy69; + if (yych == '\t') goto yy71; goto yy13; } else { - if (yych <= ' ') goto yy69; - if (yych == '"') goto yy82; + if (yych <= ' ') goto yy71; + if (yych == '"') goto yy85; goto yy13; } -yy71: +yy73: ++YYCURSOR; YYCURSOR = YYCTXMARKER; -#line 134 "../src/ast/lex.re" +#line 141 "../src/ast/lex.re" { set_sourceline(); goto echo; } -#line 443 "src/ast/lex.cc" -yy73: - yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy71; - goto yy13; -yy74: - yych = (YYCTYPE)*++YYCURSOR; - if (yych == 't') goto yy84; - goto yy13; +#line 452 "src/ast/lex.cc" yy75: yych = (YYCTYPE)*++YYCURSOR; - if (yych == ':') goto yy85; + if (yych == '\n') goto yy73; goto yy13; yy76: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '2') goto yy86; + if (yych == 't') goto yy87; goto yy13; yy77: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'r') goto yy87; + if (yych == ':') goto yy88; goto yy13; yy78: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'r') goto yy88; + if (yych == '2') goto yy89; goto yy13; yy79: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'r') goto yy89; + if (yych == 't') goto yy90; goto yy13; yy80: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'r') goto yy90; + if (yych == 'r') goto yy91; goto yy13; yy81: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '2') goto yy91; + if (yych == 'r') goto yy92; goto yy13; yy82: - ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); - yych = (YYCTYPE)*YYCURSOR; - if (yybm[0+yych] & 128) { - goto yy82; - } - if (yych <= '\n') goto yy13; - if (yych <= '"') goto yy92; - goto yy93; -yy84: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy94; + if (yych == 'r') goto yy93; goto yy13; -yy85: +yy83: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'r') goto yy95; + if (yych == 'r') goto yy94; goto yy13; -yy86: +yy84: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'c') goto yy96; + if (yych == '2') goto yy95; goto yy13; +yy85: + ++YYCURSOR; + if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); + yych = (YYCTYPE)*YYCURSOR; + if (yybm[0+yych] & 128) { + goto yy85; + } + if (yych <= '\n') goto yy13; + if (yych <= '"') goto yy96; + goto yy97; yy87: yych = (YYCTYPE)*++YYCURSOR; if (yych == 'e') goto yy98; goto yy13; yy88: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy99; + if (yych == 'r') goto yy99; goto yy13; yy89: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy100; + if (yych == 'c') goto yy100; goto yy13; yy90: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy101; + if (yych == 'c') goto yy102; goto yy13; yy91: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'c') goto yy102; + if (yych == 'e') goto yy103; goto yy13; yy92: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy71; - if (yych == '\r') goto yy73; + if (yych == 'e') goto yy104; goto yy13; yy93: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == 'e') goto yy105; + goto yy13; +yy94: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == 'e') goto yy106; + goto yy13; +yy95: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == 'c') goto yy107; + goto yy13; +yy96: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == '\n') goto yy73; + if (yych == '\r') goto yy75; + goto yy13; +yy97: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yych == '\n') goto yy13; - goto yy82; -yy94: + goto yy85; +yy98: yych = (YYCTYPE)*++YYCURSOR; - if (yych == ':') goto yy104; + if (yych == ':') goto yy109; goto yy13; -yy95: +yy99: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy105; + if (yych == 'e') goto yy110; goto yy13; -yy96: +yy100: ++YYCURSOR; #line 93 "../src/ast/lex.re" { @@ -546,92 +563,104 @@ yy96: lex_end_of_comment(out); goto echo; } -#line 550 "src/ast/lex.cc" -yy98: +#line 567 "src/ast/lex.cc" +yy102: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '2') goto yy106; + if (yych == 'h') goto yy111; goto yy13; -yy99: +yy103: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '2') goto yy107; + if (yych == '2') goto yy112; goto yy13; -yy100: +yy104: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == '2') goto yy113; + goto yy13; +yy105: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '2') goto yy108; + if (yych == '2') goto yy114; goto yy13; -yy101: +yy106: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '2') goto yy109; + if (yych == '2') goto yy115; goto yy13; -yy102: +yy107: ++YYCURSOR; #line 82 "../src/ast/lex.re" { out.wraw(tok, ptr); return Reuse; } -#line 574 "src/ast/lex.cc" -yy104: +#line 595 "src/ast/lex.cc" +yy109: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'r') goto yy110; + if (yych == 'r') goto yy116; goto yy13; -yy105: +yy110: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '2') goto yy111; + if (yych == '2') goto yy117; goto yy13; -yy106: +yy111: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'c') goto yy112; + if (yych == ':') goto yy118; goto yy13; -yy107: +yy112: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'c') goto yy114; + if (yych == 'c') goto yy119; goto yy13; -yy108: +yy113: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'c') goto yy116; + if (yych == 'c') goto yy121; goto yy13; -yy109: +yy114: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'c') goto yy118; + if (yych == 'c') goto yy123; goto yy13; -yy110: +yy115: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy120; + if (yych == 'c') goto yy125; goto yy13; -yy111: +yy116: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'c') goto yy121; + if (yych == 'e') goto yy127; goto yy13; -yy112: +yy117: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == 'c') goto yy128; + goto yy13; +yy118: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == 'r') goto yy130; + goto yy13; +yy119: ++YYCURSOR; -#line 122 "../src/ast/lex.re" +#line 129 "../src/ast/lex.re" { out.wraw(tok, ptr); lex_tags(out, true); goto echo; } -#line 615 "src/ast/lex.cc" -yy114: +#line 644 "src/ast/lex.cc" +yy121: ++YYCURSOR; #line 77 "../src/ast/lex.re" { out.wraw(tok, ptr); return Rules; } -#line 623 "src/ast/lex.cc" -yy116: +#line 652 "src/ast/lex.cc" +yy123: ++YYCURSOR; -#line 116 "../src/ast/lex.re" +#line 123 "../src/ast/lex.re" { out.wraw(tok, ptr); lex_tags(out, false); goto echo; } -#line 632 "src/ast/lex.cc" -yy118: +#line 661 "src/ast/lex.cc" +yy125: ++YYCURSOR; -#line 107 "../src/ast/lex.re" +#line 114 "../src/ast/lex.re" { out.wraw(tok, ptr); out.wdelay_line_info(); @@ -640,12 +669,12 @@ yy118: lex_end_of_comment(out); goto echo; } -#line 644 "src/ast/lex.cc" -yy120: +#line 673 "src/ast/lex.cc" +yy127: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '2') goto yy123; + if (yych == '2') goto yy131; goto yy13; -yy121: +yy128: ++YYCURSOR; #line 87 "../src/ast/lex.re" { @@ -653,21 +682,43 @@ yy121: lex_end_of_comment(out); goto echo; } -#line 657 "src/ast/lex.cc" -yy123: +#line 686 "src/ast/lex.cc" +yy130: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == 'e') goto yy132; + goto yy13; +yy131: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == 'c') goto yy133; + goto yy13; +yy132: + yych = (YYCTYPE)*++YYCURSOR; + if (yych == '2') goto yy135; + goto yy13; +yy133: + ++YYCURSOR; +#line 107 "../src/ast/lex.re" + { + out.wraw(tok, ptr); + out.wdelay_state_goto(0); + lex_end_of_comment(out); + goto echo; + } +#line 708 "src/ast/lex.cc" +yy135: yych = (YYCTYPE)*++YYCURSOR; if (yych != 'c') goto yy13; ++YYCURSOR; #line 100 "../src/ast/lex.re" { out.wraw(tok, ptr); - out.wdelay_state_goto(0); + out.wdelay_yymaxnmatch(); lex_end_of_comment(out); goto echo; } -#line 669 "src/ast/lex.cc" +#line 720 "src/ast/lex.cc" } -#line 146 "../src/ast/lex.re" +#line 153 "../src/ast/lex.re" } @@ -675,45 +726,45 @@ void Scanner::lex_end_of_comment(OutputFile &out) { uint32_t ignored = 0; for (;;) { -#line 679 "src/ast/lex.cc" +#line 730 "src/ast/lex.cc" { YYCTYPE yych; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = (YYCTYPE)*YYCURSOR; if (yych <= '\f') { - if (yych <= 0x00) goto yy128; - if (yych == '\n') goto yy132; - goto yy130; + if (yych <= 0x00) goto yy140; + if (yych == '\n') goto yy144; + goto yy142; } else { - if (yych <= '\r') goto yy134; - if (yych == '*') goto yy135; - goto yy130; + if (yych <= '\r') goto yy146; + if (yych == '*') goto yy147; + goto yy142; } -yy128: +yy140: ++YYCURSOR; -#line 153 "../src/ast/lex.re" +#line 160 "../src/ast/lex.re" { fatal_lc(get_cline(), get_column(), "expected end of block"); } -#line 697 "src/ast/lex.cc" -yy130: +#line 748 "src/ast/lex.cc" +yy142: ++YYCURSOR; -yy131: -#line 155 "../src/ast/lex.re" +yy143: +#line 162 "../src/ast/lex.re" { continue; } -#line 703 "src/ast/lex.cc" -yy132: +#line 754 "src/ast/lex.cc" +yy144: ++YYCURSOR; -#line 156 "../src/ast/lex.re" +#line 163 "../src/ast/lex.re" { ++ignored; continue; } -#line 708 "src/ast/lex.cc" -yy134: +#line 759 "src/ast/lex.cc" +yy146: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy132; - goto yy131; -yy135: + if (yych == '\n') goto yy144; + goto yy143; +yy147: yych = (YYCTYPE)*++YYCURSOR; - if (yych != '/') goto yy131; + if (yych != '/') goto yy143; ++YYCURSOR; -#line 157 "../src/ast/lex.re" +#line 164 "../src/ast/lex.re" { if (ignored > 0) { cline += ignored; @@ -722,9 +773,9 @@ yy135: tok = pos = cur; return; } -#line 726 "src/ast/lex.cc" +#line 777 "src/ast/lex.cc" } -#line 165 "../src/ast/lex.re" +#line 172 "../src/ast/lex.re" } } @@ -732,7 +783,7 @@ void Scanner::lex_tags(OutputFile &out, bool mtags) { std::string fmt, sep; for (;;) { -#line 736 "src/ast/lex.cc" +#line 787 "src/ast/lex.cc" { YYCTYPE yych; static const unsigned char yybm[] = { @@ -772,119 +823,119 @@ void Scanner::lex_tags(OutputFile &out, bool mtags) if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 128) { - goto yy142; + goto yy154; } if (yych <= ')') { if (yych <= '\n') { - if (yych >= '\t') goto yy145; + if (yych >= '\t') goto yy157; } else { - if (yych == '\r') goto yy147; + if (yych == '\r') goto yy159; } } else { if (yych <= 'f') { - if (yych <= '*') goto yy148; - if (yych >= 'f') goto yy149; + if (yych <= '*') goto yy160; + if (yych >= 'f') goto yy161; } else { - if (yych == 's') goto yy150; + if (yych == 's') goto yy162; } } ++YYCURSOR; -yy141: -#line 172 "../src/ast/lex.re" +yy153: +#line 179 "../src/ast/lex.re" { fatal_lc(get_cline(), get_column(), "unrecognized configuration"); } -#line 796 "src/ast/lex.cc" -yy142: +#line 847 "src/ast/lex.cc" +yy154: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 128) { - goto yy142; + goto yy154; } -#line 177 "../src/ast/lex.re" +#line 184 "../src/ast/lex.re" { continue; } -#line 806 "src/ast/lex.cc" -yy145: +#line 857 "src/ast/lex.cc" +yy157: ++YYCURSOR; -#line 178 "../src/ast/lex.re" +#line 185 "../src/ast/lex.re" { ++cline; continue; } -#line 811 "src/ast/lex.cc" -yy147: +#line 862 "src/ast/lex.cc" +yy159: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy145; - goto yy141; -yy148: + if (yych == '\n') goto yy157; + goto yy153; +yy160: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '/') goto yy151; - goto yy141; -yy149: + if (yych == '/') goto yy163; + goto yy153; +yy161: yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); - if (yych == 'o') goto yy153; - goto yy141; -yy150: + if (yych == 'o') goto yy165; + goto yy153; +yy162: yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); - if (yych == 'e') goto yy155; - goto yy141; -yy151: + if (yych == 'e') goto yy167; + goto yy153; +yy163: ++YYCURSOR; -#line 179 "../src/ast/lex.re" +#line 186 "../src/ast/lex.re" { out.wdelay_tags(new ConfTags(fmt, sep), mtags); tok = pos = cur; return; } -#line 836 "src/ast/lex.cc" -yy153: +#line 887 "src/ast/lex.cc" +yy165: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'r') goto yy156; -yy154: + if (yych == 'r') goto yy168; +yy166: YYCURSOR = YYMARKER; - goto yy141; -yy155: + goto yy153; +yy167: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'p') goto yy157; - goto yy154; -yy156: + if (yych == 'p') goto yy169; + goto yy166; +yy168: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'm') goto yy158; - goto yy154; -yy157: + if (yych == 'm') goto yy170; + goto yy166; +yy169: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'a') goto yy159; - goto yy154; -yy158: + if (yych == 'a') goto yy171; + goto yy166; +yy170: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'a') goto yy160; - goto yy154; -yy159: + if (yych == 'a') goto yy172; + goto yy166; +yy171: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'r') goto yy161; - goto yy154; -yy160: + if (yych == 'r') goto yy173; + goto yy166; +yy172: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 't') goto yy162; - goto yy154; -yy161: + if (yych == 't') goto yy174; + goto yy166; +yy173: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'a') goto yy164; - goto yy154; -yy162: + if (yych == 'a') goto yy176; + goto yy166; +yy174: ++YYCURSOR; -#line 174 "../src/ast/lex.re" +#line 181 "../src/ast/lex.re" { fmt = lex_conf_string(); continue; } -#line 875 "src/ast/lex.cc" -yy164: +#line 926 "src/ast/lex.cc" +yy176: yych = (YYCTYPE)*++YYCURSOR; - if (yych != 't') goto yy154; + if (yych != 't') goto yy166; yych = (YYCTYPE)*++YYCURSOR; - if (yych != 'o') goto yy154; + if (yych != 'o') goto yy166; yych = (YYCTYPE)*++YYCURSOR; - if (yych != 'r') goto yy154; + if (yych != 'r') goto yy166; ++YYCURSOR; -#line 175 "../src/ast/lex.re" +#line 182 "../src/ast/lex.re" { sep = lex_conf_string(); continue; } -#line 886 "src/ast/lex.cc" +#line 937 "src/ast/lex.cc" } -#line 184 "../src/ast/lex.re" +#line 191 "../src/ast/lex.re" } } @@ -895,7 +946,7 @@ scan: tchar = cur - pos; tok = cur; -#line 899 "src/ast/lex.cc" +#line 950 "src/ast/lex.cc" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -936,94 +987,94 @@ scan: if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 16) { - goto yy173; + goto yy185; } if (yych <= '.') { if (yych <= '#') { if (yych <= '\r') { - if (yych <= 0x08) goto yy171; - if (yych <= '\n') goto yy176; - if (yych >= '\r') goto yy178; + if (yych <= 0x08) goto yy183; + if (yych <= '\n') goto yy188; + if (yych >= '\r') goto yy190; } else { - if (yych <= 0x1F) goto yy171; - if (yych <= '!') goto yy179; - if (yych <= '"') goto yy181; - goto yy183; + if (yych <= 0x1F) goto yy183; + if (yych <= '!') goto yy191; + if (yych <= '"') goto yy193; + goto yy195; } } else { if (yych <= '\'') { - if (yych == '%') goto yy184; - if (yych >= '\'') goto yy185; + if (yych == '%') goto yy196; + if (yych >= '\'') goto yy197; } else { if (yych <= '*') { - if (yych <= ')') goto yy179; - goto yy187; + if (yych <= ')') goto yy191; + goto yy199; } else { - if (yych <= ',') goto yy179; - if (yych >= '.') goto yy188; + if (yych <= ',') goto yy191; + if (yych >= '.') goto yy200; } } } } else { if (yych <= '\\') { if (yych <= '?') { - if (yych <= '/') goto yy190; - if (yych <= '9') goto yy191; - if (yych <= ':') goto yy193; - goto yy179; + if (yych <= '/') goto yy202; + if (yych <= '9') goto yy203; + if (yych <= ':') goto yy205; + goto yy191; } else { - if (yych <= '@') goto yy183; - if (yych <= 'Z') goto yy191; - if (yych <= '[') goto yy194; - goto yy179; + if (yych <= '@') goto yy195; + if (yych <= 'Z') goto yy203; + if (yych <= '[') goto yy206; + goto yy191; } } else { if (yych <= 'q') { - if (yych == '_') goto yy191; - if (yych >= 'a') goto yy191; + if (yych == '_') goto yy203; + if (yych >= 'a') goto yy203; } else { if (yych <= 'z') { - if (yych <= 'r') goto yy196; - goto yy191; + if (yych <= 'r') goto yy208; + goto yy203; } else { - if (yych <= '{') goto yy197; - if (yych <= '|') goto yy179; + if (yych <= '{') goto yy209; + if (yych <= '|') goto yy191; } } } } -yy171: +yy183: ++YYCURSOR; -yy172: -#line 344 "../src/ast/lex.re" +yy184: +#line 351 "../src/ast/lex.re" { fatal_lc(get_cline(), get_column(), "unexpected character: '%c'", *tok); goto scan; } -#line 1004 "src/ast/lex.cc" -yy173: +#line 1055 "src/ast/lex.cc" +yy185: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 16) { - goto yy173; + goto yy185; } -#line 323 "../src/ast/lex.re" +#line 330 "../src/ast/lex.re" { goto scan; } -#line 1016 "src/ast/lex.cc" -yy176: +#line 1067 "src/ast/lex.cc" +yy188: yyaccept = 0; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); if (yych <= 0x1F) { - if (yych == '\t') goto yy199; + if (yych == '\t') goto yy211; } else { - if (yych <= ' ') goto yy199; - if (yych == '#') goto yy202; + if (yych <= ' ') goto yy211; + if (yych == '#') goto yy214; } -yy177: -#line 332 "../src/ast/lex.re" +yy189: +#line 339 "../src/ast/lex.re" { if (cur == eof) return 0; pos = cur; @@ -1035,218 +1086,218 @@ yy177: goto scan; } } -#line 1039 "src/ast/lex.cc" -yy178: +#line 1090 "src/ast/lex.cc" +yy190: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy176; - goto yy172; -yy179: + if (yych == '\n') goto yy188; + goto yy184; +yy191: ++YYCURSOR; -yy180: -#line 236 "../src/ast/lex.re" +yy192: +#line 243 "../src/ast/lex.re" { return *tok; } -#line 1049 "src/ast/lex.cc" -yy181: +#line 1100 "src/ast/lex.cc" +yy193: ++YYCURSOR; -#line 226 "../src/ast/lex.re" +#line 233 "../src/ast/lex.re" { yylval.regexp = lex_str('"'); return TOKEN_REGEXP; } -#line 1054 "src/ast/lex.cc" -yy183: +#line 1105 "src/ast/lex.cc" +yy195: yych = (YYCTYPE)*++YYCURSOR; if (yych <= 'Z') { - if (yych <= '/') goto yy172; - if (yych <= '9') goto yy204; - if (yych <= '@') goto yy172; - goto yy204; + if (yych <= '/') goto yy184; + if (yych <= '9') goto yy216; + if (yych <= '@') goto yy184; + goto yy216; } else { if (yych <= '_') { - if (yych <= '^') goto yy172; - goto yy204; + if (yych <= '^') goto yy184; + goto yy216; } else { - if (yych <= '`') goto yy172; - if (yych <= 'z') goto yy204; - goto yy172; + if (yych <= '`') goto yy184; + if (yych <= 'z') goto yy216; + goto yy184; } } -yy184: +yy196: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '}') goto yy207; - goto yy172; -yy185: + if (yych == '}') goto yy219; + goto yy184; +yy197: ++YYCURSOR; -#line 225 "../src/ast/lex.re" +#line 232 "../src/ast/lex.re" { yylval.regexp = lex_str('\''); return TOKEN_REGEXP; } -#line 1080 "src/ast/lex.cc" -yy187: +#line 1131 "src/ast/lex.cc" +yy199: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '/') goto yy207; - goto yy180; -yy188: + if (yych == '/') goto yy219; + goto yy192; +yy200: ++YYCURSOR; -#line 318 "../src/ast/lex.re" +#line 325 "../src/ast/lex.re" { yylval.regexp = ast_dot(cline, get_column()); return TOKEN_REGEXP; } -#line 1092 "src/ast/lex.cc" -yy190: +#line 1143 "src/ast/lex.cc" +yy202: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '*') goto yy209; - if (yych == '/') goto yy211; - goto yy180; -yy191: + if (yych == '*') goto yy221; + if (yych == '/') goto yy223; + goto yy192; +yy203: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; -yy192: +yy204: if (yybm[0+yych] & 32) { - goto yy191; + goto yy203; } if (yych <= ' ') { if (yych == '\t') { YYCTXMARKER = YYCURSOR; - goto yy215; + goto yy227; } - if (yych <= 0x1F) goto yy213; + if (yych <= 0x1F) goto yy225; YYCTXMARKER = YYCURSOR; - goto yy215; + goto yy227; } else { if (yych <= ',') { - if (yych <= '+') goto yy213; + if (yych <= '+') goto yy225; YYCTXMARKER = YYCURSOR; - goto yy217; + goto yy229; } else { - if (yych <= '<') goto yy213; + if (yych <= '<') goto yy225; if (yych <= '>') { YYCTXMARKER = YYCURSOR; - goto yy217; + goto yy229; } - goto yy213; + goto yy225; } } -yy193: +yy205: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '=') goto yy219; - goto yy172; -yy194: + if (yych == '=') goto yy231; + goto yy184; +yy206: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '^') goto yy221; -#line 227 "../src/ast/lex.re" + if (yych == '^') goto yy233; +#line 234 "../src/ast/lex.re" { yylval.regexp = lex_cls(false); return TOKEN_REGEXP; } -#line 1137 "src/ast/lex.cc" -yy196: +#line 1188 "src/ast/lex.cc" +yy208: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy223; - goto yy192; -yy197: + if (yych == 'e') goto yy235; + goto yy204; +yy209: yyaccept = 1; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 64) { - goto yy226; + goto yy238; } if (yych <= 'Z') { - if (yych == ',') goto yy224; - if (yych >= 'A') goto yy228; + if (yych == ',') goto yy236; + if (yych >= 'A') goto yy240; } else { if (yych <= '_') { - if (yych >= '_') goto yy228; + if (yych >= '_') goto yy240; } else { - if (yych <= '`') goto yy198; - if (yych <= 'z') goto yy228; + if (yych <= '`') goto yy210; + if (yych <= 'z') goto yy240; } } -yy198: -#line 194 "../src/ast/lex.re" +yy210: +#line 201 "../src/ast/lex.re" { depth = 1; code_line = cline; goto code; } -#line 1166 "src/ast/lex.cc" -yy199: +#line 1217 "src/ast/lex.cc" +yy211: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yych <= 0x1F) { - if (yych == '\t') goto yy199; + if (yych == '\t') goto yy211; } else { - if (yych <= ' ') goto yy199; - if (yych == '#') goto yy202; + if (yych <= ' ') goto yy211; + if (yych == '#') goto yy214; } -yy201: +yy213: YYCURSOR = YYMARKER; if (yyaccept <= 1) { if (yyaccept == 0) { - goto yy177; + goto yy189; } else { - goto yy198; + goto yy210; } } else { - goto yy225; + goto yy237; } -yy202: +yy214: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = (YYCTYPE)*YYCURSOR; if (yych <= 0x1F) { - if (yych == '\t') goto yy202; - goto yy201; + if (yych == '\t') goto yy214; + goto yy213; } else { - if (yych <= ' ') goto yy202; - if (yych == 'l') goto yy230; - goto yy201; + if (yych <= ' ') goto yy214; + if (yych == 'l') goto yy242; + goto yy213; } -yy204: +yy216: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yych <= 'Z') { - if (yych <= '/') goto yy206; - if (yych <= '9') goto yy204; - if (yych >= 'A') goto yy204; + if (yych <= '/') goto yy218; + if (yych <= '9') goto yy216; + if (yych >= 'A') goto yy216; } else { if (yych <= '_') { - if (yych >= '_') goto yy204; + if (yych >= '_') goto yy216; } else { - if (yych <= '`') goto yy206; - if (yych <= 'z') goto yy204; + if (yych <= '`') goto yy218; + if (yych <= 'z') goto yy216; } } -yy206: -#line 230 "../src/ast/lex.re" +yy218: +#line 237 "../src/ast/lex.re" { const std::string *name = new std::string(tok + 1, tok_len() - 1); yylval.regexp = ast_tag(cline, get_column(), name, tok[0] == '#'); return TOKEN_REGEXP; } -#line 1223 "src/ast/lex.cc" -yy207: +#line 1274 "src/ast/lex.cc" +yy219: ++YYCURSOR; -#line 220 "../src/ast/lex.re" +#line 227 "../src/ast/lex.re" { tok = cur; return 0; } -#line 1231 "src/ast/lex.cc" -yy209: +#line 1282 "src/ast/lex.cc" +yy221: ++YYCURSOR; -#line 214 "../src/ast/lex.re" +#line 221 "../src/ast/lex.re" { depth = 1; goto comment; } -#line 1239 "src/ast/lex.cc" -yy211: +#line 1290 "src/ast/lex.cc" +yy223: ++YYCURSOR; -#line 211 "../src/ast/lex.re" +#line 218 "../src/ast/lex.re" { goto nextLine; } -#line 1246 "src/ast/lex.cc" -yy213: +#line 1297 "src/ast/lex.cc" +yy225: ++YYCURSOR; YYCURSOR -= 1; -#line 301 "../src/ast/lex.re" +#line 308 "../src/ast/lex.re" { if (!globopts->FFlag) { yylval.str = new std::string (tok, tok_len()); @@ -1263,113 +1314,113 @@ yy213: return TOKEN_REGEXP; } } -#line 1267 "src/ast/lex.cc" -yy215: +#line 1318 "src/ast/lex.cc" +yy227: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yych <= ' ') { - if (yych == '\t') goto yy215; - if (yych <= 0x1F) goto yy231; - goto yy215; + if (yych == '\t') goto yy227; + if (yych <= 0x1F) goto yy243; + goto yy227; } else { if (yych <= ',') { - if (yych <= '+') goto yy231; + if (yych <= '+') goto yy243; } else { - if (yych <= '<') goto yy231; - if (yych >= '?') goto yy231; + if (yych <= '<') goto yy243; + if (yych >= '?') goto yy243; } } -yy217: +yy229: ++YYCURSOR; YYCURSOR = YYCTXMARKER; -#line 296 "../src/ast/lex.re" +#line 303 "../src/ast/lex.re" { yylval.str = new std::string (tok, tok_len ()); return TOKEN_ID; } -#line 1292 "src/ast/lex.cc" -yy219: +#line 1343 "src/ast/lex.cc" +yy231: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '>') goto yy233; -#line 204 "../src/ast/lex.re" + if (yych == '>') goto yy245; +#line 211 "../src/ast/lex.re" { tok += 2; /* skip ":=" */ depth = 0; code_line = cline; goto code; } -#line 1303 "src/ast/lex.cc" -yy221: +#line 1354 "src/ast/lex.cc" +yy233: ++YYCURSOR; -#line 228 "../src/ast/lex.re" +#line 235 "../src/ast/lex.re" { yylval.regexp = lex_cls(true); return TOKEN_REGEXP; } -#line 1308 "src/ast/lex.cc" -yy223: +#line 1359 "src/ast/lex.cc" +yy235: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '2') goto yy235; - goto yy192; -yy224: + if (yych == '2') goto yy247; + goto yy204; +yy236: ++YYCURSOR; -yy225: -#line 269 "../src/ast/lex.re" +yy237: +#line 276 "../src/ast/lex.re" { fatal_lc(get_cline(), get_column(), "illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers"); } -#line 1320 "src/ast/lex.cc" -yy226: +#line 1371 "src/ast/lex.cc" +yy238: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 64) { - goto yy226; + goto yy238; } if (yych <= '^') { if (yych <= ',') { - if (yych <= '+') goto yy201; - goto yy236; + if (yych <= '+') goto yy213; + goto yy248; } else { - if (yych <= '@') goto yy201; - if (yych >= '[') goto yy201; + if (yych <= '@') goto yy213; + if (yych >= '[') goto yy213; } } else { if (yych <= 'z') { - if (yych == '`') goto yy201; + if (yych == '`') goto yy213; } else { - if (yych == '}') goto yy237; - goto yy201; + if (yych == '}') goto yy249; + goto yy213; } } -yy228: +yy240: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yych <= '^') { if (yych <= '9') { - if (yych <= '/') goto yy201; - goto yy228; + if (yych <= '/') goto yy213; + goto yy240; } else { - if (yych <= '@') goto yy201; - if (yych <= 'Z') goto yy228; - goto yy201; + if (yych <= '@') goto yy213; + if (yych <= 'Z') goto yy240; + goto yy213; } } else { if (yych <= 'z') { - if (yych == '`') goto yy201; - goto yy228; + if (yych == '`') goto yy213; + goto yy240; } else { - if (yych == '}') goto yy239; - goto yy201; + if (yych == '}') goto yy251; + goto yy213; } } -yy230: +yy242: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'i') goto yy241; - goto yy201; -yy231: + if (yych == 'i') goto yy253; + goto yy213; +yy243: ++YYCURSOR; YYCURSOR = YYCTXMARKER; -#line 283 "../src/ast/lex.re" +#line 290 "../src/ast/lex.re" { yylval.str = new std::string (tok, tok_len ()); if (globopts->FFlag) @@ -1382,29 +1433,29 @@ yy231: return TOKEN_ID; } } -#line 1386 "src/ast/lex.cc" -yy233: +#line 1437 "src/ast/lex.cc" +yy245: ++YYCURSOR; YYCURSOR -= 2; -#line 200 "../src/ast/lex.re" +#line 207 "../src/ast/lex.re" { return *tok; } -#line 1394 "src/ast/lex.cc" -yy235: +#line 1445 "src/ast/lex.cc" +yy247: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'c') goto yy242; - goto yy192; -yy236: + if (yych == 'c') goto yy254; + goto yy204; +yy248: yyaccept = 2; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy225; - if (yych <= '9') goto yy243; - if (yych == '}') goto yy245; - goto yy225; -yy237: + if (yych <= '/') goto yy237; + if (yych <= '9') goto yy255; + if (yych == '}') goto yy257; + goto yy237; +yy249: ++YYCURSOR; -#line 238 "../src/ast/lex.re" +#line 245 "../src/ast/lex.re" { if (!s_to_u32_unsafe (tok + 1, cur - 1, yylval.bounds.min)) { @@ -1413,10 +1464,10 @@ yy237: yylval.bounds.max = yylval.bounds.min; return TOKEN_CLOSESIZE; } -#line 1417 "src/ast/lex.cc" -yy239: +#line 1468 "src/ast/lex.cc" +yy251: ++YYCURSOR; -#line 273 "../src/ast/lex.re" +#line 280 "../src/ast/lex.re" { if (!globopts->FFlag) { fatal_lc(get_cline(), get_column(), "curly braces for names only allowed with -F switch"); @@ -1424,26 +1475,26 @@ yy239: yylval.str = new std::string (tok + 1, tok_len () - 2); // -2 to omit braces return TOKEN_ID; } -#line 1428 "src/ast/lex.cc" -yy241: +#line 1479 "src/ast/lex.cc" +yy253: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'n') goto yy247; - goto yy201; -yy242: + if (yych == 'n') goto yy259; + goto yy213; +yy254: yych = (YYCTYPE)*++YYCURSOR; - if (yych == ':') goto yy248; - goto yy192; -yy243: + if (yych == ':') goto yy260; + goto yy204; +yy255: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; - if (yych <= '/') goto yy201; - if (yych <= '9') goto yy243; - if (yych == '}') goto yy250; - goto yy201; -yy245: + if (yych <= '/') goto yy213; + if (yych <= '9') goto yy255; + if (yych == '}') goto yy262; + goto yy213; +yy257: ++YYCURSOR; -#line 260 "../src/ast/lex.re" +#line 267 "../src/ast/lex.re" { if (!s_to_u32_unsafe (tok + 1, cur - 2, yylval.bounds.min)) { @@ -1452,19 +1503,19 @@ yy245: yylval.bounds.max = std::numeric_limits::max(); return TOKEN_CLOSESIZE; } -#line 1456 "src/ast/lex.cc" -yy247: +#line 1507 "src/ast/lex.cc" +yy259: yych = (YYCTYPE)*++YYCURSOR; - if (yych == 'e') goto yy252; - goto yy201; -yy248: + if (yych == 'e') goto yy264; + goto yy213; +yy260: ++YYCURSOR; -#line 281 "../src/ast/lex.re" +#line 288 "../src/ast/lex.re" { return TOKEN_CONF; } -#line 1465 "src/ast/lex.cc" -yy250: +#line 1516 "src/ast/lex.cc" +yy262: ++YYCURSOR; -#line 247 "../src/ast/lex.re" +#line 254 "../src/ast/lex.re" { const char * p = strchr (tok, ','); if (!s_to_u32_unsafe (tok + 1, p, yylval.bounds.min)) @@ -1477,98 +1528,98 @@ yy250: } return TOKEN_CLOSESIZE; } -#line 1481 "src/ast/lex.cc" -yy252: +#line 1532 "src/ast/lex.cc" +yy264: yych = (YYCTYPE)*++YYCURSOR; - if (yych <= '0') goto yy254; - if (yych <= '9') goto yy201; - goto yy254; -yy253: + if (yych <= '0') goto yy266; + if (yych <= '9') goto yy213; + goto yy266; +yy265: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; -yy254: +yy266: if (yych <= 0x1F) { - if (yych == '\t') goto yy253; - goto yy201; + if (yych == '\t') goto yy265; + goto yy213; } else { - if (yych <= ' ') goto yy253; - if (yych <= '0') goto yy201; - if (yych >= ':') goto yy201; + if (yych <= ' ') goto yy265; + if (yych <= '0') goto yy213; + if (yych >= ':') goto yy213; YYCTXMARKER = YYCURSOR; } -yy255: +yy267: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = (YYCTYPE)*YYCURSOR; if (yych <= '\r') { if (yych <= '\t') { - if (yych <= 0x08) goto yy201; + if (yych <= 0x08) goto yy213; } else { - if (yych <= '\n') goto yy259; - if (yych <= '\f') goto yy201; - goto yy261; + if (yych <= '\n') goto yy271; + if (yych <= '\f') goto yy213; + goto yy273; } } else { if (yych <= ' ') { - if (yych <= 0x1F) goto yy201; + if (yych <= 0x1F) goto yy213; } else { - if (yych <= '/') goto yy201; - if (yych <= '9') goto yy255; - goto yy201; + if (yych <= '/') goto yy213; + if (yych <= '9') goto yy267; + goto yy213; } } -yy257: +yy269: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yych <= 0x1F) { - if (yych == '\t') goto yy257; - goto yy201; + if (yych == '\t') goto yy269; + goto yy213; } else { - if (yych <= ' ') goto yy257; - if (yych == '"') goto yy262; - goto yy201; + if (yych <= ' ') goto yy269; + if (yych == '"') goto yy274; + goto yy213; } -yy259: +yy271: ++YYCURSOR; YYCURSOR = YYCTXMARKER; -#line 327 "../src/ast/lex.re" +#line 334 "../src/ast/lex.re" { set_sourceline (); return TOKEN_LINE_INFO; } -#line 1542 "src/ast/lex.cc" -yy261: +#line 1593 "src/ast/lex.cc" +yy273: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy259; - goto yy201; -yy262: + if (yych == '\n') goto yy271; + goto yy213; +yy274: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 128) { - goto yy262; + goto yy274; } - if (yych <= '\n') goto yy201; - if (yych >= '#') goto yy265; + if (yych <= '\n') goto yy213; + if (yych >= '#') goto yy277; yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy259; - if (yych == '\r') goto yy261; - goto yy201; -yy265: + if (yych == '\n') goto yy271; + if (yych == '\r') goto yy273; + goto yy213; +yy277: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; - if (yych == '\n') goto yy201; - goto yy262; + if (yych == '\n') goto yy213; + goto yy274; } -#line 348 "../src/ast/lex.re" +#line 355 "../src/ast/lex.re" code: -#line 1572 "src/ast/lex.cc" +#line 1623 "src/ast/lex.cc" { YYCTYPE yych; unsigned int yyaccept = 0; @@ -1610,26 +1661,26 @@ code: yych = (YYCTYPE)*YYCURSOR; if (yych <= '&') { if (yych <= '\n') { - if (yych <= 0x00) goto yy268; - if (yych <= '\t') goto yy270; - goto yy272; + if (yych <= 0x00) goto yy280; + if (yych <= '\t') goto yy282; + goto yy284; } else { - if (yych == '"') goto yy274; - goto yy270; + if (yych == '"') goto yy286; + goto yy282; } } else { if (yych <= '{') { - if (yych <= '\'') goto yy275; - if (yych <= 'z') goto yy270; - goto yy276; + if (yych <= '\'') goto yy287; + if (yych <= 'z') goto yy282; + goto yy288; } else { - if (yych == '}') goto yy278; - goto yy270; + if (yych == '}') goto yy290; + goto yy282; } } -yy268: +yy280: ++YYCURSOR; -#line 411 "../src/ast/lex.re" +#line 418 "../src/ast/lex.re" { if (cur == eof) { @@ -1641,34 +1692,34 @@ yy268: } goto code; } -#line 1645 "src/ast/lex.cc" -yy270: +#line 1696 "src/ast/lex.cc" +yy282: ++YYCURSOR; -yy271: -#line 425 "../src/ast/lex.re" +yy283: +#line 432 "../src/ast/lex.re" { goto code; } -#line 1653 "src/ast/lex.cc" -yy272: +#line 1704 "src/ast/lex.cc" +yy284: yyaccept = 0; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); if (yych <= '\r') { if (yych <= '\t') { - if (yych >= '\t') goto yy280; + if (yych >= '\t') goto yy292; } else { - if (yych <= '\n') goto yy282; - if (yych >= '\r') goto yy282; + if (yych <= '\n') goto yy294; + if (yych >= '\r') goto yy294; } } else { if (yych <= ' ') { - if (yych >= ' ') goto yy280; + if (yych >= ' ') goto yy292; } else { - if (yych == '#') goto yy283; + if (yych == '#') goto yy295; } } -yy273: -#line 392 "../src/ast/lex.re" +yy285: +#line 399 "../src/ast/lex.re" { if (depth == 0) { @@ -1688,20 +1739,20 @@ yy273: cline++; goto code; } -#line 1692 "src/ast/lex.cc" -yy274: +#line 1743 "src/ast/lex.cc" +yy286: yyaccept = 1; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); - if (yych == '\n') goto yy271; - goto yy287; -yy275: + if (yych == '\n') goto yy283; + goto yy299; +yy287: yyaccept = 1; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); - if (yych == '\n') goto yy271; - goto yy292; -yy276: + if (yych == '\n') goto yy283; + goto yy304; +yy288: ++YYCURSOR; -#line 364 "../src/ast/lex.re" +#line 371 "../src/ast/lex.re" { if (depth == 0) { @@ -1713,10 +1764,10 @@ yy276: } goto code; } -#line 1717 "src/ast/lex.cc" -yy278: +#line 1768 "src/ast/lex.cc" +yy290: ++YYCURSOR; -#line 352 "../src/ast/lex.re" +#line 359 "../src/ast/lex.re" { if (depth == 0) { @@ -1729,19 +1780,19 @@ yy278: } goto code; } -#line 1733 "src/ast/lex.cc" -yy280: +#line 1784 "src/ast/lex.cc" +yy292: yyaccept = 2; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); if (yych <= 0x1F) { - if (yych == '\t') goto yy294; + if (yych == '\t') goto yy306; } else { - if (yych <= ' ') goto yy294; - if (yych == '#') goto yy283; + if (yych <= ' ') goto yy306; + if (yych == '#') goto yy295; } -yy281: +yy293: YYCURSOR -= 1; -#line 379 "../src/ast/lex.re" +#line 386 "../src/ast/lex.re" { if (depth == 0) { @@ -1755,175 +1806,175 @@ yy281: cline++; goto code; } -#line 1759 "src/ast/lex.cc" -yy282: +#line 1810 "src/ast/lex.cc" +yy294: ++YYCURSOR; - goto yy281; -yy283: + goto yy293; +yy295: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 16) { - goto yy283; + goto yy295; } - if (yych == 'l') goto yy296; -yy285: + if (yych == 'l') goto yy308; +yy297: YYCURSOR = YYMARKER; if (yyaccept <= 1) { if (yyaccept == 0) { - goto yy273; + goto yy285; } else { - goto yy271; + goto yy283; } } else { - goto yy281; + goto yy293; } -yy286: +yy298: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; -yy287: +yy299: if (yybm[0+yych] & 32) { - goto yy286; + goto yy298; } - if (yych <= '\n') goto yy285; - if (yych >= '#') goto yy290; -yy288: + if (yych <= '\n') goto yy297; + if (yych >= '#') goto yy302; +yy300: ++YYCURSOR; -#line 422 "../src/ast/lex.re" +#line 429 "../src/ast/lex.re" { goto code; } -#line 1798 "src/ast/lex.cc" -yy290: +#line 1849 "src/ast/lex.cc" +yy302: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; - if (yych == '\n') goto yy285; - goto yy286; -yy291: + if (yych == '\n') goto yy297; + goto yy298; +yy303: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; -yy292: +yy304: if (yybm[0+yych] & 64) { - goto yy291; + goto yy303; } - if (yych <= '\n') goto yy285; - if (yych <= '\'') goto yy288; + if (yych <= '\n') goto yy297; + if (yych <= '\'') goto yy300; ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; - if (yych == '\n') goto yy285; - goto yy291; -yy294: + if (yych == '\n') goto yy297; + goto yy303; +yy306: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yych <= 0x1F) { - if (yych == '\t') goto yy294; - goto yy285; + if (yych == '\t') goto yy306; + goto yy297; } else { - if (yych <= ' ') goto yy294; - if (yych == '#') goto yy283; - goto yy285; + if (yych <= ' ') goto yy306; + if (yych == '#') goto yy295; + goto yy297; } -yy296: +yy308: yych = (YYCTYPE)*++YYCURSOR; - if (yych != 'i') goto yy285; + if (yych != 'i') goto yy297; yych = (YYCTYPE)*++YYCURSOR; - if (yych != 'n') goto yy285; + if (yych != 'n') goto yy297; yych = (YYCTYPE)*++YYCURSOR; - if (yych != 'e') goto yy285; + if (yych != 'e') goto yy297; yych = (YYCTYPE)*++YYCURSOR; - if (yych <= '0') goto yy301; - if (yych <= '9') goto yy285; - goto yy301; -yy300: + if (yych <= '0') goto yy313; + if (yych <= '9') goto yy297; + goto yy313; +yy312: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; -yy301: +yy313: if (yych <= 0x1F) { - if (yych == '\t') goto yy300; - goto yy285; + if (yych == '\t') goto yy312; + goto yy297; } else { - if (yych <= ' ') goto yy300; - if (yych <= '0') goto yy285; - if (yych >= ':') goto yy285; + if (yych <= ' ') goto yy312; + if (yych <= '0') goto yy297; + if (yych >= ':') goto yy297; YYCTXMARKER = YYCURSOR; } -yy302: +yy314: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 128) { - goto yy302; + goto yy314; } if (yych <= '\f') { - if (yych <= 0x08) goto yy285; - if (yych <= '\t') goto yy304; - if (yych <= '\n') goto yy306; - goto yy285; + if (yych <= 0x08) goto yy297; + if (yych <= '\t') goto yy316; + if (yych <= '\n') goto yy318; + goto yy297; } else { - if (yych <= '\r') goto yy308; - if (yych != ' ') goto yy285; + if (yych <= '\r') goto yy320; + if (yych != ' ') goto yy297; } -yy304: +yy316: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yych <= 0x1F) { - if (yych == '\t') goto yy304; - goto yy285; + if (yych == '\t') goto yy316; + goto yy297; } else { - if (yych <= ' ') goto yy304; - if (yych == '"') goto yy309; - goto yy285; + if (yych <= ' ') goto yy316; + if (yych == '"') goto yy321; + goto yy297; } -yy306: +yy318: ++YYCURSOR; YYCURSOR = YYCTXMARKER; -#line 375 "../src/ast/lex.re" +#line 382 "../src/ast/lex.re" { set_sourceline (); goto code; } -#line 1893 "src/ast/lex.cc" -yy308: +#line 1944 "src/ast/lex.cc" +yy320: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy306; - goto yy285; -yy309: + if (yych == '\n') goto yy318; + goto yy297; +yy321: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); yych = (YYCTYPE)*YYCURSOR; if (yych <= '!') { - if (yych == '\n') goto yy285; - goto yy309; + if (yych == '\n') goto yy297; + goto yy321; } else { - if (yych <= '"') goto yy311; - if (yych == '\\') goto yy312; - goto yy309; + if (yych <= '"') goto yy323; + if (yych == '\\') goto yy324; + goto yy321; } -yy311: +yy323: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy306; - if (yych == '\r') goto yy308; - goto yy285; -yy312: + if (yych == '\n') goto yy318; + if (yych == '\r') goto yy320; + goto yy297; +yy324: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; - if (yych == '\n') goto yy285; - goto yy309; + if (yych == '\n') goto yy297; + goto yy321; } -#line 428 "../src/ast/lex.re" +#line 435 "../src/ast/lex.re" comment: -#line 1927 "src/ast/lex.cc" +#line 1978 "src/ast/lex.cc" { YYCTYPE yych; static const unsigned char yybm[] = { @@ -1963,14 +2014,14 @@ comment: if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = (YYCTYPE)*YYCURSOR; if (yych <= ')') { - if (yych == '\n') goto yy317; + if (yych == '\n') goto yy329; } else { - if (yych <= '*') goto yy319; - if (yych == '/') goto yy320; + if (yych <= '*') goto yy331; + if (yych == '/') goto yy332; } ++YYCURSOR; -yy316: -#line 460 "../src/ast/lex.re" +yy328: +#line 467 "../src/ast/lex.re" { if (cur == eof) { @@ -1978,15 +2029,15 @@ yy316: } goto comment; } -#line 1982 "src/ast/lex.cc" -yy317: +#line 2033 "src/ast/lex.cc" +yy329: yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 32) { - goto yy321; + goto yy333; } - if (yych == '#') goto yy324; -yy318: -#line 451 "../src/ast/lex.re" + if (yych == '#') goto yy336; +yy330: +#line 458 "../src/ast/lex.re" { if (cur == eof) { @@ -1996,41 +2047,41 @@ yy318: cline++; goto comment; } -#line 2000 "src/ast/lex.cc" -yy319: +#line 2051 "src/ast/lex.cc" +yy331: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '/') goto yy326; - goto yy316; -yy320: + if (yych == '/') goto yy338; + goto yy328; +yy332: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '*') goto yy328; - goto yy316; -yy321: + if (yych == '*') goto yy340; + goto yy328; +yy333: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 32) { - goto yy321; + goto yy333; } - if (yych == '#') goto yy324; -yy323: + if (yych == '#') goto yy336; +yy335: YYCURSOR = YYMARKER; - goto yy318; -yy324: + goto yy330; +yy336: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = (YYCTYPE)*YYCURSOR; if (yych <= 0x1F) { - if (yych == '\t') goto yy324; - goto yy323; + if (yych == '\t') goto yy336; + goto yy335; } else { - if (yych <= ' ') goto yy324; - if (yych == 'l') goto yy330; - goto yy323; + if (yych <= ' ') goto yy336; + if (yych == 'l') goto yy342; + goto yy335; } -yy326: +yy338: ++YYCURSOR; -#line 432 "../src/ast/lex.re" +#line 439 "../src/ast/lex.re" { if (--depth == 0) { @@ -2041,124 +2092,124 @@ yy326: goto comment; } } -#line 2045 "src/ast/lex.cc" -yy328: +#line 2096 "src/ast/lex.cc" +yy340: ++YYCURSOR; -#line 442 "../src/ast/lex.re" +#line 449 "../src/ast/lex.re" { ++depth; fatal_lc(get_cline(), get_column(), "ambiguous /* found"); goto comment; } -#line 2054 "src/ast/lex.cc" -yy330: +#line 2105 "src/ast/lex.cc" +yy342: yych = (YYCTYPE)*++YYCURSOR; - if (yych != 'i') goto yy323; + if (yych != 'i') goto yy335; yych = (YYCTYPE)*++YYCURSOR; - if (yych != 'n') goto yy323; + if (yych != 'n') goto yy335; yych = (YYCTYPE)*++YYCURSOR; - if (yych != 'e') goto yy323; + if (yych != 'e') goto yy335; yych = (YYCTYPE)*++YYCURSOR; - if (yych <= '0') goto yy335; - if (yych <= '9') goto yy323; - goto yy335; -yy334: + if (yych <= '0') goto yy347; + if (yych <= '9') goto yy335; + goto yy347; +yy346: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; -yy335: +yy347: if (yych <= 0x1F) { - if (yych == '\t') goto yy334; - goto yy323; + if (yych == '\t') goto yy346; + goto yy335; } else { - if (yych <= ' ') goto yy334; - if (yych <= '0') goto yy323; - if (yych >= ':') goto yy323; + if (yych <= ' ') goto yy346; + if (yych <= '0') goto yy335; + if (yych >= ':') goto yy335; YYCTXMARKER = YYCURSOR; } -yy336: +yy348: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 64) { - goto yy336; + goto yy348; } if (yych <= '\f') { - if (yych <= 0x08) goto yy323; - if (yych <= '\t') goto yy338; - if (yych <= '\n') goto yy340; - goto yy323; + if (yych <= 0x08) goto yy335; + if (yych <= '\t') goto yy350; + if (yych <= '\n') goto yy352; + goto yy335; } else { - if (yych <= '\r') goto yy342; - if (yych != ' ') goto yy323; + if (yych <= '\r') goto yy354; + if (yych != ' ') goto yy335; } -yy338: +yy350: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yych <= 0x1F) { - if (yych == '\t') goto yy338; - goto yy323; + if (yych == '\t') goto yy350; + goto yy335; } else { - if (yych <= ' ') goto yy338; - if (yych == '"') goto yy343; - goto yy323; + if (yych <= ' ') goto yy350; + if (yych == '"') goto yy355; + goto yy335; } -yy340: +yy352: ++YYCURSOR; YYCURSOR = YYCTXMARKER; -#line 447 "../src/ast/lex.re" +#line 454 "../src/ast/lex.re" { set_sourceline (); goto comment; } -#line 2116 "src/ast/lex.cc" -yy342: +#line 2167 "src/ast/lex.cc" +yy354: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy340; - goto yy323; -yy343: + if (yych == '\n') goto yy352; + goto yy335; +yy355: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 128) { - goto yy343; + goto yy355; } - if (yych <= '\n') goto yy323; - if (yych >= '#') goto yy346; + if (yych <= '\n') goto yy335; + if (yych >= '#') goto yy358; yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy340; - if (yych == '\r') goto yy342; - goto yy323; -yy346: + if (yych == '\n') goto yy352; + if (yych == '\r') goto yy354; + goto yy335; +yy358: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; - if (yych == '\n') goto yy323; - goto yy343; + if (yych == '\n') goto yy335; + goto yy355; } -#line 467 "../src/ast/lex.re" +#line 474 "../src/ast/lex.re" nextLine: -#line 2146 "src/ast/lex.cc" +#line 2197 "src/ast/lex.cc" { YYCTYPE yych; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; - if (yych == '\n') goto yy351; + if (yych == '\n') goto yy363; ++YYCURSOR; -#line 478 "../src/ast/lex.re" +#line 485 "../src/ast/lex.re" { if(cur == eof) { return 0; } goto nextLine; } -#line 2159 "src/ast/lex.cc" -yy351: +#line 2210 "src/ast/lex.cc" +yy363: ++YYCURSOR; -#line 471 "../src/ast/lex.re" +#line 478 "../src/ast/lex.re" { if(cur == eof) { return 0; } @@ -2166,9 +2217,9 @@ yy351: cline++; goto scan; } -#line 2170 "src/ast/lex.cc" +#line 2221 "src/ast/lex.cc" } -#line 483 "../src/ast/lex.re" +#line 490 "../src/ast/lex.re" } @@ -2194,44 +2245,44 @@ fst: tok = cur; c = get_column(); -#line 2198 "src/ast/lex.cc" +#line 2249 "src/ast/lex.cc" { YYCTYPE yych; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; - if (yych == ']') goto yy356; -#line 509 "../src/ast/lex.re" + if (yych == ']') goto yy368; +#line 516 "../src/ast/lex.re" { l = lex_cls_chr(); goto snd; } -#line 2206 "src/ast/lex.cc" -yy356: +#line 2257 "src/ast/lex.cc" +yy368: ++YYCURSOR; -#line 508 "../src/ast/lex.re" +#line 515 "../src/ast/lex.re" { return ast_cls(cline, c0, cls, neg); } -#line 2211 "src/ast/lex.cc" +#line 2262 "src/ast/lex.cc" } -#line 510 "../src/ast/lex.re" +#line 517 "../src/ast/lex.re" snd: -#line 2217 "src/ast/lex.cc" +#line 2268 "src/ast/lex.cc" { YYCTYPE yych; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = (YYCTYPE)*(YYMARKER = YYCURSOR); - if (yych == '-') goto yy361; -yy360: -#line 513 "../src/ast/lex.re" + if (yych == '-') goto yy373; +yy372: +#line 520 "../src/ast/lex.re" { u = l; goto add; } -#line 2226 "src/ast/lex.cc" -yy361: +#line 2277 "src/ast/lex.cc" +yy373: yych = (YYCTYPE)*++YYCURSOR; - if (yych != ']') goto yy363; + if (yych != ']') goto yy375; YYCURSOR = YYMARKER; - goto yy360; -yy363: + goto yy372; +yy375: ++YYCURSOR; YYCURSOR -= 1; -#line 514 "../src/ast/lex.re" +#line 521 "../src/ast/lex.re" { u = lex_cls_chr(); if (l > u) { @@ -2240,9 +2291,9 @@ yy363: } goto add; } -#line 2244 "src/ast/lex.cc" +#line 2295 "src/ast/lex.cc" } -#line 522 "../src/ast/lex.re" +#line 529 "../src/ast/lex.re" add: cls->push_back(ASTRange(l, u, c)); @@ -2254,297 +2305,297 @@ uint32_t Scanner::lex_cls_chr() tok = cur; const uint32_t l = get_cline(), c = get_column(); -#line 2258 "src/ast/lex.cc" +#line 2309 "src/ast/lex.cc" { YYCTYPE yych; unsigned int yyaccept = 0; if ((YYLIMIT - YYCURSOR) < 10) YYFILL(10); yych = (YYCTYPE)*YYCURSOR; if (yych <= '\f') { - if (yych == '\n') goto yy369; + if (yych == '\n') goto yy381; } else { - if (yych <= '\r') goto yy371; - if (yych == '\\') goto yy372; + if (yych <= '\r') goto yy383; + if (yych == '\\') goto yy384; } ++YYCURSOR; -yy368: -#line 539 "../src/ast/lex.re" +yy380: +#line 546 "../src/ast/lex.re" { return static_cast(tok[0]); } -#line 2274 "src/ast/lex.cc" -yy369: +#line 2325 "src/ast/lex.cc" +yy381: ++YYCURSOR; -#line 534 "../src/ast/lex.re" +#line 541 "../src/ast/lex.re" { fatal_lc(l, c, "newline in character class"); } -#line 2279 "src/ast/lex.cc" -yy371: +#line 2330 "src/ast/lex.cc" +yy383: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy369; - goto yy368; -yy372: + if (yych == '\n') goto yy381; + goto yy380; +yy384: yych = (YYCTYPE)*++YYCURSOR; if (yych <= ']') { if (yych <= '3') { if (yych <= '\r') { - if (yych == '\n') goto yy369; - if (yych >= '\r') goto yy375; + if (yych == '\n') goto yy381; + if (yych >= '\r') goto yy387; } else { - if (yych == '-') goto yy376; - if (yych >= '0') goto yy378; + if (yych == '-') goto yy388; + if (yych >= '0') goto yy390; } } else { if (yych <= 'W') { - if (yych <= '7') goto yy380; - if (yych == 'U') goto yy381; + if (yych <= '7') goto yy392; + if (yych == 'U') goto yy393; } else { - if (yych <= 'X') goto yy383; - if (yych <= '[') goto yy373; - if (yych <= '\\') goto yy384; - goto yy386; + if (yych <= 'X') goto yy395; + if (yych <= '[') goto yy385; + if (yych <= '\\') goto yy396; + goto yy398; } } } else { if (yych <= 'q') { if (yych <= 'e') { - if (yych <= '`') goto yy373; - if (yych <= 'a') goto yy388; - if (yych <= 'b') goto yy390; + if (yych <= '`') goto yy385; + if (yych <= 'a') goto yy400; + if (yych <= 'b') goto yy402; } else { - if (yych <= 'f') goto yy392; - if (yych == 'n') goto yy394; + if (yych <= 'f') goto yy404; + if (yych == 'n') goto yy406; } } else { if (yych <= 'u') { - if (yych <= 'r') goto yy396; - if (yych <= 's') goto yy373; - if (yych <= 't') goto yy398; - goto yy383; + if (yych <= 'r') goto yy408; + if (yych <= 's') goto yy385; + if (yych <= 't') goto yy410; + goto yy395; } else { - if (yych <= 'v') goto yy400; - if (yych == 'x') goto yy402; + if (yych <= 'v') goto yy412; + if (yych == 'x') goto yy414; } } } -yy373: +yy385: ++YYCURSOR; -yy374: -#line 552 "../src/ast/lex.re" +yy386: +#line 559 "../src/ast/lex.re" { warn.useless_escape(cline, get_column(), tok[1]); return static_cast(tok[1]); } -#line 2336 "src/ast/lex.cc" -yy375: +#line 2387 "src/ast/lex.cc" +yy387: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy369; - goto yy374; -yy376: + if (yych == '\n') goto yy381; + goto yy386; +yy388: ++YYCURSOR; -#line 550 "../src/ast/lex.re" +#line 557 "../src/ast/lex.re" { return static_cast('-'); } -#line 2345 "src/ast/lex.cc" -yy378: +#line 2396 "src/ast/lex.cc" +yy390: yyaccept = 0; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy379; - if (yych <= '7') goto yy403; -yy379: -#line 536 "../src/ast/lex.re" + if (yych <= '/') goto yy391; + if (yych <= '7') goto yy415; +yy391: +#line 543 "../src/ast/lex.re" { fatal_lc(l, c, "syntax error in octal escape sequence"); } -#line 2354 "src/ast/lex.cc" -yy380: +#line 2405 "src/ast/lex.cc" +yy392: ++YYCURSOR; - goto yy379; -yy381: + goto yy391; +yy393: yyaccept = 1; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); if (yych <= '@') { - if (yych <= '/') goto yy382; - if (yych <= '9') goto yy405; + if (yych <= '/') goto yy394; + if (yych <= '9') goto yy417; } else { - if (yych <= 'F') goto yy405; - if (yych <= '`') goto yy382; - if (yych <= 'f') goto yy405; + if (yych <= 'F') goto yy417; + if (yych <= '`') goto yy394; + if (yych <= 'f') goto yy417; } -yy382: -#line 535 "../src/ast/lex.re" +yy394: +#line 542 "../src/ast/lex.re" { fatal_lc(l, c, "syntax error in hexadecimal escape sequence"); } -#line 2372 "src/ast/lex.cc" -yy383: +#line 2423 "src/ast/lex.cc" +yy395: yyaccept = 1; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); if (yych <= '@') { - if (yych <= '/') goto yy382; - if (yych <= '9') goto yy406; - goto yy382; + if (yych <= '/') goto yy394; + if (yych <= '9') goto yy418; + goto yy394; } else { - if (yych <= 'F') goto yy406; - if (yych <= '`') goto yy382; - if (yych <= 'f') goto yy406; - goto yy382; + if (yych <= 'F') goto yy418; + if (yych <= '`') goto yy394; + if (yych <= 'f') goto yy418; + goto yy394; } -yy384: +yy396: ++YYCURSOR; -#line 549 "../src/ast/lex.re" +#line 556 "../src/ast/lex.re" { return static_cast('\\'); } -#line 2390 "src/ast/lex.cc" -yy386: +#line 2441 "src/ast/lex.cc" +yy398: ++YYCURSOR; -#line 551 "../src/ast/lex.re" +#line 558 "../src/ast/lex.re" { return static_cast(']'); } -#line 2395 "src/ast/lex.cc" -yy388: +#line 2446 "src/ast/lex.cc" +yy400: ++YYCURSOR; -#line 542 "../src/ast/lex.re" +#line 549 "../src/ast/lex.re" { return static_cast('\a'); } -#line 2400 "src/ast/lex.cc" -yy390: +#line 2451 "src/ast/lex.cc" +yy402: ++YYCURSOR; -#line 543 "../src/ast/lex.re" +#line 550 "../src/ast/lex.re" { return static_cast('\b'); } -#line 2405 "src/ast/lex.cc" -yy392: +#line 2456 "src/ast/lex.cc" +yy404: ++YYCURSOR; -#line 544 "../src/ast/lex.re" +#line 551 "../src/ast/lex.re" { return static_cast('\f'); } -#line 2410 "src/ast/lex.cc" -yy394: +#line 2461 "src/ast/lex.cc" +yy406: ++YYCURSOR; -#line 545 "../src/ast/lex.re" +#line 552 "../src/ast/lex.re" { return static_cast('\n'); } -#line 2415 "src/ast/lex.cc" -yy396: +#line 2466 "src/ast/lex.cc" +yy408: ++YYCURSOR; -#line 546 "../src/ast/lex.re" +#line 553 "../src/ast/lex.re" { return static_cast('\r'); } -#line 2420 "src/ast/lex.cc" -yy398: +#line 2471 "src/ast/lex.cc" +yy410: ++YYCURSOR; -#line 547 "../src/ast/lex.re" +#line 554 "../src/ast/lex.re" { return static_cast('\t'); } -#line 2425 "src/ast/lex.cc" -yy400: +#line 2476 "src/ast/lex.cc" +yy412: ++YYCURSOR; -#line 548 "../src/ast/lex.re" +#line 555 "../src/ast/lex.re" { return static_cast('\v'); } -#line 2430 "src/ast/lex.cc" -yy402: +#line 2481 "src/ast/lex.cc" +yy414: yyaccept = 1; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); if (yych <= '@') { - if (yych <= '/') goto yy382; - if (yych <= '9') goto yy407; - goto yy382; + if (yych <= '/') goto yy394; + if (yych <= '9') goto yy419; + goto yy394; } else { - if (yych <= 'F') goto yy407; - if (yych <= '`') goto yy382; - if (yych <= 'f') goto yy407; - goto yy382; + if (yych <= 'F') goto yy419; + if (yych <= '`') goto yy394; + if (yych <= 'f') goto yy419; + goto yy394; } -yy403: +yy415: yych = (YYCTYPE)*++YYCURSOR; - if (yych <= '/') goto yy404; - if (yych <= '7') goto yy408; -yy404: + if (yych <= '/') goto yy416; + if (yych <= '7') goto yy420; +yy416: YYCURSOR = YYMARKER; if (yyaccept == 0) { - goto yy379; + goto yy391; } else { - goto yy382; + goto yy394; } -yy405: +yy417: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy404; - if (yych <= '9') goto yy410; - goto yy404; + if (yych <= '/') goto yy416; + if (yych <= '9') goto yy422; + goto yy416; } else { - if (yych <= 'F') goto yy410; - if (yych <= '`') goto yy404; - if (yych <= 'f') goto yy410; - goto yy404; + if (yych <= 'F') goto yy422; + if (yych <= '`') goto yy416; + if (yych <= 'f') goto yy422; + goto yy416; } -yy406: +yy418: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy404; - if (yych <= '9') goto yy411; - goto yy404; + if (yych <= '/') goto yy416; + if (yych <= '9') goto yy423; + goto yy416; } else { - if (yych <= 'F') goto yy411; - if (yych <= '`') goto yy404; - if (yych <= 'f') goto yy411; - goto yy404; + if (yych <= 'F') goto yy423; + if (yych <= '`') goto yy416; + if (yych <= 'f') goto yy423; + goto yy416; } -yy407: +yy419: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy404; - if (yych <= '9') goto yy412; - goto yy404; + if (yych <= '/') goto yy416; + if (yych <= '9') goto yy424; + goto yy416; } else { - if (yych <= 'F') goto yy412; - if (yych <= '`') goto yy404; - if (yych <= 'f') goto yy412; - goto yy404; + if (yych <= 'F') goto yy424; + if (yych <= '`') goto yy416; + if (yych <= 'f') goto yy424; + goto yy416; } -yy408: +yy420: ++YYCURSOR; -#line 541 "../src/ast/lex.re" +#line 548 "../src/ast/lex.re" { return unesc_oct(tok, cur); } -#line 2495 "src/ast/lex.cc" -yy410: +#line 2546 "src/ast/lex.cc" +yy422: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy404; - if (yych <= '9') goto yy414; - goto yy404; + if (yych <= '/') goto yy416; + if (yych <= '9') goto yy426; + goto yy416; } else { - if (yych <= 'F') goto yy414; - if (yych <= '`') goto yy404; - if (yych <= 'f') goto yy414; - goto yy404; + if (yych <= 'F') goto yy426; + if (yych <= '`') goto yy416; + if (yych <= 'f') goto yy426; + goto yy416; } -yy411: +yy423: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy404; - if (yych <= '9') goto yy407; - goto yy404; + if (yych <= '/') goto yy416; + if (yych <= '9') goto yy419; + goto yy416; } else { - if (yych <= 'F') goto yy407; - if (yych <= '`') goto yy404; - if (yych <= 'f') goto yy407; - goto yy404; + if (yych <= 'F') goto yy419; + if (yych <= '`') goto yy416; + if (yych <= 'f') goto yy419; + goto yy416; } -yy412: +yy424: ++YYCURSOR; -#line 540 "../src/ast/lex.re" +#line 547 "../src/ast/lex.re" { return unesc_hex(tok, cur); } -#line 2524 "src/ast/lex.cc" -yy414: +#line 2575 "src/ast/lex.cc" +yy426: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy404; - if (yych >= ':') goto yy404; + if (yych <= '/') goto yy416; + if (yych >= ':') goto yy416; } else { - if (yych <= 'F') goto yy415; - if (yych <= '`') goto yy404; - if (yych >= 'g') goto yy404; + if (yych <= 'F') goto yy427; + if (yych <= '`') goto yy416; + if (yych >= 'g') goto yy416; } -yy415: +yy427: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy404; - if (yych <= '9') goto yy406; - goto yy404; + if (yych <= '/') goto yy416; + if (yych <= '9') goto yy418; + goto yy416; } else { - if (yych <= 'F') goto yy406; - if (yych <= '`') goto yy404; - if (yych <= 'f') goto yy406; - goto yy404; + if (yych <= 'F') goto yy418; + if (yych <= '`') goto yy416; + if (yych <= 'f') goto yy418; + goto yy416; } } -#line 556 "../src/ast/lex.re" +#line 563 "../src/ast/lex.re" } @@ -2554,289 +2605,289 @@ uint32_t Scanner::lex_str_chr(char quote, bool &end) tok = cur; const uint32_t l = get_cline(), c = get_column(); -#line 2558 "src/ast/lex.cc" +#line 2609 "src/ast/lex.cc" { YYCTYPE yych; unsigned int yyaccept = 0; if ((YYLIMIT - YYCURSOR) < 10) YYFILL(10); yych = (YYCTYPE)*YYCURSOR; if (yych <= '\f') { - if (yych == '\n') goto yy420; + if (yych == '\n') goto yy432; } else { - if (yych <= '\r') goto yy422; - if (yych == '\\') goto yy423; + if (yych <= '\r') goto yy434; + if (yych == '\\') goto yy435; } ++YYCURSOR; -yy419: -#line 571 "../src/ast/lex.re" +yy431: +#line 578 "../src/ast/lex.re" { end = tok[0] == quote; return static_cast(tok[0]); } -#line 2577 "src/ast/lex.cc" -yy420: +#line 2628 "src/ast/lex.cc" +yy432: ++YYCURSOR; -#line 566 "../src/ast/lex.re" +#line 573 "../src/ast/lex.re" { fatal_lc(l, c, "newline in character string"); } -#line 2582 "src/ast/lex.cc" -yy422: +#line 2633 "src/ast/lex.cc" +yy434: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy420; - goto yy419; -yy423: + if (yych == '\n') goto yy432; + goto yy431; +yy435: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '`') { if (yych <= '7') { if (yych <= '\f') { - if (yych == '\n') goto yy420; + if (yych == '\n') goto yy432; } else { - if (yych <= '\r') goto yy426; - if (yych <= '/') goto yy424; - if (yych <= '3') goto yy427; - goto yy429; + if (yych <= '\r') goto yy438; + if (yych <= '/') goto yy436; + if (yych <= '3') goto yy439; + goto yy441; } } else { if (yych <= 'W') { - if (yych == 'U') goto yy430; + if (yych == 'U') goto yy442; } else { - if (yych <= 'X') goto yy432; - if (yych == '\\') goto yy433; + if (yych <= 'X') goto yy444; + if (yych == '\\') goto yy445; } } } else { if (yych <= 'q') { if (yych <= 'e') { - if (yych <= 'a') goto yy435; - if (yych <= 'b') goto yy437; + if (yych <= 'a') goto yy447; + if (yych <= 'b') goto yy449; } else { - if (yych <= 'f') goto yy439; - if (yych == 'n') goto yy441; + if (yych <= 'f') goto yy451; + if (yych == 'n') goto yy453; } } else { if (yych <= 'u') { - if (yych <= 'r') goto yy443; - if (yych <= 's') goto yy424; - if (yych <= 't') goto yy445; - goto yy432; + if (yych <= 'r') goto yy455; + if (yych <= 's') goto yy436; + if (yych <= 't') goto yy457; + goto yy444; } else { - if (yych <= 'v') goto yy447; - if (yych == 'x') goto yy449; + if (yych <= 'v') goto yy459; + if (yych == 'x') goto yy461; } } } -yy424: +yy436: ++YYCURSOR; -yy425: -#line 585 "../src/ast/lex.re" +yy437: +#line 592 "../src/ast/lex.re" { if (tok[1] != quote) { warn.useless_escape(cline, get_column(), tok[1]); } return static_cast(tok[1]); } -#line 2638 "src/ast/lex.cc" -yy426: +#line 2689 "src/ast/lex.cc" +yy438: yych = (YYCTYPE)*++YYCURSOR; - if (yych == '\n') goto yy420; - goto yy425; -yy427: + if (yych == '\n') goto yy432; + goto yy437; +yy439: yyaccept = 0; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy428; - if (yych <= '7') goto yy450; -yy428: -#line 568 "../src/ast/lex.re" + if (yych <= '/') goto yy440; + if (yych <= '7') goto yy462; +yy440: +#line 575 "../src/ast/lex.re" { fatal_lc(l, c, "syntax error in octal escape sequence"); } -#line 2651 "src/ast/lex.cc" -yy429: +#line 2702 "src/ast/lex.cc" +yy441: ++YYCURSOR; - goto yy428; -yy430: + goto yy440; +yy442: yyaccept = 1; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); if (yych <= '@') { - if (yych <= '/') goto yy431; - if (yych <= '9') goto yy452; + if (yych <= '/') goto yy443; + if (yych <= '9') goto yy464; } else { - if (yych <= 'F') goto yy452; - if (yych <= '`') goto yy431; - if (yych <= 'f') goto yy452; + if (yych <= 'F') goto yy464; + if (yych <= '`') goto yy443; + if (yych <= 'f') goto yy464; } -yy431: -#line 567 "../src/ast/lex.re" +yy443: +#line 574 "../src/ast/lex.re" { fatal_lc(l, c, "syntax error in hexadecimal escape sequence"); } -#line 2669 "src/ast/lex.cc" -yy432: +#line 2720 "src/ast/lex.cc" +yy444: yyaccept = 1; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); if (yych <= '@') { - if (yych <= '/') goto yy431; - if (yych <= '9') goto yy453; - goto yy431; + if (yych <= '/') goto yy443; + if (yych <= '9') goto yy465; + goto yy443; } else { - if (yych <= 'F') goto yy453; - if (yych <= '`') goto yy431; - if (yych <= 'f') goto yy453; - goto yy431; + if (yych <= 'F') goto yy465; + if (yych <= '`') goto yy443; + if (yych <= 'f') goto yy465; + goto yy443; } -yy433: +yy445: ++YYCURSOR; -#line 584 "../src/ast/lex.re" +#line 591 "../src/ast/lex.re" { return static_cast('\\'); } -#line 2687 "src/ast/lex.cc" -yy435: +#line 2738 "src/ast/lex.cc" +yy447: ++YYCURSOR; -#line 577 "../src/ast/lex.re" +#line 584 "../src/ast/lex.re" { return static_cast('\a'); } -#line 2692 "src/ast/lex.cc" -yy437: +#line 2743 "src/ast/lex.cc" +yy449: ++YYCURSOR; -#line 578 "../src/ast/lex.re" +#line 585 "../src/ast/lex.re" { return static_cast('\b'); } -#line 2697 "src/ast/lex.cc" -yy439: +#line 2748 "src/ast/lex.cc" +yy451: ++YYCURSOR; -#line 579 "../src/ast/lex.re" +#line 586 "../src/ast/lex.re" { return static_cast('\f'); } -#line 2702 "src/ast/lex.cc" -yy441: +#line 2753 "src/ast/lex.cc" +yy453: ++YYCURSOR; -#line 580 "../src/ast/lex.re" +#line 587 "../src/ast/lex.re" { return static_cast('\n'); } -#line 2707 "src/ast/lex.cc" -yy443: +#line 2758 "src/ast/lex.cc" +yy455: ++YYCURSOR; -#line 581 "../src/ast/lex.re" +#line 588 "../src/ast/lex.re" { return static_cast('\r'); } -#line 2712 "src/ast/lex.cc" -yy445: +#line 2763 "src/ast/lex.cc" +yy457: ++YYCURSOR; -#line 582 "../src/ast/lex.re" +#line 589 "../src/ast/lex.re" { return static_cast('\t'); } -#line 2717 "src/ast/lex.cc" -yy447: +#line 2768 "src/ast/lex.cc" +yy459: ++YYCURSOR; -#line 583 "../src/ast/lex.re" +#line 590 "../src/ast/lex.re" { return static_cast('\v'); } -#line 2722 "src/ast/lex.cc" -yy449: +#line 2773 "src/ast/lex.cc" +yy461: yyaccept = 1; yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); if (yych <= '@') { - if (yych <= '/') goto yy431; - if (yych <= '9') goto yy454; - goto yy431; + if (yych <= '/') goto yy443; + if (yych <= '9') goto yy466; + goto yy443; } else { - if (yych <= 'F') goto yy454; - if (yych <= '`') goto yy431; - if (yych <= 'f') goto yy454; - goto yy431; + if (yych <= 'F') goto yy466; + if (yych <= '`') goto yy443; + if (yych <= 'f') goto yy466; + goto yy443; } -yy450: +yy462: yych = (YYCTYPE)*++YYCURSOR; - if (yych <= '/') goto yy451; - if (yych <= '7') goto yy455; -yy451: + if (yych <= '/') goto yy463; + if (yych <= '7') goto yy467; +yy463: YYCURSOR = YYMARKER; if (yyaccept == 0) { - goto yy428; + goto yy440; } else { - goto yy431; + goto yy443; } -yy452: +yy464: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy451; - if (yych <= '9') goto yy457; - goto yy451; + if (yych <= '/') goto yy463; + if (yych <= '9') goto yy469; + goto yy463; } else { - if (yych <= 'F') goto yy457; - if (yych <= '`') goto yy451; - if (yych <= 'f') goto yy457; - goto yy451; + if (yych <= 'F') goto yy469; + if (yych <= '`') goto yy463; + if (yych <= 'f') goto yy469; + goto yy463; } -yy453: +yy465: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy451; - if (yych <= '9') goto yy458; - goto yy451; + if (yych <= '/') goto yy463; + if (yych <= '9') goto yy470; + goto yy463; } else { - if (yych <= 'F') goto yy458; - if (yych <= '`') goto yy451; - if (yych <= 'f') goto yy458; - goto yy451; + if (yych <= 'F') goto yy470; + if (yych <= '`') goto yy463; + if (yych <= 'f') goto yy470; + goto yy463; } -yy454: +yy466: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy451; - if (yych <= '9') goto yy459; - goto yy451; + if (yych <= '/') goto yy463; + if (yych <= '9') goto yy471; + goto yy463; } else { - if (yych <= 'F') goto yy459; - if (yych <= '`') goto yy451; - if (yych <= 'f') goto yy459; - goto yy451; + if (yych <= 'F') goto yy471; + if (yych <= '`') goto yy463; + if (yych <= 'f') goto yy471; + goto yy463; } -yy455: +yy467: ++YYCURSOR; -#line 576 "../src/ast/lex.re" +#line 583 "../src/ast/lex.re" { return unesc_oct(tok, cur); } -#line 2787 "src/ast/lex.cc" -yy457: +#line 2838 "src/ast/lex.cc" +yy469: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy451; - if (yych <= '9') goto yy461; - goto yy451; + if (yych <= '/') goto yy463; + if (yych <= '9') goto yy473; + goto yy463; } else { - if (yych <= 'F') goto yy461; - if (yych <= '`') goto yy451; - if (yych <= 'f') goto yy461; - goto yy451; + if (yych <= 'F') goto yy473; + if (yych <= '`') goto yy463; + if (yych <= 'f') goto yy473; + goto yy463; } -yy458: +yy470: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy451; - if (yych <= '9') goto yy454; - goto yy451; + if (yych <= '/') goto yy463; + if (yych <= '9') goto yy466; + goto yy463; } else { - if (yych <= 'F') goto yy454; - if (yych <= '`') goto yy451; - if (yych <= 'f') goto yy454; - goto yy451; + if (yych <= 'F') goto yy466; + if (yych <= '`') goto yy463; + if (yych <= 'f') goto yy466; + goto yy463; } -yy459: +yy471: ++YYCURSOR; -#line 575 "../src/ast/lex.re" +#line 582 "../src/ast/lex.re" { return unesc_hex(tok, cur); } -#line 2816 "src/ast/lex.cc" -yy461: +#line 2867 "src/ast/lex.cc" +yy473: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy451; - if (yych >= ':') goto yy451; + if (yych <= '/') goto yy463; + if (yych >= ':') goto yy463; } else { - if (yych <= 'F') goto yy462; - if (yych <= '`') goto yy451; - if (yych >= 'g') goto yy451; + if (yych <= 'F') goto yy474; + if (yych <= '`') goto yy463; + if (yych >= 'g') goto yy463; } -yy462: +yy474: yych = (YYCTYPE)*++YYCURSOR; if (yych <= '@') { - if (yych <= '/') goto yy451; - if (yych <= '9') goto yy453; - goto yy451; + if (yych <= '/') goto yy463; + if (yych <= '9') goto yy465; + goto yy463; } else { - if (yych <= 'F') goto yy453; - if (yych <= '`') goto yy451; - if (yych <= 'f') goto yy453; - goto yy451; + if (yych <= 'F') goto yy465; + if (yych <= '`') goto yy463; + if (yych <= 'f') goto yy465; + goto yy463; } } -#line 591 "../src/ast/lex.re" +#line 598 "../src/ast/lex.re" } @@ -2856,7 +2907,7 @@ void Scanner::set_sourceline () sourceline: tok = cur; -#line 2860 "src/ast/lex.cc" +#line 2911 "src/ast/lex.cc" { YYCTYPE yych; static const unsigned char yybm[] = { @@ -2896,23 +2947,23 @@ sourceline: if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = (YYCTYPE)*YYCURSOR; if (yych <= '!') { - if (yych == '\n') goto yy467; + if (yych == '\n') goto yy479; } else { - if (yych <= '"') goto yy469; - if (yych <= '0') goto yy465; - if (yych <= '9') goto yy470; + if (yych <= '"') goto yy481; + if (yych <= '0') goto yy477; + if (yych <= '9') goto yy482; } -yy465: +yy477: ++YYCURSOR; -yy466: -#line 633 "../src/ast/lex.re" +yy478: +#line 640 "../src/ast/lex.re" { goto sourceline; } -#line 2913 "src/ast/lex.cc" -yy467: +#line 2964 "src/ast/lex.cc" +yy479: ++YYCURSOR; -#line 621 "../src/ast/lex.re" +#line 628 "../src/ast/lex.re" { if (cur == eof) { @@ -2925,19 +2976,19 @@ yy467: tok = cur; return; } -#line 2929 "src/ast/lex.cc" -yy469: +#line 2980 "src/ast/lex.cc" +yy481: yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR); - if (yych == '\n') goto yy466; - goto yy474; -yy470: + if (yych == '\n') goto yy478; + goto yy486; +yy482: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; if (yybm[0+yych] & 64) { - goto yy470; + goto yy482; } -#line 610 "../src/ast/lex.re" +#line 617 "../src/ast/lex.re" { if (!s_to_u32_unsafe (tok, cur, cline)) { @@ -2945,37 +2996,37 @@ yy470: } goto sourceline; } -#line 2949 "src/ast/lex.cc" -yy473: +#line 3000 "src/ast/lex.cc" +yy485: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; -yy474: +yy486: if (yybm[0+yych] & 128) { - goto yy473; + goto yy485; } - if (yych <= '\n') goto yy475; - if (yych <= '"') goto yy476; - goto yy478; -yy475: + if (yych <= '\n') goto yy487; + if (yych <= '"') goto yy488; + goto yy490; +yy487: YYCURSOR = YYMARKER; - goto yy466; -yy476: + goto yy478; +yy488: ++YYCURSOR; -#line 617 "../src/ast/lex.re" +#line 624 "../src/ast/lex.re" { escape (in.file_name, std::string (tok + 1, tok_len () - 2)); // -2 to omit quotes goto sourceline; } -#line 2971 "src/ast/lex.cc" -yy478: +#line 3022 "src/ast/lex.cc" +yy490: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); yych = (YYCTYPE)*YYCURSOR; - if (yych == '\n') goto yy475; - goto yy473; + if (yych == '\n') goto yy487; + goto yy485; } -#line 636 "../src/ast/lex.re" +#line 643 "../src/ast/lex.re" } diff --git a/re2c/src/adfa/adfa.cc b/re2c/src/adfa/adfa.cc index c462b0f5..99147e23 100644 --- a/re2c/src/adfa/adfa.cc +++ b/re2c/src/adfa/adfa.cc @@ -42,6 +42,7 @@ DFA::DFA , finvers(dfa.finvers) , tcpool(dfa.tcpool) , max_fill (0) + , max_nmatch(0) , need_backup (false) , need_accept (false) , oldstyle_ctxmarker (false) diff --git a/re2c/src/adfa/adfa.h b/re2c/src/adfa/adfa.h index 7df2d972..48259dd3 100644 --- a/re2c/src/adfa/adfa.h +++ b/re2c/src/adfa/adfa.h @@ -77,6 +77,7 @@ struct DFA const tagver_t *finvers; tcpool_t &tcpool; size_t max_fill; + size_t max_nmatch; bool need_backup; bool need_accept; bool oldstyle_ctxmarker; diff --git a/re2c/src/adfa/prepare.cc b/re2c/src/adfa/prepare.cc index f4a5f16e..362308d1 100644 --- a/re2c/src/adfa/prepare.cc +++ b/re2c/src/adfa/prepare.cc @@ -245,6 +245,13 @@ void DFA::calc_stats(uint32_t ln, bool explicit_tags) } } + // calculate 'YYMAXNMATCH' + max_nmatch = 0; + const size_t nrule = rules.size(); + for (size_t i = 0; i < nrule; ++i) { + max_nmatch = std::max(max_nmatch, rules[i].ncap); + } + // determine if 'YYMARKER' or 'YYBACKUP'/'YYRESTORE' pair is used need_backup = accepts.size () > 0; diff --git a/re2c/src/ast/lex.re b/re2c/src/ast/lex.re index 3ff738d9..ab3b85ec 100644 --- a/re2c/src/ast/lex.re +++ b/re2c/src/ast/lex.re @@ -97,6 +97,13 @@ echo: goto echo; } + "/*!maxnmatch:re2c" { + out.wraw(tok, ptr); + out.wdelay_yymaxnmatch(); + lex_end_of_comment(out); + goto echo; + } + "/*!getstate:re2c" { out.wraw(tok, ptr); out.wdelay_state_goto(0); diff --git a/re2c/src/code/emit_action.cc b/re2c/src/code/emit_action.cc index 3a9dfc27..d37d41ce 100644 --- a/re2c/src/code/emit_action.cc +++ b/re2c/src/code/emit_action.cc @@ -165,11 +165,8 @@ void emit_rule(OutputFile &o, uint32_t ind, const DFA &dfa, size_t rule_idx) const Rule &rule = dfa.rules[rule_idx]; const Code *code = rule.code; const std::string &cond = code->cond; - const bool wrap = rule.ncap > 0; std::string s; - if (wrap) o.wind(ind++).ws("{\n"); - gen_fintags(o, ind, dfa, rule); if (opts->target == TARGET_SKELETON) { @@ -195,8 +192,6 @@ void emit_rule(OutputFile &o, uint32_t ind, const DFA &dfa, size_t rule_idx) o.wind(ind).wstring(s).ws("\n"); } } - - if (wrap) o.wind(--ind).ws("}\n"); } void need(OutputFile &o, uint32_t ind, size_t some) @@ -389,8 +384,7 @@ void gen_fintags(OutputFile &o, uint32_t ind, const DFA &dfa, const Rule &rule) const tagver_t *fins = dfa.finvers; if (rule.ncap > 0) { - o.wind(ind).ws("const size_t yynmatch = ").wu64(rule.ncap).ws(";\n"); - o.wind(ind).ws("const ").wstring(opts->yyctype).ws(" *yypmatch[yynmatch * 2];\n"); + o.wind(ind).ws("yynmatch = ").wu64(rule.ncap).ws(";\n"); } // variable tags diff --git a/re2c/src/code/emit_dfa.cc b/re2c/src/code/emit_dfa.cc index 8f73b314..18c600a0 100644 --- a/re2c/src/code/emit_dfa.cc +++ b/re2c/src/code/emit_dfa.cc @@ -179,9 +179,9 @@ void DFA::emit(Output & output, uint32_t& ind, bool isLastCond, bool& bPrologBra if (opts->target == TARGET_SKELETON) { if (output.skeletons.insert (name).second) { - emit_start(o, max_fill, name, key_size, def_rule, need_backup, - need_accept, oldstyle_ctxmarker, stagnames, stagvars, - mtagnames, mtagvars, bitmaps); + emit_start(o, max_fill, max_nmatch, name, key_size, def_rule, + need_backup, need_accept, oldstyle_ctxmarker, + stagnames, stagvars, mtagnames, mtagvars, bitmaps); uint32_t i = 2; emit_body (o, i, used_labels, initial_label); emit_end(o, name, need_backup, oldstyle_ctxmarker, mtagnames); diff --git a/re2c/src/code/output.cc b/re2c/src/code/output.cc index a1c52985..0695c341 100644 --- a/re2c/src/code/output.cc +++ b/re2c/src/code/output.cc @@ -294,6 +294,15 @@ OutputFile & OutputFile::wdelay_yymaxfill () return *this; } +OutputFile& OutputFile::wdelay_yymaxnmatch() +{ + if (block().opts->target == TARGET_CODE + && block().opts->posix_captures) { + block().fragments.push_back (new OutputFragment (OutputFragment::YYMAXNMATCH, 0)); + } + return *this; +} + OutputFile& OutputFile::wdelay_skip(uint32_t ind, bool skip) { if (skip) { @@ -411,7 +420,7 @@ static void foldexpr(std::vector &frags) bool OutputFile::emit(const uniq_vector_t &global_types, const std::set &global_stags, const std::set &global_mtags, - size_t max_fill) + size_t max_fill, size_t max_nmatch) { FILE *file = NULL; std::string filename = block().opts->output_file; @@ -472,6 +481,9 @@ bool OutputFile::emit(const uniq_vector_t &global_types, case OutputFragment::YYMAXFILL: output_yymaxfill(o, ind, max_fill, bopt); break; + case OutputFragment::YYMAXNMATCH: + output_yymaxnmatch(o, ind, max_nmatch, bopt); + break; case OutputFragment::SKIP: output_skip(o, ind, bopt); break; @@ -542,6 +554,7 @@ Output::Output(Warn &w) , header() , skeletons() , max_fill(1) + , max_nmatch(1) {} bool Output::emit() @@ -557,7 +570,7 @@ bool Output::emit() // global options are last block's options const opt_t *opts = source.block().opts; - return source.emit(types, stags, mtags, max_fill) + return source.emit(types, stags, mtags, max_fill, max_nmatch) && header.emit(opts, types); } @@ -623,6 +636,12 @@ void output_yymaxfill(std::ostream &o, uint32_t ind, o << indent(ind, opts->indString) << "#define YYMAXFILL " << max_fill << "\n"; } +void output_yymaxnmatch(std::ostream &o, uint32_t ind, + size_t max_nmatch, const opt_t *opts) +{ + o << indent(ind, opts->indString) << "#define YYMAXNMATCH " << max_nmatch << "\n"; +} + void output_line_info(std::ostream &o, uint32_t line, const std::string &fname, bool iflag) { diff --git a/re2c/src/code/output.h b/re2c/src/code/output.h index 5f093c4c..6b769aa7 100644 --- a/re2c/src/code/output.h +++ b/re2c/src/code/output.h @@ -48,6 +48,7 @@ struct OutputFragment , TYPES , YYACCEPT_INIT , YYMAXFILL + , YYMAXNMATCH , SKIP , PEEK , BACKUP @@ -136,6 +137,7 @@ public: OutputFile & wdelay_types (); OutputFile & wdelay_yyaccept_init (uint32_t ind); OutputFile & wdelay_yymaxfill (); + OutputFile& wdelay_yymaxnmatch(); OutputFile& wdelay_skip(uint32_t ind, bool skip); OutputFile& wdelay_peek(uint32_t ind, bool peek); OutputFile& wdelay_backup(uint32_t ind, bool backup); @@ -145,7 +147,8 @@ public: bool emit(const uniq_vector_t &global_types, const std::set &global_stags, - const std::set &global_mtags, size_t max_fill); + const std::set &global_mtags, + size_t max_fill, size_t max_nmatch); FORBID_COPY (OutputFile); }; @@ -166,6 +169,7 @@ struct Output HeaderFile header; std::set skeletons; size_t max_fill; + size_t max_nmatch; explicit Output(Warn &w); bool emit(); @@ -180,6 +184,7 @@ void output_types (std::ostream &o, uint32_t ind, const opt_t *opts, con void output_version_time (std::ostream &o, bool version, bool date); void output_yyaccept_init (std::ostream &o, uint32_t ind, bool, const opt_t *opts); void output_yymaxfill (std::ostream &o, uint32_t ind, size_t max_fill, const opt_t *opts); +void output_yymaxnmatch (std::ostream &o, uint32_t ind, size_t max_nmatch, const opt_t *opts); } // namespace re2c diff --git a/re2c/src/compile.cc b/re2c/src/compile.cc index 21c3439a..51ac7e21 100644 --- a/re2c/src/compile.cc +++ b/re2c/src/compile.cc @@ -109,7 +109,8 @@ static smart_ptr ast_to_dfa(const spec_t &spec, Output &output) adfa->calc_stats(line, opts->tags); // accumulate global statistics from this particular DFA - output.max_fill = std::max (output.max_fill, adfa->max_fill); + output.max_fill = std::max(output.max_fill, adfa->max_fill); + output.max_nmatch = std::max(output.max_nmatch, adfa->max_nmatch); if (adfa->need_accept) { output.source.block().used_yyaccept = true; diff --git a/re2c/src/skeleton/generate_code.cc b/re2c/src/skeleton/generate_code.cc index e5b6ef60..ca85d585 100644 --- a/re2c/src/skeleton/generate_code.cc +++ b/re2c/src/skeleton/generate_code.cc @@ -46,6 +46,7 @@ static void from_le(OutputFile &o, uint32_t ind, size_t size, const char *expr) void emit_prolog(OutputFile &o) { + o.ws("\n#include /* size_t */"); o.ws("\n#include "); o.ws("\n#include /* malloc, free */"); o.ws("\n#include /* memcpy */"); @@ -97,7 +98,7 @@ void emit_prolog(OutputFile &o) o.ws("\n"); } -void emit_start(OutputFile &o, size_t maxfill, const std::string &name, +void emit_start(OutputFile &o, size_t maxfill, size_t maxnmatch, const std::string &name, size_t sizeof_key, size_t def, bool backup, bool accept, bool oldstyle_ctxmarker, const std::set &stagnames, const std::set &stagvars, const std::set &mtagnames, const std::set &mtagvars, @@ -323,6 +324,10 @@ void emit_start(OutputFile &o, size_t maxfill, const std::string &name, o.ws("\n").wind(1).ws("const YYCTYPE *limit = NULL;"); o.ws("\n").wind(1).ws("const YYCTYPE *token = NULL;"); o.ws("\n").wind(1).ws("const YYCTYPE *eof = NULL;"); + if (opts->posix_captures) { + o.ws("\n").wind(1).ws("size_t yynmatch;"); + o.ws("\n").wind(1).ws("const YYCTYPE *yypmatch[").wu64(maxnmatch).ws(" * 2];"); + } o.ws("\n").wind(1).ws("unsigned int i = 0;"); if (!mtagnames.empty()) { o.ws("\n"); diff --git a/re2c/src/skeleton/skeleton.h b/re2c/src/skeleton/skeleton.h index 206365e1..d565ccba 100644 --- a/re2c/src/skeleton/skeleton.h +++ b/re2c/src/skeleton/skeleton.h @@ -110,7 +110,7 @@ void warn_undefined_control_flow(const Skeleton &skel, Warn &warn); void fprint_default_path(FILE *f, const Skeleton &skel, const path_t &p); void emit_data(const Skeleton &skel); void emit_prolog(OutputFile & o); -void emit_start(OutputFile &o, size_t maxfill, const std::string &name, +void emit_start(OutputFile &o, size_t maxfill, size_t maxnmatch, const std::string &name, size_t sizeof_key, size_t def, bool backup, bool accept, bool oldstyle_ctxmarker, const std::set &stagnames, const std::set &stagvars, const std::set &mtagnames, const std::set &mtagvars, diff --git a/re2c/test/bug1163046.--skeleton.c b/re2c/test/bug1163046.--skeleton.c index cd121a1a..bd7fbe1f 100644 --- a/re2c/test/bug1163046.--skeleton.c +++ b/re2c/test/bug1163046.--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/calc_008.b--skeleton.c b/re2c/test/calc_008.b--skeleton.c index 559ef210..ec125e2d 100644 --- a/re2c/test/calc_008.b--skeleton.c +++ b/re2c/test/calc_008.b--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/condition_10.cgif--skeleton.c b/re2c/test/condition_10.cgif--skeleton.c index 5c785395..a21253a7 100644 --- a/re2c/test/condition_10.cgif--skeleton.c +++ b/re2c/test/condition_10.cgif--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/config10.--skeleton.c b/re2c/test/config10.--skeleton.c index 9fa00fe3..9773e391 100644 Binary files a/re2c/test/config10.--skeleton.c and b/re2c/test/config10.--skeleton.c differ diff --git a/re2c/test/control_flow_fail.--skeleton.c b/re2c/test/control_flow_fail.--skeleton.c index 1e6df074..7f33d56d 100644 Binary files a/re2c/test/control_flow_fail.--skeleton.c and b/re2c/test/control_flow_fail.--skeleton.c differ diff --git a/re2c/test/control_flow_ok.--skeleton.c b/re2c/test/control_flow_ok.--skeleton.c index 0f45a8f6..a6a74ba9 100644 Binary files a/re2c/test/control_flow_ok.--skeleton.c and b/re2c/test/control_flow_ok.--skeleton.c differ diff --git a/re2c/test/control_flow_yymarker_fail.--skeleton.c b/re2c/test/control_flow_yymarker_fail.--skeleton.c index 2708298a..3539a847 100644 Binary files a/re2c/test/control_flow_yymarker_fail.--skeleton.c and b/re2c/test/control_flow_yymarker_fail.--skeleton.c differ diff --git a/re2c/test/control_flow_yymarker_ok.--skeleton.c b/re2c/test/control_flow_yymarker_ok.--skeleton.c index 8065b367..37021630 100644 Binary files a/re2c/test/control_flow_yymarker_ok.--skeleton.c and b/re2c/test/control_flow_yymarker_ok.--skeleton.c differ diff --git a/re2c/test/control_flow_yymarker_yyaccept_fail.--skeleton.c b/re2c/test/control_flow_yymarker_yyaccept_fail.--skeleton.c index 2b48eff2..d37d63f4 100644 Binary files a/re2c/test/control_flow_yymarker_yyaccept_fail.--skeleton.c and b/re2c/test/control_flow_yymarker_yyaccept_fail.--skeleton.c differ diff --git a/re2c/test/control_flow_yymarker_yyaccept_ok.--skeleton.c b/re2c/test/control_flow_yymarker_yyaccept_ok.--skeleton.c index 08974ba2..eadfb8e5 100644 Binary files a/re2c/test/control_flow_yymarker_yyaccept_ok.--skeleton.c and b/re2c/test/control_flow_yymarker_yyaccept_ok.--skeleton.c differ diff --git a/re2c/test/ctx.--skeleton.c b/re2c/test/ctx.--skeleton.c index 8db1733e..1db07426 100644 Binary files a/re2c/test/ctx.--skeleton.c and b/re2c/test/ctx.--skeleton.c differ diff --git a/re2c/test/input_custom_default.--skeleton--input(custom).c b/re2c/test/input_custom_default.--skeleton--input(custom).c index cf4cd8dc..8387d18d 100644 Binary files a/re2c/test/input_custom_default.--skeleton--input(custom).c and b/re2c/test/input_custom_default.--skeleton--input(custom).c differ diff --git a/re2c/test/input_custom_fgetc.--skeleton--input(custom).c b/re2c/test/input_custom_fgetc.--skeleton--input(custom).c index b1c1d420..1b7f65ee 100644 Binary files a/re2c/test/input_custom_fgetc.--skeleton--input(custom).c and b/re2c/test/input_custom_fgetc.--skeleton--input(custom).c differ diff --git a/re2c/test/input_custom_istringstream.--skeleton--input(custom).c b/re2c/test/input_custom_istringstream.--skeleton--input(custom).c index 98bab4cf..e3f99c12 100644 Binary files a/re2c/test/input_custom_istringstream.--skeleton--input(custom).c and b/re2c/test/input_custom_istringstream.--skeleton--input(custom).c differ diff --git a/re2c/test/input_custom_mjson.--skeleton--input(custom).c b/re2c/test/input_custom_mjson.--skeleton--input(custom).c index e606b50e..4c334f61 100644 --- a/re2c/test/input_custom_mjson.--skeleton--input(custom).c +++ b/re2c/test/input_custom_mjson.--skeleton--input(custom).c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/php20150211_parse_iso_intervals.ig--skeleton.c b/re2c/test/php20150211_parse_iso_intervals.ig--skeleton.c index 74a60889..b0ae216b 100644 --- a/re2c/test/php20150211_parse_iso_intervals.ig--skeleton.c +++ b/re2c/test/php20150211_parse_iso_intervals.ig--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c b/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c index e05f425a..2d5ace6a 100644 --- a/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c +++ b/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/php20150211_pdo_sql_parser_trimmed.ig--skeleton.c b/re2c/test/php20150211_pdo_sql_parser_trimmed.ig--skeleton.c index 19d50ba1..91607066 100644 --- a/re2c/test/php20150211_pdo_sql_parser_trimmed.ig--skeleton.c +++ b/re2c/test/php20150211_pdo_sql_parser_trimmed.ig--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/php20150211_phar_path_check.ig--skeleton.c b/re2c/test/php20150211_phar_path_check.ig--skeleton.c index 0919004f..fe5f74db 100644 --- a/re2c/test/php20150211_phar_path_check.ig--skeleton.c +++ b/re2c/test/php20150211_phar_path_check.ig--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/php20150211_url_scanner_ex.ig--skeleton.c b/re2c/test/php20150211_url_scanner_ex.ig--skeleton.c index d0234aad..159b2e9d 100644 --- a/re2c/test/php20150211_url_scanner_ex.ig--skeleton.c +++ b/re2c/test/php20150211_url_scanner_ex.ig--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/php20150211_var_unserializer.ig--skeleton.c b/re2c/test/php20150211_var_unserializer.ig--skeleton.c index 91311ced..b8f85b04 100644 --- a/re2c/test/php20150211_var_unserializer.ig--skeleton.c +++ b/re2c/test/php20150211_var_unserializer.ig--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/php20150211_zend_ini_scanner.igcd--skeleton--flex-syntax--case-inverted.c b/re2c/test/php20150211_zend_ini_scanner.igcd--skeleton--flex-syntax--case-inverted.c index e1990322..b01dc416 100644 --- a/re2c/test/php20150211_zend_ini_scanner.igcd--skeleton--flex-syntax--case-inverted.c +++ b/re2c/test/php20150211_zend_ini_scanner.igcd--skeleton--flex-syntax--case-inverted.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ 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 02e23d2d..d115ee27 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 @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/posix_captures/.run/__run.sh b/re2c/test/posix_captures/.run/__run.sh index c4eb3f01..37053452 100755 --- a/re2c/test/posix_captures/.run/__run.sh +++ b/re2c/test/posix_captures/.run/__run.sh @@ -1,7 +1,7 @@ # run [re2c-flags] run() { - re2c=../../../.build/re2c + re2c="../../../__build/re2c" f="test_"`date +%y%m%d%H%M%S` fail=0 diff --git a/re2c/test/posix_captures/.run/template b/re2c/test/posix_captures/.run/template index fdb5238d..adc96bb4 100644 --- a/re2c/test/posix_captures/.run/template +++ b/re2c/test/posix_captures/.run/template @@ -1,8 +1,12 @@ +#include #include static int lex(const char *YYCURSOR) { const char *YYMARKER; + /*!maxnmatch:re2c*/ + size_t yynmatch; + const char *yypmatch[YYMAXNMATCH * 2]; /*!stags:re2c format = "const char *@@;"; */ /*!re2c re2c:yyfill:enable = 0; diff --git a/re2c/test/posix_captures/basic/01.i--flex-syntax.c b/re2c/test/posix_captures/basic/01.i--flex-syntax.c index d458b0c9..f5a76faa 100644 --- a/re2c/test/posix_captures/basic/01.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/01.i--flex-syntax.c @@ -12,17 +12,14 @@ yyt2 = yyt3 = yyt4 = yyt5 = NULL; yyt1 = YYCURSOR; yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; diff --git a/re2c/test/posix_captures/basic/02.i--flex-syntax.c b/re2c/test/posix_captures/basic/02.i--flex-syntax.c index d458b0c9..f5a76faa 100644 --- a/re2c/test/posix_captures/basic/02.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/02.i--flex-syntax.c @@ -12,17 +12,14 @@ yyt2 = yyt3 = yyt4 = yyt5 = NULL; yyt1 = YYCURSOR; yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; diff --git a/re2c/test/posix_captures/basic/03.i--flex-syntax.c b/re2c/test/posix_captures/basic/03.i--flex-syntax.c index 46e0014a..6af69473 100644 --- a/re2c/test/posix_captures/basic/03.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/03.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -43,17 +40,14 @@ yy5: } yy6: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/basic/04.i--flex-syntax.c b/re2c/test/posix_captures/basic/04.i--flex-syntax.c index eede3443..1f44040f 100644 --- a/re2c/test/posix_captures/basic/04.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/04.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -37,15 +34,12 @@ yy5: } yy6: ++YYCURSOR; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[0] = YYCURSOR - 3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[0] = YYCURSOR - 3; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/05.i--flex-syntax.c b/re2c/test/posix_captures/basic/05.i--flex-syntax.c index b62acfe4..929f6328 100644 --- a/re2c/test/posix_captures/basic/05.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/05.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); @@ -68,19 +65,16 @@ yy9: default: goto yy10; } yy10: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[6] = yyt3; - yypmatch[7] = yyt4; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = yyt3; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[6] = yyt3; + yypmatch[7] = yyt4; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = yyt3; + {} yy11: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/06.i--flex-syntax.c b/re2c/test/posix_captures/basic/06.i--flex-syntax.c index b62acfe4..929f6328 100644 --- a/re2c/test/posix_captures/basic/06.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/06.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); @@ -68,19 +65,16 @@ yy9: default: goto yy10; } yy10: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[6] = yyt3; - yypmatch[7] = yyt4; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = yyt3; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[6] = yyt3; + yypmatch[7] = yyt4; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = yyt3; + {} yy11: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/07.i--flex-syntax.c b/re2c/test/posix_captures/basic/07.i--flex-syntax.c index 00c2ab7d..9ec45b91 100644 --- a/re2c/test/posix_captures/basic/07.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/07.i--flex-syntax.c @@ -11,27 +11,21 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; yyt2 = YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[4] = yyt1; - yypmatch[5] = yyt2; - yypmatch[0] = YYCURSOR - 1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 1; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[4] = yyt1; + yypmatch[5] = yyt2; + yypmatch[0] = YYCURSOR - 1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 1; + yypmatch[3] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/08.i--flex-syntax.c b/re2c/test/posix_captures/basic/08.i--flex-syntax.c index e67369bc..e68ac071 100644 --- a/re2c/test/posix_captures/basic/08.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/08.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -29,17 +26,14 @@ yy3: default: goto yy5; } yy5: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/09.i--flex-syntax.c b/re2c/test/posix_captures/basic/09.i--flex-syntax.c index ce752a5e..99cfb739 100644 --- a/re2c/test/posix_captures/basic/09.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/09.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy8; @@ -26,15 +23,12 @@ yy3: yy5: ++YYCURSOR; yy6: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 2; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 2; + yypmatch[3] = YYCURSOR; + {} yy7: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/10.i--flex-syntax.c b/re2c/test/posix_captures/basic/10.i--flex-syntax.c index 99cf3dd9..ec2b7aea 100644 --- a/re2c/test/posix_captures/basic/10.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/10.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -48,19 +45,16 @@ yy6: yyt4 = yyt5 = yyt6 = yyt7 = NULL; yyt3 = YYCURSOR; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[6] = yyt6; - yypmatch[7] = yyt7; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[6] = yyt6; + yypmatch[7] = yyt7; + yypmatch[1] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/basic/11.i--flex-syntax.c b/re2c/test/posix_captures/basic/11.i--flex-syntax.c index d92f686a..847505ad 100644 --- a/re2c/test/posix_captures/basic/11.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/11.i--flex-syntax.c @@ -19,15 +19,12 @@ goto yy3; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/12.i--flex-syntax.c b/re2c/test/posix_captures/basic/12.i--flex-syntax.c index f938a291..74ee05cf 100644 --- a/re2c/test/posix_captures/basic/12.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/12.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -48,17 +45,14 @@ yy6: yyt1 = yyt2 = NULL; yyt4 = YYCURSOR; yy7: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[0] = YYCURSOR - 2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[0] = YYCURSOR - 2; + yypmatch[1] = YYCURSOR; + {} yy8: ++YYCURSOR; yyt3 = yyt4 = NULL; diff --git a/re2c/test/posix_captures/basic/13.i--flex-syntax.c b/re2c/test/posix_captures/basic/13.i--flex-syntax.c index f938a291..74ee05cf 100644 --- a/re2c/test/posix_captures/basic/13.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/13.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -48,17 +45,14 @@ yy6: yyt1 = yyt2 = NULL; yyt4 = YYCURSOR; yy7: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[0] = YYCURSOR - 2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[0] = YYCURSOR - 2; + yypmatch[1] = YYCURSOR; + {} yy8: ++YYCURSOR; yyt3 = yyt4 = NULL; diff --git a/re2c/test/posix_captures/basic/14.i--flex-syntax.c b/re2c/test/posix_captures/basic/14.i--flex-syntax.c index 5344db7b..02316976 100644 --- a/re2c/test/posix_captures/basic/14.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/14.i--flex-syntax.c @@ -16,13 +16,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -43,17 +40,14 @@ yy5: yy6: ++YYCURSOR; yyt3 = NULL; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt4; - yypmatch[3] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt4; + yypmatch[3] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt3; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/15.i--flex-syntax.c b/re2c/test/posix_captures/basic/15.i--flex-syntax.c index 36b6a098..25df7b2d 100644 --- a/re2c/test/posix_captures/basic/15.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/15.i--flex-syntax.c @@ -10,13 +10,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -57,17 +54,14 @@ yy7: yyt4 = yyt5 = NULL; yyt3 = YYCURSOR; yy8: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[1] = YYCURSOR; + {} yy9: yyaccept = 1; YYMARKER = ++YYCURSOR; diff --git a/re2c/test/posix_captures/basic/16.i--flex-syntax.c b/re2c/test/posix_captures/basic/16.i--flex-syntax.c index 4b38c2df..29470f09 100644 --- a/re2c/test/posix_captures/basic/16.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/16.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -70,15 +67,12 @@ yy10: } yy11: ++YYCURSOR; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 4; - yypmatch[3] = YYCURSOR - 2; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 4; + yypmatch[3] = YYCURSOR - 2; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/17.i--flex-syntax.c b/re2c/test/posix_captures/basic/17.i--flex-syntax.c index 4b38c2df..29470f09 100644 --- a/re2c/test/posix_captures/basic/17.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/17.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -70,15 +67,12 @@ yy10: } yy11: ++YYCURSOR; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 4; - yypmatch[3] = YYCURSOR - 2; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 4; + yypmatch[3] = YYCURSOR - 2; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/18.i--flex-syntax.c b/re2c/test/posix_captures/basic/18.i--flex-syntax.c index 3cacffb4..a116caff 100644 --- a/re2c/test/posix_captures/basic/18.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/18.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -40,13 +37,10 @@ yy5: default: goto yy6; } yy6: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/basic/19.i--flex-syntax.c b/re2c/test/posix_captures/basic/19.i--flex-syntax.c index fea5bfc7..c38420f3 100644 --- a/re2c/test/posix_captures/basic/19.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/19.i--flex-syntax.c @@ -14,17 +14,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/basic/20.i--flex-syntax.c b/re2c/test/posix_captures/basic/20.i--flex-syntax.c index 8370719e..87189ff9 100644 --- a/re2c/test/posix_captures/basic/20.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/20.i--flex-syntax.c @@ -18,17 +18,14 @@ goto yy3; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt5; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt5; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/basic/21.i--flex-syntax.c b/re2c/test/posix_captures/basic/21.i--flex-syntax.c index 078eb9bc..4710b20f 100644 --- a/re2c/test/posix_captures/basic/21.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/21.i--flex-syntax.c @@ -9,13 +9,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -33,19 +30,16 @@ yy5: } yy6: ++YYCURSOR; - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR - 3; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 3; - yypmatch[3] = YYCURSOR - 2; - yypmatch[4] = YYCURSOR - 2; - yypmatch[5] = YYCURSOR - 1; - yypmatch[6] = YYCURSOR - 1; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = YYCURSOR - 3; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 3; + yypmatch[3] = YYCURSOR - 2; + yypmatch[4] = YYCURSOR - 2; + yypmatch[5] = YYCURSOR - 1; + yypmatch[6] = YYCURSOR - 1; + yypmatch[7] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/22.i--flex-syntax.c b/re2c/test/posix_captures/basic/22.i--flex-syntax.c index 66f5e7f0..7da1611b 100644 --- a/re2c/test/posix_captures/basic/22.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/22.i--flex-syntax.c @@ -9,82 +9,76 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; - { - const size_t yynmatch = 31; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR - 1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 1; - yypmatch[3] = YYCURSOR; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - yypmatch[6] = YYCURSOR - 1; - yypmatch[7] = YYCURSOR; - yypmatch[8] = YYCURSOR - 1; - yypmatch[9] = YYCURSOR; - yypmatch[10] = YYCURSOR - 1; - yypmatch[11] = YYCURSOR; - yypmatch[12] = YYCURSOR - 1; - yypmatch[13] = YYCURSOR; - yypmatch[14] = YYCURSOR - 1; - yypmatch[15] = YYCURSOR; - yypmatch[16] = YYCURSOR - 1; - yypmatch[17] = YYCURSOR; - yypmatch[18] = YYCURSOR - 1; - yypmatch[19] = YYCURSOR; - yypmatch[20] = YYCURSOR - 1; - yypmatch[21] = YYCURSOR; - yypmatch[22] = YYCURSOR - 1; - yypmatch[23] = YYCURSOR; - yypmatch[24] = YYCURSOR - 1; - yypmatch[25] = YYCURSOR; - yypmatch[26] = YYCURSOR - 1; - yypmatch[27] = YYCURSOR; - yypmatch[28] = YYCURSOR - 1; - yypmatch[29] = YYCURSOR; - yypmatch[30] = YYCURSOR - 1; - yypmatch[31] = YYCURSOR; - yypmatch[32] = YYCURSOR - 1; - yypmatch[33] = YYCURSOR; - yypmatch[34] = YYCURSOR - 1; - yypmatch[35] = YYCURSOR; - yypmatch[36] = YYCURSOR - 1; - yypmatch[37] = YYCURSOR; - yypmatch[38] = YYCURSOR - 1; - yypmatch[39] = YYCURSOR; - yypmatch[40] = YYCURSOR - 1; - yypmatch[41] = YYCURSOR; - yypmatch[42] = YYCURSOR - 1; - yypmatch[43] = YYCURSOR; - yypmatch[44] = YYCURSOR - 1; - yypmatch[45] = YYCURSOR; - yypmatch[46] = YYCURSOR - 1; - yypmatch[47] = YYCURSOR; - yypmatch[48] = YYCURSOR - 1; - yypmatch[49] = YYCURSOR; - yypmatch[50] = YYCURSOR - 1; - yypmatch[51] = YYCURSOR; - yypmatch[52] = YYCURSOR - 1; - yypmatch[53] = YYCURSOR; - yypmatch[54] = YYCURSOR - 1; - yypmatch[55] = YYCURSOR; - yypmatch[56] = YYCURSOR - 1; - yypmatch[57] = YYCURSOR; - yypmatch[58] = YYCURSOR - 1; - yypmatch[59] = YYCURSOR; - yypmatch[60] = YYCURSOR - 1; - yypmatch[61] = YYCURSOR; - {} - } + yynmatch = 31; + yypmatch[0] = YYCURSOR - 1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 1; + yypmatch[3] = YYCURSOR; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + yypmatch[6] = YYCURSOR - 1; + yypmatch[7] = YYCURSOR; + yypmatch[8] = YYCURSOR - 1; + yypmatch[9] = YYCURSOR; + yypmatch[10] = YYCURSOR - 1; + yypmatch[11] = YYCURSOR; + yypmatch[12] = YYCURSOR - 1; + yypmatch[13] = YYCURSOR; + yypmatch[14] = YYCURSOR - 1; + yypmatch[15] = YYCURSOR; + yypmatch[16] = YYCURSOR - 1; + yypmatch[17] = YYCURSOR; + yypmatch[18] = YYCURSOR - 1; + yypmatch[19] = YYCURSOR; + yypmatch[20] = YYCURSOR - 1; + yypmatch[21] = YYCURSOR; + yypmatch[22] = YYCURSOR - 1; + yypmatch[23] = YYCURSOR; + yypmatch[24] = YYCURSOR - 1; + yypmatch[25] = YYCURSOR; + yypmatch[26] = YYCURSOR - 1; + yypmatch[27] = YYCURSOR; + yypmatch[28] = YYCURSOR - 1; + yypmatch[29] = YYCURSOR; + yypmatch[30] = YYCURSOR - 1; + yypmatch[31] = YYCURSOR; + yypmatch[32] = YYCURSOR - 1; + yypmatch[33] = YYCURSOR; + yypmatch[34] = YYCURSOR - 1; + yypmatch[35] = YYCURSOR; + yypmatch[36] = YYCURSOR - 1; + yypmatch[37] = YYCURSOR; + yypmatch[38] = YYCURSOR - 1; + yypmatch[39] = YYCURSOR; + yypmatch[40] = YYCURSOR - 1; + yypmatch[41] = YYCURSOR; + yypmatch[42] = YYCURSOR - 1; + yypmatch[43] = YYCURSOR; + yypmatch[44] = YYCURSOR - 1; + yypmatch[45] = YYCURSOR; + yypmatch[46] = YYCURSOR - 1; + yypmatch[47] = YYCURSOR; + yypmatch[48] = YYCURSOR - 1; + yypmatch[49] = YYCURSOR; + yypmatch[50] = YYCURSOR - 1; + yypmatch[51] = YYCURSOR; + yypmatch[52] = YYCURSOR - 1; + yypmatch[53] = YYCURSOR; + yypmatch[54] = YYCURSOR - 1; + yypmatch[55] = YYCURSOR; + yypmatch[56] = YYCURSOR - 1; + yypmatch[57] = YYCURSOR; + yypmatch[58] = YYCURSOR - 1; + yypmatch[59] = YYCURSOR; + yypmatch[60] = YYCURSOR - 1; + yypmatch[61] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/23.i--flex-syntax.c b/re2c/test/posix_captures/basic/23.i--flex-syntax.c index 631ed7c5..663f7760 100644 --- a/re2c/test/posix_captures/basic/23.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/23.i--flex-syntax.c @@ -14,73 +14,70 @@ goto yy2; } yy2: - { - const size_t yynmatch = 31; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt2; - yypmatch[7] = yyt3; - yypmatch[8] = yyt2; - yypmatch[9] = yyt3; - yypmatch[10] = yyt2; - yypmatch[11] = yyt3; - yypmatch[12] = yyt2; - yypmatch[13] = yyt3; - yypmatch[14] = yyt2; - yypmatch[15] = yyt3; - yypmatch[16] = yyt2; - yypmatch[17] = yyt3; - yypmatch[18] = yyt2; - yypmatch[19] = yyt3; - yypmatch[20] = yyt2; - yypmatch[21] = yyt3; - yypmatch[22] = yyt2; - yypmatch[23] = yyt3; - yypmatch[24] = yyt2; - yypmatch[25] = yyt3; - yypmatch[26] = yyt2; - yypmatch[27] = yyt3; - yypmatch[28] = yyt2; - yypmatch[29] = yyt3; - yypmatch[30] = yyt2; - yypmatch[31] = yyt3; - yypmatch[32] = yyt2; - yypmatch[33] = yyt3; - yypmatch[34] = yyt2; - yypmatch[35] = yyt3; - yypmatch[36] = yyt2; - yypmatch[37] = yyt3; - yypmatch[38] = yyt2; - yypmatch[39] = yyt3; - yypmatch[40] = yyt2; - yypmatch[41] = yyt3; - yypmatch[42] = yyt2; - yypmatch[43] = yyt3; - yypmatch[44] = yyt2; - yypmatch[45] = yyt3; - yypmatch[46] = yyt2; - yypmatch[47] = yyt3; - yypmatch[48] = yyt2; - yypmatch[49] = yyt3; - yypmatch[50] = yyt2; - yypmatch[51] = yyt3; - yypmatch[52] = yyt2; - yypmatch[53] = yyt3; - yypmatch[54] = yyt2; - yypmatch[55] = yyt3; - yypmatch[56] = yyt2; - yypmatch[57] = yyt3; - yypmatch[58] = yyt2; - yypmatch[59] = yyt3; - yypmatch[60] = yyt2; - yypmatch[61] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 31; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt2; + yypmatch[7] = yyt3; + yypmatch[8] = yyt2; + yypmatch[9] = yyt3; + yypmatch[10] = yyt2; + yypmatch[11] = yyt3; + yypmatch[12] = yyt2; + yypmatch[13] = yyt3; + yypmatch[14] = yyt2; + yypmatch[15] = yyt3; + yypmatch[16] = yyt2; + yypmatch[17] = yyt3; + yypmatch[18] = yyt2; + yypmatch[19] = yyt3; + yypmatch[20] = yyt2; + yypmatch[21] = yyt3; + yypmatch[22] = yyt2; + yypmatch[23] = yyt3; + yypmatch[24] = yyt2; + yypmatch[25] = yyt3; + yypmatch[26] = yyt2; + yypmatch[27] = yyt3; + yypmatch[28] = yyt2; + yypmatch[29] = yyt3; + yypmatch[30] = yyt2; + yypmatch[31] = yyt3; + yypmatch[32] = yyt2; + yypmatch[33] = yyt3; + yypmatch[34] = yyt2; + yypmatch[35] = yyt3; + yypmatch[36] = yyt2; + yypmatch[37] = yyt3; + yypmatch[38] = yyt2; + yypmatch[39] = yyt3; + yypmatch[40] = yyt2; + yypmatch[41] = yyt3; + yypmatch[42] = yyt2; + yypmatch[43] = yyt3; + yypmatch[44] = yyt2; + yypmatch[45] = yyt3; + yypmatch[46] = yyt2; + yypmatch[47] = yyt3; + yypmatch[48] = yyt2; + yypmatch[49] = yyt3; + yypmatch[50] = yyt2; + yypmatch[51] = yyt3; + yypmatch[52] = yyt2; + yypmatch[53] = yyt3; + yypmatch[54] = yyt2; + yypmatch[55] = yyt3; + yypmatch[56] = yyt2; + yypmatch[57] = yyt3; + yypmatch[58] = yyt2; + yypmatch[59] = yyt3; + yypmatch[60] = yyt2; + yypmatch[61] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/24.i--flex-syntax.c b/re2c/test/posix_captures/basic/24.i--flex-syntax.c index fd0da058..4c44a79e 100644 --- a/re2c/test/posix_captures/basic/24.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/24.i--flex-syntax.c @@ -18,15 +18,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); diff --git a/re2c/test/posix_captures/basic/25.i--flex-syntax.c b/re2c/test/posix_captures/basic/25.i--flex-syntax.c index 71861750..8c551166 100644 --- a/re2c/test/posix_captures/basic/25.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/25.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -35,13 +32,10 @@ yy5: goto yy2; yy6: ++YYCURSOR; - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/26.i--flex-syntax.c b/re2c/test/posix_captures/basic/26.i--flex-syntax.c index ea400447..a9cbf84e 100644 --- a/re2c/test/posix_captures/basic/26.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/26.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -44,13 +41,10 @@ yy6: } yy8: ++YYCURSOR; - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/27.i--flex-syntax.c b/re2c/test/posix_captures/basic/27.i--flex-syntax.c index ea400447..a9cbf84e 100644 --- a/re2c/test/posix_captures/basic/27.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/27.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -44,13 +41,10 @@ yy6: } yy8: ++YYCURSOR; - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/28.i--flex-syntax.c b/re2c/test/posix_captures/basic/28.i--flex-syntax.c index 8302835a..88f250ed 100644 --- a/re2c/test/posix_captures/basic/28.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/28.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -42,13 +39,10 @@ yy6: } yy7: ++YYCURSOR; - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/29.i--flex-syntax.c b/re2c/test/posix_captures/basic/29.i--flex-syntax.c index 8302835a..88f250ed 100644 --- a/re2c/test/posix_captures/basic/29.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/29.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -42,13 +39,10 @@ yy6: } yy7: ++YYCURSOR; - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/30.i--flex-syntax.c b/re2c/test/posix_captures/basic/30.i--flex-syntax.c index 612068fb..04f6b0ca 100644 --- a/re2c/test/posix_captures/basic/30.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/30.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -36,13 +33,10 @@ yy5: } yy6: ++YYCURSOR; - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/31.i--flex-syntax.c b/re2c/test/posix_captures/basic/31.i--flex-syntax.c index 2c713ec0..157f517b 100644 --- a/re2c/test/posix_captures/basic/31.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/31.i--flex-syntax.c @@ -10,13 +10,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -34,13 +31,10 @@ yy5: } yy6: ++YYCURSOR; - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR - 2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR - 2; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/32.i--flex-syntax.c b/re2c/test/posix_captures/basic/32.i--flex-syntax.c index 2c713ec0..157f517b 100644 --- a/re2c/test/posix_captures/basic/32.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/32.i--flex-syntax.c @@ -10,13 +10,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -34,13 +31,10 @@ yy5: } yy6: ++YYCURSOR; - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR - 2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR - 2; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/33.i--flex-syntax.c b/re2c/test/posix_captures/basic/33.i--flex-syntax.c index db7b4bc5..11647d5e 100644 --- a/re2c/test/posix_captures/basic/33.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/33.i--flex-syntax.c @@ -9,26 +9,20 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR - 1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 1; - yypmatch[3] = YYCURSOR; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = YYCURSOR - 1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 1; + yypmatch[3] = YYCURSOR; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/34.i--flex-syntax.c b/re2c/test/posix_captures/basic/34.i--flex-syntax.c index 6ac6e30f..69c5d95a 100644 --- a/re2c/test/posix_captures/basic/34.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/34.i--flex-syntax.c @@ -9,13 +9,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -33,17 +30,14 @@ yy5: } yy6: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR - 3; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 3; - yypmatch[3] = YYCURSOR - 2; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = YYCURSOR - 3; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 3; + yypmatch[3] = YYCURSOR - 2; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/35.i--flex-syntax.c b/re2c/test/posix_captures/basic/35.i--flex-syntax.c index 9ecc668b..e0f95086 100644 --- a/re2c/test/posix_captures/basic/35.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/35.i--flex-syntax.c @@ -10,13 +10,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/36.i--flex-syntax.c b/re2c/test/posix_captures/basic/36.i--flex-syntax.c index bd1768fe..101e077f 100644 --- a/re2c/test/posix_captures/basic/36.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/36.i--flex-syntax.c @@ -13,15 +13,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/37.i--flex-syntax.c b/re2c/test/posix_captures/basic/37.i--flex-syntax.c index bc9a397e..7b70c2f9 100644 --- a/re2c/test/posix_captures/basic/37.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/37.i--flex-syntax.c @@ -10,15 +10,12 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/38.i--flex-syntax.c b/re2c/test/posix_captures/basic/38.i--flex-syntax.c index a6ee0c5f..fca4ae43 100644 --- a/re2c/test/posix_captures/basic/38.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/38.i--flex-syntax.c @@ -16,15 +16,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/39.i--flex-syntax.c b/re2c/test/posix_captures/basic/39.i--flex-syntax.c index 1cfcd3d5..13f6b47c 100644 --- a/re2c/test/posix_captures/basic/39.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/39.i--flex-syntax.c @@ -17,15 +17,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/40.i--flex-syntax.c b/re2c/test/posix_captures/basic/40.i--flex-syntax.c index 5f93371b..2ed422b1 100644 --- a/re2c/test/posix_captures/basic/40.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/40.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -33,15 +30,12 @@ yy3: default: goto yy5; } yy5: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy6: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/41.i--flex-syntax.c b/re2c/test/posix_captures/basic/41.i--flex-syntax.c index 52c95db0..3624dd9c 100644 --- a/re2c/test/posix_captures/basic/41.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/41.i--flex-syntax.c @@ -17,15 +17,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/42.i--flex-syntax.c b/re2c/test/posix_captures/basic/42.i--flex-syntax.c index ed16437a..f9aaf28a 100644 --- a/re2c/test/posix_captures/basic/42.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/42.i--flex-syntax.c @@ -17,13 +17,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -44,15 +41,12 @@ yy5: goto yy2; yy6: ++YYCURSOR; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/43.i--flex-syntax.c b/re2c/test/posix_captures/basic/43.i--flex-syntax.c index 83dff1bb..3dc66565 100644 --- a/re2c/test/posix_captures/basic/43.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/43.i--flex-syntax.c @@ -16,13 +16,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -92,15 +89,12 @@ yy10: } yy11: ++YYCURSOR; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt4; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt4; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/44.i--flex-syntax.c b/re2c/test/posix_captures/basic/44.i--flex-syntax.c index 1e45b314..abeddee0 100644 --- a/re2c/test/posix_captures/basic/44.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/44.i--flex-syntax.c @@ -13,22 +13,16 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR - 1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR - 1; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/45.i--flex-syntax.c b/re2c/test/posix_captures/basic/45.i--flex-syntax.c index d2724cdf..410ac189 100644 --- a/re2c/test/posix_captures/basic/45.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/45.i--flex-syntax.c @@ -13,13 +13,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -31,15 +28,12 @@ yy4: goto yy2; yy5: ++YYCURSOR; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR - 2; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 2; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = YYCURSOR - 2; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 2; + yypmatch[3] = YYCURSOR - 1; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/46.i--flex-syntax.c b/re2c/test/posix_captures/basic/46.i--flex-syntax.c index a24c9607..c7c85264 100644 --- a/re2c/test/posix_captures/basic/46.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/46.i--flex-syntax.c @@ -16,17 +16,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/47.i--flex-syntax.c b/re2c/test/posix_captures/basic/47.i--flex-syntax.c index 279f5b5a..c1a9f94e 100644 --- a/re2c/test/posix_captures/basic/47.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/47.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -38,15 +35,12 @@ yy5: } yy7: ++YYCURSOR; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 2; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 2; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/48.i--flex-syntax.c b/re2c/test/posix_captures/basic/48.i--flex-syntax.c index e64ceab8..3ffefae8 100644 --- a/re2c/test/posix_captures/basic/48.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/48.i--flex-syntax.c @@ -9,13 +9,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -28,15 +25,12 @@ yy3: goto yy4; } yy4: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[0] = yyt1 - 1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[0] = yyt1 - 1; + yypmatch[1] = YYCURSOR; + {} yy5: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/49.i--flex-syntax.c b/re2c/test/posix_captures/basic/49.i--flex-syntax.c index ab09f5d0..f08954a0 100644 --- a/re2c/test/posix_captures/basic/49.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/49.i--flex-syntax.c @@ -9,13 +9,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -45,17 +42,14 @@ yy5: } yy7: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1 - 1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1 - 1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/50.i--flex-syntax.c b/re2c/test/posix_captures/basic/50.i--flex-syntax.c index 2733ed48..fa3282df 100644 --- a/re2c/test/posix_captures/basic/50.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/50.i--flex-syntax.c @@ -9,13 +9,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -42,17 +39,14 @@ yy5: } yy7: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1 - 1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1 - 1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/51.i--flex-syntax.c b/re2c/test/posix_captures/basic/51.i--flex-syntax.c index 0fe7ddca..0817ce37 100644 --- a/re2c/test/posix_captures/basic/51.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/51.i--flex-syntax.c @@ -9,13 +9,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -55,17 +52,14 @@ yy7: } yy9: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1 - 1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1 - 1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/52.i--flex-syntax.c b/re2c/test/posix_captures/basic/52.i--flex-syntax.c index 2ffa8f34..6734473e 100644 --- a/re2c/test/posix_captures/basic/52.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/52.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -84,13 +81,10 @@ yy11: } yy12: ++YYCURSOR; - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/53.i--flex-syntax.c b/re2c/test/posix_captures/basic/53.i--flex-syntax.c index e772c429..4cbdd990 100644 --- a/re2c/test/posix_captures/basic/53.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/53.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -43,15 +40,12 @@ yy5: } yy6: ++YYCURSOR; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + {} yy8: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/54.i--flex-syntax.c b/re2c/test/posix_captures/basic/54.i--flex-syntax.c index 7c37fa94..459e606f 100644 --- a/re2c/test/posix_captures/basic/54.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/54.i--flex-syntax.c @@ -9,13 +9,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -39,21 +36,18 @@ yy6: } yy7: ++YYCURSOR; - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR - 4; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 4; - yypmatch[3] = YYCURSOR - 1; - yypmatch[4] = YYCURSOR - 4; - yypmatch[5] = YYCURSOR - 3; - yypmatch[6] = YYCURSOR - 3; - yypmatch[7] = YYCURSOR - 2; - yypmatch[8] = YYCURSOR - 1; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[0] = YYCURSOR - 4; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 4; + yypmatch[3] = YYCURSOR - 1; + yypmatch[4] = YYCURSOR - 4; + yypmatch[5] = YYCURSOR - 3; + yypmatch[6] = YYCURSOR - 3; + yypmatch[7] = YYCURSOR - 2; + yypmatch[8] = YYCURSOR - 1; + yypmatch[9] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/55.i--flex-syntax.c b/re2c/test/posix_captures/basic/55.i--flex-syntax.c index 49d5c2d8..6c4e9a6c 100644 --- a/re2c/test/posix_captures/basic/55.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/55.i--flex-syntax.c @@ -9,40 +9,34 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; - { - const size_t yynmatch = 10; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR - 1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 1; - yypmatch[3] = YYCURSOR; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - yypmatch[6] = YYCURSOR - 1; - yypmatch[7] = YYCURSOR; - yypmatch[8] = YYCURSOR - 1; - yypmatch[9] = YYCURSOR; - yypmatch[10] = YYCURSOR - 1; - yypmatch[11] = YYCURSOR; - yypmatch[12] = YYCURSOR - 1; - yypmatch[13] = YYCURSOR; - yypmatch[14] = YYCURSOR - 1; - yypmatch[15] = YYCURSOR; - yypmatch[16] = YYCURSOR - 1; - yypmatch[17] = YYCURSOR; - yypmatch[18] = YYCURSOR - 1; - yypmatch[19] = YYCURSOR; - {} - } + yynmatch = 10; + yypmatch[0] = YYCURSOR - 1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 1; + yypmatch[3] = YYCURSOR; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + yypmatch[6] = YYCURSOR - 1; + yypmatch[7] = YYCURSOR; + yypmatch[8] = YYCURSOR - 1; + yypmatch[9] = YYCURSOR; + yypmatch[10] = YYCURSOR - 1; + yypmatch[11] = YYCURSOR; + yypmatch[12] = YYCURSOR - 1; + yypmatch[13] = YYCURSOR; + yypmatch[14] = YYCURSOR - 1; + yypmatch[15] = YYCURSOR; + yypmatch[16] = YYCURSOR - 1; + yypmatch[17] = YYCURSOR; + yypmatch[18] = YYCURSOR - 1; + yypmatch[19] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/56.i--flex-syntax.c b/re2c/test/posix_captures/basic/56.i--flex-syntax.c index 35d48e46..c10dac5e 100644 --- a/re2c/test/posix_captures/basic/56.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/56.i--flex-syntax.c @@ -14,13 +14,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -47,17 +44,14 @@ yy6: goto yy9; } yy8: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2 - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2 - 1; + yypmatch[5] = YYCURSOR; + {} yy9: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/basic/57.i--flex-syntax.c b/re2c/test/posix_captures/basic/57.i--flex-syntax.c index c7b34a50..f123a7f4 100644 --- a/re2c/test/posix_captures/basic/57.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/57.i--flex-syntax.c @@ -9,13 +9,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -39,15 +36,12 @@ yy6: } yy7: ++YYCURSOR; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR - 4; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 3; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = YYCURSOR - 4; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 3; + yypmatch[3] = YYCURSOR - 1; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/58.i--flex-syntax.c b/re2c/test/posix_captures/basic/58.i--flex-syntax.c index 42747ff5..b61d6017 100644 --- a/re2c/test/posix_captures/basic/58.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/58.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -38,13 +35,10 @@ yy5: } yy6: ++YYCURSOR; - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/basic/59.i--flex-syntax.c b/re2c/test/posix_captures/basic/59.i--flex-syntax.c index 85723ee7..008cc6f1 100644 --- a/re2c/test/posix_captures/basic/59.i--flex-syntax.c +++ b/re2c/test/posix_captures/basic/59.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -59,15 +56,12 @@ yy8: default: goto yy10; } yy10: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/categorize/01.i--flex-syntax.c b/re2c/test/posix_captures/categorize/01.i--flex-syntax.c index 9d665938..40115001 100644 --- a/re2c/test/posix_captures/categorize/01.i--flex-syntax.c +++ b/re2c/test/posix_captures/categorize/01.i--flex-syntax.c @@ -19,19 +19,16 @@ goto yy2; } yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[7] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/categorize/02.i--flex-syntax.c b/re2c/test/posix_captures/categorize/02.i--flex-syntax.c index 82233dab..55a812fc 100644 --- a/re2c/test/posix_captures/categorize/02.i--flex-syntax.c +++ b/re2c/test/posix_captures/categorize/02.i--flex-syntax.c @@ -18,25 +18,22 @@ goto yy2; } yy2: - { - const size_t yynmatch = 7; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[4] = yyt1; - yypmatch[5] = yyt2; - yypmatch[6] = yyt3; - yypmatch[7] = yyt4; - yypmatch[10] = yyt5; - yypmatch[12] = yyt6; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = yyt1; - yypmatch[3] = yyt5; - yypmatch[8] = yyt5; - yypmatch[9] = YYCURSOR; - yypmatch[11] = yyt6; - yypmatch[13] = YYCURSOR; - {} - } + yynmatch = 7; + yypmatch[4] = yyt1; + yypmatch[5] = yyt2; + yypmatch[6] = yyt3; + yypmatch[7] = yyt4; + yypmatch[10] = yyt5; + yypmatch[12] = yyt6; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = yyt1; + yypmatch[3] = yyt5; + yypmatch[8] = yyt5; + yypmatch[9] = YYCURSOR; + yypmatch[11] = yyt6; + yypmatch[13] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/categorize/03.i--flex-syntax.c b/re2c/test/posix_captures/categorize/03.i--flex-syntax.c index 01535c99..b870437e 100644 --- a/re2c/test/posix_captures/categorize/03.i--flex-syntax.c +++ b/re2c/test/posix_captures/categorize/03.i--flex-syntax.c @@ -11,15 +11,12 @@ yyt2 = yyt3 = NULL; yyt1 = YYCURSOR; yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; diff --git a/re2c/test/posix_captures/categorize/04.i--flex-syntax.c b/re2c/test/posix_captures/categorize/04.i--flex-syntax.c index 46e0014a..6af69473 100644 --- a/re2c/test/posix_captures/categorize/04.i--flex-syntax.c +++ b/re2c/test/posix_captures/categorize/04.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -43,17 +40,14 @@ yy5: } yy6: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/categorize/05.i--flex-syntax.c b/re2c/test/posix_captures/categorize/05.i--flex-syntax.c index eccafaa1..3be56959 100644 --- a/re2c/test/posix_captures/categorize/05.i--flex-syntax.c +++ b/re2c/test/posix_captures/categorize/05.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -71,17 +68,14 @@ yy9: yy10: ++YYCURSOR; yy11: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy12: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/categorize/06.i--flex-syntax.c b/re2c/test/posix_captures/categorize/06.i--flex-syntax.c index bcd84b7a..7727f372 100644 --- a/re2c/test/posix_captures/categorize/06.i--flex-syntax.c +++ b/re2c/test/posix_captures/categorize/06.i--flex-syntax.c @@ -13,15 +13,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/categorize/07.i--flex-syntax.c b/re2c/test/posix_captures/categorize/07.i--flex-syntax.c index bd1768fe..101e077f 100644 --- a/re2c/test/posix_captures/categorize/07.i--flex-syntax.c +++ b/re2c/test/posix_captures/categorize/07.i--flex-syntax.c @@ -13,15 +13,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/categorize/08.i--flex-syntax.c b/re2c/test/posix_captures/categorize/08.i--flex-syntax.c index 404506d0..a5a2027b 100644 --- a/re2c/test/posix_captures/categorize/08.i--flex-syntax.c +++ b/re2c/test/posix_captures/categorize/08.i--flex-syntax.c @@ -18,15 +18,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/categorize/09.i--flex-syntax.c b/re2c/test/posix_captures/categorize/09.i--flex-syntax.c index 0ad4975d..a911bfc4 100644 --- a/re2c/test/posix_captures/categorize/09.i--flex-syntax.c +++ b/re2c/test/posix_captures/categorize/09.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -34,17 +31,14 @@ yy3: goto yy5; } yy5: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy6: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/categorize/10.i--flex-syntax.c b/re2c/test/posix_captures/categorize/10.i--flex-syntax.c index aaf30b8d..872741c9 100644 --- a/re2c/test/posix_captures/categorize/10.i--flex-syntax.c +++ b/re2c/test/posix_captures/categorize/10.i--flex-syntax.c @@ -10,15 +10,12 @@ } yyt1 = yyt2 = YYCURSOR; yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/categorize/11.i--flex-syntax.c b/re2c/test/posix_captures/categorize/11.i--flex-syntax.c index a7f94881..236f52da 100644 --- a/re2c/test/posix_captures/categorize/11.i--flex-syntax.c +++ b/re2c/test/posix_captures/categorize/11.i--flex-syntax.c @@ -19,23 +19,20 @@ goto yy2; } yy2: - { - const size_t yynmatch = 6; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[9] = yyt8; - yypmatch[10] = yyt9; - yypmatch[11] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = yyt6; - {} - } + yynmatch = 6; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[9] = yyt8; + yypmatch[10] = yyt9; + yypmatch[11] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = yyt6; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/exponential_epsilon_closure.i--posix-captures.c b/re2c/test/posix_captures/exponential_epsilon_closure.i--posix-captures.c index c2bb93c4..205ae487 100644 --- a/re2c/test/posix_captures/exponential_epsilon_closure.i--posix-captures.c +++ b/re2c/test/posix_captures/exponential_epsilon_closure.i--posix-captures.c @@ -6,17 +6,14 @@ { YYCTYPE yych; yyt1 = YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt1; - yypmatch[4] = yyt1; - yypmatch[5] = yyt1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt1; + yypmatch[4] = yyt1; + yypmatch[5] = yyt1; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 5: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/forcedassoc/01.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/01.i--flex-syntax.c index 6dab7207..24dcea7a 100644 --- a/re2c/test/posix_captures/forcedassoc/01.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/01.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,17 +43,14 @@ yy5: yy6: ++YYCURSOR; yy7: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/forcedassoc/02.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/02.i--flex-syntax.c index 6dab7207..24dcea7a 100644 --- a/re2c/test/posix_captures/forcedassoc/02.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/02.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,17 +43,14 @@ yy5: yy6: ++YYCURSOR; yy7: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/forcedassoc/03.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/03.i--flex-syntax.c index 6dab7207..24dcea7a 100644 --- a/re2c/test/posix_captures/forcedassoc/03.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/03.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,17 +43,14 @@ yy5: yy6: ++YYCURSOR; yy7: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/forcedassoc/04.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/04.i--flex-syntax.c index 6dab7207..24dcea7a 100644 --- a/re2c/test/posix_captures/forcedassoc/04.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/04.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,17 +43,14 @@ yy5: yy6: ++YYCURSOR; yy7: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/forcedassoc/05.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/05.i--flex-syntax.c index 21a407a9..e147c270 100644 --- a/re2c/test/posix_captures/forcedassoc/05.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/05.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -48,21 +45,18 @@ yy6: yyt3 = YYCURSOR; goto yy11; yy7: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[4] = yyt1; - yypmatch[6] = yyt2; - yypmatch[8] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = yyt1; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = yyt3; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[4] = yyt1; + yypmatch[6] = yyt2; + yypmatch[8] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = yyt1; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = yyt3; + yypmatch[9] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/forcedassoc/06.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/06.i--flex-syntax.c index 21a407a9..e147c270 100644 --- a/re2c/test/posix_captures/forcedassoc/06.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/06.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -48,21 +45,18 @@ yy6: yyt3 = YYCURSOR; goto yy11; yy7: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[4] = yyt1; - yypmatch[6] = yyt2; - yypmatch[8] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = yyt1; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = yyt3; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[4] = yyt1; + yypmatch[6] = yyt2; + yypmatch[8] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = yyt1; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = yyt3; + yypmatch[9] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/forcedassoc/07.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/07.i--flex-syntax.c index 21a407a9..e147c270 100644 --- a/re2c/test/posix_captures/forcedassoc/07.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/07.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -48,21 +45,18 @@ yy6: yyt3 = YYCURSOR; goto yy11; yy7: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[4] = yyt1; - yypmatch[6] = yyt2; - yypmatch[8] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = yyt1; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = yyt3; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[4] = yyt1; + yypmatch[6] = yyt2; + yypmatch[8] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = yyt1; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = yyt3; + yypmatch[9] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/forcedassoc/08.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/08.i--flex-syntax.c index 21a407a9..e147c270 100644 --- a/re2c/test/posix_captures/forcedassoc/08.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/08.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -48,21 +45,18 @@ yy6: yyt3 = YYCURSOR; goto yy11; yy7: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[4] = yyt1; - yypmatch[6] = yyt2; - yypmatch[8] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = yyt1; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = yyt3; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[4] = yyt1; + yypmatch[6] = yyt2; + yypmatch[8] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = yyt1; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = yyt3; + yypmatch[9] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/forcedassoc/09.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/09.i--flex-syntax.c index 64bb1fac..fdce1c19 100644 --- a/re2c/test/posix_captures/forcedassoc/09.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/09.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,21 +43,18 @@ yy6: yyt2 = YYCURSOR; goto yy10; yy7: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[6] = yyt3; - yypmatch[8] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[4] = yyt3; - yypmatch[5] = YYCURSOR; - yypmatch[7] = yyt2; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[2] = yyt1; + yypmatch[6] = yyt3; + yypmatch[8] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[4] = yyt3; + yypmatch[5] = YYCURSOR; + yypmatch[7] = yyt2; + yypmatch[9] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/forcedassoc/10.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/10.i--flex-syntax.c index 64bb1fac..fdce1c19 100644 --- a/re2c/test/posix_captures/forcedassoc/10.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/10.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,21 +43,18 @@ yy6: yyt2 = YYCURSOR; goto yy10; yy7: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[6] = yyt3; - yypmatch[8] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[4] = yyt3; - yypmatch[5] = YYCURSOR; - yypmatch[7] = yyt2; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[2] = yyt1; + yypmatch[6] = yyt3; + yypmatch[8] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[4] = yyt3; + yypmatch[5] = YYCURSOR; + yypmatch[7] = yyt2; + yypmatch[9] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/forcedassoc/11.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/11.i--flex-syntax.c index 64bb1fac..fdce1c19 100644 --- a/re2c/test/posix_captures/forcedassoc/11.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/11.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,21 +43,18 @@ yy6: yyt2 = YYCURSOR; goto yy10; yy7: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[6] = yyt3; - yypmatch[8] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[4] = yyt3; - yypmatch[5] = YYCURSOR; - yypmatch[7] = yyt2; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[2] = yyt1; + yypmatch[6] = yyt3; + yypmatch[8] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[4] = yyt3; + yypmatch[5] = YYCURSOR; + yypmatch[7] = yyt2; + yypmatch[9] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/forcedassoc/12.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/12.i--flex-syntax.c index 64bb1fac..fdce1c19 100644 --- a/re2c/test/posix_captures/forcedassoc/12.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/12.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,21 +43,18 @@ yy6: yyt2 = YYCURSOR; goto yy10; yy7: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[6] = yyt3; - yypmatch[8] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[4] = yyt3; - yypmatch[5] = YYCURSOR; - yypmatch[7] = yyt2; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[2] = yyt1; + yypmatch[6] = yyt3; + yypmatch[8] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[4] = yyt3; + yypmatch[5] = YYCURSOR; + yypmatch[7] = yyt2; + yypmatch[9] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/forcedassoc/13.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/13.i--flex-syntax.c index b783361f..ef51205b 100644 --- a/re2c/test/posix_captures/forcedassoc/13.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/13.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -35,17 +32,14 @@ yy4: yy5: ++YYCURSOR; yy6: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy7: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); diff --git a/re2c/test/posix_captures/forcedassoc/14.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/14.i--flex-syntax.c index b783361f..ef51205b 100644 --- a/re2c/test/posix_captures/forcedassoc/14.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/14.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -35,17 +32,14 @@ yy4: yy5: ++YYCURSOR; yy6: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy7: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); diff --git a/re2c/test/posix_captures/forcedassoc/15.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/15.i--flex-syntax.c index c5ac0ad4..0fbc3b55 100644 --- a/re2c/test/posix_captures/forcedassoc/15.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/15.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -37,21 +34,18 @@ yy5: yyt3 = YYCURSOR; goto yy11; yy6: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[4] = yyt1; - yypmatch[6] = yyt2; - yypmatch[8] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = yyt1; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = yyt3; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[4] = yyt1; + yypmatch[6] = yyt2; + yypmatch[8] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = yyt1; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = yyt3; + yypmatch[9] = YYCURSOR; + {} yy7: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); diff --git a/re2c/test/posix_captures/forcedassoc/16.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/16.i--flex-syntax.c index c5ac0ad4..0fbc3b55 100644 --- a/re2c/test/posix_captures/forcedassoc/16.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/16.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -37,21 +34,18 @@ yy5: yyt3 = YYCURSOR; goto yy11; yy6: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[4] = yyt1; - yypmatch[6] = yyt2; - yypmatch[8] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = yyt1; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = yyt3; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[4] = yyt1; + yypmatch[6] = yyt2; + yypmatch[8] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = yyt1; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = yyt3; + yypmatch[9] = YYCURSOR; + {} yy7: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); diff --git a/re2c/test/posix_captures/forcedassoc/17.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/17.i--flex-syntax.c index ccc4e45a..94e80813 100644 --- a/re2c/test/posix_captures/forcedassoc/17.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/17.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); @@ -40,21 +37,18 @@ yy6: yyt2 = YYCURSOR; goto yy9; yy7: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[6] = yyt3; - yypmatch[8] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[4] = yyt3; - yypmatch[5] = YYCURSOR; - yypmatch[7] = yyt2; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[2] = yyt1; + yypmatch[6] = yyt3; + yypmatch[8] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[4] = yyt3; + yypmatch[5] = YYCURSOR; + yypmatch[7] = yyt2; + yypmatch[9] = YYCURSOR; + {} yy8: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/forcedassoc/18.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/18.i--flex-syntax.c index ccc4e45a..94e80813 100644 --- a/re2c/test/posix_captures/forcedassoc/18.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/18.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); @@ -40,21 +37,18 @@ yy6: yyt2 = YYCURSOR; goto yy9; yy7: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[6] = yyt3; - yypmatch[8] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[4] = yyt3; - yypmatch[5] = YYCURSOR; - yypmatch[7] = yyt2; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[2] = yyt1; + yypmatch[6] = yyt3; + yypmatch[8] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[4] = yyt3; + yypmatch[5] = YYCURSOR; + yypmatch[7] = yyt2; + yypmatch[9] = YYCURSOR; + {} yy8: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/forcedassoc/19.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/19.i--flex-syntax.c index b783361f..ef51205b 100644 --- a/re2c/test/posix_captures/forcedassoc/19.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/19.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -35,17 +32,14 @@ yy4: yy5: ++YYCURSOR; yy6: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy7: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); diff --git a/re2c/test/posix_captures/forcedassoc/20.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/20.i--flex-syntax.c index b783361f..ef51205b 100644 --- a/re2c/test/posix_captures/forcedassoc/20.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/20.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -35,17 +32,14 @@ yy4: yy5: ++YYCURSOR; yy6: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy7: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); diff --git a/re2c/test/posix_captures/forcedassoc/21.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/21.i--flex-syntax.c index c5ac0ad4..0fbc3b55 100644 --- a/re2c/test/posix_captures/forcedassoc/21.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/21.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -37,21 +34,18 @@ yy5: yyt3 = YYCURSOR; goto yy11; yy6: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[4] = yyt1; - yypmatch[6] = yyt2; - yypmatch[8] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = yyt1; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = yyt3; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[4] = yyt1; + yypmatch[6] = yyt2; + yypmatch[8] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = yyt1; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = yyt3; + yypmatch[9] = YYCURSOR; + {} yy7: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); diff --git a/re2c/test/posix_captures/forcedassoc/22.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/22.i--flex-syntax.c index c5ac0ad4..0fbc3b55 100644 --- a/re2c/test/posix_captures/forcedassoc/22.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/22.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -37,21 +34,18 @@ yy5: yyt3 = YYCURSOR; goto yy11; yy6: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[4] = yyt1; - yypmatch[6] = yyt2; - yypmatch[8] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = yyt1; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = yyt3; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[4] = yyt1; + yypmatch[6] = yyt2; + yypmatch[8] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = yyt1; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = yyt3; + yypmatch[9] = YYCURSOR; + {} yy7: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3); diff --git a/re2c/test/posix_captures/forcedassoc/23.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/23.i--flex-syntax.c index ccc4e45a..94e80813 100644 --- a/re2c/test/posix_captures/forcedassoc/23.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/23.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); @@ -40,21 +37,18 @@ yy6: yyt2 = YYCURSOR; goto yy9; yy7: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[6] = yyt3; - yypmatch[8] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[4] = yyt3; - yypmatch[5] = YYCURSOR; - yypmatch[7] = yyt2; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[2] = yyt1; + yypmatch[6] = yyt3; + yypmatch[8] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[4] = yyt3; + yypmatch[5] = YYCURSOR; + yypmatch[7] = yyt2; + yypmatch[9] = YYCURSOR; + {} yy8: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/forcedassoc/24.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/24.i--flex-syntax.c index ccc4e45a..94e80813 100644 --- a/re2c/test/posix_captures/forcedassoc/24.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/24.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); @@ -40,21 +37,18 @@ yy6: yyt2 = YYCURSOR; goto yy9; yy7: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[6] = yyt3; - yypmatch[8] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[4] = yyt3; - yypmatch[5] = YYCURSOR; - yypmatch[7] = yyt2; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[2] = yyt1; + yypmatch[6] = yyt3; + yypmatch[8] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[4] = yyt3; + yypmatch[5] = YYCURSOR; + yypmatch[7] = yyt2; + yypmatch[9] = YYCURSOR; + {} yy8: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/forcedassoc/25.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/25.i--flex-syntax.c index 0298fe97..5655f6eb 100644 --- a/re2c/test/posix_captures/forcedassoc/25.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/25.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -25,15 +22,12 @@ yy3: default: goto yy4; } yy4: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; goto yy4; diff --git a/re2c/test/posix_captures/forcedassoc/26.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/26.i--flex-syntax.c index 0298fe97..5655f6eb 100644 --- a/re2c/test/posix_captures/forcedassoc/26.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/26.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -25,15 +22,12 @@ yy3: default: goto yy4; } yy4: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; goto yy4; diff --git a/re2c/test/posix_captures/forcedassoc/27.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/27.i--flex-syntax.c index b341cf97..9692ed33 100644 --- a/re2c/test/posix_captures/forcedassoc/27.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/27.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -27,17 +24,14 @@ yy3: goto yy4; } yy4: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy5: yych = *++YYCURSOR; yyt2 = YYCURSOR; diff --git a/re2c/test/posix_captures/forcedassoc/28.i--flex-syntax.c b/re2c/test/posix_captures/forcedassoc/28.i--flex-syntax.c index b341cf97..9692ed33 100644 --- a/re2c/test/posix_captures/forcedassoc/28.i--flex-syntax.c +++ b/re2c/test/posix_captures/forcedassoc/28.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -27,17 +24,14 @@ yy3: goto yy4; } yy4: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy5: yych = *++YYCURSOR; yyt2 = YYCURSOR; diff --git a/re2c/test/posix_captures/glennfowler/01.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/01.i--flex-syntax.c index c1ed85e3..d50f0e81 100644 --- a/re2c/test/posix_captures/glennfowler/01.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/01.i--flex-syntax.c @@ -14,19 +14,16 @@ goto yy2; } yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = YYCURSOR; + {} yy3: yych = *(YYMARKER = ++YYCURSOR); switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/02.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/02.i--flex-syntax.c index 2c5cb8aa..58690c89 100644 --- a/re2c/test/posix_captures/glennfowler/02.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/02.i--flex-syntax.c @@ -18,21 +18,18 @@ goto yy2; } yy2: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[6] = yyt5; - yypmatch[7] = yyt3; - yypmatch[8] = yyt4; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = yyt4; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[6] = yyt5; + yypmatch[7] = yyt3; + yypmatch[8] = yyt4; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = yyt4; + yypmatch[9] = YYCURSOR; + {} yy3: yych = *(YYMARKER = ++YYCURSOR); switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/03.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/03.i--flex-syntax.c index e7f49b3e..55d0977f 100644 --- a/re2c/test/posix_captures/glennfowler/03.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/03.i--flex-syntax.c @@ -18,23 +18,20 @@ goto yy2; } yy2: - { - const size_t yynmatch = 6; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[4] = yyt1; - yypmatch[6] = yyt4; - yypmatch[8] = yyt5; - yypmatch[9] = yyt2; - yypmatch[10] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = yyt1; - yypmatch[3] = yyt3; - yypmatch[5] = yyt4; - yypmatch[7] = yyt3; - yypmatch[11] = YYCURSOR; - {} - } + yynmatch = 6; + yypmatch[4] = yyt1; + yypmatch[6] = yyt4; + yypmatch[8] = yyt5; + yypmatch[9] = yyt2; + yypmatch[10] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = yyt1; + yypmatch[3] = yyt3; + yypmatch[5] = yyt4; + yypmatch[7] = yyt3; + yypmatch[11] = YYCURSOR; + {} yy3: yych = *(YYMARKER = ++YYCURSOR); switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/04.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/04.i--flex-syntax.c index 58207f8a..d0ae1591 100644 --- a/re2c/test/posix_captures/glennfowler/04.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/04.i--flex-syntax.c @@ -18,23 +18,20 @@ goto yy2; } yy2: - { - const size_t yynmatch = 6; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[6] = yyt2; - yypmatch[8] = yyt5; - yypmatch[9] = yyt3; - yypmatch[10] = yyt4; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[4] = yyt2; - yypmatch[5] = YYCURSOR; - yypmatch[7] = yyt4; - yypmatch[11] = YYCURSOR; - {} - } + yynmatch = 6; + yypmatch[2] = yyt1; + yypmatch[6] = yyt2; + yypmatch[8] = yyt5; + yypmatch[9] = yyt3; + yypmatch[10] = yyt4; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[4] = yyt2; + yypmatch[5] = YYCURSOR; + yypmatch[7] = yyt4; + yypmatch[11] = YYCURSOR; + {} yy3: yych = *(YYMARKER = ++YYCURSOR); switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/05.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/05.i--flex-syntax.c index 78ad0e25..2c93ea98 100644 --- a/re2c/test/posix_captures/glennfowler/05.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/05.i--flex-syntax.c @@ -7,15 +7,12 @@ yyt1 = YYCURSOR; if (yych >= 0x01) goto yy3; yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: ++YYCURSOR; goto yy2; diff --git a/re2c/test/posix_captures/glennfowler/06.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/06.i--flex-syntax.c index 78ad0e25..2c93ea98 100644 --- a/re2c/test/posix_captures/glennfowler/06.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/06.i--flex-syntax.c @@ -7,15 +7,12 @@ yyt1 = YYCURSOR; if (yych >= 0x01) goto yy3; yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: ++YYCURSOR; goto yy2; diff --git a/re2c/test/posix_captures/glennfowler/07.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/07.i--flex-syntax.c index 544fc4d3..aed763b4 100644 --- a/re2c/test/posix_captures/glennfowler/07.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/07.i--flex-syntax.c @@ -10,17 +10,14 @@ } yyt1 = yyt2 = YYCURSOR; yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; yyt2 = YYCURSOR; diff --git a/re2c/test/posix_captures/glennfowler/08.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/08.i--flex-syntax.c index c2dde026..c22b766e 100644 --- a/re2c/test/posix_captures/glennfowler/08.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/08.i--flex-syntax.c @@ -10,15 +10,12 @@ } yyt1 = yyt2 = YYCURSOR; yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; yyt2 = YYCURSOR; diff --git a/re2c/test/posix_captures/glennfowler/09.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/09.i--flex-syntax.c index c965cc4b..73ef63bb 100644 --- a/re2c/test/posix_captures/glennfowler/09.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/09.i--flex-syntax.c @@ -10,15 +10,12 @@ } yyt1 = yyt2 = yyt3 = YYCURSOR; yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/glennfowler/10.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/10.i--flex-syntax.c index 5a5ca6f2..251bddcb 100644 --- a/re2c/test/posix_captures/glennfowler/10.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/10.i--flex-syntax.c @@ -7,15 +7,12 @@ yyt1 = YYCURSOR; if (yych >= 0x01) goto yy3; yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych <= 0x00) goto yy2; diff --git a/re2c/test/posix_captures/glennfowler/11.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/11.i--flex-syntax.c index 5a5ca6f2..251bddcb 100644 --- a/re2c/test/posix_captures/glennfowler/11.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/11.i--flex-syntax.c @@ -7,15 +7,12 @@ yyt1 = YYCURSOR; if (yych >= 0x01) goto yy3; yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych <= 0x00) goto yy2; diff --git a/re2c/test/posix_captures/glennfowler/12.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/12.i--flex-syntax.c index a10ba406..cd99362f 100644 --- a/re2c/test/posix_captures/glennfowler/12.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/12.i--flex-syntax.c @@ -10,17 +10,14 @@ } yyt1 = yyt2 = YYCURSOR; yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/glennfowler/13.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/13.i--flex-syntax.c index 11319892..27620d8a 100644 --- a/re2c/test/posix_captures/glennfowler/13.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/13.i--flex-syntax.c @@ -10,15 +10,12 @@ } yyt1 = yyt2 = YYCURSOR; yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/glennfowler/14.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/14.i--flex-syntax.c index ae67d1b3..746a922a 100644 --- a/re2c/test/posix_captures/glennfowler/14.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/14.i--flex-syntax.c @@ -10,19 +10,16 @@ } yyt1 = yyt2 = yyt3 = YYCURSOR; yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[6] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = yyt3; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[6] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = yyt3; + yypmatch[7] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/glennfowler/15.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/15.i--flex-syntax.c index eb6d91cd..a2b6486b 100644 --- a/re2c/test/posix_captures/glennfowler/15.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/15.i--flex-syntax.c @@ -10,15 +10,12 @@ } yyt1 = yyt2 = YYCURSOR; yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/glennfowler/16.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/16.i--flex-syntax.c index 552af7ba..bdebb9b9 100644 --- a/re2c/test/posix_captures/glennfowler/16.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/16.i--flex-syntax.c @@ -10,15 +10,12 @@ } yyt1 = yyt2 = yyt3 = YYCURSOR; yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/glennfowler/17.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/17.i--flex-syntax.c index 4540d083..c6ddaf70 100644 --- a/re2c/test/posix_captures/glennfowler/17.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/17.i--flex-syntax.c @@ -18,19 +18,16 @@ goto yy2; } yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt5; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt4; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt5; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt4; + yypmatch[7] = YYCURSOR; + {} yy3: yych = *(YYMARKER = ++YYCURSOR); switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/18.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/18.i--flex-syntax.c index 5708cb36..1e884151 100644 --- a/re2c/test/posix_captures/glennfowler/18.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/18.i--flex-syntax.c @@ -18,19 +18,16 @@ goto yy2; } yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt5; - yypmatch[7] = yyt4; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt5; + yypmatch[7] = yyt4; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + {} yy3: yych = *(YYMARKER = ++YYCURSOR); switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/19.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/19.i--flex-syntax.c index 99207754..8d9b3a50 100644 --- a/re2c/test/posix_captures/glennfowler/19.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/19.i--flex-syntax.c @@ -18,17 +18,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt5; - yypmatch[5] = yyt4; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt5; + yypmatch[5] = yyt4; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *(YYMARKER = ++YYCURSOR); switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/20.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/20.i--flex-syntax.c index bcd84b7a..7727f372 100644 --- a/re2c/test/posix_captures/glennfowler/20.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/20.i--flex-syntax.c @@ -13,15 +13,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/glennfowler/21.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/21.i--flex-syntax.c index 02d854ff..10190d56 100644 --- a/re2c/test/posix_captures/glennfowler/21.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/21.i--flex-syntax.c @@ -15,13 +15,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); @@ -31,17 +28,14 @@ yy3: default: goto yy4; } yy4: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy5: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/22.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/22.i--flex-syntax.c index 0e4e4a8f..553e96c3 100644 --- a/re2c/test/posix_captures/glennfowler/22.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/22.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -32,17 +29,14 @@ yy4: goto yy2; yy5: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/23.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/23.i--flex-syntax.c index 70cd89f1..a3fb5641 100644 --- a/re2c/test/posix_captures/glennfowler/23.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/23.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -28,15 +25,12 @@ yy3: default: goto yy4; } yy4: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/24.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/24.i--flex-syntax.c index 11a2cac4..1801b09c 100644 --- a/re2c/test/posix_captures/glennfowler/24.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/24.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,17 +43,14 @@ yy6: default: goto yy7; } yy7: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/25.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/25.i--flex-syntax.c index 5ba435fe..dff2c39e 100644 --- a/re2c/test/posix_captures/glennfowler/25.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/25.i--flex-syntax.c @@ -18,15 +18,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/glennfowler/26.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/26.i--flex-syntax.c index c265c15d..15cc29a7 100644 --- a/re2c/test/posix_captures/glennfowler/26.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/26.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -33,15 +30,12 @@ yy4: yy5: ++YYCURSOR; yy6: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy7: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/glennfowler/27.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/27.i--flex-syntax.c index eccafaa1..3be56959 100644 --- a/re2c/test/posix_captures/glennfowler/27.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/27.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -71,17 +68,14 @@ yy9: yy10: ++YYCURSOR; yy11: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy12: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/28.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/28.i--flex-syntax.c index de1e8300..7186c58a 100644 --- a/re2c/test/posix_captures/glennfowler/28.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/28.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -120,19 +117,16 @@ yy15: yy16: ++YYCURSOR; yy17: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[6] = yyt4; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = yyt4; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[6] = yyt4; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = yyt4; + yypmatch[7] = YYCURSOR; + {} yy18: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/29.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/29.i--flex-syntax.c index 404506d0..a5a2027b 100644 --- a/re2c/test/posix_captures/glennfowler/29.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/29.i--flex-syntax.c @@ -18,15 +18,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/glennfowler/30.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/30.i--flex-syntax.c index 74d26604..1c27d16c 100644 --- a/re2c/test/posix_captures/glennfowler/30.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/30.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -25,15 +22,12 @@ yy3: default: goto yy4; } yy4: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/31.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/31.i--flex-syntax.c index ae9f3773..ae4b9902 100644 --- a/re2c/test/posix_captures/glennfowler/31.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/31.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -37,17 +34,14 @@ yy5: default: goto yy6; } yy6: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/32.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/32.i--flex-syntax.c index 4b5b21bb..75b40759 100644 --- a/re2c/test/posix_captures/glennfowler/32.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/32.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -54,19 +51,16 @@ yy7: default: goto yy8; } yy8: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[6] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = yyt3; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[6] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = yyt3; + yypmatch[7] = YYCURSOR; + {} yy9: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/33.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/33.i--flex-syntax.c index 1d6c8f8a..60beab2d 100644 --- a/re2c/test/posix_captures/glennfowler/33.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/33.i--flex-syntax.c @@ -14,15 +14,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/glennfowler/34.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/34.i--flex-syntax.c index 677466b3..9fa11b3c 100644 --- a/re2c/test/posix_captures/glennfowler/34.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/34.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -29,17 +26,14 @@ yy3: goto yy4; } yy4: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt3 = YYCURSOR; diff --git a/re2c/test/posix_captures/glennfowler/35.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/35.i--flex-syntax.c index 01564c9d..d1a2d7de 100644 --- a/re2c/test/posix_captures/glennfowler/35.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/35.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -44,21 +41,18 @@ yy5: goto yy6; } yy6: - { - const size_t yynmatch = 5; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt6; - yypmatch[5] = yyt2; - yypmatch[6] = yyt3; - yypmatch[8] = yyt4; - yypmatch[9] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 5; + yypmatch[2] = yyt1; + yypmatch[4] = yyt6; + yypmatch[5] = yyt2; + yypmatch[6] = yyt3; + yypmatch[8] = yyt4; + yypmatch[9] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[7] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/glennfowler/36.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/36.i--flex-syntax.c index 0ad4975d..a911bfc4 100644 --- a/re2c/test/posix_captures/glennfowler/36.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/36.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -34,17 +31,14 @@ yy3: goto yy5; } yy5: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy6: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/glennfowler/37.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/37.i--flex-syntax.c index bf2721f1..e0361455 100644 --- a/re2c/test/posix_captures/glennfowler/37.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/37.i--flex-syntax.c @@ -10,17 +10,14 @@ } yyt1 = yyt2 = YYCURSOR; yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/glennfowler/38.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/38.i--flex-syntax.c index aaf30b8d..872741c9 100644 --- a/re2c/test/posix_captures/glennfowler/38.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/38.i--flex-syntax.c @@ -10,15 +10,12 @@ } yyt1 = yyt2 = YYCURSOR; yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/glennfowler/39.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/39.i--flex-syntax.c index 268f7815..3d93d31b 100644 --- a/re2c/test/posix_captures/glennfowler/39.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/39.i--flex-syntax.c @@ -15,13 +15,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -58,15 +55,12 @@ yy8: default: goto yy3; } yy10: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy11: yyaccept = 1; YYMARKER = ++YYCURSOR; diff --git a/re2c/test/posix_captures/glennfowler/40.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/40.i--flex-syntax.c index b8f2ccc3..24d961bd 100644 --- a/re2c/test/posix_captures/glennfowler/40.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/40.i--flex-syntax.c @@ -15,13 +15,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -143,17 +140,14 @@ yy20: goto yy12; } yy22: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy23: yyaccept = 1; YYMARKER = ++YYCURSOR; diff --git a/re2c/test/posix_captures/glennfowler/41.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/41.i--flex-syntax.c index be8d015d..aa19ec6c 100644 --- a/re2c/test/posix_captures/glennfowler/41.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/41.i--flex-syntax.c @@ -18,15 +18,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/glennfowler/42.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/42.i--flex-syntax.c index 6d65aca6..cbbeef14 100644 --- a/re2c/test/posix_captures/glennfowler/42.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/42.i--flex-syntax.c @@ -8,29 +8,23 @@ yyt1 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = YYCURSOR; yy4: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy5: yych = *++YYCURSOR; yyt2 = YYCURSOR; diff --git a/re2c/test/posix_captures/glennfowler/43.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/43.i--flex-syntax.c index 781ec144..033385ea 100644 --- a/re2c/test/posix_captures/glennfowler/43.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/43.i--flex-syntax.c @@ -12,19 +12,16 @@ yyt2 = yyt3 = yyt4 = yyt5 = NULL; yyt1 = YYCURSOR; yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; diff --git a/re2c/test/posix_captures/glennfowler/44.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/44.i--flex-syntax.c index 5b446634..c6835a9c 100644 --- a/re2c/test/posix_captures/glennfowler/44.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/44.i--flex-syntax.c @@ -12,25 +12,22 @@ yyt2 = yyt3 = yyt4 = yyt5 = yyt7 = NULL; yyt1 = yyt6 = YYCURSOR; yy2: - { - const size_t yynmatch = 7; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt7; - yypmatch[12] = yyt7; - yypmatch[13] = yyt7; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 7; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt7; + yypmatch[12] = yyt7; + yypmatch[13] = yyt7; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; diff --git a/re2c/test/posix_captures/glennfowler/45.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/45.i--flex-syntax.c index 9cab5025..ae41f7e0 100644 --- a/re2c/test/posix_captures/glennfowler/45.i--flex-syntax.c +++ b/re2c/test/posix_captures/glennfowler/45.i--flex-syntax.c @@ -12,19 +12,16 @@ yyt3 = yyt4 = yyt5 = yyt6 = NULL; yyt1 = yyt2 = YYCURSOR; yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; diff --git a/re2c/test/posix_captures/gor1.i--posix-captures.c b/re2c/test/posix_captures/gor1.i--posix-captures.c index 76f87b00..c9a31a77 100644 --- a/re2c/test/posix_captures/gor1.i--posix-captures.c +++ b/re2c/test/posix_captures/gor1.i--posix-captures.c @@ -14,19 +14,16 @@ goto yy2; } yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[4] = yyt1; - yypmatch[5] = yyt2; - yypmatch[6] = yyt3; - yypmatch[7] = yyt4; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[4] = yyt1; + yypmatch[5] = yyt2; + yypmatch[6] = yyt3; + yypmatch[7] = yyt4; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/gor2.i--posix-captures.c b/re2c/test/posix_captures/gor2.i--posix-captures.c index 4a5c6c5a..24a9d2a2 100644 --- a/re2c/test/posix_captures/gor2.i--posix-captures.c +++ b/re2c/test/posix_captures/gor2.i--posix-captures.c @@ -13,17 +13,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[4] = yyt1; - yypmatch[5] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[4] = yyt1; + yypmatch[5] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/gor3.i--posix-captures.c b/re2c/test/posix_captures/gor3.i--posix-captures.c index 9b0e6959..b36591ef 100644 --- a/re2c/test/posix_captures/gor3.i--posix-captures.c +++ b/re2c/test/posix_captures/gor3.i--posix-captures.c @@ -14,19 +14,16 @@ goto yy3; } yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[4] = yyt5; - yypmatch[5] = yyt2; - yypmatch[6] = yyt3; - yypmatch[7] = yyt4; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[4] = yyt5; + yypmatch[5] = yyt2; + yypmatch[6] = yyt3; + yypmatch[7] = yyt4; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/implicit_grouping2.i--posix-captures.c b/re2c/test/posix_captures/implicit_grouping2.i--posix-captures.c index 3400ae9b..8c84e225 100644 --- a/re2c/test/posix_captures/implicit_grouping2.i--posix-captures.c +++ b/re2c/test/posix_captures/implicit_grouping2.i--posix-captures.c @@ -14,15 +14,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/implicit_grouping3.i--posix-captures.c b/re2c/test/posix_captures/implicit_grouping3.i--posix-captures.c index 3400ae9b..8c84e225 100644 --- a/re2c/test/posix_captures/implicit_grouping3.i--posix-captures.c +++ b/re2c/test/posix_captures/implicit_grouping3.i--posix-captures.c @@ -14,15 +14,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/leftmost1.i--posix-captures.c b/re2c/test/posix_captures/leftmost1.i--posix-captures.c index 67d04657..2da40c8f 100644 --- a/re2c/test/posix_captures/leftmost1.i--posix-captures.c +++ b/re2c/test/posix_captures/leftmost1.i--posix-captures.c @@ -14,19 +14,16 @@ goto yy2; } yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt5; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt5; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/leftmost2.i--posix-captures.c b/re2c/test/posix_captures/leftmost2.i--posix-captures.c index 0fda2448..124ac1ca 100644 --- a/re2c/test/posix_captures/leftmost2.i--posix-captures.c +++ b/re2c/test/posix_captures/leftmost2.i--posix-captures.c @@ -12,31 +12,25 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; yyt3 = NULL; yyt2 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[4] = yyt1; - yypmatch[5] = yyt2; - yypmatch[6] = yyt3; - yypmatch[7] = yyt3; - yypmatch[0] = YYCURSOR - 1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[4] = yyt1; + yypmatch[5] = yyt2; + yypmatch[6] = yyt3; + yypmatch[7] = yyt3; + yypmatch[0] = YYCURSOR - 1; + yypmatch[1] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt1 = yyt2 = yyt3 = NULL; diff --git a/re2c/test/posix_captures/multisubhistories.i--posix-captures.c b/re2c/test/posix_captures/multisubhistories.i--posix-captures.c index 3c6fbb05..b37d2c13 100644 --- a/re2c/test/posix_captures/multisubhistories.i--posix-captures.c +++ b/re2c/test/posix_captures/multisubhistories.i--posix-captures.c @@ -14,19 +14,16 @@ goto yy3; } yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[4] = yyt5; - yypmatch[5] = yyt2; - yypmatch[6] = yyt3; - yypmatch[7] = yyt4; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[4] = yyt5; + yypmatch[5] = yyt2; + yypmatch[6] = yyt3; + yypmatch[7] = yyt4; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/nullsubexpr/01.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/01.i--flex-syntax.c index bd1768fe..101e077f 100644 --- a/re2c/test/posix_captures/nullsubexpr/01.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/01.i--flex-syntax.c @@ -13,15 +13,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/nullsubexpr/02.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/02.i--flex-syntax.c index bc9a397e..7b70c2f9 100644 --- a/re2c/test/posix_captures/nullsubexpr/02.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/02.i--flex-syntax.c @@ -10,15 +10,12 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/nullsubexpr/03.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/03.i--flex-syntax.c index 10e62ea5..73cabb86 100644 --- a/re2c/test/posix_captures/nullsubexpr/03.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/03.i--flex-syntax.c @@ -14,15 +14,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/nullsubexpr/04.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/04.i--flex-syntax.c index 665dfcb4..c4ab4f5c 100644 --- a/re2c/test/posix_captures/nullsubexpr/04.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/04.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -27,15 +24,12 @@ yy3: default: goto yy5; } yy5: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/nullsubexpr/05.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/05.i--flex-syntax.c index bd1768fe..101e077f 100644 --- a/re2c/test/posix_captures/nullsubexpr/05.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/05.i--flex-syntax.c @@ -13,15 +13,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/nullsubexpr/06.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/06.i--flex-syntax.c index bc9a397e..7b70c2f9 100644 --- a/re2c/test/posix_captures/nullsubexpr/06.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/06.i--flex-syntax.c @@ -10,15 +10,12 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/nullsubexpr/07.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/07.i--flex-syntax.c index 7360dcb4..a474af53 100644 --- a/re2c/test/posix_captures/nullsubexpr/07.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/07.i--flex-syntax.c @@ -14,15 +14,12 @@ goto yy3; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/nullsubexpr/08.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/08.i--flex-syntax.c index 9fdccb21..734d0132 100644 --- a/re2c/test/posix_captures/nullsubexpr/08.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/08.i--flex-syntax.c @@ -14,15 +14,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/nullsubexpr/09.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/09.i--flex-syntax.c index 8ff55ed7..0d64c47d 100644 --- a/re2c/test/posix_captures/nullsubexpr/09.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/09.i--flex-syntax.c @@ -14,15 +14,12 @@ goto yy3; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/nullsubexpr/10.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/10.i--flex-syntax.c index 32e71805..29618271 100644 --- a/re2c/test/posix_captures/nullsubexpr/10.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/10.i--flex-syntax.c @@ -15,15 +15,12 @@ goto yy3; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/nullsubexpr/11.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/11.i--flex-syntax.c index fa114bf0..c4cc2994 100644 --- a/re2c/test/posix_captures/nullsubexpr/11.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/11.i--flex-syntax.c @@ -17,17 +17,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/nullsubexpr/12.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/12.i--flex-syntax.c index 820993ae..8b86d265 100644 --- a/re2c/test/posix_captures/nullsubexpr/12.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/12.i--flex-syntax.c @@ -9,24 +9,18 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR - 1; - yypmatch[1] = YYCURSOR; - yypmatch[2] = YYCURSOR - 1; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = YYCURSOR - 1; + yypmatch[1] = YYCURSOR; + yypmatch[2] = YYCURSOR - 1; + yypmatch[3] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/nullsubexpr/13.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/13.i--flex-syntax.c index 049feb0a..6d7dcddd 100644 --- a/re2c/test/posix_captures/nullsubexpr/13.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/13.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -37,17 +34,14 @@ yy5: goto yy2; yy6: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/nullsubexpr/14.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/14.i--flex-syntax.c index 049feb0a..6d7dcddd 100644 --- a/re2c/test/posix_captures/nullsubexpr/14.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/14.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -37,17 +34,14 @@ yy5: goto yy2; yy6: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/nullsubexpr/15.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/15.i--flex-syntax.c index 049feb0a..6d7dcddd 100644 --- a/re2c/test/posix_captures/nullsubexpr/15.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/15.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -37,17 +34,14 @@ yy5: goto yy2; yy6: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/nullsubexpr/16.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/16.i--flex-syntax.c index a6ad08ab..b99d36bc 100644 --- a/re2c/test/posix_captures/nullsubexpr/16.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/16.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -35,17 +32,14 @@ yy5: goto yy2; yy6: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/nullsubexpr/17.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/17.i--flex-syntax.c index a6ad08ab..b99d36bc 100644 --- a/re2c/test/posix_captures/nullsubexpr/17.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/17.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -35,17 +32,14 @@ yy5: goto yy2; yy6: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/nullsubexpr/18.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/18.i--flex-syntax.c index a6ad08ab..b99d36bc 100644 --- a/re2c/test/posix_captures/nullsubexpr/18.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/18.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -35,17 +32,14 @@ yy5: goto yy2; yy6: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/nullsubexpr/19.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/19.i--flex-syntax.c index d051ee0b..0d63898e 100644 --- a/re2c/test/posix_captures/nullsubexpr/19.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/19.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -37,17 +34,14 @@ yy5: goto yy2; yy6: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/nullsubexpr/20.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/20.i--flex-syntax.c index d051ee0b..0d63898e 100644 --- a/re2c/test/posix_captures/nullsubexpr/20.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/20.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -37,17 +34,14 @@ yy5: goto yy2; yy6: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/nullsubexpr/21.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/21.i--flex-syntax.c index d051ee0b..0d63898e 100644 --- a/re2c/test/posix_captures/nullsubexpr/21.i--flex-syntax.c +++ b/re2c/test/posix_captures/nullsubexpr/21.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -37,17 +34,14 @@ yy5: goto yy2; yy6: ++YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/offsets.i--posix-captures--input(custom).c b/re2c/test/posix_captures/offsets.i--posix-captures--input(custom).c new file mode 100644 index 00000000..20099b32 --- /dev/null +++ b/re2c/test/posix_captures/offsets.i--posix-captures--input(custom).c @@ -0,0 +1,76 @@ +/* Generated by re2c */ +#include +#include + +static void lex(const char *s) +{ +#define YYPEEK() *s +#define YYSKIP() ++s +#define YYBACKUP() marker = s +#define YYRESTORE() s = marker +#define YYSTAGP(t) t = (s - p) +#define YYSTAGN(t) t = 0 + #define YYMAXNMATCH 2 + + size_t yynmatch; + const char *marker, *p = s; + long yypmatch[YYMAXNMATCH * 2]; + long yyt1;long yyt2;long yyt3; + +{ + char yych; + yych = YYPEEK (); + switch (yych) { + case 'a': + YYSTAGP (yyt1); + YYSTAGP (yyt3); + goto yy4; + default: goto yy2; + } +yy2: + YYSKIP (); + { printf("error\n"); return; } +yy4: + YYSKIP (); + yych = YYPEEK (); + switch (yych) { + case 'a': goto yy6; + default: + YYSTAGP (yyt2); + goto yy5; + } +yy5: + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[1] = yyt2; + yypmatch[2] = yyt3; + yypmatch[3] = yyt2; + { + printf("'%.*s', '%.*s'\n", + yypmatch[1] - yypmatch[0], p + yypmatch[0], + yypmatch[3] - yypmatch[2], p + yypmatch[2]); + return; + } +yy6: + YYSKIP (); + yych = YYPEEK (); + switch (yych) { + case 'a': + YYSTAGP (yyt3); + goto yy4; + default: + YYSTAGP (yyt2); + goto yy5; + } +} + +} + +int main(int argc, char **argv) +{ + for (int i = 1; i < argc; ++i) { + lex(argv[i]); + } + return 0; +} +re2c: warning: line 22: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/offsets.i--posix-captures--input(custom).re b/re2c/test/posix_captures/offsets.i--posix-captures--input(custom).re new file mode 100644 index 00000000..f3b076cc --- /dev/null +++ b/re2c/test/posix_captures/offsets.i--posix-captures--input(custom).re @@ -0,0 +1,37 @@ +#include +#include + +static void lex(const char *s) +{ +#define YYPEEK() *s +#define YYSKIP() ++s +#define YYBACKUP() marker = s +#define YYRESTORE() s = marker +#define YYSTAGP(t) t = (s - p) +#define YYSTAGN(t) t = 0 + /*!maxnmatch:re2c*/ + size_t yynmatch; + const char *marker, *p = s; + long yypmatch[YYMAXNMATCH * 2]; + /*!stags:re2c format = "long @@;"; */ + /*!re2c + re2c:define:YYCTYPE = char; + re2c:yyfill:enable = 0; + + * { printf("error\n"); return; } + ("a" | "aa")* { + printf("'%.*s', '%.*s'\n", + yypmatch[1] - yypmatch[0], p + yypmatch[0], + yypmatch[3] - yypmatch[2], p + yypmatch[2]); + return; + } + */ +} + +int main(int argc, char **argv) +{ + for (int i = 1; i < argc; ++i) { + lex(argv[i]); + } + return 0; +} diff --git a/re2c/test/posix_captures/osxbsdcritical/01.i--flex-syntax.c b/re2c/test/posix_captures/osxbsdcritical/01.i--flex-syntax.c index 7c8a91f9..f33eabb0 100644 --- a/re2c/test/posix_captures/osxbsdcritical/01.i--flex-syntax.c +++ b/re2c/test/posix_captures/osxbsdcritical/01.i--flex-syntax.c @@ -14,13 +14,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -41,19 +38,16 @@ yy5: default: goto yy6; } yy6: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - yypmatch[6] = YYCURSOR - 1; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + yypmatch[6] = YYCURSOR - 1; + yypmatch[7] = YYCURSOR; + {} yy7: ++YYCURSOR; goto yy6; diff --git a/re2c/test/posix_captures/osxbsdcritical/02.i--flex-syntax.c b/re2c/test/posix_captures/osxbsdcritical/02.i--flex-syntax.c index 033a5f2c..4bdda914 100644 --- a/re2c/test/posix_captures/osxbsdcritical/02.i--flex-syntax.c +++ b/re2c/test/posix_captures/osxbsdcritical/02.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -41,19 +38,16 @@ yy5: default: goto yy6; } yy6: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - yypmatch[6] = YYCURSOR - 1; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + yypmatch[6] = YYCURSOR - 1; + yypmatch[7] = YYCURSOR; + {} yy7: ++YYCURSOR; goto yy6; diff --git a/re2c/test/posix_captures/osxbsdcritical/03.i--flex-syntax.c b/re2c/test/posix_captures/osxbsdcritical/03.i--flex-syntax.c index fd025651..ba8d7eb3 100644 --- a/re2c/test/posix_captures/osxbsdcritical/03.i--flex-syntax.c +++ b/re2c/test/posix_captures/osxbsdcritical/03.i--flex-syntax.c @@ -15,13 +15,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -54,17 +51,14 @@ yy6: default: goto yy9; } yy7: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yyaccept = 1; YYMARKER = ++YYCURSOR; diff --git a/re2c/test/posix_captures/osxbsdcritical/04.i--flex-syntax.c b/re2c/test/posix_captures/osxbsdcritical/04.i--flex-syntax.c index 7c8a91f9..f33eabb0 100644 --- a/re2c/test/posix_captures/osxbsdcritical/04.i--flex-syntax.c +++ b/re2c/test/posix_captures/osxbsdcritical/04.i--flex-syntax.c @@ -14,13 +14,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -41,19 +38,16 @@ yy5: default: goto yy6; } yy6: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - yypmatch[6] = YYCURSOR - 1; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + yypmatch[6] = YYCURSOR - 1; + yypmatch[7] = YYCURSOR; + {} yy7: ++YYCURSOR; goto yy6; diff --git a/re2c/test/posix_captures/osxbsdcritical/05.i--flex-syntax.c b/re2c/test/posix_captures/osxbsdcritical/05.i--flex-syntax.c index 033a5f2c..4bdda914 100644 --- a/re2c/test/posix_captures/osxbsdcritical/05.i--flex-syntax.c +++ b/re2c/test/posix_captures/osxbsdcritical/05.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -41,19 +38,16 @@ yy5: default: goto yy6; } yy6: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - yypmatch[6] = YYCURSOR - 1; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + yypmatch[6] = YYCURSOR - 1; + yypmatch[7] = YYCURSOR; + {} yy7: ++YYCURSOR; goto yy6; diff --git a/re2c/test/posix_captures/osxbsdcritical/06.i--flex-syntax.c b/re2c/test/posix_captures/osxbsdcritical/06.i--flex-syntax.c index fd025651..ba8d7eb3 100644 --- a/re2c/test/posix_captures/osxbsdcritical/06.i--flex-syntax.c +++ b/re2c/test/posix_captures/osxbsdcritical/06.i--flex-syntax.c @@ -15,13 +15,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -54,17 +51,14 @@ yy6: default: goto yy9; } yy7: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yyaccept = 1; YYMARKER = ++YYCURSOR; diff --git a/re2c/test/posix_captures/osxbsdcritical/07.i--flex-syntax.c b/re2c/test/posix_captures/osxbsdcritical/07.i--flex-syntax.c index a0adb6d6..fd84cfa4 100644 --- a/re2c/test/posix_captures/osxbsdcritical/07.i--flex-syntax.c +++ b/re2c/test/posix_captures/osxbsdcritical/07.i--flex-syntax.c @@ -14,13 +14,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -37,17 +34,14 @@ yy5: default: goto yy6; } yy6: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - yypmatch[4] = YYCURSOR - 1; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + yypmatch[4] = YYCURSOR - 1; + yypmatch[5] = YYCURSOR; + {} yy7: ++YYCURSOR; goto yy6; diff --git a/re2c/test/posix_captures/other/01.i--flex-syntax.c b/re2c/test/posix_captures/other/01.i--flex-syntax.c index c28fcf86..8de9b9e9 100644 --- a/re2c/test/posix_captures/other/01.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/01.i--flex-syntax.c @@ -14,15 +14,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/other/02.i--flex-syntax.c b/re2c/test/posix_captures/other/02.i--flex-syntax.c index c28fcf86..8de9b9e9 100644 --- a/re2c/test/posix_captures/other/02.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/02.i--flex-syntax.c @@ -14,15 +14,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/other/03.i--flex-syntax.c b/re2c/test/posix_captures/other/03.i--flex-syntax.c index b6873b87..4b31e353 100644 --- a/re2c/test/posix_captures/other/03.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/03.i--flex-syntax.c @@ -9,25 +9,19 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; yyt1 = NULL; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[3] = yyt1; - yypmatch[0] = YYCURSOR - 1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[3] = yyt1; + yypmatch[0] = YYCURSOR - 1; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/other/04.i--flex-syntax.c b/re2c/test/posix_captures/other/04.i--flex-syntax.c index 66ce719d..00dfd33d 100644 --- a/re2c/test/posix_captures/other/04.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/04.i--flex-syntax.c @@ -11,25 +11,19 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; yyt2 = YYCURSOR; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[0] = YYCURSOR - 1; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[0] = YYCURSOR - 1; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/other/05.i--flex-syntax.c b/re2c/test/posix_captures/other/05.i--flex-syntax.c index 753d4258..8236d2cb 100644 --- a/re2c/test/posix_captures/other/05.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/05.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -32,17 +29,14 @@ yy4: yy5: ++YYCURSOR; yyt3 = NULL; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt3; - yypmatch[0] = YYCURSOR - 2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt3; + yypmatch[0] = YYCURSOR - 2; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/other/06.i--flex-syntax.c b/re2c/test/posix_captures/other/06.i--flex-syntax.c index 0e72fb0e..8857af4a 100644 --- a/re2c/test/posix_captures/other/06.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/06.i--flex-syntax.c @@ -9,13 +9,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -31,17 +28,14 @@ yy5: ++YYCURSOR; yyt3 = NULL; yyt2 = YYCURSOR; - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[3] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt3; - yypmatch[0] = YYCURSOR - 2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[3] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt3; + yypmatch[0] = YYCURSOR - 2; + yypmatch[1] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/other/07.i--flex-syntax.c b/re2c/test/posix_captures/other/07.i--flex-syntax.c index 987292a9..f6d6fba6 100644 --- a/re2c/test/posix_captures/other/07.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/07.i--flex-syntax.c @@ -14,15 +14,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/other/08.i--flex-syntax.c b/re2c/test/posix_captures/other/08.i--flex-syntax.c index 0e9e442d..f8683519 100644 --- a/re2c/test/posix_captures/other/08.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/08.i--flex-syntax.c @@ -14,15 +14,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[3] = yyt2; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[3] = yyt2; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/other/09.i--flex-syntax.c b/re2c/test/posix_captures/other/09.i--flex-syntax.c index 4dff57ea..e7f0902d 100644 --- a/re2c/test/posix_captures/other/09.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/09.i--flex-syntax.c @@ -13,15 +13,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/other/10.i--flex-syntax.c b/re2c/test/posix_captures/other/10.i--flex-syntax.c index cac6f3ec..25e6925b 100644 --- a/re2c/test/posix_captures/other/10.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/10.i--flex-syntax.c @@ -13,17 +13,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/other/11.i--flex-syntax.c b/re2c/test/posix_captures/other/11.i--flex-syntax.c index 3baf918c..3225b112 100644 --- a/re2c/test/posix_captures/other/11.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/11.i--flex-syntax.c @@ -15,17 +15,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt4; - yypmatch[3] = yyt2; - yypmatch[4] = yyt5; - yypmatch[5] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt4; + yypmatch[3] = yyt2; + yypmatch[4] = yyt5; + yypmatch[5] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/other/12.i--flex-syntax.c b/re2c/test/posix_captures/other/12.i--flex-syntax.c index 691bb514..0d65e797 100644 --- a/re2c/test/posix_captures/other/12.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/12.i--flex-syntax.c @@ -24,15 +24,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: yyaccept = 1; YYMARKER = ++YYCURSOR; diff --git a/re2c/test/posix_captures/other/13.i--flex-syntax.c b/re2c/test/posix_captures/other/13.i--flex-syntax.c index 165840b0..5348b4ca 100644 --- a/re2c/test/posix_captures/other/13.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/13.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -31,15 +28,12 @@ yy4: goto yy2; yy5: ++YYCURSOR; - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/other/14.i--flex-syntax.c b/re2c/test/posix_captures/other/14.i--flex-syntax.c index 6663cdc3..d9d28c11 100644 --- a/re2c/test/posix_captures/other/14.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/14.i--flex-syntax.c @@ -14,15 +14,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/other/15.i--flex-syntax.c b/re2c/test/posix_captures/other/15.i--flex-syntax.c index 0f7b5715..4a8781bc 100644 --- a/re2c/test/posix_captures/other/15.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/15.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -27,15 +24,12 @@ yy3: default: goto yy4; } yy4: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; goto yy4; diff --git a/re2c/test/posix_captures/other/16.i--flex-syntax.c b/re2c/test/posix_captures/other/16.i--flex-syntax.c index 08e19c66..d3ee98e1 100644 --- a/re2c/test/posix_captures/other/16.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/16.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -36,15 +33,12 @@ yy5: default: goto yy6; } yy6: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy7: ++YYCURSOR; yyt2 = yyt3; diff --git a/re2c/test/posix_captures/other/17.i--flex-syntax.c b/re2c/test/posix_captures/other/17.i--flex-syntax.c index 674a153a..b1308767 100644 --- a/re2c/test/posix_captures/other/17.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/17.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -29,15 +26,12 @@ yy3: goto yy4; } yy4: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy5: yych = *++YYCURSOR; yyt3 = YYCURSOR; diff --git a/re2c/test/posix_captures/other/18.i--flex-syntax.c b/re2c/test/posix_captures/other/18.i--flex-syntax.c index aa1415f2..e9134c23 100644 --- a/re2c/test/posix_captures/other/18.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/18.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -40,15 +37,12 @@ yy5: default: goto yy7; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} } re2c: warning: line 6: rule matches empty string [-Wmatch-empty-string] diff --git a/re2c/test/posix_captures/other/19.i--flex-syntax.c b/re2c/test/posix_captures/other/19.i--flex-syntax.c index 3fcda5f5..d64803fc 100644 --- a/re2c/test/posix_captures/other/19.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/19.i--flex-syntax.c @@ -13,15 +13,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; yyt2 = YYCURSOR; diff --git a/re2c/test/posix_captures/other/20.i--flex-syntax.c b/re2c/test/posix_captures/other/20.i--flex-syntax.c index 46cb5c2f..c06320c3 100644 --- a/re2c/test/posix_captures/other/20.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/20.i--flex-syntax.c @@ -13,15 +13,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/other/21.i--flex-syntax.c b/re2c/test/posix_captures/other/21.i--flex-syntax.c index 4ae68dbe..d31d8904 100644 --- a/re2c/test/posix_captures/other/21.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/21.i--flex-syntax.c @@ -10,15 +10,12 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/other/22.i--flex-syntax.c b/re2c/test/posix_captures/other/22.i--flex-syntax.c index 37008125..d6905cc3 100644 --- a/re2c/test/posix_captures/other/22.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/22.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -27,15 +24,12 @@ yy3: default: goto yy4; } yy4: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy5: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/other/23.i--flex-syntax.c b/re2c/test/posix_captures/other/23.i--flex-syntax.c index fb5d2743..af72b8b4 100644 --- a/re2c/test/posix_captures/other/23.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/23.i--flex-syntax.c @@ -13,15 +13,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/other/24.i--flex-syntax.c b/re2c/test/posix_captures/other/24.i--flex-syntax.c index f3fb137c..6503ad44 100644 --- a/re2c/test/posix_captures/other/24.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/24.i--flex-syntax.c @@ -13,15 +13,12 @@ goto yy2; } yy2: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; yyt2 = YYCURSOR; diff --git a/re2c/test/posix_captures/other/25.i--flex-syntax.c b/re2c/test/posix_captures/other/25.i--flex-syntax.c index 05685dbd..b9f450b3 100644 --- a/re2c/test/posix_captures/other/25.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/25.i--flex-syntax.c @@ -16,17 +16,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/other/26.i--flex-syntax.c b/re2c/test/posix_captures/other/26.i--flex-syntax.c index 75f6f050..d3c538ad 100644 --- a/re2c/test/posix_captures/other/26.i--flex-syntax.c +++ b/re2c/test/posix_captures/other/26.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -44,15 +41,12 @@ yy6: default: goto yy7; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/01.i--flex-syntax.c b/re2c/test/posix_captures/repetition/01.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/01.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/01.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/02.i--flex-syntax.c b/re2c/test/posix_captures/repetition/02.i--flex-syntax.c index 3ea75b07..5d982296 100644 --- a/re2c/test/posix_captures/repetition/02.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/02.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -35,25 +32,22 @@ yy5: yyt7 = yyt8 = NULL; yyt10 = YYCURSOR; yy6: - { - const size_t yynmatch = 7; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 7; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/03.i--flex-syntax.c b/re2c/test/posix_captures/repetition/03.i--flex-syntax.c index 89d8970f..7c9bacb0 100644 --- a/re2c/test/posix_captures/repetition/03.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/03.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -40,31 +37,28 @@ yy5: yyt12 = yyt13 = NULL; yyt15 = YYCURSOR; yy7: - { - const size_t yynmatch = 10; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[14] = yyt11; - yypmatch[16] = yyt12; - yypmatch[17] = yyt13; - yypmatch[18] = yyt14; - yypmatch[19] = yyt15; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = yyt11; - yypmatch[15] = YYCURSOR; - {} - } + yynmatch = 10; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[14] = yyt11; + yypmatch[16] = yyt12; + yypmatch[17] = yyt13; + yypmatch[18] = yyt14; + yypmatch[19] = yyt15; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = yyt11; + yypmatch[15] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/04.i--flex-syntax.c b/re2c/test/posix_captures/repetition/04.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/04.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/04.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/05.i--flex-syntax.c b/re2c/test/posix_captures/repetition/05.i--flex-syntax.c index c7306ffd..7306fe13 100644 --- a/re2c/test/posix_captures/repetition/05.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/05.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -33,19 +30,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy6: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/06.i--flex-syntax.c b/re2c/test/posix_captures/repetition/06.i--flex-syntax.c index 7a16595c..8d53bf90 100644 --- a/re2c/test/posix_captures/repetition/06.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/06.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; @@ -34,19 +31,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/07.i--flex-syntax.c b/re2c/test/posix_captures/repetition/07.i--flex-syntax.c index 0625dd24..678a7a92 100644 --- a/re2c/test/posix_captures/repetition/07.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/07.i--flex-syntax.c @@ -11,19 +11,16 @@ yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL; yyt1 = YYCURSOR; yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[6] = yyt6; - yypmatch[7] = yyt7; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[6] = yyt6; + yypmatch[7] = yyt7; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/08.i--flex-syntax.c b/re2c/test/posix_captures/repetition/08.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/08.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/08.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/09.i--flex-syntax.c b/re2c/test/posix_captures/repetition/09.i--flex-syntax.c index 3ea75b07..5d982296 100644 --- a/re2c/test/posix_captures/repetition/09.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/09.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -35,25 +32,22 @@ yy5: yyt7 = yyt8 = NULL; yyt10 = YYCURSOR; yy6: - { - const size_t yynmatch = 7; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 7; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/10.i--flex-syntax.c b/re2c/test/posix_captures/repetition/10.i--flex-syntax.c index 89d8970f..7c9bacb0 100644 --- a/re2c/test/posix_captures/repetition/10.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/10.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -40,31 +37,28 @@ yy5: yyt12 = yyt13 = NULL; yyt15 = YYCURSOR; yy7: - { - const size_t yynmatch = 10; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[14] = yyt11; - yypmatch[16] = yyt12; - yypmatch[17] = yyt13; - yypmatch[18] = yyt14; - yypmatch[19] = yyt15; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = yyt11; - yypmatch[15] = YYCURSOR; - {} - } + yynmatch = 10; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[14] = yyt11; + yypmatch[16] = yyt12; + yypmatch[17] = yyt13; + yypmatch[18] = yyt14; + yypmatch[19] = yyt15; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = yyt11; + yypmatch[15] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/11.i--flex-syntax.c b/re2c/test/posix_captures/repetition/11.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/11.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/11.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/12.i--flex-syntax.c b/re2c/test/posix_captures/repetition/12.i--flex-syntax.c index c7306ffd..7306fe13 100644 --- a/re2c/test/posix_captures/repetition/12.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/12.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -33,19 +30,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy6: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/13.i--flex-syntax.c b/re2c/test/posix_captures/repetition/13.i--flex-syntax.c index 7a16595c..8d53bf90 100644 --- a/re2c/test/posix_captures/repetition/13.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/13.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; @@ -34,19 +31,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/14.i--flex-syntax.c b/re2c/test/posix_captures/repetition/14.i--flex-syntax.c index 0625dd24..678a7a92 100644 --- a/re2c/test/posix_captures/repetition/14.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/14.i--flex-syntax.c @@ -11,19 +11,16 @@ yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL; yyt1 = YYCURSOR; yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[6] = yyt6; - yypmatch[7] = yyt7; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[6] = yyt6; + yypmatch[7] = yyt7; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/15.i--flex-syntax.c b/re2c/test/posix_captures/repetition/15.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/15.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/15.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/16.i--flex-syntax.c b/re2c/test/posix_captures/repetition/16.i--flex-syntax.c index 3ea75b07..5d982296 100644 --- a/re2c/test/posix_captures/repetition/16.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/16.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -35,25 +32,22 @@ yy5: yyt7 = yyt8 = NULL; yyt10 = YYCURSOR; yy6: - { - const size_t yynmatch = 7; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 7; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/17.i--flex-syntax.c b/re2c/test/posix_captures/repetition/17.i--flex-syntax.c index 89d8970f..7c9bacb0 100644 --- a/re2c/test/posix_captures/repetition/17.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/17.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -40,31 +37,28 @@ yy5: yyt12 = yyt13 = NULL; yyt15 = YYCURSOR; yy7: - { - const size_t yynmatch = 10; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[14] = yyt11; - yypmatch[16] = yyt12; - yypmatch[17] = yyt13; - yypmatch[18] = yyt14; - yypmatch[19] = yyt15; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = yyt11; - yypmatch[15] = YYCURSOR; - {} - } + yynmatch = 10; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[14] = yyt11; + yypmatch[16] = yyt12; + yypmatch[17] = yyt13; + yypmatch[18] = yyt14; + yypmatch[19] = yyt15; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = yyt11; + yypmatch[15] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/18.i--flex-syntax.c b/re2c/test/posix_captures/repetition/18.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/18.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/18.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/19.i--flex-syntax.c b/re2c/test/posix_captures/repetition/19.i--flex-syntax.c index c7306ffd..7306fe13 100644 --- a/re2c/test/posix_captures/repetition/19.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/19.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -33,19 +30,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy6: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/20.i--flex-syntax.c b/re2c/test/posix_captures/repetition/20.i--flex-syntax.c index 7a16595c..8d53bf90 100644 --- a/re2c/test/posix_captures/repetition/20.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/20.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; @@ -34,19 +31,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/21.i--flex-syntax.c b/re2c/test/posix_captures/repetition/21.i--flex-syntax.c index 0625dd24..678a7a92 100644 --- a/re2c/test/posix_captures/repetition/21.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/21.i--flex-syntax.c @@ -11,19 +11,16 @@ yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL; yyt1 = YYCURSOR; yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[6] = yyt6; - yypmatch[7] = yyt7; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[6] = yyt6; + yypmatch[7] = yyt7; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/22.i--flex-syntax.c b/re2c/test/posix_captures/repetition/22.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/22.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/22.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/23.i--flex-syntax.c b/re2c/test/posix_captures/repetition/23.i--flex-syntax.c index 3ea75b07..5d982296 100644 --- a/re2c/test/posix_captures/repetition/23.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/23.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -35,25 +32,22 @@ yy5: yyt7 = yyt8 = NULL; yyt10 = YYCURSOR; yy6: - { - const size_t yynmatch = 7; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 7; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/24.i--flex-syntax.c b/re2c/test/posix_captures/repetition/24.i--flex-syntax.c index 89d8970f..7c9bacb0 100644 --- a/re2c/test/posix_captures/repetition/24.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/24.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -40,31 +37,28 @@ yy5: yyt12 = yyt13 = NULL; yyt15 = YYCURSOR; yy7: - { - const size_t yynmatch = 10; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[14] = yyt11; - yypmatch[16] = yyt12; - yypmatch[17] = yyt13; - yypmatch[18] = yyt14; - yypmatch[19] = yyt15; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = yyt11; - yypmatch[15] = YYCURSOR; - {} - } + yynmatch = 10; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[14] = yyt11; + yypmatch[16] = yyt12; + yypmatch[17] = yyt13; + yypmatch[18] = yyt14; + yypmatch[19] = yyt15; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = yyt11; + yypmatch[15] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/25.i--flex-syntax.c b/re2c/test/posix_captures/repetition/25.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/25.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/25.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/26.i--flex-syntax.c b/re2c/test/posix_captures/repetition/26.i--flex-syntax.c index c7306ffd..7306fe13 100644 --- a/re2c/test/posix_captures/repetition/26.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/26.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -33,19 +30,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy6: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/27.i--flex-syntax.c b/re2c/test/posix_captures/repetition/27.i--flex-syntax.c index 7a16595c..8d53bf90 100644 --- a/re2c/test/posix_captures/repetition/27.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/27.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; @@ -34,19 +31,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/28.i--flex-syntax.c b/re2c/test/posix_captures/repetition/28.i--flex-syntax.c index 0625dd24..678a7a92 100644 --- a/re2c/test/posix_captures/repetition/28.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/28.i--flex-syntax.c @@ -11,19 +11,16 @@ yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL; yyt1 = YYCURSOR; yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[6] = yyt6; - yypmatch[7] = yyt7; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[6] = yyt6; + yypmatch[7] = yyt7; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/29.i--flex-syntax.c b/re2c/test/posix_captures/repetition/29.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/29.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/29.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/30.i--flex-syntax.c b/re2c/test/posix_captures/repetition/30.i--flex-syntax.c index 3ea75b07..5d982296 100644 --- a/re2c/test/posix_captures/repetition/30.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/30.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -35,25 +32,22 @@ yy5: yyt7 = yyt8 = NULL; yyt10 = YYCURSOR; yy6: - { - const size_t yynmatch = 7; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 7; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/31.i--flex-syntax.c b/re2c/test/posix_captures/repetition/31.i--flex-syntax.c index 89d8970f..7c9bacb0 100644 --- a/re2c/test/posix_captures/repetition/31.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/31.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -40,31 +37,28 @@ yy5: yyt12 = yyt13 = NULL; yyt15 = YYCURSOR; yy7: - { - const size_t yynmatch = 10; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[14] = yyt11; - yypmatch[16] = yyt12; - yypmatch[17] = yyt13; - yypmatch[18] = yyt14; - yypmatch[19] = yyt15; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = yyt11; - yypmatch[15] = YYCURSOR; - {} - } + yynmatch = 10; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[14] = yyt11; + yypmatch[16] = yyt12; + yypmatch[17] = yyt13; + yypmatch[18] = yyt14; + yypmatch[19] = yyt15; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = yyt11; + yypmatch[15] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/32.i--flex-syntax.c b/re2c/test/posix_captures/repetition/32.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/32.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/32.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/33.i--flex-syntax.c b/re2c/test/posix_captures/repetition/33.i--flex-syntax.c index c7306ffd..7306fe13 100644 --- a/re2c/test/posix_captures/repetition/33.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/33.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -33,19 +30,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy6: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/34.i--flex-syntax.c b/re2c/test/posix_captures/repetition/34.i--flex-syntax.c index 7a16595c..8d53bf90 100644 --- a/re2c/test/posix_captures/repetition/34.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/34.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; @@ -34,19 +31,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/35.i--flex-syntax.c b/re2c/test/posix_captures/repetition/35.i--flex-syntax.c index 0625dd24..678a7a92 100644 --- a/re2c/test/posix_captures/repetition/35.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/35.i--flex-syntax.c @@ -11,19 +11,16 @@ yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL; yyt1 = YYCURSOR; yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[6] = yyt6; - yypmatch[7] = yyt7; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[6] = yyt6; + yypmatch[7] = yyt7; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/36.i--flex-syntax.c b/re2c/test/posix_captures/repetition/36.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/36.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/36.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/37.i--flex-syntax.c b/re2c/test/posix_captures/repetition/37.i--flex-syntax.c index 3ea75b07..5d982296 100644 --- a/re2c/test/posix_captures/repetition/37.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/37.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -35,25 +32,22 @@ yy5: yyt7 = yyt8 = NULL; yyt10 = YYCURSOR; yy6: - { - const size_t yynmatch = 7; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 7; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/38.i--flex-syntax.c b/re2c/test/posix_captures/repetition/38.i--flex-syntax.c index 89d8970f..7c9bacb0 100644 --- a/re2c/test/posix_captures/repetition/38.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/38.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -40,31 +37,28 @@ yy5: yyt12 = yyt13 = NULL; yyt15 = YYCURSOR; yy7: - { - const size_t yynmatch = 10; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[14] = yyt11; - yypmatch[16] = yyt12; - yypmatch[17] = yyt13; - yypmatch[18] = yyt14; - yypmatch[19] = yyt15; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = yyt11; - yypmatch[15] = YYCURSOR; - {} - } + yynmatch = 10; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[14] = yyt11; + yypmatch[16] = yyt12; + yypmatch[17] = yyt13; + yypmatch[18] = yyt14; + yypmatch[19] = yyt15; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = yyt11; + yypmatch[15] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/39.i--flex-syntax.c b/re2c/test/posix_captures/repetition/39.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/39.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/39.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/40.i--flex-syntax.c b/re2c/test/posix_captures/repetition/40.i--flex-syntax.c index c7306ffd..7306fe13 100644 --- a/re2c/test/posix_captures/repetition/40.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/40.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -33,19 +30,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy6: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/41.i--flex-syntax.c b/re2c/test/posix_captures/repetition/41.i--flex-syntax.c index 7a16595c..8d53bf90 100644 --- a/re2c/test/posix_captures/repetition/41.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/41.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; @@ -34,19 +31,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/42.i--flex-syntax.c b/re2c/test/posix_captures/repetition/42.i--flex-syntax.c index 0625dd24..678a7a92 100644 --- a/re2c/test/posix_captures/repetition/42.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/42.i--flex-syntax.c @@ -11,19 +11,16 @@ yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL; yyt1 = YYCURSOR; yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[6] = yyt6; - yypmatch[7] = yyt7; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[6] = yyt6; + yypmatch[7] = yyt7; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/43.i--flex-syntax.c b/re2c/test/posix_captures/repetition/43.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/43.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/43.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/44.i--flex-syntax.c b/re2c/test/posix_captures/repetition/44.i--flex-syntax.c index 3ea75b07..5d982296 100644 --- a/re2c/test/posix_captures/repetition/44.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/44.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -35,25 +32,22 @@ yy5: yyt7 = yyt8 = NULL; yyt10 = YYCURSOR; yy6: - { - const size_t yynmatch = 7; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = YYCURSOR; - {} - } + yynmatch = 7; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/45.i--flex-syntax.c b/re2c/test/posix_captures/repetition/45.i--flex-syntax.c index 89d8970f..7c9bacb0 100644 --- a/re2c/test/posix_captures/repetition/45.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/45.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -40,31 +37,28 @@ yy5: yyt12 = yyt13 = NULL; yyt15 = YYCURSOR; yy7: - { - const size_t yynmatch = 10; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[8] = yyt6; - yypmatch[10] = yyt7; - yypmatch[11] = yyt8; - yypmatch[12] = yyt9; - yypmatch[13] = yyt10; - yypmatch[14] = yyt11; - yypmatch[16] = yyt12; - yypmatch[17] = yyt13; - yypmatch[18] = yyt14; - yypmatch[19] = yyt15; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt6; - yypmatch[9] = yyt11; - yypmatch[15] = YYCURSOR; - {} - } + yynmatch = 10; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[8] = yyt6; + yypmatch[10] = yyt7; + yypmatch[11] = yyt8; + yypmatch[12] = yyt9; + yypmatch[13] = yyt10; + yypmatch[14] = yyt11; + yypmatch[16] = yyt12; + yypmatch[17] = yyt13; + yypmatch[18] = yyt14; + yypmatch[19] = yyt15; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt6; + yypmatch[9] = yyt11; + yypmatch[15] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/46.i--flex-syntax.c b/re2c/test/posix_captures/repetition/46.i--flex-syntax.c index ccd70d88..1ae28e02 100644 --- a/re2c/test/posix_captures/repetition/46.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/46.i--flex-syntax.c @@ -8,32 +8,26 @@ yyt1 = yyt2 = yyt4 = YYCURSOR; goto yy3; } - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; yyt2 = yyt3 = NULL; yyt5 = YYCURSOR; yy4: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[5] = yyt3; - yypmatch[6] = yyt4; - yypmatch[7] = yyt5; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[5] = yyt3; + yypmatch[6] = yyt4; + yypmatch[7] = yyt5; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy5: ++YYCURSOR; yyt4 = yyt5 = NULL; diff --git a/re2c/test/posix_captures/repetition/47.i--flex-syntax.c b/re2c/test/posix_captures/repetition/47.i--flex-syntax.c index c7306ffd..7306fe13 100644 --- a/re2c/test/posix_captures/repetition/47.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/47.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) { @@ -33,19 +30,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy6: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy7: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/48.i--flex-syntax.c b/re2c/test/posix_captures/repetition/48.i--flex-syntax.c index 7a16595c..8d53bf90 100644 --- a/re2c/test/posix_captures/repetition/48.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/48.i--flex-syntax.c @@ -9,13 +9,10 @@ goto yy3; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; if (yych >= 0x01) goto yy5; @@ -34,19 +31,16 @@ yy5: yyt3 = yyt4 = NULL; yyt6 = YYCURSOR; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[6] = yyt5; - yypmatch[7] = yyt6; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[6] = yyt5; + yypmatch[7] = yyt6; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; if (yych <= 0x00) { diff --git a/re2c/test/posix_captures/repetition/49.i--flex-syntax.c b/re2c/test/posix_captures/repetition/49.i--flex-syntax.c index 0625dd24..678a7a92 100644 --- a/re2c/test/posix_captures/repetition/49.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/49.i--flex-syntax.c @@ -11,19 +11,16 @@ yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL; yyt1 = YYCURSOR; yy2: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[5] = yyt5; - yypmatch[6] = yyt6; - yypmatch[7] = yyt7; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[5] = yyt5; + yypmatch[6] = yyt6; + yypmatch[7] = yyt7; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/50.i--flex-syntax.c b/re2c/test/posix_captures/repetition/50.i--flex-syntax.c index 59a5a5f8..a30233c6 100644 --- a/re2c/test/posix_captures/repetition/50.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/50.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -58,15 +55,12 @@ yy7: default: goto yy10; } yy8: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy9: yyaccept = 1; YYMARKER = ++YYCURSOR; diff --git a/re2c/test/posix_captures/repetition/51.i--flex-syntax.c b/re2c/test/posix_captures/repetition/51.i--flex-syntax.c index c31cdfa4..05e948f7 100644 --- a/re2c/test/posix_captures/repetition/51.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/51.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -58,15 +55,12 @@ yy7: default: goto yy10; } yy8: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy9: yyaccept = 1; YYMARKER = ++YYCURSOR; diff --git a/re2c/test/posix_captures/repetition/52.i--flex-syntax.c b/re2c/test/posix_captures/repetition/52.i--flex-syntax.c index 5ca98da1..1bc07695 100644 --- a/re2c/test/posix_captures/repetition/52.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/52.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -56,15 +53,12 @@ yy6: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/53.i--flex-syntax.c b/re2c/test/posix_captures/repetition/53.i--flex-syntax.c index 4c3fd397..4ff182d4 100644 --- a/re2c/test/posix_captures/repetition/53.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/53.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -55,15 +52,12 @@ yy6: default: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/54.i--flex-syntax.c b/re2c/test/posix_captures/repetition/54.i--flex-syntax.c index c856a213..f147e527 100644 --- a/re2c/test/posix_captures/repetition/54.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/54.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -55,15 +52,12 @@ yy6: default: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/55.i--flex-syntax.c b/re2c/test/posix_captures/repetition/55.i--flex-syntax.c index 5b783372..758aa39b 100644 --- a/re2c/test/posix_captures/repetition/55.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/55.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -55,15 +52,12 @@ yy6: default: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/56.i--flex-syntax.c b/re2c/test/posix_captures/repetition/56.i--flex-syntax.c index 28024f4d..74bfdc5d 100644 --- a/re2c/test/posix_captures/repetition/56.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/56.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -55,15 +52,12 @@ yy6: default: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/57.i--flex-syntax.c b/re2c/test/posix_captures/repetition/57.i--flex-syntax.c index f1d64938..f5e0f460 100644 --- a/re2c/test/posix_captures/repetition/57.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/57.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -55,15 +52,12 @@ yy6: default: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/58.i--flex-syntax.c b/re2c/test/posix_captures/repetition/58.i--flex-syntax.c index af0fc574..9e5193f8 100644 --- a/re2c/test/posix_captures/repetition/58.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/58.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -55,15 +52,12 @@ yy6: default: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/59.i--flex-syntax.c b/re2c/test/posix_captures/repetition/59.i--flex-syntax.c index af82fd09..0168779f 100644 --- a/re2c/test/posix_captures/repetition/59.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/59.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -75,15 +72,12 @@ yy6: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[1] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/60.i--flex-syntax.c b/re2c/test/posix_captures/repetition/60.i--flex-syntax.c index 8909a072..f79fa692 100644 --- a/re2c/test/posix_captures/repetition/60.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/60.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -75,15 +72,12 @@ yy6: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/61.i--flex-syntax.c b/re2c/test/posix_captures/repetition/61.i--flex-syntax.c index 66bfa8e5..abe89e20 100644 --- a/re2c/test/posix_captures/repetition/61.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/61.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -73,15 +70,12 @@ yy6: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/62.i--flex-syntax.c b/re2c/test/posix_captures/repetition/62.i--flex-syntax.c index 8b58ed07..7942b60f 100644 --- a/re2c/test/posix_captures/repetition/62.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/62.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -66,15 +63,12 @@ yy6: default: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/63.i--flex-syntax.c b/re2c/test/posix_captures/repetition/63.i--flex-syntax.c index bcd5ec2d..28f7bf0b 100644 --- a/re2c/test/posix_captures/repetition/63.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/63.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -63,15 +60,12 @@ yy6: default: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/64.i--flex-syntax.c b/re2c/test/posix_captures/repetition/64.i--flex-syntax.c index 23473f97..89e8f22e 100644 --- a/re2c/test/posix_captures/repetition/64.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/64.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -60,15 +57,12 @@ yy6: default: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/65.i--flex-syntax.c b/re2c/test/posix_captures/repetition/65.i--flex-syntax.c index dc9c449a..8302d2e6 100644 --- a/re2c/test/posix_captures/repetition/65.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/65.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -57,15 +54,12 @@ yy6: default: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/66.i--flex-syntax.c b/re2c/test/posix_captures/repetition/66.i--flex-syntax.c index e66f163f..1a89c9d5 100644 --- a/re2c/test/posix_captures/repetition/66.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/66.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -57,15 +54,12 @@ yy6: default: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/67.i--flex-syntax.c b/re2c/test/posix_captures/repetition/67.i--flex-syntax.c index 94335cbf..e41ce6f1 100644 --- a/re2c/test/posix_captures/repetition/67.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/67.i--flex-syntax.c @@ -12,13 +12,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -55,15 +52,12 @@ yy6: default: goto yy8; } yy7: - { - const size_t yynmatch = 2; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = YYCURSOR - 1; - {} - } + yynmatch = 2; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = YYCURSOR - 1; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/68.i--flex-syntax.c b/re2c/test/posix_captures/repetition/68.i--flex-syntax.c index 86c2e3aa..ee14a948 100644 --- a/re2c/test/posix_captures/repetition/68.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/68.i--flex-syntax.c @@ -25,17 +25,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[1] = YYCURSOR; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[1] = YYCURSOR; + yypmatch[5] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/69.i--flex-syntax.c b/re2c/test/posix_captures/repetition/69.i--flex-syntax.c index b84a7db0..5b0b3e33 100644 --- a/re2c/test/posix_captures/repetition/69.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/69.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -48,17 +45,14 @@ yy3: goto yy5; } yy5: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = YYCURSOR; + {} yy6: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/70.i--flex-syntax.c b/re2c/test/posix_captures/repetition/70.i--flex-syntax.c index 4ea73c14..0571c7e4 100644 --- a/re2c/test/posix_captures/repetition/70.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/70.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -87,17 +84,14 @@ yy7: goto yy9; } yy9: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = YYCURSOR; + {} yy10: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/71.i--flex-syntax.c b/re2c/test/posix_captures/repetition/71.i--flex-syntax.c index b6e5a039..2f6bc478 100644 --- a/re2c/test/posix_captures/repetition/71.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/71.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -123,17 +120,14 @@ yy12: goto yy14; } yy14: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = YYCURSOR; + {} yy15: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/72.i--flex-syntax.c b/re2c/test/posix_captures/repetition/72.i--flex-syntax.c index 0648ed31..b3ae2e05 100644 --- a/re2c/test/posix_captures/repetition/72.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/72.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -168,17 +165,14 @@ yy18: goto yy20; } yy20: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = YYCURSOR; + {} yy21: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/73.i--flex-syntax.c b/re2c/test/posix_captures/repetition/73.i--flex-syntax.c index 208f6bc1..f3123939 100644 --- a/re2c/test/posix_captures/repetition/73.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/73.i--flex-syntax.c @@ -25,17 +25,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt4; - yypmatch[3] = yyt2; - yypmatch[4] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt4; + yypmatch[3] = yyt2; + yypmatch[4] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[5] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/74.i--flex-syntax.c b/re2c/test/posix_captures/repetition/74.i--flex-syntax.c index 9bfeb189..03a92dad 100644 --- a/re2c/test/posix_captures/repetition/74.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/74.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; yyt2 = YYCURSOR; @@ -35,17 +32,14 @@ yy3: default: goto yy12; } yy4: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[4] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[4] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy5: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/75.i--flex-syntax.c b/re2c/test/posix_captures/repetition/75.i--flex-syntax.c index 6277626a..505ecefb 100644 --- a/re2c/test/posix_captures/repetition/75.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/75.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -85,17 +82,14 @@ yy7: default: goto yy17; } yy8: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[4] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[4] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy9: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/76.i--flex-syntax.c b/re2c/test/posix_captures/repetition/76.i--flex-syntax.c index 90d17b43..fd504da9 100644 --- a/re2c/test/posix_captures/repetition/76.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/76.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -121,17 +118,14 @@ yy12: default: goto yy23; } yy13: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[4] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[4] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy14: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/77.i--flex-syntax.c b/re2c/test/posix_captures/repetition/77.i--flex-syntax.c index 12b79a1e..3bb79f83 100644 --- a/re2c/test/posix_captures/repetition/77.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/77.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -166,17 +163,14 @@ yy18: default: goto yy29; } yy19: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[4] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[4] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy20: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/78.i--flex-syntax.c b/re2c/test/posix_captures/repetition/78.i--flex-syntax.c index 86c2e3aa..ee14a948 100644 --- a/re2c/test/posix_captures/repetition/78.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/78.i--flex-syntax.c @@ -25,17 +25,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[1] = YYCURSOR; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[1] = YYCURSOR; + yypmatch[5] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/79.i--flex-syntax.c b/re2c/test/posix_captures/repetition/79.i--flex-syntax.c index b84a7db0..5b0b3e33 100644 --- a/re2c/test/posix_captures/repetition/79.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/79.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -48,17 +45,14 @@ yy3: goto yy5; } yy5: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = YYCURSOR; + {} yy6: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/80.i--flex-syntax.c b/re2c/test/posix_captures/repetition/80.i--flex-syntax.c index 86c2e3aa..ee14a948 100644 --- a/re2c/test/posix_captures/repetition/80.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/80.i--flex-syntax.c @@ -25,17 +25,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[1] = YYCURSOR; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[1] = YYCURSOR; + yypmatch[5] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/81.i--flex-syntax.c b/re2c/test/posix_captures/repetition/81.i--flex-syntax.c index b84a7db0..5b0b3e33 100644 --- a/re2c/test/posix_captures/repetition/81.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/81.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -48,17 +45,14 @@ yy3: goto yy5; } yy5: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = YYCURSOR; + {} yy6: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/82.i--flex-syntax.c b/re2c/test/posix_captures/repetition/82.i--flex-syntax.c index 4ea73c14..0571c7e4 100644 --- a/re2c/test/posix_captures/repetition/82.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/82.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -87,17 +84,14 @@ yy7: goto yy9; } yy9: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = YYCURSOR; + {} yy10: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/83.i--flex-syntax.c b/re2c/test/posix_captures/repetition/83.i--flex-syntax.c index b6e5a039..2f6bc478 100644 --- a/re2c/test/posix_captures/repetition/83.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/83.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -123,17 +120,14 @@ yy12: goto yy14; } yy14: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = YYCURSOR; + {} yy15: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/84.i--flex-syntax.c b/re2c/test/posix_captures/repetition/84.i--flex-syntax.c index 0648ed31..b3ae2e05 100644 --- a/re2c/test/posix_captures/repetition/84.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/84.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -168,17 +165,14 @@ yy18: goto yy20; } yy20: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = YYCURSOR; + {} yy21: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/85.i--flex-syntax.c b/re2c/test/posix_captures/repetition/85.i--flex-syntax.c index 208f6bc1..f3123939 100644 --- a/re2c/test/posix_captures/repetition/85.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/85.i--flex-syntax.c @@ -25,17 +25,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt4; - yypmatch[3] = yyt2; - yypmatch[4] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt4; + yypmatch[3] = yyt2; + yypmatch[4] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[5] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/86.i--flex-syntax.c b/re2c/test/posix_captures/repetition/86.i--flex-syntax.c index 9bfeb189..03a92dad 100644 --- a/re2c/test/posix_captures/repetition/86.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/86.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; yyt2 = YYCURSOR; @@ -35,17 +32,14 @@ yy3: default: goto yy12; } yy4: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[4] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[4] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy5: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/87.i--flex-syntax.c b/re2c/test/posix_captures/repetition/87.i--flex-syntax.c index 6277626a..505ecefb 100644 --- a/re2c/test/posix_captures/repetition/87.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/87.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -85,17 +82,14 @@ yy7: default: goto yy17; } yy8: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[4] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[4] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy9: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/88.i--flex-syntax.c b/re2c/test/posix_captures/repetition/88.i--flex-syntax.c index 90d17b43..fd504da9 100644 --- a/re2c/test/posix_captures/repetition/88.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/88.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -121,17 +118,14 @@ yy12: default: goto yy23; } yy13: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[4] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[4] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy14: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/89.i--flex-syntax.c b/re2c/test/posix_captures/repetition/89.i--flex-syntax.c index 12b79a1e..3bb79f83 100644 --- a/re2c/test/posix_captures/repetition/89.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/89.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -166,17 +163,14 @@ yy18: default: goto yy29; } yy19: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt3; - yypmatch[4] = yyt2; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt3; + yypmatch[4] = yyt2; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = YYCURSOR; + {} yy20: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/repetition/90.i--flex-syntax.c b/re2c/test/posix_captures/repetition/90.i--flex-syntax.c index 86c2e3aa..ee14a948 100644 --- a/re2c/test/posix_captures/repetition/90.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/90.i--flex-syntax.c @@ -25,17 +25,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[3] = yyt3; - yypmatch[4] = yyt4; - yypmatch[1] = YYCURSOR; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[3] = yyt3; + yypmatch[4] = yyt4; + yypmatch[1] = YYCURSOR; + yypmatch[5] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/repetition/91.i--flex-syntax.c b/re2c/test/posix_captures/repetition/91.i--flex-syntax.c index b84a7db0..5b0b3e33 100644 --- a/re2c/test/posix_captures/repetition/91.i--flex-syntax.c +++ b/re2c/test/posix_captures/repetition/91.i--flex-syntax.c @@ -18,13 +18,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); @@ -48,17 +45,14 @@ yy3: goto yy5; } yy5: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt2; - yypmatch[4] = yyt3; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt2; + yypmatch[4] = yyt3; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = YYCURSOR; + {} yy6: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/rightassoc/01.i--flex-syntax.c b/re2c/test/posix_captures/rightassoc/01.i--flex-syntax.c index f744b4bc..d6c20567 100644 --- a/re2c/test/posix_captures/rightassoc/01.i--flex-syntax.c +++ b/re2c/test/posix_captures/rightassoc/01.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,19 +43,16 @@ yy6: yyt2 = YYCURSOR; goto yy10; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt3; - yypmatch[6] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt3; + yypmatch[6] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/rightassoc/02.i--flex-syntax.c b/re2c/test/posix_captures/rightassoc/02.i--flex-syntax.c index f744b4bc..d6c20567 100644 --- a/re2c/test/posix_captures/rightassoc/02.i--flex-syntax.c +++ b/re2c/test/posix_captures/rightassoc/02.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,19 +43,16 @@ yy6: yyt2 = YYCURSOR; goto yy10; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt3; - yypmatch[6] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt3; + yypmatch[6] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/rightassoc/03.i--flex-syntax.c b/re2c/test/posix_captures/rightassoc/03.i--flex-syntax.c index f744b4bc..d6c20567 100644 --- a/re2c/test/posix_captures/rightassoc/03.i--flex-syntax.c +++ b/re2c/test/posix_captures/rightassoc/03.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,19 +43,16 @@ yy6: yyt2 = YYCURSOR; goto yy10; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt3; - yypmatch[6] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt3; + yypmatch[6] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/rightassoc/04.i--flex-syntax.c b/re2c/test/posix_captures/rightassoc/04.i--flex-syntax.c index f744b4bc..d6c20567 100644 --- a/re2c/test/posix_captures/rightassoc/04.i--flex-syntax.c +++ b/re2c/test/posix_captures/rightassoc/04.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,19 +43,16 @@ yy6: yyt2 = YYCURSOR; goto yy10; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt3; - yypmatch[6] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt3; + yypmatch[6] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/rightassoc/05.i--flex-syntax.c b/re2c/test/posix_captures/rightassoc/05.i--flex-syntax.c index ab5ef896..cc793659 100644 --- a/re2c/test/posix_captures/rightassoc/05.i--flex-syntax.c +++ b/re2c/test/posix_captures/rightassoc/05.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); @@ -40,19 +37,16 @@ yy6: yyt2 = YYCURSOR; goto yy9; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt3; - yypmatch[6] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt3; + yypmatch[6] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = YYCURSOR; + {} yy8: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/rightassoc/06.i--flex-syntax.c b/re2c/test/posix_captures/rightassoc/06.i--flex-syntax.c index ab5ef896..cc793659 100644 --- a/re2c/test/posix_captures/rightassoc/06.i--flex-syntax.c +++ b/re2c/test/posix_captures/rightassoc/06.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); @@ -40,19 +37,16 @@ yy6: yyt2 = YYCURSOR; goto yy9; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt3; - yypmatch[6] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt3; + yypmatch[6] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = YYCURSOR; + {} yy8: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/rightassoc/07.i--flex-syntax.c b/re2c/test/posix_captures/rightassoc/07.i--flex-syntax.c index ab5ef896..cc793659 100644 --- a/re2c/test/posix_captures/rightassoc/07.i--flex-syntax.c +++ b/re2c/test/posix_captures/rightassoc/07.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); @@ -40,19 +37,16 @@ yy6: yyt2 = YYCURSOR; goto yy9; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt3; - yypmatch[6] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt3; + yypmatch[6] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = YYCURSOR; + {} yy8: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/rightassoc/08.i--flex-syntax.c b/re2c/test/posix_captures/rightassoc/08.i--flex-syntax.c index ab5ef896..cc793659 100644 --- a/re2c/test/posix_captures/rightassoc/08.i--flex-syntax.c +++ b/re2c/test/posix_captures/rightassoc/08.i--flex-syntax.c @@ -14,13 +14,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); @@ -40,19 +37,16 @@ yy6: yyt2 = YYCURSOR; goto yy9; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt3; - yypmatch[6] = yyt2; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt3; - yypmatch[5] = yyt2; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt3; + yypmatch[6] = yyt2; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt3; + yypmatch[5] = yyt2; + yypmatch[7] = YYCURSOR; + {} yy8: ++YYCURSOR; if (YYLIMIT <= YYCURSOR) YYFILL(1); diff --git a/re2c/test/posix_captures/rightassoc/09.i--flex-syntax.c b/re2c/test/posix_captures/rightassoc/09.i--flex-syntax.c index e1bf7512..c9e6ac0b 100644 --- a/re2c/test/posix_captures/rightassoc/09.i--flex-syntax.c +++ b/re2c/test/posix_captures/rightassoc/09.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,19 +43,16 @@ yy6: yyt3 = YYCURSOR; goto yy10; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[6] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = yyt3; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[6] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = yyt3; + yypmatch[7] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/rightassoc/10.i--flex-syntax.c b/re2c/test/posix_captures/rightassoc/10.i--flex-syntax.c index e1bf7512..c9e6ac0b 100644 --- a/re2c/test/posix_captures/rightassoc/10.i--flex-syntax.c +++ b/re2c/test/posix_captures/rightassoc/10.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,19 +43,16 @@ yy6: yyt3 = YYCURSOR; goto yy10; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[6] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = yyt3; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[6] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = yyt3; + yypmatch[7] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/rightassoc/11.i--flex-syntax.c b/re2c/test/posix_captures/rightassoc/11.i--flex-syntax.c index e1bf7512..c9e6ac0b 100644 --- a/re2c/test/posix_captures/rightassoc/11.i--flex-syntax.c +++ b/re2c/test/posix_captures/rightassoc/11.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,19 +43,16 @@ yy6: yyt3 = YYCURSOR; goto yy10; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[6] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = yyt3; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[6] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = yyt3; + yypmatch[7] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/rightassoc/12.i--flex-syntax.c b/re2c/test/posix_captures/rightassoc/12.i--flex-syntax.c index e1bf7512..c9e6ac0b 100644 --- a/re2c/test/posix_captures/rightassoc/12.i--flex-syntax.c +++ b/re2c/test/posix_captures/rightassoc/12.i--flex-syntax.c @@ -11,13 +11,10 @@ default: goto yy2; } yy2: - { - const size_t yynmatch = 1; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = YYCURSOR; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 1; + yypmatch[0] = YYCURSOR; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { @@ -46,19 +43,16 @@ yy6: yyt3 = YYCURSOR; goto yy10; yy7: - { - const size_t yynmatch = 4; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[2] = yyt1; - yypmatch[4] = yyt2; - yypmatch[6] = yyt3; - yypmatch[0] = yyt1; - yypmatch[1] = YYCURSOR; - yypmatch[3] = yyt2; - yypmatch[5] = yyt3; - yypmatch[7] = YYCURSOR; - {} - } + yynmatch = 4; + yypmatch[2] = yyt1; + yypmatch[4] = yyt2; + yypmatch[6] = yyt3; + yypmatch[0] = yyt1; + yypmatch[1] = YYCURSOR; + yypmatch[3] = yyt2; + yypmatch[5] = yyt3; + yypmatch[7] = YYCURSOR; + {} yy8: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/posix_captures/uncomparable_bottoms.i--posix-captures.c b/re2c/test/posix_captures/uncomparable_bottoms.i--posix-captures.c index d8467f22..b3035f57 100644 --- a/re2c/test/posix_captures/uncomparable_bottoms.i--posix-captures.c +++ b/re2c/test/posix_captures/uncomparable_bottoms.i--posix-captures.c @@ -22,17 +22,14 @@ goto yy2; } yy2: - { - const size_t yynmatch = 3; - const YYCTYPE *yypmatch[yynmatch * 2]; - yypmatch[0] = yyt1; - yypmatch[2] = yyt5; - yypmatch[3] = yyt2; - yypmatch[4] = yyt3; - yypmatch[5] = yyt4; - yypmatch[1] = YYCURSOR; - {} - } + yynmatch = 3; + yypmatch[0] = yyt1; + yypmatch[2] = yyt5; + yypmatch[3] = yyt2; + yypmatch[4] = yyt3; + yypmatch[5] = yyt4; + yypmatch[1] = YYCURSOR; + {} yy3: yych = *++YYCURSOR; switch (yych) { diff --git a/re2c/test/push.--skeleton.c b/re2c/test/push.--skeleton.c index 59d2245f..44000f38 100644 --- a/re2c/test/push.--skeleton.c +++ b/re2c/test/push.--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/repeat-01.cgir--skeleton.c b/re2c/test/repeat-01.cgir--skeleton.c index 041910b9..c1a80108 100644 --- a/re2c/test/repeat-01.cgir--skeleton.c +++ b/re2c/test/repeat-01.cgir--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/repeat-02.cgir--skeleton.c b/re2c/test/repeat-02.cgir--skeleton.c index 2d580c82..75b1c5ac 100644 --- a/re2c/test/repeat-02.cgir--skeleton.c +++ b/re2c/test/repeat-02.cgir--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/repeat-03.cgir--skeleton.c b/re2c/test/repeat-03.cgir--skeleton.c index 0ea6688e..96cf802f 100644 --- a/re2c/test/repeat-03.cgir--skeleton.c +++ b/re2c/test/repeat-03.cgir--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/repeat-06.gir--skeleton.c b/re2c/test/repeat-06.gir--skeleton.c index 1e1645e5..ddca9396 100644 --- a/re2c/test/repeat-06.gir--skeleton.c +++ b/re2c/test/repeat-06.gir--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/repeat-07_default.gir--skeleton.c b/re2c/test/repeat-07_default.gir--skeleton.c index bfed45ad..26592888 100644 --- a/re2c/test/repeat-07_default.gir--skeleton.c +++ b/re2c/test/repeat-07_default.gir--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/reuse_conds_default_0.cgir--skeleton.c b/re2c/test/reuse_conds_default_0.cgir--skeleton.c index 403957c0..a6d9a80c 100644 --- a/re2c/test/reuse_conds_default_0.cgir--skeleton.c +++ b/re2c/test/reuse_conds_default_0.cgir--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/reuse_conds_default_1.cgir--skeleton.c b/re2c/test/reuse_conds_default_1.cgir--skeleton.c index a03049b2..165eef3a 100644 --- a/re2c/test/reuse_conds_default_1.cgir--skeleton.c +++ b/re2c/test/reuse_conds_default_1.cgir--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/rexx.--skeleton.c b/re2c/test/rexx.--skeleton.c index 388d2be7..bc6ea524 100644 --- a/re2c/test/rexx.--skeleton.c +++ b/re2c/test/rexx.--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/scanner.--skeleton.c b/re2c/test/scanner.--skeleton.c index db21c31b..b7acfdc5 100644 --- a/re2c/test/scanner.--skeleton.c +++ b/re2c/test/scanner.--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/strip_003.b--skeleton.c b/re2c/test/strip_003.b--skeleton.c index 6891ef67..8a1d27cc 100644 --- a/re2c/test/strip_003.b--skeleton.c +++ b/re2c/test/strip_003.b--skeleton.c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/unicode_blocks.8--skeleton--encoding-policy(ignore).c b/re2c/test/unicode_blocks.8--skeleton--encoding-policy(ignore).c index 3574cd8e..9e034633 100644 --- a/re2c/test/unicode_blocks.8--skeleton--encoding-policy(ignore).c +++ b/re2c/test/unicode_blocks.8--skeleton--encoding-policy(ignore).c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/unicode_blocks.u--skeleton--encoding-policy(ignore).c b/re2c/test/unicode_blocks.u--skeleton--encoding-policy(ignore).c index 2a84cdbb..5e1f4736 100644 --- a/re2c/test/unicode_blocks.u--skeleton--encoding-policy(ignore).c +++ b/re2c/test/unicode_blocks.u--skeleton--encoding-policy(ignore).c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */ diff --git a/re2c/test/unicode_blocks.x--skeleton--encoding-policy(ignore).c b/re2c/test/unicode_blocks.x--skeleton--encoding-policy(ignore).c index 1c0c9c89..5d991e7d 100644 --- a/re2c/test/unicode_blocks.x--skeleton--encoding-policy(ignore).c +++ b/re2c/test/unicode_blocks.x--skeleton--encoding-policy(ignore).c @@ -1,5 +1,6 @@ /* Generated by re2c */ +#include /* size_t */ #include #include /* malloc, free */ #include /* memcpy */