just predefine stdc inttypes
authorMichael Wallner <mike@php.net>
Fri, 8 Sep 2017 13:16:10 +0000 (15:16 +0200)
committerMichael Wallner <mike@php.net>
Fri, 8 Sep 2017 13:16:10 +0000 (15:16 +0200)
16 files changed:
m4/posix/stdint.m4
m4/psi/psi_type.m4
src/context.c
src/libffi.c
src/libjit.c
src/marshal.c
src/module.c
src/parser.c
src/parser.re
src/parser_proc.c
src/parser_proc.h
src/parser_proc_grammar.y
src/token.h
src/types/decl.c
src/types/decl.h
src/types/impl_val.h

index c21c129..8ab9112 100644 (file)
@@ -1,6 +1,14 @@
 PSI_CHECK_STDINT() {
        AC_CHECK_HEADERS(stdint.h)
 
+       PSI_TYPE(int8_t, sint)
+       PSI_TYPE(uint8_t, uint)
+       PSI_TYPE(int16_t, sint)
+       PSI_TYPE(uint16_t, uint)
+       PSI_TYPE(int32_t, sint)
+       PSI_TYPE(uint32_t, uint)
+       PSI_TYPE(int64_t, sint)
+       PSI_TYPE(uint64_t, uint)
        PSI_TYPE(int_least8_t, sint)
        PSI_TYPE(int_least16_t, sint)
        PSI_TYPE(int_least32_t, sint)
index b3940a4..8dad633 100644 (file)
@@ -193,34 +193,9 @@ AC_DEFUN(PSI_TYPE_PAIR, [m4_case(m4_bregexp([$1], [^\w+], [\&]),
 dnl PSI_CHECK_STD_TYPES()
 dnl Checks for standard ANSI-C, stdint and stdbool types.
 AC_DEFUN(PSI_CHECK_STD_TYPES, [
-       AC_CHECK_HEADERS(stdint.h)
+       
        AC_HEADER_STDBOOL
 
-       AC_TYPE_INT8_T
-       PSI_CHECK_SIZEOF(int8_t)
-       AC_CHECK_ALIGNOF(int8_t)
-       AC_TYPE_UINT8_T
-       PSI_CHECK_SIZEOF(uint8_t)
-       AC_CHECK_ALIGNOF(uint8_t)
-       AC_TYPE_INT16_T
-       PSI_CHECK_SIZEOF(int16_t)
-       AC_CHECK_ALIGNOF(int16_t)
-       AC_TYPE_UINT16_T
-       PSI_CHECK_SIZEOF(uint16_t)
-       AC_CHECK_ALIGNOF(uint16_t)
-       AC_TYPE_INT32_T
-       PSI_CHECK_SIZEOF(int32_t)
-       AC_CHECK_ALIGNOF(int32_t)
-       AC_TYPE_UINT32_T
-       PSI_CHECK_SIZEOF(uint32_t)
-       AC_CHECK_ALIGNOF(uint32_t)
-       AC_TYPE_INT64_T
-       PSI_CHECK_SIZEOF(int64_t)
-       AC_CHECK_ALIGNOF(int64_t)
-       AC_TYPE_UINT64_T
-       PSI_CHECK_SIZEOF(uint64_t)
-       AC_CHECK_ALIGNOF(uint64_t)
-
        PSI_CHECK_SIZEOF(void *)
        AC_CHECK_ALIGNOF(void *)
 
index 73422be..5749a73 100644 (file)
@@ -89,6 +89,11 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
        memset(&T, 0, sizeof(T));
        psi_data_ctor_with_dtors(&T, error, flags);
 
+#if PHP_DEBUG
+       if (psi_check_env("PSI_SKIP"))
+               goto skip_predefs;
+#endif
+
        for (predef_type = &psi_predef_types[0]; predef_type->type_tag; ++predef_type) {
                struct psi_decl_type *type = psi_decl_type_init(predef_type->type_tag, predef_type->type_name);
                struct psi_decl_var *var = psi_decl_var_init(predef_type->alias, 0, 0); /* FIXME: indirection */
@@ -104,7 +109,7 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
                switch (type->type) {
                case PSI_T_INT:
                        val = psi_impl_def_val_init(PSI_T_INT, NULL);
-                       val->ival.zend.lval = predef_const->value.lval;
+                       val->ival.zend.lval = predef_const->value.zend.lval;
                        break;
                case PSI_T_STRING:
                        val = psi_impl_def_val_init(PSI_T_STRING, NULL);
@@ -207,6 +212,10 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
                predef_decl = farg;
        }
 
+#if PHP_DEBUG
+       skip_predefs:
+#endif
+
        psi_context_add_data(C, &T);
 
        return C;
index 2ba4831..1569693 100644 (file)
@@ -132,11 +132,8 @@ static inline ffi_type *psi_ffi_token_type(token_t t) {
                return &ffi_type_uint64;
        case PSI_T_BOOL:
                return &ffi_type_uchar;
-       case PSI_T_INT:
        case PSI_T_ENUM:
                return &ffi_type_sint;
-       case PSI_T_LONG:
-               return &ffi_type_slong;
        case PSI_T_FLOAT:
                return &ffi_type_float;
        case PSI_T_DOUBLE:
index 7c48191..ceafb31 100644 (file)
@@ -60,11 +60,8 @@ static inline jit_type_t psi_jit_token_type(token_t t)
                return jit_type_ulong;
        case PSI_T_BOOL:
                return jit_type_sys_bool;
-       case PSI_T_INT:
        case PSI_T_ENUM:
                return jit_type_sys_int;
-       case PSI_T_LONG:
-               return jit_type_sys_long;
        case PSI_T_FLOAT:
                return jit_type_sys_float;
        case PSI_T_DOUBLE:
index 805f12d..959291a 100644 (file)
@@ -273,13 +273,11 @@ static inline impl_val *psi_val_intval(impl_val *tmp, token_t real_type, zend_lo
        case PSI_T_UINT8:               tmp->u8 = intval;               break;
        case PSI_T_INT16:               tmp->i16 = intval;              break;
        case PSI_T_UINT16:              tmp->u16 = intval;              break;
+       case PSI_T_ENUM:
        case PSI_T_INT32:               tmp->i32 = intval;              break;
        case PSI_T_UINT32:              tmp->u32 = intval;              break;
        case PSI_T_INT64:               tmp->i64 = intval;              break;
        case PSI_T_UINT64:              tmp->u64 = intval;              break;
-       case PSI_T_ENUM:
-       case PSI_T_INT:                 tmp->ival = intval;             break;
-       case PSI_T_LONG:                tmp->lval = intval;             break;
        case PSI_T_FLOAT:               tmp->fval = intval;             break;
        case PSI_T_DOUBLE:              tmp->dval = intval;             break;
 #ifdef HAVE_LONG_DOUBLE
@@ -455,16 +453,19 @@ impl_val *psi_let_strlen(impl_val *tmp, struct psi_decl_arg *spec, token_t impl_
 {
        if (ival && impl_type == PSI_T_STRING) {
                if (ival->zend.str) {
-                       tmp->lval = ival->zend.str->len;
+                       tmp->u64 = ival->zend.str->len;
                } else {
-                       tmp->lval = 0;
+                       tmp->u64 = 0;
                }
        } else {
                zend_string *zs = zval_get_string(zvalue);
-               tmp->lval = zs->len;
+               tmp->u64 = zs->len;
                zend_string_release(zs);
        }
 
+       if (spec) {
+               psi_calc_cast(PSI_T_UINT64, tmp, psi_decl_type_get_real(spec->type)->type, tmp);
+       }
        return tmp;
 }
 
index 3cd45f9..0c8b3b3 100644 (file)
@@ -317,6 +317,8 @@ static PHP_GINIT_FUNCTION(psi)
        *bl_decls = psi_plist_add(*bl_decls, &tmp)
 
        BL_DECL_ADD("dlsym");
+       BL_DECL_ADD("alloca");
+       BL_DECL_ADD("atexit");
        BL_DECL_ADD("_IO_cookie_init");
 }
 
index 74cfe6c..ace7900 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.0.2 on Thu Sep  7 14:09:09 2017 */
+/* Generated by re2c 1.0.2 on Fri Sep  8 10:30:56 2017 */
 #line 1 "src/parser.re"
 /*******************************************************************************
  Copyright (c) 2016, Michael Wallner <mike@php.net>.
@@ -404,7 +404,7 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
 yy2:
                        ++cur;
 yy3:
-#line 455 "src/parser.re"
+#line 447 "src/parser.re"
                        { NEWTOKEN(-2); goto error; }
 #line 410 "src/parser.c"
 yy4:
@@ -418,12 +418,12 @@ yy4:
                        default:        goto yy6;
                        }
 yy6:
-#line 454 "src/parser.re"
+#line 446 "src/parser.re"
                        { NEWTOKEN(PSI_T_WHITESPACE); goto start; }
 #line 424 "src/parser.c"
 yy7:
                        ++cur;
-#line 453 "src/parser.re"
+#line 445 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
 #line 429 "src/parser.c"
 yy9:
@@ -798,7 +798,7 @@ yy54:
                        default:        goto yy62;
                        }
 yy55:
-#line 448 "src/parser.re"
+#line 440 "src/parser.re"
                        { NEWTOKEN(PSI_T_NAME); goto start; }
 #line 804 "src/parser.c"
 yy56:
@@ -1267,52 +1267,51 @@ yy94:
                        case '\'':      goto yy200;
                        case '8':       goto yy202;
                        case 'N':       goto yy179;
-                       case 'i':       goto yy203;
-                       case 'n':       goto yy204;
+                       case 'n':       goto yy203;
                        default:        goto yy62;
                        }
 yy95:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy205;
+                       case 'o':       goto yy204;
                        default:        goto yy62;
                        }
 yy96:
                        ++cur;
 #line 338 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACE); goto start; }
-#line 1286 "src/parser.c"
+#line 1285 "src/parser.c"
 yy98:
                        yych = *++cur;
                        switch (yych) {
-                       case '|':       goto yy206;
+                       case '|':       goto yy205;
                        default:        goto yy99;
                        }
 yy99:
 #line 356 "src/parser.re"
                        { NEWTOKEN(PSI_T_PIPE); goto start; }
-#line 1296 "src/parser.c"
+#line 1295 "src/parser.c"
 yy100:
                        ++cur;
 #line 339 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACE); goto start; }
-#line 1301 "src/parser.c"
+#line 1300 "src/parser.c"
 yy102:
                        ++cur;
 #line 348 "src/parser.re"
                        { NEWTOKEN(PSI_T_TILDE); goto start; }
-#line 1306 "src/parser.c"
+#line 1305 "src/parser.c"
 yy104:
                        ++cur;
 #line 342 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_NE); goto start; }
-#line 1311 "src/parser.c"
+#line 1310 "src/parser.c"
 yy106:
                        ++cur;
 #line 331 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_PASTE); goto start; }
-#line 1316 "src/parser.c"
+#line 1315 "src/parser.c"
 yy108:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -1386,14 +1385,14 @@ yy108:
                        default:        goto yy108;
                        }
 yy110:
-#line 450 "src/parser.re"
+#line 442 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; }
-#line 1392 "src/parser.c"
+#line 1391 "src/parser.c"
 yy111:
                        ++cur;
 #line 344 "src/parser.re"
                        { NEWTOKEN(PSI_T_AND); goto start; }
-#line 1397 "src/parser.c"
+#line 1396 "src/parser.c"
 yy113:
                        yych = *++cur;
                        switch (yych) {
@@ -1422,91 +1421,83 @@ yy114:
                        case 7:         goto yy129;
                        case 8:         goto yy159;
                        case 9:         goto yy184;
-                       case 10:        goto yy241;
-                       case 11:        goto yy243;
-                       case 12:        goto yy252;
-                       case 13:        goto yy272;
-                       case 14:        goto yy305;
-                       case 15:        goto yy307;
-                       case 16:        goto yy313;
-                       case 17:        goto yy321;
-                       case 18:        goto yy333;
-                       case 19:        goto yy341;
-                       case 20:        goto yy345;
-                       case 21:        goto yy352;
-                       case 22:        goto yy354;
-                       case 23:        goto yy358;
-                       case 24:        goto yy365;
-                       case 25:        goto yy367;
-                       case 26:        goto yy378;
-                       case 27:        goto yy381;
-                       case 28:        goto yy388;
-                       case 29:        goto yy391;
-                       case 30:        goto yy393;
-                       case 31:        goto yy395;
-                       case 32:        goto yy399;
-                       case 33:        goto yy404;
-                       case 34:        goto yy422;
-                       case 35:        goto yy430;
-                       case 36:        goto yy433;
-                       case 37:        goto yy440;
-                       case 38:        goto yy450;
-                       case 39:        goto yy454;
-                       case 40:        goto yy459;
-                       case 41:        goto yy461;
-                       case 42:        goto yy465;
-                       case 43:        goto yy468;
-                       case 44:        goto yy470;
-                       case 45:        goto yy472;
-                       case 46:        goto yy477;
-                       case 47:        goto yy479;
-                       case 48:        goto yy481;
-                       case 49:        goto yy483;
-                       case 50:        goto yy485;
-                       case 51:        goto yy490;
-                       case 52:        goto yy500;
-                       case 53:        goto yy505;
-                       case 54:        goto yy507;
-                       case 55:        goto yy509;
-                       case 56:        goto yy511;
-                       case 57:        goto yy513;
-                       case 58:        goto yy522;
-                       case 59:        goto yy526;
-                       case 60:        goto yy530;
-                       case 61:        goto yy532;
-                       case 62:        goto yy537;
-                       case 63:        goto yy542;
-                       case 64:        goto yy544;
-                       case 65:        goto yy550;
-                       case 66:        goto yy552;
-                       case 67:        goto yy554;
-                       case 68:        goto yy558;
-                       case 69:        goto yy563;
-                       case 70:        goto yy567;
-                       case 71:        goto yy569;
-                       case 72:        goto yy571;
-                       case 73:        goto yy573;
-                       case 74:        goto yy578;
-                       case 75:        goto yy580;
-                       case 76:        goto yy586;
-                       case 77:        goto yy591;
-                       case 78:        goto yy593;
-                       case 79:        goto yy595;
-                       case 80:        goto yy597;
-                       case 81:        goto yy599;
-                       case 82:        goto yy604;
-                       case 83:        goto yy606;
-                       case 84:        goto yy614;
-                       case 85:        goto yy618;
-                       case 86:        goto yy622;
-                       case 87:        goto yy626;
-                       case 88:        goto yy628;
-                       default:        goto yy633;
+                       case 10:        goto yy240;
+                       case 11:        goto yy242;
+                       case 12:        goto yy251;
+                       case 13:        goto yy271;
+                       case 14:        goto yy303;
+                       case 15:        goto yy305;
+                       case 16:        goto yy311;
+                       case 17:        goto yy319;
+                       case 18:        goto yy331;
+                       case 19:        goto yy339;
+                       case 20:        goto yy343;
+                       case 21:        goto yy350;
+                       case 22:        goto yy352;
+                       case 23:        goto yy356;
+                       case 24:        goto yy359;
+                       case 25:        goto yy361;
+                       case 26:        goto yy371;
+                       case 27:        goto yy374;
+                       case 28:        goto yy381;
+                       case 29:        goto yy384;
+                       case 30:        goto yy386;
+                       case 31:        goto yy388;
+                       case 32:        goto yy392;
+                       case 33:        goto yy397;
+                       case 34:        goto yy415;
+                       case 35:        goto yy423;
+                       case 36:        goto yy426;
+                       case 37:        goto yy429;
+                       case 38:        goto yy435;
+                       case 39:        goto yy439;
+                       case 40:        goto yy444;
+                       case 41:        goto yy446;
+                       case 42:        goto yy450;
+                       case 43:        goto yy453;
+                       case 44:        goto yy455;
+                       case 45:        goto yy457;
+                       case 46:        goto yy462;
+                       case 47:        goto yy464;
+                       case 48:        goto yy466;
+                       case 49:        goto yy468;
+                       case 50:        goto yy470;
+                       case 51:        goto yy475;
+                       case 52:        goto yy485;
+                       case 53:        goto yy487;
+                       case 54:        goto yy489;
+                       case 55:        goto yy491;
+                       case 56:        goto yy493;
+                       case 57:        goto yy498;
+                       case 58:        goto yy502;
+                       case 59:        goto yy506;
+                       case 60:        goto yy508;
+                       case 61:        goto yy513;
+                       case 62:        goto yy518;
+                       case 63:        goto yy520;
+                       case 64:        goto yy528;
+                       case 65:        goto yy532;
+                       case 66:        goto yy534;
+                       case 67:        goto yy536;
+                       case 68:        goto yy538;
+                       case 69:        goto yy543;
+                       case 70:        goto yy545;
+                       case 71:        goto yy551;
+                       case 72:        goto yy556;
+                       case 73:        goto yy558;
+                       case 74:        goto yy563;
+                       case 75:        goto yy565;
+                       case 76:        goto yy573;
+                       case 77:        goto yy577;
+                       case 78:        goto yy581;
+                       case 79:        goto yy585;
+                       case 80:        goto yy587;
+                       default:        goto yy592;
                        }
 yy115:
                        yych = *++cur;
                        switch (yych) {
-                       case '.':       goto yy208;
+                       case '.':       goto yy207;
                        default:        goto yy114;
                        }
 yy116:
@@ -1526,27 +1517,27 @@ yy116:
                        case '8':
                        case '9':       goto yy116;
                        case 'D':
-                       case 'd':       goto yy210;
+                       case 'd':       goto yy209;
                        case 'F':
-                       case 'f':       goto yy211;
+                       case 'f':       goto yy210;
                        case 'L':
-                       case 'l':       goto yy213;
+                       case 'l':       goto yy212;
                        default:        goto yy118;
                        }
 yy118:
 #line 314 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT; goto start; }
-#line 1540 "src/parser.c"
+#line 1531 "src/parser.c"
 yy119:
                        ++cur;
 #line 328 "src/parser.re"
                        { goto comment; }
-#line 1545 "src/parser.c"
+#line 1536 "src/parser.c"
 yy121:
                        ++cur;
 #line 329 "src/parser.re"
                        { goto comment_sl; }
-#line 1550 "src/parser.c"
+#line 1541 "src/parser.c"
 yy123:
                        yyaccept = 6;
                        mrk = ++cur;
@@ -1564,13 +1555,13 @@ yy123:
                        case '8':
                        case '9':       goto yy123;
                        case 'D':
-                       case 'd':       goto yy210;
+                       case 'd':       goto yy209;
                        case 'E':
                        case 'e':       goto yy127;
                        case 'F':
-                       case 'f':       goto yy211;
+                       case 'f':       goto yy210;
                        case 'L':
-                       case 'l':       goto yy213;
+                       case 'l':       goto yy212;
                        default:        goto yy118;
                        }
 yy125:
@@ -1615,28 +1606,28 @@ yy128:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy215;
+                       case 'l':       goto yy214;
                        case 'U':
-                       case 'u':       goto yy216;
+                       case 'u':       goto yy215;
                        default:        goto yy129;
                        }
 yy129:
                        cur -= 1;
 #line 310 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 1628 "src/parser.c"
+#line 1619 "src/parser.c"
 yy130:
                        yych = *++cur;
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy218;
+                       case 'l':       goto yy217;
                        default:        goto yy131;
                        }
 yy131:
                        cur -= 1;
 #line 309 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_U; cur += 1; goto start; }
-#line 1640 "src/parser.c"
+#line 1631 "src/parser.c"
 yy132:
                        yych = *++cur;
                        switch (yych) {
@@ -1661,7 +1652,7 @@ yy132:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy219;
+                       case 'f':       goto yy218;
                        default:        goto yy114;
                        }
 yy133:
@@ -1735,40 +1726,40 @@ yy133:
                        case 'x':
                        case 'y':
                        case 'z':       goto yy133;
-                       case '>':       goto yy221;
+                       case '>':       goto yy220;
                        default:        goto yy114;
                        }
 yy135:
                        ++cur;
 #line 358 "src/parser.re"
                        { NEWTOKEN(PSI_T_LSHIFT); goto start; }
-#line 1746 "src/parser.c"
+#line 1737 "src/parser.c"
 yy137:
                        ++cur;
 #line 360 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_LE); goto start; }
-#line 1751 "src/parser.c"
+#line 1742 "src/parser.c"
 yy139:
                        ++cur;
 #line 343 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_EQ); goto start; }
-#line 1756 "src/parser.c"
+#line 1747 "src/parser.c"
 yy141:
                        ++cur;
 #line 361 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_GE); goto start; }
-#line 1761 "src/parser.c"
+#line 1752 "src/parser.c"
 yy143:
                        ++cur;
 #line 359 "src/parser.re"
                        { NEWTOKEN(PSI_T_RSHIFT); goto start; }
-#line 1766 "src/parser.c"
+#line 1757 "src/parser.c"
 yy145:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy223;
+                       case 'r':       goto yy222;
                        default:        goto yy62;
                        }
 yy146:
@@ -1858,7 +1849,7 @@ yy147:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy224;
+                       case 'o':       goto yy223;
                        default:        goto yy62;
                        }
 yy148:
@@ -1866,7 +1857,7 @@ yy148:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy225;
+                       case 'l':       goto yy224;
                        default:        goto yy62;
                        }
 yy149:
@@ -1874,7 +1865,7 @@ yy149:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy226;
+                       case 'u':       goto yy225;
                        default:        goto yy62;
                        }
 yy150:
@@ -1882,7 +1873,7 @@ yy150:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy227;
+                       case 'f':       goto yy226;
                        default:        goto yy62;
                        }
 yy151:
@@ -1890,9 +1881,9 @@ yy151:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy228;
+                       case 'i':       goto yy227;
                        case 'S':
-                       case 's':       goto yy229;
+                       case 's':       goto yy228;
                        default:        goto yy62;
                        }
 yy152:
@@ -1900,7 +1891,7 @@ yy152:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy230;
+                       case 'd':       goto yy229;
                        default:        goto yy62;
                        }
 yy153:
@@ -1908,7 +1899,7 @@ yy153:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy231;
+                       case 'r':       goto yy230;
                        default:        goto yy62;
                        }
 yy154:
@@ -1916,7 +1907,7 @@ yy154:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy232;
+                       case 'l':       goto yy231;
                        default:        goto yy62;
                        }
 yy155:
@@ -1924,7 +1915,7 @@ yy155:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy233;
+                       case 'o':       goto yy232;
                        default:        goto yy62;
                        }
 yy156:
@@ -1932,7 +1923,7 @@ yy156:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy234;
+                       case 'e':       goto yy233;
                        default:        goto yy62;
                        }
 yy157:
@@ -1940,7 +1931,7 @@ yy157:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy235;
+                       case 'n':       goto yy234;
                        default:        goto yy62;
                        }
 yy158:
@@ -2012,24 +2003,24 @@ yy158:
                        case '~':
                        case 0x7F:      goto yy159;
                        case 'D':
-                       case 'd':       goto yy236;
+                       case 'd':       goto yy235;
                        case 'N':
-                       case 'n':       goto yy237;
+                       case 'n':       goto yy236;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
 yy159:
-#line 399 "src/parser.re"
+#line 391 "src/parser.re"
                        { NEWTOKEN(PSI_T_IF); goto start; }
-#line 2025 "src/parser.c"
+#line 2016 "src/parser.c"
 yy160:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy238;
+                       case 'c':       goto yy237;
                        case 'T':
-                       case 't':       goto yy239;
+                       case 't':       goto yy238;
                        default:        goto yy62;
                        }
 yy161:
@@ -2037,13 +2028,13 @@ yy161:
                        cur -= 1;
 #line 326 "src/parser.re"
                        { char_width = SIZEOF_WCHAR_T/8; }
-#line 2041 "src/parser.c"
+#line 2032 "src/parser.c"
 yy163:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy240;
+                       case 't':       goto yy239;
                        default:        goto yy62;
                        }
 yy164:
@@ -2051,7 +2042,7 @@ yy164:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy242;
+                       case 'b':       goto yy241;
                        default:        goto yy62;
                        }
 yy165:
@@ -2059,7 +2050,7 @@ yy165:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'X':
-                       case 'x':       goto yy244;
+                       case 'x':       goto yy243;
                        default:        goto yy62;
                        }
 yy166:
@@ -2067,7 +2058,7 @@ yy166:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy245;
+                       case 'l':       goto yy244;
                        default:        goto yy62;
                        }
 yy167:
@@ -2075,7 +2066,7 @@ yy167:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy246;
+                       case 'j':       goto yy245;
                        default:        goto yy62;
                        }
 yy168:
@@ -2083,7 +2074,7 @@ yy168:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy247;
+                       case 't':       goto yy246;
                        default:        goto yy62;
                        }
 yy169:
@@ -2091,7 +2082,7 @@ yy169:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy248;
+                       case 's':       goto yy247;
                        default:        goto yy62;
                        }
 yy170:
@@ -2099,7 +2090,7 @@ yy170:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy249;
+                       case 'e':       goto yy248;
                        default:        goto yy62;
                        }
 yy171:
@@ -2107,7 +2098,7 @@ yy171:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy250;
+                       case 't':       goto yy249;
                        default:        goto yy62;
                        }
 yy172:
@@ -2115,7 +2106,7 @@ yy172:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy251;
+                       case 't':       goto yy250;
                        default:        goto yy62;
                        }
 yy173:
@@ -2123,9 +2114,9 @@ yy173:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy253;
+                       case 'a':       goto yy252;
                        case 'R':
-                       case 'r':       goto yy254;
+                       case 'r':       goto yy253;
                        default:        goto yy62;
                        }
 yy174:
@@ -2133,14 +2124,14 @@ yy174:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'M':
-                       case 'm':       goto yy255;
+                       case 'm':       goto yy254;
                        default:        goto yy62;
                        }
 yy175:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy256;
+                       case '_':       goto yy255;
                        default:        goto yy62;
                        }
 yy176:
@@ -2148,7 +2139,7 @@ yy176:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy257;
+                       case 'u':       goto yy256;
                        default:        goto yy62;
                        }
 yy177:
@@ -2156,13 +2147,13 @@ yy177:
                        cur -= 1;
 #line 325 "src/parser.re"
                        { char_width = 4; }
-#line 2160 "src/parser.c"
+#line 2151 "src/parser.c"
 yy179:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy258;
+                       case 'd':       goto yy257;
                        default:        goto yy62;
                        }
 yy180:
@@ -2170,7 +2161,7 @@ yy180:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy259;
+                       case 'r':       goto yy258;
                        default:        goto yy62;
                        }
 yy181:
@@ -2178,7 +2169,7 @@ yy181:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy260;
+                       case 'a':       goto yy259;
                        default:        goto yy62;
                        }
 yy182:
@@ -2255,32 +2246,32 @@ yy182:
                        default:        goto yy182;
                        }
 yy184:
-#line 449 "src/parser.re"
+#line 441 "src/parser.re"
                        { NEWTOKEN(PSI_T_NSNAME); goto start; }
-#line 2261 "src/parser.c"
+#line 2252 "src/parser.c"
 yy185:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy261;
-                       case 'e':       goto yy262;
-                       case 'i':       goto yy263;
-                       case 'r':       goto yy264;
+                       case 'a':       goto yy260;
+                       case 'e':       goto yy261;
+                       case 'i':       goto yy262;
+                       case 'r':       goto yy263;
                        default:        goto yy62;
                        }
 yy186:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':       goto yy224;
-                       case 'o':       goto yy265;
+                       case 'O':       goto yy223;
+                       case 'o':       goto yy264;
                        default:        goto yy62;
                        }
 yy187:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy266;
+                       case 'a':       goto yy265;
                        default:        goto yy62;
                        }
 yy188:
@@ -2288,15 +2279,15 @@ yy188:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy226;
-                       case 'n':       goto yy267;
+                       case 'u':       goto yy225;
+                       case 'n':       goto yy266;
                        default:        goto yy62;
                        }
 yy189:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'u':       goto yy268;
+                       case 'u':       goto yy267;
                        default:        goto yy62;
                        }
 yy190:
@@ -2304,16 +2295,16 @@ yy190:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy230;
-                       case 'u':       goto yy269;
+                       case 'd':       goto yy229;
+                       case 'u':       goto yy268;
                        default:        goto yy62;
                        }
 yy191:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':       goto yy233;
-                       case 'o':       goto yy270;
+                       case 'O':       goto yy232;
+                       case 'o':       goto yy269;
                        default:        goto yy62;
                        }
 yy192:
@@ -2321,9 +2312,9 @@ yy192:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy238;
-                       case 'T':       goto yy239;
-                       case 't':       goto yy271;
+                       case 'c':       goto yy237;
+                       case 'T':       goto yy238;
+                       case 't':       goto yy270;
                        default:        goto yy62;
                        }
 yy193:
@@ -2331,15 +2322,15 @@ yy193:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy242;
-                       case 'n':       goto yy273;
+                       case 'b':       goto yy241;
+                       case 'n':       goto yy272;
                        default:        goto yy62;
                        }
 yy194:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy274;
+                       case 'n':       goto yy273;
                        default:        goto yy62;
                        }
 yy195:
@@ -2347,23 +2338,23 @@ yy195:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy249;
-                       case 'a':       goto yy275;
+                       case 'e':       goto yy248;
+                       case 'a':       goto yy274;
                        default:        goto yy62;
                        }
 yy196:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy276;
+                       case 'o':       goto yy275;
                        default:        goto yy62;
                        }
 yy197:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy277;
-                       case 'z':       goto yy278;
+                       case 'g':       goto yy276;
+                       case 'z':       goto yy277;
                        default:        goto yy62;
                        }
 yy198:
@@ -2371,16 +2362,16 @@ yy198:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy253;
-                       case 'R':       goto yy254;
-                       case 'r':       goto yy279;
+                       case 'a':       goto yy252;
+                       case 'R':       goto yy253;
+                       case 'r':       goto yy278;
                        default:        goto yy62;
                        }
 yy199:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'p':       goto yy280;
+                       case 'p':       goto yy279;
                        default:        goto yy62;
                        }
 yy200:
@@ -2388,100 +2379,93 @@ yy200:
                        cur -= 1;
 #line 324 "src/parser.re"
                        { char_width = 2; }
-#line 2392 "src/parser.c"
+#line 2383 "src/parser.c"
 yy202:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '"':       goto yy281;
+                       case '"':       goto yy280;
                        default:        goto yy62;
                        }
 yy203:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy283;
+                       case 'D':
+                       case 'd':       goto yy257;
+                       case 'i':       goto yy282;
+                       case 's':       goto yy283;
                        default:        goto yy62;
                        }
 yy204:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy258;
                        case 'i':       goto yy284;
-                       case 's':       goto yy285;
+                       case 'l':       goto yy285;
                        default:        goto yy62;
                        }
 yy205:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'i':       goto yy286;
-                       case 'l':       goto yy287;
-                       default:        goto yy62;
-                       }
-yy206:
                        ++cur;
 #line 345 "src/parser.re"
                        { NEWTOKEN(PSI_T_OR); goto start; }
-#line 2429 "src/parser.c"
-yy208:
+#line 2413 "src/parser.c"
+yy207:
                        ++cur;
 #line 365 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELLIPSIS); goto start; }
-#line 2434 "src/parser.c"
-yy210:
+#line 2418 "src/parser.c"
+yy209:
                        yych = *++cur;
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy288;
+                       case 'd':       goto yy286;
                        case 'F':
-                       case 'f':       goto yy290;
+                       case 'f':       goto yy288;
                        case 'L':
-                       case 'l':       goto yy292;
+                       case 'l':       goto yy290;
                        default:        goto yy114;
                        }
-yy211:
+yy210:
                        ++cur;
                        cur -= 1;
 #line 315 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_F; cur += 1; goto start; }
-#line 2451 "src/parser.c"
-yy213:
+#line 2435 "src/parser.c"
+yy212:
                        ++cur;
                        cur -= 1;
 #line 316 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 2457 "src/parser.c"
-yy215:
+#line 2441 "src/parser.c"
+yy214:
                        yych = *++cur;
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy294;
+                       case 'u':       goto yy292;
                        default:        goto yy114;
                        }
-yy216:
+yy215:
                        ++cur;
-yy217:
+yy216:
                        cur -= 2;
 #line 311 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_UL; cur += 2; goto start; }
-#line 2471 "src/parser.c"
-yy218:
+#line 2455 "src/parser.c"
+yy217:
                        yych = *++cur;
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy294;
-                       default:        goto yy217;
+                       case 'l':       goto yy292;
+                       default:        goto yy216;
                        }
-yy219:
+yy218:
                        yyaccept = 3;
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
-                       case '.':       goto yy296;
+                       case '.':       goto yy294;
                        case '0':
                        case '1':
                        case '2':
@@ -2503,7 +2487,7 @@ yy219:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy219;
+                       case 'f':       goto yy218;
                        case 'L':
                        case 'l':       goto yy128;
                        case 'P':
@@ -2512,150 +2496,150 @@ yy219:
                        case 'u':       goto yy130;
                        default:        goto yy39;
                        }
-yy221:
+yy220:
                        ++cur;
-#line 451 "src/parser.re"
+#line 443 "src/parser.re"
                        { tok += 1; cur -= 1; NEWTOKEN(PSI_T_CPP_HEADER); cur += 1; goto start; }
-#line 2520 "src/parser.c"
-yy223:
+#line 2504 "src/parser.c"
+yy222:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy298;
+                       case 'a':       goto yy296;
                        case 'V':
-                       case 'v':       goto yy299;
+                       case 'v':       goto yy297;
                        default:        goto yy62;
                        }
-yy224:
+yy223:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy300;
+                       case 'l':       goto yy298;
                        default:        goto yy62;
                        }
-yy225:
+yy224:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy301;
+                       case 'l':       goto yy299;
                        default:        goto yy62;
                        }
-yy226:
+yy225:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy302;
+                       case 'n':       goto yy300;
                        default:        goto yy62;
                        }
-yy227:
+yy226:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy303;
+                       case 'i':       goto yy301;
                        default:        goto yy62;
                        }
-yy228:
+yy227:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy304;
+                       case 'f':       goto yy302;
                        default:        goto yy62;
                        }
-yy229:
+yy228:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy306;
+                       case 'e':       goto yy304;
                        default:        goto yy62;
                        }
-yy230:
+yy229:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy308;
+                       case 'i':       goto yy306;
                        default:        goto yy62;
                        }
-yy231:
+yy230:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy309;
+                       case 'o':       goto yy307;
                        default:        goto yy62;
                        }
-yy232:
+yy231:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy310;
+                       case 's':       goto yy308;
                        default:        goto yy62;
                        }
-yy233:
+yy232:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy311;
+                       case 'a':       goto yy309;
                        default:        goto yy62;
                        }
-yy234:
+yy233:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy312;
+                       case 'e':       goto yy310;
                        default:        goto yy62;
                        }
-yy235:
+yy234:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy314;
+                       case 'c':       goto yy312;
                        default:        goto yy62;
                        }
-yy236:
+yy235:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy315;
+                       case 'e':       goto yy313;
                        default:        goto yy62;
                        }
-yy237:
+yy236:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy316;
+                       case 'd':       goto yy314;
                        default:        goto yy62;
                        }
-yy238:
+yy237:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy317;
+                       case 'l':       goto yy315;
                        default:        goto yy62;
                        }
-yy239:
+yy238:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy318;
+                       case 'v':       goto yy316;
                        default:        goto yy62;
                        }
-yy240:
+yy239:
                        yyaccept = 10;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -2722,15 +2706,15 @@ yy240:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy241;
+                       case 0x7F:      goto yy240;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy241:
-#line 424 "src/parser.re"
+yy240:
+#line 416 "src/parser.re"
                        { NEWTOKEN(PSI_T_LET); goto start; }
-#line 2733 "src/parser.c"
-yy242:
+#line 2717 "src/parser.c"
+yy241:
                        yyaccept = 11;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -2797,72 +2781,72 @@ yy242:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy243;
+                       case 0x7F:      goto yy242;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy243:
-#line 423 "src/parser.re"
+yy242:
+#line 415 "src/parser.re"
                        { NEWTOKEN(PSI_T_LIB); goto start; }
-#line 2808 "src/parser.c"
-yy244:
+#line 2792 "src/parser.c"
+yy243:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy319;
+                       case 'e':       goto yy317;
                        default:        goto yy62;
                        }
-yy245:
+yy244:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy320;
+                       case 'l':       goto yy318;
                        default:        goto yy62;
                        }
-yy246:
+yy245:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy322;
+                       case 'e':       goto yy320;
                        case 'V':
-                       case 'v':       goto yy323;
+                       case 'v':       goto yy321;
                        default:        goto yy62;
                        }
-yy247:
+yy246:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'H':
-                       case 'h':       goto yy324;
+                       case 'h':       goto yy322;
                        default:        goto yy62;
                        }
-yy248:
+yy247:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy325;
+                       case 't':       goto yy323;
                        default:        goto yy62;
                        }
-yy249:
+yy248:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy326;
+                       case '_':       goto yy324;
                        default:        goto yy62;
                        }
-yy250:
+yy249:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy327;
+                       case 'u':       goto yy325;
                        default:        goto yy62;
                        }
-yy251:
+yy250:
                        yyaccept = 12;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -2929,58 +2913,66 @@ yy251:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy252;
+                       case 0x7F:      goto yy251;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy252:
-#line 425 "src/parser.re"
+yy251:
+#line 417 "src/parser.re"
                        { NEWTOKEN(PSI_T_SET); goto start; }
-#line 2940 "src/parser.c"
-yy253:
+#line 2924 "src/parser.c"
+yy252:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy328;
+                       case 't':       goto yy326;
                        default:        goto yy62;
                        }
-yy254:
+yy253:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy329;
+                       case 'i':       goto yy327;
                        case 'L':
-                       case 'l':       goto yy330;
+                       case 'l':       goto yy328;
                        case 'V':
-                       case 'v':       goto yy331;
+                       case 'v':       goto yy329;
                        default:        goto yy62;
                        }
-yy255:
+yy254:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'P':
-                       case 'p':       goto yy332;
+                       case 'p':       goto yy330;
                        default:        goto yy62;
                        }
-yy256:
+yy255:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy334;
+                       case 'a':       goto yy332;
                        case 'B':
-                       case 'b':       goto yy335;
+                       case 'b':       goto yy333;
                        case 'F':
-                       case 'f':       goto yy336;
+                       case 'f':       goto yy334;
                        case 'I':
-                       case 'i':       goto yy337;
+                       case 'i':       goto yy335;
                        case 'O':
-                       case 'o':       goto yy338;
+                       case 'o':       goto yy336;
                        case 'S':
-                       case 's':       goto yy339;
+                       case 's':       goto yy337;
+                       default:        goto yy62;
+                       }
+yy256:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy338;
                        default:        goto yy62;
                        }
 yy257:
@@ -2995,100 +2987,92 @@ yy258:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy342;
+                       case 'N':
+                       case 'n':       goto yy341;
                        default:        goto yy62;
                        }
 yy259:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy343;
+                       case 'L':
+                       case 'l':       goto yy342;
                        default:        goto yy62;
                        }
 yy260:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy344;
+                       case 's':       goto yy344;
+                       case 't':       goto yy345;
                        default:        goto yy62;
                        }
 yy261:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy346;
-                       case 't':       goto yy347;
+                       case 'x':       goto yy346;
                        default:        goto yy62;
                        }
 yy262:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'x':       goto yy348;
+                       case 'n':       goto yy347;
                        default:        goto yy62;
                        }
 yy263:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy349;
+                       case 'e':       goto yy348;
                        default:        goto yy62;
                        }
 yy264:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy350;
+                       case 'L':       goto yy298;
+                       case 'l':       goto yy349;
                        default:        goto yy62;
                        }
 yy265:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':       goto yy300;
-                       case 'l':       goto yy351;
+                       case 'r':       goto yy351;
                        default:        goto yy62;
                        }
 yy266:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy353;
+                       case 's':       goto yy353;
                        default:        goto yy62;
                        }
 yy267:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy355;
+                       case 'b':       goto yy354;
                        default:        goto yy62;
                        }
 yy268:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'b':       goto yy356;
+                       case 'm':       goto yy355;
                        default:        goto yy62;
                        }
 yy269:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy357;
+                       case 'A':       goto yy309;
+                       case 'a':       goto yy357;
                        default:        goto yy62;
                        }
 yy270:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':       goto yy311;
-                       case 'a':       goto yy359;
-                       default:        goto yy62;
-                       }
-yy271:
                        yyaccept = 13;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3155,148 +3139,137 @@ yy271:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy272;
-                       case '1':       goto yy360;
-                       case '3':       goto yy361;
-                       case '6':       goto yy362;
-                       case '8':       goto yy363;
+                       case 0x7F:      goto yy271;
                        case 'V':
-                       case 'v':       goto yy318;
+                       case 'v':       goto yy316;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy272:
+yy271:
 #line 385 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT); goto start; }
-#line 3172 "src/parser.c"
+#line 3152 "src/parser.c"
+yy272:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy358;
+                       default:        goto yy62;
+                       }
 yy273:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy364;
+                       case 'g':       goto yy360;
                        default:        goto yy62;
                        }
 yy274:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy366;
+                       case 'g':       goto yy362;
                        default:        goto yy62;
                        }
 yy275:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy368;
+                       case 'r':       goto yy363;
                        default:        goto yy62;
                        }
 yy276:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy369;
+                       case 'n':       goto yy364;
                        default:        goto yy62;
                        }
 yy277:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy370;
+                       case 'e':       goto yy365;
                        default:        goto yy62;
                        }
 yy278:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'e':       goto yy371;
-                       default:        goto yy62;
-                       }
-yy279:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy329;
+                       case 'i':       goto yy327;
                        case 'L':
-                       case 'l':       goto yy330;
+                       case 'l':       goto yy328;
                        case 'V':
-                       case 'v':       goto yy331;
-                       case 'u':       goto yy372;
+                       case 'v':       goto yy329;
+                       case 'u':       goto yy366;
                        default:        goto yy62;
                        }
-yy280:
+yy279:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy373;
+                       case 'e':       goto yy367;
                        default:        goto yy62;
                        }
-yy281:
+yy280:
                        ++cur;
                        cur -= 1;
 #line 323 "src/parser.re"
                        { char_width = 1; }
-#line 3240 "src/parser.c"
-yy283:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy374;
-                       default:        goto yy62;
-                       }
-yy284:
+#line 3220 "src/parser.c"
+yy282:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy375;
+                       case 'o':       goto yy368;
                        default:        goto yy62;
                        }
-yy285:
+yy283:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy376;
+                       case 'i':       goto yy369;
                        default:        goto yy62;
                        }
-yy286:
+yy284:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy377;
+                       case 'd':       goto yy370;
                        default:        goto yy62;
                        }
-yy287:
+yy285:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy379;
+                       case 'a':       goto yy372;
                        default:        goto yy62;
                        }
-yy288:
+yy286:
                        ++cur;
                        cur -= 2;
 #line 318 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DD; cur += 2; goto start; }
-#line 3281 "src/parser.c"
-yy290:
+#line 3254 "src/parser.c"
+yy288:
                        ++cur;
                        cur -= 2;
 #line 317 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DF; cur += 2; goto start; }
-#line 3287 "src/parser.c"
-yy292:
+#line 3260 "src/parser.c"
+yy290:
                        ++cur;
                        cur -= 2;
 #line 319 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DL; cur += 2; goto start; }
-#line 3293 "src/parser.c"
-yy294:
+#line 3266 "src/parser.c"
+yy292:
                        ++cur;
                        cur -= 3;
 #line 312 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_ULL; cur += 3; goto start; }
-#line 3299 "src/parser.c"
-yy296:
+#line 3272 "src/parser.c"
+yy294:
                        ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -3322,64 +3295,64 @@ yy296:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy296;
+                       case 'f':       goto yy294;
                        case 'P':
                        case 'p':       goto yy127;
                        default:        goto yy114;
                        }
-yy298:
+yy296:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy380;
+                       case 'y':       goto yy373;
                        default:        goto yy62;
                        }
-yy299:
+yy297:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy382;
+                       case 'a':       goto yy375;
                        default:        goto yy62;
                        }
-yy300:
+yy298:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy383;
+                       case 'v':       goto yy376;
                        default:        goto yy62;
                        }
-yy301:
+yy299:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy384;
+                       case 'a':       goto yy377;
                        case 'B':
-                       case 'b':       goto yy385;
+                       case 'b':       goto yy378;
                        case 'O':
-                       case 'o':       goto yy386;
+                       case 'o':       goto yy379;
                        default:        goto yy62;
                        }
-yy302:
+yy300:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy387;
+                       case 't':       goto yy380;
                        default:        goto yy62;
                        }
-yy303:
+yy301:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy389;
+                       case 'n':       goto yy382;
                        default:        goto yy62;
                        }
-yy304:
+yy302:
                        yyaccept = 14;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3446,15 +3419,15 @@ yy304:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy305;
+                       case 0x7F:      goto yy303;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy305:
-#line 403 "src/parser.re"
+yy303:
+#line 395 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELIF); goto start; }
-#line 3457 "src/parser.c"
-yy306:
+#line 3430 "src/parser.c"
+yy304:
                        yyaccept = 15;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3521,47 +3494,47 @@ yy306:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy307;
+                       case 0x7F:      goto yy305;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy307:
-#line 402 "src/parser.re"
+yy305:
+#line 394 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELSE); goto start; }
-#line 3532 "src/parser.c"
-yy308:
+#line 3505 "src/parser.c"
+yy306:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy390;
+                       case 'f':       goto yy383;
                        default:        goto yy62;
                        }
-yy309:
+yy307:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy392;
+                       case 'r':       goto yy385;
                        default:        goto yy62;
                        }
-yy310:
+yy308:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy394;
+                       case 'e':       goto yy387;
                        default:        goto yy62;
                        }
-yy311:
+yy309:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy396;
+                       case 't':       goto yy389;
                        default:        goto yy62;
                        }
-yy312:
+yy310:
                        yyaccept = 16;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3628,63 +3601,63 @@ yy312:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy313;
+                       case 0x7F:      goto yy311;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy313:
-#line 429 "src/parser.re"
+yy311:
+#line 421 "src/parser.re"
                        { NEWTOKEN(PSI_T_FREE); goto start; }
-#line 3639 "src/parser.c"
-yy314:
+#line 3612 "src/parser.c"
+yy312:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy397;
+                       case 't':       goto yy390;
                        default:        goto yy62;
                        }
-yy315:
+yy313:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy398;
+                       case 'f':       goto yy391;
                        default:        goto yy62;
                        }
-yy316:
+yy314:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy400;
+                       case 'e':       goto yy393;
                        default:        goto yy62;
                        }
-yy317:
+yy315:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy401;
+                       case 'u':       goto yy394;
                        default:        goto yy62;
                        }
-yy318:
+yy316:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy402;
+                       case 'a':       goto yy395;
                        default:        goto yy62;
                        }
-yy319:
+yy317:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy403;
+                       case 'd':       goto yy396;
                        default:        goto yy62;
                        }
-yy320:
+yy318:
                        yyaccept = 17;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3751,94 +3724,94 @@ yy320:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy321;
+                       case 0x7F:      goto yy319;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy321:
-#line 414 "src/parser.re"
+yy319:
+#line 406 "src/parser.re"
                        { NEWTOKEN(PSI_T_NULL); goto start; }
-#line 3762 "src/parser.c"
-yy322:
+#line 3735 "src/parser.c"
+yy320:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy405;
+                       case 'c':       goto yy398;
                        default:        goto yy62;
                        }
-yy323:
+yy321:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy406;
+                       case 'a':       goto yy399;
                        default:        goto yy62;
                        }
-yy324:
+yy322:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy407;
+                       case 'v':       goto yy400;
                        default:        goto yy62;
                        }
-yy325:
+yy323:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy408;
+                       case '_':       goto yy401;
                        default:        goto yy62;
                        }
-yy326:
+yy324:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy409;
+                       case 'a':       goto yy402;
                        default:        goto yy62;
                        }
-yy327:
+yy325:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy410;
+                       case 'r':       goto yy403;
                        default:        goto yy62;
                        }
-yy328:
+yy326:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy411;
+                       case 'i':       goto yy404;
                        default:        goto yy62;
                        }
-yy329:
+yy327:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy412;
+                       case 'n':       goto yy405;
                        default:        goto yy62;
                        }
-yy330:
+yy328:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy413;
+                       case 'e':       goto yy406;
                        default:        goto yy62;
                        }
-yy331:
+yy329:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy414;
+                       case 'a':       goto yy407;
                        default:        goto yy62;
                        }
-yy332:
+yy330:
                        yyaccept = 18;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3905,63 +3878,63 @@ yy332:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy333;
+                       case 0x7F:      goto yy331;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy333:
-#line 430 "src/parser.re"
+yy331:
+#line 422 "src/parser.re"
                        { NEWTOKEN(PSI_T_TEMP); goto start; }
-#line 3916 "src/parser.c"
-yy334:
+#line 3889 "src/parser.c"
+yy332:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy415;
+                       case 'r':       goto yy408;
                        default:        goto yy62;
                        }
-yy335:
+yy333:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy416;
+                       case 'o':       goto yy409;
                        default:        goto yy62;
                        }
-yy336:
+yy334:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy417;
+                       case 'l':       goto yy410;
                        default:        goto yy62;
                        }
-yy337:
+yy335:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy418;
+                       case 'n':       goto yy411;
                        default:        goto yy62;
                        }
-yy338:
+yy336:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy419;
+                       case 'b':       goto yy412;
                        default:        goto yy62;
                        }
-yy339:
+yy337:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy420;
+                       case 't':       goto yy413;
                        default:        goto yy62;
                        }
-yy340:
+yy338:
                        yyaccept = 19;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4028,31 +4001,31 @@ yy340:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy341;
+                       case 0x7F:      goto yy339;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy341:
-#line 412 "src/parser.re"
+yy339:
+#line 404 "src/parser.re"
                        { NEWTOKEN(PSI_T_TRUE); goto start; }
-#line 4039 "src/parser.c"
-yy342:
+#line 4012 "src/parser.c"
+yy340:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy421;
+                       case 'f':       goto yy414;
                        default:        goto yy62;
                        }
-yy343:
+yy341:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy423;
+                       case 'i':       goto yy416;
                        default:        goto yy62;
                        }
-yy344:
+yy342:
                        yyaccept = 20;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4119,50 +4092,50 @@ yy344:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy345;
+                       case 0x7F:      goto yy343;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy345:
-#line 439 "src/parser.re"
+yy343:
+#line 431 "src/parser.re"
                        { NEWTOKEN(PSI_T_ZVAL); goto start; }
-#line 4130 "src/parser.c"
-yy346:
+#line 4103 "src/parser.c"
+yy344:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy424;
+                       case 'm':       goto yy417;
                        default:        goto yy62;
                        }
-yy347:
+yy345:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy425;
+                       case 't':       goto yy418;
                        default:        goto yy62;
                        }
-yy348:
+yy346:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy426;
+                       case 't':       goto yy419;
                        default:        goto yy62;
                        }
-yy349:
+yy347:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'l':       goto yy427;
+                       case 'l':       goto yy420;
                        default:        goto yy62;
                        }
-yy350:
+yy348:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy428;
+                       case 's':       goto yy421;
                        default:        goto yy62;
                        }
-yy351:
+yy349:
                        yyaccept = 21;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4229,17 +4202,17 @@ yy351:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy352;
+                       case 0x7F:      goto yy350;
                        case 'V':
-                       case 'v':       goto yy383;
+                       case 'v':       goto yy376;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy352:
+yy350:
 #line 382 "src/parser.re"
                        { NEWTOKEN(PSI_T_BOOL); goto start; }
-#line 4242 "src/parser.c"
-yy353:
+#line 4215 "src/parser.c"
+yy351:
                        yyaccept = 22;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4306,29 +4279,29 @@ yy353:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy354;
+                       case 0x7F:      goto yy352;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy354:
+yy352:
 #line 383 "src/parser.re"
                        { NEWTOKEN(PSI_T_CHAR); goto start; }
-#line 4317 "src/parser.c"
-yy355:
+#line 4290 "src/parser.c"
+yy353:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy429;
+                       case 't':       goto yy422;
                        default:        goto yy62;
                        }
-yy356:
+yy354:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'l':       goto yy431;
+                       case 'l':       goto yy424;
                        default:        goto yy62;
                        }
-yy357:
+yy355:
                        yyaccept = 23;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4395,51 +4368,23 @@ yy357:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy358;
+                       case 0x7F:      goto yy356;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy358:
+yy356:
 #line 379 "src/parser.re"
                        { NEWTOKEN(PSI_T_ENUM); goto start; }
-#line 4406 "src/parser.c"
-yy359:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':       goto yy396;
-                       case 't':       goto yy432;
-                       default:        goto yy62;
-                       }
-yy360:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '6':       goto yy434;
-                       default:        goto yy62;
-                       }
-yy361:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '2':       goto yy435;
-                       default:        goto yy62;
-                       }
-yy362:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '4':       goto yy436;
-                       default:        goto yy62;
-                       }
-yy363:
+#line 4379 "src/parser.c"
+yy357:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy437;
+                       case 'T':       goto yy389;
+                       case 't':       goto yy425;
                        default:        goto yy62;
                        }
-yy364:
+yy358:
                        yyaccept = 24;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4506,15 +4451,15 @@ yy364:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy365;
+                       case 0x7F:      goto yy359;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy365:
+yy359:
 #line 375 "src/parser.re"
                        { NEWTOKEN(PSI_T_LINE); goto start; }
-#line 4517 "src/parser.c"
-yy366:
+#line 4462 "src/parser.c"
+yy360:
                        yyaccept = 25;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4581,81 +4526,71 @@ yy366:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy367;
+                       case 0x7F:      goto yy361;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy367:
+yy361:
 #line 386 "src/parser.re"
                        { NEWTOKEN(PSI_T_LONG); goto start; }
-#line 4592 "src/parser.c"
-yy368:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'm':       goto yy438;
-                       default:        goto yy62;
-                       }
-yy369:
+#line 4537 "src/parser.c"
+yy362:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy439;
+                       case 'm':       goto yy427;
                        default:        goto yy62;
                        }
-yy370:
+yy363:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy441;
+                       case 't':       goto yy428;
                        default:        goto yy62;
                        }
-yy371:
+yy364:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy442;
+                       case 'e':       goto yy430;
                        default:        goto yy62;
                        }
-yy372:
+yy365:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'c':       goto yy443;
+                       case 'o':       goto yy431;
                        default:        goto yy62;
                        }
-yy373:
+yy366:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy444;
+                       case 'c':       goto yy432;
                        default:        goto yy62;
                        }
-yy374:
+yy367:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '1':       goto yy445;
-                       case '3':       goto yy446;
-                       case '6':       goto yy447;
-                       case '8':       goto yy448;
+                       case 'd':       goto yy433;
                        default:        goto yy62;
                        }
-yy375:
+yy368:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy449;
+                       case 'n':       goto yy434;
                        default:        goto yy62;
                        }
-yy376:
+yy369:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy451;
+                       case 'g':       goto yy436;
                        default:        goto yy62;
                        }
-yy377:
+yy370:
                        yyaccept = 26;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4722,22 +4657,22 @@ yy377:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy378;
+                       case 0x7F:      goto yy371;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy378:
+yy371:
 #line 381 "src/parser.re"
                        { NEWTOKEN(PSI_T_VOID); goto start; }
-#line 4733 "src/parser.c"
-yy379:
+#line 4668 "src/parser.c"
+yy372:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy452;
+                       case 't':       goto yy437;
                        default:        goto yy62;
                        }
-yy380:
+yy373:
                        yyaccept = 27;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4804,55 +4739,55 @@ yy380:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy381;
+                       case 0x7F:      goto yy374;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy381:
-#line 418 "src/parser.re"
+yy374:
+#line 410 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRAY); goto start; }
-#line 4815 "src/parser.c"
-yy382:
+#line 4750 "src/parser.c"
+yy375:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy453;
+                       case 'l':       goto yy438;
                        default:        goto yy62;
                        }
-yy383:
+yy376:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy455;
+                       case 'a':       goto yy440;
                        default:        goto yy62;
                        }
-yy384:
+yy377:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy456;
+                       case 'b':       goto yy441;
                        default:        goto yy62;
                        }
-yy385:
+yy378:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy457;
+                       case 'a':       goto yy442;
                        default:        goto yy62;
                        }
-yy386:
+yy379:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy458;
+                       case 'c':       goto yy443;
                        default:        goto yy62;
                        }
-yy387:
+yy380:
                        yyaccept = 28;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4919,23 +4854,23 @@ yy387:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy388;
+                       case 0x7F:      goto yy381;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy388:
-#line 440 "src/parser.re"
+yy381:
+#line 432 "src/parser.re"
                        { NEWTOKEN(PSI_T_COUNT); goto start; }
-#line 4930 "src/parser.c"
-yy389:
+#line 4865 "src/parser.c"
+yy382:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy460;
+                       case 'e':       goto yy445;
                        default:        goto yy62;
                        }
-yy390:
+yy383:
                        yyaccept = 29;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5002,15 +4937,15 @@ yy390:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy391;
+                       case 0x7F:      goto yy384;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy391:
-#line 404 "src/parser.re"
+yy384:
+#line 396 "src/parser.re"
                        { NEWTOKEN(PSI_T_ENDIF); goto start; }
-#line 5013 "src/parser.c"
-yy392:
+#line 4948 "src/parser.c"
+yy385:
                        yyaccept = 30;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5077,15 +5012,15 @@ yy392:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy393;
+                       case 0x7F:      goto yy386;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy393:
-#line 409 "src/parser.re"
+yy386:
+#line 401 "src/parser.re"
                        { NEWTOKEN(PSI_T_ERROR); goto start; }
-#line 5088 "src/parser.c"
-yy394:
+#line 5023 "src/parser.c"
+yy387:
                        yyaccept = 31;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5152,31 +5087,31 @@ yy394:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy395;
+                       case 0x7F:      goto yy388;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy395:
-#line 413 "src/parser.re"
+yy388:
+#line 405 "src/parser.re"
                        { NEWTOKEN(PSI_T_FALSE); goto start; }
-#line 5163 "src/parser.c"
-yy396:
+#line 5098 "src/parser.c"
+yy389:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy462;
+                       case 'v':       goto yy447;
                        default:        goto yy62;
                        }
-yy397:
+yy390:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy463;
+                       case 'i':       goto yy448;
                        default:        goto yy62;
                        }
-yy398:
+yy391:
                        yyaccept = 32;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5243,39 +5178,39 @@ yy398:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy399;
+                       case 0x7F:      goto yy392;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy399:
-#line 400 "src/parser.re"
+yy392:
+#line 392 "src/parser.re"
                        { NEWTOKEN(PSI_T_IFDEF); goto start; }
-#line 5254 "src/parser.c"
-yy400:
+#line 5189 "src/parser.c"
+yy393:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy464;
+                       case 'f':       goto yy449;
                        default:        goto yy62;
                        }
-yy401:
+yy394:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy466;
+                       case 'd':       goto yy451;
                        default:        goto yy62;
                        }
-yy402:
+yy395:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy467;
+                       case 'l':       goto yy452;
                        default:        goto yy62;
                        }
-yy403:
+yy396:
                        yyaccept = 33;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5342,143 +5277,143 @@ yy403:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy404;
+                       case 0x7F:      goto yy397;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy404:
-#line 415 "src/parser.re"
+yy397:
+#line 407 "src/parser.re"
                        { NEWTOKEN(PSI_T_MIXED); goto start; }
-#line 5353 "src/parser.c"
-yy405:
+#line 5288 "src/parser.c"
+yy398:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy469;
+                       case 't':       goto yy454;
                        default:        goto yy62;
                        }
-yy406:
+yy399:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy471;
+                       case 'l':       goto yy456;
                        default:        goto yy62;
                        }
-yy407:
+yy400:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy473;
+                       case 'a':       goto yy458;
                        default:        goto yy62;
                        }
-yy408:
+yy401:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy474;
+                       case 'a':       goto yy459;
                        default:        goto yy62;
                        }
-yy409:
+yy402:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy475;
+                       case 's':       goto yy460;
                        default:        goto yy62;
                        }
-yy410:
+yy403:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy476;
+                       case 'n':       goto yy461;
                        default:        goto yy62;
                        }
-yy411:
+yy404:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy478;
+                       case 'c':       goto yy463;
                        default:        goto yy62;
                        }
-yy412:
+yy405:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy480;
+                       case 'g':       goto yy465;
                        default:        goto yy62;
                        }
-yy413:
+yy406:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy482;
+                       case 'n':       goto yy467;
                        default:        goto yy62;
                        }
-yy414:
+yy407:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy484;
+                       case 'l':       goto yy469;
                        default:        goto yy62;
                        }
-yy415:
+yy408:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy486;
+                       case 'r':       goto yy471;
                        default:        goto yy62;
                        }
-yy416:
+yy409:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy487;
+                       case 'o':       goto yy472;
                        default:        goto yy62;
                        }
-yy417:
+yy410:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy488;
+                       case 'o':       goto yy473;
                        default:        goto yy62;
                        }
-yy418:
+yy411:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy489;
+                       case 't':       goto yy474;
                        default:        goto yy62;
                        }
-yy419:
+yy412:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy491;
+                       case 'j':       goto yy476;
                        default:        goto yy62;
                        }
-yy420:
+yy413:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy492;
+                       case 'r':       goto yy477;
                        default:        goto yy62;
                        }
-yy421:
+yy414:
                        yyaccept = 34;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5545,58 +5480,58 @@ yy421:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy422;
+                       case 0x7F:      goto yy415;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy422:
-#line 407 "src/parser.re"
+yy415:
+#line 399 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNDEF); goto start; }
-#line 5556 "src/parser.c"
-yy423:
+#line 5491 "src/parser.c"
+yy416:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy493;
+                       case 'n':       goto yy478;
                        default:        goto yy62;
                        }
-yy424:
+yy417:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy494;
+                       case '_':       goto yy479;
                        default:        goto yy62;
                        }
-yy425:
+yy418:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy495;
+                       case 'r':       goto yy480;
                        default:        goto yy62;
                        }
-yy426:
+yy419:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy496;
+                       case 'e':       goto yy481;
                        default:        goto yy62;
                        }
-yy427:
+yy420:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy497;
+                       case 'i':       goto yy482;
                        default:        goto yy62;
                        }
-yy428:
+yy421:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy498;
+                       case 't':       goto yy483;
                        default:        goto yy62;
                        }
-yy429:
+yy422:
                        yyaccept = 35;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5663,22 +5598,22 @@ yy429:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy430;
+                       case 0x7F:      goto yy423;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy430:
+yy423:
 #line 380 "src/parser.re"
                        { NEWTOKEN(PSI_T_CONST); goto start; }
-#line 5674 "src/parser.c"
-yy431:
+#line 5609 "src/parser.c"
+yy424:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy499;
+                       case 'e':       goto yy484;
                        default:        goto yy62;
                        }
-yy432:
+yy425:
                        yyaccept = 36;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5745,53 +5680,25 @@ yy432:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy433;
+                       case 0x7F:      goto yy426;
                        case 'V':
-                       case 'v':       goto yy462;
+                       case 'v':       goto yy447;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy433:
+yy426:
 #line 387 "src/parser.re"
                        { NEWTOKEN(PSI_T_FLOAT); goto start; }
-#line 5758 "src/parser.c"
-yy434:
+#line 5693 "src/parser.c"
+yy427:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy501;
+                       case 'a':       goto yy486;
                        default:        goto yy62;
                        }
-yy435:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy502;
-                       default:        goto yy62;
-                       }
-yy436:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy503;
-                       default:        goto yy62;
-                       }
-yy437:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy504;
-                       default:        goto yy62;
-                       }
-yy438:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'a':       goto yy506;
-                       default:        goto yy62;
-                       }
-yy439:
-                       yyaccept = 37;
+yy428:
+                       yyaccept = 37;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5857,71 +5764,43 @@ yy439:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy440;
+                       case 0x7F:      goto yy429;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy440:
+yy429:
 #line 384 "src/parser.re"
                        { NEWTOKEN(PSI_T_SHORT); goto start; }
-#line 5868 "src/parser.c"
-yy441:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'd':       goto yy508;
-                       default:        goto yy62;
-                       }
-yy442:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'f':       goto yy510;
-                       default:        goto yy62;
-                       }
-yy443:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy512;
-                       default:        goto yy62;
-                       }
-yy444:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'e':       goto yy514;
-                       default:        goto yy62;
-                       }
-yy445:
+#line 5775 "src/parser.c"
+yy430:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '6':       goto yy515;
+                       case 'd':       goto yy488;
                        default:        goto yy62;
                        }
-yy446:
+yy431:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '2':       goto yy516;
+                       case 'f':       goto yy490;
                        default:        goto yy62;
                        }
-yy447:
+yy432:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '4':       goto yy517;
+                       case 't':       goto yy492;
                        default:        goto yy62;
                        }
-yy448:
+yy433:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy518;
+                       case 'e':       goto yy494;
                        default:        goto yy62;
                        }
-yy449:
+yy434:
                        yyaccept = 38;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5988,29 +5867,29 @@ yy449:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy450;
+                       case 0x7F:      goto yy435;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy450:
+yy435:
 #line 378 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNION); goto start; }
-#line 5999 "src/parser.c"
-yy451:
+#line 5878 "src/parser.c"
+yy436:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy519;
+                       case 'n':       goto yy495;
                        default:        goto yy62;
                        }
-yy452:
+yy437:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy520;
+                       case 'i':       goto yy496;
                        default:        goto yy62;
                        }
-yy453:
+yy438:
                        yyaccept = 39;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6077,39 +5956,39 @@ yy453:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy454;
+                       case 0x7F:      goto yy439;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy454:
-#line 437 "src/parser.re"
+yy439:
+#line 429 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRVAL); goto start; }
-#line 6088 "src/parser.c"
-yy455:
+#line 5967 "src/parser.c"
+yy440:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy521;
+                       case 'l':       goto yy497;
                        default:        goto yy62;
                        }
-yy456:
+yy441:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy523;
+                       case 'l':       goto yy499;
                        default:        goto yy62;
                        }
-yy457:
+yy442:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy524;
+                       case 'c':       goto yy500;
                        default:        goto yy62;
                        }
-yy458:
+yy443:
                        yyaccept = 40;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6176,15 +6055,15 @@ yy458:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy459;
+                       case 0x7F:      goto yy444;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy459:
-#line 441 "src/parser.re"
+yy444:
+#line 433 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLOC); goto start; }
-#line 6187 "src/parser.c"
-yy460:
+#line 6066 "src/parser.c"
+yy445:
                        yyaccept = 41;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6251,33 +6130,33 @@ yy460:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy461;
+                       case 0x7F:      goto yy446;
                        case 'D':
-                       case 'd':       goto yy525;
+                       case 'd':       goto yy501;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy461:
-#line 405 "src/parser.re"
+yy446:
+#line 397 "src/parser.re"
                        { NEWTOKEN(PSI_T_DEFINE); goto start; }
-#line 6264 "src/parser.c"
-yy462:
+#line 6143 "src/parser.c"
+yy447:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy527;
+                       case 'a':       goto yy503;
                        default:        goto yy62;
                        }
-yy463:
+yy448:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy528;
+                       case 'o':       goto yy504;
                        default:        goto yy62;
                        }
-yy464:
+yy449:
                        yyaccept = 42;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6344,23 +6223,23 @@ yy464:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy465;
+                       case 0x7F:      goto yy450;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy465:
-#line 401 "src/parser.re"
+yy450:
+#line 393 "src/parser.re"
                        { NEWTOKEN(PSI_T_IFNDEF); goto start; }
-#line 6355 "src/parser.c"
-yy466:
+#line 6234 "src/parser.c"
+yy451:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy529;
+                       case 'e':       goto yy505;
                        default:        goto yy62;
                        }
-yy467:
+yy452:
                        yyaccept = 43;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6427,15 +6306,15 @@ yy467:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy468;
+                       case 0x7F:      goto yy453;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy468:
-#line 434 "src/parser.re"
+yy453:
+#line 426 "src/parser.re"
                        { NEWTOKEN(PSI_T_INTVAL); goto start; }
-#line 6438 "src/parser.c"
-yy469:
+#line 6317 "src/parser.c"
+yy454:
                        yyaccept = 44;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6502,15 +6381,15 @@ yy469:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy470;
+                       case 0x7F:      goto yy455;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy470:
-#line 419 "src/parser.re"
+yy455:
+#line 411 "src/parser.re"
                        { NEWTOKEN(PSI_T_OBJECT); goto start; }
-#line 6513 "src/parser.c"
-yy471:
+#line 6392 "src/parser.c"
+yy456:
                        yyaccept = 45;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6577,39 +6456,39 @@ yy471:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy472;
+                       case 0x7F:      goto yy457;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy472:
-#line 438 "src/parser.re"
+yy457:
+#line 430 "src/parser.re"
                        { NEWTOKEN(PSI_T_OBJVAL); goto start; }
-#line 6588 "src/parser.c"
-yy473:
+#line 6467 "src/parser.c"
+yy458:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy531;
+                       case 'l':       goto yy507;
                        default:        goto yy62;
                        }
-yy474:
+yy459:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy533;
+                       case 's':       goto yy509;
                        default:        goto yy62;
                        }
-yy475:
+yy460:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy534;
+                       case 's':       goto yy510;
                        default:        goto yy62;
                        }
-yy476:
+yy461:
                        yyaccept = 46;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6676,15 +6555,15 @@ yy476:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy477;
+                       case 0x7F:      goto yy462;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy477:
-#line 428 "src/parser.re"
+yy462:
+#line 420 "src/parser.re"
                        { NEWTOKEN(PSI_T_RETURN); goto start; }
-#line 6687 "src/parser.c"
-yy478:
+#line 6566 "src/parser.c"
+yy463:
                        yyaccept = 47;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6751,15 +6630,15 @@ yy478:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy479;
+                       case 0x7F:      goto yy464;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy479:
-#line 421 "src/parser.re"
+yy464:
+#line 413 "src/parser.re"
                        { NEWTOKEN(PSI_T_STATIC); goto start; }
-#line 6762 "src/parser.c"
-yy480:
+#line 6641 "src/parser.c"
+yy465:
                        yyaccept = 48;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6826,15 +6705,15 @@ yy480:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy481;
+                       case 0x7F:      goto yy466;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy481:
-#line 417 "src/parser.re"
+yy466:
+#line 409 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRING); goto start; }
-#line 6837 "src/parser.c"
-yy482:
+#line 6716 "src/parser.c"
+yy467:
                        yyaccept = 49;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6901,15 +6780,15 @@ yy482:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy483;
+                       case 0x7F:      goto yy468;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy483:
-#line 431 "src/parser.re"
+yy468:
+#line 423 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRLEN); goto start; }
-#line 6912 "src/parser.c"
-yy484:
+#line 6791 "src/parser.c"
+yy469:
                        yyaccept = 50;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6976,39 +6855,39 @@ yy484:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy485;
+                       case 0x7F:      goto yy470;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy485:
-#line 432 "src/parser.re"
+yy470:
+#line 424 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRVAL); goto start; }
-#line 6987 "src/parser.c"
-yy486:
+#line 6866 "src/parser.c"
+yy471:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy535;
+                       case 'a':       goto yy511;
                        default:        goto yy62;
                        }
-yy487:
+yy472:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy536;
+                       case 'l':       goto yy512;
                        default:        goto yy62;
                        }
-yy488:
+yy473:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy538;
+                       case 'a':       goto yy514;
                        default:        goto yy62;
                        }
-yy489:
+yy474:
                        yyaccept = 51;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7075,74 +6954,74 @@ yy489:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy490;
+                       case 0x7F:      goto yy475;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy490:
-#line 445 "src/parser.re"
+yy475:
+#line 437 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_INT); goto start; }
-#line 7086 "src/parser.c"
-yy491:
+#line 6965 "src/parser.c"
+yy476:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy539;
+                       case 'e':       goto yy515;
                        default:        goto yy62;
                        }
-yy492:
+yy477:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy540;
+                       case 'i':       goto yy516;
                        default:        goto yy62;
                        }
-yy493:
+yy478:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy541;
+                       case 'g':       goto yy517;
                        default:        goto yy62;
                        }
-yy494:
+yy479:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy543;
+                       case '_':       goto yy519;
                        default:        goto yy62;
                        }
-yy495:
+yy480:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy545;
+                       case 'i':       goto yy521;
                        default:        goto yy62;
                        }
-yy496:
+yy481:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy546;
+                       case 'n':       goto yy522;
                        default:        goto yy62;
                        }
-yy497:
+yy482:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy547;
+                       case 'n':       goto yy523;
                        default:        goto yy62;
                        }
-yy498:
+yy483:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy548;
+                       case 'r':       goto yy524;
                        default:        goto yy62;
                        }
-yy499:
+yy484:
                        yyaccept = 52;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7209,36 +7088,15 @@ yy499:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy500;
+                       case 0x7F:      goto yy485;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy500:
+yy485:
 #line 388 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOUBLE); goto start; }
-#line 7220 "src/parser.c"
-yy501:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy549;
-                       default:        goto yy62;
-                       }
-yy502:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy551;
-                       default:        goto yy62;
-                       }
-yy503:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy553;
-                       default:        goto yy62;
-                       }
-yy504:
+#line 7099 "src/parser.c"
+yy486:
                        yyaccept = 53;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7305,15 +7163,15 @@ yy504:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy505;
+                       case 0x7F:      goto yy487;
                        case '\\':      goto yy146;
-                       default:        goto yy61;
+                       default:        goto yy525;
                        }
-yy505:
-#line 389 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT8); goto start; }
-#line 7316 "src/parser.c"
-yy506:
+yy487:
+#line 367 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PRAGMA); goto start; }
+#line 7174 "src/parser.c"
+yy488:
                        yyaccept = 54;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7380,15 +7238,15 @@ yy506:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy507;
+                       case 0x7F:      goto yy489;
                        case '\\':      goto yy146;
-                       default:        goto yy555;
+                       default:        goto yy61;
                        }
-yy507:
-#line 367 "src/parser.re"
-                       { NEWTOKEN(PSI_T_PRAGMA); goto start; }
-#line 7391 "src/parser.c"
-yy508:
+yy489:
+#line 390 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SIGNED); goto start; }
+#line 7249 "src/parser.c"
+yy490:
                        yyaccept = 55;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7455,15 +7313,15 @@ yy508:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy509;
+                       case 0x7F:      goto yy491;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy509:
-#line 398 "src/parser.re"
-                       { NEWTOKEN(PSI_T_SIGNED); goto start; }
-#line 7466 "src/parser.c"
-yy510:
+yy491:
+#line 374 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SIZEOF); goto start; }
+#line 7324 "src/parser.c"
+yy492:
                        yyaccept = 56;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7530,140 +7388,37 @@ yy510:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy511;
+                       case 0x7F:      goto yy493;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy511:
-#line 374 "src/parser.re"
-                       { NEWTOKEN(PSI_T_SIZEOF); goto start; }
-#line 7541 "src/parser.c"
-yy512:
-                       yyaccept = 57;
+yy493:
+#line 377 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRUCT); goto start; }
+#line 7399 "src/parser.c"
+yy494:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 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 yy513;
-                       case '\\':      goto yy146;
-                       default:        goto yy61;
-                       }
-yy513:
-#line 377 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STRUCT); goto start; }
-#line 7616 "src/parser.c"
-yy514:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'f':       goto yy557;
-                       default:        goto yy62;
-                       }
-yy515:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy559;
-                       default:        goto yy62;
-                       }
-yy516:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy560;
-                       default:        goto yy62;
-                       }
-yy517:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy561;
+                       case 'f':       goto yy527;
                        default:        goto yy62;
                        }
-yy518:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy562;
-                       default:        goto yy62;
-                       }
-yy519:
+yy495:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy564;
+                       case 'e':       goto yy529;
                        default:        goto yy62;
                        }
-yy520:
+yy496:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'l':       goto yy565;
+                       case 'l':       goto yy530;
                        default:        goto yy62;
                        }
-yy521:
-                       yyaccept = 58;
+yy497:
+                       yyaccept = 57;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7729,32 +7484,32 @@ yy521:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy522;
+                       case 0x7F:      goto yy498;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy522:
-#line 436 "src/parser.re"
+yy498:
+#line 428 "src/parser.re"
                        { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
-#line 7740 "src/parser.c"
-yy523:
+#line 7495 "src/parser.c"
+yy499:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy566;
+                       case 'e':       goto yy531;
                        default:        goto yy62;
                        }
-yy524:
+yy500:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'K':
-                       case 'k':       goto yy568;
+                       case 'k':       goto yy533;
                        default:        goto yy62;
                        }
-yy525:
-                       yyaccept = 59;
+yy501:
+                       yyaccept = 58;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7820,32 +7575,32 @@ yy525:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy526;
+                       case 0x7F:      goto yy502;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy526:
-#line 406 "src/parser.re"
+yy502:
+#line 398 "src/parser.re"
                        { NEWTOKEN(PSI_T_DEFINED); goto start; }
-#line 7831 "src/parser.c"
-yy527:
+#line 7586 "src/parser.c"
+yy503:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy570;
+                       case 'l':       goto yy535;
                        default:        goto yy62;
                        }
-yy528:
+yy504:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy572;
+                       case 'n':       goto yy537;
                        default:        goto yy62;
                        }
-yy529:
-                       yyaccept = 60;
+yy505:
+                       yyaccept = 59;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7911,17 +7666,17 @@ yy529:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy530;
+                       case 0x7F:      goto yy506;
                        case '\\':      goto yy146;
-                       case '_':       goto yy574;
+                       case '_':       goto yy539;
                        default:        goto yy61;
                        }
-yy530:
-#line 410 "src/parser.re"
+yy506:
+#line 402 "src/parser.re"
                        { NEWTOKEN(PSI_T_INCLUDE); goto start; }
-#line 7923 "src/parser.c"
-yy531:
-                       yyaccept = 61;
+#line 7678 "src/parser.c"
+yy507:
+                       yyaccept = 60;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7987,40 +7742,40 @@ yy531:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy532;
+                       case 0x7F:      goto yy508;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy532:
-#line 433 "src/parser.re"
+yy508:
+#line 425 "src/parser.re"
                        { NEWTOKEN(PSI_T_PATHVAL); goto start; }
-#line 7998 "src/parser.c"
-yy533:
+#line 7753 "src/parser.c"
+yy509:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy575;
+                       case 's':       goto yy540;
                        default:        goto yy62;
                        }
-yy534:
+yy510:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy576;
+                       case 'e':       goto yy541;
                        default:        goto yy62;
                        }
-yy535:
+yy511:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy577;
+                       case 'y':       goto yy542;
                        default:        goto yy62;
                        }
-yy536:
-                       yyaccept = 62;
+yy512:
+                       yyaccept = 61;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8086,40 +7841,40 @@ yy536:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy537;
+                       case 0x7F:      goto yy513;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy537:
-#line 447 "src/parser.re"
+yy513:
+#line 439 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_BOOL); goto start; }
-#line 8097 "src/parser.c"
-yy538:
+#line 7852 "src/parser.c"
+yy514:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy579;
+                       case 't':       goto yy544;
                        default:        goto yy62;
                        }
-yy539:
+yy515:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy581;
+                       case 'c':       goto yy546;
                        default:        goto yy62;
                        }
-yy540:
+yy516:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy582;
+                       case 'n':       goto yy547;
                        default:        goto yy62;
                        }
-yy541:
-                       yyaccept = 63;
+yy517:
+                       yyaccept = 62;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8185,16 +7940,16 @@ yy541:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy542;
+                       case 0x7F:      goto yy518;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy542:
-#line 408 "src/parser.re"
+yy518:
+#line 400 "src/parser.re"
                        { NEWTOKEN(PSI_T_WARNING); goto start; }
-#line 8196 "src/parser.c"
-yy543:
-                       yyaccept = 64;
+#line 7951 "src/parser.c"
+yy519:
+                       yyaccept = 63;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8260,45 +8015,47 @@ yy543:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy544;
+                       case 0x7F:      goto yy520;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy544:
+yy520:
 #line 372 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_ASM); goto start; }
-#line 8271 "src/parser.c"
-yy545:
+#line 8026 "src/parser.c"
+yy521:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'b':       goto yy583;
+                       case 'b':       goto yy548;
                        default:        goto yy62;
                        }
-yy546:
+yy522:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy584;
+                       case 's':       goto yy549;
                        default:        goto yy62;
                        }
-yy547:
+yy523:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy585;
+                       case 'e':       goto yy550;
                        default:        goto yy62;
                        }
-yy548:
+yy524:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy587;
+                       case 'i':       goto yy552;
                        default:        goto yy62;
                        }
-yy549:
-                       yyaccept = 65;
-                       yych = *(mrk = ++cur);
+yy525:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
                        switch (yych) {
                        case 0x00:
                        case 0x01:
@@ -8363,16 +8120,13 @@ yy549:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy550;
+                       case 0x7F:      goto yy55;
                        case '\\':      goto yy146;
-                       default:        goto yy61;
+                       case 'o':       goto yy553;
+                       default:        goto yy525;
                        }
-yy550:
-#line 391 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT16); goto start; }
-#line 8374 "src/parser.c"
-yy551:
-                       yyaccept = 66;
+yy527:
+                       yyaccept = 64;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8438,16 +8192,30 @@ yy551:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy552;
+                       case 0x7F:      goto yy528;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy552:
-#line 393 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT32); goto start; }
-#line 8449 "src/parser.c"
-yy553:
-                       yyaccept = 67;
+yy528:
+#line 376 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
+#line 8203 "src/parser.c"
+yy529:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'd':       goto yy555;
+                       default:        goto yy62;
+                       }
+yy530:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy557;
+                       default:        goto yy62;
+                       }
+yy531:
+                       yyaccept = 65;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8513,19 +8281,17 @@ yy553:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy554;
+                       case 0x7F:      goto yy532;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy554:
-#line 395 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT64); goto start; }
-#line 8524 "src/parser.c"
-yy555:
-                       yyaccept = 5;
-                       mrk = ++cur;
-                       if (lim <= cur) if (cur >= lim) goto done;;
-                       yych = *cur;
+yy532:
+#line 408 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLABLE); goto start; }
+#line 8292 "src/parser.c"
+yy533:
+                       yyaccept = 66;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
                        case 0x01:
@@ -8590,597 +8356,16 @@ yy555:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy55;
-                       case '\\':      goto yy146;
-                       case 'o':       goto yy588;
-                       default:        goto yy555;
-                       }
-yy557:
-                       yyaccept = 68;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 0x00:
-                       case 0x01:
-                       case 0x02:
-                       case 0x03:
-                       case 0x04:
-                       case 0x05:
-                       case 0x06:
-                       case 0x07:
-                       case 0x08:
-                       case '\t':
-                       case '\n':
-                       case '\v':
-                       case '\f':
-                       case '\r':
-                       case 0x0E:
-                       case 0x0F:
-                       case 0x10:
-                       case 0x11:
-                       case 0x12:
-                       case 0x13:
-                       case 0x14:
-                       case 0x15:
-                       case 0x16:
-                       case 0x17:
-                       case 0x18:
-                       case 0x19:
-                       case 0x1A:
-                       case 0x1B:
-                       case 0x1C:
-                       case 0x1D:
-                       case 0x1E:
-                       case 0x1F:
-                       case ' ':
-                       case '!':
-                       case '"':
-                       case '#':
-                       case '$':
-                       case '%':
-                       case '&':
-                       case '\'':
-                       case '(':
-                       case ')':
-                       case '*':
-                       case '+':
-                       case ',':
-                       case '-':
-                       case '.':
-                       case '/':
-                       case ':':
-                       case ';':
-                       case '<':
-                       case '=':
-                       case '>':
-                       case '?':
-                       case '@':
-                       case '[':
-                       case ']':
-                       case '^':
-                       case '`':
-                       case '{':
-                       case '|':
-                       case '}':
-                       case '~':
-                       case 0x7F:      goto yy558;
-                       case '\\':      goto yy146;
-                       default:        goto yy61;
-                       }
-yy558:
-#line 376 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
-#line 8673 "src/parser.c"
-yy559:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy590;
-                       default:        goto yy62;
-                       }
-yy560:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy592;
-                       default:        goto yy62;
-                       }
-yy561:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy594;
-                       default:        goto yy62;
-                       }
-yy562:
-                       yyaccept = 69;
-                       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 yy563;
-                       case '\\':      goto yy146;
-                       default:        goto yy61;
-                       }
-yy563:
-#line 390 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT8); goto start; }
-#line 8769 "src/parser.c"
-yy564:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'd':       goto yy596;
-                       default:        goto yy62;
-                       }
-yy565:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'e':       goto yy598;
-                       default:        goto yy62;
-                       }
-yy566:
-                       yyaccept = 70;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 0x00:
-                       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 yy567;
-                       case '\\':      goto yy146;
-                       default:        goto yy61;
-                       }
-yy567:
-#line 416 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CALLABLE); goto start; }
-#line 8858 "src/parser.c"
-yy568:
-                       yyaccept = 71;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 0x00:
-                       case 0x01:
-                       case 0x02:
-                       case 0x03:
-                       case 0x04:
-                       case 0x05:
-                       case 0x06:
-                       case 0x07:
-                       case 0x08:
-                       case '\t':
-                       case '\n':
-                       case '\v':
-                       case '\f':
-                       case '\r':
-                       case 0x0E:
-                       case 0x0F:
-                       case 0x10:
-                       case 0x11:
-                       case 0x12:
-                       case 0x13:
-                       case 0x14:
-                       case 0x15:
-                       case 0x16:
-                       case 0x17:
-                       case 0x18:
-                       case 0x19:
-                       case 0x1A:
-                       case 0x1B:
-                       case 0x1C:
-                       case 0x1D:
-                       case 0x1E:
-                       case 0x1F:
-                       case ' ':
-                       case '!':
-                       case '"':
-                       case '#':
-                       case '$':
-                       case '%':
-                       case '&':
-                       case '\'':
-                       case '(':
-                       case ')':
-                       case '*':
-                       case '+':
-                       case ',':
-                       case '-':
-                       case '.':
-                       case '/':
-                       case ':':
-                       case ';':
-                       case '<':
-                       case '=':
-                       case '>':
-                       case '?':
-                       case '@':
-                       case '[':
-                       case ']':
-                       case '^':
-                       case '`':
-                       case '{':
-                       case '|':
-                       case '}':
-                       case '~':
-                       case 0x7F:      goto yy569;
-                       case '\\':      goto yy146;
-                       default:        goto yy61;
-                       }
-yy569:
-#line 420 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CALLBACK); goto start; }
-#line 8933 "src/parser.c"
-yy570:
-                       yyaccept = 72;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 0x00:
-                       case 0x01:
-                       case 0x02:
-                       case 0x03:
-                       case 0x04:
-                       case 0x05:
-                       case 0x06:
-                       case 0x07:
-                       case 0x08:
-                       case '\t':
-                       case '\n':
-                       case '\v':
-                       case '\f':
-                       case '\r':
-                       case 0x0E:
-                       case 0x0F:
-                       case 0x10:
-                       case 0x11:
-                       case 0x12:
-                       case 0x13:
-                       case 0x14:
-                       case 0x15:
-                       case 0x16:
-                       case 0x17:
-                       case 0x18:
-                       case 0x19:
-                       case 0x1A:
-                       case 0x1B:
-                       case 0x1C:
-                       case 0x1D:
-                       case 0x1E:
-                       case 0x1F:
-                       case ' ':
-                       case '!':
-                       case '"':
-                       case '#':
-                       case '$':
-                       case '%':
-                       case '&':
-                       case '\'':
-                       case '(':
-                       case ')':
-                       case '*':
-                       case '+':
-                       case ',':
-                       case '-':
-                       case '.':
-                       case '/':
-                       case ':':
-                       case ';':
-                       case '<':
-                       case '=':
-                       case '>':
-                       case '?':
-                       case '@':
-                       case '[':
-                       case ']':
-                       case '^':
-                       case '`':
-                       case '{':
-                       case '|':
-                       case '}':
-                       case '~':
-                       case 0x7F:      goto yy571;
-                       case '\\':      goto yy146;
-                       default:        goto yy61;
-                       }
-yy571:
-#line 435 "src/parser.re"
-                       { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
-#line 9008 "src/parser.c"
-yy572:
-                       yyaccept = 73;
-                       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 yy573;
-                       case '\\':      goto yy146;
-                       default:        goto yy61;
-                       }
-yy573:
-#line 422 "src/parser.re"
-                       { NEWTOKEN(PSI_T_FUNCTION); goto start; }
-#line 9083 "src/parser.c"
-yy574:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy600;
-                       default:        goto yy62;
-                       }
-yy575:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy601;
-                       default:        goto yy62;
-                       }
-yy576:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy602;
-                       default:        goto yy62;
-                       }
-yy577:
-                       yyaccept = 74;
-                       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 yy578;
-                       case '\\':      goto yy146;
-                       default:        goto yy61;
-                       }
-yy578:
-#line 443 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
-#line 9182 "src/parser.c"
-yy579:
-                       yyaccept = 75;
+                       case 0x7F:      goto yy534;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
+                       }
+yy534:
+#line 412 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLBACK); goto start; }
+#line 8367 "src/parser.c"
+yy535:
+                       yyaccept = 67;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9246,46 +8431,16 @@ yy579:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy580;
+                       case 0x7F:      goto yy536;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy580:
-#line 446 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
-#line 9257 "src/parser.c"
-yy581:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy603;
-                       default:        goto yy62;
-                       }
-yy582:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy605;
-                       default:        goto yy62;
-                       }
-yy583:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'u':       goto yy607;
-                       default:        goto yy62;
-                       }
-yy584:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'i':       goto yy608;
-                       default:        goto yy62;
-                       }
-yy585:
-                       yyaccept = 76;
+yy536:
+#line 427 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
+#line 8442 "src/parser.c"
+yy537:
+                       yyaccept = 68;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9351,26 +8506,41 @@ yy585:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy586;
+                       case 0x7F:      goto yy538;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy586:
-#line 369 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CPP_INLINE); goto start; }
-#line 9362 "src/parser.c"
-yy587:
+yy538:
+#line 414 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FUNCTION); goto start; }
+#line 8517 "src/parser.c"
+yy539:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'c':       goto yy609;
+                       case 'N':
+                       case 'n':       goto yy559;
                        default:        goto yy62;
                        }
-yy588:
+yy540:
                        yyaccept = 5;
-                       mrk = ++cur;
-                       if (lim <= cur) if (cur >= lim) goto done;;
-                       yych = *cur;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy560;
+                       default:        goto yy62;
+                       }
+yy541:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy561;
+                       default:        goto yy62;
+                       }
+yy542:
+                       yyaccept = 69;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
                        case 0x01:
@@ -9435,14 +8605,16 @@ yy588:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy55;
+                       case 0x7F:      goto yy543;
                        case '\\':      goto yy146;
-                       case 'n':       goto yy610;
-                       case 'o':       goto yy588;
-                       default:        goto yy555;
+                       default:        goto yy61;
                        }
-yy590:
-                       yyaccept = 77;
+yy543:
+#line 435 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
+#line 8616 "src/parser.c"
+yy544:
+                       yyaccept = 70;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9508,16 +8680,46 @@ yy590:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy591;
+                       case 0x7F:      goto yy545;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy591:
-#line 392 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT16); goto start; }
-#line 9519 "src/parser.c"
-yy592:
-                       yyaccept = 78;
+yy545:
+#line 438 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
+#line 8691 "src/parser.c"
+yy546:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy562;
+                       default:        goto yy62;
+                       }
+yy547:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'G':
+                       case 'g':       goto yy564;
+                       default:        goto yy62;
+                       }
+yy548:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'u':       goto yy566;
+                       default:        goto yy62;
+                       }
+yy549:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy567;
+                       default:        goto yy62;
+                       }
+yy550:
+                       yyaccept = 71;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9583,18 +8785,27 @@ yy592:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy593;
+                       case 0x7F:      goto yy551;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy593:
-#line 394 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT32); goto start; }
-#line 9594 "src/parser.c"
-yy594:
-                       yyaccept = 79;
+yy551:
+#line 369 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_INLINE); goto start; }
+#line 8796 "src/parser.c"
+yy552:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
+                       case 'c':       goto yy568;
+                       default:        goto yy62;
+                       }
+yy553:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
                        case 0x00:
                        case 0x01:
                        case 0x02:
@@ -9658,16 +8869,14 @@ yy594:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy595;
+                       case 0x7F:      goto yy55;
                        case '\\':      goto yy146;
-                       default:        goto yy61;
+                       case 'n':       goto yy569;
+                       case 'o':       goto yy553;
+                       default:        goto yy525;
                        }
-yy595:
-#line 396 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT64); goto start; }
-#line 9669 "src/parser.c"
-yy596:
-                       yyaccept = 80;
+yy555:
+                       yyaccept = 72;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9733,16 +8942,16 @@ yy596:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy597;
+                       case 0x7F:      goto yy556;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy597:
-#line 397 "src/parser.re"
+yy556:
+#line 389 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
-#line 9744 "src/parser.c"
-yy598:
-                       yyaccept = 81;
+#line 8953 "src/parser.c"
+yy557:
+                       yyaccept = 73;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9808,40 +9017,40 @@ yy598:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy599;
+                       case 0x7F:      goto yy558;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy599:
+yy558:
 #line 373 "src/parser.re"
                        { NEWTOKEN(PSI_T_VOLATILE); goto start; }
-#line 9819 "src/parser.c"
-yy600:
+#line 9028 "src/parser.c"
+yy559:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy611;
+                       case 'e':       goto yy570;
                        default:        goto yy62;
                        }
-yy601:
+yy560:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy612;
+                       case 'r':       goto yy571;
                        default:        goto yy62;
                        }
-yy602:
+yy561: