Removed unused struct field.

diff --git a/re2c/bootstrap/src/ast/lex.cc b/re2c/bootstrap/src/ast/lex.cc
index 8aa85bb290198e622e2a085083acb92789f820f6..99e4469e147654cd23b3ecac405dc688130c463f 100644 (file)
--- a/re2c/bootstrap/src/ast/lex.cc
+++ b/re2c/bootstrap/src/ast/lex.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.1.1 on Thu Dec 27 21:57:09 2018 */
+/* Generated by re2c 1.1.1 on Thu Dec 27 22:16:41 2018 */
 #line 1 "../src/ast/lex.re"
 #include "src/util/c99_stdint.h"
 #include <stddef.h>
@@ -33,7 +33,7 @@ namespace re2c {
 #line 55 "../src/ast/lex.re"
 
 
-#line 111 "../src/ast/lex.re"
+#line 108 "../src/ast/lex.re"
 
 
 Scanner::ParseMode Scanner::echo(Output &out)
@@ -103,7 +103,7 @@ echo:
                }
        }
        ++YYCURSOR;
-#line 207 "../src/ast/lex.re"
+#line 204 "../src/ast/lex.re"
        {
         if (!is_eof()) goto echo;
         out.wraw(tok, ptr);
@@ -113,7 +113,7 @@ echo:
 yy4:
        ++YYCURSOR;
 yy5:
-#line 224 "../src/ast/lex.re"
+#line 221 "../src/ast/lex.re"
        { goto echo; }
 #line 119 "src/ast/lex.cc"
 yy6:
@@ -124,7 +124,7 @@ yy6:
        }
        if (yych == '#') goto yy14;
 yy7:
-#line 219 "../src/ast/lex.re"
+#line 216 "../src/ast/lex.re"
        {
         next_line();
         goto echo;
@@ -172,7 +172,7 @@ yy14:
        }
 yy16:
        ++YYCURSOR;
-#line 122 "../src/ast/lex.re"
+#line 119 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         return Parse;
@@ -473,7 +473,7 @@ yy80:
 yy82:
        ++YYCURSOR;
        YYCURSOR = yyt1;
-#line 213 "../src/ast/lex.re"
+#line 210 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr + 1);
         set_sourceline();
@@ -612,7 +612,7 @@ yy114:
        goto yy13;
 yy115:
        ++YYCURSOR;
-#line 143 "../src/ast/lex.re"
+#line 140 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         out.wdelay_yymaxfill();
@@ -642,7 +642,7 @@ yy121:
        goto yy13;
 yy122:
        ++YYCURSOR;
-#line 132 "../src/ast/lex.re"
+#line 129 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         return Reuse;
@@ -706,7 +706,7 @@ yy137:
        goto yy13;
 yy138:
        ++YYCURSOR;
-#line 179 "../src/ast/lex.re"
+#line 176 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         lex_tags(out, true);
@@ -715,7 +715,7 @@ yy138:
 #line 716 "src/ast/lex.cc"
 yy140:
        ++YYCURSOR;
-#line 127 "../src/ast/lex.re"
+#line 124 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         return Rules;
@@ -723,7 +723,7 @@ yy140:
 #line 724 "src/ast/lex.cc"
 yy142:
        ++YYCURSOR;
-#line 173 "../src/ast/lex.re"
+#line 170 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         lex_tags(out, false);
@@ -732,7 +732,7 @@ yy142:
 #line 733 "src/ast/lex.cc"
 yy144:
        ++YYCURSOR;
-#line 164 "../src/ast/lex.re"
+#line 161 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         out.wdelay_line_info_output();
@@ -752,7 +752,7 @@ yy147:
        goto yy13;
 yy148:
        ++YYCURSOR;
-#line 137 "../src/ast/lex.re"
+#line 134 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         lex_end_of_comment(out);
@@ -777,7 +777,7 @@ yy153:
        goto yy13;
 yy154:
        ++YYCURSOR;
-#line 201 "../src/ast/lex.re"
+#line 198 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         lex_include();
@@ -790,7 +790,7 @@ yy156:
        goto yy13;
 yy157:
        ++YYCURSOR;
-#line 157 "../src/ast/lex.re"
+#line 154 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         out.wdelay_state_goto(0);
@@ -813,7 +813,7 @@ yy161:
        goto yy13;
 yy162:
        ++YYCURSOR;
-#line 185 "../src/ast/lex.re"
+#line 182 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         out.header_mode(true);
@@ -824,7 +824,7 @@ yy162:
 #line 825 "src/ast/lex.cc"
 yy164:
        ++YYCURSOR;
-#line 150 "../src/ast/lex.re"
+#line 147 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         out.wdelay_yymaxnmatch();
@@ -834,7 +834,7 @@ yy164:
 #line 835 "src/ast/lex.cc"
 yy166:
        ++YYCURSOR;
-#line 193 "../src/ast/lex.re"
+#line 190 "../src/ast/lex.re"
        {
         out.wraw(tok, ptr);
         out.header_mode(false);
@@ -844,7 +844,7 @@ yy166:
     }
 #line 846 "src/ast/lex.cc"
 }
-#line 225 "../src/ast/lex.re"
+#line 222 "../src/ast/lex.re"
 
 }
 
@@ -869,18 +869,18 @@ void Scanner::lex_end_of_comment(Output &out)
        }
 yy170:
        ++YYCURSOR;
-#line 233 "../src/ast/lex.re"
+#line 230 "../src/ast/lex.re"
        { fatal_lc(get_line(), get_column(), "expected end of block"); }
 #line 875 "src/ast/lex.cc"
 yy172:
        ++YYCURSOR;
 yy173:
-#line 234 "../src/ast/lex.re"
+#line 231 "../src/ast/lex.re"
        { continue; }
 #line 881 "src/ast/lex.cc"
 yy174:
        ++YYCURSOR;
-#line 235 "../src/ast/lex.re"
+#line 232 "../src/ast/lex.re"
        { next_line(); multiline = true; continue; }
 #line 886 "src/ast/lex.cc"
 yy176:
@@ -891,7 +891,7 @@ yy177:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych != '/') goto yy173;
        ++YYCURSOR;
-#line 236 "../src/ast/lex.re"
+#line 233 "../src/ast/lex.re"
        {
             if (multiline) {
                 out.wdelay_line_info_input(get_line(), get_fname());
@@ -901,7 +901,7 @@ yy177:
         }
 #line 903 "src/ast/lex.cc"
 }
-#line 243 "../src/ast/lex.re"
+#line 240 "../src/ast/lex.re"
 }
 }
 
@@ -952,7 +952,7 @@ void Scanner::lex_include()
        if (yych == ' ') goto yy184;
        ++YYCURSOR;
 yy183:
-#line 250 "../src/ast/lex.re"
+#line 247 "../src/ast/lex.re"
        {
         fatal_lc(get_line(), get_column()
             , "syntax error in include directive");
@@ -1033,14 +1033,14 @@ yy194:
        ++YYCURSOR;
        x = yyt1;
        y = yyt2;
-#line 255 "../src/ast/lex.re"
+#line 252 "../src/ast/lex.re"
        {
         include(std::string(x + 1, static_cast<size_t>(y - x) - 2));
         return;
     }
 #line 1042 "src/ast/lex.cc"
 }
-#line 259 "../src/ast/lex.re"
+#line 256 "../src/ast/lex.re"
 
 }
 
@@ -1107,7 +1107,7 @@ void Scanner::lex_tags(Output &out, bool mtags)
        }
        ++YYCURSOR;
 yy200:
-#line 267 "../src/ast/lex.re"
+#line 264 "../src/ast/lex.re"
        { fatal_lc(get_line(), get_column(), "unrecognized configuration"); }
 #line 1113 "src/ast/lex.cc"
 yy201:
@@ -1117,12 +1117,12 @@ yy201:
        if (yybm[0+yych] & 128) {
                goto yy201;
        }
-#line 272 "../src/ast/lex.re"
+#line 269 "../src/ast/lex.re"
        { continue; }
 #line 1123 "src/ast/lex.cc"
 yy204:
        ++YYCURSOR;
-#line 273 "../src/ast/lex.re"
+#line 270 "../src/ast/lex.re"
        { next_line(); continue; }
 #line 1128 "src/ast/lex.cc"
 yy206:
@@ -1143,7 +1143,7 @@ yy209:
        goto yy200;
 yy210:
        ++YYCURSOR;
-#line 274 "../src/ast/lex.re"
+#line 271 "../src/ast/lex.re"
        {
             out.wdelay_tags(new ConfTags(fmt, sep), mtags);
             tok = cur;
@@ -1186,7 +1186,7 @@ yy220:
        goto yy213;
 yy221:
        ++YYCURSOR;
-#line 269 "../src/ast/lex.re"
+#line 266 "../src/ast/lex.re"
        { fmt = lex_conf_string(); continue; }
 #line 1192 "src/ast/lex.cc"
 yy223:
@@ -1197,11 +1197,11 @@ yy223:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych != 'r') goto yy213;
        ++YYCURSOR;
-#line 270 "../src/ast/lex.re"
+#line 267 "../src/ast/lex.re"
        { sep = lex_conf_string(); continue; }
 #line 1203 "src/ast/lex.cc"
 }
-#line 279 "../src/ast/lex.re"
+#line 276 "../src/ast/lex.re"
 }
 }
 
@@ -1209,10 +1209,9 @@ int Scanner::scan()
 {
     const char *p;
 scan:
-    tchar = cur - pos;
     tok = cur;
 
-#line 1216 "src/ast/lex.cc"
+#line 1215 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        unsigned int yyaccept = 0;
@@ -1322,12 +1321,12 @@ scan:
 yy230:
        ++YYCURSOR;
 yy231:
-#line 405 "../src/ast/lex.re"
+#line 401 "../src/ast/lex.re"
        {
         fatal_lc(get_line(), get_column(), "unexpected character: '%c'", *tok);
         goto scan;
     }
-#line 1331 "src/ast/lex.cc"
+#line 1330 "src/ast/lex.cc"
 yy232:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -1335,9 +1334,9 @@ yy232:
        if (yybm[0+yych] & 16) {
                goto yy232;
        }
-#line 387 "../src/ast/lex.re"
+#line 383 "../src/ast/lex.re"
        { goto scan; }
-#line 1341 "src/ast/lex.cc"
+#line 1340 "src/ast/lex.cc"
 yy235:
        yyaccept = 0;
        yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
@@ -1348,7 +1347,7 @@ yy235:
                if (yych == '#') goto yy265;
        }
 yy236:
-#line 394 "../src/ast/lex.re"
+#line 390 "../src/ast/lex.re"
        {
         next_line();
         if (lexer_state == LEX_FLEX_NAME) {
@@ -1359,16 +1358,16 @@ yy236:
             goto scan;
         }
     }
-#line 1363 "src/ast/lex.cc"
+#line 1362 "src/ast/lex.cc"
 yy237:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy235;
        goto yy231;
 yy238:
        ++YYCURSOR;
-#line 305 "../src/ast/lex.re"
+#line 301 "../src/ast/lex.re"
        { yylval.regexp = lex_str('"'); return TOKEN_REGEXP; }
-#line 1372 "src/ast/lex.cc"
+#line 1371 "src/ast/lex.cc"
 yy240:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych <= '^') {
@@ -1383,30 +1382,30 @@ yy240:
 yy241:
        ++YYCURSOR;
 yy242:
-#line 315 "../src/ast/lex.re"
+#line 311 "../src/ast/lex.re"
        { return *tok; }
-#line 1389 "src/ast/lex.cc"
+#line 1388 "src/ast/lex.cc"
 yy243:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '}') goto yy270;
        goto yy231;
 yy244:
        ++YYCURSOR;
-#line 304 "../src/ast/lex.re"
+#line 300 "../src/ast/lex.re"
        { yylval.regexp = lex_str('\''); return TOKEN_REGEXP; }
-#line 1398 "src/ast/lex.cc"
+#line 1397 "src/ast/lex.cc"
 yy246:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '/') goto yy270;
        goto yy242;
 yy247:
        ++YYCURSOR;
-#line 382 "../src/ast/lex.re"
+#line 378 "../src/ast/lex.re"
        {
         yylval.regexp = ast_dot(get_line(), get_column());
         return TOKEN_REGEXP;
     }
-#line 1410 "src/ast/lex.cc"
+#line 1409 "src/ast/lex.cc"
 yy249:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '*') goto yy272;
@@ -1418,9 +1417,9 @@ yy250:
        goto yy231;
 yy251:
        ++YYCURSOR;
-#line 297 "../src/ast/lex.re"
+#line 293 "../src/ast/lex.re"
        { return lex_clist(); }
-#line 1424 "src/ast/lex.cc"
+#line 1423 "src/ast/lex.cc"
 yy253:
        yyaccept = 1;
        yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
@@ -1434,7 +1433,7 @@ yy255:
        if (yybm[0+yych] & 32) {
                goto yy254;
        }
-#line 359 "../src/ast/lex.re"
+#line 355 "../src/ast/lex.re"
        {
         if (!globopts->FFlag || lex_namedef_context_re2c()) {
             yylval.str = new std::string (tok, tok_len());
@@ -1457,13 +1456,13 @@ yy255:
             return TOKEN_REGEXP;
         }
     }
-#line 1461 "src/ast/lex.cc"
+#line 1460 "src/ast/lex.cc"
 yy257:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '^') goto yy280;
-#line 306 "../src/ast/lex.re"
+#line 302 "../src/ast/lex.re"
        { yylval.regexp = lex_cls(false); return TOKEN_REGEXP; }
-#line 1467 "src/ast/lex.cc"
+#line 1466 "src/ast/lex.cc"
 yy259:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == 'e') goto yy282;
@@ -1486,9 +1485,9 @@ yy260:
                }
        }
 yy261:
-#line 289 "../src/ast/lex.re"
+#line 285 "../src/ast/lex.re"
        { lex_code_in_braces(); return TOKEN_CODE; }
-#line 1492 "src/ast/lex.cc"
+#line 1491 "src/ast/lex.cc"
 yy262:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -1547,36 +1546,36 @@ yy267:
                }
        }
 yy269:
-#line 309 "../src/ast/lex.re"
+#line 305 "../src/ast/lex.re"
        {
         const std::string *name = new std::string(tok + 1, tok_len() - 1);
         yylval.regexp = ast_tag(get_line(), get_column(), name, tok[0] == '#');
         return TOKEN_REGEXP;
     }
