just predefine stdc inttypes

diff --git a/m4/posix/stdint.m4 b/m4/posix/stdint.m4
index c21c129167bd33c5e126c82e7f7c57004dc01209..8ab911204b6fef1d378ee4c1a0eae85a990c994c 100644 (file)
--- a/m4/posix/stdint.m4
+++ b/m4/posix/stdint.m4
@@ -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)

diff --git a/m4/psi/psi_type.m4 b/m4/psi/psi_type.m4
index b3940a4617e45a3915fe0e7767e426c3a8b7a48a..8dad63369bdeab31b84bb97c55e10672aec75700 100644 (file)
--- a/m4/psi/psi_type.m4
+++ b/m4/psi/psi_type.m4
@@ -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 *)
 

diff --git a/src/context.c b/src/context.c
index 73422be98df3b03de2d35595e511f06179bd1654..5749a73f595ecf560a8028a761757b0c814d083e 100644 (file)
--- a/src/context.c
+++ b/src/context.c
@@ -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;

diff --git a/src/libffi.c b/src/libffi.c
index 2ba48319c0d9a8c28f5c47ffa4aa57613c0d7b42..1569693ee559e883e0c573de46f39124dc768281 100644 (file)
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -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:

diff --git a/src/libjit.c b/src/libjit.c
index 7c4819121869af2e6695947b025ce16bfb81b287..ceafb3184c438f5f7f626e852b351df0324e9224 100644 (file)
--- a/src/libjit.c
+++ b/src/libjit.c
@@ -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:

diff --git a/src/marshal.c b/src/marshal.c
index 805f12d1ecb8e487be3da35f085fc29c2bd2ea7a..959291a31fb914f822205b34e1a54153766e950e 100644 (file)
--- a/src/marshal.c
+++ b/src/marshal.c
@@ -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;
 }
 

diff --git a/src/module.c b/src/module.c
index 3cd45f9efde40ecf0433c20589274501af71dfea..0c8b3b3315bb0f38b358383fc4ddcc615465d7ef 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -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");
 }
 

diff --git a/src/parser.c b/src/parser.c
index 74cfe6c2aa69cc98638c6177cde6eefdde0489e9..ace7900dfcbebd5f6ebbd9c8440c99e6ecf7585e 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -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:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy613;
+                       case 't':       goto yy572;
                        default:        goto yy62;
                        }
-yy603:
-                       yyaccept = 82;
+yy562:
+                       yyaccept = 74;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9907,16 +9116,16 @@ yy603:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy604;
+                       case 0x7F:      goto yy563;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy604:
-#line 442 "src/parser.re"
+yy563:
+#line 434 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_OBJECT); goto start; }
-#line 9918 "src/parser.c"
-yy605:
-                       yyaccept = 83;
+#line 9127 "src/parser.c"
+yy564:
+                       yyaccept = 75;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9982,36 +9191,36 @@ yy605:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy606;
+                       case 0x7F:      goto yy565;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy606:
-#line 444 "src/parser.re"
+yy565:
+#line 436 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_STRING); goto start; }
-#line 9993 "src/parser.c"
-yy607:
+#line 9202 "src/parser.c"
+yy566:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy615;
+                       case 't':       goto yy574;
                        default:        goto yy62;
                        }
-yy608:
+yy567:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy616;
+                       case 'o':       goto yy575;
                        default:        goto yy62;
                        }
-yy609:
+yy568:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy617;
+                       case 't':       goto yy576;
                        default:        goto yy62;
                        }
-yy610:
+yy569:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10082,28 +9291,28 @@ yy610:
                        case '~':
                        case 0x7F:      goto yy55;
                        case '\\':      goto yy146;
-                       case 'c':       goto yy619;
-                       case 'o':       goto yy588;
-                       default:        goto yy555;
+                       case 'c':       goto yy578;
+                       case 'o':       goto yy553;
+                       default:        goto yy525;
                        }
-yy611:
+yy570:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'X':
-                       case 'x':       goto yy620;
+                       case 'x':       goto yy579;
                        default:        goto yy62;
                        }
-yy612:
+yy571:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy621;
+                       case 't':       goto yy580;
                        default:        goto yy62;
                        }
-yy613:
-                       yyaccept = 84;
+yy572:
+                       yyaccept = 76;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10169,30 +9378,30 @@ yy613:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy614;
+                       case 0x7F:      goto yy573;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy614:
-#line 426 "src/parser.re"
+yy573:
+#line 418 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
-#line 10180 "src/parser.c"
-yy615:
+#line 9389 "src/parser.c"
+yy574:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy623;
+                       case 'e':       goto yy582;
                        default:        goto yy62;
                        }
-yy616:
+yy575:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy624;
+                       case 'n':       goto yy583;
                        default:        goto yy62;
                        }
-yy617:
-                       yyaccept = 85;
+yy576:
+                       yyaccept = 77;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10258,15 +9467,15 @@ yy617:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy618;
+                       case 0x7F:      goto yy577;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy618:
+yy577:
 #line 370 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_RESTRICT); goto start; }
-#line 10269 "src/parser.c"
-yy619:
+#line 9478 "src/parser.c"
+yy578:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10337,20 +9546,20 @@ yy619:
                        case '~':
                        case 0x7F:      goto yy55;
                        case '\\':      goto yy146;
-                       case 'e':       goto yy625;
-                       case 'o':       goto yy588;
-                       default:        goto yy555;
+                       case 'e':       goto yy584;
+                       case 'o':       goto yy553;
+                       default:        goto yy525;
                        }
-yy620:
+yy579:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy627;
+                       case 't':       goto yy586;
                        default:        goto yy62;
                        }
-yy621:
-                       yyaccept = 86;
+yy580:
+                       yyaccept = 78;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10416,30 +9625,30 @@ yy621:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy622;
+                       case 0x7F:      goto yy581;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy622:
-#line 427 "src/parser.re"
+yy581:
+#line 419 "src/parser.re"
                        { NEWTOKEN(PSI_T_POST_ASSERT); goto start; }
-#line 10427 "src/parser.c"
-yy623:
+#line 9636 "src/parser.c"
+yy582:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy629;
+                       case '_':       goto yy588;
                        default:        goto yy62;
                        }
-yy624:
+yy583:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy630;
+                       case '_':       goto yy589;
                        default:        goto yy62;
                        }
-yy625:
-                       yyaccept = 87;
+yy584:
+                       yyaccept = 79;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -10507,17 +9716,17 @@ yy625:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy626;
+                       case 0x7F:      goto yy585;
                        case '\\':      goto yy146;
-                       case 'o':       goto yy588;
-                       default:        goto yy555;
+                       case 'o':       goto yy553;
+                       default:        goto yy525;
                        }
-yy626:
+yy585:
 #line 368 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRAGMA_ONCE); goto start; }
-#line 10519 "src/parser.c"
-yy627:
-                       yyaccept = 88;
+#line 9728 "src/parser.c"
+yy586:
+                       yyaccept = 80;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10583,40 +9792,40 @@ yy627:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy628;
+                       case 0x7F:      goto yy587;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy628:
-#line 411 "src/parser.re"
+yy587:
+#line 403 "src/parser.re"
                        { NEWTOKEN(PSI_T_INCLUDE_NEXT); goto start; }
-#line 10594 "src/parser.c"
-yy629:
+#line 9803 "src/parser.c"
+yy588:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy631;
+                       case '_':       goto yy590;
                        default:        goto yy62;
                        }
-yy630:
+yy589:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy632;
+                       case '_':       goto yy591;
                        default:        goto yy62;
                        }
-yy631:
+yy590:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '\t':
                        case '\f':
-                       case ' ':       goto yy634;
-                       case '(':       goto yy636;
+                       case ' ':       goto yy593;
+                       case '(':       goto yy595;
                        default:        goto yy62;
                        }
-yy632:
-                       yyaccept = 89;
+yy591:
+                       yyaccept = 81;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10682,67 +9891,67 @@ yy632:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy633;
+                       case 0x7F:      goto yy592;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy633:
+yy592:
 #line 371 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_EXTENSION); goto start; }
-#line 10693 "src/parser.c"
-yy634:
+#line 9902 "src/parser.c"
+yy593:
                        ++cur;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\t':
                        case '\f':
-                       case ' ':       goto yy634;
-                       case '(':       goto yy636;
+                       case ' ':       goto yy593;
+                       case '(':       goto yy595;
                        default:        goto yy114;
                        }
-yy636:
+yy595:
                        yych = *++cur;
                        switch (yych) {
-                       case '(':       goto yy637;
+                       case '(':       goto yy596;
                        default:        goto yy114;
                        }
-yy637:
+yy596:
                        ++cur;
-#line 452 "src/parser.re"
+#line 444 "src/parser.re"
                        { parens = 2; goto cpp_attribute; }
-#line 10715 "src/parser.c"
+#line 9924 "src/parser.c"
                }
-#line 458 "src/parser.re"
+#line 450 "src/parser.re"
 
 
        character: ;
                
-#line 10722 "src/parser.c"
+#line 9931 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy643;
-                       case '\'':      goto yy645;
-                       case '\\':      goto yy647;
-                       default:        goto yy641;
+                       case '\r':      goto yy602;
+                       case '\'':      goto yy604;
+                       case '\\':      goto yy606;
+                       default:        goto yy600;
                        }
-yy641:
+yy600:
                        ++cur;
-#line 476 "src/parser.re"
+#line 468 "src/parser.re"
                        { escaped = false; goto character; }
-#line 10738 "src/parser.c"
-yy643:
+#line 9947 "src/parser.c"
+yy602:
                        ++cur;
-#line 463 "src/parser.re"
+#line 455 "src/parser.re"
                        { NEWLINE(); goto character; }
-#line 10743 "src/parser.c"
-yy645:
+#line 9952 "src/parser.c"
+yy604:
                        ++cur;
-#line 465 "src/parser.re"
+#line 457 "src/parser.re"
                        {
                        if (escaped) {
                                escaped = false;
@@ -10754,43 +9963,43 @@ yy645:
                        token->flags = char_width;
                        goto start;
                }
-#line 10758 "src/parser.c"
-yy647:
+#line 9967 "src/parser.c"
+yy606:
                        ++cur;
-#line 464 "src/parser.re"
+#line 456 "src/parser.re"
                        { escaped = !escaped;  goto character; }
-#line 10763 "src/parser.c"
+#line 9972 "src/parser.c"
                }
-#line 478 "src/parser.re"
+#line 470 "src/parser.re"
 
 
        string: ;
                
-#line 10770 "src/parser.c"
+#line 9979 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy653;
-                       case '"':       goto yy655;
-                       case '\\':      goto yy657;
-                       default:        goto yy651;
+                       case '\r':      goto yy612;
+                       case '"':       goto yy614;
+                       case '\\':      goto yy616;
+                       default:        goto yy610;
                        }
-yy651:
+yy610:
                        ++cur;
-#line 496 "src/parser.re"
+#line 488 "src/parser.re"
                        { escaped = false; goto string; }
-#line 10786 "src/parser.c"
-yy653:
+#line 9995 "src/parser.c"
+yy612:
                        ++cur;
-#line 483 "src/parser.re"
+#line 475 "src/parser.re"
                        { NEWLINE(); goto string; }
-#line 10791 "src/parser.c"
-yy655:
+#line 10000 "src/parser.c"
+yy614:
                        ++cur;
-#line 485 "src/parser.re"
+#line 477 "src/parser.re"
                        {
                        if (escaped) {
                                escaped = false;
@@ -10802,118 +10011,118 @@ yy655:
                        token->flags = char_width;
                        goto start;
                }
-#line 10806 "src/parser.c"
-yy657:
+#line 10015 "src/parser.c"
+yy616:
                        ++cur;
-#line 484 "src/parser.re"
+#line 476 "src/parser.re"
                        { escaped = !escaped; goto string; }
-#line 10811 "src/parser.c"
+#line 10020 "src/parser.c"
                }
-#line 498 "src/parser.re"
+#line 490 "src/parser.re"
 
 
        comment: ;
                
-#line 10818 "src/parser.c"
+#line 10027 "src/parser.c"
                {
                        unsigned char yych;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy663;
-                       case '*':       goto yy665;
-                       default:        goto yy661;
+                       case '\r':      goto yy622;
+                       case '*':       goto yy624;
+                       default:        goto yy620;
                        }
-yy661:
+yy620:
                        ++cur;
-yy662:
-#line 505 "src/parser.re"
+yy621:
+#line 497 "src/parser.re"
                        { goto comment; }
-#line 10834 "src/parser.c"
-yy663:
+#line 10043 "src/parser.c"
+yy622:
                        ++cur;
-#line 503 "src/parser.re"
+#line 495 "src/parser.re"
                        { NEWLINE(); goto comment; }
-#line 10839 "src/parser.c"
-yy665:
+#line 10048 "src/parser.c"
+yy624:
                        yych = *++cur;
                        switch (yych) {
-                       case '/':       goto yy666;
-                       default:        goto yy662;
+                       case '/':       goto yy625;
+                       default:        goto yy621;
                        }
-yy666:
+yy625:
                        ++cur;
-#line 504 "src/parser.re"
+#line 496 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); goto start; }
-#line 10850 "src/parser.c"
+#line 10059 "src/parser.c"
                }
-#line 507 "src/parser.re"
+#line 499 "src/parser.re"
 
 
        comment_sl: ;
                
-#line 10857 "src/parser.c"
+#line 10066 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy672;
-                       default:        goto yy670;
+                       case '\r':      goto yy631;
+                       default:        goto yy629;
                        }
-yy670:
+yy629:
                        ++cur;
-#line 513 "src/parser.re"
+#line 505 "src/parser.re"
                        { goto comment_sl; }
-#line 10871 "src/parser.c"
-yy672:
+#line 10080 "src/parser.c"
+yy631:
                        ++cur;
-#line 512 "src/parser.re"
+#line 504 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); NEWLINE(); goto start; }
-#line 10876 "src/parser.c"
+#line 10085 "src/parser.c"
                }
-#line 515 "src/parser.re"
+#line 507 "src/parser.re"
 
 
        cpp_attribute: ;
 
                
-#line 10884 "src/parser.c"
+#line 10093 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy678;
-                       case '(':       goto yy680;
-                       case ')':       goto yy682;
-                       default:        goto yy676;
+                       case '\r':      goto yy637;
+                       case '(':       goto yy639;
+                       case ')':       goto yy641;
+                       default:        goto yy635;
                        }
-yy676:
+yy635:
                        ++cur;
-#line 524 "src/parser.re"
+#line 516 "src/parser.re"
                        { goto cpp_attribute; }
-#line 10900 "src/parser.c"
-yy678:
+#line 10109 "src/parser.c"
+yy637:
                        ++cur;
-#line 523 "src/parser.re"
+#line 515 "src/parser.re"
                        { NEWLINE(); goto cpp_attribute; }
-#line 10905 "src/parser.c"
-yy680:
+#line 10114 "src/parser.c"
+yy639:
                        ++cur;
-#line 521 "src/parser.re"
+#line 513 "src/parser.re"
                        { ++parens; goto cpp_attribute; }
-#line 10910 "src/parser.c"
-yy682:
+#line 10119 "src/parser.c"
+yy641:
                        ++cur;
-#line 522 "src/parser.re"
+#line 514 "src/parser.re"
                        { if (parens == 1) { NEWTOKEN(PSI_T_CPP_ATTRIBUTE); goto start; } else { --parens; goto cpp_attribute; } }
-#line 10915 "src/parser.c"
+#line 10124 "src/parser.c"
                }
-#line 526 "src/parser.re"
+#line 518 "src/parser.re"
 
 error: ;
 

diff --git a/src/parser.re b/src/parser.re
index a5f271d328c000c537764ebcef9799eafb31187b..9d8288eb90287e523c08e91f81b39827c0f00834 100644 (file)
--- a/src/parser.re
+++ b/src/parser.re
@@ -386,14 +386,6 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                "long"                  { NEWTOKEN(PSI_T_LONG); goto start; }
                "float"                 { NEWTOKEN(PSI_T_FLOAT); goto start; }
                "double"                { NEWTOKEN(PSI_T_DOUBLE); goto start; }
-               "int8_t"                { NEWTOKEN(PSI_T_INT8); goto start; }
-               "uint8_t"               { NEWTOKEN(PSI_T_UINT8); goto start; }
-               "int16_t"               { NEWTOKEN(PSI_T_INT16); goto start; }
-               "uint16_t"              { NEWTOKEN(PSI_T_UINT16); goto start; }
-               "int32_t"               { NEWTOKEN(PSI_T_INT32); goto start; }
-               "uint32_t"              { NEWTOKEN(PSI_T_UINT32); goto start; }
-               "int64_t"               { NEWTOKEN(PSI_T_INT64); goto start; }
-               "uint64_t"              { NEWTOKEN(PSI_T_UINT64); goto start; }
                "unsigned"              { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
                "signed"                { NEWTOKEN(PSI_T_SIGNED); goto start; }
                'IF'                    { NEWTOKEN(PSI_T_IF); goto start; }

diff --git a/src/parser_proc.c b/src/parser_proc.c
index a24bbbcdfc7bd02cdc415385e77c25b3a14f100b..076c6c7660fb4d1ab83ae185e46f037d7e622305 100644 (file)
--- a/src/parser_proc.c
+++ b/src/parser_proc.c
@@ -96,9 +96,6 @@ static YYSTYPE yyval_default;
 
 #include <assert.h>
 #include <stdarg.h>
-#include <fnmatch.h>
-
-#include "php_psi.h"
 
 #include "plist.h"
 #include "parser.h"
@@ -150,16 +147,11 @@ static inline void psi_parser_proc_add_const(struct psi_parser *P, struct psi_co
 
 }
 static inline void psi_parser_proc_add_decl(struct psi_parser *P, struct psi_decl *decl) {
-       char *blacklisted;
-       size_t i = 0;
-
        assert(decl);
-
-       while (psi_plist_get(PSI_G(blacklist).decls, i++, &blacklisted)) {
-               if (!fnmatch(blacklisted, decl->func->var->name, 0)) {
-                       psi_decl_free(&decl);
-                       return;
-               }
+       
+       if (psi_decl_is_blacklisted(decl->func->var->name)) {
+               psi_decl_free(&decl);
+               return;
        }
 
        if (!P->decls) {
@@ -177,7 +169,7 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp
 
 /* end code */
 
-#line 181 "src/parser_proc.c" /* glr.c:264  */
+#line 173 "src/parser_proc.c" /* glr.c:264  */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -282,18 +274,18 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  178
+#define YYFINAL  168
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   4188
+#define YYLAST   3607
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  135
+#define YYNTOKENS  127
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  134
+#define YYNNTS  133
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  641
+#define YYNRULES  615
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  893
+#define YYNSTATES  866
 /* YYMAXRHS -- Maximum number of symbols on right-hand side of rule.  */
 #define YYMAXRHS 13
 /* YYMAXLEFT -- Maximum number of symbols to the left of a handle
@@ -302,7 +294,7 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp
 
 /* YYTRANSLATE(X) -- Bison symbol number corresponding to X.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   389
+#define YYMAXUTOK   381
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -348,78 +340,75 @@ static const unsigned char yytranslate[] =
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133,   134
+     125,   126
 };
 
 #if YYDEBUG
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   395,   395,   395,   395,   395,   395,   395,   395,   395,
-     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
-     396,   396,   396,   396,   397,   397,   397,   397,   397,   397,
-     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
-     397,   397,   398,   398,   398,   398,   398,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   399,   399,   399,
-     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
-     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
-     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
-     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
-     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
-     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
-     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
-     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
-     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
-     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
-     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
-     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
-     403,   404,   407,   408,   411,   412,   413,   414,   420,   428,
-     431,   434,   435,   436,   439,   442,   445,   448,   454,   460,
-     463,   469,   492,   496,   500,   505,   509,   513,   517,   524,
-     525,   529,   530,   534,   535,   536,   540,   541,   545,   546,
-     550,   551,   552,   556,   557,   561,   562,   563,   564,   565,
-     566,   567,   571,   576,   584,   587,   590,   591,   597,   602,
-     610,   613,   617,   621,   628,   632,   636,   640,   645,   655,
-     665,   670,   675,   679,   685,   694,   697,   701,   705,   711,
-     718,   724,   725,   726,   727,   731,   734,   765,   772,   773,
-     774,   775,   779,   782,   791,   797,   800,   806,   809,   815,
-     816,   824,   835,   844,   853,   861,   862,   866,   876,   885,
-     897,   900,   903,   907,   911,   915,   920,   925,   933,   934,
-     935,   938,   944,   947,   950,   956,   957,   958,   959,   960,
-     961,   962,   963,   967,   968,   972,   975,   978,   984,   987,
-     990,   998,  1010,  1013,  1016,  1023,  1026,  1036,  1039,  1042,
-    1045,  1046,  1047,  1051,  1054,  1057,  1068,  1071,  1077,  1078,
-    1082,  1083,  1087,  1091,  1097,  1098,  1104,  1107,  1113,  1116,
-    1119,  1125,  1129,  1130,  1134,  1135,  1139,  1140,  1147,  1148,
-    1152,  1159,  1170,  1177,  1188,  1195,  1206,  1217,  1231,  1232,
-    1244,  1247,  1250,  1253,  1260,  1263,  1269,  1278,  1290,  1298,
-    1301,  1311,  1324,  1329,  1337,  1347,  1357,  1360,  1364,  1370,
-    1384,  1401,  1404,  1410,  1417,  1427,  1434,  1437,  1443,  1448,
-    1456,  1460,  1464,  1468,  1472,  1476,  1483,  1487,  1491,  1495,
-    1499,  1505,  1509,  1516,  1519,  1530,  1534,  1538,  1544,  1557,
-    1570,  1583,  1586,  1593,  1596,  1599,  1602,  1608,  1612,  1619,
-    1622,  1625,  1635,  1638,  1644,  1645,  1651,  1654,  1660,  1661,
-    1671,  1674,  1681,  1686,  1691,  1701,  1704,  1710,  1713,  1719,
-    1726,  1733,  1734,  1735,  1736,  1737,  1738,  1739,  1740,  1741,
-    1745,  1748,  1754,  1757,  1760,  1763,  1766,  1772,  1776,  1784,
-    1785,  1789,  1796,  1799,  1802,  1806,  1809,  1812,  1818,  1822,
-    1830,  1837,  1845,  1853,  1854,  1855,  1856,  1857,  1858,  1859,
-    1860,  1861,  1862,  1866,  1869,  1875,  1878,  1884,  1885,  1889,
-    1892,  1898,  1901,  1907,  1914,  1921,  1924,  1927,  1934,  1939,
-    1947,  1948,  1949,  1950,  1951,  1952,  1953,  1954,  1958,  1961,
-    1967,  1970,  1976,  1983,  1984,  1988,  1995,  1998,  2004,  2012,
-    2015,  2021
+       0,   376,   376,   376,   376,   376,   376,   376,   376,   376,
+     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
+     377,   377,   377,   377,   378,   378,   378,   378,   378,   378,
+     378,   378,   378,   378,   378,   378,   378,   378,   378,   378,
+     378,   378,   379,   379,   379,   379,   379,   379,   379,   379,
+     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
+     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
+     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
+     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
+     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
+     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
+     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
+     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
+     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
+     379,   379,   379,   379,   379,   379,   379,   379,   379,   379,
+     379,   379,   379,   379,   379,   379,   379,   379,   379,   380,
+     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     380,   380,   380,   380,   384,   385,   388,   389,   392,   393,
+     394,   395,   401,   409,   412,   415,   416,   417,   420,   423,
+     426,   429,   435,   441,   444,   450,   473,   477,   481,   486,
+     490,   494,   498,   505,   506,   510,   511,   515,   516,   517,
+     521,   522,   526,   527,   531,   532,   533,   537,   538,   542,
+     543,   544,   545,   546,   547,   548,   552,   557,   565,   568,
+     571,   572,   578,   583,   591,   594,   598,   602,   609,   613,
+     617,   621,   626,   636,   646,   651,   656,   660,   666,   675,
+     678,   682,   686,   692,   699,   705,   706,   707,   708,   712,
+     715,   746,   753,   754,   755,   756,   760,   763,   772,   778,
+     781,   787,   790,   796,   797,   805,   816,   825,   837,   838,
+     842,   852,   861,   873,   876,   879,   883,   887,   891,   896,
+     901,   909,   910,   911,   917,   920,   923,   929,   930,   934,
+     937,   940,   946,   949,   952,   960,   972,   975,   978,   985,
+     988,   998,  1001,  1004,  1007,  1008,  1009,  1013,  1016,  1019,
+    1030,  1033,  1039,  1040,  1044,  1045,  1049,  1053,  1059,  1060,
+    1066,  1069,  1075,  1078,  1081,  1087,  1091,  1092,  1096,  1097,
+    1101,  1102,  1109,  1110,  1114,  1121,  1132,  1139,  1150,  1157,
+    1168,  1179,  1193,  1194,  1206,  1209,  1212,  1215,  1222,  1225,
+    1231,  1240,  1252,  1260,  1263,  1273,  1286,  1291,  1299,  1309,
+    1319,  1322,  1326,  1332,  1346,  1363,  1366,  1372,  1379,  1389,
+    1396,  1399,  1405,  1410,  1418,  1422,  1426,  1430,  1434,  1438,
+    1445,  1449,  1453,  1457,  1461,  1467,  1471,  1478,  1481,  1492,
+    1496,  1500,  1506,  1519,  1532,  1545,  1548,  1555,  1558,  1561,
+    1564,  1570,  1574,  1581,  1584,  1587,  1597,  1600,  1606,  1607,
+    1613,  1616,  1622,  1623,  1633,  1636,  1643,  1648,  1653,  1663,
+    1666,  1672,  1675,  1681,  1688,  1695,  1696,  1697,  1698,  1699,
+    1700,  1701,  1702,  1703,  1707,  1710,  1716,  1719,  1722,  1725,
+    1728,  1734,  1738,  1746,  1747,  1751,  1758,  1761,  1764,  1768,
+    1771,  1774,  1780,  1784,  1792,  1799,  1807,  1815,  1816,  1817,
+    1818,  1819,  1820,  1821,  1822,  1823,  1824,  1828,  1831,  1837,
+    1840,  1846,  1847,  1851,  1854,  1860,  1863,  1869,  1876,  1883,
+    1886,  1889,  1896,  1901,  1909,  1910,  1911,  1912,  1913,  1914,
+    1915,  1916,  1920,  1923,  1929,  1932,  1938,  1945,  1946,  1950,
+    1957,  1960,  1966,  1974,  1977,  1983
 };
 #endif
 
@@ -430,8 +419,7 @@ static const char *const yytname[] =
 {
   "\"end of file\"", "error", "$undefined", "BOOL", "CHAR", "SHORT",
   "INT", "SIGNED", "UNSIGNED", "LONG", "FLOAT", "DOUBLE", "STRING",
-  "MIXED", "ARRAY", "OBJECT", "CALLABLE", "VOID", "ZVAL", "INT8", "UINT8",
-  "INT16", "UINT16", "INT32", "UINT32", "INT64", "UINT64", "NULL", "TRUE",
+  "MIXED", "ARRAY", "OBJECT", "CALLABLE", "VOID", "ZVAL", "NULL", "TRUE",
   "FALSE", "NAME", "NSNAME", "DOLLAR_NAME", "NUMBER", "QUOTED_STRING",
   "QUOTED_CHAR", "SIZEOF", "VOLATILE", "\"end of line\"", "\";\"", "\"(\"",
   "\")\"", "\",\"", "\":\"", "\"{\"", "\"}\"", "\"[\"", "\"]\"", "\"=\"",
@@ -460,16 +448,15 @@ static const char *const yytname[] =
   "constant_type_token", "impl_def_val", "impl_def_val_token",
   "decl_typedef", "typedef", "typedef_anon", "typedef_decl",
   "typedef_anon_decl", "qualified_decl_type", "decl_type",
-  "decl_type_complex", "decl_type_simple", "decl_real_type",
-  "decl_stdint_type", "int_signed", "int_width", "decl_int_type",
-  "int_signed_types", "signed_short_types", "signed_long_types",
-  "int_width_types", "decl_stmt", "decl_asm", "ignored_quoted_strings",
-  "decl_ext_var_stmt", "decl_ext_var", "decl_ext_var_list", "decl_vars",
-  "ignored_decl", "ignored_decl_body", "ignored_decl_body_stmts",
-  "ignored_decl_body_stmt", "decl", "decl_body", "decl_func_body",
-  "decl_functor_body", "decl_functor", "decl_func", "decl_args",
-  "decl_anon_arg", "decl_arg", "decl_var", "decl_union", "decl_struct",
-  "decl_struct_args", "struct_args_block", "struct_args",
+  "decl_type_complex", "decl_type_simple", "decl_real_type", "int_signed",
+  "int_width", "decl_int_type", "int_signed_types", "signed_short_types",
+  "signed_long_types", "int_width_types", "decl_stmt", "decl_asm",
+  "ignored_quoted_strings", "decl_ext_var_stmt", "decl_ext_var",
+  "decl_ext_var_list", "decl_vars", "ignored_decl", "ignored_decl_body",
+  "ignored_decl_body_stmts", "ignored_decl_body_stmt", "decl", "decl_body",
+  "decl_func_body", "decl_functor_body", "decl_functor", "decl_func",
+  "decl_args", "decl_anon_arg", "decl_arg", "decl_var", "decl_union",
+  "decl_struct", "decl_struct_args", "struct_args_block", "struct_args",
   "struct_arg_var_list", "decl_vars_with_layout", "decl_enum",
   "decl_enum_items", "decl_enum_item", "num_exp", "number", "sizeof",
   "sizeof_body", "sizeof_body_notypes", "enum_name", "union_name",
@@ -486,103 +473,100 @@ static const char *const yytname[] =
 };
 #endif
 
-#define YYPACT_NINF -722
-#define YYTABLE_NINF -640
+#define YYPACT_NINF -695
+#define YYTABLE_NINF -614
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const short int yypact[] =
 {
-     481,  -722,  -722,  -722,  -722,  -722,    47,  -722,  -722,  3033,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  3652,   726,
-    -722,  -722,   477,  1491,  3454,  3454,  3454,  1825,    48,   278,
-      12,  -722,  1620,  3686,    93,   481,  -722,  -722,  -722,  -722,
-    -722,  3109,  -722,  -722,  -722,  -722,  -722,    91,   147,  -722,
-    -722,  -722,    64,  -722,   -21,  -722,  -722,    70,    84,   122,
-    -722,  -722,  -722,  -722,   120,  -722,   126,  -722,  -722,  -722,
-    -722,  -722,   837,  -722,   115,    80,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,   685,   -18,  -722,  -722,  -722,
-    -722,  3454,  3454,  3454,  2065,  -722,    59,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    1357,  -722,  -722,  -722,  -722,   158,   970,   970,    14,  -722,
-    1357,  2864,  3033,  3454,  3454,  3731,   160,  -722,  2984,  -722,
-    -722,   162,  3454,   163,   163,    82,    82,   161,  -722,  -722,
-     178,   179,  -722,   115,   181,  -722,  -722,   174,  3686,   171,
-     172,  -722,   187,  -722,  3765,  1528,   -21,   171,  -722,  -722,
-     173,  -722,   180,  3454,  -722,   217,  -722,    68,  -722,  -722,
-      91,  -722,  -722,   184,   186,  3810,  3810,  3454,   258,  3454,
-    -722,  -722,   115,  -722,  -722,  -722,  -722,  -722,  -722,  3109,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,   102,   970,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,   970,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,    19,  2864,  -722,
-    -722,  -722,  -722,  3158,  2864,   188,  4043,  -722,   190,    98,
-    -722,   103,  -722,  -722,  -722,  -722,  -722,   191,   189,   189,
-      36,    36,  3278,   192,  -722,   171,  1236,  -722,   258,   195,
-     198,   199,  -722,  2384,  -722,   115,   173,  -722,  -722,  -722,
-     233,  -722,  -722,   208,  -722,    15,  2665,  3109,   116,  -722,
-    -722,   136,   197,    77,  -722,  3109,  2504,  3109,  3454,   132,
-    -722,  -722,   159,  -722,  -722,  -722,  -722,  -722,  2624,  -722,
-     202,  3454,   213,  -722,  3454,   234,  -722,  -722,  -722,  -722,
-    3844,   227,  -722,  3889,  3454,  -722,  -722,  2864,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  2864,  2864,  -722,   236,
-    1570,  3109,  3109,  -722,  -722,  -722,  -722,   115,  -722,  1784,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  1103,  -722,   166,    73,
-    -722,  -722,  -722,  -722,  -722,  1664,  -722,  2624,  -722,  2965,
-    -722,  -722,  3454,  -722,  -722,  -722,    26,   685,   115,   180,
-     173,  3573,   173,  3607,  2624,  3454,  -722,   225,   238,  4067,
-     230,   240,  -722,   241,   248,   242,   251,    76,  -722,  -722,
-     253,   241,  -722,  -722,  3856,  -722,   252,  3109,  3329,   115,
-     255,  -722,  -722,  -722,   264,  4043,   265,   267,  3994,  -722,
-     261,  3731,   268,  -722,  -722,  2744,  1399,  3454,   163,   163,
-    -722,  -722,  3454,  -722,  -722,  -722,  -722,   271,  -722,  4067,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,   269,   138,  -722,    12,  -722,   266,   726,   273,
-    3916,  -722,  -722,  2624,  2624,   277,  -722,  -722,  3278,  -722,
-      15,   279,  -722,  -722,   290,  4067,  -722,  1904,  -722,  2504,
-    -722,  3109,  -722,    12,  3109,  -722,  3454,  -722,  -722,  -722,
-    -722,  -722,  -722,   292,   293,  -722,  -722,  -722,  -722,  2864,
-    2864,   294,  -722,    30,   295,  -722,   268,   189,   189,   299,
-    -722,   519,   291,   519,   297,  2624,  -722,  4019,  -722,  -722,
-     173,   173,  -722,   231,   214,   301,  4067,  -722,  -722,  -722,
-    -722,   303,  2024,  -722,   304,  3109,   142,  -722,   970,  3405,
-    4043,  4091,   315,   309,   313,  3109,   326,   295,  3109,  3109,
-    -722,  -722,   519,  -722,    12,  1784,  -722,  2624,  -722,  -722,
-     301,  -722,  -722,  -722,  -722,   327,  2624,    12,  -722,  2144,
-     328,   339,  -722,  -722,  -722,  -722,   338,   337,   348,   268,
-     340,  -722,   344,  -722,    20,  -722,  4115,    12,  3969,   342,
-     347,  -722,   343,  -722,  -722,  -722,   349,   350,  -722,  3109,
-    -722,   358,   353,  2624,  1904,   354,  -722,  2504,   363,   364,
-     268,   357,  2264,  3943,   225,  -722,  -722,  -722,   360,  2024,
-    -722,  -722,   362,   359,  -722,   356,   366,   370,  -722,  -722,
-    1904,  -722,   372,  -722,   519,   374,  2504,  -722,   375,  -722,
-    -722,  -722,  -722
+     659,  -695,  -695,  -695,  -695,  -695,    74,  -695,  -695,  2580,
+    1495,  1940,  -695,  -695,   696,  1314,  3317,  3317,  3317,    62,
+      36,   259,    43,  -695,  1411,  1639,    97,   659,  -695,  -695,
+    -695,  -695,  -695,  2804,  -695,  -695,  -695,  -695,   110,   168,
+    -695,  -695,  -695,    44,  -695,   -17,  -695,  -695,   133,    71,
+      77,  -695,  -695,  -695,  -695,    84,  -695,    90,  -695,  -695,
+    -695,  -695,  -695,   818,  -695,    86,    46,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  2916,     0,  -695,  -695,
+    -695,  -695,  3317,  3317,  3317,   706,  -695,    57,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,   444,  -695,  -695,  -695,  -695,   107,   943,   943,    33,
+    -695,   444,  2468,  2580,  3317,  3317,  1975,   112,  -695,  -695,
+    -695,   118,  3317,   122,   122,   125,   125,   126,  -695,  -695,
+     145,   169,  -695,    86,   173,  -695,  -695,   180,  1639,   182,
+     184,  -695,   198,  -695,  2199,  1340,   -17,   182,  -695,  -695,
+     186,  -695,   190,  3317,  -695,   220,  -695,    54,  -695,  -695,
+     110,  -695,  -695,   196,   199,  2311,  2311,  3317,   164,  3317,
+    -695,  -695,    86,  -695,  -695,  -695,  -695,  -695,  -695,  2804,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,   114,   943,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+     943,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,    50,
+    2468,  -695,  -695,  -695,  -695,  3028,  2468,   200,  3470,  -695,
+     203,   135,  -695,   144,  -695,  -695,  -695,  -695,   192,   201,
+     201,    75,    75,  3140,   204,  -695,   182,  1193,  -695,   164,
+     207,   209,   210,  -695,  2132,  -695,    86,   186,  -695,  -695,
+    -695,   237,  -695,  -695,   219,  -695,    29,  2423,  2804,   153,
+    -695,  -695,   165,   212,    88,  -695,  2804,  2244,  2804,  3317,
+     137,  -695,  -695,   296,  -695,  -695,  -695,  -695,  -695,  2356,
+    -695,   221,  3317,   238,  -695,  3317,   239,  -695,  -695,  -695,
+    -695,   498,   231,  -695,  2785,  3317,  -695,  -695,  2468,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  2468,  2468,  -695,
+     241,  1366,  2804,  2804,  -695,  -695,  -695,  -695,    86,  -695,
+    1572,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  1068,
+    -695,   385,  1429,  -695,  -695,  -695,  -695,  -695,  1460,  -695,
+    2356,  -695,  3446,  -695,  -695,  3317,  -695,  -695,  -695,    79,
+    2916,    86,   190,   186,  1605,   186,  1829,  2356,  3317,  -695,
+     234,   244,  3494,   240,   246,  -695,   247,   254,   242,   251,
+     108,  -695,  -695,   253,   247,  -695,  -695,   754,  -695,   252,
+    2804,  3199,    86,   256,  -695,  -695,  -695,   257,  3470,   258,
+     269,  3397,  -695,   261,  1975,   270,  -695,  -695,  2692,   612,
+    3317,   122,   122,  -695,  -695,  3317,  -695,  -695,  -695,  -695,
+     273,  -695,  3494,  -695,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -695,  -695,  -695,  -695,   271,   170,  -695,    43,  -695,
+     275,  1940,   276,  2907,  -695,  -695,  2356,  2356,   277,  -695,
+    -695,  3140,  -695,    29,   279,  -695,  -695,   280,  3494,  -695,
+    1684,  -695,  2244,  -695,  2804,  -695,    43,  2804,  -695,  3317,
+    -695,  -695,  -695,  -695,  -695,  -695,   281,   282,  -695,  -695,
+    -695,  -695,  2468,  2468,   283,  -695,    55,   287,  -695,   270,
+     201,   201,   289,  -695,   354,   288,   354,   284,  2356,  -695,
+    3422,  -695,  -695,   186,   186,  -695,   179,   195,   260,  3494,
+    -695,  -695,  -695,  -695,   293,  1796,  -695,   294,  2804,   172,
+    -695,   943,  3258,  3470,  3518,   304,   302,   306,  2804,   309,
+     287,  2804,  2804,  -695,  -695,   354,  -695,    43,  1572,  -695,
+    2356,  -695,  -695,   260,  -695,  -695,  -695,  -695,   315,  2356,
+      43,  -695,  1908,   316,   320,  -695,  -695,  -695,  -695,   319,
+     318,   329,   270,   322,  -695,   327,  -695,    24,  -695,  3542,
+      43,  3131,   328,   339,  -695,   342,  -695,  -695,  -695,   345,
+     346,  -695,  2804,  -695,   337,   347,  2356,  1684,   349,  -695,
+    2244,   358,   359,   270,   363,  2020,  3019,   234,  -695,  -695,
+    -695,   364,  1796,  -695,  -695,   365,   371,  -695,   362,   372,
+     373,  -695,  -695,  1684,  -695,   381,  -695,   354,   376,  2244,
+    -695,   377,  -695,  -695,  -695,  -695
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -590,134 +574,131 @@ static const short int yypact[] =
      means the default is an error.  */
 static const unsigned short int yydefact[] =
 {
-     290,   428,   425,   429,   423,   424,   426,   412,   413,     0,
-     415,   416,   417,   418,   419,   420,   421,   422,   411,     0,
-     295,   294,     0,     0,     0,     0,   531,     0,     0,     0,
-     639,   296,     0,     0,     0,   291,   292,   298,   297,   299,
-     303,   542,   402,   404,   403,   409,   410,   432,   443,   408,
-     300,   302,     0,   301,   448,   466,   468,   469,     0,     0,
-     478,   305,   304,   306,     0,   307,     0,   427,   414,    33,
-      34,   627,   593,    24,   542,   548,    39,    38,    37,    35,
-      36,    32,    31,    25,    29,    28,    26,    27,   601,   600,
-     598,   596,   597,   599,   595,   594,   602,    30,   625,   623,
-     622,   624,   621,   620,   479,     0,   544,   546,    40,    41,
-     411,     0,     0,     0,     0,   467,   454,   401,   309,   320,
-     317,   319,   321,   322,   333,   330,   331,   328,   334,   329,
-       0,   332,   323,   324,   325,     0,   350,   350,     0,   313,
-       0,     0,     0,   531,   531,     0,     0,   385,   542,   390,
-     488,   389,     0,   537,   537,   405,   406,   407,   528,   371,
-     429,   412,   374,     0,     0,   370,   400,     0,     0,     0,
-       0,   641,     0,   640,   411,     0,   448,     0,     1,   293,
-     539,   489,     0,   543,   433,   437,   435,   439,   430,   444,
-     432,   431,   452,     0,     0,   480,   480,     0,     0,     0,
-     543,   549,   542,   491,   545,   547,   405,   406,   407,     0,
-     453,   336,   337,   338,   340,   341,   339,   335,   350,   315,
-     310,    75,    42,    43,    44,    45,    46,    47,    48,    49,
+     274,   402,   399,   403,   397,   398,   400,   394,   395,     0,
+     393,     0,   279,   278,     0,     0,     0,     0,   505,     0,
+       0,     0,   613,   280,     0,     0,     0,   275,   276,   282,
+     281,   283,   287,   516,   385,   387,   386,   392,   406,   417,
+     391,   284,   286,     0,   285,   422,   440,   442,   443,     0,
+       0,   452,   289,   288,   290,     0,   291,     0,   401,   396,
+      33,    34,   601,   567,    24,   516,   522,    39,    38,    37,
+      35,    36,    32,    31,    25,    29,    28,    26,    27,   575,
+     574,   572,   570,   571,   573,   569,   568,   576,    30,   599,
+     597,   596,   598,   595,   594,   453,     0,   518,   520,    40,
+      41,   393,     0,     0,     0,     0,   441,   428,   384,   293,
+     304,   301,   303,   305,   306,   317,   314,   315,   312,   318,
+     313,     0,   316,   307,   308,   309,     0,   334,   334,     0,
+     297,     0,     0,     0,   505,   505,     0,     0,   369,   374,
+     462,   373,     0,   511,   511,   388,   389,   390,   502,   355,
+     403,   394,   358,     0,     0,   354,   383,     0,     0,     0,
+       0,   615,     0,   614,   393,     0,   422,     0,     1,   277,
+     513,   463,     0,   517,   407,   411,   409,   413,   404,   418,
+     406,   405,   426,     0,     0,   454,   454,     0,     0,     0,
+     517,   523,   516,   465,   519,   521,   388,   389,   390,     0,
+     427,   320,   321,   322,   324,   325,   323,   319,   334,   299,
+     294,    67,    42,    43,    44,    45,    46,    47,    48,    49,
       50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,   165,   166,    76,    77,    78,
+      60,    61,    62,    63,    64,    65,    66,   157,   158,    68,
+      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
       79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
       89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   115,   113,   114,   112,   110,   111,   116,   117,   118,
+      99,   100,   101,   107,   105,   106,   104,   102,   103,   108,
+     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
      119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
      129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
      139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
-     159,   163,   160,   161,   162,   164,   352,   318,   351,   311,
-     326,   327,   312,   335,   314,   360,   361,     0,     0,    22,
-      23,    20,    21,     0,     0,   363,   316,   362,   479,   405,
-     530,   406,   529,   386,   382,   394,   391,     0,     0,     0,
-       0,     0,     0,     0,   308,     0,     0,   458,     0,     0,
-       0,     0,   459,     0,   493,   542,   539,   438,   434,   440,
-     441,   436,   445,     0,   446,   481,     0,   542,     0,   482,
-     484,     0,   508,     0,   506,     0,   639,     0,     0,     0,
-     633,   634,     0,   570,   573,   572,   574,   575,     0,   576,
-       0,     0,   455,   456,     0,     0,   343,   353,   527,   526,
-       0,     0,   522,     0,     0,   358,   355,   365,     2,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    13,    12,
-      14,    15,    16,    17,    18,    19,     0,     0,   383,     0,
-       0,     0,     0,   496,   495,   497,   494,   542,   490,   375,
-     460,   200,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     149,   150,   151,   155,   152,   153,   154,   156,   336,   302,
+     335,   295,   310,   311,   296,   319,   298,   344,   345,     0,
+       0,    22,    23,    20,    21,     0,     0,   347,   300,   346,
+     453,   388,   504,   389,   503,   370,   366,   375,     0,     0,
+       0,     0,     0,     0,     0,   292,     0,     0,   432,     0,
+       0,     0,     0,   433,     0,   467,   516,   513,   412,   408,
+     414,   415,   410,   419,     0,   420,   455,     0,   516,     0,
+     456,   458,     0,   482,     0,   480,     0,   613,     0,     0,
+       0,   607,   608,     0,   544,   547,   546,   548,   549,     0,
+     550,     0,     0,   429,   430,     0,     0,   327,   337,   501,
+     500,     0,     0,   496,     0,     0,   342,   339,   349,     2,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    13,
+      12,    14,    15,    16,    17,    18,    19,     0,     0,   367,
+       0,     0,     0,     0,   470,   469,   471,   468,   516,   464,
+     359,   434,   184,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   272,   273,
      185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   288,   289,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
-     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
-     224,   225,   226,   227,   228,   229,   230,   231,   232,   238,
-     236,   237,   235,   233,   234,   239,   240,   241,   242,   243,
-     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
-     274,   275,   276,   277,   278,   279,   280,   281,   282,   286,
-     283,   284,   285,   287,   464,   465,     0,   462,     0,     0,
-     384,   447,   517,   516,   518,     0,   540,     0,   519,     0,
-     510,   520,     0,   492,   442,   450,     0,   487,     0,   485,
-     539,     0,   539,     0,     0,     0,   505,     0,     0,   616,
-       0,     0,   615,    41,     0,     0,     0,     0,   636,   626,
-       0,     0,   550,   571,     0,   477,     0,     0,   344,   542,
-       0,   523,   525,   354,     0,   367,     0,   366,     0,   356,
-       0,     0,   533,   395,   387,   396,     0,   397,   537,   537,
-     393,   392,     0,   378,   379,   380,   381,     0,   377,   376,
-     461,   463,   551,   563,   564,   565,   566,   562,   567,   568,
-     569,   561,     0,     0,   555,   639,   560,    24,     0,     0,
-       0,   514,   541,     0,     0,     0,   451,   449,   486,   472,
-       0,     0,   483,   470,     0,   509,   507,     0,   577,   639,
-     614,     0,   559,   639,     0,   635,     0,   613,   632,   476,
-     457,   345,   348,     0,   346,   524,   521,   359,   364,     0,
-       0,     0,   388,     0,   501,   498,   533,     0,     0,     0,
-     369,     0,     0,     0,   557,     0,   512,     0,   513,   474,
-     539,   539,   582,     0,    31,    30,   587,   588,   583,   585,
-     586,    40,     0,   617,   628,     0,     0,   637,   350,     0,
-     368,   357,     0,   534,     0,     0,     0,   501,   399,   398,
-     475,   552,     0,   556,   639,   375,   511,     0,   473,   471,
-       0,   584,   607,   593,   608,     0,     0,   639,   589,   639,
-       0,     0,   638,   342,   347,   349,     0,     0,     0,   533,
-     502,   499,     0,   553,     0,   558,   515,   639,     0,   603,
-       0,   630,   629,   618,   578,   538,     0,     0,   503,     0,
-     500,     0,     0,     0,     0,     0,   619,   639,     0,     0,
-     533,     0,   609,     0,   519,   605,   581,   579,   604,     0,
-     592,   631,     0,     0,   504,     0,     0,   610,   611,   590,
-       0,   580,     0,   535,     0,     0,   639,   606,     0,   554,
-     591,   612,   536
+     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
+     215,   216,   222,   220,   221,   219,   217,   218,   223,   224,
+     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
+     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   270,   267,   268,   269,   271,   438,   439,     0,
+     436,     0,     0,   368,   421,   491,   490,   492,     0,   514,
+       0,   493,     0,   484,   494,     0,   466,   416,   424,     0,
+     461,     0,   459,   513,     0,   513,     0,     0,     0,   479,
+       0,     0,   590,     0,     0,   589,    41,     0,     0,     0,
+       0,   610,   600,     0,     0,   524,   545,     0,   451,     0,
+       0,   328,   516,     0,   497,   499,   338,     0,   351,     0,
+     350,     0,   340,     0,     0,   507,   378,   371,   379,     0,
+     380,   511,   511,   377,   376,     0,   362,   363,   364,   365,
+       0,   361,   360,   435,   437,   525,   537,   538,   539,   540,
+     536,   541,   542,   543,   535,     0,     0,   529,   613,   534,
+      24,     0,     0,     0,   488,   515,     0,     0,     0,   425,
+     423,   460,   446,     0,     0,   457,   444,     0,   483,   481,
+       0,   551,   613,   588,     0,   533,   613,     0,   609,     0,
+     587,   606,   450,   431,   329,   332,     0,   330,   498,   495,
+     343,   348,     0,     0,     0,   372,     0,   475,   472,   507,
+       0,     0,     0,   353,     0,     0,     0,   531,     0,   486,
+       0,   487,   448,   513,   513,   556,     0,    31,    30,   561,
+     562,   557,   559,   560,    40,     0,   591,   602,     0,     0,
+     611,   334,     0,   352,   341,     0,   508,     0,     0,     0,
+     475,   382,   381,   449,   526,     0,   530,   613,   359,   485,
+       0,   447,   445,     0,   558,   581,   567,   582,     0,     0,
+     613,   563,   613,     0,     0,   612,   326,   331,   333,     0,
+       0,     0,   507,   476,   473,     0,   527,     0,   532,   489,
+     613,     0,   577,     0,   604,   603,   592,   552,   512,     0,
+       0,   477,     0,   474,     0,     0,     0,     0,     0,   593,
+     613,     0,     0,   507,     0,   583,     0,   493,   579,   555,
+     553,   578,     0,   566,   605,     0,     0,   478,     0,     0,
+     584,   585,   564,     0,   554,     0,   509,     0,     0,   613,
+     580,     0,   528,   565,   586,   510
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -722,  -352,  -128,    -7,    65,  -722,  -722,  -722,   382,  -722,
-    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,   280,
-    -722,  -722,  -722,  -134,  -722,  -315,  -722,  -722,  -722,  -722,
-    -722,  -386,  -722,  -722,   243,  -255,    22,  -249,    -2,   -12,
-    -722,  -722,  -722,  -138,   377,  -722,  -722,   239,  -722,  -722,
-    -722,  -722,   250,  -722,  -722,  -722,  -722,  -301,  -722,  -141,
-    -722,  -170,   409,    17,   -15,    33,  -722,  -722,   246,  -504,
-     -14,   -41,  -722,  -722,    62,  -348,  -722,  -353,  -722,     6,
-    -722,  -190,  -359,  -722,  -117,  -722,     7,  -722,  -454,  -450,
-      43,  -712,  -129,  -384,   -63,    -4,  -722,   345,  -722,   420,
-    -722,  -313,  -648,  -721,  -722,    66,  -400,  -722,  -428,  -704,
-      38,  -312,  -722,  -722,  -666,  -722,  -722,  -722,  -722,  -722,
-    -722,  -722,  -691,    39,  -387,  -722,  -722,  -722,  -722,  -722,
-    -722,  -274,   -29,  -680
+    -695,  -323,  -121,    -4,    83,  -695,  -695,  -695,   387,  -695,
+    -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,  -695,   286,
+    -695,  -695,  -695,  -122,  -695,  -307,  -695,  -695,  -695,  -695,
+    -695,  -360,  -695,  -695,   262,  -226,    23,  -219,  -158,    -9,
+    -695,  -695,  -695,   392,  -695,  -695,   255,  -695,  -695,  -695,
+    -695,   266,  -695,  -695,  -695,  -695,  -274,  -695,  -124,  -695,
+    -145,   412,    31,   -12,    26,  -695,  -695,   263,  -511,     8,
+     -33,  -695,  -695,    76,  -330,  -695,  -328,  -695,     4,  -695,
+    -163,  -352,  -695,  -117,  -695,    30,  -695,  -435,  -434,    82,
+    -684,  -125,  -370,   -56,    -1,  -695,   353,  -695,   431,  -695,
+    -283,  -632,  -694,  -695,    85,  -379,  -695,  -395,  -642,    64,
+    -278,  -695,  -695,  -645,  -695,  -695,  -695,  -695,  -695,  -695,
+    -695,  -658,    69,  -363,  -695,  -695,  -695,  -695,  -695,  -695,
+    -239,   -21,  -646
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const short int yydefgoto[] =
 {
-      -1,   714,   617,   180,   346,   604,    34,    35,    36,    37,
-      38,   135,   136,   137,   138,   352,   139,   140,   141,   218,
-     219,   743,   744,   347,   348,   366,   666,   667,    39,   164,
-     165,   687,   688,    40,   146,   672,   673,   674,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,   188,   398,   401,
-     191,    50,   194,   626,    51,    52,   210,   432,    53,   605,
-     606,   607,    54,    55,    56,   150,    58,    59,   408,   409,
-      60,   618,    61,    62,   474,   475,   676,   796,   830,   152,
-     413,   414,   639,   620,   621,   660,   442,    64,   153,   154,
-     158,   754,   378,   394,   182,   434,   106,   107,    65,    66,
-     703,   704,   640,   705,   706,   422,   423,   424,   865,   866,
-     867,   778,   779,   780,   108,   855,   868,   815,   876,   877,
-     425,   426,   641,   642,   109,   820,   842,   427,   428,   429,
-     647,   648,   644,   173
+      -1,   687,   590,   170,   328,   577,    26,    27,    28,    29,
+      30,   126,   127,   128,   129,   334,   130,   131,   132,   208,
+     209,   716,   717,   329,   330,   348,   639,   640,    31,   154,
+     155,   660,   661,    32,   137,   645,   646,   647,    33,    34,
+      35,    36,    37,    38,    39,    40,   178,   379,   382,   181,
+      41,   184,   599,    42,    43,   200,   413,    44,   578,   579,
+     580,    45,    46,    47,   140,    49,    50,   389,   390,    51,
+     591,    52,    53,   455,   456,   649,   769,   803,   142,   394,
+     395,   612,   593,   594,   633,   423,    55,   143,   144,   148,
+     727,   359,   375,   172,   415,    97,    98,    56,    57,   676,
+     677,   613,   678,   679,   403,   404,   405,   838,   839,   840,
+     751,   752,   753,    99,   828,   841,   788,   849,   850,   406,
+     407,   614,   615,   100,   793,   815,   408,   409,   410,   620,
+     621,   617,   163
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -725,848 +706,732 @@ static const short int yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const short int yytable[] =
 {
-     181,   172,   104,   349,   116,   105,    63,   117,   149,   151,
-     375,   199,   623,   364,   467,   166,   678,   155,   156,   157,
-     679,   148,   653,   777,   367,   379,   380,   381,   387,   643,
-     471,   472,   651,    57,   619,   115,   392,   183,   783,    75,
-     801,    63,   804,   443,   797,   147,   169,   782,   350,   446,
-     177,    57,   732,   438,   439,    74,    67,   764,    68,   440,
-     716,   781,    57,   793,   171,    57,    57,   717,    57,   654,
-     200,   441,    75,   794,   399,   473,   693,   400,   818,   694,
-     470,   833,   167,   695,   436,   696,   697,   698,   699,   700,
-     701,   467,   851,   178,   467,   184,   185,   186,   203,  -478,
-     187,   209,   166,   192,   206,   207,   208,   181,   814,  -469,
-    -488,   193,  -488,   204,   702,   735,   781,   848,   736,   635,
-     689,  -537,   636,   217,   195,   377,  -537,   722,   841,   722,
-     149,   151,   665,   353,   365,   368,   369,   371,   105,   431,
-     351,  -405,  -532,   148,   183,   376,  -406,  -532,   874,    71,
-     649,   668,   669,   189,     4,     5,   764,   630,   631,   382,
-     149,   151,   196,   889,   197,   881,   871,   373,   433,   839,
-     198,   878,    75,   148,   869,   201,   396,   632,   633,   762,
-     763,   410,   410,   822,   657,   385,   370,   372,   781,   852,
-     412,   115,   430,   407,   407,   891,   220,   147,   200,   374,
-     869,    57,  -478,   781,   652,  -532,   377,    57,   653,  -372,
-    -373,   692,   383,   384,   781,   386,   388,   678,   389,   393,
-     395,   679,   678,   397,   403,   404,   679,   435,   447,   468,
-     364,   812,   813,   470,   469,   609,   364,   610,   611,   624,
-     479,   367,   625,   655,   480,   634,   719,   367,   723,    98,
-      99,   100,   101,   102,   103,   657,   710,   662,   711,   415,
-     416,   417,   418,   419,   420,   421,   415,   416,   417,   418,
-     419,   420,   421,   727,   658,   725,   670,   728,   729,   730,
-     732,   731,     1,     2,     3,     4,     5,     6,     7,     8,
-     733,   734,   737,   739,   751,     9,   746,    10,    11,    12,
-      13,    14,    15,    16,    17,   747,   748,   -24,   110,   749,
-     760,   753,   761,   467,   765,    19,   467,   467,   769,   364,
-     770,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-     367,   771,   622,   788,   802,   789,   792,   795,   364,   364,
-     800,   816,   643,   817,   629,   805,   819,   810,   826,   367,
-     367,   365,   827,   828,   767,   768,   445,   365,   415,   416,
-     417,   418,   419,   420,   421,   831,   181,   837,   776,   843,
-     111,   112,   113,   114,   637,   478,   645,    30,   844,   845,
-     846,   847,   849,   850,   854,   857,   808,   809,   856,   858,
-     861,   200,   859,   862,   166,   870,   872,   873,   875,   884,
-     883,   627,   880,   183,   882,   888,   806,   885,   168,   798,
-     799,   646,   886,   437,   682,   890,   892,   179,   390,   835,
-     354,   756,   752,   776,   656,   190,   391,   396,   659,   402,
-     680,   681,   643,   786,   790,   791,   691,   664,   467,   467,
-     365,   176,   411,   476,   832,   726,   689,   661,   836,   170,
-     803,   205,   887,   638,   608,   149,   151,   838,   650,   365,
-     365,   811,   787,     0,     0,     0,     0,     0,   675,     0,
-     643,     0,     0,   200,     0,   643,   677,     0,     0,     0,
-       0,     0,     0,     0,     0,     1,     2,     3,     4,     5,
-       6,     7,     8,     0,   863,   776,     0,     0,     9,   643,
-      10,    11,    12,    13,    14,    15,    16,    17,     0,     0,
-     776,    18,     0,     0,     0,   118,     0,     0,    19,    20,
-      21,   776,   693,     0,     0,   694,     0,     0,     0,   695,
-      22,   696,   697,   698,   699,   700,   701,   375,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   757,
-     758,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,     0,   131,   132,   133,   134,     0,     0,
-       0,     0,    23,    24,    25,    26,    27,    28,    29,     0,
-      30,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   745,     0,     0,     0,
-       0,     0,     0,     0,    31,     0,     0,     0,     0,    32,
-       0,    33,     0,   709,     0,   715,   740,   410,     0,   410,
-     203,   364,   364,     0,   718,     0,     0,     0,   412,   407,
-       0,   407,   367,   367,   181,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   742,     0,     0,   823,   200,   149,   151,     0,     0,
-       0,   149,   151,     0,     0,     0,     0,     0,     0,   675,
-     376,   183,     0,     0,   675,   759,     0,   677,     0,     0,
-       0,     0,   677,     0,     0,     0,     0,     0,    69,     0,
-     784,     0,     0,   433,     0,     0,   166,    70,     0,     0,
-       0,     0,    71,    72,   785,     0,     0,     0,     0,     0,
-       0,   478,     0,     0,     0,    73,   627,     0,     0,     0,
-       0,     0,     0,     0,     0,   202,     0,     0,     0,   646,
+     171,   162,   108,   139,    54,    95,   331,   596,    96,   189,
+     156,   346,   145,   146,   147,   349,   651,   652,   107,   360,
+     361,   362,   592,   141,   626,   448,    48,   388,   388,   452,
+     453,    54,   173,   424,   616,   368,    48,   624,   138,   427,
+     774,   106,   777,   373,   756,   770,   737,    48,   705,    66,
+      48,    48,   159,    48,   755,   754,   167,   627,   750,   332,
+     380,    65,   157,   381,   190,   149,     1,     2,   150,     4,
+       5,     6,   151,     8,   152,   182,   419,   420,    66,   153,
+     766,   806,   421,    58,   101,    59,   417,   161,   824,  -452,
+     767,   199,   193,   695,   422,   695,   156,   168,   196,   197,
+     198,   448,   787,   185,   448,   689,   454,   183,   662,   186,
+     754,   451,   690,   791,   174,   175,   176,   207,   821,   177,
+     187,   638,   608,   194,   139,   609,   188,   335,   347,   350,
+     351,   353,    96,   191,   814,    66,   412,   210,   357,   708,
+     641,   642,   709,   356,   141,   737,   102,   103,   104,   847,
+    -452,   333,   363,   139,    62,   622,  -511,   358,   812,   355,
+     358,  -511,  -506,   862,  -443,  -462,   414,  -462,  -356,   377,
+    -388,  -506,   844,   141,   179,     4,     5,   851,   825,  -389,
+    -506,   842,   754,   393,    48,   411,   603,   604,   138,   366,
+      48,   190,  -357,   391,   391,   106,   364,   754,   605,   606,
+     854,   864,   626,   735,   736,   795,   630,   842,   754,   651,
+     652,   365,   785,   786,   651,   652,   352,   354,   367,   346,
+     369,   370,   376,   349,   374,   346,   378,   450,   384,   349,
+     385,   416,   428,   692,   449,   696,   683,   451,   684,   582,
+     583,   584,   461,   597,   460,   598,    89,    90,    91,    92,
+      93,    94,   607,   635,   628,   698,   396,   397,   398,   399,
+     400,   401,   402,     1,     2,     3,     4,     5,     6,     7,
+       8,   631,   630,   643,   700,   701,     9,   703,   705,   704,
+     702,   101,   706,   707,   710,   712,   724,   783,    11,   719,
+     720,   721,   789,   648,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,   722,   733,   726,   734,   346,   -24,   738,
+     742,   349,   743,   744,   761,   448,   762,   765,   448,   448,
+     595,   768,   773,   775,   778,   790,   346,   346,   792,   799,
+     349,   349,   602,   625,   740,   741,   347,   800,   801,   616,
+     804,   426,   347,   102,   103,   104,   105,   810,   749,   816,
+      22,   817,   818,   819,   820,   171,   822,   666,   823,   459,
+     667,   834,   827,   610,   668,   618,   669,   670,   671,   672,
+     673,   674,   829,   781,   782,   190,   830,   831,   156,   835,
+     832,   158,   843,   845,   846,   600,   779,   173,   396,   397,
+     398,   399,   400,   401,   402,   619,   848,   857,   853,   855,
+     771,   772,   655,   749,   856,   858,   861,   859,   629,   863,
+     865,   377,   632,   418,   169,   763,   764,   336,   808,   653,
+     654,   637,   665,   729,   347,   725,   662,   371,   809,   616,
+     682,   180,   372,   759,   664,   383,   166,   811,   457,   139,
+     448,   448,   805,   347,   347,   699,   388,    60,   388,   392,
+     195,   634,   160,   776,   581,   650,    61,   190,   860,   141,
+     611,    62,    63,   201,   202,   203,    64,   616,   784,   623,
+     760,     0,   616,     0,   836,   749,     0,   396,   397,   398,
+     399,   400,   401,   402,     0,     0,   648,     0,     0,     0,
+     749,   648,     0,     0,     0,     0,   616,     0,     0,     0,
+       0,   749,     1,     2,     3,     4,     5,     6,     7,     8,
+      67,    68,    69,    70,    71,     0,     0,     0,     0,     0,
+     101,     0,     0,     0,   419,   420,   730,   731,     0,     0,
+       0,     0,    72,     0,    73,    74,    75,    76,    77,    78,
+       0,     0,   422,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,     0,
+       0,     0,     0,     0,   204,     0,   205,   206,     0,     0,
+       0,     0,     0,     0,     0,     0,   718,     0,     0,     0,
+       0,     0,   102,   103,   104,     0,     0,     0,     0,     0,
+       0,   688,     0,     0,     0,     0,   193,   713,     0,     0,
+     691,   346,   346,     0,   393,   349,   349,     0,     0,     0,
+       0,     0,   391,     0,   391,   171,     1,     2,     3,     4,
+       5,     6,     7,     8,     0,     0,     0,   715,     0,     9,
+       0,   190,   139,     0,   101,     0,     0,   139,     0,   796,
+       0,    11,     0,     0,     0,     0,   357,   173,   650,   728,
+       0,   732,   141,   650,     0,     0,     0,   141,     0,     0,
+       0,     0,     0,     1,     2,     3,     4,     5,     6,     7,
+       8,   757,   156,     0,   414,     0,     9,     0,     0,     0,
+       0,    10,     0,     0,     0,   758,     0,   459,    11,    12,
+      13,     0,   600,     0,     0,     0,   134,   135,    18,   105,
+      14,     0,     0,     0,     0,   619,     0,     0,     0,     0,
+       1,     2,     3,     4,     5,     6,     7,     8,   347,   347,
+       0,     0,     0,   153,     0,   794,   109,     0,   101,     0,
+       0,     0,   644,     0,     0,   802,     0,     0,   653,   654,
+       0,     0,    15,    16,    17,    18,    19,    20,    21,     0,
+      22,     0,     0,     0,     0,     0,   807,     0,   798,     0,
+       0,     0,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,    23,   122,   123,   124,   125,    24,
+       0,    25,     0,     0,     0,   711,     0,     0,     0,   833,
+     102,   103,   104,     0,   837,     0,   429,   430,   431,   432,
+     433,   434,   435,   436,   437,   438,   439,   440,   441,   442,
+     443,   444,   445,   446,     0,     0,     0,     0,  -567,   686,
+     837,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
+    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
+    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
+    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
+    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
+    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
+    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
+    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,     0,  -567,
+       0,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
+    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
+    -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,  -567,
+    -567,  -567,  -567,  -567,     0,  -567,  -567,     0,  -567,  -567,
+    -567,  -567,  -567,   211,     0,     0,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
+     236,   237,   238,     0,   239,   240,   241,   242,   243,   244,
+     245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     255,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,     0,   288,     0,   289,   290,   291,   292,
+     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,   314,   315,   316,   317,   318,   319,   320,   321,     0,
+       0,   322,     0,   323,   324,   325,   326,   327,   462,     0,
+       0,   463,   464,   465,   466,   467,   468,   469,   470,   471,
+     472,   473,   474,   475,   476,   477,   478,   479,   480,   481,
+     482,   483,   484,   485,   486,   487,   488,   489,     0,   490,
+     491,   492,   493,   494,   367,   663,   495,   496,   497,   498,
+     499,   500,   501,   502,   503,   504,   505,   506,   507,   508,
+     509,   510,   511,   512,   513,   514,   515,   516,   517,   518,
+     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
+     529,   530,   531,   532,   533,   534,   535,   536,     0,   537,
+       0,   538,   539,   540,   541,   542,   543,   544,   545,   546,
+     547,   548,   549,   550,   551,   552,   553,   554,   555,   556,
+     557,   558,   559,   560,   561,   562,   563,   564,   565,   566,
+     567,   568,   569,   570,     0,     0,   571,     0,   572,   573,
+     574,   575,   576,   462,     0,     0,   463,   464,   465,   466,
+     467,   468,   469,   470,   471,   472,   473,   474,   475,   476,
+     477,   478,   479,   480,   481,   482,   483,   484,   485,   486,
+     487,   488,   489,     0,   490,   491,   492,   493,   494,   367,
+       0,   495,   496,   497,   498,   499,   500,   501,   502,   503,
+     504,   505,   506,   507,   508,   509,   510,   511,   512,   513,
+     514,   515,   516,   517,   518,   519,   520,   521,   522,   523,
+     524,   525,   526,   527,   528,   529,   530,   531,   532,   533,
+     534,   535,   536,     0,   537,     0,   538,   539,   540,   541,
+     542,   543,   544,   545,   546,   547,   548,   549,   550,   551,
+     552,   553,   554,   555,   556,   557,   558,   559,   560,   561,
+     562,   563,   564,   565,   566,   567,   568,   569,   570,     0,
+       0,   571,     0,   572,   573,   574,   575,   576,     1,     2,
+       3,     4,     5,     6,     7,     8,     0,     0,     0,     0,
+       0,   133,     0,     0,     0,     0,   101,     0,     0,     0,
+       0,     0,     0,    11,     1,     2,     3,     4,     5,     6,
+       7,     8,     0,     0,     0,     0,     0,     9,     0,     0,
+       0,     0,   101,     0,     0,     0,     0,     0,     0,    11,
        1,     2,     3,     4,     5,     6,     7,     8,     0,     0,
-       0,     0,   365,   365,   821,    10,    11,    12,    13,    14,
-      15,    16,    17,     0,   829,     0,   110,   680,   681,    76,
-      77,    78,    79,    80,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   834,     0,     0,     0,     0,
-       0,    81,   825,    82,    83,    84,    85,    86,    87,     0,
-       0,     0,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   860,     0,
-       0,     0,     0,   864,     0,     0,     0,     0,   111,   112,
-     113,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  -593,     0,   864,
-    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
-    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
-    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
-    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
-    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
-    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
-    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
-    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
-    -593,  -593,  -593,  -593,  -593,     0,  -593,     0,  -593,  -593,
-    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
-    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
-    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
-    -593,     0,  -593,  -593,     0,  -593,  -593,  -593,  -593,  -593,
-     221,     0,     0,   222,   223,   224,   225,   226,   227,   228,
-     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
-     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,     0,   257,
-     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
-     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
-     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,     0,   306,
-       0,   307,   308,   309,   310,   311,   312,   313,   314,   315,
-     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
-     326,   327,   328,   329,   330,   331,   332,   333,   334,   335,
-     336,   337,   338,   339,     0,     0,   340,     0,   341,   342,
-     343,   344,   345,   481,     0,     0,   482,   483,   484,   485,
-     486,   487,   488,   489,   490,   491,   492,   493,   494,   495,
-     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
-     506,   507,   508,   509,   510,   511,   512,   513,   514,   515,
-     516,     0,   517,   518,   519,   520,   521,   386,   690,   522,
-     523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
-     533,   534,   535,   536,   537,   538,   539,   540,   541,   542,
-     543,   544,   545,   546,   547,   548,   549,   550,   551,   552,
-     553,   554,   555,   556,   557,   558,   559,   560,   561,   562,
-     563,     0,   564,     0,   565,   566,   567,   568,   569,   570,
-     571,   572,   573,   574,   575,   576,   577,   578,   579,   580,
-     581,   582,   583,   584,   585,   586,   587,   588,   589,   590,
-     591,   592,   593,   594,   595,   596,   597,     0,     0,   598,
-       0,   599,   600,   601,   602,   603,   481,     0,     0,   482,
-     483,   484,   485,   486,   487,   488,   489,   490,   491,   492,
-     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
-     503,   504,   505,   506,   507,   508,   509,   510,   511,   512,
-     513,   514,   515,   516,     0,   517,   518,   519,   520,   521,
-     386,     0,   522,   523,   524,   525,   526,   527,   528,   529,
-     530,   531,   532,   533,   534,   535,   536,   537,   538,   539,
-     540,   541,   542,   543,   544,   545,   546,   547,   548,   549,
-     550,   551,   552,   553,   554,   555,   556,   557,   558,   559,
-     560,   561,   562,   563,     0,   564,     0,   565,   566,   567,
-     568,   569,   570,   571,   572,   573,   574,   575,   576,   577,
-     578,   579,   580,   581,   582,   583,   584,   585,   586,   587,
-     588,   589,   590,   591,   592,   593,   594,   595,   596,   597,
-      69,     0,   598,     0,   599,   600,   601,   602,   603,    70,
-       0,     0,     0,     0,    71,    72,     0,     0,     0,     0,
-       0,     0,     0,     0,   211,   212,   213,    73,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     9,     0,     0,     0,     0,   101,     0,
+       0,     0,     0,     0,     0,    11,     0,     0,   134,   135,
+      18,   105,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     1,     2,     3,     4,     5,
+       6,     7,     8,     0,   134,   135,    18,   105,     9,     0,
+       0,     0,   666,   164,   136,   667,     0,     0,     0,   668,
+      11,   669,   670,   671,   672,   673,   674,     0,     0,     0,
+     134,   135,    18,   105,     0,     0,     0,     0,     0,     0,
+     136,     0,   675,    60,     1,     2,     3,     4,     5,     6,
+       7,     8,    61,     0,     0,     0,     0,    62,    63,     0,
+       0,     0,   680,   585,     0,   586,   644,   587,   339,    11,
+       0,     0,   588,     0,   165,   102,   103,   104,   105,     1,
+       2,     3,     4,     5,     6,     7,     8,   341,   342,    66,
+       0,     0,     9,     0,     0,     0,     0,   101,     0,     0,
+     343,   344,     0,     0,    11,     0,    67,    68,    69,    70,
+      71,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   102,   103,   104,   681,    72,     0,
+      73,    74,    75,    76,    77,    78,     0,     0,     0,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    60,     0,     0,     0,   102,
+     103,   104,   105,     0,    61,     0,     0,     0,     0,    62,
+      63,   656,   657,   658,    64,   585,     0,   586,   659,   587,
+     339,     0,     0,     0,   588,     0,     0,     0,     0,     1,
+       2,     3,     4,     5,     6,     7,     8,     0,     0,   341,
+     342,    66,   693,     0,     0,     0,     0,   101,     0,     0,
+       0,     0,   343,   344,    11,     0,     0,     0,    67,    68,
+      69,    70,    71,     1,     2,     3,     4,     5,     6,     7,
+       8,     0,     0,     0,     0,     0,     9,     0,     0,     0,
+      72,   101,    73,    74,    75,    76,    77,    78,    11,   694,
+       0,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    60,     0,   102,
+     103,   104,   387,     0,     0,     0,    61,     0,     0,     0,
+       0,    62,    63,   745,     0,     0,    64,   585,     0,   586,
+       0,   587,   339,     0,     0,     0,   588,     0,     0,     0,
+       0,     0,     0,   102,   103,   104,   105,     0,   161,     0,
+       0,   341,   342,    66,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   343,   344,     0,     0,     0,     0,
+      67,    68,    69,    70,    71,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    72,   746,   747,    74,    75,    76,    77,    78,
+       0,     0,     0,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,   748,    89,    90,    91,    92,    93,    94,    60,
+       0,     0,     0,     0,     0,     0,     0,     0,    61,     0,
+       0,     0,     0,    62,    63,   745,     0,     0,    64,   585,
+       0,   586,     0,   587,   339,     0,     0,     0,   588,     0,
        0,     0,     0,     1,     2,     3,     4,     5,     6,     7,
-       8,     0,     0,     0,     0,     0,     9,     0,    10,    11,
-      12,    13,    14,    15,    16,    17,     0,     0,     0,   110,
-       0,    76,    77,    78,    79,    80,    19,     0,     0,     0,
-       0,     0,     0,     0,   755,     0,     0,     0,     0,     0,
-       0,     0,     0,    81,     0,    82,    83,    84,    85,    86,
-      87,     0,     0,     0,    88,    89,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-       0,     0,     0,     0,     0,   214,     0,   215,   216,     0,
-       0,   143,   144,    26,   114,     1,     2,     3,     4,     5,
-       6,     7,     8,     0,     0,     0,     0,     0,   142,     0,
-      10,    11,    12,    13,    14,    15,    16,    17,     0,     0,
-       0,   110,     0,     0,     0,     0,     0,   671,    19,     0,
-       0,     0,     1,     2,     3,     4,     5,     6,     7,     8,
-       0,     0,     0,     0,     0,     9,     0,    10,    11,    12,
-      13,    14,    15,    16,    17,     0,     0,     0,   110,     0,
-       0,     0,     0,     0,     0,    19,     0,     0,     0,     0,
-       0,     0,     0,     0,     1,     2,     3,     4,     5,     6,
-       7,     8,     0,   143,   144,    26,   114,     9,     0,    10,
-      11,    12,    13,    14,    15,    16,    17,     0,     0,     0,
-     110,     0,     0,     0,     0,     0,     0,    19,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   145,
-     143,   144,    26,   114,     1,     2,     3,     4,     5,     6,
-       7,     8,     0,     0,     0,     0,     0,     9,     0,    10,
-      11,    12,    13,    14,    15,    16,    17,     0,     0,     0,
-     174,     0,     0,     0,     0,     0,   145,    19,     0,     0,
-       0,     0,   143,   144,    26,   114,     0,    69,     1,     2,
-       3,     4,     5,     6,     7,     8,    70,     0,     0,     0,
-       0,    71,    72,    10,    11,    12,    13,    14,    15,    16,
-      17,     0,     0,     0,   707,   612,     0,   613,   671,   614,
-     357,    19,     0,     0,   615,     0,     0,     0,     0,     0,
-       0,   175,   111,   112,   113,   114,     0,     0,     0,   359,
-     360,    75,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   361,   362,     0,     0,     0,     0,    76,    77,
-      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   111,   112,   113,   708,
-      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
-       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
-       0,   683,   684,   685,    73,   612,     0,   613,   686,   614,
-     357,     0,     0,     0,   615,     0,     0,     0,   159,     1,
-       2,   160,     4,     5,     6,   161,     8,   162,     0,   359,
-     360,    75,   163,     0,    10,    11,    12,    13,    14,    15,
-      16,    17,   361,   362,     0,   110,     0,     0,    76,    77,
-      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
-       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,   111,   112,   113,
-       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
-       0,   772,     0,     0,    73,   612,     0,   613,     0,   614,
-     357,     0,     0,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   171,     0,     0,   359,
-     360,    75,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   361,   362,     0,     0,     0,     0,    76,    77,
-      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      81,   773,   774,    83,    84,    85,    86,    87,     0,     0,
-       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-     775,    98,    99,   100,   101,   102,   103,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
-       0,   772,     0,     0,    73,   612,     0,   613,     0,   614,
-     357,     0,     0,     0,   615,     0,     0,     0,     0,     1,
-       2,     3,     4,     5,     6,     7,     8,     0,     0,   359,
-     360,    75,   163,     0,    10,    11,    12,    13,    14,    15,
-      16,    17,   361,   362,     0,   110,     0,     0,    76,    77,
-      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      81,   773,   774,    83,    84,    85,    86,    87,     0,     0,
-       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-     775,    98,    99,   100,   101,   102,   103,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,   111,   112,   113,
-       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    73,   612,     0,   613,     0,   614,
-     357,     0,     0,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   171,     0,     0,   359,
-     360,    75,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   361,   362,     0,     0,   840,     0,    76,    77,
-      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
-       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    73,   612,  -639,   613,     0,   614,
-     357,     0,     0,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   171,     0,     0,   359,
-     360,    75,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   361,   362,     0,     0,     0,     0,    76,    77,
-      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
-       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    73,   612,     0,   613,     0,   614,
-     357,     0,     0,     0,   615,     0,     0,     0,     0,     0,
-       0,   616,     0,     0,     0,     0,     0,     0,     0,   359,
-     360,    75,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   361,   362,     0,     0,     0,     0,    76,    77,
-      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
-       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    73,   612,     0,   613,     0,   614,
-     357,     0,     0,     0,   615,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   171,     0,     0,   359,
-     360,    75,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   361,   362,     0,     0,     0,     0,    76,    77,
-      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
-       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    73,   612,     0,   613,     0,   614,
-     357,     0,     0,     0,   615,     0,     0,     0,     0,     1,
-       2,     3,     4,     5,     6,     7,     8,     0,     0,   359,
-     360,    75,   628,     0,    10,    11,    12,    13,    14,    15,
-      16,    17,   361,   362,     0,   110,     0,     0,    76,    77,
-      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
-       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,   111,   112,   113,
-       0,    71,    72,    10,    11,    12,    13,    14,    15,    16,
-      17,     0,     0,     0,    73,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  -542,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    75,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    76,    77,
-      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
-       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    73,     0,     0,   355,     0,   356,
-     357,     0,     0,     0,   358,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   359,
-     360,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   361,   362,     0,     0,     0,     0,    76,    77,
-      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
-     363,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
-       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,    71,    72,    10,    11,    12,    13,    14,    15,    16,
-      17,     0,   712,     0,    73,   448,   449,   450,   451,   452,
-     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
-     463,   464,   465,     0,     0,     0,    69,     0,   713,     0,
-       0,    75,     0,     0,     0,    70,     0,     0,     0,     0,
-      71,    72,     0,     0,     0,     0,     0,     0,    76,    77,
-      78,    79,    80,    73,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    74,     0,     0,     0,     0,     0,     0,
-      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
-      75,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,    76,    77,    78,
-      79,    80,    69,     0,     0,     0,     0,     0,     0,     0,
-       0,    70,     0,     0,     0,     0,    71,    72,     0,    81,
-       0,    82,    83,    84,    85,    86,    87,     0,     0,    73,
-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-      98,    99,   100,   101,   102,   103,     0,     0,     0,     0,
-       0,    69,     0,     0,     0,     0,    75,     0,     0,     0,
-      70,     0,     0,     0,     0,    71,    72,     0,     0,     0,
-       0,     0,     0,    76,    77,    78,    79,    80,    73,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   444,     0,
-       0,     0,     0,     0,     0,    81,     0,    82,    83,    84,
-      85,    86,    87,     0,     0,     0,    88,    89,    90,    91,
-      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
-     102,   103,    76,    77,    78,    79,    80,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    81,     0,    82,    83,    84,    85,
-      86,    87,     0,     0,     0,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,    69,     0,     0,     0,     0,     0,     0,     0,     0,
-      70,     0,     0,     0,     0,    71,    72,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    73,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   477,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    69,     0,     0,     0,     0,     0,     0,     0,
-       0,    70,     0,     0,     0,     0,    71,    72,     0,     0,
-       0,     0,    76,    77,    78,    79,    80,     0,     0,    73,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    81,     0,    82,    83,    84,    85,
-      86,    87,     0,     0,     0,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   741,     0,    76,    77,    78,    79,    80,    69,     0,
-       0,     0,     0,     0,     0,     0,     0,    70,     0,     0,
-       0,     0,    71,    72,     0,    81,     0,    82,    83,    84,
-      85,    86,    87,     0,     0,    73,    88,    89,    90,    91,
-      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
-     102,   103,     0,     0,     0,     0,     0,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,    71,    72,     0,     0,     0,     0,   824,     0,    76,
-      77,    78,    79,    80,    73,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    81,     0,    82,    83,    84,    85,    86,    87,     0,
-       0,     0,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,    76,    77,
-      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
-       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,   102,   103,     1,     2,     3,
+       8,     0,     0,   341,   342,    66,   693,     0,     0,     0,
+       0,   101,     0,     0,     0,     0,   343,   344,    11,     0,
+       0,     0,    67,    68,    69,    70,    71,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    72,   746,   747,    74,    75,    76,
+      77,    78,     0,   697,     0,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,   748,    89,    90,    91,    92,    93,
+      94,    60,     0,   102,   103,   104,   387,     0,     0,     0,
+      61,     0,     0,     0,     0,    62,    63,     0,     0,     0,
+      64,   585,     0,   586,     0,   587,   339,     0,     0,     0,
+     588,     0,     0,     0,     1,     2,     3,     4,     5,     6,
+       7,     8,   161,     0,     0,   341,   342,    66,     0,     0,
+       0,     0,   101,     0,     0,     0,     0,     0,   343,   344,
+       0,     0,   813,     0,    67,    68,    69,    70,    71,     1,
+       2,     3,     4,     5,     6,     7,     8,     0,     0,     0,
+       0,     0,     9,     0,     0,     0,    72,   101,    73,    74,
+      75,    76,    77,    78,    11,     0,     0,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    60,   102,   103,   104,     0,     0,     0,
+       0,     0,    61,     0,     0,     0,     0,    62,    63,     0,
+       0,     0,    64,   585,  -613,   586,     0,   587,   339,     0,
+       0,     0,   588,     0,     0,     0,     0,     0,     0,   134,
+     135,    18,   105,     0,   161,     0,     0,   341,   342,    66,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     343,   344,     0,     0,     0,     0,    67,    68,    69,    70,
+      71,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    72,     0,
+      73,    74,    75,    76,    77,    78,     0,     0,     0,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    60,     0,     0,     0,     0,
+       0,     0,     0,     0,    61,     0,     0,     0,     0,    62,
+      63,     0,     0,     0,    64,   585,     0,   586,     0,   587,
+     339,     0,     0,     0,   588,     0,     0,     0,     0,     0,
+       0,   589,     0,     0,     0,     0,     0,     0,     0,   341,
+     342,    66,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   343,   344,     0,     0,     0,     0,    67,    68,
+      69,    70,    71,     1,     2,     3,     4,     5,     6,     7,
+       8,     0,     0,     0,     0,     0,     9,     0,     0,     0,
+      72,   101,    73,    74,    75,    76,    77,    78,    11,     0,
+       0,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    60,     0,     0,
+       0,     0,     0,     0,     0,     0,    61,     0,     0,     0,
+       0,    62,    63,     0,     0,     0,    64,   585,     0,   586,
+       0,   587,   339,     0,     0,     0,   588,     0,     0,     0,
+       0,     0,     0,   102,   103,   104,   105,     0,   161,     0,
+       0,   341,   342,    66,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   343,   344,     0,     0,     0,     0,
+      67,    68,    69,    70,    71,     1,     2,     3,     4,     5,
+       6,     7,     8,     0,     0,     0,     0,     0,   386,     0,
+       0,     0,    72,   101,    73,    74,    75,    76,    77,    78,
+      11,     0,     0,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    60,
+       0,     0,     0,     0,     0,     0,     0,     0,    61,     0,
+       0,     0,     0,    62,    63,     0,     0,     0,    64,   585,
+       0,   586,     0,   587,   339,     0,     0,     0,   588,     0,
+       0,     0,     0,     0,     0,   102,   103,   104,   387,     0,
+       0,     0,     0,   341,   342,    66,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   343,   344,     0,     0,
+       0,     0,    67,    68,    69,    70,    71,     1,     2,     3,
        4,     5,     6,     7,     8,     0,     0,     0,     0,     0,
-     720,     0,    10,    11,    12,    13,    14,    15,    16,    17,
-       0,     0,     0,   110,     0,     0,     0,     0,     0,     0,
-      19,     1,     2,     3,     4,     5,     6,     7,     8,     0,
-       0,     0,     0,     0,   720,     0,    10,    11,    12,    13,
-      14,    15,    16,    17,     0,     0,     0,   110,     0,     0,
-       0,     0,     0,     0,    19,   721,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     1,     2,     3,     4,
-       5,     6,     7,     8,     0,   111,   112,   113,   406,     9,
-       0,    10,    11,    12,    13,    14,    15,    16,    17,   724,
-       0,     0,   110,     0,     0,     0,     0,     0,     0,    19,
-       1,     2,     3,     4,     5,     6,     7,     8,     0,   111,
-     112,   113,   406,     9,     0,    10,    11,    12,    13,    14,
-      15,    16,    17,     0,     0,     0,   110,     0,     0,     0,
-       0,     0,     0,    19,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     1,     2,     3,     4,     5,
-       6,     7,     8,     0,   111,   112,   113,   114,     9,     0,
-      10,    11,    12,    13,    14,    15,    16,    17,     0,     0,
-       0,   110,     0,     0,     0,     0,     0,     0,    19,     1,
-       2,     3,     4,     5,     6,     7,     8,     0,   111,   112,
-     113,   114,     9,     0,    10,    11,    12,    13,    14,    15,
-      16,    17,     0,     0,     0,   110,     0,     0,     0,     0,
-       0,     0,    19,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     1,     2,     3,     4,     5,     6,
-       7,     8,     0,   143,   144,    26,   114,   405,     0,    10,
-      11,    12,    13,    14,    15,    16,    17,     0,     0,     0,
-     110,     0,     0,     0,     0,     0,     0,    19,     1,     2,
-       3,     4,     5,     6,     7,     8,     0,   111,   112,   113,
-     114,     0,     0,    10,    11,    12,    13,    14,    15,    16,
-      17,     0,     0,     0,   110,     0,     0,     0,   438,   439,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   738,   441,     0,     0,     0,
-       0,     0,   111,   112,   113,   406,   448,   449,   450,   451,
-     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
-     462,   463,   464,   465,     0,     0,     0,     0,     0,   713,
-     663,     0,     0,     0,     0,     0,   111,   112,   113,   448,
-     449,   450,   451,   452,   453,   454,   455,   456,   457,   458,
-     459,   460,   461,   462,   463,   464,   465,   766,     0,     0,
-       0,     0,   466,     0,     0,     0,   448,   449,   450,   451,
-     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
-     462,   463,   464,   465,   879,     0,     0,     0,     0,   713,
-       0,     0,     0,   448,   449,   450,   451,   452,   453,   454,
-     455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
-     465,   853,     0,     0,     0,     0,   713,     0,     0,   448,
-     449,   450,   451,   452,   453,   454,   455,   456,   457,   458,
-     459,   460,   461,   462,   463,   464,   465,   750,     0,     0,
-       0,     0,   713,     0,   448,   449,   450,   451,   452,   453,
-     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
-     464,   465,   807,     0,     0,     0,     0,   466,     0,   448,
-     449,   450,   451,   452,   453,   454,   455,   456,   457,   458,
-     459,   460,   461,   462,   463,   464,   465,     0,     0,     0,
-       0,     0,   713,   448,   449,   450,   451,   452,   453,   454,
-     455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
-     465,     0,     0,     0,     0,     0,   466,   448,   449,   450,
-     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
-     461,   462,   463,   464,   465,     0,     0,     0,     0,     0,
-     713,   448,   449,   450,   451,   452,   453,   454,   455,   456,
-     457,   458,   459,   460,   461,   462,   463,   464,   465,     0,
-       0,     0,     0,     0,   466,   448,   449,   450,   451,   452,
-     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
-     463,   464,   465,     0,     0,     0,     0,     0,   713
+     601,     0,     0,     0,    72,   101,    73,    74,    75,    76,
+      77,    78,     0,     0,     0,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    60,     0,     0,     0,     0,     0,     0,     0,     0,
+      61,     0,     0,     0,     0,    62,    63,     0,     0,     0,
+      64,     0,     0,   337,     0,   338,   339,     0,     0,     0,
+     340,     0,     0,     0,     0,     0,     0,   102,   103,   104,
+       0,     0,     0,     0,     0,   341,   342,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   343,   344,
+       0,     0,     0,     0,    67,    68,    69,    70,    71,     0,
+       0,     0,     0,     0,     0,     0,   345,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    72,     0,    73,    74,
+      75,    76,    77,    78,     0,     0,     0,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    60,     0,     0,     0,     0,     0,     0,
+       0,     0,    61,     0,     0,     0,     0,    62,    63,     0,
+       0,     0,    64,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    65,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    66,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    67,    68,    69,    70,
+      71,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    72,     0,
+      73,    74,    75,    76,    77,    78,     0,     0,     0,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    60,     0,     0,     0,     0,
+       0,     0,     0,     0,    61,     0,     0,     0,     0,    62,
+      63,     0,     0,     0,    64,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  -516,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    66,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    67,    68,
+      69,    70,    71,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      72,     0,    73,    74,    75,    76,    77,    78,     0,     0,
+       0,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    60,     0,     0,
+       0,     0,     0,     0,     0,     0,    61,     0,   636,     0,
+       0,    62,    63,     0,     0,     0,    64,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
+     442,   443,   444,   445,   446,     0,     0,     0,     0,     0,
+     447,     0,     0,    66,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      67,    68,    69,    70,    71,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    72,     0,    73,    74,    75,    76,    77,    78,
+       0,     0,     0,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,    60,
+       0,     0,     0,     0,     0,     0,     0,     0,    61,     0,
+       0,     0,     0,    62,    63,     0,     0,     0,    64,     0,
+     739,     0,     0,     0,     0,     0,     0,     0,   192,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,     0,     0,     0,
+       0,     0,   686,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    67,    68,    69,    70,    71,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    72,     0,    73,    74,    75,    76,
+      77,    78,     0,     0,     0,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    60,     0,     0,     0,     0,     0,     0,     0,     0,
+      61,     0,     0,     0,     0,    62,    63,     0,     0,     0,
+      64,     0,   852,     0,     0,     0,     0,     0,     0,     0,
+     425,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,   439,   440,   441,   442,   443,   444,   445,   446,     0,
+       0,     0,     0,     0,   686,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    67,    68,    69,    70,    71,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    72,     0,    73,    74,
+      75,    76,    77,    78,     0,     0,     0,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    60,     0,     0,     0,     0,     0,     0,
+       0,     0,    61,     0,     0,     0,     0,    62,    63,     0,
+       0,     0,    64,     0,     0,   826,     0,     0,     0,     0,
+       0,     0,   458,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,   439,   440,   441,   442,   443,   444,   445,
+     446,     0,     0,     0,     0,     0,   686,     0,     0,     0,
+       0,     0,    60,     0,     0,     0,    67,    68,    69,    70,
+      71,    61,     0,     0,     0,     0,    62,    63,     0,     0,
+       0,    64,     0,     0,     0,     0,     0,     0,    72,     0,
+      73,    74,    75,    76,    77,    78,     0,     0,     0,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,     0,     0,     0,     0,     0,
+       0,    60,     0,   714,     0,    67,    68,    69,    70,    71,
+      61,     0,     0,     0,     0,    62,    63,     0,     0,     0,
+      64,     0,     0,     0,     0,     0,     0,    72,     0,    73,
+      74,    75,    76,    77,    78,     0,     0,     0,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,     0,     0,     0,     0,     0,     0,
+      60,     0,   797,     0,    67,    68,    69,    70,    71,    61,
+       0,     0,     0,     0,    62,    63,     0,     0,     0,    64,
+       0,     0,     0,     0,     0,     0,    72,     0,    73,    74,
+      75,    76,    77,    78,     0,     0,     0,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    67,    68,    69,    70,    71,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    72,     0,    73,    74,    75,
+      76,    77,    78,     0,     0,     0,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,   723,     0,     0,     0,     0,     0,     0,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,   780,     0,     0,
+       0,     0,   447,     0,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
+     445,   446,     0,     0,     0,   685,     0,   686,   429,   430,
+     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
+     441,   442,   443,   444,   445,   446,     0,     0,     0,     0,
+       0,   686,   429,   430,   431,   432,   433,   434,   435,   436,
+     437,   438,   439,   440,   441,   442,   443,   444,   445,   446,
+       0,     0,     0,     0,     0,   447,   429,   430,   431,   432,
+     433,   434,   435,   436,   437,   438,   439,   440,   441,   442,
+     443,   444,   445,   446,     0,     0,     0,     0,     0,   686,
+     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
+     439,   440,   441,   442,   443,   444,   445,   446,     0,     0,
+       0,     0,     0,   447,   429,   430,   431,   432,   433,   434,
+     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
+     445,   446,     0,     0,     0,     0,     0,   686
 };
 
 static const short int yycheck[] =
 {
-      41,    30,     9,   137,    18,     9,     0,    19,    23,    23,
-     148,    74,   396,   141,   366,    27,   470,    24,    25,    26,
-     470,    23,   422,   727,   141,   154,   155,   156,   169,   416,
-     378,   379,   419,     0,   393,    18,   177,    41,   729,    57,
-     761,    35,   763,   358,   756,    23,    29,   727,    34,   364,
-      33,    18,    32,    34,    35,    40,     9,   705,    11,    40,
-      34,   727,    29,    33,    52,    32,    33,    41,    35,   428,
-      74,    52,    57,    43,     6,    39,     3,     9,   782,     6,
-      44,   802,    34,    10,   218,    12,    13,    14,    15,    16,
-      17,   443,    72,     0,   446,     4,     5,     6,   105,    40,
-       9,    42,   114,    39,   111,   112,   113,   148,   774,    39,
-      40,   132,    42,   131,    41,    39,   782,   829,    42,    42,
-     479,    39,    45,   130,    40,    43,    44,   631,   819,   633,
-     145,   145,   447,   140,   141,   142,   143,   144,   142,   202,
-     126,    43,    44,   145,   148,   152,    43,    44,   860,    17,
-      18,   466,   467,     6,     7,     8,   804,    41,    42,   163,
-     175,   175,    40,   884,    44,   869,   857,   145,   209,   817,
-      44,   862,    57,   175,   854,    95,   183,    41,    42,    41,
-      42,   195,   196,    41,    42,   168,   143,   144,   854,   837,
-     197,   174,   199,   195,   196,   886,    38,   175,   202,    39,
-     880,   168,    40,   869,    45,    44,    43,   174,   608,    31,
-      31,    45,    31,    39,   880,    44,    44,   671,    31,    46,
-      40,   671,   676,     6,    40,    39,   676,   125,    40,    39,
-     358,    17,    18,    44,    43,    40,   364,    39,    39,     6,
-      48,   358,    34,    41,   385,    48,   630,   364,   632,   117,
-     118,   119,   120,   121,   122,    42,   615,    30,   617,   100,
-     101,   102,   103,   104,   105,   106,   100,   101,   102,   103,
-     104,   105,   106,    48,    40,   634,    40,    39,    48,    39,
-      32,    40,     4,     5,     6,     7,     8,     9,    10,    11,
-      48,    40,    39,    41,    33,    17,    41,    19,    20,    21,
-      22,    23,    24,    25,    26,    41,    41,    41,    30,    42,
-      39,    43,    43,   665,    41,    37,   668,   669,    41,   447,
-      41,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     447,    41,   395,    41,    43,    42,    42,    42,   466,   467,
-      41,    40,   729,    40,   407,    48,    42,   116,    33,   466,
-     467,   358,    43,    40,   713,   714,   363,   364,   100,   101,
-     102,   103,   104,   105,   106,    39,   407,    40,   727,    41,
-      92,    93,    94,    95,   415,   382,   417,    99,    39,    41,
-      43,    33,    42,    39,    42,    42,   770,   771,    41,    40,
-      32,   395,    42,    40,   406,    41,    33,    33,    41,    43,
-      41,   405,    42,   407,    42,    33,   765,    41,   130,   757,
-     758,   418,    42,   348,   477,    41,    41,    35,   175,   805,
-     140,   676,   671,   782,   431,    48,   176,   434,   440,   190,
-     471,   472,   819,   734,   749,   750,   606,   444,   790,   791,
-     447,    32,   196,   381,   797,   635,   805,   440,   807,    29,
-     763,   106,   880,   415,   388,   470,   470,   816,   419,   466,
-     467,   773,   736,    -1,    -1,    -1,    -1,    -1,   470,    -1,
-     857,    -1,    -1,   477,    -1,   862,   470,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,
-       9,    10,    11,    -1,   853,   854,    -1,    -1,    17,   886,
-      19,    20,    21,    22,    23,    24,    25,    26,    -1,    -1,
-     869,    30,    -1,    -1,    -1,    38,    -1,    -1,    37,    38,
-      39,   880,     3,    -1,    -1,     6,    -1,    -1,    -1,    10,
-      49,    12,    13,    14,    15,    16,    17,   675,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   678,
-     679,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    -1,    87,    88,    89,    90,    -1,    -1,
-      -1,    -1,    91,    92,    93,    94,    95,    96,    97,    -1,
-      99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   659,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   123,    -1,    -1,    -1,    -1,   128,
-      -1,   130,    -1,   615,    -1,   622,   657,   631,    -1,   633,
-     627,   749,   750,    -1,   628,    -1,    -1,    -1,   635,   631,
-      -1,   633,   749,   750,   675,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   658,    -1,    -1,   788,   659,   671,   671,    -1,    -1,
-      -1,   676,   676,    -1,    -1,    -1,    -1,    -1,    -1,   671,
-     677,   675,    -1,    -1,   676,   682,    -1,   671,    -1,    -1,
-      -1,    -1,   676,    -1,    -1,    -1,    -1,    -1,     3,    -1,
-     731,    -1,    -1,   734,    -1,    -1,   708,    12,    -1,    -1,
-      -1,    -1,    17,    18,   733,    -1,    -1,    -1,    -1,    -1,
-      -1,   718,    -1,    -1,    -1,    30,   720,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,   736,
-       4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
-      -1,    -1,   749,   750,   785,    19,    20,    21,    22,    23,
-      24,    25,    26,    -1,   795,    -1,    30,   798,   799,    74,
-      75,    76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   804,    -1,    -1,    -1,    -1,
-      -1,    96,   789,    98,    99,   100,   101,   102,   103,    -1,
-      -1,    -1,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,   849,    -1,
-      -1,    -1,    -1,   854,    -1,    -1,    -1,    -1,    92,    93,
-      94,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     0,    -1,   880,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    -1,    89,    -1,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
-     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
-       0,    -1,    -1,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    -1,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    -1,    89,
-      -1,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,    -1,    -1,   126,    -1,   128,   129,
-     130,   131,   132,     0,    -1,    -1,     3,     4,     5,     6,
+      33,    22,    11,    15,     0,     9,   128,   377,     9,    65,
+      19,   132,    16,    17,    18,   132,   451,   451,    10,   144,
+     145,   146,   374,    15,   403,   348,     0,   185,   186,   359,
+     360,    27,    33,   340,   397,   159,    10,   400,    15,   346,
+     734,    10,   736,   167,   702,   729,   678,    21,    24,    49,
+      24,    25,    21,    27,   700,   700,    25,   409,   700,    26,
+       6,    32,    26,     9,    65,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    31,    26,    27,    49,    17,
+      25,   775,    32,     9,    22,    11,   208,    44,    64,    32,
+      35,    34,    96,   604,    44,   606,   105,     0,   102,   103,
+     104,   424,   747,    32,   427,    26,    31,   124,   460,    32,
+     755,    36,    33,   755,     4,     5,     6,   121,   802,     9,
+      36,   428,    34,   123,   136,    37,    36,   131,   132,   133,
+     134,   135,   133,    87,   792,    49,   192,    30,   142,    31,
+     447,   448,    34,    31,   136,   777,    84,    85,    86,   833,
+      32,   118,   153,   165,    17,    18,    31,    35,   790,   136,
+      35,    36,    36,   857,    31,    32,   199,    34,    23,   173,
+      35,    36,   830,   165,     6,     7,     8,   835,   810,    35,
+      36,   827,   827,   187,   158,   189,    33,    34,   165,   158,
+     164,   192,    23,   185,   186,   164,    23,   842,    33,    34,
+     842,   859,   581,    33,    34,    33,    34,   853,   853,   644,
+     644,    31,    17,    18,   649,   649,   134,   135,    36,   340,
+      36,    23,    32,   340,    38,   346,     6,    35,    32,   346,
+      31,   117,    32,   603,    31,   605,   588,    36,   590,    32,
+      31,    31,   366,     6,    40,    26,   109,   110,   111,   112,
+     113,   114,    40,    22,    33,   607,    92,    93,    94,    95,
+      96,    97,    98,     4,     5,     6,     7,     8,     9,    10,
+      11,    32,    34,    32,    40,    31,    17,    31,    24,    32,
+      40,    22,    40,    32,    31,    33,    25,   108,    29,    33,
+      33,    33,    32,   451,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,    34,    31,    35,    35,   428,    33,    33,
+      33,   428,    33,    33,    33,   638,    34,    34,   641,   642,
+     376,    34,    33,    35,    40,    32,   447,   448,    34,    25,
+     447,   448,   388,    37,   686,   687,   340,    35,    32,   702,
+      31,   345,   346,    84,    85,    86,    87,    32,   700,    33,
+      91,    31,    33,    35,    25,   388,    34,     3,    31,   363,
+       6,    24,    34,   396,    10,   398,    12,    13,    14,    15,
+      16,    17,    33,   743,   744,   376,    34,    32,   387,    32,
+      34,   122,    33,    25,    25,   386,   738,   388,    92,    93,
+      94,    95,    96,    97,    98,   399,    33,    35,    34,    34,
+     730,   731,   458,   755,    33,    33,    25,    34,   412,    33,
+      33,   415,   421,   330,    27,   722,   723,   131,   778,   452,
+     453,   425,    37,   649,   428,   644,   778,   165,   780,   792,
+     588,    39,   166,   707,   579,   180,    24,   789,   362,   451,
+     763,   764,   770,   447,   448,   608,   604,     3,   606,   186,
+      97,   421,    21,   736,   369,   451,    12,   458,   853,   451,
+     396,    17,    18,    19,    20,    21,    22,   830,   746,   400,
+     709,    -1,   835,    -1,   826,   827,    -1,    92,    93,    94,
+      95,    96,    97,    98,    -1,    -1,   644,    -1,    -1,    -1,
+     842,   649,    -1,    -1,    -1,    -1,   859,    -1,    -1,    -1,
+      -1,   853,     4,     5,     6,     7,     8,     9,    10,    11,
+      66,    67,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
+      22,    -1,    -1,    -1,    26,    27,   651,   652,    -1,    -1,
+      -1,    -1,    88,    -1,    90,    91,    92,    93,    94,    95,
+      -1,    -1,    44,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,    -1,
+      -1,    -1,    -1,    -1,   120,    -1,   122,   123,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   632,    -1,    -1,    -1,
+      -1,    -1,    84,    85,    86,    -1,    -1,    -1,    -1,    -1,
+      -1,   595,    -1,    -1,    -1,    -1,   600,   630,    -1,    -1,
+     601,   722,   723,    -1,   608,   722,   723,    -1,    -1,    -1,
+      -1,    -1,   604,    -1,   606,   648,     4,     5,     6,     7,
+       8,     9,    10,    11,    -1,    -1,    -1,   631,    -1,    17,
+      -1,   632,   644,    -1,    22,    -1,    -1,   649,    -1,   761,
+      -1,    29,    -1,    -1,    -1,    -1,   650,   648,   644,    37,
+      -1,   655,   644,   649,    -1,    -1,    -1,   649,    -1,    -1,
+      -1,    -1,    -1,     4,     5,     6,     7,     8,     9,    10,
+      11,   704,   681,    -1,   707,    -1,    17,    -1,    -1,    -1,
+      -1,    22,    -1,    -1,    -1,   706,    -1,   691,    29,    30,
+      31,    -1,   693,    -1,    -1,    -1,    84,    85,    86,    87,
+      41,    -1,    -1,    -1,    -1,   709,    -1,    -1,    -1,    -1,
+       4,     5,     6,     7,     8,     9,    10,    11,   722,   723,
+      -1,    -1,    -1,    17,    -1,   758,    30,    -1,    22,    -1,
+      -1,    -1,   120,    -1,    -1,   768,    -1,    -1,   771,   772,
+      -1,    -1,    83,    84,    85,    86,    87,    88,    89,    -1,
+      91,    -1,    -1,    -1,    -1,    -1,   777,    -1,   762,    -1,
+      -1,    -1,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,   115,    79,    80,    81,    82,   120,
+      -1,   122,    -1,    -1,    -1,    31,    -1,    -1,    -1,   822,
+      84,    85,    86,    -1,   827,    -1,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    -1,    -1,    -1,    -1,     0,    65,
+     853,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    -1,    81,
+      -1,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,    -1,   117,   118,    -1,   120,   121,
+     122,   123,   124,     0,    -1,    -1,     3,     4,     5,     6,
        7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    -1,    39,    40,    41,    42,    43,    44,    45,    46,
+      27,    28,    29,    -1,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    46,
       47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
       57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
       67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    -1,    89,    -1,    91,    92,    93,    94,    95,    96,
+      77,    78,    79,    -1,    81,    -1,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
       97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,    -1,    -1,   126,
-      -1,   128,   129,   130,   131,   132,     0,    -1,    -1,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    -1,    39,    40,    41,    42,    43,
-      44,    -1,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    -1,    89,    -1,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-       3,    -1,   126,    -1,   128,   129,   130,   131,   132,    12,
-      -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    27,    28,    29,    30,    -1,    -1,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,    -1,
+      -1,   118,    -1,   120,   121,   122,   123,   124,     0,    -1,
+      -1,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    -1,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,    76,    77,    78,    79,    -1,    81,
+      -1,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,    -1,    -1,   118,    -1,   120,   121,
+     122,   123,   124,     0,    -1,    -1,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    -1,    31,    32,    33,    34,    35,    36,
+      -1,    38,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    -1,    81,    -1,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,    -1,
+      -1,   118,    -1,   120,   121,   122,   123,   124,     4,     5,
+       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
+      -1,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,    -1,
+      -1,    -1,    -1,    29,     4,     5,     6,     7,     8,     9,
+      10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    -1,
+      -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,    29,
+       4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
+      -1,    -1,    -1,    17,    -1,    -1,    -1,    -1,    22,    -1,
+      -1,    -1,    -1,    -1,    -1,    29,    -1,    -1,    84,    85,
+      86,    87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,
+       9,    10,    11,    -1,    84,    85,    86,    87,    17,    -1,
+      -1,    -1,     3,    22,   120,     6,    -1,    -1,    -1,    10,
+      29,    12,    13,    14,    15,    16,    17,    -1,    -1,    -1,
+      84,    85,    86,    87,    -1,    -1,    -1,    -1,    -1,    -1,
+     120,    -1,    33,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
+      -1,    -1,    22,    23,    -1,    25,   120,    27,    28,    29,
+      -1,    -1,    32,    -1,    83,    84,    85,    86,    87,     4,
+       5,     6,     7,     8,     9,    10,    11,    47,    48,    49,
+      -1,    -1,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,
+      60,    61,    -1,    -1,    29,    -1,    66,    67,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    84,    85,    86,    87,    88,    -1,
+      90,    91,    92,    93,    94,    95,    -1,    -1,    -1,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,     3,    -1,    -1,    -1,    84,
+      85,    86,    87,    -1,    12,    -1,    -1,    -1,    -1,    17,
+      18,    19,    20,    21,    22,    23,    -1,    25,    26,    27,
+      28,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,     4,
+       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    47,
+      48,    49,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,
+      -1,    -1,    60,    61,    29,    -1,    -1,    -1,    66,    67,
+      68,    69,    70,     4,     5,     6,     7,     8,     9,    10,
+      11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    -1,    -1,
+      88,    22,    90,    91,    92,    93,    94,    95,    29,    64,
+      -1,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,     3,    -1,    84,
+      85,    86,    87,    -1,    -1,    -1,    12,    -1,    -1,    -1,
+      -1,    17,    18,    19,    -1,    -1,    22,    23,    -1,    25,
+      -1,    27,    28,    -1,    -1,    -1,    32,    -1,    -1,    -1,
+      -1,    -1,    -1,    84,    85,    86,    87,    -1,    44,    -1,
+      -1,    47,    48,    49,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    60,    61,    -1,    -1,    -1,    -1,
+      66,    67,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    88,    89,    90,    91,    92,    93,    94,    95,
+      -1,    -1,    -1,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,     3,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
+      -1,    -1,    -1,    17,    18,    19,    -1,    -1,    22,    23,
+      -1,    25,    -1,    27,    28,    -1,    -1,    -1,    32,    -1,
       -1,    -1,    -1,     4,     5,     6,     7,     8,     9,    10,
-      11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    19,    20,
-      21,    22,    23,    24,    25,    26,    -1,    -1,    -1,    30,
-      -1,    74,    75,    76,    77,    78,    37,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    45,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    96,    -1,    98,    99,   100,   101,   102,
-     103,    -1,    -1,    -1,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
-      -1,    -1,    -1,    -1,    -1,   128,    -1,   130,   131,    -1,
-      -1,    92,    93,    94,    95,     4,     5,     6,     7,     8,
-       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,
-      19,    20,    21,    22,    23,    24,    25,    26,    -1,    -1,
-      -1,    30,    -1,    -1,    -1,    -1,    -1,   128,    37,    -1,
-      -1,    -1,     4,     5,     6,     7,     8,     9,    10,    11,
-      -1,    -1,    -1,    -1,    -1,    17,    -1,    19,    20,    21,
-      22,    23,    24,    25,    26,    -1,    -1,    -1,    30,    -1,
-      -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,     9,
-      10,    11,    -1,    92,    93,    94,    95,    17,    -1,    19,
-      20,    21,    22,    23,    24,    25,    26,    -1,    -1,    -1,
-      30,    -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   128,
-      92,    93,    94,    95,     4,     5,     6,     7,     8,     9,
-      10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    19,
-      20,    21,    22,    23,    24,    25,    26,    -1,    -1,    -1,
-      30,    -1,    -1,    -1,    -1,    -1,   128,    37,    -1,    -1,
-      -1,    -1,    92,    93,    94,    95,    -1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    -1,    -1,    -1,
-      -1,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    -1,    -1,    -1,    30,    31,    -1,    33,   128,    35,
-      36,    37,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-      -1,    91,    92,    93,    94,    95,    -1,    -1,    -1,    55,
-      56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    74,    75,
-      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,    95,
-      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    27,    28,    29,    30,    31,    -1,    33,    34,    35,
-      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    -1,    55,
-      56,    57,    17,    -1,    19,    20,    21,    22,    23,    24,
-      25,    26,    68,    69,    -1,    30,    -1,    -1,    74,    75,
-      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    92,    93,    94,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    27,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
-      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,    55,
-      56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    74,    75,
-      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      11,    -1,    -1,    47,    48,    49,    17,    -1,    -1,    -1,
+      -1,    22,    -1,    -1,    -1,    -1,    60,    61,    29,    -1,
+      -1,    -1,    66,    67,    68,    69,    70,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    97,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    27,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
-      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,     4,
-       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    55,
-      56,    57,    17,    -1,    19,    20,    21,    22,    23,    24,
-      25,    26,    68,    69,    -1,    30,    -1,    -1,    74,    75,
-      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    97,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    92,    93,    94,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
-      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,    55,
-      56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    68,    69,    -1,    -1,    72,    -1,    74,    75,
-      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    88,    89,    90,    91,    92,    93,
+      94,    95,    -1,    64,    -1,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,     3,    -1,    84,    85,    86,    87,    -1,    -1,    -1,
+      12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
+      22,    23,    -1,    25,    -1,    27,    28,    -1,    -1,    -1,
+      32,    -1,    -1,    -1,     4,     5,     6,     7,     8,     9,
+      10,    11,    44,    -1,    -1,    47,    48,    49,    -1,    -1,
+      -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    60,    61,
+      -1,    -1,    64,    -1,    66,    67,    68,    69,    70,     4,
+       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    -1,
+      -1,    -1,    17,    -1,    -1,    -1,    88,    22,    90,    91,
+      92,    93,    94,    95,    29,    -1,    -1,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,     3,    84,    85,    86,    -1,    -1,    -1,
+      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
+      -1,    -1,    22,    23,    24,    25,    -1,    27,    28,    -1,
+      -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,    -1,    84,
+      85,    86,    87,    -1,    44,    -1,    -1,    47,    48,    49,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
+      60,    61,    -1,    -1,    -1,    -1,    66,    67,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,
+      90,    91,    92,    93,    94,    95,    -1,    -1,    -1,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,     3,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
+      18,    -1,    -1,    -1,    22,    23,    -1,    25,    -1,    27,
+      28,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,
+      -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    47,
+      48,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    60,    61,    -1,    -1,    -1,    -1,    66,    67,
+      68,    69,    70,     4,     5,     6,     7,     8,     9,    10,
+      11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    -1,    -1,
+      88,    22,    90,    91,    92,    93,    94,    95,    29,    -1,
+      -1,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,     3,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    30,    31,    32,    33,    -1,    35,
-      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,    55,
-      56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    74,    75,
-      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    22,    23,    -1,    25,
+      -1,    27,    28,    -1,    -1,    -1,    32,    -1,    -1,    -1,
+      -1,    -1,    -1,    84,    85,    86,    87,    -1,    44,    -1,
+      -1,    47,    48,    49,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    60,    61,    -1,    -1,    -1,    -1,
+      66,    67,    68,    69,    70,     4,     5,     6,     7,     8,
+       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,
+      -1,    -1,    88,    22,    90,    91,    92,    93,    94,    95,
+      29,    -1,    -1,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,     3,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
+      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    22,    23,
+      -1,    25,    -1,    27,    28,    -1,    -1,    -1,    32,    -1,
+      -1,    -1,    -1,    -1,    -1,    84,    85,    86,    87,    -1,
+      -1,    -1,    -1,    47,    48,    49,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    60,    61,    -1,    -1,
+      -1,    -1,    66,    67,    68,    69,    70,     4,     5,     6,
+       7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
+      17,    -1,    -1,    -1,    88,    22,    90,    91,    92,    93,
+      94,    95,    -1,    -1,    -1,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
+      22,    -1,    -1,    25,    -1,    27,    28,    -1,    -1,    -1,
+      32,    -1,    -1,    -1,    -1,    -1,    -1,    84,    85,    86,
+      -1,    -1,    -1,    -1,    -1,    47,    48,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    60,    61,
+      -1,    -1,    -1,    -1,    66,    67,    68,    69,    70,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    78,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,    90,    91,
+      92,    93,    94,    95,    -1,    -1,    -1,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
+      -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    49,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
-      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-      -1,    47,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,
-      56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    74,    75,
-      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    68,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,
+      90,    91,    92,    93,    94,    95,    -1,    -1,    -1,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,     3,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
+      18,    -1,    -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
-      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,    55,
-      56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    74,    75,
-      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,
+      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
-      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,     4,
-       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    55,
-      56,    57,    17,    -1,    19,    20,    21,    22,    23,    24,
-      25,    26,    68,    69,    -1,    30,    -1,    -1,    74,    75,
-      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      88,    -1,    90,    91,    92,    93,    94,    95,    -1,    -1,
+      -1,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    33,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    22,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    -1,    -1,    -1,    -1,    -1,
+      65,    -1,    -1,    49,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    92,    93,    94,
-      -1,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
+      66,    67,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    74,    75,
-      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    88,    -1,    90,    91,    92,    93,    94,    95,
+      -1,    -1,    -1,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,     3,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
+      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    22,    -1,
+      33,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    -1,    -1,    -1,
+      -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    66,    67,    68,    69,    70,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    30,    -1,    -1,    33,    -1,    35,
-      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,
-      56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    74,    75,
-      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    -1,    47,    -1,    30,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    -1,    -1,    -1,     3,    -1,    73,    -1,
-      -1,    57,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,
-      17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    74,    75,
-      76,    77,    78,    30,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      57,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,    74,    75,    76,
-      77,    78,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,    96,
-      -1,    98,    99,   100,   101,   102,   103,    -1,    -1,    30,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,   121,   122,    -1,    -1,    -1,    -1,
-      -1,     3,    -1,    -1,    -1,    -1,    57,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    88,    -1,    90,    91,    92,    93,
+      94,    95,    -1,    -1,    -1,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
-      -1,    -1,    -1,    74,    75,    76,    77,    78,    30,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,
-      -1,    -1,    -1,    -1,    -1,    96,    -1,    98,    99,   100,
-     101,   102,   103,    -1,    -1,    -1,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,    74,    75,    76,    77,    78,    -1,    -1,    -1,
+      22,    -1,    33,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      32,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    -1,
+      -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    66,    67,    68,    69,    70,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    96,    -1,    98,    99,   100,   101,
-     102,   103,    -1,    -1,    -1,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
-     122,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,    90,    91,
+      92,    93,    94,    95,    -1,    -1,    -1,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
+      -1,    -1,    22,    -1,    -1,    34,    -1,    -1,    -1,    -1,
+      -1,    -1,    32,    42,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
+      59,    -1,    -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,
+      -1,    -1,     3,    -1,    -1,    -1,    66,    67,    68,    69,
+      70,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,
+      -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,
+      90,    91,    92,    93,    94,    95,    -1,    -1,    -1,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,    -1,    -1,    -1,    -1,    -1,
+      -1,     3,    -1,    64,    -1,    66,    67,    68,    69,    70,
       12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,
-      -1,    -1,    74,    75,    76,    77,    78,    -1,    -1,    30,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    96,    -1,    98,    99,   100,   101,
-     102,   103,    -1,    -1,    -1,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
-     122,    72,    -1,    74,    75,    76,    77,    78,     3,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,
-      -1,    -1,    17,    18,    -1,    96,    -1,    98,    99,   100,
-     101,   102,   103,    -1,    -1,    30,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,    -1,    -1,    -1,    -1,    -1,     3,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    72,    -1,    74,
-      75,    76,    77,    78,    30,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    96,    -1,    98,    99,   100,   101,   102,   103,    -1,
-      -1,    -1,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,   121,   122,    74,    75,
-      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      22,    -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,    90,
+      91,    92,    93,    94,    95,    -1,    -1,    -1,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,    -1,    -1,    -1,    -1,    -1,    -1,
+       3,    -1,    64,    -1,    66,    67,    68,    69,    70,    12,
+      -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    22,
+      -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,    90,    91,
+      92,    93,    94,    95,    -1,    -1,    -1,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    66,    67,    68,    69,    70,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
-      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     4,     5,     6,
-       7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
-      17,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
-      -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,
-      37,     4,     5,     6,     7,     8,     9,    10,    11,    -1,
-      -1,    -1,    -1,    -1,    17,    -1,    19,    20,    21,    22,
-      23,    24,    25,    26,    -1,    -1,    -1,    30,    -1,    -1,
-      -1,    -1,    -1,    -1,    37,    72,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     4,     5,     6,     7,
-       8,     9,    10,    11,    -1,    92,    93,    94,    95,    17,
-      -1,    19,    20,    21,    22,    23,    24,    25,    26,    72,
-      -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    37,
-       4,     5,     6,     7,     8,     9,    10,    11,    -1,    92,
-      93,    94,    95,    17,    -1,    19,    20,    21,    22,    23,
-      24,    25,    26,    -1,    -1,    -1,    30,    -1,    -1,    -1,
-      -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,
-       9,    10,    11,    -1,    92,    93,    94,    95,    17,    -1,
-      19,    20,    21,    22,    23,    24,    25,    26,    -1,    -1,
-      -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    37,     4,
-       5,     6,     7,     8,     9,    10,    11,    -1,    92,    93,
-      94,    95,    17,    -1,    19,    20,    21,    22,    23,    24,
-      25,    26,    -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,
-      -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,     9,
-      10,    11,    -1,    92,    93,    94,    95,    17,    -1,    19,
-      20,    21,    22,    23,    24,    25,    26,    -1,    -1,    -1,
-      30,    -1,    -1,    -1,    -1,    -1,    -1,    37,     4,     5,
-       6,     7,     8,     9,    10,    11,    -1,    92,    93,    94,
-      95,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    -1,    -1,    -1,    30,    -1,    -1,    -1,    34,    35,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    39,    52,    -1,    -1,    -1,
-      -1,    -1,    92,    93,    94,    95,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    -1,    -1,    -1,    -1,    -1,    73,
-      41,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    67,    41,    -1,    -1,
-      -1,    -1,    73,    -1,    -1,    -1,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    41,    -1,    -1,    -1,    -1,    73,
-      -1,    -1,    -1,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    42,    -1,    -1,    -1,    -1,    73,    -1,    -1,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    67,    43,    -1,    -1,
-      -1,    -1,    73,    -1,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    43,    -1,    -1,    -1,    -1,    73,    -1,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    66,    67,    -1,    -1,    -1,
-      -1,    -1,    73,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    -1,    -1,    -1,    -1,    -1,    73,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,    -1,    -1,    -1,    -1,    -1,
-      73,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    -1,
-      -1,    -1,    -1,    -1,    73,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    -1,    -1,    -1,    -1,    -1,    73
+      -1,    -1,    -1,    -1,    -1,    88,    -1,    90,    91,    92,
+      93,    94,    95,    -1,    -1,    -1,    99,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
+     113,   114,    35,    -1,    -1,    -1,    -1,    -1,    -1,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    35,    -1,    -1,
+      -1,    -1,    65,    -1,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    -1,    -1,    -1,    39,    -1,    65,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    -1,    -1,    -1,    -1,
+      -1,    65,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      -1,    -1,    -1,    -1,    -1,    65,    42,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    -1,    -1,    -1,    -1,    -1,    65,
+      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    -1,    -1,
+      -1,    -1,    -1,    65,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    -1,    -1,    -1,    -1,    -1,    65
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1574,165 +1439,159 @@ static const short int yycheck[] =
 static const unsigned short int yystos[] =
 {
        0,     4,     5,     6,     7,     8,     9,    10,    11,    17,
-      19,    20,    21,    22,    23,    24,    25,    26,    30,    37,
-      38,    39,    49,    91,    92,    93,    94,    95,    96,    97,
-      99,   123,   128,   130,   141,   142,   143,   144,   145,   163,
-     168,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     186,   189,   190,   193,   197,   198,   199,   200,   201,   202,
-     205,   207,   208,   214,   222,   233,   234,     9,    11,     3,
-      12,    17,    18,    30,    40,    57,    74,    75,    76,    77,
-      78,    96,    98,    99,   100,   101,   102,   103,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   138,   230,   231,   232,   249,   259,
-      30,    92,    93,    94,    95,   198,   205,   174,    38,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    87,    88,    89,    90,   146,   147,   148,   149,   151,
-     152,   153,    17,    92,    93,   128,   169,   171,   173,   199,
-     200,   205,   214,   223,   224,   138,   138,   138,   225,     3,
-       6,    10,    12,    17,   164,   165,   174,    34,   130,   198,
-     234,    52,   267,   268,    30,    91,   197,   198,     0,   143,
-     138,   206,   229,   230,     4,     5,     6,     9,   182,     6,
-     179,   185,    39,   132,   187,    40,    40,    44,    44,   229,
-     230,    95,    40,   138,   131,   232,   138,   138,   138,    42,
-     191,    27,    28,    29,   128,   130,   131,   138,   154,   155,
-      38,     0,     3,     4,     5,     6,     7,     8,     9,    10,
+      22,    29,    30,    31,    41,    83,    84,    85,    86,    87,
+      88,    89,    91,   115,   120,   122,   133,   134,   135,   136,
+     137,   155,   160,   165,   166,   167,   168,   169,   170,   171,
+     172,   177,   180,   181,   184,   188,   189,   190,   191,   192,
+     193,   196,   198,   199,   205,   213,   224,   225,     9,    11,
+       3,    12,    17,    18,    22,    32,    49,    66,    67,    68,
+      69,    70,    88,    90,    91,    92,    93,    94,    95,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   130,   221,   222,   223,   240,
+     250,    22,    84,    85,    86,    87,   189,   196,   166,    30,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    79,    80,    81,    82,   138,   139,   140,   141,
+     143,   144,   145,    17,    84,    85,   120,   161,   163,   190,
+     191,   196,   205,   214,   215,   130,   130,   130,   216,     3,
+       6,    10,    12,    17,   156,   157,   166,    26,   122,   189,
+     225,    44,   258,   259,    22,    83,   188,   189,     0,   135,
+     130,   197,   220,   221,     4,     5,     6,     9,   173,     6,
+     170,   176,    31,   124,   178,    32,    32,    36,    36,   220,
+     221,    87,    32,   130,   123,   223,   130,   130,   130,    34,
+     182,    19,    20,    21,   120,   122,   123,   130,   146,   147,
+      30,     0,     3,     4,     5,     6,     7,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    39,    40,    41,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    31,
+      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
       42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
       52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
       62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    89,    91,    92,    93,
+      72,    73,    74,    75,    76,    77,    78,    79,    81,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
       94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
      104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-     126,   128,   129,   130,   131,   132,   139,   158,   159,   158,
-      34,   126,   150,   138,   154,    33,    35,    36,    40,    55,
-      56,    68,    69,    86,   137,   138,   160,   219,   138,   138,
-     225,   138,   225,   171,    39,   178,   138,    43,   227,   227,
-     227,   227,   230,    31,    39,   198,    44,   194,    44,    31,
-     169,   187,   194,    46,   228,    40,   138,     6,   183,     6,
-       9,   184,   182,    40,    39,    17,    95,   173,   203,   204,
-     205,   203,   138,   215,   216,   100,   101,   102,   103,   104,
-     105,   106,   240,   241,   242,   255,   256,   262,   263,   264,
-     138,   229,   192,   206,   230,   125,   158,   139,    34,    35,
-      40,    52,   221,   160,    40,   138,   160,    40,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    66,    67,    73,   136,    39,    43,
-      44,   210,   210,    39,   209,   210,   209,    40,   138,    48,
-     194,     0,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    36,    37,    39,    40,    41,
-      42,    43,    46,    47,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    89,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,   123,   126,   128,
-     129,   130,   131,   132,   140,   194,   195,   196,   240,    40,
-      39,    39,    31,    33,    35,    40,    47,   137,   206,   217,
-     218,   219,   229,   228,     6,    34,   188,   230,    17,   229,
-      41,    42,    41,    42,    48,    42,    45,   206,   245,   217,
-     237,   257,   258,   259,   267,   206,   138,   265,   266,    18,
-     258,   259,    45,   241,   217,    41,   138,    42,    40,   174,
-     220,   221,    30,    41,   138,   160,   161,   162,   160,   160,
-      40,   128,   170,   171,   172,   173,   211,   214,   223,   224,
-     206,   206,   229,    27,    28,    29,    34,   166,   167,   217,
-      45,   196,    45,     3,     6,    10,    12,    13,    14,    15,
-      16,    17,    41,   235,   236,   238,   239,    30,    95,   173,
-     217,   217,    47,    73,   136,   138,    34,    41,   230,   228,
-      17,    72,   204,   228,    72,   217,   216,    48,    39,    48,
-      39,    40,    32,    48,    40,    39,    42,    39,    39,    41,
-     206,    72,   138,   156,   157,   229,    41,    41,    41,    42,
-      43,    33,   172,    43,   226,    45,   170,   227,   227,   138,
-      39,    43,    41,    42,   237,    41,    41,   217,   217,    41,
-      41,    41,    27,    97,    98,   116,   217,   244,   246,   247,
-     248,   249,   268,   257,   206,   267,   192,   266,    41,    42,
-     160,   160,    42,    33,    43,    42,   212,   226,   210,   210,
-      41,   238,    43,   236,   238,    48,   217,    43,   228,   228,
-     116,   246,    17,    18,   249,   252,    40,    40,   244,    42,
-     260,   206,    41,   158,    72,   138,    33,    43,    40,   206,
-     213,    39,   212,   238,   267,   166,   217,    40,   217,   237,
-      72,   257,   261,    41,    39,    41,    43,    33,   226,    42,
-      39,    72,   237,    42,    42,   250,    41,    42,    40,    42,
-     206,    32,    40,   217,   206,   243,   244,   245,   251,   268,
-      41,   257,    33,    33,   226,    41,   253,   254,   257,    41,
-      42,   244,    42,    41,    43,    41,    42,   243,    33,   238,
-      41,   257,    41
+     114,   115,   118,   120,   121,   122,   123,   124,   131,   150,
+     151,   150,    26,   118,   142,   130,   146,    25,    27,    28,
+      32,    47,    48,    60,    61,    78,   129,   130,   152,   210,
+     130,   130,   216,   130,   216,   163,    31,   130,    35,   218,
+     218,   218,   218,   221,    23,    31,   189,    36,   185,    36,
+      23,   161,   178,   185,    38,   219,    32,   130,     6,   174,
+       6,     9,   175,   173,    32,    31,    17,    87,   165,   194,
+     195,   196,   194,   130,   206,   207,    92,    93,    94,    95,
+      96,    97,    98,   231,   232,   233,   246,   247,   253,   254,
+     255,   130,   220,   183,   197,   221,   117,   150,   131,    26,
+      27,    32,    44,   212,   152,    32,   130,   152,    32,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    65,   128,    31,
+      35,    36,   201,   201,    31,   200,   201,   200,    32,   130,
+      40,   185,     0,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      31,    32,    33,    34,    35,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    81,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   118,   120,   121,   122,   123,   124,   132,   185,   186,
+     187,   231,    32,    31,    31,    23,    25,    27,    32,    39,
+     129,   197,   208,   209,   210,   220,   219,     6,    26,   179,
+     221,    17,   220,    33,    34,    33,    34,    40,    34,    37,
+     197,   236,   208,   228,   248,   249,   250,   258,   197,   130,
+     256,   257,    18,   249,   250,    37,   232,   208,    33,   130,
+      34,    32,   166,   211,   212,    22,    33,   130,   152,   153,
+     154,   152,   152,    32,   120,   162,   163,   164,   165,   202,
+     205,   214,   215,   197,   197,   220,    19,    20,    21,    26,
+     158,   159,   208,    37,   187,    37,     3,     6,    10,    12,
+      13,    14,    15,    16,    17,    33,   226,   227,   229,   230,
+      22,    87,   165,   208,   208,    39,    65,   128,   130,    26,
+      33,   221,   219,    17,    64,   195,   219,    64,   208,   207,
+      40,    31,    40,    31,    32,    24,    40,    32,    31,    34,
+      31,    31,    33,   197,    64,   130,   148,   149,   220,    33,
+      33,    33,    34,    35,    25,   164,    35,   217,    37,   162,
+     218,   218,   130,    31,    35,    33,    34,   228,    33,    33,
+     208,   208,    33,    33,    33,    19,    89,    90,   108,   208,
+     235,   237,   238,   239,   240,   259,   248,   197,   258,   183,
+     257,    33,    34,   152,   152,    34,    25,    35,    34,   203,
+     217,   201,   201,    33,   229,    35,   227,   229,    40,   208,
+      35,   219,   219,   108,   237,    17,    18,   240,   243,    32,
+      32,   235,    34,   251,   197,    33,   150,    64,   130,    25,
+      35,    32,   197,   204,    31,   203,   229,   258,   158,   208,
+      32,   208,   228,    64,   248,   252,    33,    31,    33,    35,
+      25,   217,    34,    31,    64,   228,    34,    34,   241,    33,
+      34,    32,    34,   197,    24,    32,   208,   197,   234,   235,
+     236,   242,   259,    33,   248,    25,    25,   217,    33,   244,
+     245,   248,    33,    34,   235,    34,    33,    35,    33,    34,
+     234,    25,   229,    33,   248,    33
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned short int yyr1[] =
 {
-       0,   135,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-     137,   137,   137,   137,   138,   138,   138,   138,   138,   138,
-     138,   138,   138,   138,   138,   138,   138,   138,   138,   138,
-     138,   138,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
-     141,   141,   142,   142,   143,   143,   143,   143,   143,   143,
-     143,   143,   143,   143,   143,   143,   143,   143,   144,   145,
-     145,   146,   146,   146,   146,   146,   146,   146,   146,   147,
-     147,   148,   148,   149,   149,   149,   150,   150,   151,   151,
-     152,   152,   152,   153,   153,   154,   154,   154,   154,   154,
-     154,   154,   155,   155,   156,   156,   156,   156,   157,   157,
-     158,   158,   159,   159,   160,   160,   160,   160,   160,   160,
-     160,   160,   160,   160,   160,   161,   161,   162,   162,   163,
-     164,   165,   165,   165,   165,   166,   166,   166,   167,   167,
-     167,   167,   168,   168,   168,   169,   169,   170,   170,   171,
-     171,   171,   171,   171,   171,   172,   172,   172,   172,   172,
-     173,   173,   173,   174,   174,   175,   175,   175,   176,   176,
-     176,   176,   177,   177,   177,   178,   178,   178,   178,   178,
-     178,   178,   178,   179,   179,   180,   180,   180,   181,   181,
-     181,   181,   182,   182,   182,   182,   182,   183,   183,   184,
-     184,   184,   184,   185,   185,   185,   186,   186,   187,   187,
-     188,   188,   189,   190,   191,   191,   192,   192,   193,   193,
-     193,   194,   195,   195,   196,   196,   197,   197,   198,   198,
-     199,   199,   200,   200,   201,   201,   201,   201,   202,   202,
-     203,   203,   203,   203,   204,   204,   204,   204,   205,   205,
-     205,   205,   206,   206,   207,   208,   209,   209,   210,   211,
-     211,   212,   212,   213,   213,   214,   215,   215,   216,   216,
-     217,   217,   217,   217,   217,   217,   218,   218,   218,   218,
-     218,   219,   219,   220,   220,   221,   221,   221,   222,   223,
-     224,   225,   225,   226,   226,   226,   226,   227,   227,   228,
-     228,   228,   229,   229,   230,   230,   231,   231,   232,   232,
-     233,   233,   234,   234,   234,   235,   235,   236,   236,   237,
-     238,   239,   239,   239,   239,   239,   239,   239,   239,   239,
-     240,   240,   241,   241,   241,   241,   241,   242,   242,   243,
-     243,   243,   244,   244,   244,   244,   244,   244,   245,   245,
-     246,   247,   248,   249,   249,   249,   249,   249,   249,   249,
-     249,   249,   249,   250,   250,   251,   251,   252,   252,   253,
-     253,   254,   254,   255,   256,   257,   257,   257,   258,   258,
-     259,   259,   259,   259,   259,   259,   259,   259,   260,   260,
-     261,   261,   262,   263,   263,   264,   265,   265,   266,   267,
-     267,   268
+       0,   127,   128,   128,   128,   128,   128,   128,   128,   128,
+     128,   128,   128,   128,   128,   128,   128,   128,   128,   128,
+     129,   129,   129,   129,   130,   130,   130,   130,   130,   130,
+     130,   130,   130,   130,   130,   130,   130,   130,   130,   130,
+     130,   130,   131,   131,   131,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   131,   131,   131,   131,   131,   131,
+     131,   131,   131,   131,   131,   131,   131,   131,   131,   132,
+     132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
+     132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
+     132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
+     132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
+     132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
+     132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
+     132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
+     132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
+     132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
+     132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
+     132,   132,   132,   132,   132,   132,   132,   132,   132,   132,
+     132,   132,   132,   132,   133,   133,   134,   134,   135,   135,
+     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
+     135,   135,   136,   137,   137,   138,   138,   138,   138,   138,
+     138,   138,   138,   139,   139,   140,   140,   141,   141,   141,
+     142,   142,   143,   143,   144,   144,   144,   145,   145,   146,
+     146,   146,   146,   146,   146,   146,   147,   147,   148,   148,
+     148,   148,   149,   149,   150,   150,   151,   151,   152,   152,
+     152,   152,   152,   152,   152,   152,   152,   152,   152,   153,
+     153,   154,   154,   155,   156,   157,   157,   157,   157,   158,
+     158,   158,   159,   159,   159,   159,   160,   160,   160,   161,
+     161,   162,   162,   163,   163,   163,   163,   163,   164,   164,
+     164,   164,   164,   165,   165,   165,   166,   166,   167,   167,
+     167,   168,   168,   168,   169,   169,   169,   170,   170,   171,
+     171,   171,   172,   172,   172,   172,   173,   173,   173,   173,
+     173,   174,   174,   175,   175,   175,   175,   176,   176,   176,
+     177,   177,   178,   178,   179,   179,   180,   181,   182,   182,
+     183,   183,   184,   184,   184,   185,   186,   186,   187,   187,
+     188,   188,   189,   189,   190,   190,   191,   191,   192,   192,
+     192,   192,   193,   193,   194,   194,   194,   194,   195,   195,
+     195,   195,   196,   196,   196,   196,   197,   197,   198,   199,
+     200,   200,   201,   202,   202,   203,   203,   204,   204,   205,
+     206,   206,   207,   207,   208,   208,   208,   208,   208,   208,
+     209,   209,   209,   209,   209,   210,   210,   211,   211,   212,
+     212,   212,   213,   214,   215,   216,   216,   217,   217,   217,
+     217,   218,   218,   219,   219,   219,   220,   220,   221,   221,
+     222,   222,   223,   223,   224,   224,   225,   225,   225,   226,
+     226,   227,   227,   228,   229,   230,   230,   230,   230,   230,
+     230,   230,   230,   230,   231,   231,   232,   232,   232,   232,
+     232,   233,   233,   234,   234,   234,   235,   235,   235,   235,
+     235,   235,   236,   236,   237,   238,   239,   240,   240,   240,
+     240,   240,   240,   240,   240,   240,   240,   241,   241,   242,
+     242,   243,   243,   244,   244,   245,   245,   246,   247,   248,
+     248,   248,   249,   249,   250,   250,   250,   250,   250,   250,
+     250,   250,   251,   251,   252,   252,   253,   254,   254,   255,
+     256,   256,   257,   258,   258,   259
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1765,44 +1624,41 @@ static const unsigned char yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     1,     1,     2,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     3,     2,     3,     2,     2,     1,     2,     2,
+       2,     1,     2,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       0,     1,     1,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     3,     2,
-       3,     2,     2,     1,     2,     2,     2,     1,     2,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     6,     2,     0,     1,     1,     3,     1,     3,
-       0,     1,     1,     2,     3,     2,     3,     5,     2,     4,
-       1,     1,     1,     1,     4,     0,     1,     1,     3,     6,
-       1,     1,     1,     1,     1,     0,     1,     1,     1,     1,
-       1,     1,     3,     4,     4,     1,     2,     1,     2,     1,
-       1,     2,     4,     4,     2,     1,     1,     1,     3,     3,
-       2,     2,     1,     1,     1,     2,     2,     2,     1,     1,
-       1,     1,     1,     1,     2,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
-       2,     2,     0,     1,     2,     1,     2,     0,     1,     0,
-       1,     1,     2,     0,     1,     2,     3,     4,     0,     4,
-       1,     2,     2,     3,     0,     2,     1,     3,     3,     3,
-       4,     3,     1,     2,     1,     1,     1,     2,     1,     1,
-       5,     7,     5,     7,     6,     7,     6,     5,     1,     2,
-       0,     1,     1,     3,     1,     2,     3,     2,     1,     2,
-       4,     3,     3,     2,     4,     4,     1,     1,     3,     4,
-       5,     0,     2,     2,     4,     4,     1,     3,     1,     3,
-       1,     4,     3,     3,     2,     5,     1,     1,     1,     1,
-       1,     4,     2,     1,     2,     2,     1,     1,     2,     2,
-       2,     0,     1,     0,     2,     7,     9,     0,     7,     0,
-       2,     3,     0,     1,     1,     2,     1,     2,     1,     2,
-       4,     5,     7,     8,    13,     1,     3,     2,     4,     2,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     2,     1,     1,     1,     1,     1,     3,     6,     1,
-       2,     1,     1,     1,     2,     1,     1,     1,     3,     4,
-       6,     8,     5,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     0,     2,     1,     3,     1,     1,     0,
-       1,     1,     3,     3,     3,     1,     1,     3,     5,     6,
-       1,     1,     1,     1,     1,     1,     1,     1,     0,     2,
-       1,     3,     3,     1,     1,     3,     1,     3,     4,     0,
-       1,     1
+       1,     1,     1,     1,     1,     1,     6,     2,     0,     1,
+       1,     3,     1,     3,     0,     1,     1,     2,     3,     2,
+       3,     5,     2,     4,     1,     1,     1,     1,     4,     0,
+       1,     1,     3,     6,     1,     1,     1,     1,     1,     0,
+       1,     1,     1,     1,     1,     1,     3,     4,     4,     1,
+       2,     1,     2,     1,     1,     2,     4,     4,     1,     1,
+       1,     3,     3,     2,     2,     1,     1,     1,     2,     2,
+       2,     1,     1,     1,     1,     1,     2,     1,     1,     1,
+       1,     2,     1,     1,     2,     2,     0,     1,     2,     1,
+       2,     0,     1,     0,     1,     1,     2,     0,     1,     2,
+       3,     4,     0,     4,     1,     2,     2,     3,     0,     2,
+       1,     3,     3,     3,     4,     3,     1,     2,     1,     1,
+       1,     2,     1,     1,     5,     7,     5,     7,     6,     7,
+       6,     5,     1,     2,     0,     1,     1,     3,     1,     2,
+       3,     2,     1,     2,     4,     3,     3,     2,     4,     4,
+       1,     1,     3,     4,     5,     0,     2,     2,     4,     4,
+       1,     3,     1,     3,     1,     4,     3,     3,     2,     5,
+       1,     1,     1,     1,     1,     4,     2,     1,     2,     2,
+       1,     1,     2,     2,     2,     0,     1,     0,     2,     7,
+       9,     0,     7,     0,     2,     3,     0,     1,     1,     2,
+       1,     2,     1,     2,     4,     5,     7,     8,    13,     1,
+       3,     2,     4,     2,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     2,     1,     1,     1,     1,
+       1,     3,     6,     1,     2,     1,     1,     1,     2,     1,
+       1,     1,     3,     4,     6,     8,     5,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     0,     2,     1,
+       3,     1,     1,     0,     1,     1,     3,     3,     3,     1,
+       1,     3,     5,     6,     1,     1,     1,     1,     1,     1,
+       1,     1,     0,     2,     1,     3,     3,     1,     1,     3,
+       1,     3,     4,     0,     1,     1
 };
 
 
@@ -1870,10 +1726,7 @@ static const unsigned char yydprec[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0
+       0,     0,     0,     0,     0,     0
 };
 
 /* YYMERGER[RULE-NUM] -- Index of merging function for rule #RULE-NUM.  */
@@ -1940,10 +1793,7 @@ static const unsigned char yymerger[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0
+       0,     0,     0,     0,     0,     0
 };
 
 /* YYIMMEDIATE[RULE-NUM] -- True iff rule #RULE-NUM is not to be deferred, as
@@ -2011,10 +1861,7 @@ static const yybool yyimmediate[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0
+       0,     0,     0,     0,     0,     0
 };
 
 /* YYCONFLP[YYPACT[STATE-NUM]] -- Pointer into YYCONFL of start of
@@ -2033,34 +1880,14 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     5,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   265,     0,     0,     0,     0,   267,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   269,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     5,     0,     0,     0,     0,     0,
+     249,     0,     0,     0,     0,     0,     0,     0,     0,   251,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2073,6 +1900,7 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   253,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2106,20 +1934,6 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     7,     0,     0,
-       9,    11,    13,    15,    17,    19,    21,    23,    25,    27,
-      29,    31,    33,    35,    37,    39,    41,    43,    45,    47,
-      49,    51,    53,    55,    57,    59,    61,    63,    65,    67,
-      69,    71,    73,    75,    77,    79,    81,    83,    85,    87,
-      89,    91,    93,    95,    97,    99,   101,   103,   105,   107,
-     109,   111,   113,   115,   117,   119,   121,   123,   125,   127,
-     129,   131,   133,   135,   137,   139,   141,   143,   145,   147,
-     149,   151,   153,   155,   157,   159,   161,   163,   165,   167,
-     169,   171,   173,   175,   177,     0,   179,     0,   181,   183,
-     185,   187,   189,   191,   193,   195,   197,   199,   201,   203,
-     205,   207,   209,   211,   213,   215,   217,   219,   221,   223,
-     225,   227,   229,   231,   233,   235,   237,   239,   241,   243,
-     245,     0,   247,   249,     0,   251,   253,   255,   257,   259,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2137,6 +1951,20 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     7,     0,
+       0,     9,    11,    13,    15,    17,    19,    21,    23,    25,
+      27,    29,    31,    33,    35,    37,    39,    41,    43,    45,
+      47,    49,    51,    53,    55,    57,    59,    61,    63,    65,
+      67,    69,    71,    73,    75,    77,    79,    81,    83,    85,
+      87,    89,    91,    93,    95,    97,    99,   101,   103,   105,
+     107,   109,   111,   113,   115,   117,   119,   121,   123,   125,
+     127,   129,   131,   133,   135,   137,   139,   141,   143,   145,
+     147,   149,   151,   153,   155,   157,   159,   161,     0,   163,
+       0,   165,   167,   169,   171,   173,   175,   177,   179,   181,
+     183,   185,   187,   189,   191,   193,   195,   197,   199,   201,
+     203,   205,   207,   209,   211,   213,   215,   217,   219,   221,
+     223,   225,   227,   229,     0,   231,   233,     0,   235,   237,
+     239,   241,   243,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2193,6 +2021,7 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     1,     0,     0,     0,     0,     3,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2262,6 +2091,8 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   245,     0,     0,     0,
+       0,   247,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2389,9 +2220,7 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     1,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     3,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2399,83 +2228,41 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   255,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   261,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   263,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   271,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   273
+       0,     0,     0,     0,     0,     0,     0,   257
 };
 
 /* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by
    0, pointed into by YYCONFLP.  */
 static const short int yyconfl[] =
 {
-       0,   411,     0,   411,     0,   488,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
-       0,   411,     0,   411,     0,   532,     0,   532,     0,   411,
-       0,   357,     0,   515,     0
+       0,   393,     0,   393,     0,   462,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   600,     0,   600,     0,   600,
+       0,   600,     0,   600,     0,   393,     0,   393,     0,   506,
+       0,   506,     0,   393,     0,   341,     0,   489,     0
 };
 
 /* Error token number */
@@ -2904,19 +2691,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     *yyvalp = yyvsp[YYFILL (1-yyrhslen)].yystate.yysemantics.yysval;
   switch (yyn)
     {
-        case 297:
-#line 414 "src/parser_proc_grammar.y" /* glr.c:816  */
+        case 281:
+#line 395 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                psi_cpp_exp_exec((*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), P->preproc, PSI_DATA(P));
                psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        }
 }
-#line 2916 "src/parser_proc.c" /* glr.c:816  */
+#line 2703 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 298:
-#line 420 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 282:
+#line 401 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if (P->file.ln) {
                P->error(PSI_DATA(P), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), PSI_WARNING,
@@ -2925,91 +2712,91 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                P->file.ln = strndup((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->size);
        }
 }
-#line 2929 "src/parser_proc.c" /* glr.c:816  */
+#line 2716 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 299:
-#line 428 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 283:
+#line 409 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_const(P, (*(struct psi_const **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2937 "src/parser_proc.c" /* glr.c:816  */
+#line 2724 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 300:
-#line 431 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 284:
+#line 412 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_decl(P, (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2945 "src/parser_proc.c" /* glr.c:816  */
+#line 2732 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 303:
-#line 436 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 287:
+#line 417 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_typedef(P, (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2953 "src/parser_proc.c" /* glr.c:816  */
+#line 2740 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 304:
-#line 439 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 288:
+#line 420 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_struct(P, (*(struct psi_decl_struct **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2961 "src/parser_proc.c" /* glr.c:816  */
+#line 2748 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 305:
-#line 442 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 289:
+#line 423 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_union(P, (*(struct psi_decl_union **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2969 "src/parser_proc.c" /* glr.c:816  */
+#line 2756 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 306:
-#line 445 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 290:
+#line 426 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_enum(P, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2977 "src/parser_proc.c" /* glr.c:816  */
+#line 2764 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 307:
-#line 448 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 291:
+#line 429 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_impl(P, (*(struct psi_impl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2985 "src/parser_proc.c" /* glr.c:816  */
+#line 2772 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 308:
-#line 454 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 292:
+#line 435 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 2993 "src/parser_proc.c" /* glr.c:816  */
+#line 2780 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 309:
-#line 460 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 293:
+#line 441 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = NULL;
 }
-#line 3001 "src/parser_proc.c" /* glr.c:816  */
+#line 2788 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 310:
-#line 463 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 294:
+#line 444 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = (*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3009 "src/parser_proc.c" /* glr.c:816  */
+#line 2796 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 311:
-#line 469 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 295:
+#line 450 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                struct psi_token *msg = NULL;
@@ -3033,201 +2820,201 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        }
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3037 "src/parser_proc.c" /* glr.c:816  */
+#line 2824 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 312:
-#line 492 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 296:
+#line 473 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))));
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3046 "src/parser_proc.c" /* glr.c:816  */
+#line 2833 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 313:
-#line 496 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 297:
+#line 477 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, NULL);
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3055 "src/parser_proc.c" /* glr.c:816  */
+#line 2842 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 314:
-#line 500 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 298:
+#line 481 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))));
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3065 "src/parser_proc.c" /* glr.c:816  */
+#line 2852 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 315:
-#line 505 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 299:
+#line 486 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_cpp_macro_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3074 "src/parser_proc.c" /* glr.c:816  */
+#line 2861 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 316:
-#line 509 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 300:
+#line 490 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3083 "src/parser_proc.c" /* glr.c:816  */
+#line 2870 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 317:
-#line 513 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 301:
+#line 494 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, NULL);
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3092 "src/parser_proc.c" /* glr.c:816  */
+#line 2879 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 318:
-#line 517 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 302:
+#line 498 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = NULL;
 }
-#line 3101 "src/parser_proc.c" /* glr.c:816  */
+#line 2888 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 342:
-#line 571 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 326:
+#line 552 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_cpp_macro_decl **)(&(*yyvalp))) = psi_cpp_macro_decl_init((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), NULL);
        (*(struct psi_cpp_macro_decl **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)));
 }
-#line 3111 "src/parser_proc.c" /* glr.c:816  */
+#line 2898 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 343:
-#line 576 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 327:
+#line 557 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_cpp_macro_decl **)(&(*yyvalp))) = psi_cpp_macro_decl_init(NULL, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), NULL);
        (*(struct psi_cpp_macro_decl **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3121 "src/parser_proc.c" /* glr.c:816  */
+#line 2908 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 344:
-#line 584 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 328:
+#line 565 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL);
 }
-#line 3129 "src/parser_proc.c" /* glr.c:816  */
+#line 2916 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 345:
-#line 587 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 329:
+#line 568 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL); /* FIXME */
 }
-#line 3137 "src/parser_proc.c" /* glr.c:816  */
+#line 2924 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 347:
-#line 591 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 331:
+#line 572 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3145 "src/parser_proc.c" /* glr.c:816  */
+#line 2932 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 348:
-#line 597 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 332:
+#line 578 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_token_free), &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3155 "src/parser_proc.c" /* glr.c:816  */
+#line 2942 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 349:
-#line 602 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 333:
+#line 583 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3165 "src/parser_proc.c" /* glr.c:816  */
+#line 2952 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 350:
-#line 610 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 334:
+#line 591 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3173 "src/parser_proc.c" /* glr.c:816  */
+#line 2960 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 352:
-#line 617 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 336:
+#line 598 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_token_free), &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3182 "src/parser_proc.c" /* glr.c:816  */
+#line 2969 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 353:
-#line 621 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 337:
+#line 602 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3191 "src/parser_proc.c" /* glr.c:816  */
+#line 2978 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 354:
-#line 628 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 338:
+#line 609 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_unary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 3200 "src/parser_proc.c" /* glr.c:816  */
+#line 2987 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 355:
-#line 632 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 339:
+#line 613 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_unary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3209 "src/parser_proc.c" /* glr.c:816  */
+#line 2996 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 356:
-#line 636 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 340:
+#line 617 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_binary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3218 "src/parser_proc.c" /* glr.c:816  */
+#line 3005 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 357:
-#line 640 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 341:
+#line 621 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_ternary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 3227 "src/parser_proc.c" /* glr.c:816  */
+#line 3014 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 358:
-#line 645 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 342:
+#line 626 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                uint8_t exists;
@@ -3238,11 +3025,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        }
 }
