just predefine stdc inttypes
[m6w6/ext-psi] / src / parser.c
index 8d545fccad5c781f1a789b9d5c37d95907445600..ace7900dfcbebd5f6ebbd9c8440c99e6ecf7585e 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 on Thu Mar 30 15:34:04 2017 */
+/* Generated by re2c 1.0.2 on Fri Sep  8 10:30:56 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
@@ -265,6 +266,8 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
        bool escaped;
        token_t char_width;
 
+       PSI_DEBUG_PRINT(P, "PSI: scanning %s\n", I->file);
+
        tok = mrk = eol = cur = I->buffer;
        lim = I->buffer + I->length;
        I->lines = 1;
@@ -276,7 +279,7 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                tok = cur;
 
                
-#line 280 "src/parser.c"
+#line 283 "src/parser.c"
                {
                        unsigned char yych;
                        unsigned int yyaccept = 0;
@@ -352,18 +355,12 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                        case '?':       goto yy52;
                        case 'A':
                        case 'a':       goto yy54;
-                       case 'B':
-                       case 'b':       goto yy56;
-                       case 'C':
-                       case 'c':       goto yy57;
-                       case 'D':
-                       case 'd':       goto yy58;
-                       case 'E':
-                       case 'e':       goto yy59;
-                       case 'F':
-                       case 'f':       goto yy60;
-                       case 'I':
-                       case 'i':       goto yy63;
+                       case 'B':       goto yy56;
+                       case 'C':       goto yy57;
+                       case 'D':       goto yy58;
+                       case 'E':       goto yy59;
+                       case 'F':       goto yy60;
+                       case 'I':       goto yy63;
                        case 'L':       goto yy64;
                        case 'M':
                        case 'm':       goto yy65;
@@ -374,37 +371,42 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                        case 'P':       goto yy68;
                        case 'R':
                        case 'r':       goto yy69;
-                       case 'S':
-                       case 's':       goto yy70;
-                       case 'T':
-                       case 't':       goto yy71;
+                       case 'S':       goto yy70;
+                       case 'T':       goto yy71;
                        case 'U':       goto yy72;
-                       case 'V':
-                       case 'v':       goto yy73;
                        case 'W':
-                       case 'w':       goto yy74;
+                       case 'w':       goto yy73;
                        case 'Z':
-                       case 'z':       goto yy75;
-                       case '[':       goto yy76;
-                       case '\\':      goto yy78;
-                       case ']':       goto yy80;
-                       case '^':       goto yy82;
-                       case '_':       goto yy84;
-                       case 'l':       goto yy85;
-                       case 'p':       goto yy86;
-                       case 'u':       goto yy87;
-                       case '{':       goto yy88;
-                       case '|':       goto yy90;
-                       case '}':       goto yy92;
-                       case '~':       goto yy94;
+                       case 'z':       goto yy74;
+                       case '[':       goto yy75;
+                       case '\\':      goto yy77;
+                       case ']':       goto yy79;
+                       case '^':       goto yy81;
+                       case '_':       goto yy83;
+                       case 'b':       goto yy84;
+                       case 'c':       goto yy85;
+                       case 'd':       goto yy86;
+                       case 'e':       goto yy87;
+                       case 'f':       goto yy88;
+                       case 'i':       goto yy89;
+                       case 'l':       goto yy90;
+                       case 'p':       goto yy91;
+                       case 's':       goto yy92;
+                       case 't':       goto yy93;
+                       case 'u':       goto yy94;
+                       case 'v':       goto yy95;
+                       case '{':       goto yy96;
+                       case '|':       goto yy98;
+                       case '}':       goto yy100;
+                       case '~':       goto yy102;
                        default:        goto yy61;
                        }
 yy2:
                        ++cur;
 yy3:
-#line 450 "src/parser.re"
+#line 447 "src/parser.re"
                        { NEWTOKEN(-2); goto error; }
-#line 408 "src/parser.c"
+#line 410 "src/parser.c"
 yy4:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -416,39 +418,39 @@ yy4:
                        default:        goto yy6;
                        }
 yy6:
-#line 449 "src/parser.re"
+#line 446 "src/parser.re"
                        { NEWTOKEN(PSI_T_WHITESPACE); goto start; }
-#line 422 "src/parser.c"
+#line 424 "src/parser.c"
 yy7:
                        ++cur;
-#line 448 "src/parser.re"
+#line 445 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
-#line 427 "src/parser.c"
+#line 429 "src/parser.c"
 yy9:
-                       ++cur;
-                       switch ((yych = *cur)) {
-                       case '=':       goto yy96;
+                       yych = *++cur;
+                       switch (yych) {
+                       case '=':       goto yy104;
                        default:        goto yy10;
                        }
 yy10:
-#line 347 "src/parser.re"
+#line 349 "src/parser.re"
                        { NEWTOKEN(PSI_T_NOT); goto start; }
-#line 437 "src/parser.c"
+#line 439 "src/parser.c"
 yy11:
                        ++cur;
-#line 320 "src/parser.re"
+#line 322 "src/parser.re"
                        { escaped = false; tok += 1; goto string; }
-#line 442 "src/parser.c"
+#line 444 "src/parser.c"
 yy13:
-                       ++cur;
-                       switch ((yych = *cur)) {
-                       case '#':       goto yy98;
+                       yych = *++cur;
+                       switch (yych) {
+                       case '#':       goto yy106;
                        default:        goto yy14;
                        }
 yy14:
-#line 330 "src/parser.re"
+#line 332 "src/parser.re"
                        { NEWTOKEN(PSI_T_HASH); goto start; }
-#line 452 "src/parser.c"
+#line 454 "src/parser.c"
 yy15:
                        yych = *++cur;
                        switch (yych) {
@@ -517,48 +519,48 @@ yy15:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy3;
-                       default:        goto yy100;
+                       default:        goto yy108;
                        }
 yy16:
                        ++cur;
-#line 348 "src/parser.re"
+#line 350 "src/parser.re"
                        { NEWTOKEN(PSI_T_MODULO); goto start; }
-#line 527 "src/parser.c"
+#line 529 "src/parser.c"
 yy18:
-                       ++cur;
-                       switch ((yych = *cur)) {
-                       case '&':       goto yy103;
+                       yych = *++cur;
+                       switch (yych) {
+                       case '&':       goto yy111;
                        default:        goto yy19;
                        }
 yy19:
-#line 349 "src/parser.re"
+#line 351 "src/parser.re"
                        { NEWTOKEN(PSI_T_AMPERSAND); goto start; }
-#line 537 "src/parser.c"
+#line 539 "src/parser.c"
 yy20:
                        ++cur;
-#line 319 "src/parser.re"
+#line 321 "src/parser.re"
                        { escaped = false; tok += 1; goto character; }
-#line 542 "src/parser.c"
+#line 544 "src/parser.c"
 yy22:
                        ++cur;
-#line 331 "src/parser.re"
+#line 333 "src/parser.re"
                        { NEWTOKEN(PSI_T_LPAREN); goto start; }
-#line 547 "src/parser.c"
+#line 549 "src/parser.c"
 yy24:
                        ++cur;
-#line 332 "src/parser.re"
+#line 334 "src/parser.re"
                        { NEWTOKEN(PSI_T_RPAREN); goto start; }
-#line 552 "src/parser.c"
+#line 554 "src/parser.c"
 yy26:
                        ++cur;
-#line 345 "src/parser.re"
+#line 347 "src/parser.re"
                        { NEWTOKEN(PSI_T_ASTERISK); goto start; }
-#line 557 "src/parser.c"
+#line 559 "src/parser.c"
 yy28:
                        yyaccept = 0;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '.':       goto yy105;
+                       case '.':       goto yy113;
                        case '0':       goto yy38;
                        case '1':
                        case '2':
@@ -572,19 +574,19 @@ yy28:
                        default:        goto yy29;
                        }
 yy29:
-#line 350 "src/parser.re"
+#line 352 "src/parser.re"
                        { NEWTOKEN(PSI_T_PLUS); goto start; }
-#line 578 "src/parser.c"
+#line 580 "src/parser.c"
 yy30:
                        ++cur;
-#line 334 "src/parser.re"
+#line 336 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMA); goto start; }
-#line 583 "src/parser.c"
+#line 585 "src/parser.c"
 yy32:
                        yyaccept = 1;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '.':       goto yy105;
+                       case '.':       goto yy113;
                        case '0':       goto yy38;
                        case '1':
                        case '2':
@@ -598,14 +600,14 @@ yy32:
                        default:        goto yy33;
                        }
 yy33:
-#line 351 "src/parser.re"
+#line 353 "src/parser.re"
                        { NEWTOKEN(PSI_T_MINUS); goto start; }
-#line 604 "src/parser.c"
+#line 606 "src/parser.c"
 yy34:
                        yyaccept = 2;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '.':       goto yy107;
+                       case '.':       goto yy115;
                        case '0':
                        case '1':
                        case '2':
@@ -615,60 +617,46 @@ yy34:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy108;
+                       case '9':       goto yy116;
                        default:        goto yy35;
                        }
 yy35:
-#line 362 "src/parser.re"
+#line 364 "src/parser.re"
                        { NEWTOKEN(PSI_T_PERIOD); goto start; }
-#line 625 "src/parser.c"
+#line 627 "src/parser.c"
 yy36:
-                       ++cur;
-                       switch ((yych = *cur)) {
-                       case '*':       goto yy111;
-                       case '/':       goto yy113;
+                       yych = *++cur;
+                       switch (yych) {
+                       case '*':       goto yy119;
+                       case '/':       goto yy121;
                        default:        goto yy37;
                        }
 yy37:
-#line 352 "src/parser.re"
+#line 354 "src/parser.re"
                        { NEWTOKEN(PSI_T_SLASH); goto start; }
-#line 636 "src/parser.c"
+#line 638 "src/parser.c"
 yy38:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
-                       case '.':       goto yy115;
-                       case '0':
-                       case '1':
-                       case '2':
-                       case '3':
-                       case '4':
-                       case '5':
-                       case '6':
-                       case '7':       goto yy117;
+                       case '.':       goto yy123;
                        case 'E':
-                       case 'e':       goto yy119;
-                       case 'L':
-                       case 'l':       goto yy120;
-                       case 'U':
-                       case 'u':       goto yy122;
+                       case 'e':       goto yy127;
                        case 'X':
-                       case 'x':       goto yy124;
-                       default:        goto yy39;
+                       case 'x':       goto yy132;
+                       default:        goto yy126;
                        }
 yy39:
-#line 306 "src/parser.re"
+#line 308 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT; goto start; }
-#line 664 "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 yy115;
+                       case '.':       goto yy123;
                        case '0':
                        case '1':
                        case '2':
@@ -680,23 +668,23 @@ yy40:
                        case '8':
                        case '9':       goto yy40;
                        case 'E':
-                       case 'e':       goto yy119;
+                       case 'e':       goto yy127;
                        case 'L':
-                       case 'l':       goto yy120;
+                       case 'l':       goto yy128;
                        case 'U':
-                       case 'u':       goto yy122;
+                       case 'u':       goto yy130;
                        default:        goto yy39;
                        }
 yy42:
                        ++cur;
-#line 335 "src/parser.re"
+#line 337 "src/parser.re"
                        { NEWTOKEN(PSI_T_COLON); goto start; }
-#line 695 "src/parser.c"
+#line 683 "src/parser.c"
 yy44:
                        ++cur;
-#line 333 "src/parser.re"
+#line 335 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOS); goto start; }
-#line 700 "src/parser.c"
+#line 688 "src/parser.c"
 yy46:
                        yyaccept = 4;
                        yych = *(mrk = ++cur);
@@ -766,59 +754,59 @@ yy46:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy125;
-                       case '<':       goto yy127;
-                       case '=':       goto yy129;
+                       case 'z':       goto yy133;
+                       case '<':       goto yy135;
+                       case '=':       goto yy137;
                        default:        goto yy47;
                        }
 yy47:
-#line 360 "src/parser.re"
+#line 362 "src/parser.re"
                        { NEWTOKEN(PSI_T_LCHEVR); goto start; }
-#line 778 "src/parser.c"
+#line 766 "src/parser.c"
 yy48:
-                       ++cur;
-                       switch ((yych = *cur)) {
-                       case '=':       goto yy131;
+                       yych = *++cur;
+                       switch (yych) {
+                       case '=':       goto yy139;
                        default:        goto yy49;
                        }
 yy49:
-#line 344 "src/parser.re"
+#line 346 "src/parser.re"
                        { NEWTOKEN(PSI_T_EQUALS); goto start; }
-#line 788 "src/parser.c"
+#line 776 "src/parser.c"
 yy50:
-                       ++cur;
-                       switch ((yych = *cur)) {
-                       case '=':       goto yy133;
-                       case '>':       goto yy135;
+                       yych = *++cur;
+                       switch (yych) {
+                       case '=':       goto yy141;
+                       case '>':       goto yy143;
                        default:        goto yy51;
                        }
 yy51:
-#line 361 "src/parser.re"
+#line 363 "src/parser.re"
                        { NEWTOKEN(PSI_T_RCHEVR); goto start; }
-#line 799 "src/parser.c"
+#line 787 "src/parser.c"
 yy52:
                        ++cur;
-#line 364 "src/parser.re"
+#line 366 "src/parser.re"
                        { NEWTOKEN(PSI_T_IIF); goto start; }
-#line 804 "src/parser.c"
+#line 792 "src/parser.c"
 yy54:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy137;
+                       case 'r':       goto yy145;
                        default:        goto yy62;
                        }
 yy55:
-#line 443 "src/parser.re"
+#line 440 "src/parser.re"
                        { NEWTOKEN(PSI_T_NAME); goto start; }
-#line 816 "src/parser.c"
+#line 804 "src/parser.c"
 yy56:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy139;
+                       case 'o':       goto yy147;
                        default:        goto yy62;
                        }
 yy57:
@@ -826,11 +814,9 @@ yy57:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy140;
-                       case 'H':
-                       case 'h':       goto yy141;
+                       case 'a':       goto yy148;
                        case 'O':
-                       case 'o':       goto yy142;
+                       case 'o':       goto yy149;
                        default:        goto yy62;
                        }
 yy58:
@@ -838,9 +824,7 @@ yy58:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy143;
-                       case 'O':
-                       case 'o':       goto yy144;
+                       case 'e':       goto yy150;
                        default:        goto yy62;
                        }
 yy59:
@@ -848,11 +832,11 @@ yy59:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy145;
+                       case 'l':       goto yy151;
                        case 'N':
-                       case 'n':       goto yy146;
+                       case 'n':       goto yy152;
                        case 'R':
-                       case 'r':       goto yy147;
+                       case 'r':       goto yy153;
                        default:        goto yy62;
                        }
 yy60:
@@ -860,13 +844,13 @@ yy60:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy148;
+                       case 'a':       goto yy154;
                        case 'L':
-                       case 'l':       goto yy149;
+                       case 'l':       goto yy155;
                        case 'R':
-                       case 'r':       goto yy150;
+                       case 'r':       goto yy156;
                        case 'U':
-                       case 'u':       goto yy151;
+                       case 'u':       goto yy157;
                        default:        goto yy62;
                        }
 yy61:
@@ -940,7 +924,7 @@ yy62:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy55;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy63:
@@ -948,24 +932,21 @@ yy63:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy152;
+                       case 'f':       goto yy158;
                        case 'N':
-                       case 'n':       goto yy154;
+                       case 'n':       goto yy160;
                        default:        goto yy62;
                        }
 yy64:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
                        case '"':
-                       case '\'':      goto yy155;
+                       case '\'':      goto yy161;
                        case 'E':
-                       case 'e':       goto yy157;
+                       case 'e':       goto yy163;
                        case 'I':
-                       case 'i':       goto yy158;
-                       case 'O':
-                       case 'o':       goto yy159;
+                       case 'i':       goto yy164;
                        default:        goto yy62;
                        }
 yy65:
@@ -973,7 +954,7 @@ yy65:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy160;
+                       case 'i':       goto yy165;
                        default:        goto yy62;
                        }
 yy66:
@@ -981,7 +962,7 @@ yy66:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy161;
+                       case 'u':       goto yy166;
                        default:        goto yy62;
                        }
 yy67:
@@ -989,7 +970,7 @@ yy67:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy162;
+                       case 'b':       goto yy167;
                        default:        goto yy62;
                        }
 yy68:
@@ -997,11 +978,11 @@ yy68:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy163;
+                       case 'a':       goto yy168;
                        case 'O':
-                       case 'o':       goto yy164;
+                       case 'o':       goto yy169;
                        case 'R':
-                       case 'r':       goto yy165;
+                       case 'r':       goto yy170;
                        default:        goto yy62;
                        }
 yy69:
@@ -1009,7 +990,7 @@ yy69:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy166;
+                       case 'e':       goto yy171;
                        default:        goto yy62;
                        }
 yy70:
@@ -1017,13 +998,9 @@ yy70:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy167;
-                       case 'H':
-                       case 'h':       goto yy168;
-                       case 'I':
-                       case 'i':       goto yy169;
+                       case 'e':       goto yy172;
                        case 'T':
-                       case 't':       goto yy170;
+                       case 't':       goto yy173;
                        default:        goto yy62;
                        }
 yy71:
@@ -1031,37 +1008,24 @@ yy71:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy171;
+                       case 'e':       goto yy174;
                        case 'O':
-                       case 'o':       goto yy172;
+                       case 'o':       goto yy175;
                        case 'R':
-                       case 'r':       goto yy173;
-                       case 'Y':
-                       case 'y':       goto yy174;
+                       case 'r':       goto yy176;
                        default:        goto yy62;
                        }
 yy72:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
                        case '"':
-                       case '\'':      goto yy175;
-                       case 'I':
-                       case 'i':       goto yy177;
+                       case '\'':      goto yy177;
                        case 'N':
-                       case 'n':       goto yy178;
+                       case 'n':       goto yy179;
                        default:        goto yy62;
                        }
 yy73:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy179;
-                       default:        goto yy62;
-                       }
-yy74:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -1069,7 +1033,7 @@ yy74:
                        case 'a':       goto yy180;
                        default:        goto yy62;
                        }
-yy75:
+yy74:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -1077,14 +1041,14 @@ yy75:
                        case 'v':       goto yy181;
                        default:        goto yy62;
                        }
-yy76:
+yy75:
                        ++cur;
-#line 338 "src/parser.re"
+#line 340 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACKET); goto start; }
-#line 1085 "src/parser.c"
-yy78:
-                       ++cur;
-                       switch ((yych = *cur)) {
+#line 1049 "src/parser.c"
+yy77:
+                       yych = *++cur;
+                       switch (yych) {
                        case 0x00:
                        case 0x01:
                        case 0x02:
@@ -1159,104 +1123,196 @@ yy78:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy79;
+                       case 0x7F:      goto yy78;
                        default:        goto yy182;
                        }
-yy79:
-#line 353 "src/parser.re"
+yy78:
+#line 355 "src/parser.re"
                        { NEWTOKEN(PSI_T_BSLASH); goto start; }
-#line 1169 "src/parser.c"
-yy80:
+#line 1133 "src/parser.c"
+yy79:
                        ++cur;
-#line 339 "src/parser.re"
+#line 341 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACKET); goto start; }
-#line 1174 "src/parser.c"
-yy82:
+#line 1138 "src/parser.c"
+yy81:
                        ++cur;
-#line 355 "src/parser.re"
+#line 357 "src/parser.re"
                        { NEWTOKEN(PSI_T_CARET); goto start; }
-#line 1179 "src/parser.c"
-yy84:
+#line 1143 "src/parser.c"
+yy83:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '_':       goto yy185;
                        default:        goto yy62;
                        }
+yy84:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'O':       goto yy147;
+                       case 'o':       goto yy186;
+                       default:        goto yy62;
+                       }
 yy85:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy157;
-                       case 'I':       goto yy158;
-                       case 'O':
-                       case 'o':       goto yy159;
-                       case 'i':       goto yy186;
+                       case 'A':
+                       case 'a':       goto yy148;
+                       case 'O':       goto yy149;
+                       case 'h':       goto yy187;
+                       case 'o':       goto yy188;
                        default:        goto yy62;
                        }
 yy86:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy150;
+                       case 'o':       goto yy189;
+                       default:        goto yy62;
+                       }
+yy87:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy151;
+                       case 'N':       goto yy152;
+                       case 'R':
+                       case 'r':       goto yy153;
+                       case 'n':       goto yy190;
+                       default:        goto yy62;
+                       }
+yy88:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy154;
+                       case 'L':       goto yy155;
+                       case 'R':
+                       case 'r':       goto yy156;
+                       case 'U':
+                       case 'u':       goto yy157;
+                       case 'l':       goto yy191;
+                       default:        goto yy62;
+                       }
+yy89:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'F':
+                       case 'f':       goto yy158;
+                       case 'N':       goto yy160;
+                       case 'n':       goto yy192;
+                       default:        goto yy62;
+                       }
+yy90:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy163;
+                       case 'I':       goto yy164;
+                       case 'i':       goto yy193;
+                       case 'o':       goto yy194;
+                       default:        goto yy62;
+                       }
+yy91:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy163;
+                       case 'a':       goto yy168;
                        case 'O':
-                       case 'o':       goto yy164;
-                       case 'R':       goto yy165;
-                       case 'r':       goto yy187;
+                       case 'o':       goto yy169;
+                       case 'R':       goto yy170;
+                       case 'r':       goto yy195;
                        default:        goto yy62;
                        }
-yy87:
+yy92:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy172;
+                       case 'T':       goto yy173;
+                       case 'h':       goto yy196;
+                       case 'i':       goto yy197;
+                       case 't':       goto yy198;
+                       default:        goto yy62;
+                       }
+yy93:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy174;
+                       case 'O':
+                       case 'o':       goto yy175;
+                       case 'R':
+                       case 'r':       goto yy176;
+                       case 'y':       goto yy199;
+                       default:        goto yy62;
+                       }
+yy94:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
                        case '"':
-                       case '\'':      goto yy188;
-                       case '8':       goto yy190;
-                       case 'I':
-                       case 'i':       goto yy177;
-                       case 'N':
-                       case 'n':       goto yy178;
+                       case '\'':      goto yy200;
+                       case '8':       goto yy202;
+                       case 'N':       goto yy179;
+                       case 'n':       goto yy203;
                        default:        goto yy62;
                        }
-yy88:
+yy95:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'o':       goto yy204;
+                       default:        goto yy62;
+                       }
+yy96:
                        ++cur;
-#line 336 "src/parser.re"
+#line 338 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACE); goto start; }
-#line 1229 "src/parser.c"
-yy90:
-                       ++cur;
-                       switch ((yych = *cur)) {
-                       case '|':       goto yy191;
-                       default:        goto yy91;
+#line 1285 "src/parser.c"
+yy98:
+                       yych = *++cur;
+                       switch (yych) {
+                       case '|':       goto yy205;
+                       default:        goto yy99;
                        }
-yy91:
-#line 354 "src/parser.re"
+yy99:
+#line 356 "src/parser.re"
                        { NEWTOKEN(PSI_T_PIPE); goto start; }
-#line 1239 "src/parser.c"
-yy92:
+#line 1295 "src/parser.c"
+yy100:
                        ++cur;
-#line 337 "src/parser.re"
+#line 339 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACE); goto start; }
-#line 1244 "src/parser.c"
-yy94:
+#line 1300 "src/parser.c"
+yy102:
                        ++cur;
-#line 346 "src/parser.re"
+#line 348 "src/parser.re"
                        { NEWTOKEN(PSI_T_TILDE); goto start; }
-#line 1249 "src/parser.c"
-yy96:
+#line 1305 "src/parser.c"
+yy104:
                        ++cur;
-#line 340 "src/parser.re"
+#line 342 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_NE); goto start; }
-#line 1254 "src/parser.c"
-yy98:
+#line 1310 "src/parser.c"
+yy106:
                        ++cur;
-#line 329 "src/parser.re"
+#line 331 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_PASTE); goto start; }
-#line 1259 "src/parser.c"
-yy100:
+#line 1315 "src/parser.c"
+yy108:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -1325,19 +1381,19 @@ yy100:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy102;
-                       default:        goto yy100;
+                       case 0x7F:      goto yy110;
+                       default:        goto yy108;
                        }
-yy102:
-#line 445 "src/parser.re"
+yy110:
+#line 442 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; }
-#line 1335 "src/parser.c"
-yy103:
+#line 1391 "src/parser.c"
+yy111:
                        ++cur;
-#line 342 "src/parser.re"
+#line 344 "src/parser.re"
                        { NEWTOKEN(PSI_T_AND); goto start; }
-#line 1340 "src/parser.c"
-yy105:
+#line 1396 "src/parser.c"
+yy113:
                        yych = *++cur;
                        switch (yych) {
                        case '0':
@@ -1349,10 +1405,10 @@ yy105:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy108;
-                       default:        goto yy106;
+                       case '9':       goto yy116;
+                       default:        goto yy114;
                        }
-yy106:
+yy114:
                        cur = mrk;
                        switch (yyaccept) {
                        case 0:         goto yy29;
@@ -1361,100 +1417,94 @@ yy106:
                        case 3:         goto yy39;
                        case 4:         goto yy47;
                        case 5:         goto yy55;
-                       case 6:         goto yy110;
-                       case 7:         goto yy121;
-                       case 8:         goto yy153;
+                       case 6:         goto yy118;
+                       case 7:         goto yy129;
+                       case 8:         goto yy159;
                        case 9:         goto yy184;
-                       case 10:        goto yy229;
-                       case 11:        goto yy231;
-                       case 12:        goto yy233;
-                       case 13:        goto yy243;
-                       case 14:        goto yy279;
-                       case 15:        goto yy282;
-                       case 16:        goto yy288;
-                       case 17:        goto yy290;
-                       case 18:        goto yy293;
-                       case 19:        goto yy298;
-                       case 20:        goto yy309;
-                       case 21:        goto yy312;
-                       case 22:        goto yy327;
-                       case 23:        goto yy335;
-                       case 24:        goto yy342;
-                       case 25:        goto yy345;
-                       case 26:        goto yy351;
-                       case 27:        goto yy354;
-                       case 28:        goto yy361;
-                       case 29:        goto yy363;
-                       case 30:        goto yy367;
-                       case 31:        goto yy369;
-                       case 32:        goto yy371;
-                       case 33:        goto yy373;
-                       case 34:        goto yy376;
-                       case 35:        goto yy385;
-                       case 36:        goto yy393;
-                       case 37:        goto yy412;
-                       case 38:        goto yy414;
-                       case 39:        goto yy423;
-                       case 40:        goto yy428;
-                       case 41:        goto yy430;
-                       case 42:        goto yy432;
-                       case 43:        goto yy436;
-                       case 44:        goto yy442;
-                       case 45:        goto yy444;
-                       case 46:        goto yy446;
-                       case 47:        goto yy448;
-                       case 48:        goto yy453;
-                       case 49:        goto yy455;
-                       case 50:        goto yy457;
-                       case 51:        goto yy459;
-                       case 52:        goto yy461;
-                       case 53:        goto yy463;
-                       case 54:        goto yy465;
-                       case 55:        goto yy470;
-                       case 56:        goto yy485;
-                       case 57:        goto yy487;
-                       case 58:        goto yy491;
-                       case 59:        goto yy495;
-                       case 60:        goto yy497;
-                       case 61:        goto yy499;
-                       case 62:        goto yy501;
-                       case 63:        goto yy503;
-                       case 64:        goto yy508;
-                       case 65:        goto yy513;
-                       case 66:        goto yy518;
-                       case 67:        goto yy521;
-                       case 68:        goto yy523;
-                       case 69:        goto yy530;
-                       case 70:        goto yy532;
-                       case 71:        goto yy534;
-                       case 72:        goto yy536;
-                       case 73:        goto yy541;
-                       case 74:        goto yy543;
-                       case 75:        goto yy547;
-                       case 76:        goto yy549;
-                       case 77:        goto yy551;
-                       case 78:        goto yy553;
-                       case 79:        goto yy563;
-                       case 80:        goto yy565;
-                       case 81:        goto yy573;
-                       case 82:        goto yy577;
-                       case 83:        goto yy581;
-                       case 84:        goto yy585;
-                       case 85:        goto yy587;
+                       case 10:        goto yy240;
+                       case 11:        goto yy242;
+                       case 12:        goto yy251;
+                       case 13:        goto yy271;
+                       case 14:        goto yy303;
+                       case 15:        goto yy305;
+                       case 16:        goto yy311;
+                       case 17:        goto yy319;
+                       case 18:        goto yy331;
+                       case 19:        goto yy339;
+                       case 20:        goto yy343;
+                       case 21:        goto yy350;
+                       case 22:        goto yy352;
+                       case 23:        goto yy356;
+                       case 24:        goto yy359;
+                       case 25:        goto yy361;
+                       case 26:        goto yy371;
+                       case 27:        goto yy374;
+                       case 28:        goto yy381;
+                       case 29:        goto yy384;
+                       case 30:        goto yy386;
+                       case 31:        goto yy388;
+                       case 32:        goto yy392;
+                       case 33:        goto yy397;
+                       case 34:        goto yy415;
+                       case 35:        goto yy423;
+                       case 36:        goto yy426;
+                       case 37:        goto yy429;
+                       case 38:        goto yy435;
+                       case 39:        goto yy439;
+                       case 40:        goto yy444;
+                       case 41:        goto yy446;
+                       case 42:        goto yy450;
+                       case 43:        goto yy453;
+                       case 44:        goto yy455;
+                       case 45:        goto yy457;
+                       case 46:        goto yy462;
+                       case 47:        goto yy464;
+                       case 48:        goto yy466;
+                       case 49:        goto yy468;
+                       case 50:        goto yy470;
+                       case 51:        goto yy475;
+                       case 52:        goto yy485;
+                       case 53:        goto yy487;
+                       case 54:        goto yy489;
+                       case 55:        goto yy491;
+                       case 56:        goto yy493;
+                       case 57:        goto yy498;
+                       case 58:        goto yy502;
+                       case 59:        goto yy506;
+                       case 60:        goto yy508;
+                       case 61:        goto yy513;
+                       case 62:        goto yy518;
+                       case 63:        goto yy520;
+                       case 64:        goto yy528;
+                       case 65:        goto yy532;
+                       case 66:        goto yy534;
+                       case 67:        goto yy536;
+                       case 68:        goto yy538;
+                       case 69:        goto yy543;
+                       case 70:        goto yy545;
+                       case 71:        goto yy551;
+                       case 72:        goto yy556;
+                       case 73:        goto yy558;
+                       case 74:        goto yy563;
+                       case 75:        goto yy565;
+                       case 76:        goto yy573;
+                       case 77:        goto yy577;
+                       case 78:        goto yy581;
+                       case 79:        goto yy585;
+                       case 80:        goto yy587;
                        default:        goto yy592;
                        }
-yy107:
+yy115:
                        yych = *++cur;
                        switch (yych) {
-                       case '.':       goto yy193;
-                       default:        goto yy106;
+                       case '.':       goto yy207;
+                       default:        goto yy114;
                        }
-yy108:
+yy116:
                        yyaccept = 6;
                        mrk = ++cur;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
-                       ctxmrk = cur;
                        switch (yych) {
                        case '0':
                        case '1':
@@ -1465,35 +1515,34 @@ yy108:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy108;
+                       case '9':       goto yy116;
                        case 'D':
-                       case 'd':       goto yy195;
+                       case 'd':       goto yy209;
                        case 'F':
-                       case 'f':       goto yy196;
+                       case 'f':       goto yy210;
                        case 'L':
-                       case 'l':       goto yy198;
-                       default:        goto yy110;
+                       case 'l':       goto yy212;
+                       default:        goto yy118;
                        }
-yy110:
-#line 312 "src/parser.re"
+yy118:
+#line 314 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT; goto start; }
-#line 1481 "src/parser.c"
-yy111:
+#line 1531 "src/parser.c"
+yy119:
                        ++cur;
-#line 326 "src/parser.re"
+#line 328 "src/parser.re"
                        { goto comment; }
-#line 1486 "src/parser.c"
-yy113:
+#line 1536 "src/parser.c"
+yy121:
                        ++cur;
-#line 327 "src/parser.re"
+#line 329 "src/parser.re"
                        { goto comment_sl; }
-#line 1491 "src/parser.c"
-yy115:
+#line 1541 "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':
@@ -1504,22 +1553,22 @@ yy115:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy115;
+                       case '9':       goto yy123;
                        case 'D':
-                       case 'd':       goto yy195;
+                       case 'd':       goto yy209;
                        case 'E':
-                       case 'e':       goto yy119;
+                       case 'e':       goto yy127;
                        case 'F':
-                       case 'f':       goto yy196;
+                       case 'f':       goto yy210;
                        case 'L':
-                       case 'l':       goto yy198;
-                       default:        goto yy110;
+                       case 'l':       goto yy212;
+                       default:        goto yy118;
                        }
-yy117:
+yy125:
                        ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
-                       ctxmrk = cur;
+yy126:
                        switch (yych) {
                        case '0':
                        case '1':
@@ -1528,18 +1577,18 @@ yy117:
                        case '4':
                        case '5':
                        case '6':
-                       case '7':       goto yy117;
+                       case '7':       goto yy125;
                        case 'L':
-                       case 'l':       goto yy120;
+                       case 'l':       goto yy128;
                        case 'U':
-                       case 'u':       goto yy122;
+                       case 'u':       goto yy130;
                        default:        goto yy39;
                        }
-yy119:
+yy127:
                        yych = *++cur;
                        switch (yych) {
                        case '+':
-                       case '-':       goto yy105;
+                       case '-':       goto yy113;
                        case '0':
                        case '1':
                        case '2':
@@ -1549,37 +1598,37 @@ yy119:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy108;
-                       default:        goto yy106;
+                       case '9':       goto yy116;
+                       default:        goto yy114;
                        }
-yy120:
+yy128:
                        yyaccept = 7;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy200;
+                       case 'l':       goto yy214;
                        case 'U':
-                       case 'u':       goto yy201;
-                       default:        goto yy121;
+                       case 'u':       goto yy215;
+                       default:        goto yy129;
                        }
-yy121:
-                       cur = ctxmrk;
-#line 308 "src/parser.re"
+yy129:
+                       cur -= 1;
+#line 310 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 1570 "src/parser.c"
-yy122:
-                       ++cur;
-                       switch ((yych = *cur)) {
+#line 1619 "src/parser.c"
+yy130:
+                       yych = *++cur;
+                       switch (yych) {
                        case 'L':
-                       case 'l':       goto yy203;
-                       default:        goto yy123;
+                       case 'l':       goto yy217;
+                       default:        goto yy131;
                        }
-yy123:
-                       cur = ctxmrk;
-#line 307 "src/parser.re"
+yy131:
+                       cur -= 1;
+#line 309 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_U; cur += 1; goto start; }
-#line 1582 "src/parser.c"
-yy124:
+#line 1631 "src/parser.c"
+yy132:
                        yych = *++cur;
                        switch (yych) {
                        case '0':
@@ -1603,10 +1652,10 @@ yy124:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy204;
-                       default:        goto yy106;
+                       case 'f':       goto yy218;
+                       default:        goto yy114;
                        }
-yy125:
+yy133:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -1676,44 +1725,44 @@ yy125:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy125;
-                       case '>':       goto yy206;
-                       default:        goto yy106;
+                       case 'z':       goto yy133;
+                       case '>':       goto yy220;
+                       default:        goto yy114;
                        }
-yy127:
+yy135:
                        ++cur;
-#line 356 "src/parser.re"
+#line 358 "src/parser.re"
                        { NEWTOKEN(PSI_T_LSHIFT); goto start; }
-#line 1688 "src/parser.c"
-yy129:
+#line 1737 "src/parser.c"
+yy137:
                        ++cur;
-#line 358 "src/parser.re"
+#line 360 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_LE); goto start; }
-#line 1693 "src/parser.c"
-yy131:
+#line 1742 "src/parser.c"
+yy139:
                        ++cur;
-#line 341 "src/parser.re"
+#line 343 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_EQ); goto start; }
-#line 1698 "src/parser.c"
-yy133:
+#line 1747 "src/parser.c"
+yy141:
                        ++cur;
-#line 359 "src/parser.re"
+#line 361 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_GE); goto start; }
-#line 1703 "src/parser.c"
-yy135:
+#line 1752 "src/parser.c"
+yy143:
                        ++cur;
-#line 357 "src/parser.re"
+#line 359 "src/parser.re"
                        { NEWTOKEN(PSI_T_RSHIFT); goto start; }
-#line 1708 "src/parser.c"
-yy137:
+#line 1757 "src/parser.c"
+yy145:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy208;
+                       case 'r':       goto yy222;
                        default:        goto yy62;
                        }
-yy138:
+yy146:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -1792,120 +1841,100 @@ yy138:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy106;
+                       case 0x7F:      goto yy114;
                        default:        goto yy182;
                        }
-yy139:
+yy147:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy209;
+                       case 'o':       goto yy223;
                        default:        goto yy62;
                        }
-yy140:
+yy148:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy210;
-                       default:        goto yy62;
-                       }
-yy141:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy211;
+                       case 'l':       goto yy224;
                        default:        goto yy62;
                        }
-yy142:
+yy149:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy212;
                        case 'U':
-                       case 'u':       goto yy213;
+                       case 'u':       goto yy225;
                        default:        goto yy62;
                        }
-yy143:
+yy150:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy214;
-                       default:        goto yy62;
-                       }
-yy144:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy215;
+                       case 'f':       goto yy226;
                        default:        goto yy62;
                        }
-yy145:
+yy151:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy216;
+                       case 'i':       goto yy227;
                        case 'S':
-                       case 's':       goto yy217;
+                       case 's':       goto yy228;
                        default:        goto yy62;
                        }
-yy146:
+yy152:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy218;
-                       case 'U':
-                       case 'u':       goto yy219;
+                       case 'd':       goto yy229;
                        default:        goto yy62;
                        }
-yy147:
+yy153:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy220;
+                       case 'r':       goto yy230;
                        default:        goto yy62;
                        }
-yy148:
+yy154:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy221;
+                       case 'l':       goto yy231;
                        default:        goto yy62;
                        }
-yy149:
+yy155:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy222;
+                       case 'o':       goto yy232;
                        default:        goto yy62;
                        }
-yy150:
+yy156:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy223;
+                       case 'e':       goto yy233;
                        default:        goto yy62;
                        }
-yy151:
+yy157:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy224;
+                       case 'n':       goto yy234;
                        default:        goto yy62;
                        }
-yy152:
+yy158:
                        yyaccept = 8;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -1972,211 +2001,159 @@ yy152:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy153;
+                       case 0x7F:      goto yy159;
                        case 'D':
-                       case 'd':       goto yy225;
+                       case 'd':       goto yy235;
                        case 'N':
-                       case 'n':       goto yy226;
-                       case '\\':      goto yy138;
+                       case 'n':       goto yy236;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy153:
-#line 371 "src/parser.re"
+yy159:
+#line 391 "src/parser.re"
                        { NEWTOKEN(PSI_T_IF); goto start; }
-#line 1987 "src/parser.c"
-yy154:
+#line 2016 "src/parser.c"
+yy160:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy227;
+                       case 'c':       goto yy237;
                        case 'T':
-                       case 't':       goto yy228;
+                       case 't':       goto yy238;
                        default:        goto yy62;
                        }
-yy155:
+yy161:
                        ++cur;
-                       cur = ctxmrk;
-#line 324 "src/parser.re"
+                       cur -= 1;
+#line 326 "src/parser.re"
                        { char_width = SIZEOF_WCHAR_T/8; }
-#line 2003 "src/parser.c"
-yy157:
+#line 2032 "src/parser.c"
+yy163:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy230;
+                       case 't':       goto yy239;
                        default:        goto yy62;
                        }
-yy158:
+yy164:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy232;
-                       default:        goto yy62;
-                       }
-yy159:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy234;
+                       case 'b':       goto yy241;
                        default:        goto yy62;
                        }
-yy160:
+yy165:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'X':
-                       case 'x':       goto yy235;
+                       case 'x':       goto yy243;
                        default:        goto yy62;
                        }
-yy161:
+yy166:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy236;
+                       case 'l':       goto yy244;
                        default:        goto yy62;
                        }
-yy162:
+yy167:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy237;
+                       case 'j':       goto yy245;
                        default:        goto yy62;
                        }
-yy163:
+yy168:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy238;
+                       case 't':       goto yy246;
                        default:        goto yy62;
                        }
-yy164:
+yy169:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy239;
+                       case 's':       goto yy247;
                        default:        goto yy62;
                        }
-yy165:
+yy170:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy240;
+                       case 'e':       goto yy248;
                        default:        goto yy62;
                        }
-yy166:
+yy171:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy241;
+                       case 't':       goto yy249;
                        default:        goto yy62;
                        }
-yy167:
+yy172:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy242;
-                       default:        goto yy62;
-                       }
-yy168:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy244;
-                       default:        goto yy62;
-                       }
-yy169:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy245;
+                       case 't':       goto yy250;
                        default:        goto yy62;
                        }
-yy170:
+yy173:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy246;
+                       case 'a':       goto yy252;
                        case 'R':
-                       case 'r':       goto yy247;
+                       case 'r':       goto yy253;
                        default:        goto yy62;
                        }
-yy171:
+yy174:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'M':
-                       case 'm':       goto yy248;
+                       case 'm':       goto yy254;
                        default:        goto yy62;
                        }
-yy172:
+yy175:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy249;
+                       case '_':       goto yy255;
                        default:        goto yy62;
                        }
-yy173:
+yy176:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy250;
-                       default:        goto yy62;
-                       }
-yy174:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'P':
-                       case 'p':       goto yy251;
+                       case 'u':       goto yy256;
                        default:        goto yy62;
                        }
-yy175:
+yy177:
                        ++cur;
-                       cur = ctxmrk;
-#line 323 "src/parser.re"
+                       cur -= 1;
+#line 325 "src/parser.re"
                        { char_width = 4; }
-#line 2154 "src/parser.c"
-yy177:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy252;
-                       default:        goto yy62;
-                       }
-yy178:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy253;
-                       case 'I':
-                       case 'i':       goto yy254;
-                       case 'S':
-                       case 's':       goto yy255;
-                       default:        goto yy62;
-                       }
+#line 2151 "src/parser.c"
 yy179:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy256;
+                       case 'D':
+                       case 'd':       goto yy257;
                        default:        goto yy62;
                        }
 yy180:
@@ -2184,7 +2161,7 @@ yy180:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy257;
+                       case 'r':       goto yy258;
                        default:        goto yy62;
                        }
 yy181:
@@ -2192,7 +2169,7 @@ yy181:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy258;
+                       case 'a':       goto yy259;
                        default:        goto yy62;
                        }
 yy182:
@@ -2265,314 +2242,404 @@ yy182:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy184;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy182;
                        }
 yy184:
-#line 444 "src/parser.re"
+#line 441 "src/parser.re"
                        { NEWTOKEN(PSI_T_NSNAME); goto start; }
-#line 2275 "src/parser.c"
+#line 2252 "src/parser.c"
 yy185:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy259;
-                       case 'e':       goto yy260;
-                       case 'r':       goto yy261;
+                       case 'a':       goto yy260;
+                       case 'e':       goto yy261;
+                       case 'i':       goto yy262;
+                       case 'r':       goto yy263;
                        default:        goto yy62;
                        }
 yy186:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy232;
-                       case 'n':       goto yy262;
+                       case 'O':       goto yy223;
+                       case 'o':       goto yy264;
                        default:        goto yy62;
                        }
 yy187:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy240;
-                       case 'a':       goto yy263;
+                       case 'a':       goto yy265;
                        default:        goto yy62;
                        }
 yy188:
-                       ++cur;
-                       cur = ctxmrk;
-#line 322 "src/parser.re"
-                       { char_width = 2; }
-#line 2308 "src/parser.c"
-yy190:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
-                       switch (yych) {
-                       case '"':       goto yy264;
-                       default:        goto yy62;
-                       }
-yy191:
-                       ++cur;
-#line 343 "src/parser.re"
-                       { NEWTOKEN(PSI_T_OR); goto start; }
-#line 2321 "src/parser.c"
-yy193:
-                       ++cur;
-#line 363 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ELLIPSIS); goto start; }
-#line 2326 "src/parser.c"
-yy195:
-                       yych = *++cur;
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy266;
-                       case 'F':
-                       case 'f':       goto yy268;
-                       case 'L':
-                       case 'l':       goto yy270;
-                       default:        goto yy106;
-                       }
-yy196:
-                       ++cur;
-                       cur = ctxmrk;
-#line 313 "src/parser.re"
-                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_F; cur += 1; goto start; }
-#line 2343 "src/parser.c"
-yy198:
-                       ++cur;
-                       cur = ctxmrk;
-#line 314 "src/parser.re"
-                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 2349 "src/parser.c"
-yy200:
-                       yych = *++cur;
-                       switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy272;
-                       default:        goto yy106;
-                       }
-yy201:
-                       ++cur;
-yy202:
-                       cur = ctxmrk;
-#line 309 "src/parser.re"
-                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_UL; cur += 2; goto start; }
-#line 2363 "src/parser.c"
-yy203:
-                       yych = *++cur;
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy272;
-                       default:        goto yy202;
-                       }
-yy204:
-                       yyaccept = 3;
-                       mrk = ++cur;
-                       if ((lim - cur) < 3) if (cur >= lim) goto done;;
-                       yych = *cur;
-                       ctxmrk = cur;
                        switch (yych) {
-                       case '.':       goto yy274;
-                       case '0':
-                       case '1':
-                       case '2':
-                       case '3':
-                       case '4':
-                       case '5':
-                       case '6':
-                       case '7':
-                       case '8':
-                       case '9':
-                       case 'A':
-                       case 'B':
-                       case 'C':
-                       case 'D':
-                       case 'E':
-                       case 'F':
-                       case 'a':
-                       case 'b':
-                       case 'c':
-                       case 'd':
-                       case 'e':
-                       case 'f':       goto yy204;
-                       case 'L':
-                       case 'l':       goto yy120;
-                       case 'P':
-                       case 'p':       goto yy119;
                        case 'U':
-                       case 'u':       goto yy122;
-                       default:        goto yy39;
+                       case 'u':       goto yy225;
+                       case 'n':       goto yy266;
+                       default:        goto yy62;
                        }
-yy206:
-                       ++cur;
-#line 446 "src/parser.re"
-                       { tok += 1; cur -= 1; NEWTOKEN(PSI_T_CPP_HEADER); cur += 1; goto start; }
-#line 2413 "src/parser.c"
-yy208:
+yy189:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy276;
-                       case 'V':
-                       case 'v':       goto yy277;
+                       case 'u':       goto yy267;
                        default:        goto yy62;
                        }
-yy209:
+yy190:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy278;
+                       case 'D':
+                       case 'd':       goto yy229;
+                       case 'u':       goto yy268;
                        default:        goto yy62;
                        }
-yy210:
+yy191:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy280;
+                       case 'O':       goto yy232;
+                       case 'o':       goto yy269;
                        default:        goto yy62;
                        }
-yy211:
+yy192:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy281;
+                       case 'C':
+                       case 'c':       goto yy237;
+                       case 'T':       goto yy238;
+                       case 't':       goto yy270;
                        default:        goto yy62;
                        }
-yy212:
+yy193:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'S':
-                       case 's':       goto yy283;
+                       case 'B':
+                       case 'b':       goto yy241;
+                       case 'n':       goto yy272;
                        default:        goto yy62;
                        }
-yy213:
+yy194:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy284;
+                       case 'n':       goto yy273;
                        default:        goto yy62;
                        }
-yy214:
+yy195:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy285;
+                       case 'E':
+                       case 'e':       goto yy248;
+                       case 'a':       goto yy274;
                        default:        goto yy62;
                        }
-yy215:
+yy196:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy286;
+                       case 'o':       goto yy275;
                        default:        goto yy62;
                        }
-yy216:
+yy197:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'F':
-                       case 'f':       goto yy287;
+                       case 'g':       goto yy276;
+                       case 'z':       goto yy277;
                        default:        goto yy62;
                        }
-yy217:
+yy198:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy289;
+                       case 'A':
+                       case 'a':       goto yy252;
+                       case 'R':       goto yy253;
+                       case 'r':       goto yy278;
+                       default:        goto yy62;
+                       }
+yy199:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'p':       goto yy279;
+                       default:        goto yy62;
+                       }
+yy200:
+                       ++cur;
+                       cur -= 1;
+#line 324 "src/parser.re"
+                       { char_width = 2; }
+#line 2383 "src/parser.c"
+yy202:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '"':       goto yy280;
+                       default:        goto yy62;
+                       }
+yy203:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy257;
+                       case 'i':       goto yy282;
+                       case 's':       goto yy283;
+                       default:        goto yy62;
+                       }
+yy204:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy284;
+                       case 'l':       goto yy285;
                        default:        goto yy62;
                        }
+yy205:
+                       ++cur;
+#line 345 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OR); goto start; }
+#line 2413 "src/parser.c"
+yy207:
+                       ++cur;
+#line 365 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ELLIPSIS); goto start; }
+#line 2418 "src/parser.c"
+yy209:
+                       yych = *++cur;
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy286;
+                       case 'F':
+                       case 'f':       goto yy288;
+                       case 'L':
+                       case 'l':       goto yy290;
+                       default:        goto yy114;
+                       }
+yy210:
+                       ++cur;
+                       cur -= 1;
+#line 315 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_F; cur += 1; goto start; }
+#line 2435 "src/parser.c"
+yy212:
+                       ++cur;
+                       cur -= 1;
+#line 316 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_L; cur += 1; goto start; }
+#line 2441 "src/parser.c"
+yy214:
+                       yych = *++cur;
+                       switch (yych) {
+                       case 'U':
+                       case 'u':       goto yy292;
+                       default:        goto yy114;
+                       }
+yy215:
+                       ++cur;
+yy216:
+                       cur -= 2;
+#line 311 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_UL; cur += 2; goto start; }
+#line 2455 "src/parser.c"
+yy217:
+                       yych = *++cur;
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy292;
+                       default:        goto yy216;
+                       }
 yy218:
+                       yyaccept = 3;
+                       mrk = ++cur;
+                       if ((lim - cur) < 3) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case '.':       goto yy294;
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':       goto yy218;
+                       case 'L':
+                       case 'l':       goto yy128;
+                       case 'P':
+                       case 'p':       goto yy127;
+                       case 'U':
+                       case 'u':       goto yy130;
+                       default:        goto yy39;
+                       }
+yy220:
+                       ++cur;
+#line 443 "src/parser.re"
+                       { tok += 1; cur -= 1; NEWTOKEN(PSI_T_CPP_HEADER); cur += 1; goto start; }
+#line 2504 "src/parser.c"
+yy222:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy296;
+                       case 'V':
+                       case 'v':       goto yy297;
+                       default:        goto yy62;
+                       }
+yy223:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy298;
+                       default:        goto yy62;
+                       }
+yy224:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy299;
+                       default:        goto yy62;
+                       }
+yy225:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy300;
+                       default:        goto yy62;
+                       }
+yy226:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy291;
+                       case 'i':       goto yy301;
                        default:        goto yy62;
                        }
-yy219:
+yy227:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'M':
-                       case 'm':       goto yy292;
+                       case 'F':
+                       case 'f':       goto yy302;
                        default:        goto yy62;
                        }
-yy220:
+yy228:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy304;
+                       default:        goto yy62;
+                       }
+yy229:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy306;
+                       default:        goto yy62;
+                       }
+yy230:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy294;
+                       case 'o':       goto yy307;
                        default:        goto yy62;
                        }
-yy221:
+yy231:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy295;
+                       case 's':       goto yy308;
                        default:        goto yy62;
                        }
-yy222:
+yy232:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy296;
+                       case 'a':       goto yy309;
                        default:        goto yy62;
                        }
-yy223:
+yy233:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy297;
+                       case 'e':       goto yy310;
                        default:        goto yy62;
                        }
-yy224:
+yy234:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy299;
+                       case 'c':       goto yy312;
                        default:        goto yy62;
                        }
-yy225:
+yy235:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy300;
+                       case 'e':       goto yy313;
                        default:        goto yy62;
                        }
-yy226:
+yy236:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy301;
+                       case 'd':       goto yy314;
                        default:        goto yy62;
                        }
-yy227:
+yy237:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy302;
+                       case 'l':       goto yy315;
                        default:        goto yy62;
                        }
-yy228:
+yy238:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'V':
+                       case 'v':       goto yy316;
+                       default:        goto yy62;
+                       }
+yy239:
                        yyaccept = 10;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -2639,21 +2706,15 @@ yy228:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy229;
-                       case '1':       goto yy303;
-                       case '3':       goto yy304;
-                       case '6':       goto yy305;
-                       case '8':       goto yy306;
-                       case 'V':
-                       case 'v':       goto yy307;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy240;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy229:
-#line 393 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT); goto start; }
-#line 2656 "src/parser.c"
-yy230:
+yy240:
+#line 416 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LET); goto start; }
+#line 2717 "src/parser.c"
+yy241:
                        yyaccept = 11;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -2720,15 +2781,72 @@ yy230:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy231;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy242;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy231:
-#line 419 "src/parser.re"
-                       { NEWTOKEN(PSI_T_LET); goto start; }
-#line 2731 "src/parser.c"
-yy232:
+yy242:
+#line 415 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LIB); goto start; }
+#line 2792 "src/parser.c"
+yy243:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy317;
+                       default:        goto yy62;
+                       }
+yy244:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy318;
+                       default:        goto yy62;
+                       }
+yy245:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy320;
+                       case 'V':
+                       case 'v':       goto yy321;
+                       default:        goto yy62;
+                       }
+yy246:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'H':
+                       case 'h':       goto yy322;
+                       default:        goto yy62;
+                       }
+yy247:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy323;
+                       default:        goto yy62;
+                       }
+yy248:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy324;
+                       default:        goto yy62;
+                       }
+yy249:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'U':
+                       case 'u':       goto yy325;
+                       default:        goto yy62;
+                       }
+yy250:
                        yyaccept = 12;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -2795,80 +2913,166 @@ yy232:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy233;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy251;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy233:
-#line 418 "src/parser.re"
-                       { NEWTOKEN(PSI_T_LIB); goto start; }
-#line 2806 "src/parser.c"
-yy234:
+yy251:
+#line 417 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SET); goto start; }
+#line 2924 "src/parser.c"
+yy252:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy308;
+                       case 'T':
+                       case 't':       goto yy326;
                        default:        goto yy62;
                        }
-yy235:
+yy253:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy327;
+                       case 'L':
+                       case 'l':       goto yy328;
+                       case 'V':
+                       case 'v':       goto yy329;
+                       default:        goto yy62;
+                       }
+yy254:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'P':
+                       case 'p':       goto yy330;
+                       default:        goto yy62;
+                       }
+yy255:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy332;
+                       case 'B':
+                       case 'b':       goto yy333;
+                       case 'F':
+                       case 'f':       goto yy334;
+                       case 'I':
+                       case 'i':       goto yy335;
+                       case 'O':
+                       case 'o':       goto yy336;
+                       case 'S':
+                       case 's':       goto yy337;
+                       default:        goto yy62;
+                       }
+yy256:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy310;
+                       case 'e':       goto yy338;
                        default:        goto yy62;
                        }
-yy236:
+yy257:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy340;
+                       default:        goto yy62;
+                       }
+yy258:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy341;
+                       default:        goto yy62;
+                       }
+yy259:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy311;
+                       case 'l':       goto yy342;
                        default:        goto yy62;
                        }
-yy237:
+yy260:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy313;
-                       case 'V':
-                       case 'v':       goto yy314;
+                       case 's':       goto yy344;
+                       case 't':       goto yy345;
                        default:        goto yy62;
                        }
-yy238:
+yy261:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'H':
-                       case 'h':       goto yy315;
+                       case 'x':       goto yy346;
                        default:        goto yy62;
                        }
-yy239:
+yy262:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy316;
+                       case 'n':       goto yy347;
                        default:        goto yy62;
                        }
-yy240:
+yy263:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy317;
+                       case 'e':       goto yy348;
                        default:        goto yy62;
                        }
-yy241:
+yy264:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy318;
+                       case 'L':       goto yy298;
+                       case 'l':       goto yy349;
                        default:        goto yy62;
                        }
-yy242:
+yy265:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'r':       goto yy351;
+                       default:        goto yy62;
+                       }
+yy266:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 's':       goto yy353;
+                       default:        goto yy62;
+                       }
+yy267:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'b':       goto yy354;
+                       default:        goto yy62;
+                       }
+yy268:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'm':       goto yy355;
+                       default:        goto yy62;
+                       }
+yy269:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':       goto yy309;
+                       case 'a':       goto yy357;
+                       default:        goto yy62;
+                       }
+yy270:
                        yyaccept = 13;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -2935,217 +3139,137 @@ yy242:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy243;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
-                       }
-yy243:
-#line 420 "src/parser.re"
-                       { NEWTOKEN(PSI_T_SET); goto start; }
-#line 2946 "src/parser.c"
-yy244:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy319;
-                       default:        goto yy62;
-                       }
-yy245:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy320;
-                       default:        goto yy62;
-                       }
-yy246:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy321;
-                       default:        goto yy62;
-                       }
-yy247:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy322;
-                       case 'L':
-                       case 'l':       goto yy323;
-                       case 'U':
-                       case 'u':       goto yy324;
+                       case 0x7F:      goto yy271;
                        case 'V':
-                       case 'v':       goto yy325;
-                       default:        goto yy62;
+                       case 'v':       goto yy316;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
                        }
-yy248:
+yy271:
+#line 385 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT); goto start; }
+#line 3152 "src/parser.c"
+yy272:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'P':
-                       case 'p':       goto yy326;
+                       case 'e':       goto yy358;
                        default:        goto yy62;
                        }
-yy249:
+yy273:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy328;
-                       case 'B':
-                       case 'b':       goto yy329;
-                       case 'F':
-                       case 'f':       goto yy330;
-                       case 'I':
-                       case 'i':       goto yy331;
-                       case 'O':
-                       case 'o':       goto yy332;
-                       case 'S':
-                       case 's':       goto yy333;
+                       case 'g':       goto yy360;
                        default:        goto yy62;
                        }
-yy250:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy334;
-                       default:        goto yy62;
-                       }
-yy251:
+yy274:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy336;
+                       case 'g':       goto yy362;
                        default:        goto yy62;
                        }
-yy252:
+yy275:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy337;
+                       case 'r':       goto yy363;
                        default:        goto yy62;
                        }
-yy253:
+yy276:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy338;
+                       case 'n':       goto yy364;
                        default:        goto yy62;
                        }
-yy254:
+yy277:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy339;
+                       case 'e':       goto yy365;
                        default:        goto yy62;
                        }
-yy255:
+yy278:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy340;
-                       default:        goto yy62;
-                       }
-yy256:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy341;
-                       default:        goto yy62;
-                       }
-yy257:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy343;
-                       default:        goto yy62;
-                       }
-yy258:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
+                       case 'i':       goto yy327;
                        case 'L':
-                       case 'l':       goto yy344;
+                       case 'l':       goto yy328;
+                       case 'V':
+                       case 'v':       goto yy329;
+                       case 'u':       goto yy366;
                        default:        goto yy62;
                        }
-yy259:
+yy279:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy346;
-                       case 't':       goto yy347;
+                       case 'e':       goto yy367;
                        default:        goto yy62;
                        }
-yy260:
+yy280:
+                       ++cur;
+                       cur -= 1;
+#line 323 "src/parser.re"
+                       { char_width = 1; }
+#line 3220 "src/parser.c"
+yy282:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'x':       goto yy348;
+                       case 'o':       goto yy368;
                        default:        goto yy62;
                        }
-yy261:
+yy283:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy349;
+                       case 'i':       goto yy369;
                        default:        goto yy62;
                        }
-yy262:
+yy284:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy350;
+                       case 'd':       goto yy370;
                        default:        goto yy62;
                        }
-yy263:
+yy285:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy352;
+                       case 'a':       goto yy372;
                        default:        goto yy62;
                        }
-yy264:
-                       ++cur;
-                       cur = ctxmrk;
-#line 321 "src/parser.re"
-                       { char_width = 1; }
-#line 3124 "src/parser.c"
-yy266:
+yy286:
                        ++cur;
-                       cur = ctxmrk;
-#line 316 "src/parser.re"
+                       cur -= 2;
+#line 318 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DD; cur += 2; goto start; }
-#line 3130 "src/parser.c"
-yy268:
+#line 3254 "src/parser.c"
+yy288:
                        ++cur;
-                       cur = ctxmrk;
-#line 315 "src/parser.re"
+                       cur -= 2;
+#line 317 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DF; cur += 2; goto start; }
-#line 3136 "src/parser.c"
-yy270:
+#line 3260 "src/parser.c"
+yy290:
                        ++cur;
-                       cur = ctxmrk;
-#line 317 "src/parser.re"
+                       cur -= 2;
+#line 319 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DL; cur += 2; goto start; }
-#line 3142 "src/parser.c"
-yy272:
+#line 3266 "src/parser.c"
+yy292:
                        ++cur;
-                       cur = ctxmrk;
-#line 310 "src/parser.re"
+                       cur -= 3;
+#line 312 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_ULL; cur += 3; goto start; }
-#line 3148 "src/parser.c"
-yy274:
+#line 3272 "src/parser.c"
+yy294:
                        ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -3171,225 +3295,65 @@ yy274:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy274;
+                       case 'f':       goto yy294;
                        case 'P':
-                       case 'p':       goto yy119;
-                       default:        goto yy106;
+                       case 'p':       goto yy127;
+                       default:        goto yy114;
                        }
-yy276:
+yy296:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy353;
+                       case 'y':       goto yy373;
                        default:        goto yy62;
                        }
-yy277:
+yy297:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy355;
+                       case 'a':       goto yy375;
                        default:        goto yy62;
                        }
-yy278:
-                       yyaccept = 14;
+yy298:
+                       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 '\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 yy279;
                        case 'V':
-                       case 'v':       goto yy356;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
+                       case 'v':       goto yy376;
+                       default:        goto yy62;
                        }
-yy279:
-#line 390 "src/parser.re"
-                       { NEWTOKEN(PSI_T_BOOL); goto start; }
-#line 3272 "src/parser.c"
-yy280:
+yy299:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy357;
+                       case 'a':       goto yy377;
                        case 'B':
-                       case 'b':       goto yy358;
+                       case 'b':       goto yy378;
                        case 'O':
-                       case 'o':       goto yy359;
-                       default:        goto yy62;
-                       }
-yy281:
-                       yyaccept = 15;
-                       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 yy282;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
-                       }
-yy282:
-#line 391 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CHAR); goto start; }
-#line 3359 "src/parser.c"
-yy283:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy360;
+                       case 'o':       goto yy379;
                        default:        goto yy62;
                        }
-yy284:
+yy300:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy362;
+                       case 't':       goto yy380;
                        default:        goto yy62;
                        }
-yy285:
+yy301:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy364;
-                       default:        goto yy62;
-                       }
-yy286:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy365;
+                       case 'n':       goto yy382;
                        default:        goto yy62;
                        }
-yy287:
-                       yyaccept = 16;
+yy302:
+                       yyaccept = 14;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3455,16 +3419,16 @@ yy287:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy288;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy303;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy288:
-#line 375 "src/parser.re"
+yy303:
+#line 395 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELIF); goto start; }
-#line 3466 "src/parser.c"
-yy289:
-                       yyaccept = 17;
+#line 3430 "src/parser.c"
+yy304:
+                       yyaccept = 15;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3530,123 +3494,48 @@ yy289:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy290;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy305;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy290:
-#line 374 "src/parser.re"
+yy305:
+#line 394 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELSE); goto start; }
-#line 3541 "src/parser.c"
-yy291:
+#line 3505 "src/parser.c"
+yy306:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy366;
+                       case 'f':       goto yy383;
                        default:        goto yy62;
                        }
-yy292:
-                       yyaccept = 18;
-                       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 yy293;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
-                       }
-yy293:
-#line 416 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ENUM); goto start; }
-#line 3624 "src/parser.c"
-yy294:
+yy307:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy368;
+                       case 'r':       goto yy385;
                        default:        goto yy62;
                        }
-yy295:
+yy308:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy370;
+                       case 'e':       goto yy387;
                        default:        goto yy62;
                        }
-yy296:
+yy309:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy372;
+                       case 't':       goto yy389;
                        default:        goto yy62;
                        }
-yy297:
-                       yyaccept = 19;
+yy310:
+                       yyaccept = 16;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3712,84 +3601,64 @@ yy297:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy298;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy311;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy298:
-#line 424 "src/parser.re"
+yy311:
+#line 421 "src/parser.re"
                        { NEWTOKEN(PSI_T_FREE); goto start; }
-#line 3723 "src/parser.c"
-yy299:
+#line 3612 "src/parser.c"
+yy312:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy374;
+                       case 't':       goto yy390;
                        default:        goto yy62;
                        }
-yy300:
+yy313:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy375;
+                       case 'f':       goto yy391;
                        default:        goto yy62;
                        }
-yy301:
+yy314:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy377;
+                       case 'e':       goto yy393;
                        default:        goto yy62;
                        }
-yy302:
+yy315:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy378;
-                       default:        goto yy62;
-                       }
-yy303:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '6':       goto yy379;
-                       default:        goto yy62;
-                       }
-yy304:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '2':       goto yy380;
-                       default:        goto yy62;
-                       }
-yy305:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '4':       goto yy381;
+                       case 'u':       goto yy394;
                        default:        goto yy62;
                        }
-yy306:
+yy316:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy382;
+                       case 'A':
+                       case 'a':       goto yy395;
                        default:        goto yy62;
                        }
-yy307:
+yy317:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy383;
+                       case 'D':
+                       case 'd':       goto yy396;
                        default:        goto yy62;
                        }
-yy308:
-                       yyaccept = 20;
+yy318:
+                       yyaccept = 17;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3855,24 +3724,95 @@ yy308:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy309;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy319;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy309:
-#line 394 "src/parser.re"
-                       { NEWTOKEN(PSI_T_LONG); goto start; }
-#line 3866 "src/parser.c"
-yy310:
+yy319:
+#line 406 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NULL); goto start; }
+#line 3735 "src/parser.c"
+yy320:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy384;
+                       case 'C':
+                       case 'c':       goto yy398;
                        default:        goto yy62;
                        }
-yy311:
-                       yyaccept = 21;
+yy321:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy399;
+                       default:        goto yy62;
+                       }
+yy322:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'V':
+                       case 'v':       goto yy400;
+                       default:        goto yy62;
+                       }
+yy323:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy401;
+                       default:        goto yy62;
+                       }
+yy324:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy402;
+                       default:        goto yy62;
+                       }
+yy325:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy403;
+                       default:        goto yy62;
+                       }
+yy326:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy404;
+                       default:        goto yy62;
+                       }
+yy327:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy405;
+                       default:        goto yy62;
+                       }
+yy328:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy406;
+                       default:        goto yy62;
+                       }
+yy329:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy407;
+                       default:        goto yy62;
+                       }
+yy330:
+                       yyaccept = 18;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3938,119 +3878,64 @@ yy311:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy312;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy331;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy312:
-#line 386 "src/parser.re"
-                       { NEWTOKEN(PSI_T_NULL); goto start; }
-#line 3949 "src/parser.c"
-yy313:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy386;
-                       default:        goto yy62;
-                       }
-yy314:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy387;
-                       default:        goto yy62;
-                       }
-yy315:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'V':
-                       case 'v':       goto yy388;
-                       default:        goto yy62;
-                       }
-yy316:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy389;
-                       default:        goto yy62;
-                       }
-yy317:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy390;
-                       default:        goto yy62;
-                       }
-yy318:
+yy331:
+#line 422 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TEMP); goto start; }
+#line 3889 "src/parser.c"
+yy332:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy391;
-                       default:        goto yy62;
-                       }
-yy319:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy392;
+                       case 'r':       goto yy408;
                        default:        goto yy62;
                        }
-yy320:
+yy333:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy394;
+                       case 'O':
+                       case 'o':       goto yy409;
                        default:        goto yy62;
                        }
-yy321:
+yy334:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy395;
+                       case 'L':
+                       case 'l':       goto yy410;
                        default:        goto yy62;
                        }
-yy322:
+yy335:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy396;
-                       default:        goto yy62;
-                       }
-yy323:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy397;
+                       case 'n':       goto yy411;
                        default:        goto yy62;
                        }
-yy324:
+yy336:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy398;
+                       case 'B':
+                       case 'b':       goto yy412;
                        default:        goto yy62;
                        }
-yy325:
+yy337:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy399;
+                       case 'T':
+                       case 't':       goto yy413;
                        default:        goto yy62;
                        }
-yy326:
-                       yyaccept = 22;
+yy338:
+                       yyaccept = 19;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4116,64 +4001,32 @@ yy326:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy327;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy339;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy327:
-#line 425 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TEMP); goto start; }
-#line 4127 "src/parser.c"
-yy328:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy400;
-                       default:        goto yy62;
-                       }
-yy329:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy401;
-                       default:        goto yy62;
-                       }
-yy330:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy402;
-                       default:        goto yy62;
-                       }
-yy331:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy403;
-                       default:        goto yy62;
-                       }
-yy332:
+yy339:
+#line 404 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TRUE); goto start; }
+#line 4012 "src/parser.c"
+yy340:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy404;
+                       case 'F':
+                       case 'f':       goto yy414;
                        default:        goto yy62;
                        }
-yy333:
+yy341:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy405;
+                       case 'I':
+                       case 'i':       goto yy416;
                        default:        goto yy62;
                        }
-yy334:
-                       yyaccept = 23;
+yy342:
+                       yyaccept = 20;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4239,58 +4092,51 @@ yy334:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy335;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
-                       }
-yy335:
-#line 384 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TRUE); goto start; }
-#line 4250 "src/parser.c"
-yy336:
+                       case 0x7F:      goto yy343;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
+                       }
+yy343:
+#line 431 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ZVAL); goto start; }
+#line 4103 "src/parser.c"
+yy344:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy406;
+                       case 'm':       goto yy417;
                        default:        goto yy62;
                        }
-yy337:
+yy345:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '1':       goto yy407;
-                       case '3':       goto yy408;
-                       case '6':       goto yy409;
-                       case '8':       goto yy410;
+                       case 't':       goto yy418;
                        default:        goto yy62;
                        }
-yy338:
+yy346:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'F':
-                       case 'f':       goto yy411;
+                       case 't':       goto yy419;
                        default:        goto yy62;
                        }
-yy339:
+yy347:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy413;
+                       case 'l':       goto yy420;
                        default:        goto yy62;
                        }
-yy340:
+yy348:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy415;
+                       case 's':       goto yy421;
                        default:        goto yy62;
                        }
-yy341:
-                       yyaccept = 24;
+yy349:
+                       yyaccept = 21;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4356,24 +4202,18 @@ yy341:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy342;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy350;
+                       case 'V':
+                       case 'v':       goto yy376;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy342:
-#line 389 "src/parser.re"
-                       { NEWTOKEN(PSI_T_VOID); goto start; }
-#line 4367 "src/parser.c"
-yy343:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy416;
-                       default:        goto yy62;
-                       }
-yy344:
-                       yyaccept = 25;
+yy350:
+#line 382 "src/parser.re"
+                       { NEWTOKEN(PSI_T_BOOL); goto start; }
+#line 4215 "src/parser.c"
+yy351:
+                       yyaccept = 22;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4439,44 +4279,30 @@ yy344:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy345;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy352;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy345:
-#line 434 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ZVAL); goto start; }
-#line 4450 "src/parser.c"
-yy346:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'm':       goto yy417;
-                       default:        goto yy62;
-                       }
-yy347:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy418;
-                       default:        goto yy62;
-                       }
-yy348:
+yy352:
+#line 383 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CHAR); goto start; }
+#line 4290 "src/parser.c"
+yy353:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy419;
+                       case 't':       goto yy422;
                        default:        goto yy62;
                        }
-yy349:
+yy354:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy420;
+                       case 'l':       goto yy424;
                        default:        goto yy62;
                        }
-yy350:
-                       yyaccept = 26;
+yy355:
+                       yyaccept = 23;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4542,23 +4368,24 @@ yy350:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy351;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy356;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy351:
-#line 370 "src/parser.re"
-                       { NEWTOKEN(PSI_T_LINE); goto start; }
-#line 4553 "src/parser.c"
-yy352:
+yy356:
+#line 379 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ENUM); goto start; }
+#line 4379 "src/parser.c"
+yy357:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy421;
+                       case 'T':       goto yy389;
+                       case 't':       goto yy425;
                        default:        goto yy62;
                        }
-yy353:
-                       yyaccept = 27;
+yy358:
+                       yyaccept = 24;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4624,56 +4451,16 @@ yy353:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy354;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy359;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy354:
-#line 408 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ARRAY); goto start; }
-#line 4635 "src/parser.c"
-yy355:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy422;
-                       default:        goto yy62;
-                       }
-yy356:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy424;
-                       default:        goto yy62;
-                       }
-yy357:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy425;
-                       default:        goto yy62;
-                       }
-yy358:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy426;
-                       default:        goto yy62;
-                       }
 yy359:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy427;
-                       default:        goto yy62;
-                       }
+#line 375 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LINE); goto start; }
+#line 4462 "src/parser.c"
 yy360:
-                       yyaccept = 28;
+                       yyaccept = 25;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4740,15 +4527,71 @@ yy360:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy361;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy361:
-#line 417 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CONST); goto start; }
-#line 4750 "src/parser.c"
+#line 386 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LONG); goto start; }
+#line 4537 "src/parser.c"
 yy362:
-                       yyaccept = 29;
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'm':       goto yy427;
+                       default:        goto yy62;
+                       }
+yy363:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy428;
+                       default:        goto yy62;
+                       }
+yy364:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy430;
+                       default:        goto yy62;
+                       }
+yy365:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'o':       goto yy431;
+                       default:        goto yy62;
+                       }
+yy366:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'c':       goto yy432;
+                       default:        goto yy62;
+                       }
+yy367:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'd':       goto yy433;
+                       default:        goto yy62;
+                       }
+yy368:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy434;
+                       default:        goto yy62;
+                       }
+yy369:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'g':       goto yy436;
+                       default:        goto yy62;
+                       }
+yy370:
+                       yyaccept = 26;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4814,32 +4657,23 @@ yy362:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy363;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy371;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy363:
-#line 435 "src/parser.re"
-                       { NEWTOKEN(PSI_T_COUNT); goto start; }
-#line 4825 "src/parser.c"
-yy364:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy429;
-                       default:        goto yy62;
-                       }
-yy365:
+yy371:
+#line 381 "src/parser.re"
+                       { NEWTOKEN(PSI_T_VOID); goto start; }
+#line 4668 "src/parser.c"
+yy372:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy431;
+                       case 't':       goto yy437;
                        default:        goto yy62;
                        }
-yy366:
-                       yyaccept = 30;
+yy373:
+                       yyaccept = 27;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4905,16 +4739,56 @@ yy366:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy367;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy374;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy367:
-#line 376 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ENDIF); goto start; }
-#line 4916 "src/parser.c"
-yy368:
-                       yyaccept = 31;
+yy374:
+#line 410 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ARRAY); goto start; }
+#line 4750 "src/parser.c"
+yy375:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy438;
+                       default:        goto yy62;
+                       }
+yy376:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy440;
+                       default:        goto yy62;
+                       }
+yy377:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'B':
+                       case 'b':       goto yy441;
+                       default:        goto yy62;
+                       }
+yy378:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy442;
+                       default:        goto yy62;
+                       }
+yy379:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'C':
+                       case 'c':       goto yy443;
+                       default:        goto yy62;
+                       }
+yy380:
+                       yyaccept = 28;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4980,16 +4854,24 @@ yy368:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy369;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy381;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy369:
-#line 381 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ERROR); goto start; }
-#line 4991 "src/parser.c"
-yy370:
-                       yyaccept = 32;
+yy381:
+#line 432 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COUNT); goto start; }
+#line 4865 "src/parser.c"
+yy382:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy445;
+                       default:        goto yy62;
+                       }
+yy383:
+                       yyaccept = 29;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5055,16 +4937,16 @@ yy370:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy371;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy384;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy371:
-#line 385 "src/parser.re"
-                       { NEWTOKEN(PSI_T_FALSE); goto start; }
-#line 5066 "src/parser.c"
-yy372:
-                       yyaccept = 33;
+yy384:
+#line 396 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ENDIF); goto start; }
+#line 4948 "src/parser.c"
+yy385:
+                       yyaccept = 30;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5130,26 +5012,16 @@ yy372:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy373;
-                       case 'V':
-                       case 'v':       goto yy433;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy386;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy373:
-#line 395 "src/parser.re"
-                       { NEWTOKEN(PSI_T_FLOAT); goto start; }
-#line 5143 "src/parser.c"
-yy374:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy434;
-                       default:        goto yy62;
-                       }
-yy375:
-                       yyaccept = 34;
+yy386:
+#line 401 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ERROR); goto start; }
+#line 5023 "src/parser.c"
+yy387:
+                       yyaccept = 31;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5215,69 +5087,32 @@ yy375:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy376;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy388;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy376:
-#line 372 "src/parser.re"
-                       { NEWTOKEN(PSI_T_IFDEF); goto start; }
-#line 5226 "src/parser.c"
-yy377:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'F':
-                       case 'f':       goto yy435;
-                       default:        goto yy62;
-                       }
-yy378:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy437;
-                       default:        goto yy62;
-                       }
-yy379:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy438;
-                       default:        goto yy62;
-                       }
-yy380:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy439;
-                       default:        goto yy62;
-                       }
-yy381:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy440;
-                       default:        goto yy62;
-                       }
-yy382:
+yy388:
+#line 405 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FALSE); goto start; }
+#line 5098 "src/parser.c"
+yy389:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy441;
+                       case 'V':
+                       case 'v':       goto yy447;
                        default:        goto yy62;
                        }
-yy383:
+yy390:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy443;
+                       case 'I':
+                       case 'i':       goto yy448;
                        default:        goto yy62;
                        }
-yy384:
-                       yyaccept = 35;
+yy391:
+                       yyaccept = 32;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5343,64 +5178,40 @@ yy384:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy385;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy392;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy385:
-#line 387 "src/parser.re"
-                       { NEWTOKEN(PSI_T_MIXED); goto start; }
-#line 5354 "src/parser.c"
-yy386:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy445;
-                       default:        goto yy62;
-                       }
-yy387:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy447;
-                       default:        goto yy62;
-                       }
-yy388:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy449;
-                       default:        goto yy62;
-                       }
-yy389:
+yy392:
+#line 392 "src/parser.re"
+                       { NEWTOKEN(PSI_T_IFDEF); goto start; }
+#line 5189 "src/parser.c"
+yy393:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy450;
+                       case 'F':
+                       case 'f':       goto yy449;
                        default:        goto yy62;
                        }
-yy390:
+yy394:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'S':
-                       case 's':       goto yy451;
+                       case 'D':
+                       case 'd':       goto yy451;
                        default:        goto yy62;
                        }
-yy391:
+yy395:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy452;
+                       case 'L':
+                       case 'l':       goto yy452;
                        default:        goto yy62;
                        }
-yy392:
-                       yyaccept = 36;
+yy396:
+                       yyaccept = 33;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5466,52 +5277,20 @@ yy392:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy393;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy397;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy393:
-#line 392 "src/parser.re"
-                       { NEWTOKEN(PSI_T_SHORT); goto start; }
-#line 5477 "src/parser.c"
-yy394:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy454;
-                       default:        goto yy62;
-                       }
-yy395:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy456;
-                       default:        goto yy62;
-                       }
-yy396:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy458;
-                       default:        goto yy62;
-                       }
 yy397:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy460;
-                       default:        goto yy62;
-                       }
+#line 407 "src/parser.re"
+                       { NEWTOKEN(PSI_T_MIXED); goto start; }
+#line 5288 "src/parser.c"
 yy398:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy462;
+                       case 't':       goto yy454;
                        default:        goto yy62;
                        }
 yy399:
@@ -5519,170 +5298,123 @@ yy399:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy464;
+                       case 'l':       goto yy456;
                        default:        goto yy62;
                        }
 yy400:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy466;
+                       case 'A':
+                       case 'a':       goto yy458;
                        default:        goto yy62;
                        }
 yy401:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy467;
+                       case 'A':
+                       case 'a':       goto yy459;
                        default:        goto yy62;
                        }
 yy402:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy468;
+                       case 'S':
+                       case 's':       goto yy460;
                        default:        goto yy62;
                        }
 yy403:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy469;
+                       case 'N':
+                       case 'n':       goto yy461;
                        default:        goto yy62;
                        }
 yy404:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'J':
-                       case 'j':       goto yy471;
+                       case 'C':
+                       case 'c':       goto yy463;
                        default:        goto yy62;
                        }
 yy405:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy472;
+                       case 'G':
+                       case 'g':       goto yy465;
                        default:        goto yy62;
                        }
 yy406:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy473;
+                       case 'N':
+                       case 'n':       goto yy467;
                        default:        goto yy62;
                        }
 yy407:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '6':       goto yy474;
+                       case 'L':
+                       case 'l':       goto yy469;
                        default:        goto yy62;
                        }
 yy408:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '2':       goto yy475;
+                       case 'R':
+                       case 'r':       goto yy471;
                        default:        goto yy62;
                        }
 yy409:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '4':       goto yy476;
+                       case 'O':
+                       case 'o':       goto yy472;
                        default:        goto yy62;
                        }
 yy410:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy477;
+                       case 'O':
+                       case 'o':       goto yy473;
                        default:        goto yy62;
                        }
 yy411:
-                       yyaccept = 37;
+                       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 '\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 yy412;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
+                       case 'T':
+                       case 't':       goto yy474;
+                       default:        goto yy62;
+                       }
+yy412:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'J':
+                       case 'j':       goto yy476;
+                       default:        goto yy62;
                        }
-yy412:
-#line 379 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UNDEF); goto start; }
-#line 5684 "src/parser.c"
 yy413:
-                       yyaccept = 38;
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy477;
+                       default:        goto yy62;
+                       }
+yy414:
+                       yyaccept = 34;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5748,67 +5480,59 @@ yy413:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy414;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy415;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy414:
-#line 415 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UNION); goto start; }
-#line 5759 "src/parser.c"
 yy415:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy478;
-                       default:        goto yy62;
-                       }
+#line 399 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNDEF); goto start; }
+#line 5491 "src/parser.c"
 yy416:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy479;
+                       case 'n':       goto yy478;
                        default:        goto yy62;
                        }
 yy417:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy480;
+                       case '_':       goto yy479;
                        default:        goto yy62;
                        }
 yy418:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy481;
+                       case 'r':       goto yy480;
                        default:        goto yy62;
                        }
 yy419:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy482;
+                       case 'e':       goto yy481;
                        default:        goto yy62;
                        }
 yy420:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy483;
+                       case 'i':       goto yy482;
                        default:        goto yy62;
                        }
 yy421:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy484;
+                       case 't':       goto yy483;
                        default:        goto yy62;
                        }
 yy422:
-                       yyaccept = 39;
+                       yyaccept = 35;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5875,39 +5599,22 @@ yy422:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy423;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy423:
-#line 432 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ARRVAL); goto start; }
-#line 5885 "src/parser.c"
+#line 380 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CONST); goto start; }
+#line 5609 "src/parser.c"
 yy424:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy486;
+                       case 'e':       goto yy484;
                        default:        goto yy62;
                        }
 yy425:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy488;
-                       default:        goto yy62;
-                       }
-yy426:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy489;
-                       default:        goto yy62;
-                       }
-yy427:
-                       yyaccept = 40;
+                       yyaccept = 36;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5973,16 +5680,25 @@ yy427:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy428;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy426;
+                       case 'V':
+                       case 'v':       goto yy447;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
+yy426:
+#line 387 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FLOAT); goto start; }
+#line 5693 "src/parser.c"
+yy427:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'a':       goto yy486;
+                       default:        goto yy62;
+                       }
 yy428:
-#line 436 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CALLOC); goto start; }
-#line 5984 "src/parser.c"
-yy429:
-                       yyaccept = 41;
+                       yyaccept = 37;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6048,18 +5764,44 @@ yy429:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy430;
-                       case 'D':
-                       case 'd':       goto yy490;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy429;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
+yy429:
+#line 384 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SHORT); goto start; }
+#line 5775 "src/parser.c"
 yy430:
-#line 377 "src/parser.re"
-                       { NEWTOKEN(PSI_T_DEFINE); goto start; }
-#line 6061 "src/parser.c"
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'd':       goto yy488;
+                       default:        goto yy62;
+                       }
 yy431:
-                       yyaccept = 42;
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'f':       goto yy490;
+                       default:        goto yy62;
+                       }
+yy432:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy492;
+                       default:        goto yy62;
+                       }
+yy433:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy494;
+                       default:        goto yy62;
+                       }
+yy434:
+                       yyaccept = 38;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6125,32 +5867,30 @@ yy431:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy432;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy435;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy432:
-#line 396 "src/parser.re"
-                       { NEWTOKEN(PSI_T_DOUBLE); goto start; }
-#line 6136 "src/parser.c"
-yy433:
+yy435:
+#line 378 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNION); goto start; }
+#line 5878 "src/parser.c"
+yy436:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy492;
+                       case 'n':       goto yy495;
                        default:        goto yy62;
                        }
-yy434:
+yy437:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy493;
+                       case 'i':       goto yy496;
                        default:        goto yy62;
                        }
-yy435:
-                       yyaccept = 43;
+yy438:
+                       yyaccept = 39;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6216,48 +5956,40 @@ yy435:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy436;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy439;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy436:
-#line 373 "src/parser.re"
-                       { NEWTOKEN(PSI_T_IFNDEF); goto start; }
-#line 6227 "src/parser.c"
-yy437:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy494;
-                       default:        goto yy62;
-                       }
-yy438:
+yy439:
+#line 429 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ARRVAL); goto start; }
+#line 5967 "src/parser.c"
+yy440:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy496;
+                       case 'L':
+                       case 'l':       goto yy497;
                        default:        goto yy62;
                        }
-yy439:
+yy441:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy498;
+                       case 'L':
+                       case 'l':       goto yy499;
                        default:        goto yy62;
                        }
-yy440:
+yy442:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy500;
+                       case 'C':
+                       case 'c':       goto yy500;
                        default:        goto yy62;
                        }
-yy441:
-                       yyaccept = 44;
+yy443:
+                       yyaccept = 40;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6323,16 +6055,16 @@ yy441:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy442;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy444;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy442:
-#line 397 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT8); goto start; }
-#line 6334 "src/parser.c"
-yy443:
-                       yyaccept = 45;
+yy444:
+#line 433 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLOC); goto start; }
+#line 6066 "src/parser.c"
+yy445:
+                       yyaccept = 41;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6398,16 +6130,34 @@ yy443:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy444;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy446;
+                       case 'D':
+                       case 'd':       goto yy501;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy444:
-#line 429 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INTVAL); goto start; }
-#line 6409 "src/parser.c"
-yy445:
-                       yyaccept = 46;
+yy446:
+#line 397 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DEFINE); goto start; }
+#line 6143 "src/parser.c"
+yy447:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy503;
+                       default:        goto yy62;
+                       }
+yy448:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'O':
+                       case 'o':       goto yy504;
+                       default:        goto yy62;
+                       }
+yy449:
+                       yyaccept = 42;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6473,16 +6223,24 @@ yy445:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy446;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy450;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy446:
-#line 409 "src/parser.re"
-                       { NEWTOKEN(PSI_T_OBJECT); goto start; }
-#line 6484 "src/parser.c"
-yy447:
-                       yyaccept = 47;
+yy450:
+#line 393 "src/parser.re"
+                       { NEWTOKEN(PSI_T_IFNDEF); goto start; }
+#line 6234 "src/parser.c"
+yy451:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy505;
+                       default:        goto yy62;
+                       }
+yy452:
+                       yyaccept = 43;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6548,40 +6306,16 @@ yy447:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy448;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy453;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy448:
-#line 433 "src/parser.re"
-                       { NEWTOKEN(PSI_T_OBJVAL); goto start; }
-#line 6559 "src/parser.c"
-yy449:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy502;
-                       default:        goto yy62;
-                       }
-yy450:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'S':
-                       case 's':       goto yy504;
-                       default:        goto yy62;
-                       }
-yy451:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'S':
-                       case 's':       goto yy505;
-                       default:        goto yy62;
-                       }
-yy452:
-                       yyaccept = 48;
+yy453:
+#line 426 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INTVAL); goto start; }
+#line 6317 "src/parser.c"
+yy454:
+                       yyaccept = 44;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6647,16 +6381,16 @@ yy452:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy453;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy455;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy453:
-#line 423 "src/parser.re"
-                       { NEWTOKEN(PSI_T_RETURN); goto start; }
-#line 6658 "src/parser.c"
-yy454:
-                       yyaccept = 49;
+yy455:
+#line 411 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OBJECT); goto start; }
+#line 6392 "src/parser.c"
+yy456:
+                       yyaccept = 45;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6722,16 +6456,40 @@ yy454:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy455;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy457;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy455:
-#line 406 "src/parser.re"
-                       { NEWTOKEN(PSI_T_SIGNED); goto start; }
-#line 6733 "src/parser.c"
-yy456:
-                       yyaccept = 50;
+yy457:
+#line 430 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OBJVAL); goto start; }
+#line 6467 "src/parser.c"
+yy458:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy507;
+                       default:        goto yy62;
+                       }
+yy459:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'S':
+                       case 's':       goto yy509;
+                       default:        goto yy62;
+                       }
+yy460:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'S':
+                       case 's':       goto yy510;
+                       default:        goto yy62;
+                       }
+yy461:
+                       yyaccept = 46;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6797,16 +6555,16 @@ yy456:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy457;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy462;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy457:
-#line 411 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STATIC); goto start; }
-#line 6808 "src/parser.c"
-yy458:
-                       yyaccept = 51;
+yy462:
+#line 420 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RETURN); goto start; }
+#line 6566 "src/parser.c"
+yy463:
+                       yyaccept = 47;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6872,16 +6630,16 @@ yy458:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy459;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy464;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy459:
-#line 407 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STRING); goto start; }
-#line 6883 "src/parser.c"
-yy460:
-                       yyaccept = 52;
+yy464:
+#line 413 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STATIC); goto start; }
+#line 6641 "src/parser.c"
+yy465:
+                       yyaccept = 48;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6947,16 +6705,16 @@ yy460:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy461;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy466;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy461:
-#line 426 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STRLEN); goto start; }
-#line 6958 "src/parser.c"
-yy462:
-                       yyaccept = 53;
+yy466:
+#line 409 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRING); goto start; }
+#line 6716 "src/parser.c"
+yy467:
+                       yyaccept = 49;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7022,16 +6780,16 @@ yy462:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy463;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy468;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy463:
-#line 414 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STRUCT); goto start; }
-#line 7033 "src/parser.c"
-yy464:
-                       yyaccept = 54;
+yy468:
+#line 423 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRLEN); goto start; }
+#line 6791 "src/parser.c"
+yy469:
+                       yyaccept = 50;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7097,40 +6855,40 @@ yy464:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy465;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy470;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy465:
-#line 427 "src/parser.re"
+yy470:
+#line 424 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRVAL); goto start; }
-#line 7108 "src/parser.c"
-yy466:
+#line 6866 "src/parser.c"
+yy471:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy506;
+                       case 'a':       goto yy511;
                        default:        goto yy62;
                        }
-yy467:
+yy472:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy507;
+                       case 'l':       goto yy512;
                        default:        goto yy62;
                        }
-yy468:
+yy473:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy509;
+                       case 'a':       goto yy514;
                        default:        goto yy62;
                        }
-yy469:
-                       yyaccept = 55;
+yy474:
+                       yyaccept = 51;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7196,113 +6954,75 @@ yy469:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy470;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy475;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy470:
-#line 440 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TO_INT); goto start; }
-#line 7207 "src/parser.c"
-yy471:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy510;
-                       default:        goto yy62;
-                       }
-yy472:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy511;
-                       default:        goto yy62;
-                       }
-yy473:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'F':
-                       case 'f':       goto yy512;
-                       default:        goto yy62;
-                       }
-yy474:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy514;
-                       default:        goto yy62;
-                       }
 yy475:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy515;
-                       default:        goto yy62;
-                       }
+#line 437 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_INT); goto start; }
+#line 6965 "src/parser.c"
 yy476:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy516;
+                       case 'E':
+                       case 'e':       goto yy515;
                        default:        goto yy62;
                        }
 yy477:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy517;
+                       case 'I':
+                       case 'i':       goto yy516;
                        default:        goto yy62;
                        }
 yy478:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy519;
+                       case 'G':
+                       case 'g':       goto yy517;
                        default:        goto yy62;
                        }
 yy479:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy520;
+                       case '_':       goto yy519;
                        default:        goto yy62;
                        }
 yy480:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy522;
+                       case 'i':       goto yy521;
                        default:        goto yy62;
                        }
 yy481:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy524;
+                       case 'n':       goto yy522;
                        default:        goto yy62;
                        }
 yy482:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy525;
+                       case 'n':       goto yy523;
                        default:        goto yy62;
                        }
 yy483:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy526;
+                       case 'r':       goto yy524;
                        default:        goto yy62;
                        }
 yy484:
-                       yyaccept = 56;
+                       yyaccept = 52;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7369,15 +7089,15 @@ yy484:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy485;
-                       case '\\':      goto yy138;
-                       default:        goto yy527;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
                        }
 yy485:
-#line 365 "src/parser.re"
-                       { NEWTOKEN(PSI_T_PRAGMA); goto start; }
-#line 7379 "src/parser.c"
+#line 388 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DOUBLE); goto start; }
+#line 7099 "src/parser.c"
 yy486:
-                       yyaccept = 57;
+                       yyaccept = 53;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7444,122 +7164,15 @@ yy486:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy487;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
+                       case '\\':      goto yy146;
+                       default:        goto yy525;
                        }
 yy487:
-#line 431 "src/parser.re"
-                       { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
-#line 7454 "src/parser.c"
+#line 367 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PRAGMA); goto start; }
+#line 7174 "src/parser.c"
 yy488:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy529;
-                       default:        goto yy62;
-                       }
-yy489:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'K':
-                       case 'k':       goto yy531;
-                       default:        goto yy62;
-                       }
-yy490:
-                       yyaccept = 58;
-                       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 yy491;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
-                       }
-yy491:
-#line 378 "src/parser.re"
-                       { NEWTOKEN(PSI_T_DEFINED); goto start; }
-#line 7545 "src/parser.c"
-yy492:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy533;
-                       default:        goto yy62;
-                       }
-yy493:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy535;
-                       default:        goto yy62;
-                       }
-yy494:
-                       yyaccept = 59;
+                       yyaccept = 54;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7625,17 +7238,16 @@ yy494:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy495;
-                       case '\\':      goto yy138;
-                       case '_':       goto yy537;
+                       case 0x7F:      goto yy489;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy495:
-#line 382 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INCLUDE); goto start; }
-#line 7637 "src/parser.c"
-yy496:
-                       yyaccept = 60;
+yy489:
+#line 390 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SIGNED); goto start; }
+#line 7249 "src/parser.c"
+yy490:
+                       yyaccept = 55;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7701,16 +7313,16 @@ yy496:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy497;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
-                       }
-yy497:
-#line 399 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT16); goto start; }
-#line 7712 "src/parser.c"
-yy498:
-                       yyaccept = 61;
+                       case 0x7F:      goto yy491;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
+                       }
+yy491:
+#line 374 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SIZEOF); goto start; }
+#line 7324 "src/parser.c"
+yy492:
+                       yyaccept = 56;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7776,16 +7388,37 @@ yy498:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy499;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy493;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy499:
-#line 401 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT32); goto start; }
-#line 7787 "src/parser.c"
-yy500:
-                       yyaccept = 62;
+yy493:
+#line 377 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRUCT); goto start; }
+#line 7399 "src/parser.c"
+yy494:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'f':       goto yy527;
+                       default:        goto yy62;
+                       }
+yy495:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy529;
+                       default:        goto yy62;
+                       }
+yy496:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'l':       goto yy530;
+                       default:        goto yy62;
+                       }
+yy497:
+                       yyaccept = 57;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7851,16 +7484,32 @@ yy500:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy501;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy498;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
+yy498:
+#line 428 "src/parser.re"
+                       { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
+#line 7495 "src/parser.c"
+yy499:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy531;
+                       default:        goto yy62;
+                       }
+yy500:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'K':
+                       case 'k':       goto yy533;
+                       default:        goto yy62;
+                       }
 yy501:
-#line 403 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT64); goto start; }
-#line 7862 "src/parser.c"
-yy502:
-                       yyaccept = 63;
+                       yyaccept = 58;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7926,40 +7575,32 @@ yy502:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy503;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy502;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
+yy502:
+#line 398 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DEFINED); goto start; }
+#line 7586 "src/parser.c"
 yy503:
-#line 428 "src/parser.re"
-                       { NEWTOKEN(PSI_T_PATHVAL); goto start; }
-#line 7937 "src/parser.c"
-yy504:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'S':
-                       case 's':       goto yy538;
-                       default:        goto yy62;
-                       }
-yy505:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy539;
+                       case 'L':
+                       case 'l':       goto yy535;
                        default:        goto yy62;
                        }
-yy506:
+yy504:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'Y':
-                       case 'y':       goto yy540;
+                       case 'N':
+                       case 'n':       goto yy537;
                        default:        goto yy62;
                        }
-yy507:
-                       yyaccept = 64;
+yy505:
+                       yyaccept = 59;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8025,40 +7666,17 @@ yy507:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy508;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy506;
+                       case '\\':      goto yy146;
+                       case '_':       goto yy539;
                        default:        goto yy61;
                        }
-yy508:
-#line 442 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TO_BOOL); goto start; }
-#line 8036 "src/parser.c"
-yy509:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy542;
-                       default:        goto yy62;
-                       }
-yy510:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy544;
-                       default:        goto yy62;
-                       }
-yy511:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy545;
-                       default:        goto yy62;
-                       }
-yy512:
-                       yyaccept = 65;
+yy506:
+#line 402 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INCLUDE); goto start; }
+#line 7678 "src/parser.c"
+yy507:
+                       yyaccept = 60;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8124,40 +7742,40 @@ yy512:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy513;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy508;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy513:
-#line 413 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
-#line 8135 "src/parser.c"
-yy514:
+yy508:
+#line 425 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PATHVAL); goto start; }
+#line 7753 "src/parser.c"
+yy509:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy546;
+                       case 'S':
+                       case 's':       goto yy540;
                        default:        goto yy62;
                        }
-yy515:
+yy510:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy548;
+                       case 'E':
+                       case 'e':       goto yy541;
                        default:        goto yy62;
                        }
-yy516:
+yy511:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy550;
+                       case 'Y':
+                       case 'y':       goto yy542;
                        default:        goto yy62;
                        }
-yy517:
-                       yyaccept = 66;
+yy512:
+                       yyaccept = 61;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8223,24 +7841,40 @@ yy517:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy518;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy513;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy518:
-#line 398 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT8); goto start; }
-#line 8234 "src/parser.c"
-yy519:
+yy513:
+#line 439 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_BOOL); goto start; }
+#line 7852 "src/parser.c"
+yy514:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy552;
+                       case 'T':
+                       case 't':       goto yy544;
                        default:        goto yy62;
                        }
-yy520:
-                       yyaccept = 67;
+yy515:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'C':
+                       case 'c':       goto yy546;
+                       default:        goto yy62;
+                       }
+yy516:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy547;
+                       default:        goto yy62;
+                       }
+yy517:
+                       yyaccept = 62;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8306,16 +7940,16 @@ yy520:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy521;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy518;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy521:
-#line 380 "src/parser.re"
+yy518:
+#line 400 "src/parser.re"
                        { NEWTOKEN(PSI_T_WARNING); goto start; }
-#line 8317 "src/parser.c"
-yy522:
-                       yyaccept = 68;
+#line 7951 "src/parser.c"
+yy519:
+                       yyaccept = 63;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8381,36 +8015,43 @@ yy522:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy523;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy520;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy523:
-#line 369 "src/parser.re"
+yy520:
+#line 372 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_ASM); goto start; }
-#line 8392 "src/parser.c"
-yy524:
+#line 8026 "src/parser.c"
+yy521:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'b':       goto yy554;
+                       case 'b':       goto yy548;
                        default:        goto yy62;
                        }
-yy525:
+yy522:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy555;
+                       case 's':       goto yy549;
                        default:        goto yy62;
                        }
-yy526:
+yy523:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy556;
+                       case 'e':       goto yy550;
                        default:        goto yy62;
                        }
-yy527:
+yy524:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy552;
+                       default:        goto yy62;
+                       }
+yy525:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -8480,12 +8121,12 @@ yy527:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy55;
-                       case '\\':      goto yy138;
-                       case 'o':       goto yy557;
-                       default:        goto yy527;
+                       case '\\':      goto yy146;
+                       case 'o':       goto yy553;
+                       default:        goto yy525;
                        }
-yy529:
-                       yyaccept = 69;
+yy527:
+                       yyaccept = 64;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8551,16 +8192,30 @@ yy529:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy530;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy528;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
+yy528:
+#line 376 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
+#line 8203 "src/parser.c"
+yy529:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'd':       goto yy555;
+                       default:        goto yy62;
+                       }
 yy530:
-#line 388 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CALLABLE); goto start; }
-#line 8562 "src/parser.c"
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy557;
+                       default:        goto yy62;
+                       }
 yy531:
-                       yyaccept = 70;
+                       yyaccept = 65;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8627,15 +8282,15 @@ yy531:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy532;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy532:
-#line 410 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CALLBACK); goto start; }
-#line 8637 "src/parser.c"
+#line 408 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLABLE); goto start; }
+#line 8292 "src/parser.c"
 yy533:
-                       yyaccept = 71;
+                       yyaccept = 66;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8702,15 +8357,15 @@ yy533:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy534;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy534:
-#line 430 "src/parser.re"
-                       { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
-#line 8712 "src/parser.c"
+#line 412 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLBACK); goto start; }
+#line 8367 "src/parser.c"
 yy535:
-                       yyaccept = 72;
+                       yyaccept = 67;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8777,39 +8432,15 @@ yy535:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy536;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy536:
-#line 412 "src/parser.re"
-                       { NEWTOKEN(PSI_T_FUNCTION); goto start; }
-#line 8787 "src/parser.c"
+#line 427 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
+#line 8442 "src/parser.c"
 yy537:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy559;
-                       default:        goto yy62;
-                       }
-yy538:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy560;
-                       default:        goto yy62;
-                       }
-yy539:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy561;
-                       default:        goto yy62;
-                       }
-yy540:
-                       yyaccept = 73;
+                       yyaccept = 68;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8875,16 +8506,40 @@ yy540:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy541;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy538;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
+yy538:
+#line 414 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FUNCTION); goto start; }
+#line 8517 "src/parser.c"
+yy539:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy559;
+                       default:        goto yy62;
+                       }
+yy540:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy560;
+                       default:        goto yy62;
+                       }
 yy541:
-#line 438 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
-#line 8886 "src/parser.c"
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy561;
+                       default:        goto yy62;
+                       }
 yy542:
-                       yyaccept = 74;
+                       yyaccept = 69;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8951,31 +8606,15 @@ yy542:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy543;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy543:
-#line 441 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
-#line 8961 "src/parser.c"
+#line 435 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
+#line 8616 "src/parser.c"
 yy544:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy562;
-                       default:        goto yy62;
-                       }
-yy545:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy564;
-                       default:        goto yy62;
-                       }
-yy546:
-                       yyaccept = 75;
+                       yyaccept = 70;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9041,16 +8680,46 @@ yy546:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy547;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy545;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
+yy545:
+#line 438 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
+#line 8691 "src/parser.c"
+yy546:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy562;
+                       default:        goto yy62;
+                       }
 yy547:
-#line 400 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT16); goto start; }
-#line 9052 "src/parser.c"
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'G':
+                       case 'g':       goto yy564;
+                       default:        goto yy62;
+                       }
 yy548:
-                       yyaccept = 76;
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'u':       goto yy566;
+                       default:        goto yy62;
+                       }
+yy549:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy567;
+                       default:        goto yy62;
+                       }
+yy550:
+                       yyaccept = 71;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9116,18 +8785,27 @@ yy548:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy549;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy551;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy549:
-#line 402 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT32); goto start; }
-#line 9127 "src/parser.c"
-yy550:
-                       yyaccept = 77;
+yy551:
+#line 369 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_INLINE); goto start; }
+#line 8796 "src/parser.c"
+yy552:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
+                       case 'c':       goto yy568;
+                       default:        goto yy62;
+                       }
+yy553:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
                        case 0x00:
                        case 0x01:
                        case 0x02:
@@ -9191,16 +8869,14 @@ yy550:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy551;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
+                       case 0x7F:      goto yy55;
+                       case '\\':      goto yy146;
+                       case 'n':       goto yy569;
+                       case 'o':       goto yy553;
+                       default:        goto yy525;
                        }
-yy551:
-#line 404 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT64); goto start; }
-#line 9202 "src/parser.c"
-yy552:
-                       yyaccept = 78;
+yy555:
+                       yyaccept = 72;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9266,40 +8942,17 @@ yy552:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy553;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy556;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy553:
-#line 405 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
-#line 9277 "src/parser.c"
-yy554:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'u':       goto yy566;
-                       default:        goto yy62;
-                       }
-yy555:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'i':       goto yy567;
-                       default:        goto yy62;
-                       }
 yy556:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'c':       goto yy568;
-                       default:        goto yy62;
-                       }
+#line 389 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
+#line 8953 "src/parser.c"
 yy557:
-                       yyaccept = 5;
-                       mrk = ++cur;
-                       if (lim <= cur) if (cur >= lim) goto done;;
-                       yych = *cur;
+                       yyaccept = 73;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
                        case 0x01:
@@ -9364,12 +9017,14 @@ yy557:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy55;
-                       case '\\':      goto yy138;
-                       case 'n':       goto yy569;
-                       case 'o':       goto yy557;
-                       default:        goto yy527;
+                       case 0x7F:      goto yy558;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
                        }
+yy558:
+#line 373 "src/parser.re"
+                       { NEWTOKEN(PSI_T_VOLATILE); goto start; }
+#line 9028 "src/parser.c"
 yy559:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -9395,7 +9050,7 @@ yy561:
                        default:        goto yy62;
                        }
 yy562:
-                       yyaccept = 79;
+                       yyaccept = 74;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9462,15 +9117,15 @@ yy562:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy563;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy563:
-#line 437 "src/parser.re"
+#line 434 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_OBJECT); goto start; }
-#line 9472 "src/parser.c"
+#line 9127 "src/parser.c"
 yy564:
-                       yyaccept = 80;
+                       yyaccept = 75;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9537,13 +9192,13 @@ yy564:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy565;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy565:
-#line 439 "src/parser.re"
+#line 436 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_STRING); goto start; }
-#line 9547 "src/parser.c"
+#line 9202 "src/parser.c"
 yy566:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -9635,10 +9290,10 @@ yy569:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy55;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        case 'c':       goto yy578;
-                       case 'o':       goto yy557;
-                       default:        goto yy527;
+                       case 'o':       goto yy553;
+                       default:        goto yy525;
                        }
 yy570:
                        yyaccept = 5;
@@ -9657,7 +9312,7 @@ yy571:
                        default:        goto yy62;
                        }
 yy572:
-                       yyaccept = 81;
+                       yyaccept = 76;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9724,13 +9379,13 @@ yy572:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy573;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy573:
-#line 421 "src/parser.re"
+#line 418 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
-#line 9734 "src/parser.c"
+#line 9389 "src/parser.c"
 yy574:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -9746,7 +9401,7 @@ yy575:
                        default:        goto yy62;
                        }
 yy576:
-                       yyaccept = 82;
+                       yyaccept = 77;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9813,13 +9468,13 @@ yy576:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy577;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy577:
-#line 367 "src/parser.re"
+#line 370 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_RESTRICT); goto start; }
-#line 9823 "src/parser.c"
+#line 9478 "src/parser.c"
 yy578:
                        yyaccept = 5;
                        mrk = ++cur;
@@ -9890,10 +9545,10 @@ yy578:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy55;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        case 'e':       goto yy584;
-                       case 'o':       goto yy557;
-                       default:        goto yy527;
+                       case 'o':       goto yy553;
+                       default:        goto yy525;
                        }
 yy579:
                        yyaccept = 5;
@@ -9904,7 +9559,7 @@ yy579:
                        default:        goto yy62;
                        }
 yy580:
-                       yyaccept = 83;
+                       yyaccept = 78;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9971,13 +9626,13 @@ yy580:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy581;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy581:
-#line 422 "src/parser.re"
+#line 419 "src/parser.re"
                        { NEWTOKEN(PSI_T_POST_ASSERT); goto start; }
-#line 9981 "src/parser.c"
+#line 9636 "src/parser.c"
 yy582:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -9993,7 +9648,7 @@ yy583:
                        default:        goto yy62;
                        }
 yy584:
-                       yyaccept = 84;
+                       yyaccept = 79;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -10062,16 +9717,16 @@ yy584:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy585;
-                       case '\\':      goto yy138;
-                       case 'o':       goto yy557;
-                       default:        goto yy527;
+                       case '\\':      goto yy146;
+                       case 'o':       goto yy553;
+                       default:        goto yy525;
                        }
 yy585:
-#line 366 "src/parser.re"
+#line 368 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRAGMA_ONCE); goto start; }
-#line 10073 "src/parser.c"
+#line 9728 "src/parser.c"
 yy586:
-                       yyaccept = 85;
+                       yyaccept = 80;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10138,13 +9793,13 @@ yy586:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy587;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy587:
-#line 383 "src/parser.re"
+#line 403 "src/parser.re"
                        { NEWTOKEN(PSI_T_INCLUDE_NEXT); goto start; }
-#line 10148 "src/parser.c"
+#line 9803 "src/parser.c"
 yy588:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -10163,75 +9818,14 @@ yy590:
                        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 yy593;
                        case '(':       goto yy595;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
+                       default:        goto yy62;
                        }
 yy591:
-                       yyaccept = 86;
+                       yyaccept = 81;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10298,13 +9892,13 @@ yy591:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy592;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy592:
-#line 368 "src/parser.re"
+#line 371 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_EXTENSION); goto start; }
-#line 10308 "src/parser.c"
+#line 9902 "src/parser.c"
 yy593:
                        ++cur;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
@@ -10314,26 +9908,26 @@ yy593:
                        case '\f':
                        case ' ':       goto yy593;
                        case '(':       goto yy595;
-                       default:        goto yy106;
+                       default:        goto yy114;
                        }
 yy595:
                        yych = *++cur;
                        switch (yych) {
                        case '(':       goto yy596;
-                       default:        goto yy106;
+                       default:        goto yy114;
                        }
 yy596:
                        ++cur;
-#line 447 "src/parser.re"
+#line 444 "src/parser.re"
                        { parens = 2; goto cpp_attribute; }
-#line 10330 "src/parser.c"
+#line 9924 "src/parser.c"
                }
-#line 453 "src/parser.re"
+#line 450 "src/parser.re"
 
 
        character: ;
                
-#line 10337 "src/parser.c"
+#line 9931 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10347,30 +9941,41 @@ yy596:
                        }
 yy600:
                        ++cur;
-#line 461 "src/parser.re"
-                       { goto character; }
-#line 10353 "src/parser.c"
+#line 468 "src/parser.re"
+                       { escaped = false; goto character; }
+#line 9947 "src/parser.c"
 yy602:
                        ++cur;
-#line 459 "src/parser.re"
+#line 455 "src/parser.re"
                        { NEWLINE(); goto character; }
-#line 10358 "src/parser.c"
+#line 9952 "src/parser.c"
 yy604:
                        ++cur;
-#line 458 "src/parser.re"
-                       { if (escaped) goto character; cur -= 1; NEWTOKEN(PSI_T_QUOTED_CHAR); cur += 1; token->flags = char_width; goto start; }
-#line 10363 "src/parser.c"
+#line 457 "src/parser.re"
+                       {
+                       if (escaped) {
+                               escaped = false;
+                               goto character;
+                       }
+                       cur -= 1;
+                       NEWTOKEN(PSI_T_QUOTED_CHAR);
+                       cur += 1;
+                       token->flags = char_width;
+                       goto start;
+               }
+#line 9967 "src/parser.c"
 yy606:
                        ++cur;
-#line 460 "src/parser.re"
-                       { escaped = !escaped; }
-#line 10368 "src/parser.c"
+#line 456 "src/parser.re"
+                       { escaped = !escaped;  goto character; }
+#line 9972 "src/parser.c"
                }
-#line 463 "src/parser.re"
+#line 470 "src/parser.re"
+
 
        string: ;
                
-#line 10374 "src/parser.c"
+#line 9979 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10384,31 +9989,41 @@ yy606:
                        }
 yy610:
                        ++cur;
-#line 470 "src/parser.re"
-                       { goto string; }
-#line 10390 "src/parser.c"
+#line 488 "src/parser.re"
+                       { escaped = false; goto string; }
+#line 9995 "src/parser.c"
 yy612:
                        ++cur;
-#line 468 "src/parser.re"
+#line 475 "src/parser.re"
                        { NEWLINE(); goto string; }
-#line 10395 "src/parser.c"
+#line 10000 "src/parser.c"
 yy614:
                        ++cur;
-#line 467 "src/parser.re"
-                       { if (escaped) goto string; cur -= 1; NEWTOKEN(PSI_T_QUOTED_STRING); cur += 1; token->flags = char_width; goto start; }
-#line 10400 "src/parser.c"
+#line 477 "src/parser.re"
+                       {
+                       if (escaped) {
+                               escaped = false;
+                               goto string;
+                       }
+                       cur -= 1;
+                       NEWTOKEN(PSI_T_QUOTED_STRING);
+                       cur += 1;
+                       token->flags = char_width;
+                       goto start;
+               }
+#line 10015 "src/parser.c"
 yy616:
                        ++cur;
-#line 469 "src/parser.re"
+#line 476 "src/parser.re"
                        { escaped = !escaped; goto string; }
-#line 10405 "src/parser.c"
+#line 10020 "src/parser.c"
                }
-#line 472 "src/parser.re"
+#line 490 "src/parser.re"
 
 
        comment: ;
                
-#line 10412 "src/parser.c"
+#line 10027 "src/parser.c"
                {
                        unsigned char yych;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
@@ -10422,14 +10037,14 @@ yy616:
 yy620:
                        ++cur;
 yy621:
-#line 479 "src/parser.re"
+#line 497 "src/parser.re"
                        { goto comment; }
-#line 10428 "src/parser.c"
+#line 10043 "src/parser.c"
 yy622:
                        ++cur;
-#line 477 "src/parser.re"
+#line 495 "src/parser.re"
                        { NEWLINE(); goto comment; }
-#line 10433 "src/parser.c"
+#line 10048 "src/parser.c"
 yy624:
                        yych = *++cur;
                        switch (yych) {
@@ -10438,16 +10053,16 @@ yy624:
                        }
 yy625:
                        ++cur;
-#line 478 "src/parser.re"
+#line 496 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); goto start; }
-#line 10444 "src/parser.c"
+#line 10059 "src/parser.c"
                }
-#line 481 "src/parser.re"
+#line 499 "src/parser.re"
 
 
        comment_sl: ;
                
-#line 10451 "src/parser.c"
+#line 10066 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10459,22 +10074,22 @@ yy625:
                        }
 yy629:
                        ++cur;
-#line 487 "src/parser.re"
+#line 505 "src/parser.re"
                        { goto comment_sl; }
-#line 10465 "src/parser.c"
+#line 10080 "src/parser.c"
 yy631:
                        ++cur;
-#line 486 "src/parser.re"
+#line 504 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); NEWLINE(); goto start; }
-#line 10470 "src/parser.c"
+#line 10085 "src/parser.c"
                }
-#line 489 "src/parser.re"
+#line 507 "src/parser.re"
 
 
        cpp_attribute: ;
 
                
-#line 10478 "src/parser.c"
+#line 10093 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10488,26 +10103,26 @@ yy631:
                        }
 yy635:
                        ++cur;
-#line 498 "src/parser.re"
+#line 516 "src/parser.re"
                        { goto cpp_attribute; }
-#line 10494 "src/parser.c"
+#line 10109 "src/parser.c"
 yy637:
                        ++cur;
-#line 497 "src/parser.re"
+#line 515 "src/parser.re"
                        { NEWLINE(); goto cpp_attribute; }
-#line 10499 "src/parser.c"
+#line 10114 "src/parser.c"
 yy639:
                        ++cur;
-#line 495 "src/parser.re"
+#line 513 "src/parser.re"
                        { ++parens; goto cpp_attribute; }
-#line 10504 "src/parser.c"
+#line 10119 "src/parser.c"
 yy641:
                        ++cur;
-#line 496 "src/parser.re"
+#line 514 "src/parser.re"
                        { if (parens == 1) { NEWTOKEN(PSI_T_CPP_ATTRIBUTE); goto start; } else { --parens; goto cpp_attribute; } }
-#line 10509 "src/parser.c"
+#line 10124 "src/parser.c"
                }
-#line 500 "src/parser.re"
+#line 518 "src/parser.re"
 
 error: ;