-#line 1557 "src/ast/lex.cc"
+#line 1556 "src/ast/lex.cc"
 yy270:
        ++YYCURSOR;
-#line 302 "../src/ast/lex.re"
+#line 298 "../src/ast/lex.re"
        { tok = cur; return 0; }
-#line 1562 "src/ast/lex.cc"
+#line 1561 "src/ast/lex.cc"
 yy272:
        ++YYCURSOR;
-#line 300 "../src/ast/lex.re"
+#line 296 "../src/ast/lex.re"
        { lex_c_comment(); goto scan; }
-#line 1567 "src/ast/lex.cc"
+#line 1566 "src/ast/lex.cc"
 yy274:
        ++YYCURSOR;
-#line 299 "../src/ast/lex.re"
+#line 295 "../src/ast/lex.re"
        { lex_cpp_comment(); goto scan; }
-#line 1572 "src/ast/lex.cc"
+#line 1571 "src/ast/lex.cc"
 yy276:
        yyaccept = 3;
        yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
        if (yych == '>') goto yy278;
 yy277:
-#line 290 "../src/ast/lex.re"
+#line 286 "../src/ast/lex.re"
        { lex_code_indented(); return TOKEN_CODE; }
-#line 1580 "src/ast/lex.cc"
+#line 1579 "src/ast/lex.cc"
 yy278:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -1609,9 +1608,9 @@ yy278:
        }
 yy280:
        ++YYCURSOR;
-#line 307 "../src/ast/lex.re"
+#line 303 "../src/ast/lex.re"
        { yylval.regexp = lex_cls(true);  return TOKEN_REGEXP; }
-#line 1615 "src/ast/lex.cc"
+#line 1614 "src/ast/lex.cc"
 yy282:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '2') goto yy293;
@@ -1619,12 +1618,12 @@ yy282:
 yy283:
        ++YYCURSOR;
 yy284:
-#line 343 "../src/ast/lex.re"
+#line 339 "../src/ast/lex.re"
        {
         fatal_lc(get_line(), get_column(),
             "illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers");
     }
-#line 1628 "src/ast/lex.cc"
+#line 1627 "src/ast/lex.cc"
 yy285:
        ++YYCURSOR;
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -1682,12 +1681,12 @@ yy290:
        }
 yy292:
        p = yyt1;
-#line 292 "../src/ast/lex.re"
+#line 288 "../src/ast/lex.re"
        {
         yylval.str = new std::string(p, static_cast<size_t>(cur - p));
         return tok[0] == ':' ? TOKEN_CJUMP : TOKEN_CNEXT;
     }
-#line 1691 "src/ast/lex.cc"
+#line 1690 "src/ast/lex.cc"
 yy293:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == 'c') goto yy300;
@@ -1701,7 +1700,7 @@ yy294:
        goto yy284;
 yy295:
        ++YYCURSOR;
-#line 317 "../src/ast/lex.re"
+#line 313 "../src/ast/lex.re"
        {
         if (!s_to_u32_unsafe (tok + 1, cur - 1, yylval.bounds.min)) {
             fatal_lc(get_line(), get_column(), "repetition count overflow");
@@ -1709,10 +1708,10 @@ yy295:
         yylval.bounds.max = yylval.bounds.min;
         return TOKEN_CLOSESIZE;
     }
-#line 1713 "src/ast/lex.cc"
+#line 1712 "src/ast/lex.cc"
 yy297:
        ++YYCURSOR;
-#line 348 "../src/ast/lex.re"
+#line 344 "../src/ast/lex.re"
        {
         if (!globopts->FFlag) {
             fatal_lc(get_line(), get_column(),
@@ -1721,7 +1720,7 @@ yy297:
         yylval.str = new std::string (tok + 1, tok_len () - 2); // -2 to omit braces
         return TOKEN_ID;
     }
-#line 1725 "src/ast/lex.cc"
+#line 1724 "src/ast/lex.cc"
 yy299:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == 'n') goto yy305;
@@ -1740,7 +1739,7 @@ yy301:
        goto yy264;
 yy303:
        ++YYCURSOR;
-#line 335 "../src/ast/lex.re"
+#line 331 "../src/ast/lex.re"
        {
         if (!s_to_u32_unsafe (tok + 1, cur - 2, yylval.bounds.min)) {
             fatal_lc(get_line(), get_column(), "repetition lower bound overflow");
@@ -1748,20 +1747,20 @@ yy303:
         yylval.bounds.max = std::numeric_limits<uint32_t>::max();
         return TOKEN_CLOSESIZE;
     }
-#line 1752 "src/ast/lex.cc"
+#line 1751 "src/ast/lex.cc"
 yy305:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == 'e') goto yy310;
        goto yy264;
 yy306:
        ++YYCURSOR;
-#line 357 "../src/ast/lex.re"
+#line 353 "../src/ast/lex.re"
        { return TOKEN_CONF; }
-#line 1761 "src/ast/lex.cc"
+#line 1760 "src/ast/lex.cc"
 yy308:
        ++YYCURSOR;
        p = yyt1;
-#line 325 "../src/ast/lex.re"
+#line 321 "../src/ast/lex.re"
        {
         if (!s_to_u32_unsafe (tok + 1, p, yylval.bounds.min)) {
             fatal_lc(get_line(), get_column(), "repetition lower bound overflow");
@@ -1771,7 +1770,7 @@ yy308:
         }
         return TOKEN_CLOSESIZE;
     }
-#line 1775 "src/ast/lex.cc"
+#line 1774 "src/ast/lex.cc"
 yy310:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych <= '0') goto yy312;
@@ -1827,12 +1826,12 @@ yy315:
 yy317:
        ++YYCURSOR;
        YYCURSOR = yyt1;
-#line 389 "../src/ast/lex.re"
+#line 385 "../src/ast/lex.re"
        {
         set_sourceline ();
         return TOKEN_LINE_INFO;
     }
-#line 1836 "src/ast/lex.cc"
+#line 1835 "src/ast/lex.cc"
 yy319:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy317;
@@ -1858,14 +1857,14 @@ yy323:
        if (yych == '\n') goto yy264;
        goto yy320;
 }
-#line 409 "../src/ast/lex.re"
+#line 405 "../src/ast/lex.re"
 
 }
 
 bool Scanner::lex_namedef_context_re2c()
 {
 
-#line 1869 "src/ast/lex.cc"
+#line 1868 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        static const unsigned char yybm[] = {
@@ -1920,9 +1919,9 @@ bool Scanner::lex_namedef_context_re2c()
                }
        }
 yy326:
-#line 416 "../src/ast/lex.re"
+#line 412 "../src/ast/lex.re"
        { return false; }
-#line 1926 "src/ast/lex.cc"
+#line 1925 "src/ast/lex.cc"
 yy327:
        ++YYCURSOR;
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -1939,18 +1938,18 @@ yy330:
        if (yych == '>') goto yy329;
        ++YYCURSOR;
        YYCURSOR = yyt1;
-#line 415 "../src/ast/lex.re"
+#line 411 "../src/ast/lex.re"
        { return true; }
-#line 1945 "src/ast/lex.cc"
+#line 1944 "src/ast/lex.cc"
 }