-#line 3242 "src/parser_proc.c" /* glr.c:816  */
+#line 3029 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 359:
-#line 655 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 343:
+#line 636 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                uint8_t exists;
@@ -3253,112 +3040,112 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3257 "src/parser_proc.c" /* glr.c:816  */
+#line 3044 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 360:
-#line 665 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 344:
+#line 646 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->flags));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3267 "src/parser_proc.c" /* glr.c:816  */
+#line 3054 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 361:
-#line 670 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 345:
+#line 651 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3277 "src/parser_proc.c" /* glr.c:816  */
+#line 3064 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 362:
-#line 675 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 346:
+#line 656 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num((*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
 }
-#line 3286 "src/parser_proc.c" /* glr.c:816  */
+#line 3073 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 363:
-#line 679 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 347:
+#line 660 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init(PSI_T_DEFINE, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3297 "src/parser_proc.c" /* glr.c:816  */
+#line 3084 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 364:
-#line 685 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 348:
+#line 666 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init(PSI_T_FUNCTION,
                psi_cpp_macro_call_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 0));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 3308 "src/parser_proc.c" /* glr.c:816  */
+#line 3095 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 365:
-#line 694 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 349:
+#line 675 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3316 "src/parser_proc.c" /* glr.c:816  */
+#line 3103 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 367:
-#line 701 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 351:
+#line 682 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_num_exp_free), 
                &(*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3325 "src/parser_proc.c" /* glr.c:816  */
+#line 3112 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 368:
-#line 705 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 352:
+#line 686 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3333 "src/parser_proc.c" /* glr.c:816  */
+#line 3120 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 369:
-#line 711 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 353:
+#line 692 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_const **)(&(*yyvalp))) = psi_const_init((*(struct psi_const_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_impl_def_val **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_const **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 3342 "src/parser_proc.c" /* glr.c:816  */
+#line 3129 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 370:
-#line 718 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 354:
+#line 699 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_const_type **)(&(*yyvalp))) = psi_const_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
 }
