PHP 8 compatibility
[m6w6/ext-psi] / src / parser_scan.c
index 62fe215ffc068f6198cf512c2f59b789032f1db3..0acd259549e47a0b51be7c8cafd88b1465cb686a 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.1.1 on Tue Nov 20 15:59:31 2018 */
+/* Generated by re2c 1.1.1 on Thu Dec 13 16:05:05 2018 */
 #line 1 "src/parser_scan.re"
 /*******************************************************************************
  Copyright (c) 2016, Michael Wallner <mike@php.net>.
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include <php_psi_stdinc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 
 #include "parser.h"
 #include "plist.h"
+#include "debug.h"
 
 #define YYMAXFILL 15
 
@@ -42,17 +47,19 @@ size_t psi_parser_maxfill(void) {
 
 #define NEWLINE() \
        eol = cur; \
-       ++I->lines
+       ++lines
 
 #define NEWTOKEN(t) do { \
        if (t == PSI_T_COMMENT || t == PSI_T_WHITESPACE) { \
-               token = psi_token_init(t, "", 0, tok - eol + 1, I->lines, I->file); \
+               token = psi_token_init(t, "", 0, tok - eol + 1, lines, I->file); \
        } else { \
-               token = psi_token_init(t, tok, cur - tok, tok - eol + 1, I->lines, I->file); \
+               token = psi_token_init(t, tok, cur - tok, tok - eol + 1, lines, I->file); \
        } \
        tokens = psi_plist_add(tokens, &token); \
-       PSI_DEBUG_PRINT(P, "PSI: scanned < "); \
-       PSI_DEBUG_DUMP(P, psi_token_dump, token); \
+       PSI_DEBUG_LOCK(P, \
+                       PSI_DEBUG_PRINT(P, "PSI: scanned < "); \
+                       PSI_DEBUG_DUMP(P, psi_token_dump, token); \
+       ); \
 } while(0)
 
 #define CHECKEOF() if (cur >= lim - YYMAXFILL) goto done
@@ -62,15 +69,13 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
        struct psi_plist *tokens;
        struct psi_token *token;
        const char *tok, *cur, *lim, *mrk, *eol, *ctxmrk;
-       unsigned parens;
+       unsigned char_width, parens, lines = 1;
        bool escaped;
-       token_t char_width;
 
        PSI_DEBUG_PRINT(P, "PSI: scanning %s\n", I->file->val);
 
        tok = mrk = eol = cur = I->buffer;
        lim = I->buffer + I->length + YYMAXFILL;
-       I->lines = 1;
        tokens = psi_plist_init((psi_plist_dtor) psi_token_free);
 
        start: ;
@@ -81,7 +86,7 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                (void) ctxmrk;
 
                
-#line 85 "src/parser_scan.c"
+#line 90 "src/parser_scan.c"
                {
                        unsigned char yych;
                        unsigned int yyaccept = 0;
@@ -206,9 +211,9 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
 yy2:
                        ++cur;
 yy3:
-#line 250 "src/parser_scan.re"
+#line 253 "src/parser_scan.re"
                        { CHECKEOF(); NEWTOKEN(-2); goto error; }
-#line 212 "src/parser_scan.c"
+#line 217 "src/parser_scan.c"
 yy4:
                        ++cur;
                        if (lim <= cur) CHECKEOF();;
@@ -220,14 +225,14 @@ yy4:
                        default:        goto yy6;
                        }
 yy6:
-#line 249 "src/parser_scan.re"
+#line 252 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_WHITESPACE); goto start; }
-#line 226 "src/parser_scan.c"
+#line 231 "src/parser_scan.c"
 yy7:
                        ++cur;
-#line 248 "src/parser_scan.re"
+#line 251 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
-#line 231 "src/parser_scan.c"
+#line 236 "src/parser_scan.c"
 yy9:
                        yych = *++cur;
                        switch (yych) {
@@ -235,14 +240,14 @@ yy9:
                        default:        goto yy10;
                        }
 yy10:
-#line 151 "src/parser_scan.re"
+#line 156 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NOT); goto start; }
-#line 241 "src/parser_scan.c"
+#line 246 "src/parser_scan.c"
 yy11:
                        ++cur;
-#line 124 "src/parser_scan.re"
+#line 129 "src/parser_scan.re"
                        { escaped = false; tok += 1; goto string; }
-#line 246 "src/parser_scan.c"
+#line 251 "src/parser_scan.c"
 yy13:
                        yych = *++cur;
                        switch (yych) {
@@ -250,9 +255,9 @@ yy13:
                        default:        goto yy14;
                        }
 yy14:
-#line 134 "src/parser_scan.re"
+#line 139 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_HASH); goto start; }
-#line 256 "src/parser_scan.c"
+#line 261 "src/parser_scan.c"
 yy15:
                        yych = *++cur;
                        switch (yych) {
@@ -325,9 +330,9 @@ yy15:
                        }
 yy16:
                        ++cur;
-#line 152 "src/parser_scan.re"
+#line 157 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_MODULO); goto start; }
-#line 331 "src/parser_scan.c"
+#line 336 "src/parser_scan.c"
 yy18:
                        yych = *++cur;
                        switch (yych) {
@@ -335,44 +340,44 @@ yy18:
                        default:        goto yy19;
                        }
 yy19:
-#line 153 "src/parser_scan.re"
+#line 158 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_AMPERSAND); goto start; }
-#line 341 "src/parser_scan.c"
+#line 346 "src/parser_scan.c"
 yy20:
                        ++cur;
-#line 123 "src/parser_scan.re"
+#line 128 "src/parser_scan.re"
                        { escaped = false; tok += 1; goto character; }
-#line 346 "src/parser_scan.c"
+#line 351 "src/parser_scan.c"
 yy22:
                        ++cur;
-#line 135 "src/parser_scan.re"
+#line 140 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_LPAREN); goto start; }
-#line 351 "src/parser_scan.c"
+#line 356 "src/parser_scan.c"
 yy24:
                        ++cur;
-#line 136 "src/parser_scan.re"
+#line 141 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_RPAREN); goto start; }
-#line 356 "src/parser_scan.c"
+#line 361 "src/parser_scan.c"
 yy26:
                        ++cur;
-#line 149 "src/parser_scan.re"
+#line 154 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_ASTERISK); goto start; }
-#line 361 "src/parser_scan.c"
+#line 366 "src/parser_scan.c"
 yy28:
                        ++cur;
-#line 154 "src/parser_scan.re"
+#line 159 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_PLUS); goto start; }
-#line 366 "src/parser_scan.c"
+#line 371 "src/parser_scan.c"
 yy30:
                        ++cur;
-#line 138 "src/parser_scan.re"
+#line 143 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_COMMA); goto start; }
-#line 371 "src/parser_scan.c"
+#line 376 "src/parser_scan.c"
 yy32:
                        ++cur;
-#line 155 "src/parser_scan.re"
+#line 160 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_MINUS); goto start; }
-#line 376 "src/parser_scan.c"
+#line 381 "src/parser_scan.c"
 yy34:
                        yyaccept = 0;
                        yych = *(mrk = ++cur);
@@ -391,9 +396,9 @@ yy34:
                        default:        goto yy35;
                        }
 yy35:
-#line 166 "src/parser_scan.re"
+#line 171 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_PERIOD); goto start; }
-#line 397 "src/parser_scan.c"
+#line 402 "src/parser_scan.c"
 yy36:
                        yych = *++cur;
                        switch (yych) {
@@ -402,9 +407,9 @@ yy36:
                        default:        goto yy37;
                        }
 yy37:
-#line 156 "src/parser_scan.re"
+#line 161 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_SLASH); goto start; }
-#line 408 "src/parser_scan.c"
+#line 413 "src/parser_scan.c"
 yy38:
                        yyaccept = 1;
                        yych = *(mrk = ++cur);
@@ -417,9 +422,9 @@ yy38:
                        default:        goto yy125;
                        }
 yy39:
-#line 110 "src/parser_scan.re"
+#line 115 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT; goto start; }
-#line 423 "src/parser_scan.c"
+#line 428 "src/parser_scan.c"
 yy40:
                        yyaccept = 1;
                        mrk = ++cur;
@@ -447,14 +452,14 @@ yy40:
                        }
 yy42:
                        ++cur;
-#line 139 "src/parser_scan.re"
+#line 144 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_COLON); goto start; }
-#line 453 "src/parser_scan.c"
+#line 458 "src/parser_scan.c"
 yy44:
                        ++cur;
-#line 137 "src/parser_scan.re"
+#line 142 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_EOS); goto start; }
-#line 458 "src/parser_scan.c"
+#line 463 "src/parser_scan.c"
 yy46:
                        yyaccept = 2;
                        yych = *(mrk = ++cur);
@@ -530,9 +535,9 @@ yy46:
                        default:        goto yy47;
                        }
 yy47:
-#line 164 "src/parser_scan.re"
+#line 169 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_LCHEVR); goto start; }
-#line 536 "src/parser_scan.c"
+#line 541 "src/parser_scan.c"
 yy48:
                        yych = *++cur;
                        switch (yych) {
@@ -540,9 +545,9 @@ yy48:
                        default:        goto yy49;
                        }
 yy49:
-#line 148 "src/parser_scan.re"
+#line 153 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_EQUALS); goto start; }
-#line 546 "src/parser_scan.c"
+#line 551 "src/parser_scan.c"
 yy50:
                        yych = *++cur;
                        switch (yych) {
@@ -551,14 +556,14 @@ yy50:
                        default:        goto yy51;
                        }
 yy51:
-#line 165 "src/parser_scan.re"
+#line 170 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_RCHEVR); goto start; }
-#line 557 "src/parser_scan.c"
+#line 562 "src/parser_scan.c"
 yy52:
                        ++cur;
-#line 168 "src/parser_scan.re"
+#line 173 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_IIF); goto start; }
-#line 562 "src/parser_scan.c"
+#line 567 "src/parser_scan.c"
 yy54:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
@@ -570,9 +575,9 @@ yy54:
                        default:        goto yy62;
                        }
 yy55:
-#line 243 "src/parser_scan.re"
+#line 246 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NAME); goto start; }
-#line 576 "src/parser_scan.c"
+#line 581 "src/parser_scan.c"
 yy56:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
@@ -717,8 +722,6 @@ yy64:
                        case '\'':      goto yy162;
                        case 'E':
                        case 'e':       goto yy164;
-                       case 'I':
-                       case 'i':       goto yy165;
                        default:        goto yy62;
                        }
 yy65:
@@ -726,7 +729,7 @@ yy65:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy166;
+                       case 'i':       goto yy165;
                        default:        goto yy62;
                        }
 yy66:
@@ -734,7 +737,7 @@ yy66:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy167;
+                       case 'u':       goto yy166;
                        default:        goto yy62;
                        }
 yy67:
@@ -742,7 +745,7 @@ yy67:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy168;
+                       case 'b':       goto yy167;
                        default:        goto yy62;
                        }
 yy68:
@@ -750,11 +753,11 @@ yy68:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy169;
+                       case 'a':       goto yy168;
                        case 'O':
-                       case 'o':       goto yy170;
+                       case 'o':       goto yy169;
                        case 'R':
-                       case 'r':       goto yy171;
+                       case 'r':       goto yy170;
                        default:        goto yy62;
                        }
 yy69:
@@ -762,7 +765,7 @@ yy69:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy172;
+                       case 'e':       goto yy171;
                        default:        goto yy62;
                        }
 yy70:
@@ -770,9 +773,9 @@ yy70:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy173;
+                       case 'e':       goto yy172;
                        case 'T':
-                       case 't':       goto yy174;
+                       case 't':       goto yy173;
                        default:        goto yy62;
                        }
 yy71:
@@ -780,11 +783,11 @@ yy71:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy175;
+                       case 'e':       goto yy174;
                        case 'O':
-                       case 'o':       goto yy176;
+                       case 'o':       goto yy175;
                        case 'R':
-                       case 'r':       goto yy177;
+                       case 'r':       goto yy176;
                        default:        goto yy62;
                        }
 yy72:
@@ -792,9 +795,9 @@ yy72:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '"':
-                       case '\'':      goto yy178;
+                       case '\'':      goto yy177;
                        case 'N':
-                       case 'n':       goto yy180;
+                       case 'n':       goto yy179;
                        default:        goto yy62;
                        }
 yy73:
@@ -802,7 +805,7 @@ yy73:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy181;
+                       case 'a':       goto yy180;
                        default:        goto yy62;
                        }
 yy74:
@@ -810,14 +813,14 @@ yy74:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy182;
+                       case 'v':       goto yy181;
                        default:        goto yy62;
                        }
 yy75:
                        ++cur;
-#line 142 "src/parser_scan.re"
+#line 147 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_LBRACKET); goto start; }
-#line 821 "src/parser_scan.c"
+#line 824 "src/parser_scan.c"
 yy77:
                        yych = *++cur;
                        switch (yych) {
@@ -896,27 +899,27 @@ yy77:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy78;
-                       default:        goto yy183;
+                       default:        goto yy182;
                        }
 yy78:
-#line 157 "src/parser_scan.re"
+#line 162 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_BSLASH); goto start; }
-#line 905 "src/parser_scan.c"
+#line 908 "src/parser_scan.c"
 yy79:
                        ++cur;
-#line 143 "src/parser_scan.re"
+#line 148 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_RBRACKET); goto start; }
-#line 910 "src/parser_scan.c"
+#line 913 "src/parser_scan.c"
 yy81:
                        ++cur;
-#line 159 "src/parser_scan.re"
+#line 164 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CARET); goto start; }
-#line 915 "src/parser_scan.c"
+#line 918 "src/parser_scan.c"
 yy83:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy186;
+                       case '_':       goto yy185;
                        default:        goto yy62;
                        }
 yy84:
@@ -924,7 +927,7 @@ yy84:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':       goto yy148;
-                       case 'o':       goto yy187;
+                       case 'o':       goto yy186;
                        default:        goto yy62;
                        }
 yy85:
@@ -934,8 +937,8 @@ yy85:
                        case 'A':
                        case 'a':       goto yy149;
                        case 'O':       goto yy150;
-                       case 'h':       goto yy188;
-                       case 'o':       goto yy189;
+                       case 'h':       goto yy187;
+                       case 'o':       goto yy188;
                        default:        goto yy62;
                        }
 yy86:
@@ -944,7 +947,7 @@ yy86:
                        switch (yych) {
                        case 'E':
                        case 'e':       goto yy151;
-                       case 'o':       goto yy190;
+                       case 'o':       goto yy189;
                        default:        goto yy62;
                        }
 yy87:
@@ -956,7 +959,7 @@ yy87:
                        case 'N':       goto yy153;
                        case 'R':
                        case 'r':       goto yy154;
-                       case 'n':       goto yy191;
+                       case 'n':       goto yy190;
                        default:        goto yy62;
                        }
 yy88:
@@ -970,7 +973,7 @@ yy88:
                        case 'r':       goto yy157;
                        case 'U':
                        case 'u':       goto yy158;
-                       case 'l':       goto yy192;
+                       case 'l':       goto yy191;
                        default:        goto yy62;
                        }
 yy89:
@@ -980,7 +983,7 @@ yy89:
                        case 'F':
                        case 'f':       goto yy159;
                        case 'N':       goto yy161;
-                       case 'n':       goto yy193;
+                       case 'n':       goto yy192;
                        default:        goto yy62;
                        }
 yy90:
@@ -989,9 +992,8 @@ yy90:
                        switch (yych) {
                        case 'E':
                        case 'e':       goto yy164;
-                       case 'I':       goto yy165;
-                       case 'i':       goto yy194;
-                       case 'o':       goto yy195;
+                       case 'i':       goto yy193;
+                       case 'o':       goto yy194;
                        default:        goto yy62;
                        }
 yy91:
@@ -999,11 +1001,11 @@ yy91:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy169;
+                       case 'a':       goto yy168;
                        case 'O':
-                       case 'o':       goto yy170;
-                       case 'R':       goto yy171;
-                       case 'r':       goto yy196;
+                       case 'o':       goto yy169;
+                       case 'R':       goto yy170;
+                       case 'r':       goto yy195;
                        default:        goto yy62;
                        }
 yy92:
@@ -1011,11 +1013,11 @@ yy92:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy173;
-                       case 'T':       goto yy174;
-                       case 'h':       goto yy197;
-                       case 'i':       goto yy198;
-                       case 't':       goto yy199;
+                       case 'e':       goto yy172;
+                       case 'T':       goto yy173;
+                       case 'h':       goto yy196;
+                       case 'i':       goto yy197;
+                       case 't':       goto yy198;
                        default:        goto yy62;
                        }
 yy93:
@@ -1023,12 +1025,12 @@ yy93:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy175;
+                       case 'e':       goto yy174;
                        case 'O':
-                       case 'o':       goto yy176;
+                       case 'o':       goto yy175;
                        case 'R':
-                       case 'r':       goto yy177;
-                       case 'y':       goto yy200;
+                       case 'r':       goto yy176;
+                       case 'y':       goto yy199;
                        default:        goto yy62;
                        }
 yy94:
@@ -1036,54 +1038,54 @@ yy94:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '"':
-                       case '\'':      goto yy201;
-                       case '8':       goto yy203;
-                       case 'N':       goto yy180;
-                       case 'n':       goto yy204;
+                       case '\'':      goto yy200;
+                       case '8':       goto yy202;
+                       case 'N':       goto yy179;
+                       case 'n':       goto yy203;
                        default:        goto yy62;
                        }
 yy95:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy205;
+                       case 'o':       goto yy204;
                        default:        goto yy62;
                        }
 yy96:
                        ++cur;
-#line 140 "src/parser_scan.re"
+#line 145 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_LBRACE); goto start; }
-#line 1057 "src/parser_scan.c"
+#line 1059 "src/parser_scan.c"
 yy98:
                        yych = *++cur;
                        switch (yych) {
-                       case '|':       goto yy206;
+                       case '|':       goto yy205;
                        default:        goto yy99;
                        }
 yy99:
-#line 158 "src/parser_scan.re"
+#line 163 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_PIPE); goto start; }
-#line 1067 "src/parser_scan.c"
+#line 1069 "src/parser_scan.c"
 yy100:
                        ++cur;
-#line 141 "src/parser_scan.re"
+#line 146 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_RBRACE); goto start; }
-#line 1072 "src/parser_scan.c"
+#line 1074 "src/parser_scan.c"
 yy102:
                        ++cur;
-#line 150 "src/parser_scan.re"
+#line 155 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_TILDE); goto start; }
-#line 1077 "src/parser_scan.c"
+#line 1079 "src/parser_scan.c"
 yy104:
                        ++cur;
-#line 144 "src/parser_scan.re"
+#line 149 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CMP_NE); goto start; }
-#line 1082 "src/parser_scan.c"
+#line 1084 "src/parser_scan.c"
 yy106:
                        ++cur;
-#line 133 "src/parser_scan.re"
+#line 138 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CPP_PASTE); goto start; }
-#line 1087 "src/parser_scan.c"
+#line 1089 "src/parser_scan.c"
 yy108:
                        ++cur;
                        if (lim <= cur) CHECKEOF();;
@@ -1157,18 +1159,18 @@ yy108:
                        default:        goto yy108;
                        }
 yy110:
-#line 245 "src/parser_scan.re"
+#line 248 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; }
-#line 1163 "src/parser_scan.c"
+#line 1165 "src/parser_scan.c"
 yy111:
                        ++cur;
-#line 146 "src/parser_scan.re"
+#line 151 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_AND); goto start; }
-#line 1168 "src/parser_scan.c"
+#line 1170 "src/parser_scan.c"
 yy113:
                        yych = *++cur;
                        switch (yych) {
-                       case '.':       goto yy208;
+                       case '.':       goto yy207;
                        default:        goto yy114;
                        }
 yy114:
@@ -1182,79 +1184,77 @@ yy114:
                        case 5:         goto yy128;
                        case 6:         goto yy146;
                        case 7:         goto yy160;
-                       case 8:         goto yy185;
-                       case 9:         goto yy242;
-                       case 10:        goto yy244;
-                       case 11:        goto yy253;
-                       case 12:        goto yy274;
-                       case 13:        goto yy306;
-                       case 14:        goto yy308;
-                       case 15:        goto yy314;
-                       case 16:        goto yy322;
-                       case 17:        goto yy334;
-                       case 18:        goto yy342;
-                       case 19:        goto yy346;
-                       case 20:        goto yy353;
-                       case 21:        goto yy355;
-                       case 22:        goto yy359;
-                       case 23:        goto yy363;
-                       case 24:        goto yy365;
+                       case 8:         goto yy184;
+                       case 9:         goto yy241;
+                       case 10:        goto yy250;
+                       case 11:        goto yy271;
+                       case 12:        goto yy303;
+                       case 13:        goto yy305;
+                       case 14:        goto yy311;
+                       case 15:        goto yy319;
+                       case 16:        goto yy331;
+                       case 17:        goto yy339;
+                       case 18:        goto yy343;
+                       case 19:        goto yy350;
+                       case 20:        goto yy352;
+                       case 21:        goto yy356;
+                       case 22:        goto yy360;
+                       case 23:        goto yy362;
+                       case 24:        goto yy372;
                        case 25:        goto yy375;
-                       case 26:        goto yy378;
+                       case 26:        goto yy382;
                        case 27:        goto yy385;
-                       case 28:        goto yy388;
-                       case 29:        goto yy390;
-                       case 30:        goto yy392;
-                       case 31:        goto yy396;
-                       case 32:        goto yy401;
+                       case 28:        goto yy387;
+                       case 29:        goto yy389;
+                       case 30:        goto yy393;
+                       case 31:        goto yy398;
+                       case 32:        goto yy416;
                        case 33:        goto yy419;
-                       case 34:        goto yy422;
+                       case 34:        goto yy424;
                        case 35:        goto yy427;
-                       case 36:        goto yy430;
-                       case 37:        goto yy434;
-                       case 38:        goto yy440;
-                       case 39:        goto yy444;
-                       case 40:        goto yy449;
-                       case 41:        goto yy451;
+                       case 36:        goto yy431;
+                       case 37:        goto yy437;
+                       case 38:        goto yy441;
+                       case 39:        goto yy446;
+                       case 40:        goto yy448;
+                       case 41:        goto yy452;
                        case 42:        goto yy455;
-                       case 43:        goto yy458;
-                       case 44:        goto yy460;
-                       case 45:        goto yy462;
-                       case 46:        goto yy467;
-                       case 47:        goto yy469;
-                       case 48:        goto yy471;
-                       case 49:        goto yy473;
-                       case 50:        goto yy475;
-                       case 51:        goto yy480;
-                       case 52:        goto yy489;
-                       case 53:        goto yy491;
-                       case 54:        goto yy493;
-                       case 55:        goto yy495;
-                       case 56:        goto yy497;
-                       case 57:        goto yy499;
-                       case 58:        goto yy504;
-                       case 59:        goto yy508;
-                       case 60:        goto yy512;
-                       case 61:        goto yy514;
-                       case 62:        goto yy519;
-                       case 63:        goto yy524;
-                       case 64:        goto yy532;
-                       case 65:        goto yy536;
-                       case 66:        goto yy538;
-                       case 67:        goto yy540;
+                       case 43:        goto yy457;
+                       case 44:        goto yy459;
+                       case 45:        goto yy464;
+                       case 46:        goto yy466;
+                       case 47:        goto yy468;
+                       case 48:        goto yy470;
+                       case 49:        goto yy472;
+                       case 50:        goto yy477;
+                       case 51:        goto yy486;
+                       case 52:        goto yy488;
+                       case 53:        goto yy490;
+                       case 54:        goto yy492;
+                       case 55:        goto yy494;
+                       case 56:        goto yy496;
+                       case 57:        goto yy501;
+                       case 58:        goto yy505;
+                       case 59:        goto yy509;
+                       case 60:        goto yy511;
+                       case 61:        goto yy516;
+                       case 62:        goto yy521;
+                       case 63:        goto yy527;
+                       case 64:        goto yy531;
+                       case 65:        goto yy533;
+                       case 66:        goto yy535;
+                       case 67:        goto yy537;
                        case 68:        goto yy542;
-                       case 69:        goto yy547;
-                       case 70:        goto yy549;
-                       case 71:        goto yy558;
-                       case 72:        goto yy560;
-                       case 73:        goto yy565;
+                       case 69:        goto yy544;
+                       case 70:        goto yy551;
+                       case 71:        goto yy553;
+                       case 72:        goto yy558;
+                       case 73:        goto yy560;
                        case 74:        goto yy567;
-                       case 75:        goto yy575;
-                       case 76:        goto yy579;
-                       case 77:        goto yy583;
-                       case 78:        goto yy587;
-                       case 79:        goto yy589;
-                       default:        goto yy594;
+                       case 75:        goto yy571;
+                       case 76:        goto yy574;
+                       case 77:        goto yy578;
+                       default:        goto yy583;
                        }
 yy115:
                        yyaccept = 4;
@@ -1273,25 +1273,25 @@ yy115:
                        case '8':
                        case '9':       goto yy115;
                        case 'D':
-                       case 'd':       goto yy210;
+                       case 'd':       goto yy209;
                        case 'F':
-                       case 'f':       goto yy211;
+                       case 'f':       goto yy210;
                        case 'L':
-                       case 'l':       goto yy213;
+                       case 'l':       goto yy212;
                        default:        goto yy117;
                        }
 yy117:
-#line 116 "src/parser_scan.re"
+#line 121 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT; goto start; }
 #line 1287 "src/parser_scan.c"
 yy118:
                        ++cur;
-#line 130 "src/parser_scan.re"
+#line 135 "src/parser_scan.re"
                        { goto comment; }
 #line 1292 "src/parser_scan.c"
 yy120:
                        ++cur;
-#line 131 "src/parser_scan.re"
+#line 136 "src/parser_scan.re"
                        { goto comment_sl; }
 #line 1297 "src/parser_scan.c"
 yy122:
@@ -1311,13 +1311,13 @@ yy122:
                        case '8':
                        case '9':       goto yy122;
                        case 'D':
-                       case 'd':       goto yy210;
+                       case 'd':       goto yy209;
                        case 'E':
                        case 'e':       goto yy126;
                        case 'F':
-                       case 'f':       goto yy211;
+                       case 'f':       goto yy210;
                        case 'L':
-                       case 'l':       goto yy213;
+                       case 'l':       goto yy212;
                        default:        goto yy117;
                        }
 yy124:
@@ -1344,7 +1344,7 @@ yy126:
                        yych = *++cur;
                        switch (yych) {
                        case '+':
-                       case '-':       goto yy215;
+                       case '-':       goto yy214;
                        case '0':
                        case '1':
                        case '2':
@@ -1362,26 +1362,26 @@ yy127:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy216;
+                       case 'l':       goto yy215;
                        case 'U':
-                       case 'u':       goto yy217;
+                       case 'u':       goto yy216;
                        default:        goto yy128;
                        }
 yy128:
                        cur -= 1;
-#line 112 "src/parser_scan.re"
+#line 117 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_L; cur += 1; goto start; }
 #line 1375 "src/parser_scan.c"
 yy129:
                        yych = *++cur;
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy219;
+                       case 'l':       goto yy218;
                        default:        goto yy130;
                        }
 yy130:
                        cur -= 1;
-#line 111 "src/parser_scan.re"
+#line 116 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_U; cur += 1; goto start; }
 #line 1387 "src/parser_scan.c"
 yy131:
@@ -1408,7 +1408,7 @@ yy131:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy220;
+                       case 'f':       goto yy219;
                        default:        goto yy114;
                        }
 yy132:
@@ -1482,32 +1482,32 @@ yy132:
                        case 'x':
                        case 'y':
                        case 'z':       goto yy132;
-                       case '>':       goto yy222;
+                       case '>':       goto yy221;
                        default:        goto yy114;
                        }
 yy134:
                        ++cur;
-#line 160 "src/parser_scan.re"
+#line 165 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_LSHIFT); goto start; }
 #line 1493 "src/parser_scan.c"
 yy136:
                        ++cur;
-#line 162 "src/parser_scan.re"
+#line 167 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CMP_LE); goto start; }
 #line 1498 "src/parser_scan.c"
 yy138:
                        ++cur;
-#line 145 "src/parser_scan.re"
+#line 150 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CMP_EQ); goto start; }
 #line 1503 "src/parser_scan.c"
 yy140:
                        ++cur;
-#line 163 "src/parser_scan.re"
+#line 168 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CMP_GE); goto start; }
 #line 1508 "src/parser_scan.c"
 yy142:
                        ++cur;
-#line 161 "src/parser_scan.re"
+#line 166 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_RSHIFT); goto start; }
 #line 1513 "src/parser_scan.c"
 yy144:
@@ -1515,7 +1515,7 @@ yy144:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy224;
+                       case 'r':       goto yy223;
                        default:        goto yy62;
                        }
 yy145:
@@ -1590,7 +1590,7 @@ yy145:
                        default:        goto yy61;
                        }
 yy146:
-#line 223 "src/parser_scan.re"
+#line 226 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_AS); goto start; }
 #line 1596 "src/parser_scan.c"
 yy147:
@@ -1673,14 +1673,14 @@ yy147:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy114;
-                       default:        goto yy183;
+                       default:        goto yy182;
                        }
 yy148:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy225;
+                       case 'o':       goto yy224;
                        default:        goto yy62;
                        }
 yy149:
@@ -1688,7 +1688,7 @@ yy149:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy226;
+                       case 'l':       goto yy225;
                        default:        goto yy62;
                        }
 yy150:
@@ -1696,7 +1696,7 @@ yy150:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy227;
+                       case 'u':       goto yy226;
                        default:        goto yy62;
                        }
 yy151:
@@ -1704,7 +1704,7 @@ yy151:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy228;
+                       case 'f':       goto yy227;
                        default:        goto yy62;
                        }
 yy152:
@@ -1712,9 +1712,9 @@ yy152:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy229;
+                       case 'i':       goto yy228;
                        case 'S':
-                       case 's':       goto yy230;
+                       case 's':       goto yy229;
                        default:        goto yy62;
                        }
 yy153:
@@ -1722,7 +1722,7 @@ yy153:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy231;
+                       case 'd':       goto yy230;
                        default:        goto yy62;
                        }
 yy154:
@@ -1730,7 +1730,7 @@ yy154:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy232;
+                       case 'r':       goto yy231;
                        default:        goto yy62;
                        }
 yy155:
@@ -1738,7 +1738,7 @@ yy155:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy233;
+                       case 'l':       goto yy232;
                        default:        goto yy62;
                        }
 yy156:
@@ -1746,7 +1746,7 @@ yy156:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy234;
+                       case 'o':       goto yy233;
                        default:        goto yy62;
                        }
 yy157:
@@ -1754,7 +1754,7 @@ yy157:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy235;
+                       case 'e':       goto yy234;
                        default:        goto yy62;
                        }
 yy158:
@@ -1762,7 +1762,7 @@ yy158:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy236;
+                       case 'n':       goto yy235;
                        default:        goto yy62;
                        }
 yy159:
@@ -1834,14 +1834,14 @@ yy159:
                        case '~':
                        case 0x7F:      goto yy160;
                        case 'D':
-                       case 'd':       goto yy237;
+                       case 'd':       goto yy236;
                        case 'N':
-                       case 'n':       goto yy238;
+                       case 'n':       goto yy237;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
 yy160:
-#line 193 "src/parser_scan.re"
+#line 197 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_IF); goto start; }
 #line 1847 "src/parser_scan.c"
 yy161:
@@ -1849,79 +1849,79 @@ yy161:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy239;
+                       case 'c':       goto yy238;
                        case 'T':
-                       case 't':       goto yy240;
+                       case 't':       goto yy239;
                        default:        goto yy62;
                        }
 yy162:
                        ++cur;
                        cur -= 1;
-#line 128 "src/parser_scan.re"
-                       { char_width = sizeof(wchar_t)/8; }
+#line 133 "src/parser_scan.re"
+                       { char_width = sizeof(wchar_t); }
 #line 1863 "src/parser_scan.c"
 yy164:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy241;
+                       case 't':       goto yy240;
                        default:        goto yy62;
                        }
 yy165:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy243;
+                       case 'X':
+                       case 'x':       goto yy242;
                        default:        goto yy62;
                        }
 yy166:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'X':
-                       case 'x':       goto yy245;
+                       case 'L':
+                       case 'l':       goto yy243;
                        default:        goto yy62;
                        }
 yy167:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy246;
+                       case 'J':
+                       case 'j':       goto yy244;
                        default:        goto yy62;
                        }
 yy168:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'J':
-                       case 'j':       goto yy247;
+                       case 'T':
+                       case 't':       goto yy245;
                        default:        goto yy62;
                        }
 yy169:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy248;
+                       case 'S':
+                       case 's':       goto yy246;
                        default:        goto yy62;
                        }
 yy170:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'S':
-                       case 's':       goto yy249;
+                       case 'E':
+                       case 'e':       goto yy247;
                        default:        goto yy62;
                        }
 yy171:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy250;
+                       case 'T':
+                       case 't':       goto yy248;
                        default:        goto yy62;
                        }
 yy172:
@@ -1929,81 +1929,73 @@ yy172:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy251;
+                       case 't':       goto yy249;
                        default:        goto yy62;
                        }
 yy173:
-                       yyaccept = 3;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy252;
-                       default:        goto yy62;
-                       }
-yy174:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy254;
+                       case 'a':       goto yy251;
                        case 'R':
-                       case 'r':       goto yy255;
+                       case 'r':       goto yy252;
                        default:        goto yy62;
                        }
-yy175:
+yy174:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'M':
-                       case 'm':       goto yy256;
+                       case 'm':       goto yy253;
                        default:        goto yy62;
                        }
-yy176:
+yy175:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy257;
+                       case '_':       goto yy254;
                        default:        goto yy62;
                        }
-yy177:
+yy176:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy258;
+                       case 'u':       goto yy255;
                        default:        goto yy62;
                        }
-yy178:
+yy177:
                        ++cur;
                        cur -= 1;
-#line 127 "src/parser_scan.re"
+#line 132 "src/parser_scan.re"
                        { char_width = 4; }
-#line 1982 "src/parser_scan.c"
-yy180:
+#line 1974 "src/parser_scan.c"
+yy179:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy259;
+                       case 'd':       goto yy256;
                        default:        goto yy62;
                        }
-yy181:
+yy180:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy260;
+                       case 'r':       goto yy257;
                        default:        goto yy62;
                        }
-yy182:
+yy181:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy261;
+                       case 'a':       goto yy258;
                        default:        goto yy62;
                        }
-yy183:
+yy182:
                        yyaccept = 8;
                        mrk = ++cur;
                        if (lim <= cur) CHECKEOF();;
@@ -2072,205 +2064,203 @@ yy183:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy185;
+                       case 0x7F:      goto yy184;
                        case '\\':      goto yy147;
-                       default:        goto yy183;
+                       default:        goto yy182;
                        }
-yy185:
-#line 244 "src/parser_scan.re"
+yy184:
+#line 247 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NSNAME); goto start; }
-#line 2083 "src/parser_scan.c"
+#line 2075 "src/parser_scan.c"
+yy185:
+                       yyaccept = 3;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'a':       goto yy259;
+                       case 'e':       goto yy260;
+                       case 'i':       goto yy261;
+                       case 'r':       goto yy262;
+                       default:        goto yy62;
+                       }
 yy186:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy262;
-                       case 'e':       goto yy263;
-                       case 'i':       goto yy264;
-                       case 'r':       goto yy265;
+                       case 'O':       goto yy224;
+                       case 'o':       goto yy263;
                        default:        goto yy62;
                        }
 yy187:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':       goto yy225;
-                       case 'o':       goto yy266;
+                       case 'a':       goto yy264;
                        default:        goto yy62;
                        }
 yy188:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy267;
+                       case 'U':
+                       case 'u':       goto yy226;
+                       case 'n':       goto yy265;
                        default:        goto yy62;
                        }
 yy189:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy227;
-                       case 'n':       goto yy268;
+                       case 'u':       goto yy266;
                        default:        goto yy62;
                        }
 yy190:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'u':       goto yy269;
+                       case 'D':
+                       case 'd':       goto yy230;
+                       case 'u':       goto yy267;
                        default:        goto yy62;
                        }
 yy191:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy231;
-                       case 'u':       goto yy270;
+                       case 'O':       goto yy233;
+                       case 'o':       goto yy268;
                        default:        goto yy62;
                        }
 yy192:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':       goto yy234;
-                       case 'o':       goto yy271;
+                       case 'C':
+                       case 'c':       goto yy238;
+                       case 'T':       goto yy239;
+                       case 'l':       goto yy269;
+                       case 't':       goto yy270;
                        default:        goto yy62;
                        }
 yy193:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy239;
-                       case 'T':       goto yy240;
-                       case 'l':       goto yy272;
-                       case 't':       goto yy273;
+                       case 'n':       goto yy272;
                        default:        goto yy62;
                        }
 yy194:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy243;
-                       case 'n':       goto yy275;
+                       case 'n':       goto yy273;
                        default:        goto yy62;
                        }
 yy195:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy276;
+                       case 'E':
+                       case 'e':       goto yy247;
+                       case 'a':       goto yy274;
                        default:        goto yy62;
                        }
 yy196:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy250;
-                       case 'a':       goto yy277;
+                       case 'o':       goto yy275;
                        default:        goto yy62;
                        }
 yy197:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy278;
+                       case 'g':       goto yy276;
+                       case 'z':       goto yy277;
                        default:        goto yy62;
                        }
 yy198:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy279;
-                       case 'z':       goto yy280;
+                       case 'A':
+                       case 'a':       goto yy251;
+                       case 'R':       goto yy252;
+                       case 'r':       goto yy278;
                        default:        goto yy62;
                        }
 yy199:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy254;
-                       case 'R':       goto yy255;
-                       case 'r':       goto yy281;
+                       case 'p':       goto yy279;
                        default:        goto yy62;
                        }
 yy200:
-                       yyaccept = 3;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'p':       goto yy282;
-                       default:        goto yy62;
-                       }
-yy201:
                        ++cur;
                        cur -= 1;
-#line 126 "src/parser_scan.re"
+#line 131 "src/parser_scan.re"
                        { char_width = 2; }
-#line 2215 "src/parser_scan.c"
-yy203:
+#line 2205 "src/parser_scan.c"
+yy202:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '"':       goto yy283;
+                       case '"':       goto yy280;
                        default:        goto yy62;
                        }
-yy204:
+yy203:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy259;
-                       case 'i':       goto yy285;
-                       case 's':       goto yy286;
+                       case 'd':       goto yy256;
+                       case 'i':       goto yy282;
+                       case 's':       goto yy283;
                        default:        goto yy62;
                        }
-yy205:
+yy204:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy287;
-                       case 'l':       goto yy288;
+                       case 'i':       goto yy284;
+                       case 'l':       goto yy285;
                        default:        goto yy62;
                        }
-yy206:
+yy205:
                        ++cur;
-#line 147 "src/parser_scan.re"
+#line 152 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_OR); goto start; }
-#line 2245 "src/parser_scan.c"
-yy208:
+#line 2235 "src/parser_scan.c"
+yy207:
                        ++cur;
-#line 167 "src/parser_scan.re"
+#line 172 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_ELLIPSIS); goto start; }
-#line 2250 "src/parser_scan.c"
-yy210:
+#line 2240 "src/parser_scan.c"
+yy209:
                        yych = *++cur;
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy289;
+                       case 'd':       goto yy286;
                        case 'F':
-                       case 'f':       goto yy291;
+                       case 'f':       goto yy288;
                        case 'L':
-                       case 'l':       goto yy293;
+                       case 'l':       goto yy290;
                        default:        goto yy114;
                        }
-yy211:
+yy210:
                        ++cur;
                        cur -= 1;
-#line 117 "src/parser_scan.re"
+#line 122 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_F; cur += 1; goto start; }
-#line 2267 "src/parser_scan.c"
-yy213:
+#line 2257 "src/parser_scan.c"
+yy212:
                        ++cur;
                        cur -= 1;
-#line 118 "src/parser_scan.re"
+#line 123 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 2273 "src/parser_scan.c"
-yy215:
+#line 2263 "src/parser_scan.c"
+yy214:
                        yych = *++cur;
                        switch (yych) {
                        case '0':
@@ -2285,34 +2275,34 @@ yy215:
                        case '9':       goto yy115;
                        default:        goto yy114;
                        }
-yy216:
+yy215:
                        yych = *++cur;
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy295;
+                       case 'u':       goto yy292;
                        default:        goto yy114;
                        }
-yy217:
+yy216:
                        ++cur;
-yy218:
+yy217:
                        cur -= 2;
-#line 113 "src/parser_scan.re"
+#line 118 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_UL; cur += 2; goto start; }
-#line 2302 "src/parser_scan.c"
-yy219:
+#line 2292 "src/parser_scan.c"
+yy218:
                        yych = *++cur;
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy295;
-                       default:        goto yy218;
+                       case 'l':       goto yy292;
+                       default:        goto yy217;
                        }
-yy220:
+yy219:
                        yyaccept = 1;
                        mrk = ++cur;
                        if ((lim - cur) < 3) CHECKEOF();;
                        yych = *cur;
                        switch (yych) {
-                       case '.':       goto yy297;
+                       case '.':       goto yy294;
                        case '0':
                        case '1':
                        case '2':
@@ -2334,7 +2324,7 @@ yy220:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy220;
+                       case 'f':       goto yy219;
                        case 'L':
                        case 'l':       goto yy127;
                        case 'P':
@@ -2343,150 +2333,150 @@ yy220:
                        case 'u':       goto yy129;
                        default:        goto yy39;
                        }
-yy222:
+yy221:
                        ++cur;
-#line 246 "src/parser_scan.re"
+#line 249 "src/parser_scan.re"
                        { tok += 1; cur -= 1; NEWTOKEN(PSI_T_CPP_HEADER); cur += 1; goto start; }
-#line 2351 "src/parser_scan.c"
-yy224:
+#line 2341 "src/parser_scan.c"
+yy223:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy299;
+                       case 'a':       goto yy296;
                        case 'V':
-                       case 'v':       goto yy300;
+                       case 'v':       goto yy297;
                        default:        goto yy62;
                        }
-yy225:
+yy224:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy301;
+                       case 'l':       goto yy298;
                        default:        goto yy62;
                        }
-yy226:
+yy225:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy302;
+                       case 'l':       goto yy299;
                        default:        goto yy62;
                        }
-yy227:
+yy226:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy303;
+                       case 'n':       goto yy300;
                        default:        goto yy62;
                        }
-yy228:
+yy227:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy304;
+                       case 'i':       goto yy301;
                        default:        goto yy62;
                        }
-yy229:
+yy228:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy305;
+                       case 'f':       goto yy302;
                        default:        goto yy62;
                        }
-yy230:
+yy229:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy307;
+                       case 'e':       goto yy304;
                        default:        goto yy62;
                        }
-yy231:
+yy230:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy309;
+                       case 'i':       goto yy306;
                        default:        goto yy62;
                        }
-yy232:
+yy231:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy310;
+                       case 'o':       goto yy307;
                        default:        goto yy62;
                        }
-yy233:
+yy232:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy311;
+                       case 's':       goto yy308;
                        default:        goto yy62;
                        }
-yy234:
+yy233:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy312;
+                       case 'a':       goto yy309;
                        default:        goto yy62;
                        }
-yy235:
+yy234:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy313;
+                       case 'e':       goto yy310;
                        default:        goto yy62;
                        }
-yy236:
+yy235:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy315;
+                       case 'c':       goto yy312;
                        default:        goto yy62;
                        }
-yy237:
+yy236:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy316;
+                       case 'e':       goto yy313;
                        default:        goto yy62;
                        }
-yy238:
+yy237:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy317;
+                       case 'd':       goto yy314;
                        default:        goto yy62;
                        }
-yy239:
+yy238:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy318;
+                       case 'l':       goto yy315;
                        default:        goto yy62;
                        }
-yy240:
+yy239:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy319;
+                       case 'v':       goto yy316;
                        default:        goto yy62;
                        }
-yy241:
+yy240:
                        yyaccept = 9;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -2553,148 +2543,73 @@ yy241:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy242;
+                       case 0x7F:      goto yy241;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
+yy241:
+#line 221 "src/parser_scan.re"
+                       { NEWTOKEN(PSI_T_LET); goto start; }
+#line 2554 "src/parser_scan.c"
 yy242:
-#line 218 "src/parser_scan.re"
-                       { NEWTOKEN(PSI_T_LET); goto start; }
-#line 2564 "src/parser_scan.c"
-yy243:
-                       yyaccept = 10;
-                       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 yy244;
-                       case '\\':      goto yy147;
-                       default:        goto yy61;
-                       }
-yy244:
-#line 217 "src/parser_scan.re"
-                       { NEWTOKEN(PSI_T_LIB); goto start; }
-#line 2639 "src/parser_scan.c"
-yy245:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy320;
+                       case 'e':       goto yy317;
                        default:        goto yy62;
                        }
-yy246:
+yy243:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy321;
+                       case 'l':       goto yy318;
                        default:        goto yy62;
                        }
-yy247:
+yy244:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy323;
+                       case 'e':       goto yy320;
                        case 'V':
-                       case 'v':       goto yy324;
+                       case 'v':       goto yy321;
                        default:        goto yy62;
                        }
-yy248:
+yy245:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'H':
-                       case 'h':       goto yy325;
+                       case 'h':       goto yy322;
                        default:        goto yy62;
                        }
-yy249:
+yy246:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy326;
+                       case 't':       goto yy323;
                        default:        goto yy62;
                        }
-yy250:
+yy247:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy327;
+                       case '_':       goto yy324;
                        default:        goto yy62;
                        }
-yy251:
+yy248:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy328;
+                       case 'u':       goto yy325;
                        default:        goto yy62;
                        }
-yy252:
-                       yyaccept = 11;
+yy249:
+                       yyaccept = 10;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -2760,174 +2675,174 @@ yy252:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy253;
+                       case 0x7F:      goto yy250;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy253:
-#line 219 "src/parser_scan.re"
+yy250:
+#line 222 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_SET); goto start; }
-#line 2771 "src/parser_scan.c"
-yy254:
+#line 2686 "src/parser_scan.c"
+yy251:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy329;
+                       case 't':       goto yy326;
                        default:        goto yy62;
                        }
-yy255:
+yy252:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy330;
+                       case 'i':       goto yy327;
                        case 'L':
-                       case 'l':       goto yy331;
+                       case 'l':       goto yy328;
                        case 'V':
-                       case 'v':       goto yy332;
+                       case 'v':       goto yy329;
                        default:        goto yy62;
                        }
-yy256:
+yy253:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'P':
-                       case 'p':       goto yy333;
+                       case 'p':       goto yy330;
                        default:        goto yy62;
                        }
-yy257:
+yy254:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy335;
+                       case 'a':       goto yy332;
                        case 'B':
-                       case 'b':       goto yy336;
+                       case 'b':       goto yy333;
                        case 'F':
-                       case 'f':       goto yy337;
+                       case 'f':       goto yy334;
                        case 'I':
-                       case 'i':       goto yy338;
+                       case 'i':       goto yy335;
                        case 'O':
-                       case 'o':       goto yy339;
+                       case 'o':       goto yy336;
                        case 'S':
-                       case 's':       goto yy340;
+                       case 's':       goto yy337;
                        default:        goto yy62;
                        }
-yy258:
+yy255:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy341;
+                       case 'e':       goto yy338;
                        default:        goto yy62;
                        }
-yy259:
+yy256:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy343;
+                       case 'e':       goto yy340;
                        default:        goto yy62;
                        }
-yy260:
+yy257:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy344;
+                       case 'n':       goto yy341;
                        default:        goto yy62;
                        }
-yy261:
+yy258:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy345;
+                       case 'l':       goto yy342;
                        default:        goto yy62;
                        }
-yy262:
+yy259:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy347;
-                       case 't':       goto yy348;
+                       case 's':       goto yy344;
+                       case 't':       goto yy345;
                        default:        goto yy62;
                        }
-yy263:
+yy260:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'x':       goto yy349;
+                       case 'x':       goto yy346;
                        default:        goto yy62;
                        }
-yy264:
+yy261:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy350;
+                       case 'n':       goto yy347;
                        default:        goto yy62;
                        }
-yy265:
+yy262:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy351;
+                       case 'e':       goto yy348;
                        default:        goto yy62;
                        }
-yy266:
+yy263:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':       goto yy301;
-                       case 'l':       goto yy352;
+                       case 'L':       goto yy298;
+                       case 'l':       goto yy349;
                        default:        goto yy62;
                        }
-yy267:
+yy264:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy354;
+                       case 'r':       goto yy351;
                        default:        goto yy62;
                        }
-yy268:
+yy265:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy356;
+                       case 's':       goto yy353;
                        default:        goto yy62;
                        }
-yy269:
+yy266:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'b':       goto yy357;
+                       case 'b':       goto yy354;
                        default:        goto yy62;
                        }
-yy270:
+yy267:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy358;
+                       case 'm':       goto yy355;
                        default:        goto yy62;
                        }
-yy271:
+yy268:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':       goto yy312;
-                       case 'a':       goto yy360;
+                       case 'A':       goto yy309;
+                       case 'a':       goto yy357;
                        default:        goto yy62;
                        }
-yy272:
+yy269:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy361;
+                       case 'i':       goto yy358;
                        default:        goto yy62;
                        }
-yy273:
-                       yyaccept = 12;
+yy270:
+                       yyaccept = 11;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -2993,137 +2908,137 @@ yy273:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy274;
+                       case 0x7F:      goto yy271;
                        case 'V':
-                       case 'v':       goto yy319;
+                       case 'v':       goto yy316;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy274:
-#line 187 "src/parser_scan.re"
+yy271:
+#line 191 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_INT); goto start; }
-#line 3006 "src/parser_scan.c"
-yy275:
+#line 2921 "src/parser_scan.c"
+yy272:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy362;
+                       case 'e':       goto yy359;
                        default:        goto yy62;
                        }
-yy276:
+yy273:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy364;
+                       case 'g':       goto yy361;
                        default:        goto yy62;
                        }
-yy277:
+yy274:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy366;
+                       case 'g':       goto yy363;
                        default:        goto yy62;
                        }
-yy278:
+yy275:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy367;
+                       case 'r':       goto yy364;
                        default:        goto yy62;
                        }
-yy279:
+yy276:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy368;
+                       case 'n':       goto yy365;
                        default:        goto yy62;
                        }
-yy280:
+yy277:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy369;
+                       case 'e':       goto yy366;
                        default:        goto yy62;
                        }
-yy281:
+yy278:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy330;
+                       case 'i':       goto yy327;
                        case 'L':
-                       case 'l':       goto yy331;
+                       case 'l':       goto yy328;
                        case 'V':
-                       case 'v':       goto yy332;
-                       case 'u':       goto yy370;
+                       case 'v':       goto yy329;
+                       case 'u':       goto yy367;
                        default:        goto yy62;
                        }
-yy282:
+yy279:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy371;
+                       case 'e':       goto yy368;
                        default:        goto yy62;
                        }
-yy283:
+yy280:
                        ++cur;
                        cur -= 1;
-#line 125 "src/parser_scan.re"
+#line 130 "src/parser_scan.re"
                        { char_width = 1; }
-#line 3074 "src/parser_scan.c"
-yy285:
+#line 2989 "src/parser_scan.c"
+yy282:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy372;
+                       case 'o':       goto yy369;
                        default:        goto yy62;
                        }
-yy286:
+yy283:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy373;
+                       case 'i':       goto yy370;
                        default:        goto yy62;
                        }
-yy287:
+yy284:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy374;
+                       case 'd':       goto yy371;
                        default:        goto yy62;
                        }
-yy288:
+yy285:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy376;
+                       case 'a':       goto yy373;
                        default:        goto yy62;
                        }
-yy289:
+yy286:
                        ++cur;
                        cur -= 2;
-#line 120 "src/parser_scan.re"
+#line 125 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DD; cur += 2; goto start; }
-#line 3108 "src/parser_scan.c"
-yy291:
+#line 3023 "src/parser_scan.c"
+yy288:
                        ++cur;
                        cur -= 2;
-#line 119 "src/parser_scan.re"
+#line 124 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DF; cur += 2; goto start; }
-#line 3114 "src/parser_scan.c"
-yy293:
+#line 3029 "src/parser_scan.c"
+yy290:
                        ++cur;
                        cur -= 2;
-#line 121 "src/parser_scan.re"
+#line 126 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DL; cur += 2; goto start; }
-#line 3120 "src/parser_scan.c"
-yy295:
+#line 3035 "src/parser_scan.c"
+yy292:
                        ++cur;
                        cur -= 3;
-#line 114 "src/parser_scan.re"
+#line 119 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_ULL; cur += 3; goto start; }
-#line 3126 "src/parser_scan.c"
-yy297:
+#line 3041 "src/parser_scan.c"
+yy294:
                        ++cur;
                        if ((lim - cur) < 3) CHECKEOF();;
                        yych = *cur;
@@ -3149,65 +3064,65 @@ yy297:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy297;
+                       case 'f':       goto yy294;
                        case 'P':
                        case 'p':       goto yy126;
                        default:        goto yy114;
                        }
-yy299:
+yy296:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy377;
+                       case 'y':       goto yy374;
                        default:        goto yy62;
                        }
-yy300:
+yy297:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy379;
+                       case 'a':       goto yy376;
                        default:        goto yy62;
                        }
-yy301:
+yy298:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy380;
+                       case 'v':       goto yy377;
                        default:        goto yy62;
                        }
-yy302:
+yy299:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy381;
+                       case 'a':       goto yy378;
                        case 'B':
-                       case 'b':       goto yy382;
+                       case 'b':       goto yy379;
                        case 'O':
-                       case 'o':       goto yy383;
+                       case 'o':       goto yy380;
                        default:        goto yy62;
                        }
-yy303:
+yy300:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy384;
+                       case 't':       goto yy381;
                        default:        goto yy62;
                        }
-yy304:
+yy301:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy386;
+                       case 'n':       goto yy383;
                        default:        goto yy62;
                        }
-yy305:
-                       yyaccept = 13;
+yy302:
+                       yyaccept = 12;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3273,16 +3188,16 @@ yy305:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy306;
+                       case 0x7F:      goto yy303;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy306:
-#line 197 "src/parser_scan.re"
+yy303:
+#line 201 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_ELIF); goto start; }
-#line 3284 "src/parser_scan.c"
-yy307:
-                       yyaccept = 14;
+#line 3199 "src/parser_scan.c"
+yy304:
+                       yyaccept = 13;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3348,48 +3263,48 @@ yy307:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy308;
+                       case 0x7F:      goto yy305;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy308:
-#line 196 "src/parser_scan.re"
+yy305:
+#line 200 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_ELSE); goto start; }
-#line 3359 "src/parser_scan.c"
-yy309:
+#line 3274 "src/parser_scan.c"
+yy306:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy387;
+                       case 'f':       goto yy384;
                        default:        goto yy62;
                        }
-yy310:
+yy307:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy389;
+                       case 'r':       goto yy386;
                        default:        goto yy62;
                        }
-yy311:
+yy308:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy391;
+                       case 'e':       goto yy388;
                        default:        goto yy62;
                        }
-yy312:
+yy309:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy393;
+                       case 't':       goto yy390;
                        default:        goto yy62;
                        }
-yy313:
-                       yyaccept = 15;
+yy310:
+                       yyaccept = 14;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3455,64 +3370,64 @@ yy313:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy314;
+                       case 0x7F:      goto yy311;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy314:
-#line 224 "src/parser_scan.re"
+yy311:
+#line 227 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_FREE); goto start; }
-#line 3466 "src/parser_scan.c"
-yy315:
+#line 3381 "src/parser_scan.c"
+yy312:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy394;
+                       case 't':       goto yy391;
                        default:        goto yy62;
                        }
-yy316:
+yy313:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy395;
+                       case 'f':       goto yy392;
                        default:        goto yy62;
                        }
-yy317:
+yy314:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy397;
+                       case 'e':       goto yy394;
                        default:        goto yy62;
                        }
-yy318:
+yy315:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy398;
+                       case 'u':       goto yy395;
                        default:        goto yy62;
                        }
-yy319:
+yy316:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy399;
+                       case 'a':       goto yy396;
                        default:        goto yy62;
                        }
-yy320:
+yy317:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy400;
+                       case 'd':       goto yy397;
                        default:        goto yy62;
                        }
-yy321:
-                       yyaccept = 16;
+yy318:
+                       yyaccept = 15;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3578,95 +3493,95 @@ yy321:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy322;
+                       case 0x7F:      goto yy319;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy322:
-#line 208 "src/parser_scan.re"
+yy319:
+#line 212 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_NULL); goto start; }
-#line 3589 "src/parser_scan.c"
-yy323:
+#line 3504 "src/parser_scan.c"
+yy320:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy402;
+                       case 'c':       goto yy399;
                        default:        goto yy62;
                        }
-yy324:
+yy321:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy403;
+                       case 'a':       goto yy400;
                        default:        goto yy62;
                        }
-yy325:
+yy322:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy404;
+                       case 'v':       goto yy401;
                        default:        goto yy62;
                        }
-yy326:
+yy323:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy405;
+                       case '_':       goto yy402;
                        default:        goto yy62;
                        }
-yy327:
+yy324:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy406;
+                       case 'a':       goto yy403;
                        default:        goto yy62;
                        }
-yy328:
+yy325:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy407;
+                       case 'r':       goto yy404;
                        default:        goto yy62;
                        }
-yy329:
+yy326:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy408;
+                       case 'i':       goto yy405;
                        default:        goto yy62;
                        }
-yy330:
+yy327:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy409;
+                       case 'n':       goto yy406;
                        default:        goto yy62;
                        }
-yy331:
+yy328:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy410;
+                       case 'e':       goto yy407;
                        default:        goto yy62;
                        }
-yy332:
+yy329:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy411;
+                       case 'a':       goto yy408;
                        default:        goto yy62;
                        }
-yy333:
-                       yyaccept = 17;
+yy330:
+                       yyaccept = 16;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3732,64 +3647,64 @@ yy333:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy334;
+                       case 0x7F:      goto yy331;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy334:
-#line 225 "src/parser_scan.re"
+yy331:
+#line 228 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_TEMP); goto start; }
-#line 3743 "src/parser_scan.c"
-yy335:
+#line 3658 "src/parser_scan.c"
+yy332:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy412;
+                       case 'r':       goto yy409;
                        default:        goto yy62;
                        }
-yy336:
+yy333:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy413;
+                       case 'o':       goto yy410;
                        default:        goto yy62;
                        }
-yy337:
+yy334:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy414;
+                       case 'l':       goto yy411;
                        default:        goto yy62;
                        }
-yy338:
+yy335:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy415;
+                       case 'n':       goto yy412;
                        default:        goto yy62;
                        }
-yy339:
+yy336:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy416;
+                       case 'b':       goto yy413;
                        default:        goto yy62;
                        }
-yy340:
+yy337:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy417;
+                       case 't':       goto yy414;
                        default:        goto yy62;
                        }
-yy341:
-                       yyaccept = 18;
+yy338:
+                       yyaccept = 17;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3855,32 +3770,32 @@ yy341:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy342;
+                       case 0x7F:      goto yy339;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy342:
-#line 206 "src/parser_scan.re"
+yy339:
+#line 210 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_TRUE); goto start; }
-#line 3866 "src/parser_scan.c"
-yy343:
+#line 3781 "src/parser_scan.c"
+yy340:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy418;
+                       case 'f':       goto yy415;
                        default:        goto yy62;
                        }
-yy344:
+yy341:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy420;
+                       case 'i':       goto yy417;
                        default:        goto yy62;
                        }
-yy345:
-                       yyaccept = 19;
+yy342:
+                       yyaccept = 18;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3946,51 +3861,51 @@ yy345:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy346;
+                       case 0x7F:      goto yy343;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy346:
-#line 234 "src/parser_scan.re"
+yy343:
+#line 237 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_ZVAL); goto start; }
-#line 3957 "src/parser_scan.c"
-yy347:
+#line 3872 "src/parser_scan.c"
+yy344:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy421;
+                       case 'm':       goto yy418;
                        default:        goto yy62;
                        }
-yy348:
+yy345:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy423;
+                       case 't':       goto yy420;
                        default:        goto yy62;
                        }
-yy349:
+yy346:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy424;
+                       case 't':       goto yy421;
                        default:        goto yy62;
                        }
-yy350:
+yy347:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'l':       goto yy272;
+                       case 'l':       goto yy269;
                        default:        goto yy62;
                        }
-yy351:
+yy348:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy425;
+                       case 's':       goto yy422;
                        default:        goto yy62;
                        }
-yy352:
-                       yyaccept = 20;
+yy349:
+                       yyaccept = 19;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4056,18 +3971,18 @@ yy352:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy353;
+                       case 0x7F:      goto yy350;
                        case 'V':
-                       case 'v':       goto yy380;
+                       case 'v':       goto yy377;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy353:
-#line 184 "src/parser_scan.re"
+yy350:
+#line 188 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_BOOL); goto start; }
-#line 4069 "src/parser_scan.c"
-yy354:
-                       yyaccept = 21;
+#line 3984 "src/parser_scan.c"
+yy351:
+                       yyaccept = 20;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4133,30 +4048,30 @@ yy354:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy355;
+                       case 0x7F:      goto yy352;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy355:
-#line 185 "src/parser_scan.re"
+yy352:
+#line 189 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CHAR); goto start; }
-#line 4144 "src/parser_scan.c"
-yy356:
+#line 4059 "src/parser_scan.c"
+yy353:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy426;
+                       case 't':       goto yy423;
                        default:        goto yy62;
                        }
-yy357:
+yy354:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'l':       goto yy428;
+                       case 'l':       goto yy425;
                        default:        goto yy62;
                        }
-yy358:
-                       yyaccept = 22;
+yy355:
+                       yyaccept = 21;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4222,31 +4137,31 @@ yy358:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy359;
+                       case 0x7F:      goto yy356;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy359:
-#line 181 "src/parser_scan.re"
+yy356:
+#line 185 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_ENUM); goto start; }
-#line 4233 "src/parser_scan.c"
-yy360:
+#line 4148 "src/parser_scan.c"
+yy357:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':       goto yy393;
-                       case 't':       goto yy429;
+                       case 'T':       goto yy390;
+                       case 't':       goto yy426;
                        default:        goto yy62;
                        }
-yy361:
+yy358:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy431;
+                       case 'n':       goto yy428;
                        default:        goto yy62;
                        }
-yy362:
-                       yyaccept = 23;
+yy359:
+                       yyaccept = 22;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4312,16 +4227,16 @@ yy362:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy363;
+                       case 0x7F:      goto yy360;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy363:
-#line 177 "src/parser_scan.re"
+yy360:
+#line 181 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_LINE); goto start; }
-#line 4323 "src/parser_scan.c"
-yy364:
-                       yyaccept = 24;
+#line 4238 "src/parser_scan.c"
+yy361:
+                       yyaccept = 23;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4387,72 +4302,72 @@ yy364:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy365;
+                       case 0x7F:      goto yy362;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy365:
-#line 188 "src/parser_scan.re"
+yy362:
+#line 192 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_LONG); goto start; }
-#line 4398 "src/parser_scan.c"
-yy366:
+#line 4313 "src/parser_scan.c"
+yy363:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy432;
+                       case 'm':       goto yy429;
                        default:        goto yy62;
                        }
-yy367:
+yy364:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy433;
+                       case 't':       goto yy430;
                        default:        goto yy62;
                        }
-yy368:
+yy365:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy435;
+                       case 'e':       goto yy432;
                        default:        goto yy62;
                        }
-yy369:
+yy366:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy436;
+                       case 'o':       goto yy433;
                        default:        goto yy62;
                        }
-yy370:
+yy367:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'c':       goto yy437;
+                       case 'c':       goto yy434;
                        default:        goto yy62;
                        }
-yy371:
+yy368:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy438;
+                       case 'd':       goto yy435;
                        default:        goto yy62;
                        }
-yy372:
+yy369:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy439;
+                       case 'n':       goto yy436;
                        default:        goto yy62;
                        }
-yy373:
+yy370:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy441;
+                       case 'g':       goto yy438;
                        default:        goto yy62;
                        }
-yy374:
-                       yyaccept = 25;
+yy371:
+                       yyaccept = 24;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4518,23 +4433,23 @@ yy374:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy375;
+                       case 0x7F:      goto yy372;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy375:
-#line 183 "src/parser_scan.re"
+yy372:
+#line 187 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_VOID); goto start; }
-#line 4529 "src/parser_scan.c"
-yy376:
+#line 4444 "src/parser_scan.c"
+yy373:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy442;
+                       case 't':       goto yy439;
                        default:        goto yy62;
                        }
-yy377:
-                       yyaccept = 26;
+yy374:
+                       yyaccept = 25;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4600,56 +4515,56 @@ yy377:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy378;
+                       case 0x7F:      goto yy375;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy378:
-#line 212 "src/parser_scan.re"
+yy375:
+#line 216 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_ARRAY); goto start; }
-#line 4611 "src/parser_scan.c"
-yy379:
+#line 4526 "src/parser_scan.c"
+yy376:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy443;
+                       case 'l':       goto yy440;
                        default:        goto yy62;
                        }
-yy380:
+yy377:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy445;
+                       case 'a':       goto yy442;
                        default:        goto yy62;
                        }
-yy381:
+yy378:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy446;
+                       case 'b':       goto yy443;
                        default:        goto yy62;
                        }
-yy382:
+yy379:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy447;
+                       case 'a':       goto yy444;
                        default:        goto yy62;
                        }
-yy383:
+yy380:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy448;
+                       case 'c':       goto yy445;
                        default:        goto yy62;
                        }
-yy384:
-                       yyaccept = 27;
+yy381:
+                       yyaccept = 26;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4715,24 +4630,24 @@ yy384:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy385;
+                       case 0x7F:      goto yy382;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy385:
-#line 235 "src/parser_scan.re"
+yy382:
+#line 238 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_COUNT); goto start; }
-#line 4726 "src/parser_scan.c"
-yy386:
+#line 4641 "src/parser_scan.c"
+yy383:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy450;
+                       case 'e':       goto yy447;
                        default:        goto yy62;
                        }
-yy387:
-                       yyaccept = 28;
+yy384:
+                       yyaccept = 27;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4798,16 +4713,16 @@ yy387:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy388;
+                       case 0x7F:      goto yy385;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy388:
-#line 198 "src/parser_scan.re"
+yy385:
+#line 202 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_ENDIF); goto start; }
-#line 4809 "src/parser_scan.c"
-yy389:
-                       yyaccept = 29;
+#line 4724 "src/parser_scan.c"
+yy386:
+                       yyaccept = 28;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4873,16 +4788,16 @@ yy389:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy390;
+                       case 0x7F:      goto yy387;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy390:
-#line 203 "src/parser_scan.re"
+yy387:
+#line 207 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_ERROR); goto start; }
-#line 4884 "src/parser_scan.c"
-yy391:
-                       yyaccept = 30;
+#line 4799 "src/parser_scan.c"
+yy388:
+                       yyaccept = 29;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4948,32 +4863,32 @@ yy391:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy392;
+                       case 0x7F:      goto yy389;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy392:
-#line 207 "src/parser_scan.re"
+yy389:
+#line 211 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_FALSE); goto start; }
-#line 4959 "src/parser_scan.c"
-yy393:
+#line 4874 "src/parser_scan.c"
+yy390:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy452;
+                       case 'v':       goto yy449;
                        default:        goto yy62;
                        }
-yy394:
+yy391:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy453;
+                       case 'i':       goto yy450;
                        default:        goto yy62;
                        }
-yy395:
-                       yyaccept = 31;
+yy392:
+                       yyaccept = 30;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5039,40 +4954,40 @@ yy395:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy396;
+                       case 0x7F:      goto yy393;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy396:
-#line 194 "src/parser_scan.re"
+yy393:
+#line 198 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_IFDEF); goto start; }
-#line 5050 "src/parser_scan.c"
-yy397:
+#line 4965 "src/parser_scan.c"
+yy394:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy454;
+                       case 'f':       goto yy451;
                        default:        goto yy62;
                        }
-yy398:
+yy395:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy456;
+                       case 'd':       goto yy453;
                        default:        goto yy62;
                        }
-yy399:
+yy396:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy457;
+                       case 'l':       goto yy454;
                        default:        goto yy62;
                        }
-yy400:
-                       yyaccept = 32;
+yy397:
+                       yyaccept = 31;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5138,145 +5053,145 @@ yy400:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy401;
+                       case 0x7F:      goto yy398;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy401:
-#line 209 "src/parser_scan.re"
+yy398:
+#line 213 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_MIXED); goto start; }
-#line 5149 "src/parser_scan.c"
-yy402:
+#line 5064 "src/parser_scan.c"
+yy399:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy459;
+                       case 't':       goto yy456;
                        default:        goto yy62;
                        }
-yy403:
+yy400:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy461;
+                       case 'l':       goto yy458;
                        default:        goto yy62;
                        }
-yy404:
+yy401:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy463;
+                       case 'a':       goto yy460;
                        default:        goto yy62;
                        }
-yy405:
+yy402:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy464;
+                       case 'a':       goto yy461;
                        default:        goto yy62;
                        }
-yy406:
+yy403:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy465;
+                       case 's':       goto yy462;
                        default:        goto yy62;
                        }
-yy407:
+yy404:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy466;
+                       case 'n':       goto yy463;
                        default:        goto yy62;
                        }
-yy408:
+yy405:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy468;
+                       case 'c':       goto yy465;
                        default:        goto yy62;
                        }
-yy409:
+yy406:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy470;
+                       case 'g':       goto yy467;
                        default:        goto yy62;
                        }
-yy410:
+yy407:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy472;
+                       case 'n':       goto yy469;
                        default:        goto yy62;
                        }
-yy411:
+yy408:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy474;
+                       case 'l':       goto yy471;
                        default:        goto yy62;
                        }
-yy412:
+yy409:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy476;
+                       case 'r':       goto yy473;
                        default:        goto yy62;
                        }
-yy413:
+yy410:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy477;
+                       case 'o':       goto yy474;
                        default:        goto yy62;
                        }
-yy414:
+yy411:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy478;
+                       case 'o':       goto yy475;
                        default:        goto yy62;
                        }
-yy415:
+yy412:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy479;
+                       case 't':       goto yy476;
                        default:        goto yy62;
                        }
-yy416:
+yy413:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy481;
+                       case 'j':       goto yy478;
                        default:        goto yy62;
                        }
-yy417:
+yy414:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy482;
+                       case 'r':       goto yy479;
                        default:        goto yy62;
                        }
-yy418:
-                       yyaccept = 33;
-                       yych = *(mrk = ++cur);
+yy415:
+                       yyaccept = 32;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
                        case 0x01:
@@ -5341,24 +5256,24 @@ yy418:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy419;
+                       case 0x7F:      goto yy416;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy419:
-#line 201 "src/parser_scan.re"
+yy416:
+#line 205 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_UNDEF); goto start; }
-#line 5352 "src/parser_scan.c"
-yy420:
+#line 5267 "src/parser_scan.c"
+yy417:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy483;
+                       case 'n':       goto yy480;
                        default:        goto yy62;
                        }
-yy421:
-                       yyaccept = 34;
+yy418:
+                       yyaccept = 33;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5424,38 +5339,38 @@ yy421:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy422;
+                       case 0x7F:      goto yy419;
                        case '\\':      goto yy147;
-                       case '_':       goto yy484;
+                       case '_':       goto yy481;
                        default:        goto yy61;
                        }
-yy422:
-#line 174 "src/parser_scan.re"
+yy419:
+#line 178 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CPP_ASM); goto start; }
-#line 5436 "src/parser_scan.c"
-yy423:
+#line 5351 "src/parser_scan.c"
+yy420:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy485;
+                       case 'r':       goto yy482;
                        default:        goto yy62;
                        }
-yy424:
+yy421:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy486;
+                       case 'e':       goto yy483;
                        default:        goto yy62;
                        }
-yy425:
+yy422:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy487;
+                       case 't':       goto yy484;
                        default:        goto yy62;
                        }
-yy426:
-                       yyaccept = 35;
+yy423:
+                       yyaccept = 34;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5521,23 +5436,23 @@ yy426:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy427;
+                       case 0x7F:      goto yy424;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy427:
-#line 182 "src/parser_scan.re"
+yy424:
+#line 186 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CONST); goto start; }
-#line 5532 "src/parser_scan.c"
-yy428:
+#line 5447 "src/parser_scan.c"
+yy425:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy488;
+                       case 'e':       goto yy485;
                        default:        goto yy62;
                        }
-yy429:
-                       yyaccept = 36;
+yy426:
+                       yyaccept = 35;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5603,32 +5518,32 @@ yy429:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy430;
+                       case 0x7F:      goto yy427;
                        case 'V':
-                       case 'v':       goto yy452;
+                       case 'v':       goto yy449;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy430:
-#line 189 "src/parser_scan.re"
+yy427:
+#line 193 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_FLOAT); goto start; }
-#line 5616 "src/parser_scan.c"
-yy431:
+#line 5531 "src/parser_scan.c"
+yy428:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy490;
+                       case 'e':       goto yy487;
                        default:        goto yy62;
                        }
-yy432:
+yy429:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy492;
+                       case 'a':       goto yy489;
                        default:        goto yy62;
                        }
-yy433:
-                       yyaccept = 37;
+yy430:
+                       yyaccept = 36;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5694,44 +5609,44 @@ yy433:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy434;
+                       case 0x7F:      goto yy431;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy434:
-#line 186 "src/parser_scan.re"
+yy431:
+#line 190 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_SHORT); goto start; }
-#line 5705 "src/parser_scan.c"
-yy435:
+#line 5620 "src/parser_scan.c"
+yy432:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy494;
+                       case 'd':       goto yy491;
                        default:        goto yy62;
                        }
-yy436:
+yy433:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'f':       goto yy496;
+                       case 'f':       goto yy493;
                        default:        goto yy62;
                        }
-yy437:
+yy434:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy498;
+                       case 't':       goto yy495;
                        default:        goto yy62;
                        }
-yy438:
+yy435:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy500;
+                       case 'e':       goto yy497;
                        default:        goto yy62;
                        }
-yy439:
-                       yyaccept = 38;
+yy436:
+                       yyaccept = 37;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5797,30 +5712,30 @@ yy439:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy440;
+                       case 0x7F:      goto yy437;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy440:
-#line 180 "src/parser_scan.re"
+yy437:
+#line 184 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_UNION); goto start; }
-#line 5808 "src/parser_scan.c"
-yy441:
+#line 5723 "src/parser_scan.c"
+yy438:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy501;
+                       case 'n':       goto yy498;
                        default:        goto yy62;
                        }
-yy442:
+yy439:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy502;
+                       case 'i':       goto yy499;
                        default:        goto yy62;
                        }
-yy443:
-                       yyaccept = 39;
+yy440:
+                       yyaccept = 38;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5886,40 +5801,40 @@ yy443:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy444;
+                       case 0x7F:      goto yy441;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy444:
-#line 232 "src/parser_scan.re"
+yy441:
+#line 235 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_ARRVAL); goto start; }
-#line 5897 "src/parser_scan.c"
-yy445:
+#line 5812 "src/parser_scan.c"
+yy442:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy503;
+                       case 'l':       goto yy500;
                        default:        goto yy62;
                        }
-yy446:
+yy443:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy505;
+                       case 'l':       goto yy502;
                        default:        goto yy62;
                        }
-yy447:
+yy444:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy506;
+                       case 'c':       goto yy503;
                        default:        goto yy62;
                        }
-yy448:
-                       yyaccept = 40;
+yy445:
+                       yyaccept = 39;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5985,16 +5900,16 @@ yy448:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy449;
+                       case 0x7F:      goto yy446;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy449:
-#line 236 "src/parser_scan.re"
+yy446:
+#line 239 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CALLOC); goto start; }
-#line 5996 "src/parser_scan.c"
-yy450:
-                       yyaccept = 41;
+#line 5911 "src/parser_scan.c"
+yy447:
+                       yyaccept = 40;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6060,34 +5975,34 @@ yy450:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy451;
+                       case 0x7F:      goto yy448;
                        case 'D':
-                       case 'd':       goto yy507;
+                       case 'd':       goto yy504;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy451:
-#line 199 "src/parser_scan.re"
+yy448:
+#line 203 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_DEFINE); goto start; }
-#line 6073 "src/parser_scan.c"
-yy452:
+#line 5988 "src/parser_scan.c"
+yy449:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy509;
+                       case 'a':       goto yy506;
                        default:        goto yy62;
                        }
-yy453:
+yy450:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy510;
+                       case 'o':       goto yy507;
                        default:        goto yy62;
                        }
-yy454:
-                       yyaccept = 42;
+yy451:
+                       yyaccept = 41;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6153,24 +6068,24 @@ yy454:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy455;
+                       case 0x7F:      goto yy452;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy455:
-#line 195 "src/parser_scan.re"
+yy452:
+#line 199 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_IFNDEF); goto start; }
-#line 6164 "src/parser_scan.c"
-yy456:
+#line 6079 "src/parser_scan.c"
+yy453:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy511;
+                       case 'e':       goto yy508;
                        default:        goto yy62;
                        }
-yy457:
-                       yyaccept = 43;
+yy454:
+                       yyaccept = 42;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6236,16 +6151,16 @@ yy457:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy458;
+                       case 0x7F:      goto yy455;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy458:
-#line 229 "src/parser_scan.re"
+yy455:
+#line 232 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_INTVAL); goto start; }
-#line 6247 "src/parser_scan.c"
-yy459:
-                       yyaccept = 44;
+#line 6162 "src/parser_scan.c"
+yy456:
+                       yyaccept = 43;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6311,16 +6226,16 @@ yy459:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy460;
+                       case 0x7F:      goto yy457;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy460:
-#line 213 "src/parser_scan.re"
+yy457:
+#line 217 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_OBJECT); goto start; }
-#line 6322 "src/parser_scan.c"
-yy461:
-                       yyaccept = 45;
+#line 6237 "src/parser_scan.c"
+yy458:
+                       yyaccept = 44;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6386,40 +6301,40 @@ yy461:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy462;
+                       case 0x7F:      goto yy459;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy462:
-#line 233 "src/parser_scan.re"
+yy459:
+#line 236 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_OBJVAL); goto start; }
-#line 6397 "src/parser_scan.c"
-yy463:
+#line 6312 "src/parser_scan.c"
+yy460:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy513;
+                       case 'l':       goto yy510;
                        default:        goto yy62;
                        }
-yy464:
+yy461:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy515;
+                       case 's':       goto yy512;
                        default:        goto yy62;
                        }
-yy465:
+yy462:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy516;
+                       case 's':       goto yy513;
                        default:        goto yy62;
                        }
-yy466:
-                       yyaccept = 46;
+yy463:
+                       yyaccept = 45;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6485,16 +6400,16 @@ yy466:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy467;
+                       case 0x7F:      goto yy464;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy467:
-#line 222 "src/parser_scan.re"
+yy464:
+#line 225 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_RETURN); goto start; }
-#line 6496 "src/parser_scan.c"
-yy468:
-                       yyaccept = 47;
+#line 6411 "src/parser_scan.c"
+yy465:
+                       yyaccept = 46;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6560,16 +6475,16 @@ yy468:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy469;
+                       case 0x7F:      goto yy466;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy469:
-#line 215 "src/parser_scan.re"
+yy466:
+#line 219 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_STATIC); goto start; }
-#line 6571 "src/parser_scan.c"
-yy470:
-                       yyaccept = 48;
+#line 6486 "src/parser_scan.c"
+yy467:
+                       yyaccept = 47;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6635,16 +6550,16 @@ yy470:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy471;
+                       case 0x7F:      goto yy468;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy471:
-#line 211 "src/parser_scan.re"
+yy468:
+#line 215 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_STRING); goto start; }
-#line 6646 "src/parser_scan.c"
-yy472:
-                       yyaccept = 49;
+#line 6561 "src/parser_scan.c"
+yy469:
+                       yyaccept = 48;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6710,16 +6625,16 @@ yy472:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy473;
+                       case 0x7F:      goto yy470;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy473:
-#line 226 "src/parser_scan.re"
+yy470:
+#line 229 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_STRLEN); goto start; }
-#line 6721 "src/parser_scan.c"
-yy474:
-                       yyaccept = 50;
+#line 6636 "src/parser_scan.c"
+yy471:
+                       yyaccept = 49;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6785,40 +6700,40 @@ yy474:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy475;
+                       case 0x7F:      goto yy472;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy475:
-#line 227 "src/parser_scan.re"
+yy472:
+#line 230 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_STRVAL); goto start; }
-#line 6796 "src/parser_scan.c"
-yy476:
+#line 6711 "src/parser_scan.c"
+yy473:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy517;
+                       case 'a':       goto yy514;
                        default:        goto yy62;
                        }
-yy477:
+yy474:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy518;
+                       case 'l':       goto yy515;
                        default:        goto yy62;
                        }
-yy478:
+yy475:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy520;
+                       case 'a':       goto yy517;
                        default:        goto yy62;
                        }
-yy479:
-                       yyaccept = 51;
+yy476:
+                       yyaccept = 50;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6884,68 +6799,68 @@ yy479:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy480;
+                       case 0x7F:      goto yy477;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy480:
-#line 240 "src/parser_scan.re"
+yy477:
+#line 243 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_TO_INT); goto start; }
-#line 6895 "src/parser_scan.c"
-yy481:
+#line 6810 "src/parser_scan.c"
+yy478:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy521;
+                       case 'e':       goto yy518;
                        default:        goto yy62;
                        }
-yy482:
+yy479:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy522;
+                       case 'i':       goto yy519;
                        default:        goto yy62;
                        }
-yy483:
+yy480:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy523;
+                       case 'g':       goto yy520;
                        default:        goto yy62;
                        }
-yy484:
+yy481:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy525;
+                       case '_':       goto yy522;
                        default:        goto yy62;
                        }
-yy485:
+yy482:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy526;
+                       case 'i':       goto yy523;
                        default:        goto yy62;
                        }
-yy486:
+yy483:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy527;
+                       case 'n':       goto yy524;
                        default:        goto yy62;
                        }
-yy487:
+yy484:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy528;
+                       case 'r':       goto yy525;
                        default:        goto yy62;
                        }
-yy488:
-                       yyaccept = 52;
+yy485:
+                       yyaccept = 51;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7011,16 +6926,16 @@ yy488:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy489;
+                       case 0x7F:      goto yy486;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy489:
-#line 190 "src/parser_scan.re"
+yy486:
+#line 194 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_DOUBLE); goto start; }
-#line 7022 "src/parser_scan.c"
-yy490:
-                       yyaccept = 53;
+#line 6937 "src/parser_scan.c"
+yy487:
+                       yyaccept = 52;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7086,16 +7001,16 @@ yy490:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy491;
+                       case 0x7F:      goto yy488;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy491:
-#line 171 "src/parser_scan.re"
+yy488:
+#line 175 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CPP_INLINE); goto start; }
-#line 7097 "src/parser_scan.c"
-yy492:
-                       yyaccept = 54;
+#line 7012 "src/parser_scan.c"
+yy489:
+                       yyaccept = 53;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7161,16 +7076,16 @@ yy492:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy493;
+                       case 0x7F:      goto yy490;
                        case '\\':      goto yy147;
-                       default:        goto yy529;
+                       default:        goto yy61;
                        }
-yy493:
-#line 169 "src/parser_scan.re"
+yy490:
+#line 174 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_PRAGMA); goto start; }
-#line 7172 "src/parser_scan.c"
-yy494:
-                       yyaccept = 55;
+#line 7087 "src/parser_scan.c"
+yy491:
+                       yyaccept = 54;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7236,16 +7151,16 @@ yy494:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy495;
+                       case 0x7F:      goto yy492;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy495:
-#line 192 "src/parser_scan.re"
-                       { NEWTOKEN(PSI_T_SIGNED); goto start; }
-#line 7247 "src/parser_scan.c"
-yy496:
-                       yyaccept = 56;
+yy492:
+#line 196 "src/parser_scan.re"
+                       { NEWTOKEN(PSI_T_SIGNED); goto start; }
+#line 7162 "src/parser_scan.c"
+yy493:
+                       yyaccept = 55;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7311,16 +7226,16 @@ yy496:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy497;
+                       case 0x7F:      goto yy494;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy497:
-#line 176 "src/parser_scan.re"
+yy494:
+#line 180 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_SIZEOF); goto start; }
-#line 7322 "src/parser_scan.c"
-yy498:
-                       yyaccept = 57;
+#line 7237 "src/parser_scan.c"
+yy495:
+                       yyaccept = 56;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7386,37 +7301,37 @@ yy498:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy499;
+                       case 0x7F:      goto yy496;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy499:
-#line 179 "src/parser_scan.re"
+yy496:
+#line 183 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_STRUCT); goto start; }
-#line 7397 "src/parser_scan.c"
-yy500:
+#line 7312 "src/parser_scan.c"
+yy497:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'f':       goto yy531;
+                       case 'f':       goto yy526;
                        default:        goto yy62;
                        }
-yy501:
+yy498:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy533;
+                       case 'e':       goto yy528;
                        default:        goto yy62;
                        }
-yy502:
+yy499:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'l':       goto yy534;
+                       case 'l':       goto yy529;
                        default:        goto yy62;
                        }
-yy503:
-                       yyaccept = 58;
+yy500:
+                       yyaccept = 57;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7482,32 +7397,32 @@ yy503:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy504;
+                       case 0x7F:      goto yy501;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy504:
-#line 231 "src/parser_scan.re"
+yy501:
+#line 234 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
-#line 7493 "src/parser_scan.c"
-yy505:
+#line 7408 "src/parser_scan.c"
+yy502:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy535;
+                       case 'e':       goto yy530;
                        default:        goto yy62;
                        }
-yy506:
+yy503:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'K':
-                       case 'k':       goto yy537;
+                       case 'k':       goto yy532;
                        default:        goto yy62;
                        }
-yy507:
-                       yyaccept = 59;
+yy504:
+                       yyaccept = 58;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7573,32 +7488,32 @@ yy507:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy508;
+                       case 0x7F:      goto yy505;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy508:
-#line 200 "src/parser_scan.re"
+yy505:
+#line 204 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_DEFINED); goto start; }
-#line 7584 "src/parser_scan.c"
-yy509:
+#line 7499 "src/parser_scan.c"
+yy506:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy539;
+                       case 'l':       goto yy534;
                        default:        goto yy62;
                        }
-yy510:
+yy507:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy541;
+                       case 'n':       goto yy536;
                        default:        goto yy62;
                        }
-yy511:
-                       yyaccept = 60;
+yy508:
+                       yyaccept = 59;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7664,17 +7579,17 @@ yy511:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy512;
+                       case 0x7F:      goto yy509;
                        case '\\':      goto yy147;
-                       case '_':       goto yy543;
+                       case '_':       goto yy538;
                        default:        goto yy61;
                        }
-yy512:
-#line 204 "src/parser_scan.re"
+yy509:
+#line 208 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_INCLUDE); goto start; }
-#line 7676 "src/parser_scan.c"
-yy513:
-                       yyaccept = 61;
+#line 7591 "src/parser_scan.c"
+yy510:
+                       yyaccept = 60;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7740,40 +7655,40 @@ yy513:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy514;
+                       case 0x7F:      goto yy511;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy514:
-#line 228 "src/parser_scan.re"
+yy511:
+#line 231 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_PATHVAL); goto start; }
-#line 7751 "src/parser_scan.c"
-yy515:
+#line 7666 "src/parser_scan.c"
+yy512:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy544;
+                       case 's':       goto yy539;
                        default:        goto yy62;
                        }
-yy516:
+yy513:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy545;
+                       case 'e':       goto yy540;
                        default:        goto yy62;
                        }
-yy517:
+yy514:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy546;
+                       case 'y':       goto yy541;
                        default:        goto yy62;
                        }
-yy518:
-                       yyaccept = 62;
+yy515:
+                       yyaccept = 61;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7839,40 +7754,40 @@ yy518:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy519;
+                       case 0x7F:      goto yy516;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy519:
-#line 242 "src/parser_scan.re"
+yy516:
+#line 245 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_TO_BOOL); goto start; }
-#line 7850 "src/parser_scan.c"
-yy520:
+#line 7765 "src/parser_scan.c"
+yy517:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy548;
+                       case 't':       goto yy543;
                        default:        goto yy62;
                        }
-yy521:
+yy518:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy550;
+                       case 'c':       goto yy545;
                        default:        goto yy62;
                        }
-yy522:
+yy519:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy551;
+                       case 'n':       goto yy546;
                        default:        goto yy62;
                        }
-yy523:
-                       yyaccept = 63;
+yy520:
+                       yyaccept = 62;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7938,16 +7853,16 @@ yy523:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy524;
+                       case 0x7F:      goto yy521;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy524:
-#line 202 "src/parser_scan.re"
+yy521:
+#line 206 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_WARNING); goto start; }
-#line 7949 "src/parser_scan.c"
-yy525:
-                       yyaccept = 34;
+#line 7864 "src/parser_scan.c"
+yy522:
+                       yyaccept = 33;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8013,107 +7928,33 @@ yy525:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy422;
+                       case 0x7F:      goto yy419;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy526:
+yy523:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'b':       goto yy552;
+                       case 'b':       goto yy547;
                        default:        goto yy62;
                        }
-yy527:
+yy524:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy553;
+                       case 's':       goto yy548;
                        default:        goto yy62;
                        }
-yy528:
+yy525:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy554;
+                       case 'i':       goto yy549;
                        default:        goto yy62;
                        }
-yy529:
-                       yyaccept = 3;
-                       mrk = ++cur;
-                       if (lim <= cur) CHECKEOF();;
-                       yych = *cur;
-                       switch (yych) {
-                       case 0x00:
-                       case 0x01:
-                       case 0x02:
-                       case 0x03:
-                       case 0x04:
-                       case 0x05:
-                       case 0x06:
-                       case 0x07:
-                       case 0x08:
-                       case '\t':
-                       case '\n':
-                       case '\v':
-                       case '\f':
-                       case '\r':
-                       case 0x0E:
-                       case 0x0F:
-                       case 0x10:
-                       case 0x11:
-                       case 0x12:
-                       case 0x13:
-                       case 0x14:
-                       case 0x15:
-                       case 0x16:
-                       case 0x17:
-                       case 0x18:
-                       case 0x19:
-                       case 0x1A:
-                       case 0x1B:
-                       case 0x1C:
-                       case 0x1D:
-                       case 0x1E:
-                       case 0x1F:
-                       case ' ':
-                       case '!':
-                       case '"':
-                       case '#':
-                       case '$':
-                       case '%':
-                       case '&':
-                       case '\'':
-                       case '(':
-                       case ')':
-                       case '*':
-                       case '+':
-                       case ',':
-                       case '-':
-                       case '.':
-                       case '/':
-                       case ':':
-                       case ';':
-                       case '<':
-                       case '=':
-                       case '>':
-                       case '?':
-                       case '@':
-                       case '[':
-                       case ']':
-                       case '^':
-                       case '`':
-                       case '{':
-                       case '|':
-                       case '}':
-                       case '~':
-                       case 0x7F:      goto yy55;
-                       case '\\':      goto yy147;
-                       case 'o':       goto yy555;
-                       default:        goto yy529;
-                       }
-yy531:
-                       yyaccept = 64;
+yy526:
+                       yyaccept = 63;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8179,30 +8020,30 @@ yy531:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy532;
+                       case 0x7F:      goto yy527;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy532:
-#line 178 "src/parser_scan.re"
+yy527:
+#line 182 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
-#line 8190 "src/parser_scan.c"
-yy533:
+#line 8031 "src/parser_scan.c"
+yy528:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy557;
+                       case 'd':       goto yy550;
                        default:        goto yy62;
                        }
-yy534:
+yy529:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy559;
+                       case 'e':       goto yy552;
                        default:        goto yy62;
                        }
-yy535:
-                       yyaccept = 65;
+yy530:
+                       yyaccept = 64;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8268,16 +8109,16 @@ yy535:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy536;
+                       case 0x7F:      goto yy531;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy536:
-#line 210 "src/parser_scan.re"
+yy531:
+#line 214 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CALLABLE); goto start; }
-#line 8279 "src/parser_scan.c"
-yy537:
-                       yyaccept = 66;
+#line 8120 "src/parser_scan.c"
+yy532:
+                       yyaccept = 65;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8343,16 +8184,16 @@ yy537:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy538;
+                       case 0x7F:      goto yy533;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy538:
-#line 214 "src/parser_scan.re"
+yy533:
+#line 218 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CALLBACK); goto start; }
-#line 8354 "src/parser_scan.c"
-yy539:
-                       yyaccept = 67;
+#line 8195 "src/parser_scan.c"
+yy534:
+                       yyaccept = 66;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8418,16 +8259,16 @@ yy539:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy540;
+                       case 0x7F:      goto yy535;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy540:
-#line 230 "src/parser_scan.re"
+yy535:
+#line 233 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
-#line 8429 "src/parser_scan.c"
-yy541:
-                       yyaccept = 68;
+#line 8270 "src/parser_scan.c"
+yy536:
+                       yyaccept = 67;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8493,40 +8334,40 @@ yy541:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy542;
+                       case 0x7F:      goto yy537;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy542:
-#line 216 "src/parser_scan.re"
+yy537:
+#line 220 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_FUNCTION); goto start; }
-#line 8504 "src/parser_scan.c"
-yy543:
+#line 8345 "src/parser_scan.c"
+yy538:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy561;
+                       case 'n':       goto yy554;
                        default:        goto yy62;
                        }
-yy544:
+yy539:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy562;
+                       case 'e':       goto yy555;
                        default:        goto yy62;
                        }
-yy545:
+yy540:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy563;
+                       case 'r':       goto yy556;
                        default:        goto yy62;
                        }
-yy546:
-                       yyaccept = 69;
+yy541:
+                       yyaccept = 68;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8592,16 +8433,16 @@ yy546:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy547;
+                       case 0x7F:      goto yy542;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy547:
-#line 238 "src/parser_scan.re"
+yy542:
+#line 241 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
-#line 8603 "src/parser_scan.c"
-yy548:
-                       yyaccept = 70;
+#line 8444 "src/parser_scan.c"
+yy543:
+                       yyaccept = 69;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8667,302 +8508,53 @@ yy548:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy549;
+                       case 0x7F:      goto yy544;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy549:
-#line 241 "src/parser_scan.re"
+yy544:
+#line 244 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
-#line 8678 "src/parser_scan.c"
-yy550:
+#line 8519 "src/parser_scan.c"
+yy545:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy564;
+                       case 't':       goto yy557;
                        default:        goto yy62;
                        }
-yy551:
+yy546:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy566;
+                       case 'g':       goto yy559;
                        default:        goto yy62;
                        }
-yy552:
-                       yyaccept = 3;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'u':       goto yy568;
-                       default:        goto yy62;
-                       }
-yy553:
-                       yyaccept = 3;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'i':       goto yy569;
-                       default:        goto yy62;
-                       }
-yy554:
-                       yyaccept = 3;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'c':       goto yy570;
-                       default:        goto yy62;
-                       }
-yy555:
-                       yyaccept = 3;
-                       mrk = ++cur;
-                       if (lim <= cur) CHECKEOF();;
-                       yych = *cur;
-                       switch (yych) {
-                       case 0x00:
-                       case 0x01:
-                       case 0x02:
-                       case 0x03:
-                       case 0x04:
-                       case 0x05:
-                       case 0x06:
-                       case 0x07:
-                       case 0x08:
-                       case '\t':
-                       case '\n':
-                       case '\v':
-                       case '\f':
-                       case '\r':
-                       case 0x0E:
-                       case 0x0F:
-                       case 0x10:
-                       case 0x11:
-                       case 0x12:
-                       case 0x13:
-                       case 0x14:
-                       case 0x15:
-                       case 0x16:
-                       case 0x17:
-                       case 0x18:
-                       case 0x19:
-                       case 0x1A:
-                       case 0x1B:
-                       case 0x1C:
-                       case 0x1D:
-                       case 0x1E:
-                       case 0x1F:
-                       case ' ':
-                       case '!':
-                       case '"':
-                       case '#':
-                       case '$':
-                       case '%':
-                       case '&':
-                       case '\'':
-                       case '(':
-                       case ')':
-                       case '*':
-                       case '+':
-                       case ',':
-                       case '-':
-                       case '.':
-                       case '/':
-                       case ':':
-                       case ';':
-                       case '<':
-                       case '=':
-                       case '>':
-                       case '?':
-                       case '@':
-                       case '[':
-                       case ']':
-                       case '^':
-                       case '`':
-                       case '{':
-                       case '|':
-                       case '}':
-                       case '~':
-                       case 0x7F:      goto yy55;
-                       case '\\':      goto yy147;
-                       case 'n':       goto yy571;
-                       case 'o':       goto yy555;
-                       default:        goto yy529;
-                       }
-yy557:
-                       yyaccept = 71;
-                       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 yy558;
-                       case '\\':      goto yy147;
-                       default:        goto yy61;
-                       }
-yy558:
-#line 191 "src/parser_scan.re"
-                       { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
-#line 8865 "src/parser_scan.c"
-yy559:
-                       yyaccept = 72;
-                       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 yy560;
-                       case '\\':      goto yy147;
-                       default:        goto yy61;
-                       }
-yy560:
-#line 175 "src/parser_scan.re"
-                       { NEWTOKEN(PSI_T_VOLATILE); goto start; }
-#line 8940 "src/parser_scan.c"
-yy561:
+yy547:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy572;
+                       case 'u':       goto yy561;
                        default:        goto yy62;
                        }
-yy562:
+yy548:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy573;
+                       case 'i':       goto yy562;
                        default:        goto yy62;
                        }
-yy563:
+yy549:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy574;
+                       case 'c':       goto yy563;
                        default:        goto yy62;
                        }
-yy564:
-                       yyaccept = 73;
+yy550:
+                       yyaccept = 70;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9028,16 +8620,16 @@ yy564:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy565;
+                       case 0x7F:      goto yy551;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy565:
-#line 237 "src/parser_scan.re"
-                       { NEWTOKEN(PSI_T_TO_OBJECT); goto start; }
-#line 9039 "src/parser_scan.c"
-yy566:
-                       yyaccept = 74;
+yy551:
+#line 195 "src/parser_scan.re"
+                       { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
+#line 8631 "src/parser_scan.c"
+yy552:
+                       yyaccept = 71;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9103,40 +8695,41 @@ yy566:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy567;
+                       case 0x7F:      goto yy553;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy567:
-#line 239 "src/parser_scan.re"
-                       { NEWTOKEN(PSI_T_TO_STRING); goto start; }
-#line 9114 "src/parser_scan.c"
-yy568:
+yy553:
+#line 179 "src/parser_scan.re"
+                       { NEWTOKEN(PSI_T_VOLATILE); goto start; }
+#line 8706 "src/parser_scan.c"
+yy554:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy576;
+                       case 'E':
+                       case 'e':       goto yy564;
                        default:        goto yy62;
                        }
-yy569:
+yy555:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy577;
+                       case 'R':
+                       case 'r':       goto yy565;
                        default:        goto yy62;
                        }
-yy570:
+yy556:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy578;
+                       case 'T':
+                       case 't':       goto yy566;
                        default:        goto yy62;
                        }
-yy571:
-                       yyaccept = 3;
-                       mrk = ++cur;
-                       if (lim <= cur) CHECKEOF();;
-                       yych = *cur;
+yy557:
+                       yyaccept = 72;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
                        case 0x01:
@@ -9201,30 +8794,16 @@ yy571:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy55;
+                       case 0x7F:      goto yy558;
                        case '\\':      goto yy147;
-                       case 'c':       goto yy580;
-                       case 'o':       goto yy555;
-                       default:        goto yy529;
-                       }
-yy572:
-                       yyaccept = 3;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'X':
-                       case 'x':       goto yy581;
-                       default:        goto yy62;
-                       }
-yy573:
-                       yyaccept = 3;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy582;
-                       default:        goto yy62;
+                       default:        goto yy61;
                        }
-yy574:
-                       yyaccept = 75;
+yy558:
+#line 240 "src/parser_scan.re"
+                       { NEWTOKEN(PSI_T_TO_OBJECT); goto start; }
+#line 8805 "src/parser_scan.c"
+yy559:
+                       yyaccept = 73;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9290,30 +8869,53 @@ yy574:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy575;
+                       case 0x7F:      goto yy560;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy575:
-#line 220 "src/parser_scan.re"
-                       { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
-#line 9301 "src/parser_scan.c"
-yy576:
+yy560:
+#line 242 "src/parser_scan.re"
+                       { NEWTOKEN(PSI_T_TO_STRING); goto start; }
+#line 8880 "src/parser_scan.c"
+yy561:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy584;
+                       case 't':       goto yy568;
                        default:        goto yy62;
                        }
-yy577:
+yy562:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy585;
+                       case 'o':       goto yy569;
                        default:        goto yy62;
                        }
-yy578:
-                       yyaccept = 76;
+yy563:
+                       yyaccept = 3;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy570;
+                       default:        goto yy62;
+                       }
+yy564:
+                       yyaccept = 3;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'X':
+                       case 'x':       goto yy572;
+                       default:        goto yy62;
+                       }
+yy565:
+                       yyaccept = 3;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy573;
+                       default:        goto yy62;
+                       }
+yy566:
+                       yyaccept = 74;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9379,19 +8981,31 @@ yy578:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy579;
+                       case 0x7F:      goto yy567;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy579:
-#line 172 "src/parser_scan.re"
-                       { NEWTOKEN(PSI_T_CPP_RESTRICT); goto start; }
-#line 9390 "src/parser_scan.c"
-yy580:
+yy567:
+#line 223 "src/parser_scan.re"
+                       { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
+#line 8992 "src/parser_scan.c"
+yy568:
                        yyaccept = 3;
-                       mrk = ++cur;
-                       if (lim <= cur) CHECKEOF();;
-                       yych = *cur;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy575;
+                       default:        goto yy62;
+                       }
+yy569:
+                       yyaccept = 3;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy576;
+                       default:        goto yy62;
+                       }
+yy570:
+                       yyaccept = 75;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
                        case 0x01:
@@ -9456,22 +9070,24 @@ yy580:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy55;
+                       case 0x7F:      goto yy571;
                        case '\\':      goto yy147;
-                       case 'e':       goto yy586;
-                       case 'o':       goto yy555;
-                       default:        goto yy529;
+                       default:        goto yy61;
                        }
-yy581:
+yy571:
+#line 176 "src/parser_scan.re"
+                       { NEWTOKEN(PSI_T_CPP_RESTRICT); goto start; }
+#line 9081 "src/parser_scan.c"
+yy572:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy588;
+                       case 't':       goto yy577;
                        default:        goto yy62;
                        }
-yy582:
-                       yyaccept = 77;
+yy573:
+                       yyaccept = 76;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9537,108 +9153,30 @@ yy582:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy583;
+                       case 0x7F:      goto yy574;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy583:
-#line 221 "src/parser_scan.re"
+yy574:
+#line 224 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_POST_ASSERT); goto start; }
-#line 9548 "src/parser_scan.c"
-yy584:
+#line 9164 "src/parser_scan.c"
+yy575:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy590;
+                       case '_':       goto yy579;
                        default:        goto yy62;
                        }
-yy585:
+yy576:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy591;
+                       case '_':       goto yy580;
                        default:        goto yy62;
                        }
-yy586:
-                       yyaccept = 78;
-                       mrk = ++cur;
-                       if (lim <= cur) CHECKEOF();;
-                       yych = *cur;
-                       switch (yych) {
-                       case 0x00:
-                       case 0x01:
-                       case 0x02:
-                       case 0x03:
-                       case 0x04:
-                       case 0x05:
-                       case 0x06:
-                       case 0x07:
-                       case 0x08:
-                       case '\t':
-                       case '\n':
-                       case '\v':
-                       case '\f':
-                       case '\r':
-                       case 0x0E:
-                       case 0x0F:
-                       case 0x10:
-                       case 0x11:
-                       case 0x12:
-                       case 0x13:
-                       case 0x14:
-                       case 0x15:
-                       case 0x16:
-                       case 0x17:
-                       case 0x18:
-                       case 0x19:
-                       case 0x1A:
-                       case 0x1B:
-                       case 0x1C:
-                       case 0x1D:
-                       case 0x1E:
-                       case 0x1F:
-                       case ' ':
-                       case '!':
-                       case '"':
-                       case '#':
-                       case '$':
-                       case '%':
-                       case '&':
-                       case '\'':
-                       case '(':
-                       case ')':
-                       case '*':
-                       case '+':
-                       case ',':
-                       case '-':
-                       case '.':
-                       case '/':
-                       case ':':
-                       case ';':
-                       case '<':
-                       case '=':
-                       case '>':
-                       case '?':
-                       case '@':
-                       case '[':
-                       case ']':
-                       case '^':
-                       case '`':
-                       case '{':
-                       case '|':
-                       case '}':
-                       case '~':
-                       case 0x7F:      goto yy587;
-                       case '\\':      goto yy147;
-                       case 'o':       goto yy555;
-                       default:        goto yy529;
-                       }
-yy587:
-#line 170 "src/parser_scan.re"
-                       { NEWTOKEN(PSI_T_PRAGMA_ONCE); goto start; }
-#line 9640 "src/parser_scan.c"
-yy588:
-                       yyaccept = 79;
+yy577:
+                       yyaccept = 77;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9704,40 +9242,40 @@ yy588:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy589;
+                       case 0x7F:      goto yy578;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy589:
-#line 205 "src/parser_scan.re"
+yy578:
+#line 209 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_INCLUDE_NEXT); goto start; }
-#line 9715 "src/parser_scan.c"
-yy590:
+#line 9253 "src/parser_scan.c"
+yy579:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy592;
+                       case '_':       goto yy581;
                        default:        goto yy62;
                        }
-yy591:
+yy580:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy593;
+                       case '_':       goto yy582;
                        default:        goto yy62;
                        }
-yy592:
+yy581:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '\t':
                        case '\f':
-                       case ' ':       goto yy595;
-                       case '(':       goto yy597;
+                       case ' ':       goto yy584;
+                       case '(':       goto yy586;
                        default:        goto yy62;
                        }
-yy593:
-                       yyaccept = 80;
+yy582:
+                       yyaccept = 78;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9803,67 +9341,67 @@ yy593:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy594;
+                       case 0x7F:      goto yy583;
                        case '\\':      goto yy147;
                        default:        goto yy61;
                        }
-yy594:
-#line 173 "src/parser_scan.re"
+yy583:
+#line 177 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_CPP_EXTENSION); goto start; }
-#line 9814 "src/parser_scan.c"
-yy595:
+#line 9352 "src/parser_scan.c"
+yy584:
                        ++cur;
                        if ((lim - cur) < 2) CHECKEOF();;
                        yych = *cur;
                        switch (yych) {
                        case '\t':
                        case '\f':
-                       case ' ':       goto yy595;
-                       case '(':       goto yy597;
+                       case ' ':       goto yy584;
+                       case '(':       goto yy586;
                        default:        goto yy114;
                        }
-yy597:
+yy586:
                        yych = *++cur;
                        switch (yych) {
-                       case '(':       goto yy598;
+                       case '(':       goto yy587;
                        default:        goto yy114;
                        }
-yy598:
+yy587:
                        ++cur;
-#line 247 "src/parser_scan.re"
+#line 250 "src/parser_scan.re"
                        { parens = 2; goto cpp_attribute; }
-#line 9836 "src/parser_scan.c"
+#line 9374 "src/parser_scan.c"
                }
-#line 253 "src/parser_scan.re"
+#line 256 "src/parser_scan.re"
 
 
        character: ;
                
-#line 9843 "src/parser_scan.c"
+#line 9381 "src/parser_scan.c"
                {
                        unsigned char yych;
                        if (lim <= cur) CHECKEOF();;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy604;
-                       case '\'':      goto yy606;
-                       case '\\':      goto yy608;
-                       default:        goto yy602;
+                       case '\r':      goto yy593;
+                       case '\'':      goto yy595;
+                       case '\\':      goto yy597;
+                       default:        goto yy591;
                        }
-yy602:
+yy591:
                        ++cur;
-#line 271 "src/parser_scan.re"
+#line 274 "src/parser_scan.re"
                        { escaped = false; goto character; }
-#line 9859 "src/parser_scan.c"
-yy604:
+#line 9397 "src/parser_scan.c"
+yy593:
                        ++cur;
-#line 258 "src/parser_scan.re"
+#line 261 "src/parser_scan.re"
                        { NEWLINE(); goto character; }
-#line 9864 "src/parser_scan.c"
-yy606:
+#line 9402 "src/parser_scan.c"
+yy595:
                        ++cur;
-#line 260 "src/parser_scan.re"
+#line 263 "src/parser_scan.re"
                        {
                        if (escaped) {
                                escaped = false;
@@ -9875,43 +9413,43 @@ yy606:
                        token->flags = char_width;
                        goto start;
                }
-#line 9879 "src/parser_scan.c"
-yy608:
+#line 9417 "src/parser_scan.c"
+yy597:
                        ++cur;
-#line 259 "src/parser_scan.re"
+#line 262 "src/parser_scan.re"
                        { escaped = !escaped;  goto character; }
-#line 9884 "src/parser_scan.c"
+#line 9422 "src/parser_scan.c"
                }
-#line 273 "src/parser_scan.re"
+#line 276 "src/parser_scan.re"
 
 
        string: ;
                
-#line 9891 "src/parser_scan.c"
+#line 9429 "src/parser_scan.c"
                {
                        unsigned char yych;
                        if (lim <= cur) CHECKEOF();;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy614;
-                       case '"':       goto yy616;
-                       case '\\':      goto yy618;
-                       default:        goto yy612;
+                       case '\r':      goto yy603;
+                       case '"':       goto yy605;
+                       case '\\':      goto yy607;
+                       default:        goto yy601;
                        }
-yy612:
+yy601:
                        ++cur;
-#line 291 "src/parser_scan.re"
+#line 294 "src/parser_scan.re"
                        { escaped = false; goto string; }
-#line 9907 "src/parser_scan.c"
-yy614:
+#line 9445 "src/parser_scan.c"
+yy603:
                        ++cur;
-#line 278 "src/parser_scan.re"
+#line 281 "src/parser_scan.re"
                        { NEWLINE(); goto string; }
-#line 9912 "src/parser_scan.c"
-yy616:
+#line 9450 "src/parser_scan.c"
+yy605:
                        ++cur;
-#line 280 "src/parser_scan.re"
+#line 283 "src/parser_scan.re"
                        {
                        if (escaped) {
                                escaped = false;
@@ -9923,118 +9461,118 @@ yy616:
                        token->flags = char_width;
                        goto start;
                }
-#line 9927 "src/parser_scan.c"
-yy618:
+#line 9465 "src/parser_scan.c"
+yy607:
                        ++cur;
-#line 279 "src/parser_scan.re"
+#line 282 "src/parser_scan.re"
                        { escaped = !escaped; goto string; }
-#line 9932 "src/parser_scan.c"
+#line 9470 "src/parser_scan.c"
                }
-#line 293 "src/parser_scan.re"
+#line 296 "src/parser_scan.re"
 
 
        comment: ;
                
-#line 9939 "src/parser_scan.c"
+#line 9477 "src/parser_scan.c"
                {
                        unsigned char yych;
                        if ((lim - cur) < 2) CHECKEOF();;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy624;
-                       case '*':       goto yy626;
-                       default:        goto yy622;
+                       case '\r':      goto yy613;
+                       case '*':       goto yy615;
+                       default:        goto yy611;
                        }
-yy622:
+yy611:
                        ++cur;
-yy623:
-#line 300 "src/parser_scan.re"
+yy612:
+#line 303 "src/parser_scan.re"
                        { goto comment; }
-#line 9955 "src/parser_scan.c"
-yy624:
+#line 9493 "src/parser_scan.c"
+yy613:
                        ++cur;
-#line 298 "src/parser_scan.re"
+#line 301 "src/parser_scan.re"
                        { NEWLINE(); goto comment; }
-#line 9960 "src/parser_scan.c"
-yy626:
+#line 9498 "src/parser_scan.c"
+yy615:
                        yych = *++cur;
                        switch (yych) {
-                       case '/':       goto yy627;
-                       default:        goto yy623;
+                       case '/':       goto yy616;
+                       default:        goto yy612;
                        }
-yy627:
+yy616:
                        ++cur;
-#line 299 "src/parser_scan.re"
+#line 302 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_COMMENT); goto start; }
-#line 9971 "src/parser_scan.c"
+#line 9509 "src/parser_scan.c"
                }
-#line 302 "src/parser_scan.re"
+#line 305 "src/parser_scan.re"
 
 
        comment_sl: ;
                
-#line 9978 "src/parser_scan.c"
+#line 9516 "src/parser_scan.c"
                {
                        unsigned char yych;
                        if (lim <= cur) CHECKEOF();;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy633;
-                       default:        goto yy631;
+                       case '\r':      goto yy622;
+                       default:        goto yy620;
                        }
-yy631:
+yy620:
                        ++cur;
-#line 308 "src/parser_scan.re"
+#line 311 "src/parser_scan.re"
                        { goto comment_sl; }
-#line 9992 "src/parser_scan.c"
-yy633:
+#line 9530 "src/parser_scan.c"
+yy622:
                        ++cur;
-#line 307 "src/parser_scan.re"
+#line 310 "src/parser_scan.re"
                        { NEWTOKEN(PSI_T_COMMENT); tok = cur - 1; NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
-#line 9997 "src/parser_scan.c"
+#line 9535 "src/parser_scan.c"
                }
-#line 310 "src/parser_scan.re"
+#line 313 "src/parser_scan.re"
 
 
        cpp_attribute: ;
 
                
-#line 10005 "src/parser_scan.c"
+#line 9543 "src/parser_scan.c"
                {
                        unsigned char yych;
                        if (lim <= cur) CHECKEOF();;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy639;
-                       case '(':       goto yy641;
-                       case ')':       goto yy643;
-                       default:        goto yy637;
+                       case '\r':      goto yy628;
+                       case '(':       goto yy630;
+                       case ')':       goto yy632;
+                       default:        goto yy626;
                        }
-yy637:
+yy626:
                        ++cur;
-#line 319 "src/parser_scan.re"
+#line 322 "src/parser_scan.re"
                        { goto cpp_attribute; }
-#line 10021 "src/parser_scan.c"
-yy639:
+#line 9559 "src/parser_scan.c"
+yy628:
                        ++cur;
-#line 318 "src/parser_scan.re"
+#line 321 "src/parser_scan.re"
                        { NEWLINE(); goto cpp_attribute; }
-#line 10026 "src/parser_scan.c"
-yy641:
+#line 9564 "src/parser_scan.c"
+yy630:
                        ++cur;
-#line 316 "src/parser_scan.re"
+#line 319 "src/parser_scan.re"
                        { ++parens; goto cpp_attribute; }
-#line 10031 "src/parser_scan.c"
-yy643:
+#line 9569 "src/parser_scan.c"
+yy632:
                        ++cur;
-#line 317 "src/parser_scan.re"
+#line 320 "src/parser_scan.re"
                        { if (parens == 1) { NEWTOKEN(PSI_T_CPP_ATTRIBUTE); goto start; } else { --parens; goto cpp_attribute; } }
-#line 10036 "src/parser_scan.c"
+#line 9574 "src/parser_scan.c"
                }
-#line 321 "src/parser_scan.re"
+#line 324 "src/parser_scan.re"
 
 error: ;