-#line 417 "../src/ast/lex.re"
+#line 413 "../src/ast/lex.re"
 
 }
 
 bool Scanner::lex_namedef_context_flex()
 {
 
-#line 1954 "src/ast/lex.cc"
+#line 1953 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        static const unsigned char yybm[] = {
@@ -1997,9 +1996,9 @@ bool Scanner::lex_namedef_context_flex()
                yyt1 = YYCURSOR;
                goto yy336;
        }
-#line 425 "../src/ast/lex.re"
+#line 421 "../src/ast/lex.re"
        { return false; }
-#line 2003 "src/ast/lex.cc"
+#line 2002 "src/ast/lex.cc"
 yy336:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -2014,17 +2013,17 @@ yy336:
                if (yych == '{') goto yy339;
        }
        YYCURSOR = yyt1;
-#line 424 "../src/ast/lex.re"
+#line 420 "../src/ast/lex.re"
        { return true; }
-#line 2020 "src/ast/lex.cc"
+#line 2019 "src/ast/lex.cc"
 yy339:
        ++YYCURSOR;
        YYCURSOR = yyt1;
-#line 423 "../src/ast/lex.re"
+#line 419 "../src/ast/lex.re"
        { return false; }
-#line 2026 "src/ast/lex.cc"
+#line 2025 "src/ast/lex.cc"
 }
-#line 426 "../src/ast/lex.re"
+#line 422 "../src/ast/lex.re"
 
 }
 
@@ -2033,7 +2032,7 @@ int Scanner::lex_clist()
     int kind = TOKEN_CLIST;
     CondList *cl = new CondList;
 
-#line 2037 "src/ast/lex.cc"
+#line 2036 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        static const unsigned char yybm[] = {
@@ -2083,30 +2082,30 @@ yy341:
        if (yych <= '!') goto yy345;
        if (yych == '>') goto yy348;
 yy344:
-#line 436 "../src/ast/lex.re"
+#line 432 "../src/ast/lex.re"
        { goto cond; }
-#line 2089 "src/ast/lex.cc"
+#line 2088 "src/ast/lex.cc"
 yy345:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = (YYCTYPE)*YYCURSOR;
        if (yych == '\t') goto yy345;
        if (yych == ' ') goto yy345;
-#line 434 "../src/ast/lex.re"
+#line 430 "../src/ast/lex.re"
        { kind = TOKEN_CSETUP; goto cond; }
-#line 2098 "src/ast/lex.cc"
+#line 2097 "src/ast/lex.cc"
 yy348:
        ++YYCURSOR;
-#line 435 "../src/ast/lex.re"
+#line 431 "../src/ast/lex.re"
        { kind = TOKEN_CZERO; goto end; }
-#line 2103 "src/ast/lex.cc"
+#line 2102 "src/ast/lex.cc"
 }
-#line 437 "../src/ast/lex.re"
+#line 433 "../src/ast/lex.re"
 
 cond:
     tok = cur;
 
-#line 2110 "src/ast/lex.cc"
+#line 2109 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        static const unsigned char yybm[] = {
@@ -2158,14 +2157,14 @@ cond:
        }
 yy352:
        ++YYCURSOR;
-#line 443 "../src/ast/lex.re"
+#line 439 "../src/ast/lex.re"
        { goto error; }
-#line 2164 "src/ast/lex.cc"
+#line 2163 "src/ast/lex.cc"
 yy354:
        ++YYCURSOR;
-#line 442 "../src/ast/lex.re"
+#line 438 "../src/ast/lex.re"
        { if (!cl->empty()) goto error; cl->insert("*"); goto next; }
-#line 2169 "src/ast/lex.cc"
+#line 2168 "src/ast/lex.cc"
 yy356:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -2173,15 +2172,15 @@ yy356:
        if (yybm[0+yych] & 128) {
                goto yy356;
        }
-#line 441 "../src/ast/lex.re"
+#line 437 "../src/ast/lex.re"
        { cl->insert(std::string(tok, tok_len())); goto next; }
-#line 2179 "src/ast/lex.cc"
+#line 2178 "src/ast/lex.cc"
 }
-#line 444 "../src/ast/lex.re"
+#line 440 "../src/ast/lex.re"
 
 next:
 
-#line 2185 "src/ast/lex.cc"
+#line 2184 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        static const unsigned char yybm[] = {
@@ -2232,9 +2231,9 @@ next:
        }
        ++YYCURSOR;
 yy362:
-#line 449 "../src/ast/lex.re"
+#line 445 "../src/ast/lex.re"
        { goto error; }
-#line 2238 "src/ast/lex.cc"
+#line 2237 "src/ast/lex.cc"
 yy363:
        yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
        if (yych <= ' ') {
@@ -2256,14 +2255,14 @@ yy364:
        if (yybm[0+yych] & 128) {
                goto yy364;
        }
-#line 447 "../src/ast/lex.re"
+#line 443 "../src/ast/lex.re"
        { goto cond; }
-#line 2262 "src/ast/lex.cc"
+#line 2261 "src/ast/lex.cc"
 yy367:
        ++YYCURSOR;
-#line 448 "../src/ast/lex.re"
+#line 444 "../src/ast/lex.re"
        { goto end; }
-#line 2267 "src/ast/lex.cc"
+#line 2266 "src/ast/lex.cc"
 yy369:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -2281,7 +2280,7 @@ yy369:
        YYCURSOR = YYMARKER;
        goto yy362;
 }
-#line 450 "../src/ast/lex.re"
+#line 446 "../src/ast/lex.re"
 
 end:
     yylval.clist = cl;
@@ -2297,7 +2296,7 @@ void Scanner::lex_code_indented()
     tok = cur;
 code:
 
-#line 2301 "src/ast/lex.cc"
+#line 2300 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
@@ -2325,15 +2324,15 @@ code:
        }
 yy374:
        ++YYCURSOR;
-#line 473 "../src/ast/lex.re"
+#line 469 "../src/ast/lex.re"
        { fail_if_eof(); goto code; }
-#line 2331 "src/ast/lex.cc"
+#line 2330 "src/ast/lex.cc"
 yy376:
        ++YYCURSOR;
 yy377:
-#line 478 "../src/ast/lex.re"
+#line 474 "../src/ast/lex.re"
        { goto code; }
-#line 2337 "src/ast/lex.cc"
+#line 2336 "src/ast/lex.cc"
 yy378:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych <= '\f') {
@@ -2344,23 +2343,23 @@ yy378:
                if (yych == ' ') goto yy386;
        }
 yy379:
-#line 466 "../src/ast/lex.re"
+#line 462 "../src/ast/lex.re"
        {
         while (isspace(tok[0])) ++tok;
         while (cur > tok && isspace(cur[-1])) --cur;
         yylval.code = new Code(get_fname (), line, tok, tok_len ());
         return;
     }
-#line 2355 "src/ast/lex.cc"
+#line 2354 "src/ast/lex.cc"
 yy380:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy378;
        goto yy377;
 yy381:
        ++YYCURSOR;
-#line 477 "../src/ast/lex.re"
+#line 473 "../src/ast/lex.re"
        { lex_string(cur[-1]); goto code; }
-#line 2364 "src/ast/lex.cc"
+#line 2363 "src/ast/lex.cc"
 yy383:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '*') goto yy388;
@@ -2368,27 +2367,27 @@ yy383:
        goto yy377;
 yy384:
        ++YYCURSOR;