-#line 3350 "src/parser_proc.c" /* glr.c:816  */
+#line 3137 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 375:
-#line 731 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 359:
+#line 712 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_def_val **)(&(*yyvalp))) = NULL;
 }
-#line 3358 "src/parser_proc.c" /* glr.c:816  */
+#line 3145 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 376:
-#line 734 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 360:
+#line 715 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if (psi_num_exp_validate(PSI_DATA(P), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), NULL, NULL, NULL, NULL, NULL)) {
                impl_val res = {0};
@@ -3390,28 +3177,28 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        }
        psi_num_exp_free(&(*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3394 "src/parser_proc.c" /* glr.c:816  */
+#line 3181 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 377:
-#line 765 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 361:
+#line 746 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_def_val **)(&(*yyvalp))) = psi_impl_def_val_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_impl_def_val **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3403 "src/parser_proc.c" /* glr.c:816  */
+#line 3190 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 382:
-#line 779 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 366:
+#line 760 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3411 "src/parser_proc.c" /* glr.c:816  */
+#line 3198 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 383:
-#line 782 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 367:
+#line 763 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_VOID, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text),
@@ -3421,51 +3208,51 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3425 "src/parser_proc.c" /* glr.c:816  */
+#line 3212 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 384:
-#line 791 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 368:
+#line 772 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3433 "src/parser_proc.c" /* glr.c:816  */
+#line 3220 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 385:
-#line 797 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 369:
+#line 778 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3441 "src/parser_proc.c" /* glr.c:816  */
+#line 3228 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 386:
-#line 800 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 370:
+#line 781 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3449 "src/parser_proc.c" /* glr.c:816  */
+#line 3236 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 387:
-#line 806 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 371:
+#line 787 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3457 "src/parser_proc.c" /* glr.c:816  */
+#line 3244 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 388:
-#line 809 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 372:
+#line 790 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3465 "src/parser_proc.c" /* glr.c:816  */
+#line 3252 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 390:
-#line 816 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 374:
+#line 797 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_FUNCTION, (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->var->name),
@@ -3474,11 +3261,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->token);
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.func = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3478 "src/parser_proc.c" /* glr.c:816  */
+#line 3265 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 391:
-#line 824 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 375:
+#line 805 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
@@ -3490,11 +3277,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.enm = (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
        psi_parser_proc_add_enum(P, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3494 "src/parser_proc.c" /* glr.c:816  */
+#line 3281 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 392:
-#line 835 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 376:
+#line 816 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_STRUCT, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval));
@@ -3504,11 +3291,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).len;
        psi_parser_proc_add_struct(P, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct);
 }
-#line 3508 "src/parser_proc.c" /* glr.c:816  */
+#line 3295 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 393:
-#line 844 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 377:
+#line 825 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_UNION, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval));
@@ -3518,30 +3305,20 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).len;
        psi_parser_proc_add_union(P, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn);
 }
