cpp: fix relative includes
authorMichael Wallner <mike@php.net>
Thu, 27 Jul 2017 10:43:25 +0000 (12:43 +0200)
committerMichael Wallner <mike@php.net>
Thu, 27 Jul 2017 10:43:25 +0000 (12:43 +0200)
src/cpp.c
src/cpp.h
src/parser.c
src/parser.h
src/parser.re
src/parser_proc.c
src/parser_proc_grammar.y
src/types/cpp_exp.c

index 8075cf6..b181e27 100644 (file)
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -25,6 +25,8 @@
 
 #include "php_psi_stdinc.h"
 
+#include <libgen.h>
+
 #include "cpp.h"
 #include "parser.h"
 
@@ -427,24 +429,49 @@ static inline bool try_include(struct psi_cpp *cpp, const char *path, bool *pars
        return false;
 }
 
-bool psi_cpp_include(struct psi_cpp *cpp, const char *file, unsigned flags)
+static inline void include_path(const struct psi_token *file, char **path)
+{
+       if (*file->text == '/') {
+               *path = file->text;
+       } else {
+               char *dir;
+               size_t len;
+
+               strncpy(*path, file->file, PATH_MAX);
+
+               dir = dirname(*path);
+               len = strlen(dir);
+
+               assert(len + file->size + 1 < PATH_MAX);
+
+               memmove(*path, dir, len);
+               (*path)[len] = '/';
+               memcpy(&(*path)[len + 1], file->text, file->size + 1);
+       }
+}
+
+bool psi_cpp_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned flags)
 {
        bool parsed = false;
-       int f_len = strlen(file);
+       int f_len = strlen(file->text);
 
-       if (!(flags & PSI_CPP_INCLUDE_NEXT) || *file == '/') {
+       if (!(flags & PSI_CPP_INCLUDE_NEXT) || *file->text == '/') {
                /* first try as is, full or relative path */
-               if ((flags & PSI_CPP_INCLUDE_ONCE) && zend_hash_str_exists(&cpp->once, file, f_len)) {
+               char temp[PATH_MAX], *path = temp;
+
+               include_path(file, &path);
+
+               if ((flags & PSI_CPP_INCLUDE_ONCE) && zend_hash_str_exists(&cpp->once, path, f_len)) {
                        return true;
                }
-               if (try_include(cpp, file, &parsed)) {
+               if (try_include(cpp, path, &parsed)) {
                        /* found */
                        return parsed;
                }
        }
 
        /* look through search paths */
-       if (*file != '/') {
+       if (*file->text != '/') {
                char path[PATH_MAX];
                const char *sep;
                int p_len;
@@ -468,7 +495,7 @@ bool psi_cpp_include(struct psi_cpp *cpp, const char *file, unsigned flags)
                        sep = strchr(cpp->search, ':');
                        d_len = sep ? sep - cpp->search : strlen(cpp->search);
 
-                       if (PATH_MAX > (p_len = snprintf(path, PATH_MAX, "%.*s/%.*s", d_len, cpp->search, f_len, file))) {
+                       if (PATH_MAX > (p_len = snprintf(path, PATH_MAX, "%.*s/%.*s", d_len, cpp->search, f_len, file->text))) {
                                if ((flags & PSI_CPP_INCLUDE_ONCE) && zend_hash_str_exists(&cpp->once, path, p_len)) {
                                        return true;
                                }
index 9c74588..49bdd31 100644 (file)
--- a/src/cpp.h
+++ b/src/cpp.h
@@ -59,7 +59,7 @@ bool psi_cpp_undef(struct psi_cpp *cpp, struct psi_token *tok);
 #define PSI_CPP_INCLUDE_NEXT 0x1
 #define PSI_CPP_INCLUDE_ONCE 0x2
 
-bool psi_cpp_include(struct psi_cpp *cpp, const char *file, unsigned flags);
+bool psi_cpp_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned flags);
 
 void psi_cpp_tokiter_reset(struct psi_cpp *cpp);
 bool psi_cpp_tokiter_seek(struct psi_cpp *cpp, size_t index);
index f2d2473..4e979dd 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 on Thu Jul 27 10:44:33 2017 */
+/* Generated by re2c 0.16 on Thu Jul 27 12:41:40 2017 */
 #line 1 "src/parser.re"
 /*******************************************************************************
  Copyright (c) 2016, Michael Wallner <mike@php.net>.
@@ -354,18 +354,12 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                        case '?':       goto yy52;
                        case 'A':
                        case 'a':       goto yy54;
-                       case 'B':
-                       case 'b':       goto yy56;
-                       case 'C':
-                       case 'c':       goto yy57;
-                       case 'D':
-                       case 'd':       goto yy58;
-                       case 'E':
-                       case 'e':       goto yy59;
-                       case 'F':
-                       case 'f':       goto yy60;
-                       case 'I':
-                       case 'i':       goto yy63;
+                       case 'B':       goto yy56;
+                       case 'C':       goto yy57;
+                       case 'D':       goto yy58;
+                       case 'E':       goto yy59;
+                       case 'F':       goto yy60;
+                       case 'I':       goto yy63;
                        case 'L':       goto yy64;
                        case 'M':
                        case 'm':       goto yy65;
@@ -376,29 +370,34 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                        case 'P':       goto yy68;
                        case 'R':
                        case 'r':       goto yy69;
-                       case 'S':
-                       case 's':       goto yy70;
-                       case 'T':
-                       case 't':       goto yy71;
+                       case 'S':       goto yy70;
+                       case 'T':       goto yy71;
                        case 'U':       goto yy72;
-                       case 'V':
-                       case 'v':       goto yy73;
                        case 'W':
-                       case 'w':       goto yy74;
+                       case 'w':       goto yy73;
                        case 'Z':
-                       case 'z':       goto yy75;
-                       case '[':       goto yy76;
-                       case '\\':      goto yy78;
-                       case ']':       goto yy80;
-                       case '^':       goto yy82;
-                       case '_':       goto yy84;
-                       case 'l':       goto yy85;
-                       case 'p':       goto yy86;
-                       case 'u':       goto yy87;
-                       case '{':       goto yy88;
-                       case '|':       goto yy90;
-                       case '}':       goto yy92;
-                       case '~':       goto yy94;
+                       case 'z':       goto yy74;
+                       case '[':       goto yy75;
+                       case '\\':      goto yy77;
+                       case ']':       goto yy79;
+                       case '^':       goto yy81;
+                       case '_':       goto yy83;
+                       case 'b':       goto yy84;
+                       case 'c':       goto yy85;
+                       case 'd':       goto yy86;
+                       case 'e':       goto yy87;
+                       case 'f':       goto yy88;
+                       case 'i':       goto yy89;
+                       case 'l':       goto yy90;
+                       case 'p':       goto yy91;
+                       case 's':       goto yy92;
+                       case 't':       goto yy93;
+                       case 'u':       goto yy94;
+                       case 'v':       goto yy95;
+                       case '{':       goto yy96;
+                       case '|':       goto yy98;
+                       case '}':       goto yy100;
+                       case '~':       goto yy102;
                        default:        goto yy61;
                        }
 yy2:
@@ -406,7 +405,7 @@ yy2:
 yy3:
 #line 452 "src/parser.re"
                        { NEWTOKEN(-2); goto error; }
-#line 410 "src/parser.c"
+#line 409 "src/parser.c"
 yy4:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -420,37 +419,37 @@ yy4:
 yy6:
 #line 451 "src/parser.re"
                        { NEWTOKEN(PSI_T_WHITESPACE); goto start; }
-#line 424 "src/parser.c"
+#line 423 "src/parser.c"
 yy7:
                        ++cur;
 #line 450 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
-#line 429 "src/parser.c"
+#line 428 "src/parser.c"
 yy9:
                        ++cur;
                        switch ((yych = *cur)) {
-                       case '=':       goto yy96;
+                       case '=':       goto yy104;
                        default:        goto yy10;
                        }
 yy10:
 #line 349 "src/parser.re"
                        { NEWTOKEN(PSI_T_NOT); goto start; }
-#line 439 "src/parser.c"
+#line 438 "src/parser.c"
 yy11:
                        ++cur;
 #line 322 "src/parser.re"
                        { escaped = false; tok += 1; goto string; }
-#line 444 "src/parser.c"
+#line 443 "src/parser.c"
 yy13:
                        ++cur;
                        switch ((yych = *cur)) {
-                       case '#':       goto yy98;
+                       case '#':       goto yy106;
                        default:        goto yy14;
                        }
 yy14:
 #line 332 "src/parser.re"
                        { NEWTOKEN(PSI_T_HASH); goto start; }
-#line 454 "src/parser.c"
+#line 453 "src/parser.c"
 yy15:
                        yych = *++cur;
                        switch (yych) {
@@ -519,48 +518,48 @@ yy15:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy3;
-                       default:        goto yy100;
+                       default:        goto yy108;
                        }
 yy16:
                        ++cur;
 #line 350 "src/parser.re"
                        { NEWTOKEN(PSI_T_MODULO); goto start; }
-#line 529 "src/parser.c"
+#line 528 "src/parser.c"
 yy18:
                        ++cur;
                        switch ((yych = *cur)) {
-                       case '&':       goto yy103;
+                       case '&':       goto yy111;
                        default:        goto yy19;
                        }
 yy19:
 #line 351 "src/parser.re"
                        { NEWTOKEN(PSI_T_AMPERSAND); goto start; }
-#line 539 "src/parser.c"
+#line 538 "src/parser.c"
 yy20:
                        ++cur;
 #line 321 "src/parser.re"
                        { escaped = false; tok += 1; goto character; }
-#line 544 "src/parser.c"
+#line 543 "src/parser.c"
 yy22:
                        ++cur;
 #line 333 "src/parser.re"
                        { NEWTOKEN(PSI_T_LPAREN); goto start; }
-#line 549 "src/parser.c"
+#line 548 "src/parser.c"
 yy24:
                        ++cur;
 #line 334 "src/parser.re"
                        { NEWTOKEN(PSI_T_RPAREN); goto start; }
-#line 554 "src/parser.c"
+#line 553 "src/parser.c"
 yy26:
                        ++cur;
 #line 347 "src/parser.re"
                        { NEWTOKEN(PSI_T_ASTERISK); goto start; }
-#line 559 "src/parser.c"
+#line 558 "src/parser.c"
 yy28:
                        yyaccept = 0;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '.':       goto yy105;
+                       case '.':       goto yy113;
                        case '0':       goto yy38;
                        case '1':
                        case '2':
@@ -576,17 +575,17 @@ yy28:
 yy29:
 #line 352 "src/parser.re"
                        { NEWTOKEN(PSI_T_PLUS); goto start; }
-#line 580 "src/parser.c"
+#line 579 "src/parser.c"
 yy30:
                        ++cur;
 #line 336 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMA); goto start; }
-#line 585 "src/parser.c"
+#line 584 "src/parser.c"
 yy32:
                        yyaccept = 1;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '.':       goto yy105;
+                       case '.':       goto yy113;
                        case '0':       goto yy38;
                        case '1':
                        case '2':
@@ -602,12 +601,12 @@ yy32:
 yy33:
 #line 353 "src/parser.re"
                        { NEWTOKEN(PSI_T_MINUS); goto start; }
-#line 606 "src/parser.c"
+#line 605 "src/parser.c"
 yy34:
                        yyaccept = 2;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '.':       goto yy107;
+                       case '.':       goto yy115;
                        case '0':
                        case '1':
                        case '2':
@@ -617,30 +616,30 @@ yy34:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy108;
+                       case '9':       goto yy116;
                        default:        goto yy35;
                        }
 yy35:
 #line 364 "src/parser.re"
                        { NEWTOKEN(PSI_T_PERIOD); goto start; }
-#line 627 "src/parser.c"
+#line 626 "src/parser.c"
 yy36:
                        ++cur;
                        switch ((yych = *cur)) {
-                       case '*':       goto yy111;
-                       case '/':       goto yy113;
+                       case '*':       goto yy119;
+                       case '/':       goto yy121;
                        default:        goto yy37;
                        }
 yy37:
 #line 354 "src/parser.re"
                        { NEWTOKEN(PSI_T_SLASH); goto start; }
-#line 638 "src/parser.c"
+#line 637 "src/parser.c"
 yy38:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
                        ctxmrk = cur;
                        switch (yych) {
-                       case '.':       goto yy115;
+                       case '.':       goto yy123;
                        case '0':
                        case '1':
                        case '2':
@@ -648,21 +647,21 @@ yy38:
                        case '4':
                        case '5':
                        case '6':
-                       case '7':       goto yy117;
+                       case '7':       goto yy125;
                        case 'E':
-                       case 'e':       goto yy119;
+                       case 'e':       goto yy127;
                        case 'L':
-                       case 'l':       goto yy120;
+                       case 'l':       goto yy128;
                        case 'U':
-                       case 'u':       goto yy122;
+                       case 'u':       goto yy130;
                        case 'X':
-                       case 'x':       goto yy124;
+                       case 'x':       goto yy132;
                        default:        goto yy39;
                        }
 yy39:
 #line 308 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT; goto start; }
-#line 666 "src/parser.c"
+#line 665 "src/parser.c"
 yy40:
                        yyaccept = 3;
                        mrk = ++cur;
@@ -670,7 +669,7 @@ yy40:
                        yych = *cur;
                        ctxmrk = cur;
                        switch (yych) {
-                       case '.':       goto yy115;
+                       case '.':       goto yy123;
                        case '0':
                        case '1':
                        case '2':
@@ -682,23 +681,23 @@ yy40:
                        case '8':
                        case '9':       goto yy40;
                        case 'E':
-                       case 'e':       goto yy119;
+                       case 'e':       goto yy127;
                        case 'L':
-                       case 'l':       goto yy120;
+                       case 'l':       goto yy128;
                        case 'U':
-                       case 'u':       goto yy122;
+                       case 'u':       goto yy130;
                        default:        goto yy39;
                        }
 yy42:
                        ++cur;
 #line 337 "src/parser.re"
                        { NEWTOKEN(PSI_T_COLON); goto start; }
-#line 697 "src/parser.c"
+#line 696 "src/parser.c"
 yy44:
                        ++cur;
 #line 335 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOS); goto start; }
-#line 702 "src/parser.c"
+#line 701 "src/parser.c"
 yy46:
                        yyaccept = 4;
                        yych = *(mrk = ++cur);
@@ -768,59 +767,59 @@ yy46:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy125;
-                       case '<':       goto yy127;
-                       case '=':       goto yy129;
+                       case 'z':       goto yy133;
+                       case '<':       goto yy135;
+                       case '=':       goto yy137;
                        default:        goto yy47;
                        }
 yy47:
 #line 362 "src/parser.re"
                        { NEWTOKEN(PSI_T_LCHEVR); goto start; }
-#line 780 "src/parser.c"
+#line 779 "src/parser.c"
 yy48:
                        ++cur;
                        switch ((yych = *cur)) {
-                       case '=':       goto yy131;
+                       case '=':       goto yy139;
                        default:        goto yy49;
                        }
 yy49:
 #line 346 "src/parser.re"
                        { NEWTOKEN(PSI_T_EQUALS); goto start; }
-#line 790 "src/parser.c"
+#line 789 "src/parser.c"
 yy50:
                        ++cur;
                        switch ((yych = *cur)) {
-                       case '=':       goto yy133;
-                       case '>':       goto yy135;
+                       case '=':       goto yy141;
+                       case '>':       goto yy143;
                        default:        goto yy51;
                        }
 yy51:
 #line 363 "src/parser.re"
                        { NEWTOKEN(PSI_T_RCHEVR); goto start; }
-#line 801 "src/parser.c"
+#line 800 "src/parser.c"
 yy52:
                        ++cur;
 #line 366 "src/parser.re"
                        { NEWTOKEN(PSI_T_IIF); goto start; }
-#line 806 "src/parser.c"
+#line 805 "src/parser.c"
 yy54:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy137;
+                       case 'r':       goto yy145;
                        default:        goto yy62;
                        }
 yy55:
 #line 445 "src/parser.re"
                        { NEWTOKEN(PSI_T_NAME); goto start; }
-#line 818 "src/parser.c"
+#line 817 "src/parser.c"
 yy56:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy139;
+                       case 'o':       goto yy147;
                        default:        goto yy62;
                        }
 yy57:
@@ -828,11 +827,9 @@ yy57:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy140;
-                       case 'H':
-                       case 'h':       goto yy141;
+                       case 'a':       goto yy148;
                        case 'O':
-                       case 'o':       goto yy142;
+                       case 'o':       goto yy149;
                        default:        goto yy62;
                        }
 yy58:
@@ -840,9 +837,7 @@ yy58:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy143;
-                       case 'O':
-                       case 'o':       goto yy144;
+                       case 'e':       goto yy150;
                        default:        goto yy62;
                        }
 yy59:
@@ -850,11 +845,11 @@ yy59:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy145;
+                       case 'l':       goto yy151;
                        case 'N':
-                       case 'n':       goto yy146;
+                       case 'n':       goto yy152;
                        case 'R':
-                       case 'r':       goto yy147;
+                       case 'r':       goto yy153;
                        default:        goto yy62;
                        }
 yy60:
@@ -862,13 +857,13 @@ yy60:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy148;
+                       case 'a':       goto yy154;
                        case 'L':
-                       case 'l':       goto yy149;
+                       case 'l':       goto yy155;
                        case 'R':
-                       case 'r':       goto yy150;
+                       case 'r':       goto yy156;
                        case 'U':
-                       case 'u':       goto yy151;
+                       case 'u':       goto yy157;
                        default:        goto yy62;
                        }
 yy61:
@@ -942,7 +937,7 @@ yy62:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy55;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy63:
@@ -950,9 +945,9 @@ yy63:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy152;
+                       case 'f':       goto yy158;
                        case 'N':
-                       case 'n':       goto yy154;
+                       case 'n':       goto yy160;
                        default:        goto yy62;
                        }
 yy64:
@@ -961,13 +956,11 @@ yy64:
                        ctxmrk = cur;
                        switch (yych) {
                        case '"':
-                       case '\'':      goto yy155;
+                       case '\'':      goto yy161;
                        case 'E':
-                       case 'e':       goto yy157;
+                       case 'e':       goto yy163;
                        case 'I':
-                       case 'i':       goto yy158;
-                       case 'O':
-                       case 'o':       goto yy159;
+                       case 'i':       goto yy164;
                        default:        goto yy62;
                        }
 yy65:
@@ -975,7 +968,7 @@ yy65:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy160;
+                       case 'i':       goto yy165;
                        default:        goto yy62;
                        }
 yy66:
@@ -983,7 +976,7 @@ yy66:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy161;
+                       case 'u':       goto yy166;
                        default:        goto yy62;
                        }
 yy67:
@@ -991,7 +984,7 @@ yy67:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy162;
+                       case 'b':       goto yy167;
                        default:        goto yy62;
                        }
 yy68:
@@ -999,11 +992,11 @@ yy68:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy163;
+                       case 'a':       goto yy168;
                        case 'O':
-                       case 'o':       goto yy164;
+                       case 'o':       goto yy169;
                        case 'R':
-                       case 'r':       goto yy165;
+                       case 'r':       goto yy170;
                        default:        goto yy62;
                        }
 yy69:
@@ -1011,7 +1004,7 @@ yy69:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy166;
+                       case 'e':       goto yy171;
                        default:        goto yy62;
                        }
 yy70:
@@ -1019,13 +1012,9 @@ yy70:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy167;
-                       case 'H':
-                       case 'h':       goto yy168;
-                       case 'I':
-                       case 'i':       goto yy169;
+                       case 'e':       goto yy172;
                        case 'T':
-                       case 't':       goto yy170;
+                       case 't':       goto yy173;
                        default:        goto yy62;
                        }
 yy71:
@@ -1033,13 +1022,11 @@ yy71:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy171;
+                       case 'e':       goto yy174;
                        case 'O':
-                       case 'o':       goto yy172;
+                       case 'o':       goto yy175;
                        case 'R':
-                       case 'r':       goto yy173;
-                       case 'Y':
-                       case 'y':       goto yy174;
+                       case 'r':       goto yy176;
                        default:        goto yy62;
                        }
 yy72:
@@ -1048,22 +1035,12 @@ yy72:
                        ctxmrk = cur;
                        switch (yych) {
                        case '"':
-                       case '\'':      goto yy175;
-                       case 'I':
-                       case 'i':       goto yy177;
+                       case '\'':      goto yy177;
                        case 'N':
-                       case 'n':       goto yy178;
+                       case 'n':       goto yy179;
                        default:        goto yy62;
                        }
 yy73:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy179;
-                       default:        goto yy62;
-                       }
-yy74:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -1071,7 +1048,7 @@ yy74:
                        case 'a':       goto yy180;
                        default:        goto yy62;
                        }
-yy75:
+yy74:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -1079,12 +1056,12 @@ yy75:
                        case 'v':       goto yy181;
                        default:        goto yy62;
                        }
-yy76:
+yy75:
                        ++cur;
 #line 340 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACKET); goto start; }
-#line 1087 "src/parser.c"
-yy78:
+#line 1064 "src/parser.c"
+yy77:
                        ++cur;
                        switch ((yych = *cur)) {
                        case 0x00:
@@ -1161,104 +1138,198 @@ yy78:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy79;
+                       case 0x7F:      goto yy78;
                        default:        goto yy182;
                        }
-yy79:
+yy78:
 #line 355 "src/parser.re"
                        { NEWTOKEN(PSI_T_BSLASH); goto start; }
-#line 1171 "src/parser.c"
-yy80:
+#line 1148 "src/parser.c"
+yy79:
                        ++cur;
 #line 341 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACKET); goto start; }
-#line 1176 "src/parser.c"
-yy82:
+#line 1153 "src/parser.c"
+yy81:
                        ++cur;
 #line 357 "src/parser.re"
                        { NEWTOKEN(PSI_T_CARET); goto start; }
-#line 1181 "src/parser.c"
-yy84:
+#line 1158 "src/parser.c"
+yy83:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '_':       goto yy185;
                        default:        goto yy62;
                        }
+yy84:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'O':       goto yy147;
+                       case 'o':       goto yy186;
+                       default:        goto yy62;
+                       }
 yy85:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy157;
-                       case 'I':       goto yy158;
-                       case 'O':
-                       case 'o':       goto yy159;
-                       case 'i':       goto yy186;
+                       case 'A':
+                       case 'a':       goto yy148;
+                       case 'O':       goto yy149;
+                       case 'h':       goto yy187;
+                       case 'o':       goto yy188;
                        default:        goto yy62;
                        }
 yy86:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy150;
+                       case 'o':       goto yy189;
+                       default:        goto yy62;
+                       }
+yy87:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy151;
+                       case 'N':       goto yy152;
+                       case 'R':
+                       case 'r':       goto yy153;
+                       case 'n':       goto yy190;
+                       default:        goto yy62;
+                       }
+yy88:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy154;
+                       case 'L':       goto yy155;
+                       case 'R':
+                       case 'r':       goto yy156;
+                       case 'U':
+                       case 'u':       goto yy157;
+                       case 'l':       goto yy191;
+                       default:        goto yy62;
+                       }
+yy89:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'F':
+                       case 'f':       goto yy158;
+                       case 'N':       goto yy160;
+                       case 'n':       goto yy192;
+                       default:        goto yy62;
+                       }
+yy90:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy163;
+                       case 'I':       goto yy164;
+                       case 'i':       goto yy193;
+                       case 'o':       goto yy194;
+                       default:        goto yy62;
+                       }
+yy91:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy163;
+                       case 'a':       goto yy168;
                        case 'O':
-                       case 'o':       goto yy164;
-                       case 'R':       goto yy165;
-                       case 'r':       goto yy187;
+                       case 'o':       goto yy169;
+                       case 'R':       goto yy170;
+                       case 'r':       goto yy195;
                        default:        goto yy62;
                        }
-yy87:
+yy92:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy172;
+                       case 'T':       goto yy173;
+                       case 'h':       goto yy196;
+                       case 'i':       goto yy197;
+                       case 't':       goto yy198;
+                       default:        goto yy62;
+                       }
+yy93:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy174;
+                       case 'O':
+                       case 'o':       goto yy175;
+                       case 'R':
+                       case 'r':       goto yy176;
+                       case 'y':       goto yy199;
+                       default:        goto yy62;
+                       }
+yy94:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        ctxmrk = cur;
                        switch (yych) {
                        case '"':
-                       case '\'':      goto yy188;
-                       case '8':       goto yy190;
-                       case 'I':
-                       case 'i':       goto yy177;
-                       case 'N':
-                       case 'n':       goto yy178;
+                       case '\'':      goto yy200;
+                       case '8':       goto yy202;
+                       case 'N':       goto yy179;
+                       case 'i':       goto yy203;
+                       case 'n':       goto yy204;
                        default:        goto yy62;
                        }
-yy88:
+yy95:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'o':       goto yy205;
+                       default:        goto yy62;
+                       }
+yy96:
                        ++cur;
 #line 338 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACE); goto start; }
-#line 1231 "src/parser.c"
-yy90:
+#line 1302 "src/parser.c"
+yy98:
                        ++cur;
                        switch ((yych = *cur)) {
-                       case '|':       goto yy191;
-                       default:        goto yy91;
+                       case '|':       goto yy206;
+                       default:        goto yy99;
                        }
-yy91:
+yy99:
 #line 356 "src/parser.re"
                        { NEWTOKEN(PSI_T_PIPE); goto start; }
-#line 1241 "src/parser.c"
-yy92:
+#line 1312 "src/parser.c"
+yy100:
                        ++cur;
 #line 339 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACE); goto start; }
-#line 1246 "src/parser.c"
-yy94:
+#line 1317 "src/parser.c"
+yy102:
                        ++cur;
 #line 348 "src/parser.re"
                        { NEWTOKEN(PSI_T_TILDE); goto start; }
-#line 1251 "src/parser.c"
-yy96:
+#line 1322 "src/parser.c"
+yy104:
                        ++cur;
 #line 342 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_NE); goto start; }
-#line 1256 "src/parser.c"
-yy98:
+#line 1327 "src/parser.c"
+yy106:
                        ++cur;
 #line 331 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_PASTE); goto start; }
-#line 1261 "src/parser.c"
-yy100:
+#line 1332 "src/parser.c"
+yy108:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -1327,19 +1398,19 @@ yy100:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy102;
-                       default:        goto yy100;
+                       case 0x7F:      goto yy110;
+                       default:        goto yy108;
                        }
-yy102:
+yy110:
 #line 447 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; }
-#line 1337 "src/parser.c"
-yy103:
+#line 1408 "src/parser.c"
+yy111:
                        ++cur;
 #line 344 "src/parser.re"
                        { NEWTOKEN(PSI_T_AND); goto start; }
-#line 1342 "src/parser.c"
-yy105:
+#line 1413 "src/parser.c"
+yy113:
                        yych = *++cur;
                        switch (yych) {
                        case '0':
@@ -1351,10 +1422,10 @@ yy105:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy108;
-                       default:        goto yy106;
+                       case '9':       goto yy116;
+                       default:        goto yy114;
                        }
-yy106:
+yy114:
                        cur = mrk;
                        switch (yyaccept) {
                        case 0:         goto yy29;
@@ -1363,95 +1434,95 @@ yy106:
                        case 3:         goto yy39;
                        case 4:         goto yy47;
                        case 5:         goto yy55;
-                       case 6:         goto yy110;
-                       case 7:         goto yy121;
-                       case 8:         goto yy153;
+                       case 6:         goto yy118;
+                       case 7:         goto yy129;
+                       case 8:         goto yy159;
                        case 9:         goto yy184;
-                       case 10:        goto yy229;
-                       case 11:        goto yy231;
-                       case 12:        goto yy233;
-                       case 13:        goto yy243;
-                       case 14:        goto yy279;
-                       case 15:        goto yy282;
-                       case 16:        goto yy288;
-                       case 17:        goto yy290;
-                       case 18:        goto yy293;
-                       case 19:        goto yy298;
-                       case 20:        goto yy309;
-                       case 21:        goto yy312;
-                       case 22:        goto yy327;
-                       case 23:        goto yy335;
-                       case 24:        goto yy342;
-                       case 25:        goto yy345;
-                       case 26:        goto yy351;
-                       case 27:        goto yy354;
-                       case 28:        goto yy361;
-                       case 29:        goto yy363;
-                       case 30:        goto yy367;
-                       case 31:        goto yy369;
-                       case 32:        goto yy371;
-                       case 33:        goto yy373;
-                       case 34:        goto yy376;
-                       case 35:        goto yy385;
-                       case 36:        goto yy393;
-                       case 37:        goto yy412;
-                       case 38:        goto yy414;
-                       case 39:        goto yy423;
-                       case 40:        goto yy428;
-                       case 41:        goto yy430;
-                       case 42:        goto yy432;
-                       case 43:        goto yy436;
-                       case 44:        goto yy442;
-                       case 45:        goto yy444;
-                       case 46:        goto yy446;
-                       case 47:        goto yy448;
-                       case 48:        goto yy453;
-                       case 49:        goto yy455;
-                       case 50:        goto yy457;
-                       case 51:        goto yy459;
-                       case 52:        goto yy461;
-                       case 53:        goto yy463;
-                       case 54:        goto yy465;
-                       case 55:        goto yy470;
-                       case 56:        goto yy485;
-                       case 57:        goto yy487;
-                       case 58:        goto yy491;
-                       case 59:        goto yy495;
-                       case 60:        goto yy497;
-                       case 61:        goto yy499;
-                       case 62:        goto yy501;
-                       case 63:        goto yy503;
-                       case 64:        goto yy508;
-                       case 65:        goto yy513;
-                       case 66:        goto yy518;
-                       case 67:        goto yy521;
-                       case 68:        goto yy523;
-                       case 69:        goto yy530;
-                       case 70:        goto yy532;
-                       case 71:        goto yy534;
-                       case 72:        goto yy536;
-                       case 73:        goto yy541;
-                       case 74:        goto yy543;
-                       case 75:        goto yy547;
-                       case 76:        goto yy549;
-                       case 77:        goto yy551;
-                       case 78:        goto yy553;
-                       case 79:        goto yy563;
-                       case 80:        goto yy565;
-                       case 81:        goto yy573;
-                       case 82:        goto yy577;
-                       case 83:        goto yy581;
-                       case 84:        goto yy585;
-                       case 85:        goto yy587;
-                       default:        goto yy592;
-                       }
-yy107:
+                       case 10:        goto yy241;
+                       case 11:        goto yy243;
+                       case 12:        goto yy252;
+                       case 13:        goto yy271;
+                       case 14:        goto yy302;
+                       case 15:        goto yy304;
+                       case 16:        goto yy310;
+                       case 17:        goto yy318;
+                       case 18:        goto yy330;
+                       case 19:        goto yy338;
+                       case 20:        goto yy342;
+                       case 21:        goto yy348;
+                       case 22:        goto yy350;
+                       case 23:        goto yy354;
+                       case 24:        goto yy361;
+                       case 25:        goto yy363;
+                       case 26:        goto yy373;
+                       case 27:        goto yy375;
+                       case 28:        goto yy382;
+                       case 29:        goto yy385;
+                       case 30:        goto yy387;
+                       case 31:        goto yy389;
+                       case 32:        goto yy393;
+                       case 33:        goto yy398;
+                       case 34:        goto yy416;
+                       case 35:        goto yy423;
+                       case 36:        goto yy426;
+                       case 37:        goto yy433;
+                       case 38:        goto yy442;
+                       case 39:        goto yy445;
+                       case 40:        goto yy450;
+                       case 41:        goto yy452;
+                       case 42:        goto yy456;
+                       case 43:        goto yy459;
+                       case 44:        goto yy461;
+                       case 45:        goto yy463;
+                       case 46:        goto yy468;
+                       case 47:        goto yy470;
+                       case 48:        goto yy472;
+                       case 49:        goto yy474;
+                       case 50:        goto yy476;
+                       case 51:        goto yy481;
+                       case 52:        goto yy490;
+                       case 53:        goto yy495;
+                       case 54:        goto yy497;
+                       case 55:        goto yy499;
+                       case 56:        goto yy501;
+                       case 57:        goto yy509;
+                       case 58:        goto yy513;
+                       case 59:        goto yy517;
+                       case 60:        goto yy519;
+                       case 61:        goto yy524;
+                       case 62:        goto yy529;
+                       case 63:        goto yy531;
+                       case 64:        goto yy536;
+                       case 65:        goto yy538;
+                       case 66:        goto yy540;
+                       case 67:        goto yy544;
+                       case 68:        goto yy549;
+                       case 69:        goto yy552;
+                       case 70:        goto yy554;
+                       case 71:        goto yy556;
+                       case 72:        goto yy558;
+                       case 73:        goto yy563;
+                       case 74:        goto yy565;
+                       case 75:        goto yy574;
+                       case 76:        goto yy576;
+                       case 77:        goto yy578;
+                       case 78:        goto yy580;
+                       case 79:        goto yy585;
+                       case 80:        goto yy587;
+                       case 81:        goto yy595;
+                       case 82:        goto yy599;
+                       case 83:        goto yy603;
+                       case 84:        goto yy607;
+                       case 85:        goto yy609;
+                       default:        goto yy614;
+                       }
+yy115:
                        yych = *++cur;
                        switch (yych) {
-                       case '.':       goto yy193;
-                       default:        goto yy106;
+                       case '.':       goto yy208;
+                       default:        goto yy114;
                        }
-yy108:
+yy116:
                        yyaccept = 6;
                        mrk = ++cur;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
@@ -1467,30 +1538,30 @@ yy108:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy108;
+                       case '9':       goto yy116;
                        case 'D':
-                       case 'd':       goto yy195;
+                       case 'd':       goto yy210;
                        case 'F':
-                       case 'f':       goto yy196;
+                       case 'f':       goto yy211;
                        case 'L':
-                       case 'l':       goto yy198;
-                       default:        goto yy110;
+                       case 'l':       goto yy213;
+                       default:        goto yy118;
                        }
-yy110:
+yy118:
 #line 314 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT; goto start; }
-#line 1483 "src/parser.c"
-yy111:
+#line 1554 "src/parser.c"
+yy119:
                        ++cur;
 #line 328 "src/parser.re"
                        { goto comment; }
-#line 1488 "src/parser.c"
-yy113:
+#line 1559 "src/parser.c"
+yy121:
                        ++cur;
 #line 329 "src/parser.re"
                        { goto comment_sl; }
-#line 1493 "src/parser.c"
-yy115:
+#line 1564 "src/parser.c"
+yy123:
                        yyaccept = 6;
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
@@ -1506,18 +1577,18 @@ yy115:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy115;
+                       case '9':       goto yy123;
                        case 'D':
-                       case 'd':       goto yy195;
+                       case 'd':       goto yy210;
                        case 'E':
-                       case 'e':       goto yy119;
+                       case 'e':       goto yy127;
                        case 'F':
-                       case 'f':       goto yy196;
+                       case 'f':       goto yy211;
                        case 'L':
-                       case 'l':       goto yy198;
-                       default:        goto yy110;
+                       case 'l':       goto yy213;
+                       default:        goto yy118;
                        }
-yy117:
+yy125:
                        ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -1530,18 +1601,18 @@ yy117:
                        case '4':
                        case '5':
                        case '6':
-                       case '7':       goto yy117;
+                       case '7':       goto yy125;
                        case 'L':
-                       case 'l':       goto yy120;
+                       case 'l':       goto yy128;
                        case 'U':
-                       case 'u':       goto yy122;
+                       case 'u':       goto yy130;
                        default:        goto yy39;
                        }
-yy119:
+yy127:
                        yych = *++cur;
                        switch (yych) {
                        case '+':
-                       case '-':       goto yy105;
+                       case '-':       goto yy113;
                        case '0':
                        case '1':
                        case '2':
@@ -1551,37 +1622,37 @@ yy119:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy108;
-                       default:        goto yy106;
+                       case '9':       goto yy116;
+                       default:        goto yy114;
                        }
-yy120:
+yy128:
                        yyaccept = 7;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy200;
+                       case 'l':       goto yy215;
                        case 'U':
-                       case 'u':       goto yy201;
-                       default:        goto yy121;
+                       case 'u':       goto yy216;
+                       default:        goto yy129;
                        }
-yy121:
+yy129:
                        cur = ctxmrk;
 #line 310 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 1572 "src/parser.c"
-yy122:
+#line 1643 "src/parser.c"
+yy130:
                        ++cur;
                        switch ((yych = *cur)) {
                        case 'L':
-                       case 'l':       goto yy203;
-                       default:        goto yy123;
+                       case 'l':       goto yy218;
+                       default:        goto yy131;
                        }
-yy123:
+yy131:
                        cur = ctxmrk;
 #line 309 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_U; cur += 1; goto start; }
-#line 1584 "src/parser.c"
-yy124:
+#line 1655 "src/parser.c"
+yy132:
                        yych = *++cur;
                        switch (yych) {
                        case '0':
@@ -1605,10 +1676,10 @@ yy124:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy204;
-                       default:        goto yy106;
+                       case 'f':       goto yy219;
+                       default:        goto yy114;
                        }
-yy125:
+yy133:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -1678,44 +1749,44 @@ yy125:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy125;
-                       case '>':       goto yy206;
-                       default:        goto yy106;
+                       case 'z':       goto yy133;
+                       case '>':       goto yy221;
+                       default:        goto yy114;
                        }
-yy127:
+yy135:
                        ++cur;
 #line 358 "src/parser.re"
                        { NEWTOKEN(PSI_T_LSHIFT); goto start; }
-#line 1690 "src/parser.c"
-yy129:
+#line 1761 "src/parser.c"
+yy137:
                        ++cur;
 #line 360 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_LE); goto start; }
-#line 1695 "src/parser.c"
-yy131:
+#line 1766 "src/parser.c"
+yy139:
                        ++cur;
 #line 343 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_EQ); goto start; }
-#line 1700 "src/parser.c"
-yy133:
+#line 1771 "src/parser.c"
+yy141:
                        ++cur;
 #line 361 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_GE); goto start; }
-#line 1705 "src/parser.c"
-yy135:
+#line 1776 "src/parser.c"
+yy143:
                        ++cur;
 #line 359 "src/parser.re"
                        { NEWTOKEN(PSI_T_RSHIFT); goto start; }
-#line 1710 "src/parser.c"
-yy137:
+#line 1781 "src/parser.c"
+yy145:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy208;
+                       case 'r':       goto yy223;
                        default:        goto yy62;
                        }
-yy138:
+yy146:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -1794,120 +1865,100 @@ yy138:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy106;
+                       case 0x7F:      goto yy114;
                        default:        goto yy182;
                        }
-yy139:
+yy147:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy209;
+                       case 'o':       goto yy224;
                        default:        goto yy62;
                        }
-yy140:
+yy148:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy210;
-                       default:        goto yy62;
-                       }
-yy141:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy211;
+                       case 'l':       goto yy225;
                        default:        goto yy62;
                        }
-yy142:
+yy149:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy212;
                        case 'U':
-                       case 'u':       goto yy213;
+                       case 'u':       goto yy226;
                        default:        goto yy62;
                        }
-yy143:
+yy150:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy214;
-                       default:        goto yy62;
-                       }
-yy144:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy215;
+                       case 'f':       goto yy227;
                        default:        goto yy62;
                        }
-yy145:
+yy151:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy216;
+                       case 'i':       goto yy228;
                        case 'S':
-                       case 's':       goto yy217;
+                       case 's':       goto yy229;
                        default:        goto yy62;
                        }
-yy146:
+yy152:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy218;
-                       case 'U':
-                       case 'u':       goto yy219;
+                       case 'd':       goto yy230;
                        default:        goto yy62;
                        }
-yy147:
+yy153:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy220;
+                       case 'r':       goto yy231;
                        default:        goto yy62;
                        }
-yy148:
+yy154:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy221;
+                       case 'l':       goto yy232;
                        default:        goto yy62;
                        }
-yy149:
+yy155:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy222;
+                       case 'o':       goto yy233;
                        default:        goto yy62;
                        }
-yy150:
+yy156:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy223;
+                       case 'e':       goto yy234;
                        default:        goto yy62;
                        }
-yy151:
+yy157:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy224;
+                       case 'n':       goto yy235;
                        default:        goto yy62;
                        }
-yy152:
+yy158:
                        yyaccept = 8;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -1974,219 +2025,167 @@ yy152:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy153;
+                       case 0x7F:      goto yy159;
                        case 'D':
-                       case 'd':       goto yy225;
+                       case 'd':       goto yy236;
                        case 'N':
-                       case 'n':       goto yy226;
-                       case '\\':      goto yy138;
+                       case 'n':       goto yy237;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy153:
-#line 373 "src/parser.re"
+yy159:
+#line 396 "src/parser.re"
                        { NEWTOKEN(PSI_T_IF); goto start; }
-#line 1989 "src/parser.c"
-yy154:
+#line 2040 "src/parser.c"
+yy160:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy227;
+                       case 'c':       goto yy238;
                        case 'T':
-                       case 't':       goto yy228;
+                       case 't':       goto yy239;
                        default:        goto yy62;
                        }
-yy155:
+yy161:
                        ++cur;
                        cur = ctxmrk;
 #line 326 "src/parser.re"
                        { char_width = SIZEOF_WCHAR_T/8; }
-#line 2005 "src/parser.c"
-yy157:
+#line 2056 "src/parser.c"
+yy163:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy230;
+                       case 't':       goto yy240;
                        default:        goto yy62;
                        }
-yy158:
+yy164:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy232;
+                       case 'b':       goto yy242;
                        default:        goto yy62;
                        }
-yy159:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy234;
-                       default:        goto yy62;
-                       }
-yy160:
+yy165:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'X':
-                       case 'x':       goto yy235;
+                       case 'x':       goto yy244;
                        default:        goto yy62;
                        }
-yy161:
+yy166:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy236;
+                       case 'l':       goto yy245;
                        default:        goto yy62;
                        }
-yy162:
+yy167:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy237;
+                       case 'j':       goto yy246;
                        default:        goto yy62;
                        }
-yy163:
+yy168:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy238;
+                       case 't':       goto yy247;
                        default:        goto yy62;
                        }
-yy164:
+yy169:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy239;
+                       case 's':       goto yy248;
                        default:        goto yy62;
                        }
-yy165:
+yy170:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy240;
+                       case 'e':       goto yy249;
                        default:        goto yy62;
                        }
-yy166:
+yy171:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy241;
+                       case 't':       goto yy250;
                        default:        goto yy62;
                        }
-yy167:
+yy172:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy242;
+                       case 't':       goto yy251;
                        default:        goto yy62;
                        }
-yy168:
+yy173:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy244;
+                       case 'A':
+                       case 'a':       goto yy253;
+                       case 'R':
+                       case 'r':       goto yy254;
                        default:        goto yy62;
                        }
-yy169:
+yy174:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy245;
+                       case 'M':
+                       case 'm':       goto yy255;
                        default:        goto yy62;
                        }
-yy170:
+yy175:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy246;
-                       case 'R':
-                       case 'r':       goto yy247;
+                       case '_':       goto yy256;
                        default:        goto yy62;
                        }
-yy171:
+yy176:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'M':
-                       case 'm':       goto yy248;
+                       case 'U':
+                       case 'u':       goto yy257;
                        default:        goto yy62;
                        }
-yy172:
+yy177:
+                       ++cur;
+                       cur = ctxmrk;
+#line 325 "src/parser.re"
+                       { char_width = 4; }
+#line 2175 "src/parser.c"
+yy179:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy249;
+                       case 'D':
+                       case 'd':       goto yy258;
                        default:        goto yy62;
                        }
-yy173:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy250;
-                       default:        goto yy62;
-                       }
-yy174:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'P':
-                       case 'p':       goto yy251;
-                       default:        goto yy62;
-                       }
-yy175:
-                       ++cur;
-                       cur = ctxmrk;
-#line 325 "src/parser.re"
-                       { char_width = 4; }
-#line 2156 "src/parser.c"
-yy177:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy252;
-                       default:        goto yy62;
-                       }
-yy178:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy253;
-                       case 'I':
-                       case 'i':       goto yy254;
-                       case 'S':
-                       case 's':       goto yy255;
-                       default:        goto yy62;
-                       }
-yy179:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy256;
-                       default:        goto yy62;
-                       }
-yy180:
+yy180:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy257;
+                       case 'r':       goto yy259;
                        default:        goto yy62;
                        }
 yy181:
@@ -2194,7 +2193,7 @@ yy181:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy258;
+                       case 'a':       goto yy260;
                        default:        goto yy62;
                        }
 yy182:
@@ -2267,116 +2266,236 @@ yy182:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy184;
-                       case '\\':      goto yy138;
+                       case '\\':      goto yy146;
                        default:        goto yy182;
                        }
 yy184:
 #line 446 "src/parser.re"
                        { NEWTOKEN(PSI_T_NSNAME); goto start; }
-#line 2277 "src/parser.c"
+#line 2276 "src/parser.c"
 yy185:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy259;
-                       case 'e':       goto yy260;
-                       case 'r':       goto yy261;
+                       case 'a':       goto yy261;
+                       case 'e':       goto yy262;
+                       case 'r':       goto yy263;
                        default:        goto yy62;
                        }
 yy186:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy232;
-                       case 'n':       goto yy262;
+                       case 'O':       goto yy224;
+                       case 'o':       goto yy264;
                        default:        goto yy62;
                        }
 yy187:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy240;
-                       case 'a':       goto yy263;
+                       case 'a':       goto yy265;
                        default:        goto yy62;
                        }
 yy188:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'U':
+                       case 'u':       goto yy226;
+                       case 'n':       goto yy266;
+                       default:        goto yy62;
+                       }
+yy189:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'u':       goto yy267;
+                       default:        goto yy62;
+                       }
+yy190:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy230;
+                       case 'u':       goto yy268;
+                       default:        goto yy62;
+                       }
+yy191:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'O':       goto yy233;
+                       case 'o':       goto yy269;
+                       default:        goto yy62;
+                       }
+yy192:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'C':
+                       case 'c':       goto yy238;
+                       case 'T':       goto yy239;
+                       case 't':       goto yy270;
+                       default:        goto yy62;
+                       }
+yy193:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'B':
+                       case 'b':       goto yy242;
+                       case 'n':       goto yy272;
+                       default:        goto yy62;
+                       }
+yy194:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy273;
+                       default:        goto yy62;
+                       }
+yy195:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy249;
+                       case 'a':       goto yy274;
+                       default:        goto yy62;
+                       }
+yy196:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'o':       goto yy275;
+                       default:        goto yy62;
+                       }
+yy197:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'g':       goto yy276;
+                       default:        goto yy62;
+                       }
+yy198:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy253;
+                       case 'R':       goto yy254;
+                       case 'r':       goto yy277;
+                       default:        goto yy62;
+                       }
+yy199:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'p':       goto yy278;
+                       default:        goto yy62;
+                       }
+yy200:
                        ++cur;
                        cur = ctxmrk;
 #line 324 "src/parser.re"
                        { char_width = 2; }
-#line 2310 "src/parser.c"
-yy190:
+#line 2405 "src/parser.c"
+yy202:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        ctxmrk = cur;
                        switch (yych) {
-                       case '"':       goto yy264;
+                       case '"':       goto yy279;
                        default:        goto yy62;
                        }
-yy191:
+yy203:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy281;
+                       default:        goto yy62;
+                       }
+yy204:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy258;
+                       case 'i':       goto yy282;
+                       case 's':       goto yy283;
+                       default:        goto yy62;
+                       }
+yy205:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy284;
+                       default:        goto yy62;
+                       }
+yy206:
                        ++cur;
 #line 345 "src/parser.re"
                        { NEWTOKEN(PSI_T_OR); goto start; }
-#line 2323 "src/parser.c"
-yy193:
+#line 2442 "src/parser.c"
+yy208:
                        ++cur;
 #line 365 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELLIPSIS); goto start; }
-#line 2328 "src/parser.c"
-yy195:
+#line 2447 "src/parser.c"
+yy210:
                        yych = *++cur;
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy266;
+                       case 'd':       goto yy285;
                        case 'F':
-                       case 'f':       goto yy268;
+                       case 'f':       goto yy287;
                        case 'L':
-                       case 'l':       goto yy270;
-                       default:        goto yy106;
+                       case 'l':       goto yy289;
+                       default:        goto yy114;
                        }
-yy196:
+yy211:
                        ++cur;
                        cur = ctxmrk;
 #line 315 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_F; cur += 1; goto start; }
-#line 2345 "src/parser.c"
-yy198:
+#line 2464 "src/parser.c"
+yy213:
                        ++cur;
                        cur = ctxmrk;
 #line 316 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 2351 "src/parser.c"
-yy200:
+#line 2470 "src/parser.c"
+yy215:
                        yych = *++cur;
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy272;
-                       default:        goto yy106;
+                       case 'u':       goto yy291;
+                       default:        goto yy114;
                        }
-yy201:
+yy216:
                        ++cur;
-yy202:
+yy217:
                        cur = ctxmrk;
 #line 311 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_UL; cur += 2; goto start; }
-#line 2365 "src/parser.c"
-yy203:
+#line 2484 "src/parser.c"
+yy218:
                        yych = *++cur;
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy272;
-                       default:        goto yy202;
+                       case 'l':       goto yy291;
+                       default:        goto yy217;
                        }
-yy204:
+yy219:
                        yyaccept = 3;
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
                        ctxmrk = cur;
                        switch (yych) {
-                       case '.':       goto yy274;
+                       case '.':       goto yy293;
                        case '0':
                        case '1':
                        case '2':
@@ -2398,183 +2517,159 @@ yy204:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy204;
+                       case 'f':       goto yy219;
                        case 'L':
-                       case 'l':       goto yy120;
+                       case 'l':       goto yy128;
                        case 'P':
-                       case 'p':       goto yy119;
+                       case 'p':       goto yy127;
                        case 'U':
-                       case 'u':       goto yy122;
+                       case 'u':       goto yy130;
                        default:        goto yy39;
                        }
-yy206:
+yy221:
                        ++cur;
 #line 448 "src/parser.re"
                        { tok += 1; cur -= 1; NEWTOKEN(PSI_T_CPP_HEADER); cur += 1; goto start; }
-#line 2415 "src/parser.c"
-yy208:
+#line 2534 "src/parser.c"
+yy223:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy276;
+                       case 'a':       goto yy295;
                        case 'V':
-                       case 'v':       goto yy277;
+                       case 'v':       goto yy296;
                        default:        goto yy62;
                        }
-yy209:
+yy224:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy278;
+                       case 'l':       goto yy297;
                        default:        goto yy62;
                        }
-yy210:
+yy225:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy280;
-                       default:        goto yy62;
-                       }
-yy211:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy281;
-                       default:        goto yy62;
-                       }
-yy212:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'S':
-                       case 's':       goto yy283;
+                       case 'l':       goto yy298;
                        default:        goto yy62;
                        }
-yy213:
+yy226:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy284;
+                       case 'n':       goto yy299;
                        default:        goto yy62;
                        }
-yy214:
+yy227:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy285;
-                       default:        goto yy62;
-                       }
-yy215:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy286;
+                       case 'i':       goto yy300;
                        default:        goto yy62;
                        }
-yy216:
+yy228:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy287;
+                       case 'f':       goto yy301;
                        default:        goto yy62;
                        }
-yy217:
+yy229:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy289;
+                       case 'e':       goto yy303;
                        default:        goto yy62;
                        }
-yy218:
+yy230:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy291;
-                       default:        goto yy62;
-                       }
-yy219:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'M':
-                       case 'm':       goto yy292;
+                       case 'i':       goto yy305;
                        default:        goto yy62;
                        }
-yy220:
+yy231:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy294;
+                       case 'o':       goto yy306;
                        default:        goto yy62;
                        }
-yy221:
+yy232:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy295;
+                       case 's':       goto yy307;
                        default:        goto yy62;
                        }
-yy222:
+yy233:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy296;
+                       case 'a':       goto yy308;
                        default:        goto yy62;
                        }
-yy223:
+yy234:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy297;
+                       case 'e':       goto yy309;
                        default:        goto yy62;
                        }
-yy224:
+yy235:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy299;
+                       case 'c':       goto yy311;
                        default:        goto yy62;
                        }
-yy225:
+yy236:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy300;
+                       case 'e':       goto yy312;
                        default:        goto yy62;
                        }
-yy226:
+yy237:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy301;
+                       case 'd':       goto yy313;
                        default:        goto yy62;
                        }
-yy227:
+yy238:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy302;
+                       case 'l':       goto yy314;
                        default:        goto yy62;
                        }
-yy228:
+yy239:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'V':
+                       case 'v':       goto yy315;
+                       default:        goto yy62;
+                       }
+yy240:
                        yyaccept = 10;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -2641,21 +2736,15 @@ yy228:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy229;
-                       case '1':       goto yy303;
-                       case '3':       goto yy304;
-                       case '6':       goto yy305;
-                       case '8':       goto yy306;
-                       case 'V':
-                       case 'v':       goto yy307;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy241;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy229:
-#line 395 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT); goto start; }
-#line 2658 "src/parser.c"
-yy230:
+yy241:
+#line 421 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LET); goto start; }
+#line 2747 "src/parser.c"
+yy242:
                        yyaccept = 11;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -2722,29 +2811,86 @@ yy230:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy231;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy243;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy231:
-#line 421 "src/parser.re"
-                       { NEWTOKEN(PSI_T_LET); goto start; }
-#line 2733 "src/parser.c"
-yy232:
-                       yyaccept = 12;
+yy243:
+#line 420 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LIB); goto start; }
+#line 2822 "src/parser.c"
+yy244:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 0x00:
-                       case 0x01:
-                       case 0x02:
-                       case 0x03:
-                       case 0x04:
-                       case 0x05:
-                       case 0x06:
-                       case 0x07:
-                       case 0x08:
-                       case '\t':
-                       case '\n':
+                       case 'E':
+                       case 'e':       goto yy316;
+                       default:        goto yy62;
+                       }
+yy245:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy317;
+                       default:        goto yy62;
+                       }
+yy246:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy319;
+                       case 'V':
+                       case 'v':       goto yy320;
+                       default:        goto yy62;
+                       }
+yy247:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'H':
+                       case 'h':       goto yy321;
+                       default:        goto yy62;
+                       }
+yy248:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy322;
+                       default:        goto yy62;
+                       }
+yy249:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy323;
+                       default:        goto yy62;
+                       }
+yy250:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'U':
+                       case 'u':       goto yy324;
+                       default:        goto yy62;
+                       }
+yy251:
+                       yyaccept = 12;
+                       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':
@@ -2797,80 +2943,159 @@ yy232:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy233;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy252;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy233:
-#line 420 "src/parser.re"
-                       { NEWTOKEN(PSI_T_LIB); goto start; }
-#line 2808 "src/parser.c"
-yy234:
+yy252:
+#line 422 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SET); goto start; }
+#line 2954 "src/parser.c"
+yy253:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy308;
+                       case 'T':
+                       case 't':       goto yy325;
                        default:        goto yy62;
                        }
-yy235:
+yy254:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy326;
+                       case 'L':
+                       case 'l':       goto yy327;
+                       case 'V':
+                       case 'v':       goto yy328;
+                       default:        goto yy62;
+                       }
+yy255:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'P':
+                       case 'p':       goto yy329;
+                       default:        goto yy62;
+                       }
+yy256:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy331;
+                       case 'B':
+                       case 'b':       goto yy332;
+                       case 'F':
+                       case 'f':       goto yy333;
+                       case 'I':
+                       case 'i':       goto yy334;
+                       case 'O':
+                       case 'o':       goto yy335;
+                       case 'S':
+                       case 's':       goto yy336;
+                       default:        goto yy62;
+                       }
+yy257:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy310;
+                       case 'e':       goto yy337;
                        default:        goto yy62;
                        }
-yy236:
+yy258:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy339;
+                       default:        goto yy62;
+                       }
+yy259:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy340;
+                       default:        goto yy62;
+                       }
+yy260:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy311;
+                       case 'l':       goto yy341;
                        default:        goto yy62;
                        }
-yy237:
+yy261:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy313;
-                       case 'V':
-                       case 'v':       goto yy314;
+                       case 's':       goto yy343;
+                       case 't':       goto yy344;
                        default:        goto yy62;
                        }
-yy238:
+yy262:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'H':
-                       case 'h':       goto yy315;
+                       case 'x':       goto yy345;
                        default:        goto yy62;
                        }
-yy239:
+yy263:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy316;
+                       case 'e':       goto yy346;
                        default:        goto yy62;
                        }
-yy240:
+yy264:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy317;
+                       case 'L':       goto yy297;
+                       case 'l':       goto yy347;
                        default:        goto yy62;
                        }
-yy241:
+yy265:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy318;
+                       case 'r':       goto yy349;
                        default:        goto yy62;
                        }
-yy242:
+yy266:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 's':       goto yy351;
+                       default:        goto yy62;
+                       }
+yy267:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'b':       goto yy352;
+                       default:        goto yy62;
+                       }
+yy268:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'm':       goto yy353;
+                       default:        goto yy62;
+                       }
+yy269:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':       goto yy308;
+                       case 'a':       goto yy355;
+                       default:        goto yy62;
+                       }
+yy270:
                        yyaccept = 13;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -2937,217 +3162,134 @@ yy242:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy243;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
-                       }
-yy243:
-#line 422 "src/parser.re"
-                       { NEWTOKEN(PSI_T_SET); goto start; }
-#line 2948 "src/parser.c"
-yy244:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy319;
-                       default:        goto yy62;
-                       }
-yy245:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy320;
-                       default:        goto yy62;
-                       }
-yy246:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy321;
-                       default:        goto yy62;
-                       }
-yy247:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy322;
-                       case 'L':
-                       case 'l':       goto yy323;
-                       case 'U':
-                       case 'u':       goto yy324;
+                       case 0x7F:      goto yy271;
+                       case '1':       goto yy356;
+                       case '3':       goto yy357;
+                       case '6':       goto yy358;
+                       case '8':       goto yy359;
                        case 'V':
-                       case 'v':       goto yy325;
-                       default:        goto yy62;
-                       }
-yy248:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'P':
-                       case 'p':       goto yy326;
-                       default:        goto yy62;
-                       }
-yy249:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy328;
-                       case 'B':
-                       case 'b':       goto yy329;
-                       case 'F':
-                       case 'f':       goto yy330;
-                       case 'I':
-                       case 'i':       goto yy331;
-                       case 'O':
-                       case 'o':       goto yy332;
-                       case 'S':
-                       case 's':       goto yy333;
-                       default:        goto yy62;
+                       case 'v':       goto yy315;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
                        }
-yy250:
+yy271:
+#line 382 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT); goto start; }
+#line 3179 "src/parser.c"
+yy272:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy334;
+                       case 'e':       goto yy360;
                        default:        goto yy62;
                        }
-yy251:
+yy273:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy336;
+                       case 'g':       goto yy362;
                        default:        goto yy62;
                        }
-yy252:
+yy274:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy337;
+                       case 'g':       goto yy364;
                        default:        goto yy62;
                        }
-yy253:
+yy275:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy338;
+                       case 'r':       goto yy365;
                        default:        goto yy62;
                        }
-yy254:
+yy276:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy339;
+                       case 'n':       goto yy366;
                        default:        goto yy62;
                        }
-yy255:
+yy277:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy340;
-                       default:        goto yy62;
-                       }
-yy256:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy341;
-                       default:        goto yy62;
-                       }
-yy257:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy343;
-                       default:        goto yy62;
-                       }
-yy258:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
+                       case 'i':       goto yy326;
                        case 'L':
-                       case 'l':       goto yy344;
+                       case 'l':       goto yy327;
+                       case 'V':
+                       case 'v':       goto yy328;
+                       case 'u':       goto yy367;
                        default:        goto yy62;
                        }
-yy259:
+yy278:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy346;
-                       case 't':       goto yy347;
+                       case 'e':       goto yy368;
                        default:        goto yy62;
                        }
-yy260:
+yy279:
+                       ++cur;
+                       cur = ctxmrk;
+#line 323 "src/parser.re"
+                       { char_width = 1; }
+#line 3240 "src/parser.c"
+yy281:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'x':       goto yy348;
+                       case 't':       goto yy369;
                        default:        goto yy62;
                        }
-yy261:
+yy282:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy349;
+                       case 'o':       goto yy370;
                        default:        goto yy62;
                        }
-yy262:
+yy283:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy350;
+                       case 'i':       goto yy371;
                        default:        goto yy62;
                        }
-yy263:
+yy284:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy352;
+                       case 'd':       goto yy372;
                        default:        goto yy62;
                        }
-yy264:
-                       ++cur;
-                       cur = ctxmrk;
-#line 323 "src/parser.re"
-                       { char_width = 1; }
-#line 3126 "src/parser.c"
-yy266:
+yy285:
                        ++cur;
                        cur = ctxmrk;
 #line 318 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DD; cur += 2; goto start; }
-#line 3132 "src/parser.c"
-yy268:
+#line 3274 "src/parser.c"
+yy287:
                        ++cur;
                        cur = ctxmrk;
 #line 317 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DF; cur += 2; goto start; }
-#line 3138 "src/parser.c"
-yy270:
+#line 3280 "src/parser.c"
+yy289:
                        ++cur;
                        cur = ctxmrk;
 #line 319 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DL; cur += 2; goto start; }
-#line 3144 "src/parser.c"
-yy272:
+#line 3286 "src/parser.c"
+yy291:
                        ++cur;
                        cur = ctxmrk;
 #line 312 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_ULL; cur += 3; goto start; }
-#line 3150 "src/parser.c"
-yy274:
+#line 3292 "src/parser.c"
+yy293:
                        ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -3173,118 +3315,65 @@ yy274:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy274;
+                       case 'f':       goto yy293;
                        case 'P':
-                       case 'p':       goto yy119;
-                       default:        goto yy106;
+                       case 'p':       goto yy127;
+                       default:        goto yy114;
                        }
-yy276:
+yy295:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy353;
+                       case 'y':       goto yy374;
                        default:        goto yy62;
                        }
-yy277:
+yy296:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy355;
+                       case 'a':       goto yy376;
                        default:        goto yy62;
                        }
-yy278:
-                       yyaccept = 14;
+yy297:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 0x00:
-                       case 0x01:
-                       case 0x02:
-                       case 0x03:
-                       case 0x04:
-                       case 0x05:
-                       case 0x06:
-                       case 0x07:
-                       case 0x08:
-                       case '\t':
-                       case '\n':
-                       case '\v':
-                       case '\f':
-                       case '\r':
-                       case 0x0E:
-                       case 0x0F:
-                       case 0x10:
-                       case 0x11:
-                       case 0x12:
-                       case 0x13:
-                       case 0x14:
-                       case 0x15:
-                       case 0x16:
-                       case 0x17:
-                       case 0x18:
-                       case 0x19:
-                       case 0x1A:
-                       case 0x1B:
-                       case 0x1C:
-                       case 0x1D:
-                       case 0x1E:
-                       case 0x1F:
-                       case ' ':
-                       case '!':
-                       case '"':
-                       case '#':
-                       case '$':
-                       case '%':
-                       case '&':
-                       case '\'':
-                       case '(':
-                       case ')':
-                       case '*':
-                       case '+':
-                       case ',':
-                       case '-':
-                       case '.':
-                       case '/':
-                       case ':':
-                       case ';':
-                       case '<':
-                       case '=':
-                       case '>':
-                       case '?':
-                       case '@':
-                       case '[':
-                       case ']':
-                       case '^':
-                       case '`':
-                       case '{':
-                       case '|':
-                       case '}':
-                       case '~':
-                       case 0x7F:      goto yy279;
                        case 'V':
-                       case 'v':       goto yy356;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
+                       case 'v':       goto yy377;
+                       default:        goto yy62;
                        }
-yy279:
-#line 392 "src/parser.re"
-                       { NEWTOKEN(PSI_T_BOOL); goto start; }
-#line 3274 "src/parser.c"
-yy280:
+yy298:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy357;
+                       case 'a':       goto yy378;
                        case 'B':
-                       case 'b':       goto yy358;
+                       case 'b':       goto yy379;
                        case 'O':
-                       case 'o':       goto yy359;
+                       case 'o':       goto yy380;
                        default:        goto yy62;
                        }
-yy281:
-                       yyaccept = 15;
+yy299:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy381;
+                       default:        goto yy62;
+                       }
+yy300:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy383;
+                       default:        goto yy62;
+                       }
+yy301:
+                       yyaccept = 14;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3350,48 +3439,16 @@ yy281:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy282;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy302;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy282:
-#line 393 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CHAR); goto start; }
-#line 3361 "src/parser.c"
-yy283:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy360;
-                       default:        goto yy62;
-                       }
-yy284:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy362;
-                       default:        goto yy62;
-                       }
-yy285:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy364;
-                       default:        goto yy62;
-                       }
-yy286:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy365;
-                       default:        goto yy62;
-                       }
-yy287:
-                       yyaccept = 16;
+yy302:
+#line 400 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ELIF); goto start; }
+#line 3450 "src/parser.c"
+yy303:
+                       yyaccept = 15;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3457,16 +3514,48 @@ yy287:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy288;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy304;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy288:
-#line 377 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ELIF); goto start; }
-#line 3468 "src/parser.c"
-yy289:
-                       yyaccept = 17;
+yy304:
+#line 399 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ELSE); goto start; }
+#line 3525 "src/parser.c"
+yy305:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'F':
+                       case 'f':       goto yy384;
+                       default:        goto yy62;
+                       }
+yy306:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy386;
+                       default:        goto yy62;
+                       }
+yy307:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy388;
+                       default:        goto yy62;
+                       }
+yy308:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy390;
+                       default:        goto yy62;
+                       }
+yy309:
+                       yyaccept = 16;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3532,24 +3621,64 @@ yy289:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy290;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy310;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy290:
-#line 376 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ELSE); goto start; }
-#line 3543 "src/parser.c"
-yy291:
+yy310:
+#line 426 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FREE); goto start; }
+#line 3632 "src/parser.c"
+yy311:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy391;
+                       default:        goto yy62;
+                       }
+yy312:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy366;
+                       case 'f':       goto yy392;
                        default:        goto yy62;
                        }
-yy292:
-                       yyaccept = 18;
+yy313:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy394;
+                       default:        goto yy62;
+                       }
+yy314:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'U':
+                       case 'u':       goto yy395;
+                       default:        goto yy62;
+                       }
+yy315:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy396;
+                       default:        goto yy62;
+                       }
+yy316:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy397;
+                       default:        goto yy62;
+                       }
+yy317:
+                       yyaccept = 17;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3615,40 +3744,95 @@ yy292:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy293;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy318;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy293:
-#line 418 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ENUM); goto start; }
-#line 3626 "src/parser.c"
-yy294:
+yy318:
+#line 411 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NULL); goto start; }
+#line 3755 "src/parser.c"
+yy319:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'C':
+                       case 'c':       goto yy399;
+                       default:        goto yy62;
+                       }
+yy320:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy400;
+                       default:        goto yy62;
+                       }
+yy321:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'V':
+                       case 'v':       goto yy401;
+                       default:        goto yy62;
+                       }
+yy322:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy402;
+                       default:        goto yy62;
+                       }
+yy323:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy403;
+                       default:        goto yy62;
+                       }
+yy324:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy368;
+                       case 'r':       goto yy404;
                        default:        goto yy62;
                        }
-yy295:
+yy325:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy405;
+                       default:        goto yy62;
+                       }
+yy326:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy406;
+                       default:        goto yy62;
+                       }
+yy327:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy370;
+                       case 'e':       goto yy407;
                        default:        goto yy62;
                        }
-yy296:
+yy328:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy372;
+                       case 'A':
+                       case 'a':       goto yy408;
                        default:        goto yy62;
                        }
-yy297:
-                       yyaccept = 19;
+yy329:
+                       yyaccept = 18;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3714,84 +3898,64 @@ yy297:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy298;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy330;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy298:
-#line 426 "src/parser.re"
-                       { NEWTOKEN(PSI_T_FREE); goto start; }
-#line 3725 "src/parser.c"
-yy299:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy374;
-                       default:        goto yy62;
-                       }
-yy300:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'F':
-                       case 'f':       goto yy375;
-                       default:        goto yy62;
-                       }
-yy301:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy377;
-                       default:        goto yy62;
-                       }
-yy302:
+yy330:
+#line 427 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TEMP); goto start; }
+#line 3909 "src/parser.c"
+yy331:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy378;
+                       case 'R':
+                       case 'r':       goto yy409;
                        default:        goto yy62;
                        }
-yy303:
+yy332:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '6':       goto yy379;
+                       case 'O':
+                       case 'o':       goto yy410;
                        default:        goto yy62;
                        }
-yy304:
+yy333:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '2':       goto yy380;
+                       case 'L':
+                       case 'l':       goto yy411;
                        default:        goto yy62;
                        }
-yy305:
+yy334:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '4':       goto yy381;
+                       case 'N':
+                       case 'n':       goto yy412;
                        default:        goto yy62;
                        }
-yy306:
+yy335:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy382;
+                       case 'B':
+                       case 'b':       goto yy413;
                        default:        goto yy62;
                        }
-yy307:
+yy336:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy383;
+                       case 'T':
+                       case 't':       goto yy414;
                        default:        goto yy62;
                        }
-yy308:
-                       yyaccept = 20;
+yy337:
+                       yyaccept = 19;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3857,24 +4021,32 @@ yy308:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy309;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy338;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy309:
-#line 396 "src/parser.re"
-                       { NEWTOKEN(PSI_T_LONG); goto start; }
-#line 3868 "src/parser.c"
-yy310:
+yy338:
+#line 409 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TRUE); goto start; }
+#line 4032 "src/parser.c"
+yy339:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy384;
+                       case 'F':
+                       case 'f':       goto yy415;
                        default:        goto yy62;
                        }
-yy311:
-                       yyaccept = 21;
+yy340:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy417;
+                       default:        goto yy62;
+                       }
+yy341:
+                       yyaccept = 20;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3940,118 +4112,120 @@ yy311:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy312;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy342;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy312:
-#line 388 "src/parser.re"
-                       { NEWTOKEN(PSI_T_NULL); goto start; }
-#line 3951 "src/parser.c"
-yy313:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy386;
-                       default:        goto yy62;
-                       }
-yy314:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy387;
-                       default:        goto yy62;
-                       }
-yy315:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'V':
-                       case 'v':       goto yy388;
-                       default:        goto yy62;
-                       }
-yy316:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy389;
-                       default:        goto yy62;
-                       }
-yy317:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy390;
-                       default:        goto yy62;
-                       }
-yy318:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy391;
-                       default:        goto yy62;
-                       }
-yy319:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy392;
-                       default:        goto yy62;
-                       }
-yy320:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy394;
-                       default:        goto yy62;
-                       }
-yy321:
+yy342:
+#line 436 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ZVAL); goto start; }
+#line 4123 "src/parser.c"
+yy343:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy395;
+                       case 'm':       goto yy418;
                        default:        goto yy62;
                        }
-yy322:
+yy344:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy396;
+                       case 't':       goto yy419;
                        default:        goto yy62;
                        }
-yy323:
+yy345:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy397;
+                       case 't':       goto yy420;
                        default:        goto yy62;
                        }
-yy324:
+yy346:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy398;
+                       case 's':       goto yy421;
                        default:        goto yy62;
                        }
-yy325:
-                       yyaccept = 5;
+yy347:
+                       yyaccept = 21;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy399;
-                       default:        goto yy62;
+                       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 yy348;
+                       case 'V':
+                       case 'v':       goto yy377;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
                        }
-yy326:
+yy348:
+#line 379 "src/parser.re"
+                       { NEWTOKEN(PSI_T_BOOL); goto start; }
+#line 4228 "src/parser.c"
+yy349:
                        yyaccept = 22;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4118,63 +4292,29 @@ yy326:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy327;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy350;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy327:
-#line 427 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TEMP); goto start; }
-#line 4129 "src/parser.c"
-yy328:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy400;
-                       default:        goto yy62;
-                       }
-yy329:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy401;
-                       default:        goto yy62;
-                       }
-yy330:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy402;
-                       default:        goto yy62;
-                       }
-yy331:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy403;
-                       default:        goto yy62;
-                       }
-yy332:
+yy350:
+#line 380 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CHAR); goto start; }
+#line 4303 "src/parser.c"
+yy351:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy404;
+                       case 't':       goto yy422;
                        default:        goto yy62;
                        }
-yy333:
+yy352:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy405;
+                       case 'l':       goto yy424;
                        default:        goto yy62;
                        }
-yy334:
+yy353:
                        yyaccept = 23;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4241,57 +4381,51 @@ yy334:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy335;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy354;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy335:
-#line 386 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TRUE); goto start; }
-#line 4252 "src/parser.c"
-yy336:
+yy354:
+#line 376 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ENUM); goto start; }
+#line 4392 "src/parser.c"
+yy355:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy406;
+                       case 'T':       goto yy390;
+                       case 't':       goto yy425;
                        default:        goto yy62;
                        }
-yy337:
+yy356:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '1':       goto yy407;
-                       case '3':       goto yy408;
-                       case '6':       goto yy409;
-                       case '8':       goto yy410;
+                       case '6':       goto yy427;
                        default:        goto yy62;
                        }
-yy338:
+yy357:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'F':
-                       case 'f':       goto yy411;
+                       case '2':       goto yy428;
                        default:        goto yy62;
                        }
-yy339:
+yy358:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy413;
+                       case '4':       goto yy429;
                        default:        goto yy62;
                        }
-yy340:
+yy359:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy415;
+                       case '_':       goto yy430;
                        default:        goto yy62;
                        }
-yy341:
+yy360:
                        yyaccept = 24;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4358,23 +4492,15 @@ yy341:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy342;
-                       case '\\':      goto yy138;
-                       default:        goto yy61;
-                       }
-yy342:
-#line 391 "src/parser.re"
-                       { NEWTOKEN(PSI_T_VOID); goto start; }
-#line 4369 "src/parser.c"
-yy343:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy416;
-                       default:        goto yy62;
+                       case 0x7F:      goto yy361;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
                        }
-yy344:
+yy361:
+#line 372 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LINE); goto start; }
+#line 4503 "src/parser.c"
+yy362:
                        yyaccept = 25;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4441,43 +4567,74 @@ yy344:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy345;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy363;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy345:
-#line 436 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ZVAL); goto start; }
-#line 4452 "src/parser.c"
-yy346:
+yy363:
+#line 383 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LONG); goto start; }
+#line 4578 "src/parser.c"
+yy364:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy417;
+                       case 'm':       goto yy431;
                        default:        goto yy62;
                        }
-yy347:
+yy365:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy418;
+                       case 't':       goto yy432;
                        default:        goto yy62;
                        }
-yy348:
+yy366:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy419;
+                       case 'e':       goto yy434;
                        default:        goto yy62;
                        }
-yy349:
+yy367:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy420;
+                       case 'c':       goto yy435;
                        default:        goto yy62;
                        }
-yy350:
+yy368:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'd':       goto yy436;
+                       default:        goto yy62;
+                       }
+yy369:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '1':       goto yy437;
+                       case '3':       goto yy438;
+                       case '6':       goto yy439;
+                       case '8':       goto yy440;
+                       default:        goto yy62;
+                       }
+yy370:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy441;
+                       default:        goto yy62;
+                       }
+yy371:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'g':       goto yy443;
+                       default:        goto yy62;
+                       }
+yy372:
                        yyaccept = 26;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4544,22 +4701,15 @@ yy350:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy351;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy373;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy351:
-#line 372 "src/parser.re"
-                       { NEWTOKEN(PSI_T_LINE); goto start; }
-#line 4555 "src/parser.c"
-yy352:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'm':       goto yy421;
-                       default:        goto yy62;
-                       }
-yy353:
+yy373:
+#line 378 "src/parser.re"
+                       { NEWTOKEN(PSI_T_VOID); goto start; }
+#line 4712 "src/parser.c"
+yy374:
                        yyaccept = 27;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4626,55 +4776,55 @@ yy353:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy354;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy375;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy354:
-#line 410 "src/parser.re"
+yy375:
+#line 415 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRAY); goto start; }
-#line 4637 "src/parser.c"
-yy355:
+#line 4787 "src/parser.c"
+yy376:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy422;
+                       case 'l':       goto yy444;
                        default:        goto yy62;
                        }
-yy356:
+yy377:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy424;
+                       case 'a':       goto yy446;
                        default:        goto yy62;
                        }
-yy357:
+yy378:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy425;
+                       case 'b':       goto yy447;
                        default:        goto yy62;
                        }
-yy358:
+yy379:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy426;
+                       case 'a':       goto yy448;
                        default:        goto yy62;
                        }
-yy359:
+yy380:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy427;
+                       case 'c':       goto yy449;
                        default:        goto yy62;
                        }
-yy360:
+yy381:
                        yyaccept = 28;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4741,15 +4891,23 @@ yy360:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy361;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy382;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy361:
-#line 419 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CONST); goto start; }
-#line 4752 "src/parser.c"
-yy362:
+yy382:
+#line 437 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COUNT); goto start; }
+#line 4902 "src/parser.c"
+yy383:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy451;
+                       default:        goto yy62;
+                       }
+yy384:
                        yyaccept = 29;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4816,31 +4974,15 @@ yy362:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy363;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy385;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy363:
-#line 437 "src/parser.re"
-                       { NEWTOKEN(PSI_T_COUNT); goto start; }
-#line 4827 "src/parser.c"
-yy364:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy429;
-                       default:        goto yy62;
-                       }
-yy365:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy431;
-                       default:        goto yy62;
-                       }
-yy366:
+yy385:
+#line 401 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ENDIF); goto start; }
+#line 4985 "src/parser.c"
+yy386:
                        yyaccept = 30;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4907,15 +5049,15 @@ yy366:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy367;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy387;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy367:
-#line 378 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ENDIF); goto start; }
-#line 4918 "src/parser.c"
-yy368:
+yy387:
+#line 406 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ERROR); goto start; }
+#line 5060 "src/parser.c"
+yy388:
                        yyaccept = 31;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4982,15 +5124,31 @@ yy368:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy369;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy389;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy369:
-#line 383 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ERROR); goto start; }
-#line 4993 "src/parser.c"
-yy370:
+yy389:
+#line 410 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FALSE); goto start; }
+#line 5135 "src/parser.c"
+yy390:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'V':
+                       case 'v':       goto yy453;
+                       default:        goto yy62;
+                       }
+yy391:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy454;
+                       default:        goto yy62;
+                       }
+yy392:
                        yyaccept = 32;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5057,15 +5215,39 @@ yy370:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy371;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy393;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy371:
-#line 387 "src/parser.re"
-                       { NEWTOKEN(PSI_T_FALSE); goto start; }
-#line 5068 "src/parser.c"
-yy372:
+yy393:
+#line 397 "src/parser.re"
+                       { NEWTOKEN(PSI_T_IFDEF); goto start; }
+#line 5226 "src/parser.c"
+yy394:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'F':
+                       case 'f':       goto yy455;
+                       default:        goto yy62;
+                       }
+yy395:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy457;
+                       default:        goto yy62;
+                       }
+yy396:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy458;
+                       default:        goto yy62;
+                       }
+yy397:
                        yyaccept = 33;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5132,25 +5314,143 @@ yy372:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy373;
-                       case 'V':
-                       case 'v':       goto yy433;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy398;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy373:
-#line 397 "src/parser.re"
-                       { NEWTOKEN(PSI_T_FLOAT); goto start; }
-#line 5145 "src/parser.c"
-yy374:
+yy398:
+#line 412 "src/parser.re"
+                       { NEWTOKEN(PSI_T_MIXED); goto start; }
+#line 5325 "src/parser.c"
+yy399:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy460;
+                       default:        goto yy62;
+                       }
+yy400:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy462;
+                       default:        goto yy62;
+                       }
+yy401:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy464;
+                       default:        goto yy62;
+                       }
+yy402:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy465;
+                       default:        goto yy62;
+                       }
+yy403:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'S':
+                       case 's':       goto yy466;
+                       default:        goto yy62;
+                       }
+yy404:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy467;
+                       default:        goto yy62;
+                       }
+yy405:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'C':
+                       case 'c':       goto yy469;
+                       default:        goto yy62;
+                       }
+yy406:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'G':
+                       case 'g':       goto yy471;
+                       default:        goto yy62;
+                       }
+yy407:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy473;
+                       default:        goto yy62;
+                       }
+yy408:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy475;
+                       default:        goto yy62;
+                       }
+yy409:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy477;
+                       default:        goto yy62;
+                       }
+yy410:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy434;
+                       case 'O':
+                       case 'o':       goto yy478;
                        default:        goto yy62;
                        }
-yy375:
+yy411:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'O':
+                       case 'o':       goto yy479;
+                       default:        goto yy62;
+                       }
+yy412:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy480;
+                       default:        goto yy62;
+                       }
+yy413:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'J':
+                       case 'j':       goto yy482;
+                       default:        goto yy62;
+                       }
+yy414:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy483;
+                       default:        goto yy62;
+                       }
+yy415:
                        yyaccept = 34;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5217,68 +5517,51 @@ yy375:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy376;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy416;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy376:
-#line 374 "src/parser.re"
-                       { NEWTOKEN(PSI_T_IFDEF); goto start; }
-#line 5228 "src/parser.c"
-yy377:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'F':
-                       case 'f':       goto yy435;
-                       default:        goto yy62;
-                       }
-yy378:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy437;
-                       default:        goto yy62;
-                       }
-yy379:
+yy416:
+#line 404 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNDEF); goto start; }
+#line 5528 "src/parser.c"
+yy417:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy438;
+                       case 'N':
+                       case 'n':       goto yy484;
                        default:        goto yy62;
                        }
-yy380:
+yy418:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy439;
+                       case '_':       goto yy485;
                        default:        goto yy62;
                        }
-yy381:
+yy419:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy440;
+                       case 'r':       goto yy486;
                        default:        goto yy62;
                        }
-yy382:
+yy420:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy441;
+                       case 'e':       goto yy487;
                        default:        goto yy62;
                        }
-yy383:
+yy421:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy443;
+                       case 't':       goto yy488;
                        default:        goto yy62;
                        }
-yy384:
+yy422:
                        yyaccept = 35;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5345,63 +5628,22 @@ yy384:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy385;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy423;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy385:
-#line 389 "src/parser.re"
-                       { NEWTOKEN(PSI_T_MIXED); goto start; }
-#line 5356 "src/parser.c"
-yy386:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy445;
-                       default:        goto yy62;
-                       }
-yy387:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy447;
-                       default:        goto yy62;
-                       }
-yy388:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy449;
-                       default:        goto yy62;
-                       }
-yy389:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy450;
-                       default:        goto yy62;
-                       }
-yy390:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'S':
-                       case 's':       goto yy451;
-                       default:        goto yy62;
-                       }
-yy391:
+yy423:
+#line 377 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CONST); goto start; }
+#line 5639 "src/parser.c"
+yy424:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy452;
+                       case 'e':       goto yy489;
                        default:        goto yy62;
                        }
-yy392:
+yy425:
                        yyaccept = 36;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5468,147 +5710,52 @@ yy392:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy393;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy426;
+                       case 'V':
+                       case 'v':       goto yy453;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy393:
-#line 394 "src/parser.re"
-                       { NEWTOKEN(PSI_T_SHORT); goto start; }
-#line 5479 "src/parser.c"
-yy394:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy454;
-                       default:        goto yy62;
-                       }
-yy395:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy456;
-                       default:        goto yy62;
-                       }
-yy396:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy458;
-                       default:        goto yy62;
-                       }
-yy397:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy460;
-                       default:        goto yy62;
-                       }
-yy398:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy462;
-                       default:        goto yy62;
-                       }
-yy399:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy464;
-                       default:        goto yy62;
-                       }
-yy400:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy466;
-                       default:        goto yy62;
-                       }
-yy401:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy467;
-                       default:        goto yy62;
-                       }
-yy402:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy468;
-                       default:        goto yy62;
-                       }
-yy403:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy469;
-                       default:        goto yy62;
-                       }
-yy404:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'J':
-                       case 'j':       goto yy471;
-                       default:        goto yy62;
-                       }
-yy405:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy472;
-                       default:        goto yy62;
-                       }
-yy406:
+yy426:
+#line 384 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FLOAT); goto start; }
+#line 5723 "src/parser.c"
+yy427:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy473;
+                       case '_':       goto yy491;
                        default:        goto yy62;
                        }
-yy407:
+yy428:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '6':       goto yy474;
+                       case '_':       goto yy492;
                        default:        goto yy62;
                        }
-yy408:
+yy429:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '2':       goto yy475;
+                       case '_':       goto yy493;
                        default:        goto yy62;
                        }
-yy409:
+yy430:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '4':       goto yy476;
+                       case 't':       goto yy494;
                        default:        goto yy62;
                        }
-yy410:
+yy431:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy477;
+                       case 'a':       goto yy496;
                        default:        goto yy62;
                        }
-yy411:
+yy432:
                        yyaccept = 37;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5675,15 +5822,64 @@ yy411:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy412;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy433;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy412:
-#line 381 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UNDEF); goto start; }
-#line 5686 "src/parser.c"
-yy413:
+yy433:
+#line 381 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SHORT); goto start; }
+#line 5833 "src/parser.c"
+yy434:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'd':       goto yy498;
+                       default:        goto yy62;
+                       }
+yy435:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy500;
+                       default:        goto yy62;
+                       }
+yy436:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy502;
+                       default:        goto yy62;
+                       }
+yy437:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '6':       goto yy503;
+                       default:        goto yy62;
+                       }
+yy438:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '2':       goto yy504;
+                       default:        goto yy62;
+                       }
+yy439:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '4':       goto yy505;
+                       default:        goto yy62;
+                       }
+yy440:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy506;
+                       default:        goto yy62;
+                       }
+yy441:
                        yyaccept = 38;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5750,66 +5946,22 @@ yy413:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy414;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy442;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy414:
-#line 417 "src/parser.re"
+yy442:
+#line 375 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNION); goto start; }
-#line 5761 "src/parser.c"
-yy415:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy478;
-                       default:        goto yy62;
-                       }
-yy416:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy479;
-                       default:        goto yy62;
-                       }
-yy417:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy480;
-                       default:        goto yy62;
-                       }
-yy418:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'r':       goto yy481;
-                       default:        goto yy62;
-                       }
-yy419:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'e':       goto yy482;
-                       default:        goto yy62;
-                       }
-yy420:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy483;
-                       default:        goto yy62;
-                       }
-yy421:
+#line 5957 "src/parser.c"
+yy443:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy484;
+                       case 'n':       goto yy507;
                        default:        goto yy62;
                        }
-yy422:
+yy444:
                        yyaccept = 39;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5876,39 +6028,39 @@ yy422:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy423;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy445;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy423:
+yy445:
 #line 434 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRVAL); goto start; }
-#line 5887 "src/parser.c"
-yy424:
+#line 6039 "src/parser.c"
+yy446:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy486;
+                       case 'l':       goto yy508;
                        default:        goto yy62;
                        }
-yy425:
+yy447:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy488;
+                       case 'l':       goto yy510;
                        default:        goto yy62;
                        }
-yy426:
+yy448:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy489;
+                       case 'c':       goto yy511;
                        default:        goto yy62;
                        }
-yy427:
+yy449:
                        yyaccept = 40;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5975,15 +6127,15 @@ yy427:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy428;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy450;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy428:
+yy450:
 #line 438 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLOC); goto start; }
-#line 5986 "src/parser.c"
-yy429:
+#line 6138 "src/parser.c"
+yy451:
                        yyaccept = 41;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6050,17 +6202,33 @@ yy429:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy430;
+                       case 0x7F:      goto yy452;
                        case 'D':
-                       case 'd':       goto yy490;
-                       case '\\':      goto yy138;
+                       case 'd':       goto yy512;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy430:
-#line 379 "src/parser.re"
+yy452:
+#line 402 "src/parser.re"
                        { NEWTOKEN(PSI_T_DEFINE); goto start; }
-#line 6063 "src/parser.c"
-yy431:
+#line 6215 "src/parser.c"
+yy453:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy514;
+                       default:        goto yy62;
+                       }
+yy454:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'O':
+                       case 'o':       goto yy515;
+                       default:        goto yy62;
+                       }
+yy455:
                        yyaccept = 42;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6127,31 +6295,23 @@ yy431:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy432;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy456;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy432:
+yy456:
 #line 398 "src/parser.re"
-                       { NEWTOKEN(PSI_T_DOUBLE); goto start; }
-#line 6138 "src/parser.c"
-yy433:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy492;
-                       default:        goto yy62;
-                       }
-yy434:
+                       { NEWTOKEN(PSI_T_IFNDEF); goto start; }
+#line 6306 "src/parser.c"
+yy457:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy493;
+                       case 'E':
+                       case 'e':       goto yy516;
                        default:        goto yy62;
                        }
-yy435:
+yy458:
                        yyaccept = 43;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6218,47 +6378,15 @@ yy435:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy436;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy459;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy436:
-#line 375 "src/parser.re"
-                       { NEWTOKEN(PSI_T_IFNDEF); goto start; }
-#line 6229 "src/parser.c"
-yy437:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy494;
-                       default:        goto yy62;
-                       }
-yy438:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy496;
-                       default:        goto yy62;
-                       }
-yy439:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy498;
-                       default:        goto yy62;
-                       }
-yy440:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy500;
-                       default:        goto yy62;
-                       }
-yy441:
+yy459:
+#line 431 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INTVAL); goto start; }
+#line 6389 "src/parser.c"
+yy460:
                        yyaccept = 44;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6325,15 +6453,15 @@ yy441:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy442;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy461;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy442:
-#line 399 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT8); goto start; }
-#line 6336 "src/parser.c"
-yy443:
+yy461:
+#line 416 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OBJECT); goto start; }
+#line 6464 "src/parser.c"
+yy462:
                        yyaccept = 45;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6400,15 +6528,39 @@ yy443:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy444;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy463;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy444:
-#line 431 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INTVAL); goto start; }
-#line 6411 "src/parser.c"
-yy445:
+yy463:
+#line 435 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OBJVAL); goto start; }
+#line 6539 "src/parser.c"
+yy464:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy518;
+                       default:        goto yy62;
+                       }
+yy465:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'S':
+                       case 's':       goto yy520;
+                       default:        goto yy62;
+                       }
+yy466:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'S':
+                       case 's':       goto yy521;
+                       default:        goto yy62;
+                       }
+yy467:
                        yyaccept = 46;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6475,15 +6627,15 @@ yy445:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy446;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy468;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy446:
-#line 411 "src/parser.re"
-                       { NEWTOKEN(PSI_T_OBJECT); goto start; }
-#line 6486 "src/parser.c"
-yy447:
+yy468:
+#line 425 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RETURN); goto start; }
+#line 6638 "src/parser.c"
+yy469:
                        yyaccept = 47;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6550,39 +6702,15 @@ yy447:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy448;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy470;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy448:
-#line 435 "src/parser.re"
-                       { NEWTOKEN(PSI_T_OBJVAL); goto start; }
-#line 6561 "src/parser.c"
-yy449:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy502;
-                       default:        goto yy62;
-                       }
-yy450:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'S':
-                       case 's':       goto yy504;
-                       default:        goto yy62;
-                       }
-yy451:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'S':
-                       case 's':       goto yy505;
-                       default:        goto yy62;
-                       }
-yy452:
+yy470:
+#line 418 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STATIC); goto start; }
+#line 6713 "src/parser.c"
+yy471:
                        yyaccept = 48;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6649,15 +6777,15 @@ yy452:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy453;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy472;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy453:
-#line 425 "src/parser.re"
-                       { NEWTOKEN(PSI_T_RETURN); goto start; }
-#line 6660 "src/parser.c"
-yy454:
+yy472:
+#line 414 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRING); goto start; }
+#line 6788 "src/parser.c"
+yy473:
                        yyaccept = 49;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6724,15 +6852,15 @@ yy454:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy455;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy474;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy455:
-#line 408 "src/parser.re"
-                       { NEWTOKEN(PSI_T_SIGNED); goto start; }
-#line 6735 "src/parser.c"
-yy456:
+yy474:
+#line 428 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRLEN); goto start; }
+#line 6863 "src/parser.c"
+yy475:
                        yyaccept = 50;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6799,15 +6927,39 @@ yy456:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy457;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy476;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy457:
-#line 413 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STATIC); goto start; }
-#line 6810 "src/parser.c"
-yy458:
+yy476:
+#line 429 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRVAL); goto start; }
+#line 6938 "src/parser.c"
+yy477:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy522;
+                       default:        goto yy62;
+                       }
+yy478:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy523;
+                       default:        goto yy62;
+                       }
+yy479:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy525;
+                       default:        goto yy62;
+                       }
+yy480:
                        yyaccept = 51;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6874,15 +7026,67 @@ yy458:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy459;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy481;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy459:
-#line 409 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STRING); goto start; }
-#line 6885 "src/parser.c"
-yy460:
+yy481:
+#line 442 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_INT); goto start; }
+#line 7037 "src/parser.c"
+yy482:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy526;
+                       default:        goto yy62;
+                       }
+yy483:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy527;
+                       default:        goto yy62;
+                       }
+yy484:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'G':
+                       case 'g':       goto yy528;
+                       default:        goto yy62;
+                       }
+yy485:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy530;
+                       default:        goto yy62;
+                       }
+yy486:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy532;
+                       default:        goto yy62;
+                       }
+yy487:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy533;
+                       default:        goto yy62;
+                       }
+yy488:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'r':       goto yy534;
+                       default:        goto yy62;
+                       }
+yy489:
                        yyaccept = 52;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6949,15 +7153,36 @@ yy460:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy461;
-                       case '\\':      goto yy138;
+                       case 0x7F:      goto yy490;
+                       case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy461:
-#line 428 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STRLEN); goto start; }
-#line 6960 "src/parser.c"
-yy462:
+yy490:
+#line 385 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DOUBLE); goto start; }
+#line 7164 "src/parser.c"
+yy491:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy535;
+                       default:        goto yy62;
+                       }
+yy492:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy537;
+                       default:        goto yy62;
+                       }
+yy493:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy539;
+                       default:        goto yy62;
+                       }
+yy494:
      &