-#line 474 "../src/ast/lex.re"
+#line 470 "../src/ast/lex.re"
        { fatal_l(get_line(), "Curly braces are not allowed after ':='"); }
-#line 2374 "src/ast/lex.cc"
+#line 2373 "src/ast/lex.cc"
 yy386:
        ++YYCURSOR;
        YYCURSOR -= 1;
-#line 465 "../src/ast/lex.re"
+#line 461 "../src/ast/lex.re"
        { goto code; }
-#line 2380 "src/ast/lex.cc"
+#line 2379 "src/ast/lex.cc"
 yy388:
        ++YYCURSOR;
-#line 475 "../src/ast/lex.re"
+#line 471 "../src/ast/lex.re"
        { lex_c_comment(); goto code; }
-#line 2385 "src/ast/lex.cc"
+#line 2384 "src/ast/lex.cc"
 yy390:
        ++YYCURSOR;
-#line 476 "../src/ast/lex.re"
+#line 472 "../src/ast/lex.re"
        { lex_cpp_comment(); goto code; }
-#line 2390 "src/ast/lex.cc"
+#line 2389 "src/ast/lex.cc"
 }
-#line 479 "../src/ast/lex.re"
+#line 475 "../src/ast/lex.re"
 
 }
 
@@ -2398,7 +2397,7 @@ void Scanner::lex_code_in_braces()
     uint32_t depth = 1;
 code:
 
-#line 2402 "src/ast/lex.cc"
+#line 2401 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        static const unsigned char yybm[] = {
@@ -2460,15 +2459,15 @@ code:
        }
 yy394:
        ++YYCURSOR;
-#line 499 "../src/ast/lex.re"
+#line 495 "../src/ast/lex.re"
        { fail_if_eof(); goto code; }
-#line 2466 "src/ast/lex.cc"
+#line 2465 "src/ast/lex.cc"
 yy396:
        ++YYCURSOR;
 yy397:
-#line 503 "../src/ast/lex.re"
+#line 499 "../src/ast/lex.re"
        { goto code; }
-#line 2472 "src/ast/lex.cc"
+#line 2471 "src/ast/lex.cc"
 yy398:
        yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
        if (yybm[0+yych] & 32) {
@@ -2476,18 +2475,18 @@ yy398:
        }
        if (yych == '#') goto yy411;
 yy399:
-#line 498 "../src/ast/lex.re"
+#line 494 "../src/ast/lex.re"
        { next_line(); goto code; }
-#line 2482 "src/ast/lex.cc"
+#line 2481 "src/ast/lex.cc"
 yy400:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy398;
        goto yy397;
 yy401:
        ++YYCURSOR;
-#line 502 "../src/ast/lex.re"
+#line 498 "../src/ast/lex.re"
        { lex_string(cur[-1]); goto code; }
-#line 2491 "src/ast/lex.cc"
+#line 2490 "src/ast/lex.cc"
 yy403:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '*') goto yy413;
@@ -2495,12 +2494,12 @@ yy403:
        goto yy397;
 yy404:
        ++YYCURSOR;
-#line 496 "../src/ast/lex.re"
+#line 492 "../src/ast/lex.re"
        { ++depth; goto code; }
-#line 2501 "src/ast/lex.cc"
+#line 2500 "src/ast/lex.cc"
 yy406:
        ++YYCURSOR;
-#line 488 "../src/ast/lex.re"
+#line 484 "../src/ast/lex.re"
        {
         if (--depth == 0) {
             yylval.code = new Code(get_fname (), line, tok, tok_len ());
@@ -2508,7 +2507,7 @@ yy406:
         }
         goto code;
     }
-#line 2512 "src/ast/lex.cc"
+#line 2511 "src/ast/lex.cc"
 yy408:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -2534,14 +2533,14 @@ yy411:
        }
 yy413:
        ++YYCURSOR;
-#line 500 "../src/ast/lex.re"
+#line 496 "../src/ast/lex.re"
        { lex_c_comment(); goto code; }
-#line 2540 "src/ast/lex.cc"
+#line 2539 "src/ast/lex.cc"
 yy415:
        ++YYCURSOR;
-#line 501 "../src/ast/lex.re"
+#line 497 "../src/ast/lex.re"
        { lex_cpp_comment(); goto code; }
-#line 2545 "src/ast/lex.cc"
+#line 2544 "src/ast/lex.cc"
 yy417:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych != 'i') goto yy410;
@@ -2598,9 +2597,9 @@ yy425:
 yy427:
        ++YYCURSOR;
        YYCURSOR = yyt1;
-#line 497 "../src/ast/lex.re"
+#line 493 "../src/ast/lex.re"
        { set_sourceline (); goto code; }
-#line 2604 "src/ast/lex.cc"
+#line 2603 "src/ast/lex.cc"
 yy429:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy427;
@@ -2626,7 +2625,7 @@ yy433:
        if (yych == '\n') goto yy410;
        goto yy430;
 }
-#line 504 "../src/ast/lex.re"
+#line 500 "../src/ast/lex.re"
 
 }
 
@@ -2634,7 +2633,7 @@ void Scanner::lex_string(char delim)
 {
 loop:
 
-#line 2638 "src/ast/lex.cc"
+#line 2637 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -2660,29 +2659,29 @@ loop:
        }
 yy436:
        ++YYCURSOR;
-#line 514 "../src/ast/lex.re"
+#line 510 "../src/ast/lex.re"
        { fail_if_eof(); goto loop; }
-#line 2666 "src/ast/lex.cc"
+#line 2665 "src/ast/lex.cc"
 yy438:
        ++YYCURSOR;
 yy439:
-#line 515 "../src/ast/lex.re"
+#line 511 "../src/ast/lex.re"
        { goto loop; }
-#line 2672 "src/ast/lex.cc"
+#line 2671 "src/ast/lex.cc"
 yy440:
        ++YYCURSOR;
-#line 513 "../src/ast/lex.re"
+#line 509 "../src/ast/lex.re"
        { next_line(); goto loop; }
-#line 2677 "src/ast/lex.cc"
+#line 2676 "src/ast/lex.cc"
 yy442:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy440;
        goto yy439;
 yy443:
        ++YYCURSOR;
-#line 511 "../src/ast/lex.re"
+#line 507 "../src/ast/lex.re"
        { if (cur[-1] == delim) return; else goto loop; }
-#line 2686 "src/ast/lex.cc"
+#line 2685 "src/ast/lex.cc"
 yy445:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych <= '&') {
@@ -2693,11 +2692,11 @@ yy445:
        }
 yy446:
        ++YYCURSOR;
-#line 512 "../src/ast/lex.re"
+#line 508 "../src/ast/lex.re"
        { goto loop; }
-#line 2699 "src/ast/lex.cc"
+#line 2698 "src/ast/lex.cc"
 }
-#line 516 "../src/ast/lex.re"
+#line 512 "../src/ast/lex.re"
 
 }
 
@@ -2705,7 +2704,7 @@ void Scanner::lex_c_comment()
 {
 loop:
 
-#line 2709 "src/ast/lex.cc"
+#line 2708 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -2721,20 +2720,20 @@ loop:
        }
 yy450:
        ++YYCURSOR;
-#line 525 "../src/ast/lex.re"
+#line 521 "../src/ast/lex.re"
        { fail_if_eof(); goto loop; }
-#line 2727 "src/ast/lex.cc"
+#line 2726 "src/ast/lex.cc"
 yy452:
        ++YYCURSOR;
 yy453:
-#line 526 "../src/ast/lex.re"
+#line 522 "../src/ast/lex.re"
        { goto loop; }
-#line 2733 "src/ast/lex.cc"
+#line 2732 "src/ast/lex.cc"
 yy454:
        ++YYCURSOR;
-#line 524 "../src/ast/lex.re"
+#line 520 "../src/ast/lex.re"
        { next_line(); goto loop; }
-#line 2738 "src/ast/lex.cc"
+#line 2737 "src/ast/lex.cc"
 yy456:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy454;
@@ -2743,11 +2742,11 @@ yy457:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych != '/') goto yy453;
        ++YYCURSOR;
-#line 523 "../src/ast/lex.re"
+#line 519 "../src/ast/lex.re"
        { return; }
-#line 2749 "src/ast/lex.cc"
+#line 2748 "src/ast/lex.cc"
 }
-#line 527 "../src/ast/lex.re"
+#line 523 "../src/ast/lex.re"
 
 }
 
@@ -2755,7 +2754,7 @@ void Scanner::lex_cpp_comment()
 {
 loop:
 
-#line 2759 "src/ast/lex.cc"
+#line 2758 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -2770,26 +2769,26 @@ loop:
        }
 yy462:
        ++YYCURSOR;
-#line 535 "../src/ast/lex.re"
+#line 531 "../src/ast/lex.re"
        { fail_if_eof(); goto loop; }
-#line 2776 "src/ast/lex.cc"
+#line 2775 "src/ast/lex.cc"
 yy464:
        ++YYCURSOR;
 yy465:
-#line 536 "../src/ast/lex.re"
+#line 532 "../src/ast/lex.re"
        { goto loop; }
-#line 2782 "src/ast/lex.cc"
+#line 2781 "src/ast/lex.cc"
 yy466:
        ++YYCURSOR;
-#line 534 "../src/ast/lex.re"
+#line 530 "../src/ast/lex.re"
        { next_line(); return; }
-#line 2787 "src/ast/lex.cc"
+#line 2786 "src/ast/lex.cc"
 yy468:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy466;
        goto yy465;
 }
-#line 537 "../src/ast/lex.re"
+#line 533 "../src/ast/lex.re"
 
 }
 
@@ -2801,35 +2800,35 @@ fst:
     tok = cur;
     c = get_column();
     
-#line 2805 "src/ast/lex.cc"
+#line 2804 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = (YYCTYPE)*YYCURSOR;
        if (yych == ']') goto yy472;
-#line 549 "../src/ast/lex.re"
+#line 545 "../src/ast/lex.re"
        { l = lex_cls_chr(); goto snd; }
-#line 2813 "src/ast/lex.cc"
+#line 2812 "src/ast/lex.cc"
 yy472:
        ++YYCURSOR;
-#line 548 "../src/ast/lex.re"
+#line 544 "../src/ast/lex.re"
        { return ast_cls(get_line(), c0, cls, neg); }
-#line 2818 "src/ast/lex.cc"
+#line 2817 "src/ast/lex.cc"
 }
-#line 550 "../src/ast/lex.re"
+#line 546 "../src/ast/lex.re"
 
 snd:
     
-#line 2824 "src/ast/lex.cc"
+#line 2823 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = (YYCTYPE)*(YYMARKER = YYCURSOR);
        if (yych == '-') goto yy477;
 yy476:
-#line 553 "../src/ast/lex.re"
+#line 549 "../src/ast/lex.re"
        { u = l; goto add; }
-#line 2833 "src/ast/lex.cc"
+#line 2832 "src/ast/lex.cc"
 yy477:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych != ']') goto yy479;
@@ -2838,7 +2837,7 @@ yy477:
 yy479:
        ++YYCURSOR;
        YYCURSOR -= 1;
-#line 554 "../src/ast/lex.re"
+#line 550 "../src/ast/lex.re"
        {
             u = lex_cls_chr();
             if (l > u) {
@@ -2847,9 +2846,9 @@ yy479:
             }
             goto add;
         }
-#line 2851 "src/ast/lex.cc"
+#line 2850 "src/ast/lex.cc"
 }
-#line 562 "../src/ast/lex.re"
+#line 558 "../src/ast/lex.re"
 
 add:
     cls->push_back(ASTRange(l, u, c));
@@ -2861,7 +2860,7 @@ uint32_t Scanner::lex_cls_chr()
     tok = cur;
     const uint32_t l = get_line(), c = get_column();
     
-#line 2865 "src/ast/lex.cc"
+#line 2864 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        unsigned int yyaccept = 0;
@@ -2878,20 +2877,20 @@ uint32_t Scanner::lex_cls_chr()
        }
 yy483:
        ++YYCURSOR;
-#line 574 "../src/ast/lex.re"
+#line 570 "../src/ast/lex.re"
        { fail_if_eof(); return 0; }
-#line 2884 "src/ast/lex.cc"
+#line 2883 "src/ast/lex.cc"
 yy485:
        ++YYCURSOR;
 yy486:
-#line 580 "../src/ast/lex.re"
+#line 576 "../src/ast/lex.re"
        { return static_cast<uint8_t>(tok[0]); }
-#line 2890 "src/ast/lex.cc"
+#line 2889 "src/ast/lex.cc"
 yy487:
        ++YYCURSOR;
-#line 575 "../src/ast/lex.re"
+#line 571 "../src/ast/lex.re"
        { fatal_lc(l, c, "newline in character class"); }
-#line 2895 "src/ast/lex.cc"
+#line 2894 "src/ast/lex.cc"
 yy489:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy487;
@@ -2950,36 +2949,36 @@ yy490:
                }
        }
 yy491:
-#line 578 "../src/ast/lex.re"
+#line 574 "../src/ast/lex.re"
        { fatal_lc(l, c, "syntax error in escape sequence"); }
-#line 2956 "src/ast/lex.cc"
+#line 2955 "src/ast/lex.cc"
 yy492:
        ++YYCURSOR;
 yy493:
-#line 593 "../src/ast/lex.re"
+#line 589 "../src/ast/lex.re"
        {
             warn.useless_escape(l, c, tok[1]);
             return static_cast<uint8_t>(tok[1]);
         }
-#line 2965 "src/ast/lex.cc"
+#line 2964 "src/ast/lex.cc"
 yy494:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy487;
        goto yy493;
 yy495:
        ++YYCURSOR;
-#line 591 "../src/ast/lex.re"
+#line 587 "../src/ast/lex.re"
        { return static_cast<uint8_t>('-'); }
-#line 2974 "src/ast/lex.cc"
+#line 2973 "src/ast/lex.cc"
 yy497:
        yyaccept = 0;
        yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
        if (yych <= '/') goto yy498;
        if (yych <= '7') goto yy522;
 yy498:
-#line 577 "../src/ast/lex.re"
+#line 573 "../src/ast/lex.re"
        { fatal_lc(l, c, "syntax error in octal escape sequence"); }
-#line 2983 "src/ast/lex.cc"
+#line 2982 "src/ast/lex.cc"
 yy499:
        ++YYCURSOR;
        goto yy498;
@@ -2995,9 +2994,9 @@ yy500:
                if (yych <= 'f') goto yy524;
        }
 yy501:
-#line 576 "../src/ast/lex.re"
+#line 572 "../src/ast/lex.re"
        { fatal_lc(l, c, "syntax error in hexadecimal escape sequence"); }
-#line 3001 "src/ast/lex.cc"
+#line 3000 "src/ast/lex.cc"
 yy502:
        yyaccept = 1;
        yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
@@ -3013,49 +3012,49 @@ yy502:
        }
 yy503:
        ++YYCURSOR;
-#line 590 "../src/ast/lex.re"
+#line 586 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\\'); }
-#line 3019 "src/ast/lex.cc"
+#line 3018 "src/ast/lex.cc"
 yy505:
        ++YYCURSOR;
-#line 592 "../src/ast/lex.re"
+#line 588 "../src/ast/lex.re"
        { return static_cast<uint8_t>(']'); }
-#line 3024 "src/ast/lex.cc"
+#line 3023 "src/ast/lex.cc"
 yy507:
        ++YYCURSOR;
-#line 583 "../src/ast/lex.re"
+#line 579 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\a'); }
-#line 3029 "src/ast/lex.cc"
+#line 3028 "src/ast/lex.cc"
 yy509:
        ++YYCURSOR;
-#line 584 "../src/ast/lex.re"
+#line 580 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\b'); }
-#line 3034 "src/ast/lex.cc"
+#line 3033 "src/ast/lex.cc"
 yy511:
        ++YYCURSOR;
-#line 585 "../src/ast/lex.re"
+#line 581 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\f'); }
-#line 3039 "src/ast/lex.cc"
+#line 3038 "src/ast/lex.cc"
 yy513:
        ++YYCURSOR;
-#line 586 "../src/ast/lex.re"
+#line 582 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\n'); }
-#line 3044 "src/ast/lex.cc"
+#line 3043 "src/ast/lex.cc"
 yy515:
        ++YYCURSOR;
-#line 587 "../src/ast/lex.re"
+#line 583 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\r'); }
-#line 3049 "src/ast/lex.cc"
+#line 3048 "src/ast/lex.cc"
 yy517:
        ++YYCURSOR;
-#line 588 "../src/ast/lex.re"
+#line 584 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\t'); }
-#line 3054 "src/ast/lex.cc"
+#line 3053 "src/ast/lex.cc"
 yy519:
        ++YYCURSOR;
-#line 589 "../src/ast/lex.re"
+#line 585 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\v'); }
-#line 3059 "src/ast/lex.cc"
+#line 3058 "src/ast/lex.cc"
 yy521:
        yyaccept = 1;
        yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
@@ -3118,9 +3117,9 @@ yy526:
        }
 yy527:
        ++YYCURSOR;
-#line 582 "../src/ast/lex.re"
+#line 578 "../src/ast/lex.re"
        { return unesc_oct(tok, cur); }
-#line 3124 "src/ast/lex.cc"
+#line 3123 "src/ast/lex.cc"
 yy529:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych <= '@') {
@@ -3147,9 +3146,9 @@ yy530:
        }
 yy531:
        ++YYCURSOR;
-#line 581 "../src/ast/lex.re"
+#line 577 "../src/ast/lex.re"
        { return unesc_hex(tok, cur); }
-#line 3153 "src/ast/lex.cc"
+#line 3152 "src/ast/lex.cc"
 yy533:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych <= '@') {
@@ -3173,7 +3172,7 @@ yy534:
                goto yy523;
        }
 }
-#line 597 "../src/ast/lex.re"
+#line 593 "../src/ast/lex.re"
 
 }
 
@@ -3183,7 +3182,7 @@ uint32_t Scanner::lex_str_chr(char quote, bool &end)
     tok = cur;
     const uint32_t l = get_line(), c = get_column();
     
-#line 3187 "src/ast/lex.cc"
+#line 3186 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        unsigned int yyaccept = 0;
@@ -3200,23 +3199,23 @@ uint32_t Scanner::lex_str_chr(char quote, bool &end)
        }
 yy537:
        ++YYCURSOR;
-#line 607 "../src/ast/lex.re"
+#line 603 "../src/ast/lex.re"
        { fail_if_eof(); return 0; }
-#line 3206 "src/ast/lex.cc"
+#line 3205 "src/ast/lex.cc"
 yy539:
        ++YYCURSOR;
 yy540:
-#line 613 "../src/ast/lex.re"
+#line 609 "../src/ast/lex.re"
        {
             end = tok[0] == quote;
             return static_cast<uint8_t>(tok[0]);
         }
-#line 3215 "src/ast/lex.cc"
+#line 3214 "src/ast/lex.cc"
 yy541:
        ++YYCURSOR;
-#line 608 "../src/ast/lex.re"
+#line 604 "../src/ast/lex.re"
        { fatal_lc(l, c, "newline in character string"); }
-#line 3220 "src/ast/lex.cc"
+#line 3219 "src/ast/lex.cc"
 yy543:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy541;
@@ -3270,20 +3269,20 @@ yy544:
                }
        }
 yy545:
-#line 611 "../src/ast/lex.re"
+#line 607 "../src/ast/lex.re"
        { fatal_lc(l, c, "syntax error in escape sequence"); }
-#line 3276 "src/ast/lex.cc"
+#line 3275 "src/ast/lex.cc"
 yy546:
        ++YYCURSOR;
 yy547:
-#line 627 "../src/ast/lex.re"
+#line 623 "../src/ast/lex.re"
        {
             if (tok[1] != quote) {
                 warn.useless_escape(l, c, tok[1]);
             }
             return static_cast<uint8_t>(tok[1]);
         }
-#line 3287 "src/ast/lex.cc"
+#line 3286 "src/ast/lex.cc"
 yy548:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy541;
@@ -3294,9 +3293,9 @@ yy549:
        if (yych <= '/') goto yy550;
        if (yych <= '7') goto yy572;
 yy550:
-#line 610 "../src/ast/lex.re"
+#line 606 "../src/ast/lex.re"
        { fatal_lc(l, c, "syntax error in octal escape sequence"); }
-#line 3300 "src/ast/lex.cc"
+#line 3299 "src/ast/lex.cc"
 yy551:
        ++YYCURSOR;
        goto yy550;
@@ -3312,9 +3311,9 @@ yy552:
                if (yych <= 'f') goto yy574;
        }
 yy553:
-#line 609 "../src/ast/lex.re"
+#line 605 "../src/ast/lex.re"
        { fatal_lc(l, c, "syntax error in hexadecimal escape sequence"); }
-#line 3318 "src/ast/lex.cc"
+#line 3317 "src/ast/lex.cc"
 yy554:
        yyaccept = 1;
        yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
@@ -3330,44 +3329,44 @@ yy554:
        }
 yy555:
        ++YYCURSOR;
-#line 626 "../src/ast/lex.re"
+#line 622 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\\'); }
-#line 3336 "src/ast/lex.cc"
+#line 3335 "src/ast/lex.cc"
 yy557:
        ++YYCURSOR;
-#line 619 "../src/ast/lex.re"
+#line 615 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\a'); }
-#line 3341 "src/ast/lex.cc"
+#line 3340 "src/ast/lex.cc"
 yy559:
        ++YYCURSOR;