-#line 3522 "src/parser_proc.c" /* glr.c:816  */
+#line 3309 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 394:
-#line 853 "src/parser_proc_grammar.y" /* glr.c:816  */
-    {
-       (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
-       (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0, 0));
-       (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
-}
-#line 3532 "src/parser_proc.c" /* glr.c:816  */
-    break;
-
-  case 396:
-#line 862 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 379:
+#line 838 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), psi_decl_var_init(NULL, 0, 0));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
 }
-#line 3541 "src/parser_proc.c" /* glr.c:816  */
+#line 3318 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 397:
-#line 866 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 380:
+#line 842 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_ENUM, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->name),
@@ -3552,11 +3329,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.enm = (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        psi_parser_proc_add_enum(P, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3556 "src/parser_proc.c" /* glr.c:816  */
+#line 3333 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 398:
-#line 876 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 381:
+#line 852 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_STRUCT, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text), psi_decl_var_init(NULL, 0, 0));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
@@ -3566,11 +3343,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len;
        psi_parser_proc_add_struct(P, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct);
 }
-#line 3570 "src/parser_proc.c" /* glr.c:816  */
+#line 3347 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 399:
-#line 885 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 382:
+#line 861 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_UNION, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text), psi_decl_var_init(NULL, 0, 0));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
@@ -3580,146 +3357,138 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len;
        psi_parser_proc_add_union(P, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn);
 }
