cpp: sizeof, anon decls, etc
authorMichael Wallner <mike@php.net>
Tue, 5 Sep 2017 06:56:27 +0000 (08:56 +0200)
committerMichael Wallner <mike@php.net>
Tue, 5 Sep 2017 06:56:27 +0000 (08:56 +0200)
src/parser.c
src/parser.re
src/parser_proc.c
src/parser_proc.h
src/parser_proc_grammar.y
src/types/number.c
src/types/number.h

index 4e979dd..f130933 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 on Thu Jul 27 12:41:40 2017 */
+/* Generated by re2c 1.0.2 on Mon Sep  4 19:48:37 2017 */
 #line 1 "src/parser.re"
 /*******************************************************************************
  Copyright (c) 2016, Michael Wallner <mike@php.net>.
@@ -33,6 +33,7 @@
 #include "parser.h"
 
 #define YYMAXFILL 15
+
 #ifndef YYMAXFILL
 # define YYMAXFILL 256
 #endif
@@ -278,7 +279,7 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                tok = cur;
 
                
-#line 282 "src/parser.c"
+#line 283 "src/parser.c"
                {
                        unsigned char yych;
                        unsigned int yyaccept = 0;
@@ -403,9 +404,9 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
 yy2:
                        ++cur;
 yy3:
-#line 452 "src/parser.re"
+#line 455 "src/parser.re"
                        { NEWTOKEN(-2); goto error; }
-#line 409 "src/parser.c"
+#line 410 "src/parser.c"
 yy4:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -417,39 +418,39 @@ yy4:
                        default:        goto yy6;
                        }
 yy6:
-#line 451 "src/parser.re"
+#line 454 "src/parser.re"
                        { NEWTOKEN(PSI_T_WHITESPACE); goto start; }
-#line 423 "src/parser.c"
+#line 424 "src/parser.c"
 yy7:
                        ++cur;
-#line 450 "src/parser.re"
+#line 453 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
-#line 428 "src/parser.c"
+#line 429 "src/parser.c"
 yy9:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '=':       goto yy104;
                        default:        goto yy10;
                        }
 yy10:
 #line 349 "src/parser.re"
                        { NEWTOKEN(PSI_T_NOT); goto start; }
-#line 438 "src/parser.c"
+#line 439 "src/parser.c"
 yy11:
                        ++cur;
 #line 322 "src/parser.re"
                        { escaped = false; tok += 1; goto string; }
-#line 443 "src/parser.c"
+#line 444 "src/parser.c"
 yy13:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '#':       goto yy106;
                        default:        goto yy14;
                        }
 yy14:
 #line 332 "src/parser.re"
                        { NEWTOKEN(PSI_T_HASH); goto start; }
-#line 453 "src/parser.c"
+#line 454 "src/parser.c"
 yy15:
                        yych = *++cur;
                        switch (yych) {
@@ -524,37 +525,37 @@ yy16:
                        ++cur;
 #line 350 "src/parser.re"
                        { NEWTOKEN(PSI_T_MODULO); goto start; }
-#line 528 "src/parser.c"
+#line 529 "src/parser.c"
 yy18:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '&':       goto yy111;
                        default:        goto yy19;
                        }
 yy19:
 #line 351 "src/parser.re"
                        { NEWTOKEN(PSI_T_AMPERSAND); goto start; }
-#line 538 "src/parser.c"
+#line 539 "src/parser.c"
 yy20:
                        ++cur;
 #line 321 "src/parser.re"
                        { escaped = false; tok += 1; goto character; }
-#line 543 "src/parser.c"
+#line 544 "src/parser.c"
 yy22:
                        ++cur;
 #line 333 "src/parser.re"
                        { NEWTOKEN(PSI_T_LPAREN); goto start; }
-#line 548 "src/parser.c"
+#line 549 "src/parser.c"
 yy24:
                        ++cur;
 #line 334 "src/parser.re"
                        { NEWTOKEN(PSI_T_RPAREN); goto start; }
-#line 553 "src/parser.c"
+#line 554 "src/parser.c"
 yy26:
                        ++cur;
 #line 347 "src/parser.re"
                        { NEWTOKEN(PSI_T_ASTERISK); goto start; }
-#line 558 "src/parser.c"
+#line 559 "src/parser.c"
 yy28:
                        yyaccept = 0;
                        yych = *(mrk = ++cur);
@@ -575,12 +576,12 @@ yy28:
 yy29:
 #line 352 "src/parser.re"
                        { NEWTOKEN(PSI_T_PLUS); goto start; }
-#line 579 "src/parser.c"
+#line 580 "src/parser.c"
 yy30:
                        ++cur;
 #line 336 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMA); goto start; }
-#line 584 "src/parser.c"
+#line 585 "src/parser.c"
 yy32:
                        yyaccept = 1;
                        yych = *(mrk = ++cur);
@@ -601,7 +602,7 @@ yy32:
 yy33:
 #line 353 "src/parser.re"
                        { NEWTOKEN(PSI_T_MINUS); goto start; }
-#line 605 "src/parser.c"
+#line 606 "src/parser.c"
 yy34:
                        yyaccept = 2;
                        yych = *(mrk = ++cur);
@@ -622,10 +623,10 @@ yy34:
 yy35:
 #line 364 "src/parser.re"
                        { NEWTOKEN(PSI_T_PERIOD); goto start; }
-#line 626 "src/parser.c"
+#line 627 "src/parser.c"
 yy36:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '*':       goto yy119;
                        case '/':       goto yy121;
                        default:        goto yy37;
@@ -633,41 +634,27 @@ yy36:
 yy37:
 #line 354 "src/parser.re"
                        { NEWTOKEN(PSI_T_SLASH); goto start; }
-#line 637 "src/parser.c"
+#line 638 "src/parser.c"
 yy38:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
                        case '.':       goto yy123;
-                       case '0':
-                       case '1':
-                       case '2':
-                       case '3':
-                       case '4':
-                       case '5':
-                       case '6':
-                       case '7':       goto yy125;
                        case 'E':
                        case 'e':       goto yy127;
-                       case 'L':
-                       case 'l':       goto yy128;
-                       case 'U':
-                       case 'u':       goto yy130;
                        case 'X':
                        case 'x':       goto yy132;
-                       default:        goto yy39;
+                       default:        goto yy126;
                        }
 yy39:
 #line 308 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT; goto start; }
-#line 665 "src/parser.c"
+#line 653 "src/parser.c"
 yy40:
                        yyaccept = 3;
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
-                       ctxmrk = cur;
                        switch (yych) {
                        case '.':       goto yy123;
                        case '0':
@@ -692,12 +679,12 @@ yy42:
                        ++cur;
 #line 337 "src/parser.re"
                        { NEWTOKEN(PSI_T_COLON); goto start; }
-#line 696 "src/parser.c"
+#line 683 "src/parser.c"
 yy44:
                        ++cur;
 #line 335 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOS); goto start; }
-#line 701 "src/parser.c"
+#line 688 "src/parser.c"
 yy46:
                        yyaccept = 4;
                        yych = *(mrk = ++cur);
@@ -775,20 +762,20 @@ yy46:
 yy47:
 #line 362 "src/parser.re"
                        { NEWTOKEN(PSI_T_LCHEVR); goto start; }
-#line 779 "src/parser.c"
+#line 766 "src/parser.c"
 yy48:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '=':       goto yy139;
                        default:        goto yy49;
                        }
 yy49:
 #line 346 "src/parser.re"
                        { NEWTOKEN(PSI_T_EQUALS); goto start; }
-#line 789 "src/parser.c"
+#line 776 "src/parser.c"
 yy50:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '=':       goto yy141;
                        case '>':       goto yy143;
                        default:        goto yy51;
@@ -796,12 +783,12 @@ yy50:
 yy51:
 #line 363 "src/parser.re"
                        { NEWTOKEN(PSI_T_RCHEVR); goto start; }
-#line 800 "src/parser.c"
+#line 787 "src/parser.c"
 yy52:
                        ++cur;
 #line 366 "src/parser.re"
                        { NEWTOKEN(PSI_T_IIF); goto start; }
-#line 805 "src/parser.c"
+#line 792 "src/parser.c"
 yy54:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -811,9 +798,9 @@ yy54:
                        default:        goto yy62;
                        }
 yy55:
-#line 445 "src/parser.re"
+#line 448 "src/parser.re"
                        { NEWTOKEN(PSI_T_NAME); goto start; }
-#line 817 "src/parser.c"
+#line 804 "src/parser.c"
 yy56:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -953,7 +940,6 @@ yy63:
 yy64:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
                        case '"':
                        case '\'':      goto yy161;
@@ -1032,7 +1018,6 @@ yy71:
 yy72:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
                        case '"':
                        case '\'':      goto yy177;
@@ -1060,10 +1045,10 @@ yy75:
                        ++cur;
 #line 340 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACKET); goto start; }
-#line 1064 "src/parser.c"
+#line 1049 "src/parser.c"
 yy77:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case 0x00:
                        case 0x01:
                        case 0x02:
@@ -1144,17 +1129,17 @@ yy77:
 yy78:
 #line 355 "src/parser.re"
                        { NEWTOKEN(PSI_T_BSLASH); goto start; }
-#line 1148 "src/parser.c"
+#line 1133 "src/parser.c"
 yy79:
                        ++cur;
 #line 341 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACKET); goto start; }
-#line 1153 "src/parser.c"
+#line 1138 "src/parser.c"
 yy81:
                        ++cur;
 #line 357 "src/parser.re"
                        { NEWTOKEN(PSI_T_CARET); goto start; }
-#line 1158 "src/parser.c"
+#line 1143 "src/parser.c"
 yy83:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -1277,7 +1262,6 @@ yy93:
 yy94:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
                        case '"':
                        case '\'':      goto yy200;
@@ -1298,37 +1282,37 @@ yy96:
                        ++cur;
 #line 338 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACE); goto start; }
-#line 1302 "src/parser.c"
+#line 1286 "src/parser.c"
 yy98:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '|':       goto yy206;
                        default:        goto yy99;
                        }
 yy99:
 #line 356 "src/parser.re"
                        { NEWTOKEN(PSI_T_PIPE); goto start; }
-#line 1312 "src/parser.c"
+#line 1296 "src/parser.c"
 yy100:
                        ++cur;
 #line 339 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACE); goto start; }
-#line 1317 "src/parser.c"
+#line 1301 "src/parser.c"
 yy102:
                        ++cur;
 #line 348 "src/parser.re"
                        { NEWTOKEN(PSI_T_TILDE); goto start; }
-#line 1322 "src/parser.c"
+#line 1306 "src/parser.c"
 yy104:
                        ++cur;
 #line 342 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_NE); goto start; }
-#line 1327 "src/parser.c"
+#line 1311 "src/parser.c"
 yy106:
                        ++cur;
 #line 331 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_PASTE); goto start; }
-#line 1332 "src/parser.c"
+#line 1316 "src/parser.c"
 yy108:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -1402,14 +1386,14 @@ yy108:
                        default:        goto yy108;
                        }
 yy110:
-#line 447 "src/parser.re"
+#line 450 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; }
-#line 1408 "src/parser.c"
+#line 1392 "src/parser.c"
 yy111:
                        ++cur;
 #line 344 "src/parser.re"
                        { NEWTOKEN(PSI_T_AND); goto start; }
-#line 1413 "src/parser.c"
+#line 1397 "src/parser.c"
 yy113:
                        yych = *++cur;
                        switch (yych) {
@@ -1441,80 +1425,83 @@ yy114:
                        case 10:        goto yy241;
                        case 11:        goto yy243;
                        case 12:        goto yy252;
-                       case 13:        goto yy271;
-                       case 14:        goto yy302;
-                       case 15:        goto yy304;
-                       case 16:        goto yy310;
-                       case 17:        goto yy318;
-                       case 18:        goto yy330;
-                       case 19:        goto yy338;
-                       case 20:        goto yy342;
-                       case 21:        goto yy348;
-                       case 22:        goto yy350;
-                       case 23:        goto yy354;
-                       case 24:        goto yy361;
-                       case 25:        goto yy363;
-                       case 26:        goto yy373;
-                       case 27:        goto yy375;
-                       case 28:        goto yy382;
-                       case 29:        goto yy385;
-                       case 30:        goto yy387;
-                       case 31:        goto yy389;
-                       case 32:        goto yy393;
-                       case 33:        goto yy398;
-                       case 34:        goto yy416;
-                       case 35:        goto yy423;
-                       case 36:        goto yy426;
-                       case 37:        goto yy433;
-                       case 38:        goto yy442;
-                       case 39:        goto yy445;
-                       case 40:        goto yy450;
-                       case 41:        goto yy452;
-                       case 42:        goto yy456;
-                       case 43:        goto yy459;
-                       case 44:        goto yy461;
-                       case 45:        goto yy463;
-                       case 46:        goto yy468;
-                       case 47:        goto yy470;
-                       case 48:        goto yy472;
-                       case 49:        goto yy474;
-                       case 50:        goto yy476;
-                       case 51:        goto yy481;
-                       case 52:        goto yy490;
-                       case 53:        goto yy495;
-                       case 54:        goto yy497;
-                       case 55:        goto yy499;
-                       case 56:        goto yy501;
-                       case 57:        goto yy509;
-                       case 58:        goto yy513;
-                       case 59:        goto yy517;
-                       case 60:        goto yy519;
-                       case 61:        goto yy524;
-                       case 62:        goto yy529;
-                       case 63:        goto yy531;
-                       case 64:        goto yy536;
-                       case 65:        goto yy538;
-                       case 66:        goto yy540;
-                       case 67:        goto yy544;
-                       case 68:        goto yy549;
-                       case 69:        goto yy552;
-                       case 70:        goto yy554;
-                       case 71:        goto yy556;
-                       case 72:        goto yy558;
-                       case 73:        goto yy563;
-                       case 74:        goto yy565;
-                       case 75:        goto yy574;
-                       case 76:        goto yy576;
-                       case 77:        goto yy578;
-                       case 78:        goto yy580;
-                       case 79:        goto yy585;
-                       case 80:        goto yy587;
-                       case 81:        goto yy595;
-                       case 82:        goto yy599;
-                       case 83:        goto yy603;
-                       case 84:        goto yy607;
-                       case 85:        goto yy609;
-                       default:        goto yy614;
+                       case 13:        goto yy272;
+                       case 14:        goto yy305;
+                       case 15:        goto yy307;
+                       case 16:        goto yy313;
+                       case 17:        goto yy321;
+                       case 18:        goto yy333;
+                       case 19:        goto yy341;
+                       case 20:        goto yy345;
+                       case 21:        goto yy352;
+                       case 22:        goto yy354;
+                       case 23:        goto yy358;
+                       case 24:        goto yy365;
+                       case 25:        goto yy367;
+                       case 26:        goto yy378;
+                       case 27:        goto yy381;
+                       case 28:        goto yy388;
+                       case 29:        goto yy391;
+                       case 30:        goto yy393;
+                       case 31:        goto yy395;
+                       case 32:        goto yy399;
+                       case 33:        goto yy404;
+                       case 34:        goto yy422;
+                       case 35:        goto yy430;
+                       case 36:        goto yy433;
+                       case 37:        goto yy440;
+                       case 38:        goto yy450;
+                       case 39:        goto yy454;
+                       case 40:        goto yy459;
+                       case 41:        goto yy461;
+                       case 42:        goto yy465;
+                       case 43:        goto yy468;
+                       case 44:        goto yy470;
+                       case 45:        goto yy472;
+                       case 46:        goto yy477;
+                       case 47:        goto yy479;
+                       case 48:        goto yy481;
+                       case 49:        goto yy483;
+                       case 50:        goto yy485;
+                       case 51:        goto yy490;
+                       case 52:        goto yy500;
+                       case 53:        goto yy505;
+                       case 54:        goto yy507;
+                       case 55:        goto yy509;
+                       case 56:        goto yy511;
+                       case 57:        goto yy513;
+                       case 58:        goto yy522;
+                       case 59:        goto yy526;
+                       case 60:        goto yy530;
+                       case 61:        goto yy532;
+                       case 62:        goto yy537;
+                       case 63:        goto yy542;
+                       case 64:        goto yy544;
+                       case 65:        goto yy550;
+                       case 66:        goto yy552;
+                       case 67:        goto yy554;
+                       case 68:        goto yy558;
+                       case 69:        goto yy563;
+                       case 70:        goto yy567;
+                       case 71:        goto yy569;
+                       case 72:        goto yy571;
+                       case 73:        goto yy573;
+                       case 74:        goto yy578;
+                       case 75:        goto yy580;
+                       case 76:        goto yy586;
+                       case 77:        goto yy591;
+                       case 78:        goto yy593;
+                       case 79:        goto yy595;
+                       case 80:        goto yy597;
+                       case 81:        goto yy599;
+                       case 82:        goto yy604;
+                       case 83:        goto yy606;
+                       case 84:        goto yy614;
+                       case 85:        goto yy618;
+                       case 86:        goto yy622;
+                       case 87:        goto yy626;
+                       case 88:        goto yy628;
+                       default:        goto yy633;
                        }
 yy115:
                        yych = *++cur;
@@ -1527,7 +1514,6 @@ yy116:
                        mrk = ++cur;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
-                       ctxmrk = cur;
                        switch (yych) {
                        case '0':
                        case '1':
@@ -1550,23 +1536,22 @@ yy116:
 yy118:
 #line 314 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT; goto start; }
-#line 1554 "src/parser.c"
+#line 1540 "src/parser.c"
 yy119:
                        ++cur;
 #line 328 "src/parser.re"
                        { goto comment; }
-#line 1559 "src/parser.c"
+#line 1545 "src/parser.c"
 yy121:
                        ++cur;
 #line 329 "src/parser.re"
                        { goto comment_sl; }
-#line 1564 "src/parser.c"
+#line 1550 "src/parser.c"
 yy123:
                        yyaccept = 6;
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
-                       ctxmrk = cur;
                        switch (yych) {
                        case '0':
                        case '1':
@@ -1592,7 +1577,7 @@ yy125:
                        ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
-                       ctxmrk = cur;
+yy126:
                        switch (yych) {
                        case '0':
                        case '1':
@@ -1636,22 +1621,22 @@ yy128:
                        default:        goto yy129;
                        }
 yy129:
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 310 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 1643 "src/parser.c"
+#line 1628 "src/parser.c"
 yy130:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case 'L':
                        case 'l':       goto yy218;
                        default:        goto yy131;
                        }
 yy131:
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 309 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_U; cur += 1; goto start; }
-#line 1655 "src/parser.c"
+#line 1640 "src/parser.c"
 yy132:
                        yych = *++cur;
                        switch (yych) {
@@ -1757,27 +1742,27 @@ yy135:
                        ++cur;
 #line 358 "src/parser.re"
                        { NEWTOKEN(PSI_T_LSHIFT); goto start; }
-#line 1761 "src/parser.c"
+#line 1746 "src/parser.c"
 yy137:
                        ++cur;
 #line 360 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_LE); goto start; }
-#line 1766 "src/parser.c"
+#line 1751 "src/parser.c"
 yy139:
                        ++cur;
 #line 343 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_EQ); goto start; }
-#line 1771 "src/parser.c"
+#line 1756 "src/parser.c"
 yy141:
                        ++cur;
 #line 361 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_GE); goto start; }
-#line 1776 "src/parser.c"
+#line 1761 "src/parser.c"
 yy143:
                        ++cur;
 #line 359 "src/parser.re"
                        { NEWTOKEN(PSI_T_RSHIFT); goto start; }
-#line 1781 "src/parser.c"
+#line 1766 "src/parser.c"
 yy145:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2034,9 +2019,9 @@ yy158:
                        default:        goto yy61;
                        }
 yy159:
-#line 396 "src/parser.re"
+#line 399 "src/parser.re"
                        { NEWTOKEN(PSI_T_IF); goto start; }
-#line 2040 "src/parser.c"
+#line 2025 "src/parser.c"
 yy160:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2049,10 +2034,10 @@ yy160:
                        }
 yy161:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 326 "src/parser.re"
                        { char_width = SIZEOF_WCHAR_T/8; }
-#line 2056 "src/parser.c"
+#line 2041 "src/parser.c"
 yy163:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2168,10 +2153,10 @@ yy176:
                        }
 yy177:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 325 "src/parser.re"
                        { char_width = 4; }
-#line 2175 "src/parser.c"
+#line 2160 "src/parser.c"
 yy179:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2270,16 +2255,17 @@ yy182:
                        default:        goto yy182;
                        }
 yy184:
-#line 446 "src/parser.re"
+#line 449 "src/parser.re"
                        { NEWTOKEN(PSI_T_NSNAME); goto start; }
-#line 2276 "src/parser.c"
+#line 2261 "src/parser.c"
 yy185:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'a':       goto yy261;
                        case 'e':       goto yy262;
-                       case 'r':       goto yy263;
+                       case 'i':       goto yy263;
+                       case 'r':       goto yy264;
                        default:        goto yy62;
                        }
 yy186:
@@ -2287,14 +2273,14 @@ yy186:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':       goto yy224;
-                       case 'o':       goto yy264;
+                       case 'o':       goto yy265;
                        default:        goto yy62;
                        }
 yy187:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy265;
+                       case 'a':       goto yy266;
                        default:        goto yy62;
                        }
 yy188:
@@ -2303,14 +2289,14 @@ yy188:
                        switch (yych) {
                        case 'U':
                        case 'u':       goto yy226;
-                       case 'n':       goto yy266;
+                       case 'n':       goto yy267;
                        default:        goto yy62;
                        }
 yy189:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'u':       goto yy267;
+                       case 'u':       goto yy268;
                        default:        goto yy62;
                        }
 yy190:
@@ -2319,7 +2305,7 @@ yy190:
                        switch (yych) {
                        case 'D':
                        case 'd':       goto yy230;
-                       case 'u':       goto yy268;
+                       case 'u':       goto yy269;
                        default:        goto yy62;
                        }
 yy191:
@@ -2327,7 +2313,7 @@ yy191:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':       goto yy233;
-                       case 'o':       goto yy269;
+                       case 'o':       goto yy270;
                        default:        goto yy62;
                        }
 yy192:
@@ -2337,7 +2323,7 @@ yy192:
                        case 'C':
                        case 'c':       goto yy238;
                        case 'T':       goto yy239;
-                       case 't':       goto yy270;
+                       case 't':       goto yy271;
                        default:        goto yy62;
                        }
 yy193:
@@ -2346,14 +2332,14 @@ yy193:
                        switch (yych) {
                        case 'B':
                        case 'b':       goto yy242;
-                       case 'n':       goto yy272;
+                       case 'n':       goto yy273;
                        default:        goto yy62;
                        }
 yy194:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy273;
+                       case 'n':       goto yy274;
                        default:        goto yy62;
                        }
 yy195:
@@ -2362,21 +2348,22 @@ yy195:
                        switch (yych) {
                        case 'E':
                        case 'e':       goto yy249;
-                       case 'a':       goto yy274;
+                       case 'a':       goto yy275;
                        default:        goto yy62;
                        }
 yy196:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy275;
+                       case 'o':       goto yy276;
                        default:        goto yy62;
                        }
 yy197:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy276;
+                       case 'g':       goto yy277;
+                       case 'z':       goto yy278;
                        default:        goto yy62;
                        }
 yy198:
@@ -2386,35 +2373,34 @@ yy198:
                        case 'A':
                        case 'a':       goto yy253;
                        case 'R':       goto yy254;
-                       case 'r':       goto yy277;
+                       case 'r':       goto yy279;
                        default:        goto yy62;
                        }
 yy199:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'p':       goto yy278;
+                       case 'p':       goto yy280;
                        default:        goto yy62;
                        }
 yy200:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 324 "src/parser.re"
                        { char_width = 2; }
-#line 2405 "src/parser.c"
+#line 2392 "src/parser.c"
 yy202:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
-                       case '"':       goto yy279;
+                       case '"':       goto yy281;
                        default:        goto yy62;
                        }
 yy203:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy281;
+                       case 'n':       goto yy283;
                        default:        goto yy62;
                        }
 yy204:
@@ -2423,69 +2409,70 @@ yy204:
                        switch (yych) {
                        case 'D':
                        case 'd':       goto yy258;
-                       case 'i':       goto yy282;
-                       case 's':       goto yy283;
+                       case 'i':       goto yy284;
+                       case 's':       goto yy285;
                        default:        goto yy62;
                        }
 yy205:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy284;
+                       case 'i':       goto yy286;
+                       case 'l':       goto yy287;
                        default:        goto yy62;
                        }
 yy206:
                        ++cur;
 #line 345 "src/parser.re"
                        { NEWTOKEN(PSI_T_OR); goto start; }
-#line 2442 "src/parser.c"
+#line 2429 "src/parser.c"
 yy208:
                        ++cur;
 #line 365 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELLIPSIS); goto start; }
-#line 2447 "src/parser.c"
+#line 2434 "src/parser.c"
 yy210:
                        yych = *++cur;
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy285;
+                       case 'd':       goto yy288;
                        case 'F':
-                       case 'f':       goto yy287;
+                       case 'f':       goto yy290;
                        case 'L':
-                       case 'l':       goto yy289;
+                       case 'l':       goto yy292;
                        default:        goto yy114;
                        }
 yy211:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 315 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_F; cur += 1; goto start; }
-#line 2464 "src/parser.c"
+#line 2451 "src/parser.c"
 yy213:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 316 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 2470 "src/parser.c"
+#line 2457 "src/parser.c"
 yy215:
                        yych = *++cur;
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy291;
+                       case 'u':       goto yy294;
                        default:        goto yy114;
                        }
 yy216:
                        ++cur;
 yy217:
-                       cur = ctxmrk;
+                       cur -= 2;
 #line 311 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_UL; cur += 2; goto start; }
-#line 2484 "src/parser.c"
+#line 2471 "src/parser.c"
 yy218:
                        yych = *++cur;
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy291;
+                       case 'l':       goto yy294;
                        default:        goto yy217;
                        }
 yy219:
@@ -2493,9 +2480,8 @@ yy219:
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
-                       ctxmrk = cur;
                        switch (yych) {
-                       case '.':       goto yy293;
+                       case '.':       goto yy296;
                        case '0':
                        case '1':
                        case '2':
@@ -2528,17 +2514,17 @@ yy219:
                        }
 yy221:
                        ++cur;
-#line 448 "src/parser.re"
+#line 451 "src/parser.re"
                        { tok += 1; cur -= 1; NEWTOKEN(PSI_T_CPP_HEADER); cur += 1; goto start; }
-#line 2534 "src/parser.c"
+#line 2520 "src/parser.c"
 yy223:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy295;
+                       case 'a':       goto yy298;
                        case 'V':
-                       case 'v':       goto yy296;
+                       case 'v':       goto yy299;
                        default:        goto yy62;
                        }
 yy224:
@@ -2546,7 +2532,7 @@ yy224:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy297;
+                       case 'l':       goto yy300;
                        default:        goto yy62;
                        }
 yy225:
@@ -2554,7 +2540,7 @@ yy225:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy298;
+                       case 'l':       goto yy301;
                        default:        goto yy62;
                        }
 yy226:
@@ -2562,7 +2548,7 @@ yy226:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy299;
+                       case 'n':       goto yy302;
                        default:        goto yy62;
                        }
 yy227:
@@ -2570,7 +2556,7 @@ yy227:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy300;
+                       case 'i':       goto yy303;
                        default:        goto yy62;
                        }
 yy228:
@@ -2578,7 +2564,7 @@ yy228:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy301;
+                       case 'f':       goto yy304;
                        default:        goto yy62;
                        }
 yy229:
@@ -2586,7 +2572,7 @@ yy229:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy303;
+                       case 'e':       goto yy306;
                        default:        goto yy62;
                        }
 yy230:
@@ -2594,7 +2580,7 @@ yy230:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy305;
+                       case 'i':       goto yy308;
                        default:        goto yy62;
                        }
 yy231:
@@ -2602,7 +2588,7 @@ yy231:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy306;
+                       case 'o':       goto yy309;
                        default:        goto yy62;
                        }
 yy232:
@@ -2610,7 +2596,7 @@ yy232:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy307;
+                       case 's':       goto yy310;
                        default:        goto yy62;
                        }
 yy233:
@@ -2618,7 +2604,7 @@ yy233:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy308;
+                       case 'a':       goto yy311;
                        default:        goto yy62;
                        }
 yy234:
@@ -2626,7 +2612,7 @@ yy234:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy309;
+                       case 'e':       goto yy312;
                        default:        goto yy62;
                        }
 yy235:
@@ -2634,7 +2620,7 @@ yy235:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy311;
+                       case 'c':       goto yy314;
                        default:        goto yy62;
                        }
 yy236:
@@ -2642,7 +2628,7 @@ yy236:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy312;
+                       case 'e':       goto yy315;
                        default:        goto yy62;
                        }
 yy237:
@@ -2650,7 +2636,7 @@ yy237:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy313;
+                       case 'd':       goto yy316;
                        default:        goto yy62;
                        }
 yy238:
@@ -2658,7 +2644,7 @@ yy238:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy314;
+                       case 'l':       goto yy317;
                        default:        goto yy62;
                        }
 yy239:
@@ -2666,7 +2652,7 @@ yy239:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy315;
+                       case 'v':       goto yy318;
                        default:        goto yy62;
                        }
 yy240:
@@ -2741,9 +2727,9 @@ yy240:
                        default:        goto yy61;
                        }
 yy241:
-#line 421 "src/parser.re"
+#line 424 "src/parser.re"
                        { NEWTOKEN(PSI_T_LET); goto start; }
-#line 2747 "src/parser.c"
+#line 2733 "src/parser.c"
 yy242:
                        yyaccept = 11;
                        yych = *(mrk = ++cur);
@@ -2816,15 +2802,15 @@ yy242:
                        default:        goto yy61;
                        }
 yy243:
-#line 420 "src/parser.re"
+#line 423 "src/parser.re"
                        { NEWTOKEN(PSI_T_LIB); goto start; }
-#line 2822 "src/parser.c"
+#line 2808 "src/parser.c"
 yy244:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy316;
+                       case 'e':       goto yy319;
                        default:        goto yy62;
                        }
 yy245:
@@ -2832,7 +2818,7 @@ yy245:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy317;
+                       case 'l':       goto yy320;
                        default:        goto yy62;
                        }
 yy246:
@@ -2840,9 +2826,9 @@ yy246:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy319;
+                       case 'e':       goto yy322;
                        case 'V':
-                       case 'v':       goto yy320;
+                       case 'v':       goto yy323;
                        default:        goto yy62;
                        }
 yy247:
@@ -2850,7 +2836,7 @@ yy247:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'H':
-                       case 'h':       goto yy321;
+                       case 'h':       goto yy324;
                        default:        goto yy62;
                        }
 yy248:
@@ -2858,14 +2844,14 @@ yy248:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy322;
+                       case 't':       goto yy325;
                        default:        goto yy62;
                        }
 yy249:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy323;
+                       case '_':       goto yy326;
                        default:        goto yy62;
                        }
 yy250:
@@ -2873,7 +2859,7 @@ yy250:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy324;
+                       case 'u':       goto yy327;
                        default:        goto yy62;
                        }
 yy251:
@@ -2948,15 +2934,15 @@ yy251:
                        default:        goto yy61;
                        }
 yy252:
-#line 422 "src/parser.re"
+#line 425 "src/parser.re"
                        { NEWTOKEN(PSI_T_SET); goto start; }
-#line 2954 "src/parser.c"
+#line 2940 "src/parser.c"
 yy253:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy325;
+                       case 't':       goto yy328;
                        default:        goto yy62;
                        }
 yy254:
@@ -2964,11 +2950,11 @@ yy254:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy326;
+                       case 'i':       goto yy329;
                        case 'L':
-                       case 'l':       goto yy327;
+                       case 'l':       goto yy330;
                        case 'V':
-                       case 'v':       goto yy328;
+                       case 'v':       goto yy331;
                        default:        goto yy62;
                        }
 yy255:
@@ -2976,7 +2962,7 @@ yy255:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'P':
-                       case 'p':       goto yy329;
+                       case 'p':       goto yy332;
                        default:        goto yy62;
                        }
 yy256:
@@ -2984,17 +2970,17 @@ yy256:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy331;
+                       case 'a':       goto yy334;
                        case 'B':
-                       case 'b':       goto yy332;
+                       case 'b':       goto yy335;
                        case 'F':
-                       case 'f':       goto yy333;
+                       case 'f':       goto yy336;
                        case 'I':
-                       case 'i':       goto yy334;
+                       case 'i':       goto yy337;
                        case 'O':
-                       case 'o':       goto yy335;
+                       case 'o':       goto yy338;
                        case 'S':
-                       case 's':       goto yy336;
+                       case 's':       goto yy339;
                        default:        goto yy62;
                        }
 yy257:
@@ -3002,7 +2988,7 @@ yy257:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy337;
+                       case 'e':       goto yy340;
                        default:        goto yy62;
                        }
 yy258:
@@ -3010,7 +2996,7 @@ yy258:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy339;
+                       case 'e':       goto yy342;
                        default:        goto yy62;
                        }
 yy259:
@@ -3018,7 +3004,7 @@ yy259:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy340;
+                       case 'n':       goto yy343;
                        default:        goto yy62;
                        }
 yy260:
@@ -3026,76 +3012,83 @@ yy260:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy341;
+                       case 'l':       goto yy344;
                        default:        goto yy62;
                        }
 yy261:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy343;
-                       case 't':       goto yy344;
+                       case 's':       goto yy346;
+                       case 't':       goto yy347;
                        default:        goto yy62;
                        }
 yy262:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'x':       goto yy345;
+                       case 'x':       goto yy348;
                        default:        goto yy62;
                        }
 yy263:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy346;
+                       case 'n':       goto yy349;
                        default:        goto yy62;
                        }
 yy264:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':       goto yy297;
-                       case 'l':       goto yy347;
+                       case 'e':       goto yy350;
                        default:        goto yy62;
                        }
 yy265:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy349;
+                       case 'L':       goto yy300;
+                       case 'l':       goto yy351;
                        default:        goto yy62;
                        }
 yy266:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy351;
+                       case 'r':       goto yy353;
                        default:        goto yy62;
                        }
 yy267:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'b':       goto yy352;
+                       case 's':       goto yy355;
                        default:        goto yy62;
                        }
 yy268:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy353;
+                       case 'b':       goto yy356;
                        default:        goto yy62;
                        }
 yy269:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':       goto yy308;
-                       case 'a':       goto yy355;
+                       case 'm':       goto yy357;
                        default:        goto yy62;
                        }
 yy270:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':       goto yy311;
+                       case 'a':       goto yy359;
+                       default:        goto yy62;
+                       }
+yy271:
                        yyaccept = 13;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3162,134 +3155,148 @@ yy270:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy271;
-                       case '1':       goto yy356;
-                       case '3':       goto yy357;
-                       case '6':       goto yy358;
-                       case '8':       goto yy359;
+                       case 0x7F:      goto yy272;
+                       case '1':       goto yy360;
+                       case '3':       goto yy361;
+                       case '6':       goto yy362;
+                       case '8':       goto yy363;
                        case 'V':
-                       case 'v':       goto yy315;
+                       case 'v':       goto yy318;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy271:
-#line 382 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT); goto start; }
-#line 3179 "src/parser.c"
 yy272:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'e':       goto yy360;
-                       default:        goto yy62;
-                       }
+#line 385 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT); goto start; }
+#line 3172 "src/parser.c"
 yy273:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy362;
+                       case 'e':       goto yy364;
                        default:        goto yy62;
                        }
 yy274:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy364;
+                       case 'g':       goto yy366;
                        default:        goto yy62;
                        }
 yy275:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy365;
+                       case 'g':       goto yy368;
                        default:        goto yy62;
                        }
 yy276:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy366;
+                       case 'r':       goto yy369;
                        default:        goto yy62;
                        }
 yy277:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy370;
+                       default:        goto yy62;
+                       }
+yy278:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy371;
+                       default:        goto yy62;
+                       }
+yy279:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy326;
+                       case 'i':       goto yy329;
                        case 'L':
-                       case 'l':       goto yy327;
+                       case 'l':       goto yy330;
                        case 'V':
-                       case 'v':       goto yy328;
-                       case 'u':       goto yy367;
+                       case 'v':       goto yy331;
+                       case 'u':       goto yy372;
                        default:        goto yy62;
                        }
-yy278:
+yy280:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy368;
+                       case 'e':       goto yy373;
                        default:        goto yy62;
                        }
-yy279:
+yy281:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 323 "src/parser.re"
                        { char_width = 1; }
 #line 3240 "src/parser.c"
-yy281:
+yy283:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy369;
+                       case 't':       goto yy374;
                        default:        goto yy62;
                        }
-yy282:
+yy284:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy370;
+                       case 'o':       goto yy375;
                        default:        goto yy62;
                        }
-yy283:
+yy285:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy371;
+                       case 'i':       goto yy376;
                        default:        goto yy62;
                        }
-yy284:
+yy286:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy372;
+                       case 'd':       goto yy377;
                        default:        goto yy62;
                        }
-yy285:
+yy287:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'a':       goto yy379;
+                       default:        goto yy62;
+                       }
+yy288:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 2;
 #line 318 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DD; cur += 2; goto start; }
-#line 3274 "src/parser.c"
-yy287:
+#line 3281 "src/parser.c"
+yy290:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 2;
 #line 317 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DF; cur += 2; goto start; }
-#line 3280 "src/parser.c"
-yy289:
+#line 3287 "src/parser.c"
+yy292:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 2;
 #line 319 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DL; cur += 2; goto start; }
-#line 3286 "src/parser.c"
-yy291:
+#line 3293 "src/parser.c"
+yy294:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 3;
 #line 312 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_ULL; cur += 3; goto start; }
-#line 3292 "src/parser.c"
-yy293:
+#line 3299 "src/parser.c"
+yy296:
                        ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -3315,64 +3322,64 @@ yy293:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy293;
+                       case 'f':       goto yy296;
                        case 'P':
                        case 'p':       goto yy127;
                        default:        goto yy114;
                        }
-yy295:
+yy298:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy374;
+                       case 'y':       goto yy380;
                        default:        goto yy62;
                        }
-yy296:
+yy299:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy376;
+                       case 'a':       goto yy382;
                        default:        goto yy62;
                        }
-yy297:
+yy300:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy377;
+                       case 'v':       goto yy383;
                        default:        goto yy62;
                        }
-yy298:
+yy301:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy378;
+                       case 'a':       goto yy384;
                        case 'B':
-                       case 'b':       goto yy379;
+                       case 'b':       goto yy385;
                        case 'O':
-                       case 'o':       goto yy380;
+                       case 'o':       goto yy386;
                        default:        goto yy62;
                        }
-yy299:
+yy302:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy381;
+                       case 't':       goto yy387;
                        default:        goto yy62;
                        }
-yy300:
+yy303:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy383;
+                       case 'n':       goto yy389;
                        default:        goto yy62;
                        }
-yy301:
+yy304:
                        yyaccept = 14;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3439,15 +3446,15 @@ yy301:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy302;
+                       case 0x7F:      goto yy305;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy302:
-#line 400 "src/parser.re"
+yy305:
+#line 403 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELIF); goto start; }
-#line 3450 "src/parser.c"
-yy303:
+#line 3457 "src/parser.c"
+yy306:
                        yyaccept = 15;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3514,47 +3521,47 @@ yy303:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy304;
+                       case 0x7F:      goto yy307;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy304:
-#line 399 "src/parser.re"
+yy307:
+#line 402 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELSE); goto start; }
-#line 3525 "src/parser.c"
-yy305:
+#line 3532 "src/parser.c"
+yy308:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy384;
+                       case 'f':       goto yy390;
                        default:        goto yy62;
                        }
-yy306:
+yy309:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy386;
+                       case 'r':       goto yy392;
                        default:        goto yy62;
                        }
-yy307:
+yy310:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy388;
+                       case 'e':       goto yy394;
                        default:        goto yy62;
                        }
-yy308:
+yy311:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy390;
+                       case 't':       goto yy396;
                        default:        goto yy62;
                        }
-yy309:
+yy312:
                        yyaccept = 16;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3621,63 +3628,63 @@ yy309:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy310;
+                       case 0x7F:      goto yy313;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy310:
-#line 426 "src/parser.re"
+yy313:
+#line 429 "src/parser.re"
                        { NEWTOKEN(PSI_T_FREE); goto start; }
-#line 3632 "src/parser.c"
-yy311:
+#line 3639 "src/parser.c"
+yy314:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy391;
+                       case 't':       goto yy397;
                        default:        goto yy62;
                        }
-yy312:
+yy315:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy392;
+                       case 'f':       goto yy398;
                        default:        goto yy62;
                        }
-yy313:
+yy316:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy394;
+                       case 'e':       goto yy400;
                        default:        goto yy62;
                        }
-yy314:
+yy317:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy395;
+                       case 'u':       goto yy401;
                        default:        goto yy62;
                        }
-yy315:
+yy318:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy396;
+                       case 'a':       goto yy402;
                        default:        goto yy62;
                        }
-yy316:
+yy319:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy397;
+                       case 'd':       goto yy403;
                        default:        goto yy62;
                        }
-yy317:
+yy320:
                        yyaccept = 17;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3744,94 +3751,94 @@ yy317:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy318;
+                       case 0x7F:      goto yy321;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy318:
-#line 411 "src/parser.re"
+yy321:
+#line 414 "src/parser.re"
                        { NEWTOKEN(PSI_T_NULL); goto start; }
-#line 3755 "src/parser.c"
-yy319:
+#line 3762 "src/parser.c"
+yy322:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy399;
+                       case 'c':       goto yy405;
                        default:        goto yy62;
                        }
-yy320:
+yy323:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy400;
+                       case 'a':       goto yy406;
                        default:        goto yy62;
                        }
-yy321:
+yy324:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy401;
+                       case 'v':       goto yy407;
                        default:        goto yy62;
                        }
-yy322:
+yy325:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy402;
+                       case '_':       goto yy408;
                        default:        goto yy62;
                        }
-yy323:
+yy326:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy403;
+                       case 'a':       goto yy409;
                        default:        goto yy62;
                        }
-yy324:
+yy327:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy404;
+                       case 'r':       goto yy410;
                        default:        goto yy62;
                        }
-yy325:
+yy328:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy405;
+                       case 'i':       goto yy411;
                        default:        goto yy62;
                        }
-yy326:
+yy329:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy406;
+                       case 'n':       goto yy412;
                        default:        goto yy62;
                        }
-yy327:
+yy330:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy407;
+                       case 'e':       goto yy413;
                        default:        goto yy62;
                        }
-yy328:
+yy331:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy408;
+                       case 'a':       goto yy414;
                        default:        goto yy62;
                        }
-yy329:
+yy332:
                        yyaccept = 18;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3898,63 +3905,63 @@ yy329:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy330;
+                       case 0x7F:      goto yy333;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy330:
-#line 427 "src/parser.re"
+yy333:
+#line 430 "src/parser.re"
                        { NEWTOKEN(PSI_T_TEMP); goto start; }
-#line 3909 "src/parser.c"
-yy331:
+#line 3916 "src/parser.c"
+yy334:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy409;
+                       case 'r':       goto yy415;
                        default:        goto yy62;
                        }
-yy332:
+yy335:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy410;
+                       case 'o':       goto yy416;
                        default:        goto yy62;
                        }
-yy333:
+yy336:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy411;
+                       case 'l':       goto yy417;
                        default:        goto yy62;
                        }
-yy334:
+yy337:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy412;
+                       case 'n':       goto yy418;
                        default:        goto yy62;
                        }
-yy335:
+yy338:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy413;
+                       case 'b':       goto yy419;
                        default:        goto yy62;
                        }
-yy336:
+yy339:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy414;
+                       case 't':       goto yy420;
                        default:        goto yy62;
                        }
-yy337:
+yy340:
                        yyaccept = 19;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4021,31 +4028,31 @@ yy337:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy338;
+                       case 0x7F:      goto yy341;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy338:
-#line 409 "src/parser.re"
+yy341:
+#line 412 "src/parser.re"
                        { NEWTOKEN(PSI_T_TRUE); goto start; }
-#line 4032 "src/parser.c"
-yy339:
+#line 4039 "src/parser.c"
+yy342:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy415;
+                       case 'f':       goto yy421;
                        default:        goto yy62;
                        }
-yy340:
+yy343:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy417;
+                       case 'i':       goto yy423;
                        default:        goto yy62;
                        }
-yy341:
+yy344:
                        yyaccept = 20;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4112,43 +4119,50 @@ yy341:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy342;
+                       case 0x7F:      goto yy345;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy342:
-#line 436 "src/parser.re"
+yy345:
+#line 439 "src/parser.re"
                        { NEWTOKEN(PSI_T_ZVAL); goto start; }
-#line 4123 "src/parser.c"
-yy343:
+#line 4130 "src/parser.c"
+yy346:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy418;
+                       case 'm':       goto yy424;
                        default:        goto yy62;
                        }
-yy344:
+yy347:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy419;
+                       case 't':       goto yy425;
                        default:        goto yy62;
                        }
-yy345:
+yy348:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy420;
+                       case 't':       goto yy426;
                        default:        goto yy62;
                        }
-yy346:
+yy349:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy421;
+                       case 'l':       goto yy427;
                        default:        goto yy62;
                        }
-yy347:
+yy350:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 's':       goto yy428;
+                       default:        goto yy62;
+                       }
+yy351:
                        yyaccept = 21;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4215,17 +4229,17 @@ yy347:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy348;
+                       case 0x7F:      goto yy352;
                        case 'V':
-                       case 'v':       goto yy377;
+                       case 'v':       goto yy383;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy348:
-#line 379 "src/parser.re"
+yy352:
+#line 382 "src/parser.re"
                        { NEWTOKEN(PSI_T_BOOL); goto start; }
-#line 4228 "src/parser.c"
-yy349:
+#line 4242 "src/parser.c"
+yy353:
                        yyaccept = 22;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4292,29 +4306,29 @@ yy349:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy350;
+                       case 0x7F:      goto yy354;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy350:
-#line 380 "src/parser.re"
+yy354:
+#line 383 "src/parser.re"
                        { NEWTOKEN(PSI_T_CHAR); goto start; }
-#line 4303 "src/parser.c"
-yy351:
+#line 4317 "src/parser.c"
+yy355:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy422;
+                       case 't':       goto yy429;
                        default:        goto yy62;
                        }
-yy352:
+yy356:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'l':       goto yy424;
+                       case 'l':       goto yy431;
                        default:        goto yy62;
                        }
-yy353:
+yy357:
                        yyaccept = 23;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4381,51 +4395,51 @@ yy353:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy354;
+                       case 0x7F:      goto yy358;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy354:
-#line 376 "src/parser.re"
+yy358:
+#line 379 "src/parser.re"
                        { NEWTOKEN(PSI_T_ENUM); goto start; }
-#line 4392 "src/parser.c"
-yy355:
+#line 4406 "src/parser.c"
+yy359:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':       goto yy390;
-                       case 't':       goto yy425;
+                       case 'T':       goto yy396;
+                       case 't':       goto yy432;
                        default:        goto yy62;
                        }
-yy356:
+yy360:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '6':       goto yy427;
+                       case '6':       goto yy434;
                        default:        goto yy62;
                        }
-yy357:
+yy361:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '2':       goto yy428;
+                       case '2':       goto yy435;
                        default:        goto yy62;
                        }
-yy358:
+yy362:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '4':       goto yy429;
+                       case '4':       goto yy436;
                        default:        goto yy62;
                        }
-yy359:
+yy363:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy430;
+                       case '_':       goto yy437;
                        default:        goto yy62;
                        }
-yy360:
+yy364:
                        yyaccept = 24;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4492,15 +4506,15 @@ yy360:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy361;
+                       case 0x7F:      goto yy365;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy361:
-#line 372 "src/parser.re"
+yy365:
+#line 375 "src/parser.re"
                        { NEWTOKEN(PSI_T_LINE); goto start; }
-#line 4503 "src/parser.c"
-yy362:
+#line 4517 "src/parser.c"
+yy366:
                        yyaccept = 25;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4567,74 +4581,81 @@ yy362:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy363;
+                       case 0x7F:      goto yy367;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy363:
-#line 383 "src/parser.re"
+yy367:
+#line 386 "src/parser.re"
                        { NEWTOKEN(PSI_T_LONG); goto start; }
-#line 4578 "src/parser.c"
-yy364:
+#line 4592 "src/parser.c"
+yy368:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy431;
+                       case 'm':       goto yy438;
                        default:        goto yy62;
                        }
-yy365:
+yy369:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy432;
+                       case 't':       goto yy439;
                        default:        goto yy62;
                        }
-yy366:
+yy370:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy434;
+                       case 'e':       goto yy441;
                        default:        goto yy62;
                        }
-yy367:
+yy371:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'c':       goto yy435;
+                       case 'o':       goto yy442;
                        default:        goto yy62;
                        }
-yy368:
+yy372:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy436;
+                       case 'c':       goto yy443;
                        default:        goto yy62;
                        }
-yy369:
+yy373:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '1':       goto yy437;
-                       case '3':       goto yy438;
-                       case '6':       goto yy439;
-                       case '8':       goto yy440;
+                       case 'd':       goto yy444;
                        default:        goto yy62;
                        }
-yy370:
+yy374:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy441;
+                       case '1':       goto yy445;
+                       case '3':       goto yy446;
+                       case '6':       goto yy447;
+                       case '8':       goto yy448;
                        default:        goto yy62;
                        }
-yy371:
+yy375:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy443;
+                       case 'n':       goto yy449;
                        default:        goto yy62;
                        }
-yy372:
+yy376:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'g':       goto yy451;
+                       default:        goto yy62;
+                       }
+yy377:
                        yyaccept = 26;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4701,15 +4722,22 @@ yy372:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy373;
+                       case 0x7F:      goto yy378;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy373:
-#line 378 "src/parser.re"
+yy378:
+#line 381 "src/parser.re"
                        { NEWTOKEN(PSI_T_VOID); goto start; }
-#line 4712 "src/parser.c"
-yy374:
+#line 4733 "src/parser.c"
+yy379:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy452;
+                       default:        goto yy62;
+                       }
+yy380:
                        yyaccept = 27;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4776,55 +4804,55 @@ yy374:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy375;
+                       case 0x7F:      goto yy381;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy375:
-#line 415 "src/parser.re"
+yy381:
+#line 418 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRAY); goto start; }
-#line 4787 "src/parser.c"
-yy376:
+#line 4815 "src/parser.c"
+yy382:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy444;
+                       case 'l':       goto yy453;
                        default:        goto yy62;
                        }
-yy377:
+yy383:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy446;
+                       case 'a':       goto yy455;
                        default:        goto yy62;
                        }
-yy378:
+yy384:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy447;
+                       case 'b':       goto yy456;
                        default:        goto yy62;
                        }
-yy379:
+yy385:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy448;
+                       case 'a':       goto yy457;
                        default:        goto yy62;
                        }
-yy380:
+yy386:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy449;
+                       case 'c':       goto yy458;
                        default:        goto yy62;
                        }
-yy381:
+yy387:
                        yyaccept = 28;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4891,23 +4919,23 @@ yy381:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy382;
+                       case 0x7F:      goto yy388;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy382:
-#line 437 "src/parser.re"
+yy388:
+#line 440 "src/parser.re"
                        { NEWTOKEN(PSI_T_COUNT); goto start; }
-#line 4902 "src/parser.c"
-yy383:
+#line 4930 "src/parser.c"
+yy389:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy451;
+                       case 'e':       goto yy460;
                        default:        goto yy62;
                        }
-yy384:
+yy390:
                        yyaccept = 29;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4974,15 +5002,15 @@ yy384:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy385;
+                       case 0x7F:      goto yy391;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy385:
-#line 401 "src/parser.re"
+yy391:
+#line 404 "src/parser.re"
                        { NEWTOKEN(PSI_T_ENDIF); goto start; }
-#line 4985 "src/parser.c"
-yy386:
+#line 5013 "src/parser.c"
+yy392:
                        yyaccept = 30;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5049,15 +5077,15 @@ yy386:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy387;
+                       case 0x7F:      goto yy393;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy387:
-#line 406 "src/parser.re"
+yy393:
+#line 409 "src/parser.re"
                        { NEWTOKEN(PSI_T_ERROR); goto start; }
-#line 5060 "src/parser.c"
-yy388:
+#line 5088 "src/parser.c"
+yy394:
                        yyaccept = 31;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5124,31 +5152,31 @@ yy388:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy389;
+                       case 0x7F:      goto yy395;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy389:
-#line 410 "src/parser.re"
+yy395:
+#line 413 "src/parser.re"
                        { NEWTOKEN(PSI_T_FALSE); goto start; }
-#line 5135 "src/parser.c"
-yy390:
+#line 5163 "src/parser.c"
+yy396:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy453;
+                       case 'v':       goto yy462;
                        default:        goto yy62;
                        }
-yy391:
+yy397:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy454;
+                       case 'i':       goto yy463;
                        default:        goto yy62;
                        }
-yy392:
+yy398:
                        yyaccept = 32;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5215,39 +5243,39 @@ yy392:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy393;
+                       case 0x7F:      goto yy399;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy393:
-#line 397 "src/parser.re"
+yy399:
+#line 400 "src/parser.re"
                        { NEWTOKEN(PSI_T_IFDEF); goto start; }
-#line 5226 "src/parser.c"
-yy394:
+#line 5254 "src/parser.c"
+yy400:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy455;
+                       case 'f':       goto yy464;
                        default:        goto yy62;
                        }
-yy395:
+yy401:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy457;
+                       case 'd':       goto yy466;
                        default:        goto yy62;
                        }
-yy396:
+yy402:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy458;
+                       case 'l':       goto yy467;
                        default:        goto yy62;
                        }
-yy397:
+yy403:
                        yyaccept = 33;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5314,143 +5342,143 @@ yy397:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy398;
+                       case 0x7F:      goto yy404;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy398:
-#line 412 "src/parser.re"
+yy404:
+#line 415 "src/parser.re"
                        { NEWTOKEN(PSI_T_MIXED); goto start; }
-#line 5325 "src/parser.c"
-yy399:
+#line 5353 "src/parser.c"
+yy405:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy460;
+                       case 't':       goto yy469;
                        default:        goto yy62;
                        }
-yy400:
+yy406:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy462;
+                       case 'l':       goto yy471;
                        default:        goto yy62;
                        }
-yy401:
+yy407:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy464;
+                       case 'a':       goto yy473;
                        default:        goto yy62;
                        }
-yy402:
+yy408:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy465;
+                       case 'a':       goto yy474;
                        default:        goto yy62;
                        }
-yy403:
+yy409:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy466;
+                       case 's':       goto yy475;
                        default:        goto yy62;
                        }
-yy404:
+yy410:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy467;
+                       case 'n':       goto yy476;
                        default:        goto yy62;
                        }
-yy405:
+yy411:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy469;
+                       case 'c':       goto yy478;
                        default:        goto yy62;
                        }
-yy406:
+yy412:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy471;
+                       case 'g':       goto yy480;
                        default:        goto yy62;
                        }
-yy407:
+yy413:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy473;
+                       case 'n':       goto yy482;
                        default:        goto yy62;
                        }
-yy408:
+yy414:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy475;
+                       case 'l':       goto yy484;
                        default:        goto yy62;
                        }
-yy409:
+yy415:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy477;
+                       case 'r':       goto yy486;
                        default:        goto yy62;
                        }
-yy410:
+yy416:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy478;
+                       case 'o':       goto yy487;
                        default:        goto yy62;
                        }
-yy411:
+yy417:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy479;
+                       case 'o':       goto yy488;
                        default:        goto yy62;
                        }
-yy412:
+yy418:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy480;
+                       case 't':       goto yy489;
                        default:        goto yy62;
                        }
-yy413:
+yy419:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy482;
+                       case 'j':       goto yy491;
                        default:        goto yy62;
                        }
-yy414:
+yy420:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy483;
+                       case 'r':       goto yy492;
                        default:        goto yy62;
                        }
-yy415:
+yy421:
                        yyaccept = 34;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5517,51 +5545,58 @@ yy415:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy416;
+                       case 0x7F:      goto yy422;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy416:
-#line 404 "src/parser.re"
+yy422:
+#line 407 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNDEF); goto start; }
-#line 5528 "src/parser.c"
-yy417:
+#line 5556 "src/parser.c"
+yy423:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy484;
+                       case 'n':       goto yy493;
                        default:        goto yy62;
                        }
-yy418:
+yy424:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy485;
+                       case '_':       goto yy494;
                        default:        goto yy62;
                        }
-yy419:
+yy425:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy486;
+                       case 'r':       goto yy495;
                        default:        goto yy62;
                        }
-yy420:
+yy426:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy487;
+                       case 'e':       goto yy496;
                        default:        goto yy62;
                        }
-yy421:
+yy427:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy488;
+                       case 'i':       goto yy497;
                        default:        goto yy62;
                        }
-yy422:
+yy428:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy498;
+                       default:        goto yy62;
+                       }
+yy429:
                        yyaccept = 35;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5628,22 +5663,22 @@ yy422:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy423;
+                       case 0x7F:      goto yy430;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy423:
-#line 377 "src/parser.re"
+yy430:
+#line 380 "src/parser.re"
                        { NEWTOKEN(PSI_T_CONST); goto start; }
-#line 5639 "src/parser.c"
-yy424:
+#line 5674 "src/parser.c"
+yy431:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy489;
+                       case 'e':       goto yy499;
                        default:        goto yy62;
                        }
-yy425:
+yy432:
                        yyaccept = 36;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5710,52 +5745,52 @@ yy425:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy426;
+                       case 0x7F:      goto yy433;
                        case 'V':
-                       case 'v':       goto yy453;
+                       case 'v':       goto yy462;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy426:
-#line 384 "src/parser.re"
+yy433:
+#line 387 "src/parser.re"
                        { NEWTOKEN(PSI_T_FLOAT); goto start; }
-#line 5723 "src/parser.c"
-yy427:
+#line 5758 "src/parser.c"
+yy434:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy491;
+                       case '_':       goto yy501;
                        default:        goto yy62;
                        }
-yy428:
+yy435:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy492;
+                       case '_':       goto yy502;
                        default:        goto yy62;
                        }
-yy429:
+yy436:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy493;
+                       case '_':       goto yy503;
                        default:        goto yy62;
                        }
-yy430:
+yy437:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy494;
+                       case 't':       goto yy504;
                        default:        goto yy62;
                        }
-yy431:
+yy438:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy496;
+                       case 'a':       goto yy506;
                        default:        goto yy62;
                        }
-yy432:
+yy439:
                        yyaccept = 37;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5822,64 +5857,71 @@ yy432:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy433;
+                       case 0x7F:      goto yy440;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy433:
-#line 381 "src/parser.re"
+yy440:
+#line 384 "src/parser.re"
                        { NEWTOKEN(PSI_T_SHORT); goto start; }
-#line 5833 "src/parser.c"
-yy434:
+#line 5868 "src/parser.c"
+yy441:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy498;
+                       case 'd':       goto yy508;
                        default:        goto yy62;
                        }
-yy435:
+yy442:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy500;
+                       case 'f':       goto yy510;
                        default:        goto yy62;
                        }
-yy436:
+yy443:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy502;
+                       case 't':       goto yy512;
                        default:        goto yy62;
                        }
-yy437:
+yy444:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '6':       goto yy503;
+                       case 'e':       goto yy514;
                        default:        goto yy62;
                        }
-yy438:
+yy445:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '2':       goto yy504;
+                       case '6':       goto yy515;
                        default:        goto yy62;
                        }
-yy439:
+yy446:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '4':       goto yy505;
+                       case '2':       goto yy516;
                        default:        goto yy62;
                        }
-yy440:
+yy447:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy506;
+                       case '4':       goto yy517;
                        default:        goto yy62;
                        }
-yy441:
+yy448:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy518;
+                       default:        goto yy62;
+                       }
+yy449:
                        yyaccept = 38;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5946,22 +5988,29 @@ yy441:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy442;
+                       case 0x7F:      goto yy450;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy442:
-#line 375 "src/parser.re"
+yy450:
+#line 378 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNION); goto start; }
-#line 5957 "src/parser.c"
-yy443:
+#line 5999 "src/parser.c"
+yy451:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy507;
+                       case 'n':       goto yy519;
                        default:        goto yy62;
                        }
-yy444:
+yy452:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy520;
+                       default:        goto yy62;
+                       }
+yy453:
                        yyaccept = 39;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6028,39 +6077,39 @@ yy444:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy445;
+                       case 0x7F:      goto yy454;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy445:
-#line 434 "src/parser.re"
+yy454:
+#line 437 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRVAL); goto start; }
-#line 6039 "src/parser.c"
-yy446:
+#line 6088 "src/parser.c"
+yy455:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy508;
+                       case 'l':       goto yy521;
                        default:        goto yy62;
                        }
-yy447:
+yy456:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy510;
+                       case 'l':       goto yy523;
                        default:        goto yy62;
                        }
-yy448:
+yy457:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy511;
+                       case 'c':       goto yy524;
                        default:        goto yy62;
                        }
-yy449:
+yy458:
                        yyaccept = 40;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6127,15 +6176,15 @@ yy449:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy450;
+                       case 0x7F:      goto yy459;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy450:
-#line 438 "src/parser.re"
+yy459:
+#line 441 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLOC); goto start; }
-#line 6138 "src/parser.c"
-yy451:
+#line 6187 "src/parser.c"
+yy460:
                        yyaccept = 41;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6202,33 +6251,33 @@ yy451:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy452;
+                       case 0x7F:      goto yy461;
                        case 'D':
-                       case 'd':       goto yy512;
+                       case 'd':       goto yy525;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy452:
-#line 402 "src/parser.re"
+yy461:
+#line 405 "src/parser.re"
                        { NEWTOKEN(PSI_T_DEFINE); goto start; }
-#line 6215 "src/parser.c"
-yy453:
+#line 6264 "src/parser.c"
+yy462:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy514;
+                       case 'a':       goto yy527;
                        default:        goto yy62;
                        }
-yy454:
+yy463:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy515;
+                       case 'o':       goto yy528;
                        default:        goto yy62;
                        }
-yy455:
+yy464:
                        yyaccept = 42;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6295,23 +6344,23 @@ yy455:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy456;
+                       case 0x7F:      goto yy465;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy456:
-#line 398 "src/parser.re"
+yy465:
+#line 401 "src/parser.re"
                        { NEWTOKEN(PSI_T_IFNDEF); goto start; }
-#line 6306 "src/parser.c"
-yy457:
+#line 6355 "src/parser.c"
+yy466:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy516;
+                       case 'e':       goto yy529;
                        default:        goto yy62;
                        }
-yy458:
+yy467:
                        yyaccept = 43;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6378,15 +6427,15 @@ yy458:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy459;
+                       case 0x7F:      goto yy468;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy459:
-#line 431 "src/parser.re"
+yy468:
+#line 434 "src/parser.re"
                        { NEWTOKEN(PSI_T_INTVAL); goto start; }
-#line 6389 "src/parser.c"
-yy460:
+#line 6438 "src/parser.c"
+yy469:
                        yyaccept = 44;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6453,15 +6502,15 @@ yy460:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy461;
+                       case 0x7F:      goto yy470;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy461:
-#line 416 "src/parser.re"
+yy470:
+#line 419 "src/parser.re"
                        { NEWTOKEN(PSI_T_OBJECT); goto start; }
-#line 6464 "src/parser.c"
-yy462:
+#line 6513 "src/parser.c"
+yy471:
                        yyaccept = 45;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6528,39 +6577,39 @@ yy462:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy463;
+                       case 0x7F:      goto yy472;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy463:
-#line 435 "src/parser.re"
+yy472:
+#line 438 "src/parser.re"
                        { NEWTOKEN(PSI_T_OBJVAL); goto start; }
-#line 6539 "src/parser.c"
-yy464:
+#line 6588 "src/parser.c"
+yy473:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy518;
+                       case 'l':       goto yy531;
                        default:        goto yy62;
                        }
-yy465:
+yy474:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy520;
+                       case 's':       goto yy533;
                        default:        goto yy62;
                        }
-yy466:
+yy475:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy521;
+                       case 's':       goto yy534;
                        default:        goto yy62;
                        }
-yy467:
+yy476:
                        yyaccept = 46;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6627,15 +6676,15 @@ yy467:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy468;
+                       case 0x7F:      goto yy477;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy468:
-#line 425 "src/parser.re"
+yy477:
+#line 428 "src/parser.re"
                        { NEWTOKEN(PSI_T_RETURN); goto start; }
-#line 6638 "src/parser.c"
-yy469:
+#line 6687 "src/parser.c"
+yy478:
                        yyaccept = 47;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6702,15 +6751,15 @@ yy469:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy470;
+                       case 0x7F:      goto yy479;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy470:
-#line 418 "src/parser.re"
+yy479:
+#line 421 "src/parser.re"
                        { NEWTOKEN(PSI_T_STATIC); goto start; }
-#line 6713 "src/parser.c"
-yy471:
+#line 6762 "src/parser.c"
+yy480:
                        yyaccept = 48;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6777,15 +6826,15 @@ yy471:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy472;
+                       case 0x7F:      goto yy481;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy472:
-#line 414 "src/parser.re"
+yy481:
+#line 417 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRING); goto start; }
-#line 6788 "src/parser.c"
-yy473:
+#line 6837 "src/parser.c"
+yy482:
                        yyaccept = 49;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6852,15 +6901,15 @@ yy473:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy474;
+                       case 0x7F:      goto yy483;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy474:
-#line 428 "src/parser.re"
+yy483:
+#line 431 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRLEN); goto start; }
-#line 6863 "src/parser.c"
-yy475:
+#line 6912 "src/parser.c"
+yy484:
                        yyaccept = 50;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6927,39 +6976,39 @@ yy475:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy476;
+                       case 0x7F:      goto yy485;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy476:
-#line 429 "src/parser.re"
+yy485:
+#line 432 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRVAL); goto start; }
-#line 6938 "src/parser.c"
-yy477:
+#line 6987 "src/parser.c"
+yy486:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy522;
+                       case 'a':       goto yy535;
                        default:        goto yy62;
                        }
-yy478:
+yy487:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy523;
+                       case 'l':       goto yy536;
                        default:        goto yy62;
                        }
-yy479:
+yy488:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy525;
+                       case 'a':       goto yy538;
                        default:        goto yy62;
                        }
-yy480:
+yy489:
                        yyaccept = 51;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7026,67 +7075,74 @@ yy480:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy481;
+                       case 0x7F:      goto yy490;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy481:
-#line 442 "src/parser.re"
+yy490:
+#line 445 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_INT); goto start; }
-#line 7037 "src/parser.c"
-yy482:
+#line 7086 "src/parser.c"
+yy491:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy526;
+                       case 'e':       goto yy539;
                        default:        goto yy62;
                        }
-yy483:
+yy492:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy527;
+                       case 'i':       goto yy540;
                        default:        goto yy62;
                        }
-yy484:
+yy493:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy528;
+                       case 'g':       goto yy541;
                        default:        goto yy62;
                        }
-yy485:
+yy494:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy530;
+                       case '_':       goto yy543;
                        default:        goto yy62;
                        }
-yy486:
+yy495:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy532;
+                       case 'i':       goto yy545;
                        default:        goto yy62;
                        }
-yy487:
+yy496:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy533;
+                       case 'n':       goto yy546;
                        default:        goto yy62;
                        }
-yy488:
+yy497:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy534;
+                       case 'n':       goto yy547;
                        default:        goto yy62;
                        }
-yy489:
+yy498:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'r':       goto yy548;
+                       default:        goto yy62;
+                       }
+yy499:
                        yyaccept = 52;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7153,36 +7209,36 @@ yy489:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy490;
+                       case 0x7F:      goto yy500;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy490:
-#line 385 "src/parser.re"
+yy500:
+#line 388 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOUBLE); goto start; }
-#line 7164 "src/parser.c"
-yy491:
+#line 7220 "src/parser.c"
+yy501:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy535;
+                       case 't':       goto yy549;
                        default:        goto yy62;
                        }
-yy492:
+yy502:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy537;
+                       case 't':       goto yy551;
                        default:        goto yy62;
                        }
-yy493:
+yy503:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy539;
+                       case 't':       goto yy553;
                        default:        goto yy62;
                        }
-yy494:
+yy504:
                        yyaccept = 53;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7249,15 +7305,15 @@ yy494:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy495;
+                       case 0x7F:      goto yy505;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy495:
-#line 386 "src/parser.re"
+yy505:
+#line 389 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT8); goto start; }
-#line 7260 "src/parser.c"
-yy496:
+#line 7316 "src/parser.c"
+yy506:
                        yyaccept = 54;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7324,15 +7380,15 @@ yy496:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy497;
+                       case 0x7F:      goto yy507;
                        case '\\':      goto yy146;
-                       default:        goto yy541;
+                       default:        goto yy555;
                        }
-yy497:
+yy507:
 #line 367 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRAGMA); goto start; }
-#line 7335 "src/parser.c"
-yy498:
+#line 7391 "src/parser.c"
+yy508:
                        yyaccept = 55;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7399,15 +7455,15 @@ yy498:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy499;
+                       case 0x7F:      goto yy509;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy499:
-#line 395 "src/parser.re"
+yy509:
+#line 398 "src/parser.re"
                        { NEWTOKEN(PSI_T_SIGNED); goto start; }
-#line 7410 "src/parser.c"
-yy500:
+#line 7466 "src/parser.c"
+yy510:
                        yyaccept = 56;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7474,57 +7530,15 @@ yy500:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy501;
+                       case 0x7F:      goto yy511;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy501:
+yy511:
 #line 374 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STRUCT); goto start; }
-#line 7485 "src/parser.c"
-yy502:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'f':       goto yy543;
-                       default:        goto yy62;
-                       }
-yy503:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy545;
-                       default:        goto yy62;
-                       }
-yy504:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy546;
-                       default:        goto yy62;
-                       }
-yy505:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy547;
-                       default:        goto yy62;
-                       }
-yy506:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy548;
-                       default:        goto yy62;
-                       }
-yy507:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'e':       goto yy550;
-                       default:        goto yy62;
-                       }
-yy508:
+                       { NEWTOKEN(PSI_T_SIZEOF); goto start; }
+#line 7541 "src/parser.c"
+yy512:
                        yyaccept = 57;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7591,38 +7605,71 @@ yy508:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy509;
+                       case 0x7F:      goto yy513;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy509:
-#line 433 "src/parser.re"
-                       { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
-#line 7602 "src/parser.c"
-yy510:
+yy513:
+#line 377 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRUCT); goto start; }
+#line 7616 "src/parser.c"
+yy514:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy551;
+                       case 'f':       goto yy557;
                        default:        goto yy62;
                        }
-yy511:
+yy515:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'K':
-                       case 'k':       goto yy553;
+                       case '_':       goto yy559;
                        default:        goto yy62;
                        }
-yy512:
-                       yyaccept = 58;
+yy516:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 0x00:
-                       case 0x01:
-                       case 0x02:
-                       case 0x03:
+                       case '_':       goto yy560;
+                       default:        goto yy62;
+                       }
+yy517:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy561;
+                       default:        goto yy62;
+                       }
+yy518:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy562;
+                       default:        goto yy62;
+                       }
+yy519:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy564;
+                       default:        goto yy62;
+                       }
+yy520:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'l':       goto yy565;
+                       default:        goto yy62;
+                       }
+yy521:
+                       yyaccept = 58;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
                        case 0x04:
                        case 0x05:
                        case 0x06:
@@ -7682,32 +7729,123 @@ yy512:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy513;
+                       case 0x7F:      goto yy522;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy513:
-#line 403 "src/parser.re"
+yy522:
+#line 436 "src/parser.re"
+                       { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
+#line 7740 "src/parser.c"
+yy523:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy566;
+                       default:        goto yy62;
+                       }
+yy524:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'K':
+                       case 'k':       goto yy568;
+                       default:        goto yy62;
+                       }
+yy525:
+                       yyaccept = 59;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy526;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
+                       }
+yy526:
+#line 406 "src/parser.re"
                        { NEWTOKEN(PSI_T_DEFINED); goto start; }
-#line 7693 "src/parser.c"
-yy514:
+#line 7831 "src/parser.c"
+yy527:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy555;
+                       case 'l':       goto yy570;
                        default:        goto yy62;
                        }
-yy515:
+yy528:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy557;
+                       case 'n':       goto yy572;
                        default:        goto yy62;
                        }
-yy516:
-                       yyaccept = 59;
+yy529:
+                       yyaccept = 60;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7773,17 +7911,17 @@ yy516:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy517;
+                       case 0x7F:      goto yy530;
                        case '\\':      goto yy146;
-                       case '_':       goto yy559;
+                       case '_':       goto yy574;
                        default:        goto yy61;
                        }
-yy517:
-#line 407 "src/parser.re"
+yy530:
+#line 410 "src/parser.re"
                        { NEWTOKEN(PSI_T_INCLUDE); goto start; }
-#line 7785 "src/parser.c"
-yy518:
-                       yyaccept = 60;
+#line 7923 "src/parser.c"
+yy531:
+                       yyaccept = 61;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7849,40 +7987,40 @@ yy518:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy519;
+                       case 0x7F:      goto yy532;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy519:
-#line 430 "src/parser.re"
+yy532:
+#line 433 "src/parser.re"
                        { NEWTOKEN(PSI_T_PATHVAL); goto start; }
-#line 7860 "src/parser.c"
-yy520:
+#line 7998 "src/parser.c"
+yy533:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy560;
+                       case 's':       goto yy575;
                        default:        goto yy62;
                        }
-yy521:
+yy534:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy561;
+                       case 'e':       goto yy576;
                        default:        goto yy62;
                        }
-yy522:
+yy535:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy562;
+                       case 'y':       goto yy577;
                        default:        goto yy62;
                        }
-yy523:
-                       yyaccept = 61;
+yy536:
+                       yyaccept = 62;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7948,40 +8086,40 @@ yy523:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy524;
+                       case 0x7F:      goto yy537;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy524:
-#line 444 "src/parser.re"
+yy537:
+#line 447 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_BOOL); goto start; }
-#line 7959 "src/parser.c"
-yy525:
+#line 8097 "src/parser.c"
+yy538:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy564;
+                       case 't':       goto yy579;
                        default:        goto yy62;
                        }
-yy526:
+yy539:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy566;
+                       case 'c':       goto yy581;
                        default:        goto yy62;
                        }
-yy527:
+yy540:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy567;
+                       case 'n':       goto yy582;
                        default:        goto yy62;
                        }
-yy528:
-                       yyaccept = 62;
+yy541:
+                       yyaccept = 63;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8047,16 +8185,16 @@ yy528:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy529;
+                       case 0x7F:      goto yy542;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy529:
-#line 405 "src/parser.re"
+yy542:
+#line 408 "src/parser.re"
                        { NEWTOKEN(PSI_T_WARNING); goto start; }
-#line 8058 "src/parser.c"
-yy530:
-                       yyaccept = 63;
+#line 8196 "src/parser.c"
+yy543:
+                       yyaccept = 64;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8122,37 +8260,44 @@ yy530:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy531;
+                       case 0x7F:      goto yy544;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy531:
-#line 371 "src/parser.re"
+yy544:
+#line 372 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_ASM); goto start; }
-#line 8133 "src/parser.c"
-yy532:
+#line 8271 "src/parser.c"
+yy545:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'b':       goto yy568;
+                       case 'b':       goto yy583;
                        default:        goto yy62;
                        }
-yy533:
+yy546:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy569;
+                       case 's':       goto yy584;
                        default:        goto yy62;
                        }
-yy534:
+yy547:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy570;
+                       case 'e':       goto yy585;
                        default:        goto yy62;
                        }
-yy535:
-                       yyaccept = 64;
+yy548:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy587;
+                       default:        goto yy62;
+                       }
+yy549:
+                       yyaccept = 65;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8218,16 +8363,16 @@ yy535:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy536;
+                       case 0x7F:      goto yy550;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy536:
-#line 388 "src/parser.re"
+yy550:
+#line 391 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT16); goto start; }
-#line 8229 "src/parser.c"
-yy537:
-                       yyaccept = 65;
+#line 8374 "src/parser.c"
+yy551:
+                       yyaccept = 66;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8293,16 +8438,16 @@ yy537:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy538;
+                       case 0x7F:      goto yy552;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy538:
-#line 390 "src/parser.re"
+yy552:
+#line 393 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT32); goto start; }
-#line 8304 "src/parser.c"
-yy539:
-                       yyaccept = 66;
+#line 8449 "src/parser.c"
+yy553:
+                       yyaccept = 67;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8368,15 +8513,15 @@ yy539:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy540;
+                       case 0x7F:      goto yy554;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy540:
-#line 392 "src/parser.re"
+yy554:
+#line 395 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT64); goto start; }
-#line 8379 "src/parser.c"
-yy541:
+#line 8524 "src/parser.c"
+yy555:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -8447,11 +8592,11 @@ yy541:
                        case '~':
                        case 0x7F:      goto yy55;
                        case '\\':      goto yy146;
-                       case 'o':       goto yy571;
-                       default:        goto yy541;
+                       case 'o':       goto yy588;
+                       default:        goto yy555;
                        }
-yy543:
-                       yyaccept = 67;
+yy557:
+                       yyaccept = 68;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8517,37 +8662,37 @@ yy543:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy544;
+                       case 0x7F:      goto yy558;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy544:
-#line 373 "src/parser.re"
+yy558:
+#line 376 "src/parser.re"
                        { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
-#line 8528 "src/parser.c"
-yy545:
+#line 8673 "src/parser.c"
+yy559:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy573;
+                       case 't':       goto yy590;
                        default:        goto yy62;
                        }
-yy546:
+yy560:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy575;
+                       case 't':       goto yy592;
                        default:        goto yy62;
                        }
-yy547:
+yy561:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy577;
+                       case 't':       goto yy594;
                        default:        goto yy62;
                        }
-yy548:
-                       yyaccept = 68;
+yy562:
+                       yyaccept = 69;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8613,23 +8758,30 @@ yy548:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy549;
+                       case 0x7F:      goto yy563;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy549:
-#line 387 "src/parser.re"
+yy563:
+#line 390 "src/parser.re"
                        { NEWTOKEN(PSI_T_UINT8); goto start; }
-#line 8624 "src/parser.c"
-yy550:
+#line 8769 "src/parser.c"
+yy564:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy579;
+                       case 'd':       goto yy596;
                        default:        goto yy62;
                        }
-yy551:
-                       yyaccept = 69;
+yy565:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy598;
+                       default:        goto yy62;
+                       }
+yy566:
+                       yyaccept = 70;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8695,16 +8847,16 @@ yy551:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy552;
+                       case 0x7F:      goto yy567;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy552:
-#line 413 "src/parser.re"
+yy567:
+#line 416 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLABLE); goto start; }
-#line 8706 "src/parser.c"
-yy553:
-                       yyaccept = 70;
+#line 8858 "src/parser.c"
+yy568:
+                       yyaccept = 71;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8770,16 +8922,16 @@ yy553:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy554;
+                       case 0x7F:      goto yy569;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy554:
-#line 417 "src/parser.re"
+yy569:
+#line 420 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLBACK); goto start; }
-#line 8781 "src/parser.c"
-yy555:
-                       yyaccept = 71;
+#line 8933 "src/parser.c"
+yy570:
+                       yyaccept = 72;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8845,16 +8997,16 @@ yy555:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy556;
+                       case 0x7F:      goto yy571;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy556:
-#line 432 "src/parser.re"
+yy571:
+#line 435 "src/parser.re"
                        { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
-#line 8856 "src/parser.c"
-yy557:
-                       yyaccept = 72;
+#line 9008 "src/parser.c"
+yy572:
+                       yyaccept = 73;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8920,40 +9072,40 @@ yy557:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy558;
+                       case 0x7F:      goto yy573;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy558:
-#line 419 "src/parser.re"
+yy573:
+#line 422 "src/parser.re"
                        { NEWTOKEN(PSI_T_FUNCTION); goto start; }
-#line 8931 "src/parser.c"
-yy559:
+#line 9083 "src/parser.c"
+yy574:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy581;
+                       case 'n':       goto yy600;
                        default:        goto yy62;
                        }
-yy560:
+yy575:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy582;
+                       case 'e':       goto yy601;
                        default:        goto yy62;
                        }
-yy561:
+yy576:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy583;
+                       case 'r':       goto yy602;
                        default:        goto yy62;
                        }
-yy562:
-                       yyaccept = 73;
+yy577:
+                       yyaccept = 74;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9019,16 +9171,16 @@ yy562:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy563;
+                       case 0x7F:      goto yy578;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy563:
-#line 440 "src/parser.re"
+yy578:
+#line 443 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
-#line 9030 "src/parser.c"
-yy564:
-                       yyaccept = 74;
+#line 9182 "src/parser.c"
+yy579:
+                       yyaccept = 75;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9094,57 +9246,205 @@ yy564:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy565;
+                       case 0x7F:      goto yy580;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy565:
-#line 443 "src/parser.re"
+yy580:
+#line 446 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
-#line 9105 "src/parser.c"
-yy566:
+#line 9257 "src/parser.c"
+yy581:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy584;
+                       case 't':       goto yy603;
                        default:        goto yy62;
                        }
-yy567:
+yy582:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy586;
+                       case 'g':       goto yy605;
                        default:        goto yy62;
                        }
-yy568:
+yy583:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'u':       goto yy588;
+                       case 'u':       goto yy607;
                        default:        goto yy62;
                        }
-yy569:
+yy584:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy608;
+                       default:        goto yy62;
+                       }
+yy585:
+                       yyaccept = 76;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy586;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
+                       }
+yy586:
+#line 369 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_INLINE); goto start; }
+#line 9362 "src/parser.c"
+yy587:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy589;
+                       case 'c':       goto yy609;
                        default:        goto yy62;
                        }
-yy570:
-                       yyaccept = 5;
+yy588:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy55;
+                       case '\\':      goto yy146;
+                       case 'n':       goto yy610;
+                       case 'o':       goto yy588;
+                       default:        goto yy555;
+                       }
+yy590:
+                       yyaccept = 77;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'c':       goto yy590;
-                       default:        goto yy62;
-                       }
-yy571:
-                       yyaccept = 5;
-                       mrk = ++cur;
-                       if (lim <= cur) if (cur >= lim) goto done;;
-                       yych = *cur;
-                       switch (yych) {
                        case 0x00:
                        case 0x01:
                        case 0x02:
@@ -9208,14 +9508,16 @@ yy571:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy55;
+                       case 0x7F:      goto yy591;
                        case '\\':      goto yy146;
-                       case 'n':       goto yy591;
-                       case 'o':       goto yy571;
-                       default:        goto yy541;
+                       default:        goto yy61;
                        }
-yy573:
-                       yyaccept = 75;
+yy591:
+#line 392 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT16); goto start; }
+#line 9519 "src/parser.c"
+yy592:
+                       yyaccept = 78;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9281,16 +9583,16 @@ yy573:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy574;
+                       case 0x7F:      goto yy593;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy574:
-#line 389 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT16); goto start; }
-#line 9292 "src/parser.c"
-yy575:
-                       yyaccept = 76;
+yy593:
+#line 394 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT32); goto start; }
+#line 9594 "src/parser.c"
+yy594:
+                       yyaccept = 79;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9356,16 +9658,16 @@ yy575:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy576;
+                       case 0x7F:      goto yy595;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy576:
-#line 391 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT32); goto start; }
-#line 9367 "src/parser.c"
-yy577:
-                       yyaccept = 77;
+yy595:
+#line 396 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT64); goto start; }
+#line 9669 "src/parser.c"
+yy596:
+                       yyaccept = 80;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9431,16 +9733,16 @@ yy577:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy578;
+                       case 0x7F:      goto yy597;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy578:
-#line 393 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT64); goto start; }
-#line 9442 "src/parser.c"
-yy579:
-                       yyaccept = 78;
+yy597:
+#line 397 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
+#line 9744 "src/parser.c"
+yy598:
+                       yyaccept = 81;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9506,40 +9808,40 @@ yy579:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy580;
+                       case 0x7F:      goto yy599;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy580:
-#line 394 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
-#line 9517 "src/parser.c"
-yy581:
+yy599:
+#line 373 "src/parser.re"
+                       { NEWTOKEN(PSI_T_VOLATILE); goto start; }
+#line 9819 "src/parser.c"
+yy600:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy592;
+                       case 'e':       goto yy611;
                        default:        goto yy62;
                        }
-yy582:
+yy601:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy593;
+                       case 'r':       goto yy612;
                        default:        goto yy62;
                        }
-yy583:
+yy602:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy594;
+                       case 't':       goto yy613;
                        default:        goto yy62;
                        }
-yy584:
-                       yyaccept = 79;
+yy603:
+                       yyaccept = 82;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9605,16 +9907,16 @@ yy584:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy585;
+                       case 0x7F:      goto yy604;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy585:
-#line 439 "src/parser.re"
+yy604:
+#line 442 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_OBJECT); goto start; }
-#line 9616 "src/parser.c"
-yy586:
-                       yyaccept = 80;
+#line 9918 "src/parser.c"
+yy605:
+                       yyaccept = 83;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9680,36 +9982,36 @@ yy586:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy587;
+                       case 0x7F:      goto yy606;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy587:
-#line 441 "src/parser.re"
+yy606:
+#line 444 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_STRING); goto start; }
-#line 9691 "src/parser.c"
-yy588:
+#line 9993 "src/parser.c"
+yy607:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy596;
+                       case 't':       goto yy615;
                        default:        goto yy62;
                        }
-yy589:
+yy608:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy597;
+                       case 'o':       goto yy616;
                        default:        goto yy62;
                        }
-yy590:
+yy609:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy598;
+                       case 't':       goto yy617;
                        default:        goto yy62;
                        }
-yy591:
+yy610:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -9780,28 +10082,28 @@ yy591:
                        case '~':
                        case 0x7F:      goto yy55;
                        case '\\':      goto yy146;
-                       case 'c':       goto yy600;
-                       case 'o':       goto yy571;
-                       default:        goto yy541;
+                       case 'c':       goto yy619;
+                       case 'o':       goto yy588;
+                       default:        goto yy555;
                        }
-yy592:
+yy611:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'X':
-                       case 'x':       goto yy601;
+                       case 'x':       goto yy620;
                        default:        goto yy62;
                        }
-yy593:
+yy612:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy602;
+                       case 't':       goto yy621;
                        default:        goto yy62;
                        }
-yy594:
-                       yyaccept = 81;
+yy613:
+                       yyaccept = 84;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9867,30 +10169,30 @@ yy594:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy595;
+                       case 0x7F:      goto yy614;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy595:
-#line 423 "src/parser.re"
+yy614:
+#line 426 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
-#line 9878 "src/parser.c"
-yy596:
+#line 10180 "src/parser.c"
+yy615:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy604;
+                       case 'e':       goto yy623;
                        default:        goto yy62;
                        }
-yy597:
+yy616:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy605;
+                       case 'n':       goto yy624;
                        default:        goto yy62;
                        }
-yy598:
-                       yyaccept = 82;
+yy617:
+                       yyaccept = 85;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9956,15 +10258,15 @@ yy598:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy599;
+                       case 0x7F:      goto yy618;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy599:
-#line 369 "src/parser.re"
+yy618:
+#line 370 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_RESTRICT); goto start; }
-#line 9967 "src/parser.c"
-yy600:
+#line 10269 "src/parser.c"
+yy619:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10035,20 +10337,20 @@ yy600:
                        case '~':
                        case 0x7F:      goto yy55;
                        case '\\':      goto yy146;
-                       case 'e':       goto yy606;
-                       case 'o':       goto yy571;
-                       default:        goto yy541;
+                       case 'e':       goto yy625;
+                       case 'o':       goto yy588;
+                       default:        goto yy555;
                        }
-yy601:
+yy620:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy608;
+                       case 't':       goto yy627;
                        default:        goto yy62;
                        }
-yy602:
-                       yyaccept = 83;
+yy621:
+                       yyaccept = 86;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10114,30 +10416,30 @@ yy602:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy603;
+                       case 0x7F:      goto yy622;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy603:
-#line 424 "src/parser.re"
+yy622:
+#line 427 "src/parser.re"
                        { NEWTOKEN(PSI_T_POST_ASSERT); goto start; }
-#line 10125 "src/parser.c"
-yy604:
+#line 10427 "src/parser.c"
+yy623:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy610;
+                       case '_':       goto yy629;
                        default:        goto yy62;
                        }
-yy605:
+yy624:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy611;
+                       case '_':       goto yy630;
                        default:        goto yy62;
                        }
-yy606:
-                       yyaccept = 84;
+yy625:
+                       yyaccept = 87;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -10205,17 +10507,17 @@ yy606:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy607;
+                       case 0x7F:      goto yy626;
                        case '\\':      goto yy146;
-                       case 'o':       goto yy571;
-                       default:        goto yy541;
+                       case 'o':       goto yy588;
+                       default:        goto yy555;
                        }
-yy607:
+yy626:
 #line 368 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRAGMA_ONCE); goto start; }
-#line 10217 "src/parser.c"
-yy608:
-                       yyaccept = 85;
+#line 10519 "src/parser.c"
+yy627:
+                       yyaccept = 88;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10281,101 +10583,40 @@ yy608:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy609;
+                       case 0x7F:      goto yy628;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy609:
-#line 408 "src/parser.re"
+yy628:
+#line 411 "src/parser.re"
                        { NEWTOKEN(PSI_T_INCLUDE_NEXT); goto start; }
-#line 10292 "src/parser.c"
-yy610:
+#line 10594 "src/parser.c"
+yy629:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy612;
+                       case '_':       goto yy631;
                        default:        goto yy62;
                        }
-yy611:
+yy630:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy613;
+                       case '_':       goto yy632;
                        default:        goto yy62;
                        }
-yy612:
+yy631:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 0x00:
-                       case 0x01:
-                       case 0x02:
-                       case 0x03:
-                       case 0x04:
-                       case 0x05:
-                       case 0x06:
-                       case 0x07:
-                       case 0x08:
-                       case '\n':
-                       case '\v':
-                       case '\r':
-                       case 0x0E:
-                       case 0x0F:
-                       case 0x10:
-                       case 0x11:
-                       case 0x12:
-                       case 0x13:
-                       case 0x14:
-                       case 0x15:
-                       case 0x16:
-                       case 0x17:
-                       case 0x18:
-                       case 0x19:
-                       case 0x1A:
-                       case 0x1B:
-                       case 0x1C:
-                       case 0x1D:
-                       case 0x1E:
-                       case 0x1F:
-                       case '!':
-                       case '"':
-                       case '#':
-                       case '$':
-                       case '%':
-                       case '&':
-                       case '\'':
-                       case ')':
-                       case '*':
-                       case '+':
-                       case ',':
-                       case '-':
-                       case '.':
-                       case '/':
-                       case ':':
-                       case ';':
-                       case '<':
-                       case '=':
-                       case '>':
-                       case '?':
-                       case '@':
-                       case '[':
-                       case ']':
-                       case '^':
-                       case '`':
-                       case '{':
-                       case '|':
-                       case '}':
-                       case '~':
-                       case 0x7F:      goto yy55;
                        case '\t':
                        case '\f':
-                       case ' ':       goto yy615;
-                       case '(':       goto yy617;
-                       case '\\':      goto yy146;
-                       default:        goto yy61;
+                       case ' ':       goto yy634;
+                       case '(':       goto yy636;
+                       default:        goto yy62;
                        }
-yy613:
-                       yyaccept = 86;
+yy632:
+                       yyaccept = 89;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10441,67 +10682,67 @@ yy613:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy614;
+                       case 0x7F:      goto yy633;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy614:
-#line 370 "src/parser.re"
+yy633:
+#line 371 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_EXTENSION); goto start; }
-#line 10452 "src/parser.c"
-yy615:
+#line 10693 "src/parser.c"
+yy634:
                        ++cur;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\t':
                        case '\f':
-                       case ' ':       goto yy615;
-                       case '(':       goto yy617;
+                       case ' ':       goto yy634;
+                       case '(':       goto yy636;
                        default:        goto yy114;
                        }
-yy617:
+yy636:
                        yych = *++cur;
                        switch (yych) {
-                       case '(':       goto yy618;
+                       case '(':       goto yy637;
                        default:        goto yy114;
                        }
-yy618:
+yy637:
                        ++cur;
-#line 449 "src/parser.re"
+#line 452 "src/parser.re"
                        { parens = 2; goto cpp_attribute; }
-#line 10474 "src/parser.c"
+#line 10715 "src/parser.c"
                }
-#line 455 "src/parser.re"
+#line 458 "src/parser.re"
 
 
        character: ;
                
-#line 10481 "src/parser.c"
+#line 10722 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy624;
-                       case '\'':      goto yy626;
-                       case '\\':      goto yy628;
-                       default:        goto yy622;
+                       case '\r':      goto yy643;
+                       case '\'':      goto yy645;
+                       case '\\':      goto yy647;
+                       default:        goto yy641;
                        }
-yy622:
+yy641:
                        ++cur;
-#line 473 "src/parser.re"
+#line 476 "src/parser.re"
                        { escaped = false; goto character; }
-#line 10497 "src/parser.c"
-yy624:
+#line 10738 "src/parser.c"
+yy643:
                        ++cur;
-#line 460 "src/parser.re"
+#line 463 "src/parser.re"
                        { NEWLINE(); goto character; }
-#line 10502 "src/parser.c"
-yy626:
+#line 10743 "src/parser.c"
+yy645:
                        ++cur;
-#line 462 "src/parser.re"
+#line 465 "src/parser.re"
                        {
                        if (escaped) {
                                escaped = false;
@@ -10513,43 +10754,43 @@ yy626:
                        token->flags = char_width;
                        goto start;
                }
-#line 10517 "src/parser.c"
-yy628:
+#line 10758 "src/parser.c"
+yy647:
                        ++cur;
-#line 461 "src/parser.re"
+#line 464 "src/parser.re"
                        { escaped = !escaped;  goto character; }
-#line 10522 "src/parser.c"
+#line 10763 "src/parser.c"
                }
-#line 475 "src/parser.re"
+#line 478 "src/parser.re"
 
 
        string: ;
                
-#line 10529 "src/parser.c"
+#line 10770 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy634;
-                       case '"':       goto yy636;
-                       case '\\':      goto yy638;
-                       default:        goto yy632;
+                       case '\r':      goto yy653;
+                       case '"':       goto yy655;
+                       case '\\':      goto yy657;
+                       default:        goto yy651;
                        }
-yy632:
+yy651:
                        ++cur;
-#line 493 "src/parser.re"
+#line 496 "src/parser.re"
                        { escaped = false; goto string; }
-#line 10545 "src/parser.c"
-yy634:
+#line 10786 "src/parser.c"
+yy653:
                        ++cur;
-#line 480 "src/parser.re"
+#line 483 "src/parser.re"
                        { NEWLINE(); goto string; }
-#line 10550 "src/parser.c"
-yy636:
+#line 10791 "src/parser.c"
+yy655:
                        ++cur;
-#line 482 "src/parser.re"
+#line 485 "src/parser.re"
                        {
                        if (escaped) {
                                escaped = false;
@@ -10561,118 +10802,118 @@ yy636:
                        token->flags = char_width;
                        goto start;
                }
-#line 10565 "src/parser.c"
-yy638:
+#line 10806 "src/parser.c"
+yy657:
                        ++cur;
-#line 481 "src/parser.re"
+#line 484 "src/parser.re"
                        { escaped = !escaped; goto string; }
-#line 10570 "src/parser.c"
+#line 10811 "src/parser.c"
                }
-#line 495 "src/parser.re"
+#line 498 "src/parser.re"
 
 
        comment: ;
                
-#line 10577 "src/parser.c"
+#line 10818 "src/parser.c"
                {
                        unsigned char yych;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy644;
-                       case '*':       goto yy646;
-                       default:        goto yy642;
+                       case '\r':      goto yy663;
+                       case '*':       goto yy665;
+                       default:        goto yy661;
                        }
-yy642:
+yy661:
                        ++cur;
-yy643:
-#line 502 "src/parser.re"
+yy662:
+#line 505 "src/parser.re"
                        { goto comment; }
-#line 10593 "src/parser.c"
-yy644:
+#line 10834 "src/parser.c"
+yy663:
                        ++cur;
-#line 500 "src/parser.re"
+#line 503 "src/parser.re"
                        { NEWLINE(); goto comment; }
-#line 10598 "src/parser.c"
-yy646:
+#line 10839 "src/parser.c"
+yy665:
                        yych = *++cur;
                        switch (yych) {
-                       case '/':       goto yy647;
-                       default:        goto yy643;
+                       case '/':       goto yy666;
+                       default:        goto yy662;
                        }
-yy647:
+yy666:
                        ++cur;
-#line 501 "src/parser.re"
+#line 504 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); goto start; }
-#line 10609 "src/parser.c"
+#line 10850 "src/parser.c"
                }
-#line 504 "src/parser.re"
+#line 507 "src/parser.re"
 
 
        comment_sl: ;
                
-#line 10616 "src/parser.c"
+#line 10857 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy653;
-                       default:    &