-#line 620 "../src/ast/lex.re"
+#line 616 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\b'); }
-#line 3346 "src/ast/lex.cc"
+#line 3345 "src/ast/lex.cc"
 yy561:
        ++YYCURSOR;
-#line 621 "../src/ast/lex.re"
+#line 617 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\f'); }
-#line 3351 "src/ast/lex.cc"
+#line 3350 "src/ast/lex.cc"
 yy563:
        ++YYCURSOR;
-#line 622 "../src/ast/lex.re"
+#line 618 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\n'); }
-#line 3356 "src/ast/lex.cc"
+#line 3355 "src/ast/lex.cc"
 yy565:
        ++YYCURSOR;
-#line 623 "../src/ast/lex.re"
+#line 619 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\r'); }
-#line 3361 "src/ast/lex.cc"
+#line 3360 "src/ast/lex.cc"
 yy567:
        ++YYCURSOR;
-#line 624 "../src/ast/lex.re"
+#line 620 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\t'); }
-#line 3366 "src/ast/lex.cc"
+#line 3365 "src/ast/lex.cc"
 yy569:
        ++YYCURSOR;
-#line 625 "../src/ast/lex.re"
+#line 621 "../src/ast/lex.re"
        { return static_cast<uint8_t>('\v'); }
-#line 3371 "src/ast/lex.cc"
+#line 3370 "src/ast/lex.cc"
 yy571:
        yyaccept = 1;
        yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
@@ -3430,9 +3429,9 @@ yy576:
        }
 yy577:
        ++YYCURSOR;
-#line 618 "../src/ast/lex.re"
+#line 614 "../src/ast/lex.re"
        { return unesc_oct(tok, cur); }
-#line 3436 "src/ast/lex.cc"
+#line 3435 "src/ast/lex.cc"
 yy579:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych <= '@') {
@@ -3459,9 +3458,9 @@ yy580:
        }
 yy581:
        ++YYCURSOR;
-#line 617 "../src/ast/lex.re"
+#line 613 "../src/ast/lex.re"
        { return unesc_hex(tok, cur); }
-#line 3465 "src/ast/lex.cc"
+#line 3464 "src/ast/lex.cc"
 yy583:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych <= '@') {
@@ -3485,7 +3484,7 @@ yy584:
                goto yy573;
        }
 }
-#line 633 "../src/ast/lex.re"
+#line 629 "../src/ast/lex.re"
 
 }
 
@@ -3505,7 +3504,7 @@ void Scanner::set_sourceline ()
 sourceline:
     tok = cur;
 
-#line 3509 "src/ast/lex.cc"
+#line 3508 "src/ast/lex.cc"
 {
        YYCTYPE yych;
        static const unsigned char yybm[] = {
@@ -3563,20 +3562,20 @@ sourceline:
                }
        }
        ++YYCURSOR;
-#line 669 "../src/ast/lex.re"
+#line 665 "../src/ast/lex.re"
        { --cur; return; }
-#line 3569 "src/ast/lex.cc"
+#line 3568 "src/ast/lex.cc"
 yy589:
        ++YYCURSOR;
 yy590:
-#line 670 "../src/ast/lex.re"
+#line 666 "../src/ast/lex.re"
        { goto sourceline; }
-#line 3575 "src/ast/lex.cc"
+#line 3574 "src/ast/lex.cc"
 yy591:
        ++YYCURSOR;
-#line 668 "../src/ast/lex.re"
+#line 664 "../src/ast/lex.re"
        { tok = cur; return; }
-#line 3580 "src/ast/lex.cc"
+#line 3579 "src/ast/lex.cc"
 yy593:
        yych = (YYCTYPE)*++YYCURSOR;
        if (yych == '\n') goto yy591;
@@ -3593,7 +3592,7 @@ yy595:
        if (yybm[0+yych] & 64) {
                goto yy595;
        }
-#line 652 "../src/ast/lex.re"
+#line 648 "../src/ast/lex.re"
        {
         uint32_t l;
         if (!s_to_u32_unsafe (tok, cur, l)) {
@@ -3602,7 +3601,7 @@ yy595:
         set_line(l);
         goto sourceline;
     }
-#line 3606 "src/ast/lex.cc"
+#line 3605 "src/ast/lex.cc"
 yy598:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -3619,14 +3618,14 @@ yy600:
        goto yy590;
 yy601:
        ++YYCURSOR;
-#line 661 "../src/ast/lex.re"
+#line 657 "../src/ast/lex.re"
        {
         std::string &name = get_input().escaped_name;
         name = std::string(tok + 1, tok_len () - 2); // strip quotes
         strrreplace(name, "\\", "\\\\");
         goto sourceline;
     }
-#line 3630 "src/ast/lex.cc"
+#line 3629 "src/ast/lex.cc"
 yy603:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -3635,7 +3634,7 @@ yy603:
        if (yych == '\n') goto yy600;
        goto yy598;
 }
-#line 671 "../src/ast/lex.re"
+#line 667 "../src/ast/lex.re"
 
 }
 

diff --git a/re2c/bootstrap/src/ast/lex.h b/re2c/bootstrap/src/ast/lex.h
index e92fde6782340f141b57ce304a73754e67cb03f2..1ead31afad6efeef48967cd9decfb3f5bc0cf17d 100644 (file)
--- a/re2c/bootstrap/src/ast/lex.h
+++ b/re2c/bootstrap/src/ast/lex.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.1.1 on Thu Dec 27 21:57:09 2018 */
+/* Generated by re2c 1.1.1 on Thu Dec 27 22:16:41 2018 */
 
 #include <string.h>
 #include "src/util/forbid_copy.h"
@@ -17,8 +17,6 @@ struct ScannerState
     char *bot, *lim, *cur, *mar, *ctx, *tok, *ptr, *pos, *eof;
     char *yyt1;char *yyt2;
 
-    ptrdiff_t tchar;
-
     inline ScannerState()
         : lexer_state (LEX_NORMAL)
         , BSIZE(8192)
@@ -32,7 +30,6 @@ struct ScannerState
         , pos(lim)
         , eof(NULL)
         , yyt1(lim), yyt2(lim)
-        , tchar(0)
     {
         memset(lim, 0, YYMAXFILL);
     }

diff --git a/re2c/src/ast/lex.re b/re2c/src/ast/lex.re
index 3d94dfa21333ee68ab4b9eb95d57aadc102f4d5d..90104e38fe2af6a7bff0c067e4e92687b55fafef 100644 (file)
--- a/re2c/src/ast/lex.re
+++ b/re2c/src/ast/lex.re
@@ -71,8 +71,6 @@ struct ScannerState
     char *bot, *lim, *cur, *mar, *ctx, *tok, *ptr, *pos, *eof;
     /*!stags:re2c format = "char *@@;"; */
 
-    ptrdiff_t tchar;
-
     inline ScannerState()
         : lexer_state (LEX_NORMAL)
         , BSIZE(8192)
@@ -86,7 +84,6 @@ struct ScannerState
         , pos(lim)
         , eof(NULL)
         /*!stags:re2c format = ", @@(lim)"; */
-        , tchar(0)
     {
         memset(lim, 0, YYMAXFILL);
     }
@@ -283,7 +280,6 @@ int Scanner::scan()
 {
     const char *p;
 scan:
-    tchar = cur - pos;
     tok = cur;
 /*!re2c
     "{"  { lex_code_in_braces(); return TOKEN_CODE; }