-#line 3584 "src/parser_proc.c" /* glr.c:816  */
+#line 3361 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 400:
-#line 897 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 383:
+#line 873 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_type **)(&(*yyvalp))) = (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3592 "src/parser_proc.c" /* glr.c:816  */
+#line 3369 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 401:
-#line 900 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 384:
+#line 876 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_type **)(&(*yyvalp))) = (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3600 "src/parser_proc.c" /* glr.c:816  */
+#line 3377 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 403:
-#line 907 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 386:
+#line 883 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_type **)(&(*yyvalp))) = psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_decl_type **)(&(*yyvalp)))->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3609 "src/parser_proc.c" /* glr.c:816  */
+#line 3386 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 405:
-#line 915 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 388:
+#line 891 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_type **)(&(*yyvalp))) = psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_decl_type **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3619 "src/parser_proc.c" /* glr.c:816  */
+#line 3396 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 406:
-#line 920 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 389:
+#line 896 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_type **)(&(*yyvalp))) = psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_decl_type **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3629 "src/parser_proc.c" /* glr.c:816  */
+#line 3406 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 407:
-#line 925 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 390:
+#line 901 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_type **)(&(*yyvalp))) = psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_decl_type **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3639 "src/parser_proc.c" /* glr.c:816  */
-    break;
-
-  case 410:
-#line 935 "src/parser_proc_grammar.y" /* glr.c:816  */
-    {
-       (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
-}
-#line 3647 "src/parser_proc.c" /* glr.c:816  */
+#line 3416 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 411:
-#line 938 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 393:
+#line 911 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3655 "src/parser_proc.c" /* glr.c:816  */
+#line 3424 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 412:
-#line 944 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 394:
+#line 917 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3663 "src/parser_proc.c" /* glr.c:816  */
+#line 3432 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 413:
-#line 947 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 395:
+#line 920 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3671 "src/parser_proc.c" /* glr.c:816  */
+#line 3440 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 414:
-#line 950 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 396:
+#line 923 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3679 "src/parser_proc.c" /* glr.c:816  */
+#line 3448 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 425:
-#line 972 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 399:
+#line 934 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3687 "src/parser_proc.c" /* glr.c:816  */
+#line 3456 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 426:
-#line 975 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 400:
+#line 937 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3695 "src/parser_proc.c" /* glr.c:816  */
+#line 3464 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 427:
-#line 978 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 401:
+#line 940 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3703 "src/parser_proc.c" /* glr.c:816  */
+#line 3472 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 428:
-#line 984 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 402:
+#line 946 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3711 "src/parser_proc.c" /* glr.c:816  */
+#line 3480 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 429:
-#line 987 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 403:
+#line 949 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3719 "src/parser_proc.c" /* glr.c:816  */
+#line 3488 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 430:
-#line 990 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 404:
+#line 952 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3728,11 +3497,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3732 "src/parser_proc.c" /* glr.c:816  */
+#line 3501 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 431:
-#line 998 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 405:
+#line 960 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3742,27 +3511,27 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
        }
 }
-#line 3746 "src/parser_proc.c" /* glr.c:816  */
+#line 3515 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 432:
-#line 1010 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 406:
+#line 972 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3754 "src/parser_proc.c" /* glr.c:816  */
+#line 3523 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 433:
-#line 1013 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 407:
+#line 975 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3762 "src/parser_proc.c" /* glr.c:816  */
+#line 3531 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 434:
-#line 1016 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 408:
+#line 978 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3770,19 +3539,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3774 "src/parser_proc.c" /* glr.c:816  */
+#line 3543 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 435:
-#line 1023 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 409:
+#line 985 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3782 "src/parser_proc.c" /* glr.c:816  */
+#line 3551 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 436:
-#line 1026 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 410:
+#line 988 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3790,43 +3559,43 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3794 "src/parser_proc.c" /* glr.c:816  */
+#line 3563 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 437:
-#line 1036 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 411:
+#line 998 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3802 "src/parser_proc.c" /* glr.c:816  */
+#line 3571 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 439:
-#line 1042 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 413:
+#line 1004 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3810 "src/parser_proc.c" /* glr.c:816  */
+#line 3579 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 443:
-#line 1051 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 417:
+#line 1013 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3818 "src/parser_proc.c" /* glr.c:816  */
+#line 3587 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 444:
-#line 1054 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 418:
+#line 1016 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3826 "src/parser_proc.c" /* glr.c:816  */
+#line 3595 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 445:
-#line 1057 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 419:
+#line 1019 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3835,92 +3604,92 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3839 "src/parser_proc.c" /* glr.c:816  */
+#line 3608 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 446:
-#line 1068 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 420:
+#line 1030 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3847 "src/parser_proc.c" /* glr.c:816  */
+#line 3616 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 447:
-#line 1071 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 421:
+#line 1033 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3855 "src/parser_proc.c" /* glr.c:816  */
+#line 3624 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 453:
-#line 1091 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 427:
+#line 1053 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_decl_arg_free(&(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3863 "src/parser_proc.c" /* glr.c:816  */
+#line 3632 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 455:
-#line 1098 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 429:
+#line 1060 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3871 "src/parser_proc.c" /* glr.c:816  */
+#line 3640 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 456:
-#line 1104 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 430:
+#line 1066 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_var_free), &(*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3879 "src/parser_proc.c" /* glr.c:816  */
+#line 3648 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 457:
-#line 1107 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 431:
+#line 1069 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3887 "src/parser_proc.c" /* glr.c:816  */
+#line 3656 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 458:
-#line 1113 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 432:
+#line 1075 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3895 "src/parser_proc.c" /* glr.c:816  */
+#line 3664 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 459:
-#line 1116 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 433:
+#line 1078 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3903 "src/parser_proc.c" /* glr.c:816  */
+#line 3672 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 460:
-#line 1119 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 434:
+#line 1081 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3911 "src/parser_proc.c" /* glr.c:816  */
+#line 3680 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 467:
-#line 1140 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 441:
+#line 1102 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_decl **)(&(*yyvalp)))->abi = psi_decl_abi_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text);
 }
-#line 3920 "src/parser_proc.c" /* glr.c:816  */
+#line 3689 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 470:
-#line 1152 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 444:
+#line 1114 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        if ((*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
@@ -3928,11 +3697,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        }
 }
-#line 3932 "src/parser_proc.c" /* glr.c:816  */
+#line 3701 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 471:
-#line 1159 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 445:
+#line 1121 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)));
        (*(struct psi_decl **)(&(*yyvalp)))->varargs = 1;
@@ -3941,11 +3710,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        }
 }
-#line 3945 "src/parser_proc.c" /* glr.c:816  */
+#line 3714 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 472:
-#line 1170 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 446:
+#line 1132 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        if ((*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
@@ -3953,11 +3722,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        }
 }
-#line 3957 "src/parser_proc.c" /* glr.c:816  */
+#line 3726 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 473:
-#line 1177 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 447:
+#line 1139 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)));
        (*(struct psi_decl **)(&(*yyvalp)))->varargs = 1;
@@ -3966,11 +3735,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        }
 }
-#line 3970 "src/parser_proc.c" /* glr.c:816  */
+#line 3739 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 474:
-#line 1188 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 448:
+#line 1150 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
@@ -3978,11 +3747,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3982 "src/parser_proc.c" /* glr.c:816  */
+#line 3751 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 475:
-#line 1195 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 449:
+#line 1157 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
@@ -3994,11 +3763,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3998 "src/parser_proc.c" /* glr.c:816  */
+#line 3767 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 476:
-#line 1206 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 450:
+#line 1168 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
@@ -4010,11 +3779,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4014 "src/parser_proc.c" /* glr.c:816  */
+#line 3783 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 477:
-#line 1217 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 451:
+#line 1179 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
@@ -4026,11 +3795,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4030 "src/parser_proc.c" /* glr.c:816  */
+#line 3799 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 479:
-#line 1232 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 453:
+#line 1194 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text),
@@ -4040,62 +3809,62 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4044 "src/parser_proc.c" /* glr.c:816  */
+#line 3813 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 480:
-#line 1244 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 454:
+#line 1206 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4052 "src/parser_proc.c" /* glr.c:816  */
+#line 3821 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 481:
-#line 1247 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 455:
+#line 1209 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4060 "src/parser_proc.c" /* glr.c:816  */
+#line 3829 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 482:
-#line 1250 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 456:
+#line 1212 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4068 "src/parser_proc.c" /* glr.c:816  */
+#line 3837 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 483:
-#line 1253 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 457:
+#line 1215 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4076 "src/parser_proc.c" /* glr.c:816  */
+#line 3845 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 484:
-#line 1260 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 458:
+#line 1222 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4084 "src/parser_proc.c" /* glr.c:816  */
+#line 3853 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 485:
-#line 1263 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 459:
+#line 1225 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), 
                psi_decl_var_init(NULL, (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), 0)
        );
 }
-#line 4095 "src/parser_proc.c" /* glr.c:816  */
+#line 3864 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 486:
-#line 1269 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 460:
+#line 1231 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text),
@@ -4105,11 +3874,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4109 "src/parser_proc.c" /* glr.c:816  */
+#line 3878 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 487:
-#line 1278 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 461:
+#line 1240 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text),
@@ -4119,11 +3888,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4123 "src/parser_proc.c" /* glr.c:816  */
+#line 3892 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 488:
-#line 1290 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 462:
+#line 1252 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_FUNCTION, (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->var->name),
@@ -4132,19 +3901,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->token);
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.func = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4136 "src/parser_proc.c" /* glr.c:816  */
+#line 3905 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 489:
-#line 1298 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 463:
+#line 1260 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4144 "src/parser_proc.c" /* glr.c:816  */
+#line 3913 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 490:
-#line 1301 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 464:
+#line 1263 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
@@ -4155,11 +3924,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4159 "src/parser_proc.c" /* glr.c:816  */
+#line 3928 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 491:
-#line 1311 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 465:
+#line 1273 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
@@ -4170,31 +3939,31 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4174 "src/parser_proc.c" /* glr.c:816  */
+#line 3943 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 492:
-#line 1324 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 466:
+#line 1286 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_var **)(&(*yyvalp))) = psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text, (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)) + !! (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_var **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4184 "src/parser_proc.c" /* glr.c:816  */
+#line 3953 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 493:
-#line 1329 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 467:
+#line 1291 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_var **)(&(*yyvalp))) = psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text, !! (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_var **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4194 "src/parser_proc.c" /* glr.c:816  */
+#line 3963 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 494:
-#line 1337 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 468:
+#line 1299 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_union **)(&(*yyvalp))) = psi_decl_union_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -4202,11 +3971,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_union **)(&(*yyvalp)))->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len;
        (*(struct psi_decl_union **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4206 "src/parser_proc.c" /* glr.c:816  */
+#line 3975 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 495:
-#line 1347 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 469:
+#line 1309 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_struct **)(&(*yyvalp))) = psi_decl_struct_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -4214,27 +3983,27 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_struct **)(&(*yyvalp)))->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len;
        (*(struct psi_decl_struct **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4218 "src/parser_proc.c" /* glr.c:816  */
+#line 3987 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 496:
-#line 1357 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 470:
+#line 1319 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4226 "src/parser_proc.c" /* glr.c:816  */
+#line 3995 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 498:
-#line 1364 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 472:
+#line 1326 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 4234 "src/parser_proc.c" /* glr.c:816  */
+#line 4003 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 499:
-#line 1370 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 473:
+#line 1332 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
@@ -4249,11 +4018,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 4253 "src/parser_proc.c" /* glr.c:816  */
+#line 4022 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 500:
-#line 1384 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 474:
+#line 1346 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
@@ -4268,27 +4037,27 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 4272 "src/parser_proc.c" /* glr.c:816  */
+#line 4041 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 501:
-#line 1401 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 475:
+#line 1363 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4280 "src/parser_proc.c" /* glr.c:816  */
+#line 4049 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 502:
-#line 1404 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 476:
+#line 1366 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4288 "src/parser_proc.c" /* glr.c:816  */
+#line 4057 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 503:
-#line 1410 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 477:
+#line 1372 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                struct psi_decl_arg *arg = psi_decl_arg_init(NULL, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
@@ -4296,11 +4065,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &arg);
        }
 }
-#line 4300 "src/parser_proc.c" /* glr.c:816  */
+#line 4069 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 504:
-#line 1417 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 478:
+#line 1379 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                struct psi_decl_arg *arg = psi_decl_arg_init(NULL, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
@@ -4308,180 +4077,180 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), &arg);
        }
 }
-#line 4312 "src/parser_proc.c" /* glr.c:816  */
+#line 4081 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 505:
-#line 1427 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 479:
+#line 1389 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_enum **)(&(*yyvalp))) = psi_decl_enum_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_enum **)(&(*yyvalp)))->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval));
 }
-#line 4321 "src/parser_proc.c" /* glr.c:816  */
+#line 4090 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 506:
-#line 1434 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 480:
+#line 1396 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_enum_item_free), &(*(struct psi_decl_enum_item **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4329 "src/parser_proc.c" /* glr.c:816  */
+#line 4098 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 507:
-#line 1437 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 481:
+#line 1399 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_decl_enum_item **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4337 "src/parser_proc.c" /* glr.c:816  */
+#line 4106 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 508:
-#line 1443 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 482:
+#line 1405 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_enum_item **)(&(*yyvalp))) = psi_decl_enum_item_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, NULL);
        (*(struct psi_decl_enum_item **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4347 "src/parser_proc.c" /* glr.c:816  */
+#line 4116 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 509:
-#line 1448 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 483:
+#line 1410 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_enum_item **)(&(*yyvalp))) = psi_decl_enum_item_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_enum_item **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4357 "src/parser_proc.c" /* glr.c:816  */
+#line 4126 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 510:
-#line 1456 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 484:
+#line 1418 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num((*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
 }
-#line 4366 "src/parser_proc.c" /* glr.c:816  */
+#line 4135 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 511:
-#line 1460 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 485:
+#line 1422 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_cast((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->token);
 }
-#line 4375 "src/parser_proc.c" /* glr.c:816  */
+#line 4144 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 512:
-#line 1464 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 486:
+#line 1426 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_unary(PSI_T_LPAREN, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4384 "src/parser_proc.c" /* glr.c:816  */
+#line 4153 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 513:
-#line 1468 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 487:
+#line 1430 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_binary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4393 "src/parser_proc.c" /* glr.c:816  */
+#line 4162 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 514:
-#line 1472 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 488:
+#line 1434 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_unary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4402 "src/parser_proc.c" /* glr.c:816  */
+#line 4171 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 515:
-#line 1476 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 489:
+#line 1438 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_ternary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 4411 "src/parser_proc.c" /* glr.c:816  */
+#line 4180 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 516:
-#line 1483 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 490:
+#line 1445 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->flags);
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4420 "src/parser_proc.c" /* glr.c:816  */
+#line 4189 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 517:
-#line 1487 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 491:
+#line 1449 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0);
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4429 "src/parser_proc.c" /* glr.c:816  */
+#line 4198 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 518:
-#line 1491 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 492:
+#line 1453 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0);
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4438 "src/parser_proc.c" /* glr.c:816  */
+#line 4207 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 519:
-#line 1495 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 493:
+#line 1457 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_NAME, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), 0);
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
 }
-#line 4447 "src/parser_proc.c" /* glr.c:816  */
+#line 4216 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 520:
-#line 1499 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 494:
+#line 1461 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4455 "src/parser_proc.c" /* glr.c:816  */
+#line 4224 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 521:
-#line 1505 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 495:
+#line 1467 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 4464 "src/parser_proc.c" /* glr.c:816  */
+#line 4233 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 522:
-#line 1509 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 496:
+#line 1471 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4473 "src/parser_proc.c" /* glr.c:816  */
+#line 4242 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 523:
-#line 1516 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 497:
+#line 1478 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4481 "src/parser_proc.c" /* glr.c:816  */
+#line 4250 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 524:
-#line 1519 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 498:
+#line 1481 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                int8_t sizeof_void_p = sizeof(void *);
@@ -4490,37 +4259,37 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_SIZEOF, (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), 0);
        }
 }
-#line 4494 "src/parser_proc.c" /* glr.c:816  */
+#line 4263 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 525:
-#line 1530 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 499:
+#line 1492 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        int8_t sizeof_void_p = sizeof(void *);
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT8, &sizeof_void_p, 0);
 }
-#line 4503 "src/parser_proc.c" /* glr.c:816  */
+#line 4272 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 526:
-#line 1534 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 500:
+#line 1496 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        int8_t sizeof_a = sizeof('a');
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT8, &sizeof_a, 0);
 }
-#line 4512 "src/parser_proc.c" /* glr.c:816  */
+#line 4281 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 527:
-#line 1538 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 501:
+#line 1500 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT64, &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->size, 0);
 }
-#line 4520 "src/parser_proc.c" /* glr.c:816  */
+#line 4289 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 528:
-#line 1544 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 502:
+#line 1506 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -4531,11 +4300,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_append("@", psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 1, digest);
        }
 }
-#line 4535 "src/parser_proc.c" /* glr.c:816  */
+#line 4304 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 529:
-#line 1557 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 503:
+#line 1519 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -4546,11 +4315,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_append("@", psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 1, digest);
        }
 }
-#line 4550 "src/parser_proc.c" /* glr.c:816  */
+#line 4319 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 530:
-#line 1570 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 504:
+#line 1532 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -4561,94 +4330,94 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_append("@", psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 1, digest);
        }
 }
-#line 4565 "src/parser_proc.c" /* glr.c:816  */
+#line 4334 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 531:
-#line 1583 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 505:
+#line 1545 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 4573 "src/parser_proc.c" /* glr.c:816  */
+#line 4342 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 532:
-#line 1586 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 506:
+#line 1548 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&(*yyvalp)))->type = PSI_T_NAME;
 }
-#line 4582 "src/parser_proc.c" /* glr.c:816  */
+#line 4351 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 533:
-#line 1593 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 507:
+#line 1555 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = NULL;
 }
-#line 4590 "src/parser_proc.c" /* glr.c:816  */
+#line 4359 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 534:
-#line 1596 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 508:
+#line 1558 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = psi_layout_init(0, 0, psi_layout_init(0, atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text), NULL));
 }
-#line 4598 "src/parser_proc.c" /* glr.c:816  */
+#line 4367 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 535:
-#line 1599 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 509:
+#line 1561 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = psi_layout_init(atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text), NULL);
 }
-#line 4606 "src/parser_proc.c" /* glr.c:816  */
+#line 4375 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 536:
-#line 1602 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 510:
+#line 1564 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = psi_layout_init(atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text), psi_layout_init(0, atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-7)].yystate.yysemantics.yysval))->text), NULL));
 }
-#line 4614 "src/parser_proc.c" /* glr.c:816  */
+#line 4383 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 537:
-#line 1608 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 511:
+#line 1570 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout*)(&(*yyvalp))).pos = 0;
        (*(struct psi_layout*)(&(*yyvalp))).len = 0;
 }
-#line 4623 "src/parser_proc.c" /* glr.c:816  */
+#line 4392 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 538:
-#line 1612 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 512:
+#line 1574 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout*)(&(*yyvalp))).pos = atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text);
        (*(struct psi_layout*)(&(*yyvalp))).len = atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text);
 }
-#line 4632 "src/parser_proc.c" /* glr.c:816  */
+#line 4401 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 539:
-#line 1619 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 513:
+#line 1581 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4640 "src/parser_proc.c" /* glr.c:816  */
+#line 4409 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 540:
-#line 1622 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 514:
+#line 1584 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4648 "src/parser_proc.c" /* glr.c:816  */
+#line 4417 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 541:
-#line 1625 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 515:
+#line 1587 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if (psi_num_exp_validate(PSI_DATA(P), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), NULL, NULL, NULL, NULL, NULL)) {
                (*(size_t*)(&(*yyvalp))) = psi_long_num_exp((*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), NULL, &P->preproc->defs);
@@ -4656,88 +4425,88 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(size_t*)(&(*yyvalp))) = 0;
        }
 }
-#line 4660 "src/parser_proc.c" /* glr.c:816  */
+#line 4429 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 542:
-#line 1635 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 516:
+#line 1597 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4668 "src/parser_proc.c" /* glr.c:816  */
+#line 4437 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 543:
-#line 1638 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 517:
+#line 1600 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4676 "src/parser_proc.c" /* glr.c:816  */
+#line 4445 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 545:
-#line 1645 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 519:
+#line 1607 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 4684 "src/parser_proc.c" /* glr.c:816  */
+#line 4453 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 546:
-#line 1651 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 520:
+#line 1613 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 1;
 }
-#line 4692 "src/parser_proc.c" /* glr.c:816  */
+#line 4461 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 547:
-#line 1654 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 521:
+#line 1616 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)) + 1;
 }
-#line 4700 "src/parser_proc.c" /* glr.c:816  */
+#line 4469 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 550:
-#line 1671 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 524:
+#line 1633 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl **)(&(*yyvalp))) = psi_impl_init((*(struct psi_impl_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4708 "src/parser_proc.c" /* glr.c:816  */
+#line 4477 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 551:
-#line 1674 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 525:
+#line 1636 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl **)(&(*yyvalp))) = psi_impl_init((*(struct psi_impl_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->static_memory = 1;
 }
-#line 4717 "src/parser_proc.c" /* glr.c:816  */
+#line 4486 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 552:
-#line 1681 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 526:
+#line 1643 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_func **)(&(*yyvalp))) = psi_impl_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->text, NULL, (*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_func **)(&(*yyvalp)))->return_reference = (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval));
 }
-#line 4727 "src/parser_proc.c" /* glr.c:816  */
+#line 4496 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 553:
-#line 1686 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 527:
+#line 1648 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_func **)(&(*yyvalp))) = psi_impl_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_func **)(&(*yyvalp)))->return_reference = (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval));
 }
-#line 4737 "src/parser_proc.c" /* glr.c:816  */
+#line 4506 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 554:
-#line 1691 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 528:
+#line 1653 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_func **)(&(*yyvalp))) = psi_impl_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-10)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-8)].yystate.yysemantics.yysval)), (*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-10)].yystate.yysemantics.yysval)));
@@ -4745,470 +4514,470 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_impl_func **)(&(*yyvalp)))->vararg = psi_impl_arg_init((*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)), psi_impl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))), NULL);
        (*(struct psi_impl_func **)(&(*yyvalp)))->vararg->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 4749 "src/parser_proc.c" /* glr.c:816  */
+#line 4518 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 555:
-#line 1701 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 529:
+#line 1663 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_impl_arg_free), &(*(struct psi_impl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4757 "src/parser_proc.c" /* glr.c:816  */
+#line 4526 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 556:
-#line 1704 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 530:
+#line 1666 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_impl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4765 "src/parser_proc.c" /* glr.c:816  */
+#line 4534 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 557:
-#line 1710 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 531:
+#line 1672 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_arg **)(&(*yyvalp))) = psi_impl_arg_init((*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), NULL);
 }
-#line 4773 "src/parser_proc.c" /* glr.c:816  */
+#line 4542 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 558:
-#line 1713 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 532:
+#line 1675 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_arg **)(&(*yyvalp))) = psi_impl_arg_init((*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_impl_def_val **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4781 "src/parser_proc.c" /* glr.c:816  */
+#line 4550 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 559:
-#line 1719 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 533:
+#line 1681 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_var **)(&(*yyvalp))) = psi_impl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_impl_var **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4790 "src/parser_proc.c" /* glr.c:816  */
+#line 4559 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 560:
-#line 1726 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 534:
+#line 1688 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_type **)(&(*yyvalp))) = psi_impl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_impl_type **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4799 "src/parser_proc.c" /* glr.c:816  */
+#line 4568 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 570:
-#line 1745 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 544:
+#line 1707 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_impl_stmt_free), &(*(struct psi_token ***)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4807 "src/parser_proc.c" /* glr.c:816  */
+#line 4576 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 571:
-#line 1748 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 545:
+#line 1710 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), &(*(struct psi_token ***)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4815 "src/parser_proc.c" /* glr.c:816  */
+#line 4584 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 572:
-#line 1754 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 546:
+#line 1716 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_return_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4823 "src/parser_proc.c" /* glr.c:816  */
+#line 4592 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 573:
-#line 1757 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 547:
+#line 1719 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_let_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4831 "src/parser_proc.c" /* glr.c:816  */
+#line 4600 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 574:
-#line 1760 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 548:
+#line 1722 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_set_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4839 "src/parser_proc.c" /* glr.c:816  */
+#line 4608 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 575:
-#line 1763 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 549:
+#line 1725 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_assert_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4847 "src/parser_proc.c" /* glr.c:816  */
+#line 4616 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 576:
-#line 1766 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 550:
+#line 1728 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_free_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4855 "src/parser_proc.c" /* glr.c:816  */
+#line 4624 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 577:
-#line 1772 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 551:
+#line 1734 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_stmt **)(&(*yyvalp))) = psi_let_stmt_init((*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_let_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4864 "src/parser_proc.c" /* glr.c:816  */
+#line 4633 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 578:
-#line 1776 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 552:
+#line 1738 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_stmt **)(&(*yyvalp))) = psi_let_stmt_init(psi_let_exp_init_ex((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), PSI_LET_TMP, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))));
        (*(struct psi_let_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)));
        (*(struct psi_let_stmt **)(&(*yyvalp)))->exp->is_reference = (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 4874 "src/parser_proc.c" /* glr.c:816  */
+#line 4643 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 580:
-#line 1785 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 554:
+#line 1747 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = (*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_let_exp **)(&(*yyvalp)))->is_reference = true;
 }
-#line 4883 "src/parser_proc.c" /* glr.c:816  */
+#line 4652 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 581:
-#line 1789 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 555:
+#line 1751 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = (*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_let_exp **)(&(*yyvalp)))->is_reference = false;
 }
-#line 4892 "src/parser_proc.c" /* glr.c:816  */
+#line 4661 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 582:
-#line 1796 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 556:
+#line 1758 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_NULL, NULL);
 }
-#line 4900 "src/parser_proc.c" /* glr.c:816  */
+#line 4669 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 583:
-#line 1799 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 557:
+#line 1761 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLOC, (*(struct psi_let_calloc **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4908 "src/parser_proc.c" /* glr.c:816  */
+#line 4677 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 584:
-#line 1802 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 558:
+#line 1764 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLOC, (*(struct psi_let_calloc **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_let_calloc **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->static_memory = 1;
 }
-#line 4917 "src/parser_proc.c" /* glr.c:816  */
+#line 4686 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 585:
-#line 1806 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 559:
+#line 1768 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLBACK, (*(struct psi_let_callback **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4925 "src/parser_proc.c" /* glr.c:816  */
+#line 4694 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 586:
-#line 1809 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 560:
+#line 1771 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init_ex(NULL, PSI_LET_FUNC, (*(struct psi_let_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4933 "src/parser_proc.c" /* glr.c:816  */
+#line 4702 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 587:
-#line 1812 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 561:
+#line 1774 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init_ex(NULL, PSI_LET_NUMEXP, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4941 "src/parser_proc.c" /* glr.c:816  */
+#line 4710 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 588:
-#line 1818 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 562:
+#line 1780 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = (*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_let_exp **)(&(*yyvalp)))->var = (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 4950 "src/parser_proc.c" /* glr.c:816  */
+#line 4719 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 589:
-#line 1822 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 563:
+#line 1784 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = (*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_let_exp **)(&(*yyvalp)))->is_reference = 1;
        (*(struct psi_let_exp **)(&(*yyvalp)))->var = (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval));
 }
-#line 4960 "src/parser_proc.c" /* glr.c:816  */
+#line 4729 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 590:
-#line 1830 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 564:
+#line 1792 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_calloc **)(&(*yyvalp))) = psi_let_calloc_init((*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_let_calloc **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)));
 }
-#line 4969 "src/parser_proc.c" /* glr.c:816  */
+#line 4738 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 591:
-#line 1837 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 565:
+#line 1799 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_callback **)(&(*yyvalp))) = psi_let_callback_init(psi_let_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval))->text, (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        (*(struct psi_let_callback **)(&(*yyvalp)))->func->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)));
        (*(struct psi_let_callback **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-7)].yystate.yysemantics.yysval)));
 }
-#line 4979 "src/parser_proc.c" /* glr.c:816  */
+#line 4748 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 592:
-#line 1845 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 566:
+#line 1807 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_func **)(&(*yyvalp))) = psi_let_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->text, (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        (*(struct psi_let_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)));
        (*(struct psi_let_func **)(&(*yyvalp)))->inner = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 4989 "src/parser_proc.c" /* glr.c:816  */
+#line 4758 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 603:
-#line 1866 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 577:
+#line 1828 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4997 "src/parser_proc.c" /* glr.c:816  */
+#line 4766 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 604:
-#line 1869 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 578:
+#line 1831 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 5005 "src/parser_proc.c" /* glr.c:816  */
+#line 4774 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 605:
-#line 1875 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 579:
+#line 1837 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_let_exp_free), &(*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 5013 "src/parser_proc.c" /* glr.c:816  */
+#line 4782 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 606:
-#line 1878 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 580:
+#line 1840 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 5021 "src/parser_proc.c" /* glr.c:816  */
+#line 4790 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 609:
-#line 1889 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 583:
+#line 1851 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 5029 "src/parser_proc.c" /* glr.c:816  */
+#line 4798 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 610:
-#line 1892 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 584:
+#line 1854 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 5037 "src/parser_proc.c" /* glr.c:816  */
+#line 4806 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 611:
-#line 1898 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 585:
+#line 1860 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_set_exp_free), &(*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 5045 "src/parser_proc.c" /* glr.c:816  */
+#line 4814 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 612:
-#line 1901 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 586:
+#line 1863 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 5053 "src/parser_proc.c" /* glr.c:816  */
+#line 4822 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 613:
-#line 1907 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 587:
+#line 1869 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_return_stmt **)(&(*yyvalp))) = psi_return_stmt_init(psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))));
        (*(struct psi_return_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 5062 "src/parser_proc.c" /* glr.c:816  */
+#line 4831 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 614:
-#line 1914 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 588:
+#line 1876 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_stmt **)(&(*yyvalp))) = psi_set_stmt_init((*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_set_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 5071 "src/parser_proc.c" /* glr.c:816  */
+#line 4840 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 615:
-#line 1921 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 589:
+#line 1883 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_exp **)(&(*yyvalp))) = psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 5079 "src/parser_proc.c" /* glr.c:816  */
+#line 4848 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 616:
-#line 1924 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 590:
+#line 1886 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_exp **)(&(*yyvalp))) = psi_set_exp_init(PSI_SET_NUMEXP, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 5087 "src/parser_proc.c" /* glr.c:816  */
+#line 4856 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 617:
-#line 1927 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 591:
+#line 1889 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_exp **)(&(*yyvalp))) = (*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_set_exp **)(&(*yyvalp)))->var = (*(struct psi_impl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 5096 "src/parser_proc.c" /* glr.c:816  */
+#line 4865 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 618:
-#line 1934 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 592:
+#line 1896 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_func **)(&(*yyvalp))) = psi_set_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval))->text, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        (*(struct psi_set_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)));
        (*(struct psi_set_func **)(&(*yyvalp)))->inner = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 5106 "src/parser_proc.c" /* glr.c:816  */
+#line 4875 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 619:
-#line 1939 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 593:
+#line 1901 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_func **)(&(*yyvalp))) = psi_set_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->text, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
        (*(struct psi_set_func **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)));
        (*(struct psi_set_func **)(&(*yyvalp)))->recursive = 1;
 }
-#line 5116 "src/parser_proc.c" /* glr.c:816  */
+#line 4885 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 628:
-#line 1958 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 602:
+#line 1920 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 5124 "src/parser_proc.c" /* glr.c:816  */
+#line 4893 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 629:
-#line 1961 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 603:
+#line 1923 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 5132 "src/parser_proc.c" /* glr.c:816  */
+#line 4901 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 630:
-#line 1967 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 604:
+#line 1929 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_set_exp_free), &(*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 5140 "src/parser_proc.c" /* glr.c:816  */
+#line 4909 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 631:
-#line 1970 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 605:
+#line 1932 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 5148 "src/parser_proc.c" /* glr.c:816  */
+#line 4917 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 632:
-#line 1976 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 606:
+#line 1938 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_assert_stmt **)(&(*yyvalp))) = psi_assert_stmt_init((enum psi_assert_kind) (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_assert_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 5157 "src/parser_proc.c" /* glr.c:816  */
+#line 4926 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 635:
-#line 1988 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 609:
+#line 1950 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_free_stmt **)(&(*yyvalp))) = psi_free_stmt_init((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_free_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 5166 "src/parser_proc.c" /* glr.c:816  */
+#line 4935 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 636:
-#line 1995 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 610:
+#line 1957 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_free_exp_free), &(*(struct psi_free_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 5174 "src/parser_proc.c" /* glr.c:816  */
+#line 4943 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 637:
-#line 1998 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 611:
+#line 1960 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_free_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 5182 "src/parser_proc.c" /* glr.c:816  */
+#line 4951 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 638:
-#line 2004 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 612:
+#line 1966 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_free_exp **)(&(*yyvalp))) = psi_free_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_free_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 5192 "src/parser_proc.c" /* glr.c:816  */
+#line 4961 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 639:
-#line 2012 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 613:
+#line 1974 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = false;
 }
-#line 5200 "src/parser_proc.c" /* glr.c:816  */
+#line 4969 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 640:
-#line 2015 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 614:
+#line 1977 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = true;
 }
-#line 5208 "src/parser_proc.c" /* glr.c:816  */
+#line 4977 "src/parser_proc.c" /* glr.c:816  */
     break;
 
 
-#line 5212 "src/parser_proc.c" /* glr.c:816  */
+#line 4981 "src/parser_proc.c" /* glr.c:816  */
       default: break;
     }
 
@@ -5256,706 +5025,700 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct psi_parser
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   switch (yytype)
     {
-          case 136: /* binary_op_token  */
-#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
+          case 128: /* binary_op_token  */
+#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5263 "src/parser_proc.c" /* glr.c:846  */
+#line 5032 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 137: /* unary_op_token  */
-#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 129: /* unary_op_token  */
+#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5269 "src/parser_proc.c" /* glr.c:846  */
+#line 5038 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 138: /* name_token  */
-#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 130: /* name_token  */
+#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5275 "src/parser_proc.c" /* glr.c:846  */
+#line 5044 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 139: /* any_noeol_token  */
-#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 131: /* any_noeol_token  */
+#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5281 "src/parser_proc.c" /* glr.c:846  */
+#line 5050 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 144: /* lib  */
-#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 136: /* lib  */
+#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5287 "src/parser_proc.c" /* glr.c:846  */
+#line 5056 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 145: /* cpp  */
-#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 137: /* cpp  */
+#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 5293 "src/parser_proc.c" /* glr.c:846  */
+#line 5062 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 146: /* cpp_exp  */
-#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 138: /* cpp_exp  */
+#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 5299 "src/parser_proc.c" /* glr.c:846  */
+#line 5068 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 148: /* cpp_message_token  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 140: /* cpp_message_token  */
+#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5305 "src/parser_proc.c" /* glr.c:846  */
+#line 5074 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 149: /* cpp_include_token  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 141: /* cpp_include_token  */
+#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5311 "src/parser_proc.c" /* glr.c:846  */
+#line 5080 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 150: /* cpp_header_token  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 142: /* cpp_header_token  */
+#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5317 "src/parser_proc.c" /* glr.c:846  */
+#line 5086 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 151: /* cpp_no_arg_token  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 143: /* cpp_no_arg_token  */
+#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5323 "src/parser_proc.c" /* glr.c:846  */
+#line 5092 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 152: /* cpp_name_arg_token  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 144: /* cpp_name_arg_token  */
+#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5329 "src/parser_proc.c" /* glr.c:846  */
+#line 5098 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 153: /* cpp_exp_arg_token  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 145: /* cpp_exp_arg_token  */
+#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5335 "src/parser_proc.c" /* glr.c:846  */
+#line 5104 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 154: /* cpp_special_name_token  */
-#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 146: /* cpp_special_name_token  */
+#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5341 "src/parser_proc.c" /* glr.c:846  */
+#line 5110 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 155: /* cpp_macro_decl  */
-#line 288 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 147: /* cpp_macro_decl  */
+#line 272 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_macro_decl_free(&(*(struct psi_cpp_macro_decl **)(&(*yyvaluep))));}
-#line 5347 "src/parser_proc.c" /* glr.c:846  */
+#line 5116 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 156: /* cpp_macro_sig  */
-#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 148: /* cpp_macro_sig  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5353 "src/parser_proc.c" /* glr.c:846  */
+#line 5122 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 157: /* cpp_macro_sig_args  */
-#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 149: /* cpp_macro_sig_args  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5359 "src/parser_proc.c" /* glr.c:846  */
+#line 5128 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 158: /* cpp_macro_decl_tokens  */
-#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 150: /* cpp_macro_decl_tokens  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5365 "src/parser_proc.c" /* glr.c:846  */
+#line 5134 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 159: /* cpp_macro_decl_token_list  */
-#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 151: /* cpp_macro_decl_token_list  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5371 "src/parser_proc.c" /* glr.c:846  */
+#line 5140 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 160: /* cpp_macro_exp  */
-#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 152: /* cpp_macro_exp  */
+#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 5377 "src/parser_proc.c" /* glr.c:846  */
+#line 5146 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 161: /* cpp_macro_call_args  */
-#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 153: /* cpp_macro_call_args  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5383 "src/parser_proc.c" /* glr.c:846  */
+#line 5152 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 162: /* cpp_macro_call_arg_list  */
-#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 154: /* cpp_macro_call_arg_list  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5389 "src/parser_proc.c" /* glr.c:846  */
+#line 5158 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 163: /* constant  */
-#line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 155: /* constant  */
+#line 282 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_free(&(*(struct psi_const **)(&(*yyvaluep))));}
-#line 5395 "src/parser_proc.c" /* glr.c:846  */
+#line 5164 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 164: /* constant_type  */
-#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 156: /* constant_type  */
+#line 284 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_type_free(&(*(struct psi_const_type **)(&(*yyvaluep))));}
-#line 5401 "src/parser_proc.c" /* glr.c:846  */
+#line 5170 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 165: /* constant_type_token  */
-#line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 157: /* constant_type_token  */
+#line 279 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5407 "src/parser_proc.c" /* glr.c:846  */
+#line 5176 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 166: /* impl_def_val  */
-#line 302 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 158: /* impl_def_val  */
+#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_def_val_free(&(*(struct psi_impl_def_val **)(&(*yyvaluep))));}
-#line 5413 "src/parser_proc.c" /* glr.c:846  */
+#line 5182 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 167: /* impl_def_val_token  */
-#line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 159: /* impl_def_val_token  */
+#line 279 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5419 "src/parser_proc.c" /* glr.c:846  */
+#line 5188 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 168: /* decl_typedef  */
-#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 160: /* decl_typedef  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5425 "src/parser_proc.c" /* glr.c:846  */
+#line 5194 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 169: /* typedef  */
-#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 161: /* typedef  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5431 "src/parser_proc.c" /* glr.c:846  */
+#line 5200 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 170: /* typedef_anon  */
-#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 162: /* typedef_anon  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5437 "src/parser_proc.c" /* glr.c:846  */
+#line 5206 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 171: /* typedef_decl  */
-#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 163: /* typedef_decl  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5443 "src/parser_proc.c" /* glr.c:846  */
+#line 5212 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 172: /* typedef_anon_decl  */
-#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 164: /* typedef_anon_decl  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5449 "src/parser_proc.c" /* glr.c:846  */
+#line 5218 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 173: /* qualified_decl_type  */
-#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 165: /* qualified_decl_type  */
+#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 5455 "src/parser_proc.c" /* glr.c:846  */
+#line 5224 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 174: /* decl_type  */
-#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 166: /* decl_type  */
+#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 5461 "src/parser_proc.c" /* glr.c:846  */
+#line 5230 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 175: /* decl_type_complex  */
-#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 167: /* decl_type_complex  */
+#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 5467 "src/parser_proc.c" /* glr.c:846  */
+#line 5236 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 176: /* decl_type_simple  */
-#line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 168: /* decl_type_simple  */
+#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5473 "src/parser_proc.c" /* glr.c:846  */
+#line 5242 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 177: /* decl_real_type  */
-#line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 169: /* decl_real_type  */
+#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5479 "src/parser_proc.c" /* glr.c:846  */
+#line 5248 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 178: /* decl_stdint_type  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 170: /* int_signed  */
+#line 267 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5485 "src/parser_proc.c" /* glr.c:846  */
+#line 5254 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 179: /* int_signed  */
-#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
-      {}
-#line 5491 "src/parser_proc.c" /* glr.c:846  */
-        break;
-
-    case 180: /* int_width  */
-#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 171: /* int_width  */
+#line 264 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5497 "src/parser_proc.c" /* glr.c:846  */
+#line 5260 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 181: /* decl_int_type  */
-#line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 172: /* decl_int_type  */
+#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5503 "src/parser_proc.c" /* glr.c:846  */
+#line 5266 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 182: /* int_signed_types  */
-#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 173: /* int_signed_types  */
+#line 264 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5509 "src/parser_proc.c" /* glr.c:846  */
+#line 5272 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 183: /* signed_short_types  */
-#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 174: /* signed_short_types  */
+#line 267 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5515 "src/parser_proc.c" /* glr.c:846  */
+#line 5278 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 184: /* signed_long_types  */
-#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 175: /* signed_long_types  */
+#line 267 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5521 "src/parser_proc.c" /* glr.c:846  */
+#line 5284 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 185: /* int_width_types  */
-#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 176: /* int_width_types  */
+#line 264 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5527 "src/parser_proc.c" /* glr.c:846  */
+#line 5290 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 186: /* decl_stmt  */
-#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 177: /* decl_stmt  */
+#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5533 "src/parser_proc.c" /* glr.c:846  */
+#line 5296 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 192: /* decl_vars  */
-#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 183: /* decl_vars  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5539 "src/parser_proc.c" /* glr.c:846  */
+#line 5302 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 197: /* decl  */
-#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 188: /* decl  */
+#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5545 "src/parser_proc.c" /* glr.c:846  */
+#line 5308 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 198: /* decl_body  */
-#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 189: /* decl_body  */
+#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5551 "src/parser_proc.c" /* glr.c:846  */
+#line 5314 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 199: /* decl_func_body  */
-#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 190: /* decl_func_body  */
+#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5557 "src/parser_proc.c" /* glr.c:846  */
+#line 5320 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 200: /* decl_functor_body  */
-#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 191: /* decl_functor_body  */
+#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5563 "src/parser_proc.c" /* glr.c:846  */
+#line 5326 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 201: /* decl_functor  */
-#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 192: /* decl_functor  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5569 "src/parser_proc.c" /* glr.c:846  */
+#line 5332 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 202: /* decl_func  */
-#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 193: /* decl_func  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5575 "src/parser_proc.c" /* glr.c:846  */
+#line 5338 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 203: /* decl_args  */
-#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 194: /* decl_args  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5581 "src/parser_proc.c" /* glr.c:846  */
+#line 5344 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 204: /* decl_anon_arg  */
-#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 195: /* decl_anon_arg  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5587 "src/parser_proc.c" /* glr.c:846  */
+#line 5350 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 205: /* decl_arg  */
-#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 196: /* decl_arg  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5593 "src/parser_proc.c" /* glr.c:846  */
+#line 5356 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 206: /* decl_var  */
-#line 317 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 197: /* decl_var  */
+#line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_var_free(&(*(struct psi_decl_var **)(&(*yyvaluep))));}
-#line 5599 "src/parser_proc.c" /* glr.c:846  */
+#line 5362 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 207: /* decl_union  */
-#line 321 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 198: /* decl_union  */
+#line 302 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_union_free(&(*(struct psi_decl_union **)(&(*yyvaluep))));}
-#line 5605 "src/parser_proc.c" /* glr.c:846  */
+#line 5368 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 208: /* decl_struct  */
-#line 319 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 199: /* decl_struct  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_struct_free(&(*(struct psi_decl_struct **)(&(*yyvaluep))));}
-#line 5611 "src/parser_proc.c" /* glr.c:846  */
+#line 5374 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 209: /* decl_struct_args  */
-#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 200: /* decl_struct_args  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5617 "src/parser_proc.c" /* glr.c:846  */
+#line 5380 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 210: /* struct_args_block  */
-#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 201: /* struct_args_block  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5623 "src/parser_proc.c" /* glr.c:846  */
+#line 5386 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 211: /* struct_args  */
-#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 202: /* struct_args  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5629 "src/parser_proc.c" /* glr.c:846  */
+#line 5392 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 212: /* struct_arg_var_list  */
-#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 203: /* struct_arg_var_list  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5635 "src/parser_proc.c" /* glr.c:846  */
+#line 5398 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 213: /* decl_vars_with_layout  */
-#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 204: /* decl_vars_with_layout  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5641 "src/parser_proc.c" /* glr.c:846  */
+#line 5404 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 214: /* decl_enum  */
-#line 323 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 205: /* decl_enum  */
+#line 304 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_free(&(*(struct psi_decl_enum **)(&(*yyvaluep))));}
-#line 5647 "src/parser_proc.c" /* glr.c:846  */
+#line 5410 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 215: /* decl_enum_items  */
-#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 206: /* decl_enum_items  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5653 "src/parser_proc.c" /* glr.c:846  */
+#line 5416 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 216: /* decl_enum_item  */
-#line 325 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 207: /* decl_enum_item  */
+#line 306 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_item_free(&(*(struct psi_decl_enum_item **)(&(*yyvaluep))));}
-#line 5659 "src/parser_proc.c" /* glr.c:846  */
+#line 5422 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 217: /* num_exp  */
-#line 381 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 208: /* num_exp  */
+#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 5665 "src/parser_proc.c" /* glr.c:846  */
+#line 5428 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 218: /* number  */
-#line 383 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 209: /* number  */
+#line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5671 "src/parser_proc.c" /* glr.c:846  */
+#line 5434 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 219: /* sizeof  */
-#line 335 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 210: /* sizeof  */
+#line 316 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5677 "src/parser_proc.c" /* glr.c:846  */
+#line 5440 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 220: /* sizeof_body  */
-#line 335 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 211: /* sizeof_body  */
+#line 316 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5683 "src/parser_proc.c" /* glr.c:846  */
+#line 5446 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 221: /* sizeof_body_notypes  */
-#line 335 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 212: /* sizeof_body_notypes  */
+#line 316 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5689 "src/parser_proc.c" /* glr.c:846  */
+#line 5452 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 222: /* enum_name  */
-#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 213: /* enum_name  */
+#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5695 "src/parser_proc.c" /* glr.c:846  */
+#line 5458 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 223: /* union_name  */
-#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 214: /* union_name  */
+#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5701 "src/parser_proc.c" /* glr.c:846  */
+#line 5464 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 224: /* struct_name  */
-#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 215: /* struct_name  */
+#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5707 "src/parser_proc.c" /* glr.c:846  */
+#line 5470 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 225: /* optional_name  */
-#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 216: /* optional_name  */
+#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5713 "src/parser_proc.c" /* glr.c:846  */
+#line 5476 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 226: /* decl_layout  */
-#line 332 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 217: /* decl_layout  */
+#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_layout_free(&(*(struct psi_layout **)(&(*yyvaluep))));}
-#line 5719 "src/parser_proc.c" /* glr.c:846  */
+#line 5482 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 227: /* align_and_size  */
-#line 330 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 218: /* align_and_size  */
+#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5725 "src/parser_proc.c" /* glr.c:846  */
+#line 5488 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 228: /* array_size  */
-#line 386 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 219: /* array_size  */
+#line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5731 "src/parser_proc.c" /* glr.c:846  */
+#line 5494 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 229: /* indirection  */
-#line 386 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 220: /* indirection  */
+#line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5737 "src/parser_proc.c" /* glr.c:846  */
+#line 5500 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 230: /* pointers  */
-#line 386 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 221: /* pointers  */
+#line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5743 "src/parser_proc.c" /* glr.c:846  */
+#line 5506 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 231: /* asterisks  */
-#line 386 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 222: /* asterisks  */
+#line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5749 "src/parser_proc.c" /* glr.c:846  */
+#line 5512 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 233: /* impl  */
-#line 338 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 224: /* impl  */
+#line 319 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_free(&(*(struct psi_impl **)(&(*yyvaluep))));}
-#line 5755 "src/parser_proc.c" /* glr.c:846  */
+#line 5518 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 234: /* impl_func  */
-#line 340 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 225: /* impl_func  */
+#line 321 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_func_free(&(*(struct psi_impl_func **)(&(*yyvaluep))));}
-#line 5761 "src/parser_proc.c" /* glr.c:846  */
+#line 5524 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 235: /* impl_args  */
-#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 226: /* impl_args  */
+#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5767 "src/parser_proc.c" /* glr.c:846  */
+#line 5530 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 236: /* impl_arg  */
-#line 342 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 227: /* impl_arg  */
+#line 323 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_arg_free(&(*(struct psi_impl_arg **)(&(*yyvaluep))));}
-#line 5773 "src/parser_proc.c" /* glr.c:846  */
+#line 5536 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 237: /* impl_var  */
-#line 346 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 228: /* impl_var  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_var_free(&(*(struct psi_impl_var **)(&(*yyvaluep))));}
-#line 5779 "src/parser_proc.c" /* glr.c:846  */
+#line 5542 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 238: /* impl_type  */
-#line 344 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 229: /* impl_type  */
+#line 325 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_type_free(&(*(struct psi_impl_type **)(&(*yyvaluep))));}
-#line 5785 "src/parser_proc.c" /* glr.c:846  */
+#line 5548 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 239: /* impl_type_token  */
-#line 376 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 230: /* impl_type_token  */
+#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5791 "src/parser_proc.c" /* glr.c:846  */
+#line 5554 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 240: /* impl_stmts  */
-#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 231: /* impl_stmts  */
+#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5797 "src/parser_proc.c" /* glr.c:846  */
+#line 5560 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 241: /* impl_stmt  */
-#line 374 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 232: /* impl_stmt  */
+#line 355 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_stmt_free(&(*(struct psi_token ***)(&(*yyvaluep))));}
-#line 5803 "src/parser_proc.c" /* glr.c:846  */
+#line 5566 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 242: /* let_stmt  */
-#line 349 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 233: /* let_stmt  */
+#line 330 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_stmt_free(&(*(struct psi_let_stmt **)(&(*yyvaluep))));}
-#line 5809 "src/parser_proc.c" /* glr.c:846  */
+#line 5572 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 243: /* let_exp  */
-#line 351 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 234: /* let_exp  */
+#line 332 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5815 "src/parser_proc.c" /* glr.c:846  */
+#line 5578 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 244: /* let_exp_byref  */
-#line 351 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 235: /* let_exp_byref  */
+#line 332 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5821 "src/parser_proc.c" /* glr.c:846  */
+#line 5584 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 245: /* let_exp_assign  */
-#line 351 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 236: /* let_exp_assign  */
+#line 332 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5827 "src/parser_proc.c" /* glr.c:846  */
+#line 5590 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 246: /* let_calloc  */
-#line 353 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 237: /* let_calloc  */
+#line 334 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_calloc_free(&(*(struct psi_let_calloc **)(&(*yyvaluep))));}
-#line 5833 "src/parser_proc.c" /* glr.c:846  */
+#line 5596 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 247: /* let_callback  */
-#line 355 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 238: /* let_callback  */
+#line 336 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_callback_free(&(*(struct psi_let_callback **)(&(*yyvaluep))));}
-#line 5839 "src/parser_proc.c" /* glr.c:846  */
+#line 5602 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 248: /* let_func  */
-#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 239: /* let_func  */
+#line 338 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_func_free(&(*(struct psi_let_func **)(&(*yyvaluep))));}
-#line 5845 "src/parser_proc.c" /* glr.c:846  */
+#line 5608 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 249: /* let_func_token  */
-#line 376 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 240: /* let_func_token  */
+#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5851 "src/parser_proc.c" /* glr.c:846  */
+#line 5614 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 250: /* let_func_exps  */
-#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 241: /* let_func_exps  */
+#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5857 "src/parser_proc.c" /* glr.c:846  */
+#line 5620 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 251: /* let_exps  */
-#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 242: /* let_exps  */
+#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5863 "src/parser_proc.c" /* glr.c:846  */
+#line 5626 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 252: /* callback_rval  */
-#line 376 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 243: /* callback_rval  */
+#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5869 "src/parser_proc.c" /* glr.c:846  */
+#line 5632 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 253: /* callback_arg_list  */
-#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 244: /* callback_arg_list  */
+#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5875 "src/parser_proc.c" /* glr.c:846  */
+#line 5638 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 254: /* callback_args  */
-#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 245: /* callback_args  */
+#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5881 "src/parser_proc.c" /* glr.c:846  */
+#line 5644 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 255: /* return_stmt  */
-#line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 246: /* return_stmt  */
+#line 348 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_return_stmt_free(&(*(struct psi_return_stmt **)(&(*yyvaluep))));}
-#line 5887 "src/parser_proc.c" /* glr.c:846  */
+#line 5650 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 256: /* set_stmt  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 247: /* set_stmt  */
+#line 340 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_stmt_free(&(*(struct psi_set_stmt **)(&(*yyvaluep))));}
-#line 5893 "src/parser_proc.c" /* glr.c:846  */
+#line 5656 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 257: /* set_exp  */
-#line 361 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 248: /* set_exp  */
+#line 342 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_exp_free(&(*(struct psi_set_exp **)(&(*yyvaluep))));}
-#line 5899 "src/parser_proc.c" /* glr.c:846  */
+#line 5662 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 258: /* set_func  */
-#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 249: /* set_func  */
+#line 344 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_func_free(&(*(struct psi_set_func **)(&(*yyvaluep))));}
-#line 5905 "src/parser_proc.c" /* glr.c:846  */
+#line 5668 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 259: /* set_func_token  */
-#line 376 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 250: /* set_func_token  */
+#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5911 "src/parser_proc.c" /* glr.c:846  */
+#line 5674 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 260: /* set_func_exps  */
-#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 251: /* set_func_exps  */
+#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5917 "src/parser_proc.c" /* glr.c:846  */
+#line 5680 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 261: /* set_exps  */
-#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 252: /* set_exps  */
+#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5923 "src/parser_proc.c" /* glr.c:846  */
+#line 5686 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 262: /* assert_stmt  */
-#line 365 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 253: /* assert_stmt  */
+#line 346 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_assert_stmt_free(&(*(struct psi_assert_stmt **)(&(*yyvaluep))));}
-#line 5929 "src/parser_proc.c" /* glr.c:846  */
+#line 5692 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 263: /* assert_stmt_token  */
-#line 376 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 254: /* assert_stmt_token  */
+#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5935 "src/parser_proc.c" /* glr.c:846  */
+#line 5698 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 264: /* free_stmt  */
-#line 369 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 255: /* free_stmt  */
+#line 350 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_stmt_free(&(*(struct psi_free_stmt **)(&(*yyvaluep))));}
-#line 5941 "src/parser_proc.c" /* glr.c:846  */
+#line 5704 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 265: /* free_exps  */
-#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 256: /* free_exps  */
+#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5947 "src/parser_proc.c" /* glr.c:846  */
+#line 5710 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 266: /* free_exp  */
-#line 371 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 257: /* free_exp  */
+#line 352 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_exp_free(&(*(struct psi_free_exp **)(&(*yyvaluep))));}
-#line 5953 "src/parser_proc.c" /* glr.c:846  */
+#line 5716 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 267: /* reference  */
-#line 388 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 258: /* reference  */
+#line 369 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5959 "src/parser_proc.c" /* glr.c:846  */
+#line 5722 "src/parser_proc.c" /* glr.c:846  */
         break;
 
 
@@ -6012,7 +5775,7 @@ yylhsNonterm (yyRuleNum yyrule)
 }
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-722)))
+  (!!((Yystate) == (-695)))
 
 /** True iff LR state YYSTATE has only a default reduction (regardless
  *  of token).  */
@@ -7304,11 +7067,11 @@ yyparse (struct psi_parser *P, struct psi_plist *tokens, size_t *index)
   yylval = yyval_default;
 
   /* User initialization code.  */
-  #line 114 "src/parser_proc_grammar.y" /* glr.c:2270  */
+  #line 106 "src/parser_proc_grammar.y" /* glr.c:2270  */
 {
 }
 
-#line 7312 "src/parser_proc.c" /* glr.c:2270  */
+#line 7075 "src/parser_proc.c" /* glr.c:2270  */
 
   if (! yyinitGLRStack (yystackp, YYINITDEPTH))
     goto yyexhaustedlab;
@@ -7614,7 +7377,7 @@ yypdumpstack (yyGLRStack* yystackp)
 #define yydebug psi_parser_proc_debug
 #define yynerrs psi_parser_proc_nerrs
 
-#line 2024 "src/parser_proc_grammar.y" /* glr.c:2584  */
+#line 1986 "src/parser_proc_grammar.y" /* glr.c:2584  */
 
 
 /* epilogue */

diff --git a/src/parser_proc.h b/src/parser_proc.h
index e7f59614175c396ffd1b9805ce6a9a678bb1a360..18e5a85c32d5f56217c152eaf6e82d654247c3d6 100644 (file)
--- a/src/parser_proc.h
+++ b/src/parser_proc.h
@@ -40,7 +40,7 @@
 extern int psi_parser_proc_debug;
 #endif
 /* "%code requires" blocks.  */
-#line 90 "src/parser_proc_grammar.y" /* glr.c:197  */
+#line 82 "src/parser_proc_grammar.y" /* glr.c:197  */
 
 #include "plist.h"
 #include "types/layout.h"
@@ -72,122 +72,114 @@ struct psi_parser;
     PSI_T_CALLABLE = 271,
     PSI_T_VOID = 272,
     PSI_T_ZVAL = 273,
-    PSI_T_INT8 = 274,
-    PSI_T_UINT8 = 275,
-    PSI_T_INT16 = 276,
-    PSI_T_UINT16 = 277,
-    PSI_T_INT32 = 278,
-    PSI_T_UINT32 = 279,
-    PSI_T_INT64 = 280,
-    PSI_T_UINT64 = 281,
-    PSI_T_NULL = 282,
-    PSI_T_TRUE = 283,
-    PSI_T_FALSE = 284,
-    PSI_T_NAME = 285,
-    PSI_T_NSNAME = 286,
-    PSI_T_DOLLAR_NAME = 287,
-    PSI_T_NUMBER = 288,
-    PSI_T_QUOTED_STRING = 289,
-    PSI_T_QUOTED_CHAR = 290,
-    PSI_T_SIZEOF = 291,
-    PSI_T_VOLATILE = 292,
-    PSI_T_EOL = 293,
-    PSI_T_EOS = 294,
-    PSI_T_LPAREN = 295,
-    PSI_T_RPAREN = 296,
-    PSI_T_COMMA = 297,
-    PSI_T_COLON = 298,
-    PSI_T_LBRACE = 299,
-    PSI_T_RBRACE = 300,
-    PSI_T_LBRACKET = 301,
-    PSI_T_RBRACKET = 302,
-    PSI_T_EQUALS = 303,
-    PSI_T_HASH = 304,
-    PSI_T_PIPE = 305,
-    PSI_T_CARET = 306,
-    PSI_T_AMPERSAND = 307,
-    PSI_T_LSHIFT = 308,
-    PSI_T_RSHIFT = 309,
-    PSI_T_PLUS = 310,
-    PSI_T_MINUS = 311,
-    PSI_T_ASTERISK = 312,
-    PSI_T_SLASH = 313,
-    PSI_T_MODULO = 314,
-    PSI_T_LCHEVR = 315,
-    PSI_T_RCHEVR = 316,
-    PSI_T_CMP_GE = 317,
-    PSI_T_CMP_LE = 318,
-    PSI_T_OR = 319,
-    PSI_T_AND = 320,
-    PSI_T_CMP_EQ = 321,
-    PSI_T_CMP_NE = 322,
-    PSI_T_TILDE = 323,
-    PSI_T_NOT = 324,
-    PSI_T_PERIOD = 325,
-    PSI_T_BACKSLASH = 326,
-    PSI_T_ELLIPSIS = 327,
-    PSI_T_IIF = 328,
-    PSI_T_PRAGMA = 329,
-    PSI_T_PRAGMA_ONCE = 330,
-    PSI_T_LINE = 331,
-    PSI_T_ERROR = 332,
-    PSI_T_WARNING = 333,
-    PSI_T_IF = 334,
-    PSI_T_IFDEF = 335,
-    PSI_T_IFNDEF = 336,
-    PSI_T_ELSE = 337,
-    PSI_T_ELIF = 338,
-    PSI_T_ENDIF = 339,
-    PSI_T_DEFINE = 340,
-    PSI_T_DEFINED = 341,
-    PSI_T_UNDEF = 342,
-    PSI_T_IMPORT = 343,
-    PSI_T_INCLUDE = 344,
-    PSI_T_INCLUDE_NEXT = 345,
-    PSI_T_TYPEDEF = 346,
-    PSI_T_STRUCT = 347,
-    PSI_T_UNION = 348,
-    PSI_T_ENUM = 349,
-    PSI_T_CONST = 350,
-    PSI_T_LIB = 351,
-    PSI_T_STATIC = 352,
-    PSI_T_CALLBACK = 353,
-    PSI_T_FUNCTION = 354,
-    PSI_T_LET = 355,
-    PSI_T_SET = 356,
-    PSI_T_TEMP = 357,
-    PSI_T_FREE = 358,
-    PSI_T_RETURN = 359,
-    PSI_T_PRE_ASSERT = 360,
-    PSI_T_POST_ASSERT = 361,
-    PSI_T_BOOLVAL = 362,
-    PSI_T_INTVAL = 363,
-    PSI_T_STRVAL = 364,
-    PSI_T_PATHVAL = 365,
-    PSI_T_STRLEN = 366,
-    PSI_T_FLOATVAL = 367,
-    PSI_T_ARRVAL = 368,
-    PSI_T_OBJVAL = 369,
-    PSI_T_COUNT = 370,
-    PSI_T_CALLOC = 371,
-    PSI_T_TO_BOOL = 372,
-    PSI_T_TO_INT = 373,
-    PSI_T_TO_STRING = 374,
-    PSI_T_TO_FLOAT = 375,
-    PSI_T_TO_ARRAY = 376,
-    PSI_T_TO_OBJECT = 377,
-    PSI_T_COMMENT = 378,
-    PSI_T_WHITESPACE = 379,
-    PSI_T_NO_WHITESPACE = 380,
-    PSI_T_CPP_HEADER = 381,
-    PSI_T_CPP_ATTRIBUTE = 382,
-    PSI_T_CPP_EXTENSION = 383,
-    PSI_T_CPP_PASTE = 384,
-    PSI_T_CPP_INLINE = 385,
-    PSI_T_CPP_RESTRICT = 386,
-    PSI_T_CPP_ASM = 387,
-    PSI_T_BINARY = 388,
-    PSI_T_UNARY = 389
+    PSI_T_NULL = 274,
+    PSI_T_TRUE = 275,
+    PSI_T_FALSE = 276,
+    PSI_T_NAME = 277,
+    PSI_T_NSNAME = 278,
+    PSI_T_DOLLAR_NAME = 279,
+    PSI_T_NUMBER = 280,
+    PSI_T_QUOTED_STRING = 281,
+    PSI_T_QUOTED_CHAR = 282,
+    PSI_T_SIZEOF = 283,
+    PSI_T_VOLATILE = 284,
+    PSI_T_EOL = 285,
+    PSI_T_EOS = 286,
+    PSI_T_LPAREN = 287,
+    PSI_T_RPAREN = 288,
+    PSI_T_COMMA = 289,
+    PSI_T_COLON = 290,
+    PSI_T_LBRACE = 291,
+    PSI_T_RBRACE = 292,
+    PSI_T_LBRACKET = 293,
+    PSI_T_RBRACKET = 294,
+    PSI_T_EQUALS = 295,
+    PSI_T_HASH = 296,
+    PSI_T_PIPE = 297,
+    PSI_T_CARET = 298,
+    PSI_T_AMPERSAND = 299,
+    PSI_T_LSHIFT = 300,
+    PSI_T_RSHIFT = 301,
+    PSI_T_PLUS = 302,
+    PSI_T_MINUS = 303,
+    PSI_T_ASTERISK = 304,
+    PSI_T_SLASH = 305,
+    PSI_T_MODULO = 306,
+    PSI_T_LCHEVR = 307,
+    PSI_T_RCHEVR = 308,
+    PSI_T_CMP_GE = 309,
+    PSI_T_CMP_LE = 310,
+    PSI_T_OR = 311,
+    PSI_T_AND = 312,
+    PSI_T_CMP_EQ = 313,
+    PSI_T_CMP_NE = 314,
+    PSI_T_TILDE = 315,
+    PSI_T_NOT = 316,
+    PSI_T_PERIOD = 317,
+    PSI_T_BACKSLASH = 318,
+    PSI_T_ELLIPSIS = 319,
+    PSI_T_IIF = 320,
+    PSI_T_PRAGMA = 321,
+    PSI_T_PRAGMA_ONCE = 322,
+    PSI_T_LINE = 323,
+    PSI_T_ERROR = 324,
+    PSI_T_WARNING = 325,
+    PSI_T_IF = 326,
+    PSI_T_IFDEF = 327,
+    PSI_T_IFNDEF = 328,
+    PSI_T_ELSE = 329,
+    PSI_T_ELIF = 330,
+    PSI_T_ENDIF = 331,
+    PSI_T_DEFINE = 332,
+    PSI_T_DEFINED = 333,
+    PSI_T_UNDEF = 334,
+    PSI_T_IMPORT = 335,
+    PSI_T_INCLUDE = 336,
+    PSI_T_INCLUDE_NEXT = 337,
+    PSI_T_TYPEDEF = 338,
+    PSI_T_STRUCT = 339,
+    PSI_T_UNION = 340,
+    PSI_T_ENUM = 341,
+    PSI_T_CONST = 342,
+    PSI_T_LIB = 343,
+    PSI_T_STATIC = 344,
+    PSI_T_CALLBACK = 345,
+    PSI_T_FUNCTION = 346,
+    PSI_T_LET = 347,
+    PSI_T_SET = 348,
+    PSI_T_TEMP = 349,
+    PSI_T_FREE = 350,
+    PSI_T_RETURN = 351,
+    PSI_T_PRE_ASSERT = 352,
+    PSI_T_POST_ASSERT = 353,
+    PSI_T_BOOLVAL = 354,
+    PSI_T_INTVAL = 355,
+    PSI_T_STRVAL = 356,
+    PSI_T_PATHVAL = 357,
+    PSI_T_STRLEN = 358,
+    PSI_T_FLOATVAL = 359,
+    PSI_T_ARRVAL = 360,
+    PSI_T_OBJVAL = 361,
+    PSI_T_COUNT = 362,
+    PSI_T_CALLOC = 363,
+    PSI_T_TO_BOOL = 364,
+    PSI_T_TO_INT = 365,
+    PSI_T_TO_STRING = 366,
+    PSI_T_TO_FLOAT = 367,
+    PSI_T_TO_ARRAY = 368,
+    PSI_T_TO_OBJECT = 369,
+    PSI_T_COMMENT = 370,
+    PSI_T_WHITESPACE = 371,
+    PSI_T_NO_WHITESPACE = 372,
+    PSI_T_CPP_HEADER = 373,
+    PSI_T_CPP_ATTRIBUTE = 374,
+    PSI_T_CPP_EXTENSION = 375,
+    PSI_T_CPP_PASTE = 376,
+    PSI_T_CPP_INLINE = 377,
+    PSI_T_CPP_RESTRICT = 378,
+    PSI_T_CPP_ASM = 379,
+    PSI_T_BINARY = 380,
+    PSI_T_UNARY = 381
   };
 #endif
 
@@ -397,22 +389,6 @@ union YYSTYPE
   struct psi_token * PSI_T_VOID;
   /* ZVAL  */
   struct psi_token * PSI_T_ZVAL;
-  /* INT8  */
-  struct psi_token * PSI_T_INT8;
-  /* UINT8  */
-  struct psi_token * PSI_T_UINT8;
-  /* INT16  */
-  struct psi_token * PSI_T_INT16;
-  /* UINT16  */
-  struct psi_token * PSI_T_UINT16;
-  /* INT32  */
-  struct psi_token * PSI_T_INT32;
-  /* UINT32  */
-  struct psi_token * PSI_T_UINT32;
-  /* INT64  */
-  struct psi_token * PSI_T_INT64;
-  /* UINT64  */
-  struct psi_token * PSI_T_UINT64;
   /* NULL  */
   struct psi_token * PSI_T_NULL;
   /* TRUE  */
@@ -657,8 +633,6 @@ union YYSTYPE
   struct psi_token * PSI_T_decl_type_simple;
   /* decl_real_type  */
   struct psi_token * PSI_T_decl_real_type;
-  /* decl_stdint_type  */
-  struct psi_token * PSI_T_decl_stdint_type;
   /* int_signed  */
   struct psi_token * PSI_T_int_signed;
   /* int_width  */
@@ -693,7 +667,7 @@ union YYSTYPE
   struct psi_token * PSI_T_assert_stmt_token;
   /* impl_stmt  */
   struct psi_token ** PSI_T_impl_stmt;
-#line 697 "src/parser_proc.h" /* glr.c:197  */
+#line 671 "src/parser_proc.h" /* glr.c:197  */
 };
 
 typedef union YYSTYPE YYSTYPE;

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index 6fa4ab0bfb9ace332bb39f08688661e81217123a..b3e20d334c0e397c4bdf85c57c23d8f03a668c28 100644 (file)
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -5,9 +5,6 @@
 %code {
 #include <assert.h>
 #include <stdarg.h>
-#include <fnmatch.h>
-
-#include "php_psi.h"
 
 #include "plist.h"
 #include "parser.h"
@@ -59,16 +56,11 @@ static inline void psi_parser_proc_add_const(struct psi_parser *P, struct psi_co
 
 }
 static inline void psi_parser_proc_add_decl(struct psi_parser *P, struct psi_decl *decl) {
-       char *blacklisted;
-       size_t i = 0;
-
        assert(decl);
-
-       while (psi_plist_get(PSI_G(blacklist).decls, i++, &blacklisted)) {
-               if (!fnmatch(blacklisted, decl->func->var->name, 0)) {
-                       psi_decl_free(&decl);
-                       return;
-               }
+       
+       if (psi_decl_is_blacklisted(decl->func->var->name)) {
+               psi_decl_free(&decl);
+               return;
        }
 
        if (!P->decls) {
@@ -132,14 +124,6 @@ struct psi_parser;
 %token <struct psi_token *> CALLABLE
 %token <struct psi_token *> VOID
 %token <struct psi_token *> ZVAL
-%token <struct psi_token *> INT8
-%token <struct psi_token *> UINT8
-%token <struct psi_token *> INT16
-%token <struct psi_token *> UINT16
-%token <struct psi_token *> INT32
-%token <struct psi_token *> UINT32
-%token <struct psi_token *> INT64
-%token <struct psi_token *> UINT64
 %token <struct psi_token *> NULL
 %token <struct psi_token *> TRUE
 %token <struct psi_token *> FALSE
@@ -304,9 +288,6 @@ struct psi_parser;
 %type          <struct psi_token *>                            decl_real_type decl_int_type decl_type_simple
 %destructor    {psi_token_free(&$$);}                          decl_real_type decl_int_type decl_type_simple
 
-%type          <struct psi_token *>                            decl_stdint_type
-%destructor    {}                                                                      decl_stdint_type
-
 %type          <struct psi_decl_type *>                        decl_type qualified_decl_type decl_type_complex
 %destructor    {psi_decl_type_free(&$$);}                      decl_type qualified_decl_type decl_type_complex
 %type          <struct psi_decl *>                                     decl_stmt decl decl_body decl_func_body decl_functor_body
@@ -395,8 +376,8 @@ struct psi_parser;
 binary_op_token: PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | RCHEVR | LCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE ; 
 unary_op_token: TILDE | NOT | PLUS | MINUS ;
 name_token: NAME | FUNCTION | TEMP | FREE | SET | LET | CALLOC | CALLBACK | LIB | BOOL | STRING | ERROR | WARNING | LINE | PRAGMA_ONCE | PRAGMA | let_func_token | set_func_token;
-any_noeol_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | INT8 | UINT8 | INT16 | UINT16 | INT32 | UINT32 | INT64 | UINT64 | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACE | RBRACE | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE;
-any_nobrace_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | INT8 | UINT8 | INT16 | UINT16 | INT32 | UINT32 | INT64 | UINT64 | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE;
+any_noeol_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACE | RBRACE | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE;
+any_nobrace_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE;
 
 
 file:
@@ -850,11 +831,6 @@ typedef_decl[def]:
        $def->type->real.unn->size = $as.len;
        psi_parser_proc_add_union(P, $def->type->real.unn);
 }
-|      qualified_decl_type[type] decl_stdint_type[stdint] {
-       $stdint->type = PSI_T_NAME;
-       $def = psi_decl_arg_init($type, psi_decl_var_init($stdint->text, 0, 0));
-       $def->var->token = psi_token_copy($stdint);
-}
 ;
 
 typedef_anon_decl[def]:
@@ -932,9 +908,6 @@ decl_type_complex[type]:
 decl_type_simple[type]:
        decl_int_type
 |      decl_real_type
-|      decl_stdint_type[type_] {
-       $type = psi_token_copy($type_);
-}
 |      NAME[type_] {
        $type = psi_token_copy($type_);
 }
@@ -952,17 +925,6 @@ decl_real_type[type]:
 }
 ;
 
-decl_stdint_type[type]:
-       INT8
-|      UINT8
-|      INT16
-|      UINT16
-|      INT32
-|      UINT32
-|      INT64
-|      UINT64
-;
-
 int_signed[i]:
        SIGNED
 |      UNSIGNED

diff --git a/src/token.h b/src/token.h
index cf9423fba8320d573e870cd1f848fffc11bbf6dd..643864662d82bb5f54eeabb34d3dad71e220d5ee 100644 (file)
--- a/src/token.h
+++ b/src/token.h
@@ -49,9 +49,53 @@ static inline size_t psi_offset_padding(size_t diff, size_t alignment) {
 
 #define PSI_T_CAST                     PSI_T_EQUALS
 #define PSI_T_POINTER          PSI_T_ASTERISK
-#define PSI_T_LONG_DOUBLE      (PSI_T_DOUBLE << 16)
-#define PSI_T_BSLASH           (PSI_T_SLASH << 16)
+
 #define PSI_T_WHITESPACE       -PSI_T_NO_WHITESPACE
+#define PSI_T_BSLASH           -PSI_T_SLASH
+#define PSI_T_LONG_DOUBLE      -PSI_T_DOUBLE
+
+#if SIZEOF_CHAR == SIZEOF_INT8_T
+# define PSI_T_INT8 PSI_T_CHAR
+# define PSI_T_UINT8 -PSI_T_CHAR
+# define ALIGNOF_INT8_T ALIGNOF_CHAR
+# define ALIGNOF_UINT8_T ALIGNOF_CHAR
+#else
+# error SIZEOF_CHAR != 8
+#endif
+#if SIZEOF_SHORT == SIZEOF_INT16_T
+# define PSI_T_INT16 PSI_T_SHORT
+# define PSI_T_UINT16 -PSI_T_SHORT
+# define ALIGNOF_INT16_T ALIGNOF_SHORT
+# define ALIGNOF_UINT16_T ALIGNOF_SHORT
+#else
+# error SIZEOF_SHORT != 16
+#endif
+#if SIZEOF_INT == SIZEOF_INT32_T
+# define PSI_T_INT32 PSI_T_INT
+# define PSI_T_UINT32 -PSI_T_INT
+# define ALIGNOF_INT32_T ALIGNOF_INT
+# define ALIGNOF_UINT32_T ALIGNOF_INT
+#elif SIZEOF_LONG == SIZEOF_INT32_T
+# define PSI_T_INT32 PSI_T_LONG
+# define PSI_T_UINT32 -PSI_T_LONG
+# define ALIGNOF_INT32_T ALIGNOF_LONG
+# define ALIGNOF_UINT32_T ALIGNOF_LONG
+#else
+# error SIZEOF_INT != 32 and SIZEOF_LONG != 32
+#endif
+#if SIZEOF_LONG == SIZEOF_INT64_T
+# define PSI_T_INT64 PSI_T_LONG
+# define PSI_T_UINT64 -PSI_T_LONG
+# define ALIGNOF_INT64_T ALIGNOF_LONG
+# define ALIGNOF_UINT64_T ALIGNOF_LONG
+# elif HAVE_LONG_LONG_INT && SIZEOF_LONG_LONG_INT == SIZEOF_INT64_T
+# define PSI_T_INT64 (PSI_T_LONG << 16)
+# define PSI_T_UINT64 -(PSI_T_LONG << 16)
+# define ALIGNOF_INT64_T ALIGNOF_LONG_LONG
+# define ALIGNOF_UINT64_T ALIGNOF_LONG_LONG
+#else
+# error SIZEOF_LONG != 64 and SIZEOF_LONG_LONG != 64
+#endif
 
 typedef int token_t;
 

diff --git a/src/types/decl.c b/src/types/decl.c
index 69e0b662b890369d16552a628d98d017587ffac4..2d974808b7bd8ee3d7cf735632ba22ad8f878876 100644 (file)
--- a/src/types/decl.c
+++ b/src/types/decl.c
@@ -25,7 +25,11 @@
 
 #include "php_psi_stdinc.h"
 
+#include "php_psi.h"
+
 #include <dlfcn.h>
+#include <fnmatch.h>
+
 #include "data.h"
 
 #define PSI_FUNC_REDIRS
@@ -157,3 +161,17 @@ bool psi_decl_validate_nodl(struct psi_data *data, struct psi_decl *decl,
 
        return true;
 }
+
+bool psi_decl_is_blacklisted(const char *name)
+{
+       char *blacklisted;
+       size_t i = 0;
+
+       while (psi_plist_get(PSI_G(blacklist).decls, i++, &blacklisted)) {
+               if (!fnmatch(blacklisted, name, 0)) {
+                       return true;
+               }
+       }
+       return false;
+}
+

diff --git a/src/types/decl.h b/src/types/decl.h
index 1ca56d50128feeb7b20f44c6720242d816e5dca3..0ef42bda287b7a616bd8df3a5c56e8539eb31708 100644 (file)
--- a/src/types/decl.h
+++ b/src/types/decl.h
@@ -51,4 +51,6 @@ static inline struct psi_decl_arg *psi_decl_get_arg(struct psi_decl *decl, struc
        return psi_decl_arg_get_by_var(var, decl->args, decl->func);
 }
 
+bool psi_decl_is_blacklisted(const char *name);
+
 #endif

diff --git a/src/types/impl_val.h b/src/types/impl_val.h
index 8e119cd36864039b888c91cdfb847623e2adc548..1e6c119f06e61974c2b4d48c76fd1f89c9ccd38f 100644 (file)
--- a/src/types/impl_val.h
+++ b/src/types/impl_val.h
@@ -35,16 +35,12 @@ typedef struct zend_fcall {
 } zend_fcall;
 
 typedef union impl_val {
-       char cval;
        int8_t i8;
        uint8_t u8;
-       short sval;
        int16_t i16;
        uint16_t u16;
-       int ival;
        int32_t i32;
        uint32_t u32;
-       long lval;
        int64_t i64;
        uint64_t u64;
        float fval;