__int128 support

diff --git a/m4/psi/psi_type.m4 b/m4/psi/psi_type.m4
index 8dad63369bdeab31b84bb97c55e10672aec75700..8f2956f96bb7dc692027d0144f5dcebaefb0fdf7 100644 (file)
--- a/m4/psi/psi_type.m4
+++ b/m4/psi/psi_type.m4
@@ -68,7 +68,7 @@ AC_DEFUN(PSI_STDTYPE, [
        ifdef(AS_TR_CPP(AC_TYPE_$1), AS_TR_CPP(AC_TYPE_$1))
        PSI_CHECK_SIZEOF($1)
        if PSI_SH_TEST_SIZEOF($1); then
-               m4_case([$1],
+               m4_case(ifelse(,[$2],[$1],[$2]),
                [bool],[psi_add_stdtype "{PSI_T_BOOL, \"bool\", NULL}"],
                [float],[psi_add_stdtype "{PSI_T_FLOAT, \"float\", NULL}"],
                [double],[psi_add_stdtype "{PSI_T_DOUBLE, \"double\", NULL}"],
@@ -255,4 +255,14 @@ AC_DEFUN(PSI_CHECK_STD_TYPES, [
        PSI_STDTYPE(long long unsigned int, uint)
        dnl this must come after the check for "unsigned long long int"; autoconf, wth?
        PSI_STDTYPE(long long int, int)
+       
+       AC_CHECK_TYPE(__int128, [
+               AC_DEFINE([HAVE_INT128], [1], [ ])
+               AC_CHECK_ALIGNOF(__int128)
+               PSI_STDTYPE(__int128, int)
+               PSI_STDTYPE(signed __int128, int)
+               PSI_STDTYPE(unsigned __int128, uint)
+       ])
+       
+       PSI_STDTYPE(_Float128)
 ])

diff --git a/php_psi.h b/php_psi.h
index c0d0ae6eabff6ba1bb26d3ef66366a2025704e06..7279ff5abcc35316cf7dce4af1494aa0cf58a8a1 100644 (file)
--- a/php_psi.h
+++ b/php_psi.h
@@ -75,6 +75,7 @@ ZEND_BEGIN_MODULE_GLOBALS(psi)
        char *engine;
        char *directory;
        char *search_path;
+       struct psi_context_ops *ops;
        struct psi_context *context;
        struct {
                struct psi_plist *decls;

diff --git a/src/context.h b/src/context.h
index ae79f4bd6137f6b40590a549f8672227f7647259..2cbe6d28afa1d1295765c0da2939c2e41daa6e85 100644 (file)
--- a/src/context.h
+++ b/src/context.h
@@ -43,6 +43,8 @@ enum psi_context_query {
 };
 
 struct psi_context_ops {
+       ZEND_RESULT_CODE (*load)(void);
+       void (*free)(void);
        void (*init)(struct psi_context *C);
        void (*dtor)(struct psi_context *C);
        zend_function_entry *(*compile)(struct psi_context *C);

diff --git a/src/libffi.c b/src/libffi.c
index 1569693ee559e883e0c573de46f39124dc768281..6935ef9c7f760cd4df46cef545169f20c76bf9cb 100644 (file)
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -105,6 +105,11 @@ static void psi_ffi_prep_va(ffi_cif *base, ffi_cif *signature, size_t argc, size
        assert(FFI_OK == rc);
 }
 
+#if HAVE_INT128
+static ffi_type *ffi_type_sint128;
+static ffi_type *ffi_type_uint128;
+#endif
+
 static inline ffi_type *psi_ffi_decl_arg_type(struct psi_decl_arg *darg);
 
 static inline ffi_type *psi_ffi_token_type(token_t t) {
@@ -130,6 +135,12 @@ static inline ffi_type *psi_ffi_token_type(token_t t) {
                return &ffi_type_sint64;
        case PSI_T_UINT64:
                return &ffi_type_uint64;
+#if HAVE_INT128
+       case PSI_T_INT128:
+               return ffi_type_sint128;
+       case PSI_T_UINT128:
+               return ffi_type_uint128;
+#endif
        case PSI_T_BOOL:
                return &ffi_type_uchar;
        case PSI_T_ENUM:
@@ -698,7 +709,43 @@ static void *psi_ffi_query(struct psi_context *C, enum psi_context_query q, void
        return NULL;
 }
 
+static ZEND_RESULT_CODE psi_ffi_load()
+{
+#if HAVE_INT128
+       ffi_type *i128, *u128;
+
+       i128 = calloc(1, 3*sizeof(ffi_type));
+       i128->type = FFI_TYPE_STRUCT;
+       i128->size = 0;
+       i128->elements = (ffi_type **) (i128 + 1);
+       i128->elements[0] = &ffi_type_sint64;
+       i128->elements[1] = &ffi_type_sint64;
+
+       ffi_type_sint128 = i128;
+
+       u128 = calloc(1, 3*sizeof(ffi_type));
+       u128->type = FFI_TYPE_STRUCT;
+       u128->size = 0;
+       u128->elements = (ffi_type **) (u128 + 1);
+       u128->elements[0] = &ffi_type_uint64;
+       u128->elements[1] = &ffi_type_uint64;
+
+       ffi_type_uint128 = u128;
+#endif
+       return SUCCESS;
+}
+
+static void psi_ffi_free()
+{
+#if HAVE_INT128
+       free(ffi_type_sint128);
+       free(ffi_type_uint128);
+#endif
+}
+
 static struct psi_context_ops ops = {
+       psi_ffi_load,
+       psi_ffi_free,
        psi_ffi_init,
        psi_ffi_dtor,
        psi_ffi_compile,

diff --git a/src/libjit.c b/src/libjit.c
index ceafb3184c438f5f7f626e852b351df0324e9224..eaf3b164e4bff18c762d799df84919416aabbb0d 100644 (file)
--- a/src/libjit.c
+++ b/src/libjit.c
@@ -32,6 +32,11 @@
 
 #include <jit/jit.h>
 
+#if HAVE_INT128
+static jit_type_t jit_type_llong;
+static jit_type_t jit_type_ullong;
+#endif
+
 static inline jit_type_t psi_jit_decl_arg_type(struct psi_decl_arg *darg);
 
 static inline jit_type_t psi_jit_token_type(token_t t)
@@ -58,6 +63,12 @@ static inline jit_type_t psi_jit_token_type(token_t t)
                return jit_type_long;
        case PSI_T_UINT64:
                return jit_type_ulong;
+#if HAVE_INT128
+       case PSI_T_INT128:
+               return jit_type_llong;
+       case PSI_T_UINT128:
+               return jit_type_ullong;
+#endif
        case PSI_T_BOOL:
                return jit_type_sys_bool;
        case PSI_T_ENUM:
@@ -643,7 +654,31 @@ static void *psi_jit_query(struct psi_context *C, enum psi_context_query q,
        return NULL;
 }
 
+static ZEND_RESULT_CODE psi_jit_load(void)
+{
+#if HAVE_INT128
+       jit_type_t ll_fields[2], ull_fields[2];
+
+       ll_fields[0] = ll_fields[1] = jit_type_long;
+       jit_type_llong = jit_type_create_struct(ll_fields, 2, 1);
+
+       ull_fields[0] = ull_fields[1] = jit_type_ulong;
+       jit_type_ullong = jit_type_create_struct(ull_fields, 2, 1);
+#endif
+       return SUCCESS;
+}
+
+static void psi_jit_free(void)
+{
+#if HAVE_INT128
+       jit_type_free(jit_type_llong);
+       jit_type_free(jit_type_ullong);
+#endif
+}
+
 static struct psi_context_ops ops = {
+       psi_jit_load,
+       psi_jit_free,
        psi_jit_init,
        psi_jit_dtor,
        psi_jit_compile,

diff --git a/src/marshal.c b/src/marshal.c
index 959291a31fb914f822205b34e1a54153766e950e..55feb3c254127ade7ad584110000dc88989ca36c 100644 (file)
--- a/src/marshal.c
+++ b/src/marshal.c
@@ -195,6 +195,10 @@ static inline impl_val *psi_val_boolval(impl_val *tmp, token_t real_type, zend_b
        case PSI_T_UINT32:              tmp->u32 = boolval;             break;
        case PSI_T_INT64:               tmp->i64 = boolval;             break;
        case PSI_T_UINT64:              tmp->u64 = boolval;             break;
+#ifdef HAVE_INT128
+       case PSI_T_INT128:              tmp->i128 = boolval;    break;
+       case PSI_T_UINT128:             tmp->u128 = boolval;    break;
+#endif
        case PSI_T_FLOAT:               tmp->fval = boolval;    break;
        case PSI_T_DOUBLE:              tmp->dval = boolval;    break;
 #ifdef HAVE_LONG_DOUBLE
@@ -222,14 +226,52 @@ impl_val *psi_let_boolval(impl_val *tmp, struct psi_decl_arg *spec, token_t impl
        return psi_val_boolval(tmp, real_type, boolval);
 }
 
-# define RETVAL_LONG_U64(V) \
-               if (V > ZEND_LONG_MAX) { \
-                       char d[24] = {0}; \
-                       RETVAL_STRING(zend_print_ulong_to_buf(&d[22], V)); \
+static inline char *psi_u128_to_buf(char *buf, unsigned __int128 u128)
+{
+       for (*buf = 0; u128 > 0; u128 /= 10) {
+               *--buf = ((u128 % 10) + '0') & 0xff;
+       }
+       return buf;
+}
+
+static inline char *psi_i128_to_buf(char *buf, __int128 i128)
+{
+       if (i128 < 0) {
+               char *res = psi_u128_to_buf(buf, ~((unsigned __int128) i128) + 1);
+
+               *--res = '-';
+               return res;
+       }
+       return psi_u128_to_buf(buf, i128);
+}
+
+#if HAVE_INT128
+# define RETVAL_LONG_STR(V, s) do {\
+               char buf[0x30] = {0}; \
+               if (s && V >= ZEND_LONG_MIN && V <= ZEND_LONG_MAX) { \
+                       RETVAL_LONG(V); \
+               } else if (!s && V <= ZEND_LONG_MAX) { \
+                       RETVAL_LONG(V); \
+               } else if (!s && V <= ZEND_ULONG_MAX) { \
+                       RETVAL_STRING(zend_print_ulong_to_buf(&buf[sizeof(buf) - 1], V)); \
+               } else if (s && V >= INT128_MIN && V <= INT128_MAX) { \
+                       RETVAL_STRING(psi_i128_to_buf(&buf[sizeof(buf) - 1], V)); \
                } else { \
+                       RETVAL_STRING(psi_u128_to_buf(&buf[sizeof(buf) - 1], V)); \
+               } \
+       } while (0)
+#else
+# define RETVAL_LONG_STR(V, s) do {\
+               char buf[0x20] = {0}; \
+               if (s && V >= ZEND_LONG_MIN && V <= ZEND_LONG_MAX) { \
                        RETVAL_LONG(V); \
-               }
-
+               } else if (!s && V <= ZEND_LONG_MAX) { \
+                       RETVAL_LONG(V); \
+               } else { \
+                       RETVAL_STRING(zend_print_ulong_to_buf(&buf[sizeof(buf) - 1], V)); \
+               } \
+       } while (0)
+#endif
 /*
  * set $ivar = to_int(*dvar)
  */
@@ -248,7 +290,11 @@ void psi_set_to_int(zval *return_value, struct psi_set_exp *set, impl_val *ret_v
        case PSI_T_INT32:               RETVAL_LONG(v->i32);                            break;
        case PSI_T_UINT32:              RETVAL_LONG(v->u32);                            break;
        case PSI_T_INT64:               RETVAL_LONG(v->i64);                            break;
-       case PSI_T_UINT64:              RETVAL_LONG_U64(v->u64);                        break;
+       case PSI_T_UINT64:              RETVAL_LONG_STR(v->u64, 0);                     break;
+#ifdef HAVE_INT128
+       case PSI_T_INT128:              RETVAL_LONG_STR(v->i128, 1);            break;
+       case PSI_T_UINT128:             RETVAL_LONG_STR(v->u128, 0);            break;
+#endif
        case PSI_T_FLOAT:
                RETVAL_DOUBLE((double) v->fval);
                convert_to_long(return_value);
@@ -278,6 +324,10 @@ static inline impl_val *psi_val_intval(impl_val *tmp, token_t real_type, zend_lo
        case PSI_T_UINT32:              tmp->u32 = intval;              break;
        case PSI_T_INT64:               tmp->i64 = intval;              break;
        case PSI_T_UINT64:              tmp->u64 = intval;              break;
+#if HAVE_INT128
+       case PSI_T_INT128:              tmp->i128 = intval;             break;
+       case PSI_T_UINT128:             tmp->u128 = intval;             break;
+#endif
        case PSI_T_FLOAT:               tmp->fval = intval;             break;
        case PSI_T_DOUBLE:              tmp->dval = intval;             break;
 #ifdef HAVE_LONG_DOUBLE
@@ -289,6 +339,85 @@ static inline impl_val *psi_val_intval(impl_val *tmp, token_t real_type, zend_lo
        return tmp;
 }
 
+#if HAVE_INT128
+void psi_strto_i128(char *ptr, char *end, token_t real_type, impl_val *val) {
+       unsigned __int128 i = 0;
+       bool oct = false, hex = false, sign = false;
+
+       if (*ptr == '+') {
+               ++ptr;
+       } else if (*ptr == '-') {
+               sign = true;
+               ++ptr;
+       } else if (*ptr == '\\') {
+               switch (*++ptr) {
+               case 'x':
+                       hex = true;
+                       ++ptr;
+                       break;
+               case '0':case '1':case '2':case '3':case '4':case '5':case '6':case '7':
+                       oct = true;
+                       break;
+               default:
+                       goto fail;
+               }
+       }
+       while (ptr < end) {
+               switch (*ptr) {
+               case '8':case '9':
+                       if (oct) {
+                               goto fail;
+                       }
+                       /* no break */
+               case '0':case '1':case '2':case '3':case '4':case '5':case '6':case '7':
+                       if (oct) {
+                               i <<= 3;
+                       } else if (hex) {
+                               i <<= 4;
+                       } else {
+                               i *= 10;
+                       }
+                       i += *ptr - '0';
+                       break;
+               case 'a':case 'b':case 'c':case 'd':case 'e':case 'f':
+                       if (!hex) {
+                               goto fail;
+                       }
+                       i <<= 4;
+                       i += 10 + (*ptr - 'a');
+                       break;
+               case 'A':case 'B':case 'C':case 'D':case 'E':case 'F':
+                       if (!hex) {
+                               goto fail;
+                       }
+                       i <<= 4;
+                       i += 10 + (*ptr - 'A');
+                       break;
+               default:
+               fail:
+                       zend_error(E_WARNING, "A non well formed numeric value encountered");
+                       goto stop;
+               }
+               ++ptr;
+       }
+
+stop:
+       if (real_type == PSI_T_UINT128) {
+               if (sign) {
+                       val->u128 = -i;
+               } else {
+                       val->u128 = i;
+               }
+       } else {
+               if (sign) {
+                       val->i128 = -i;
+               } else {
+                       val->i128 = i;
+               }
+       }
+}
+#endif
+
 /*
  * let dvar = intval($ivar)
  */
@@ -297,8 +426,17 @@ impl_val *psi_let_intval(impl_val *tmp, struct psi_decl_arg *spec, token_t impl_
        zend_long intval;
        token_t real_type = spec ? psi_decl_type_get_real(spec->type)->type : PSI_T_LONG;
 
+
        if (ival && impl_type == PSI_T_INT) {
                intval = ival->zend.lval;
+#if HAVE_INT128
+       } else if ((real_type == PSI_T_UINT128 || real_type == PSI_T_INT128) &&
+                       !((Z_TYPE_P(zvalue) == IS_TRUE || Z_TYPE_P(zvalue) == IS_FALSE || Z_TYPE_P(zvalue) == IS_LONG || Z_TYPE_P(zvalue) == IS_DOUBLE || Z_TYPE_P(zvalue) == IS_NULL))) {
+               zend_string *str = zval_get_string(zvalue);
+               psi_strto_i128(str->val, str->val + str->len, real_type, tmp);
+               zend_string_release(str);
+               return tmp;
+#endif
        } else {
                intval = zval_get_long(zvalue);
        }
@@ -329,6 +467,10 @@ void psi_set_to_float(zval *return_value, struct psi_set_exp *set, impl_val *ret
        case PSI_T_UINT32:              RETVAL_DOUBLE((double) v->u32);         break;
        case PSI_T_INT64:               RETVAL_DOUBLE((double) v->i64);         break;
        case PSI_T_UINT64:              RETVAL_DOUBLE((double) v->u64);         break;
+#if HAVE_INT128
+       case PSI_T_INT128:              RETVAL_DOUBLE((double) v->i128);        break;
+       case PSI_T_UINT128:             RETVAL_DOUBLE((double) v->u128);        break;
+#endif
        EMPTY_SWITCH_DEFAULT_CASE();
        }
 }
@@ -343,6 +485,10 @@ static inline impl_val *psi_val_floatval(impl_val *tmp, token_t real_type, doubl
        case PSI_T_UINT32:              tmp->u32 = floatval;    break;
        case PSI_T_INT64:               tmp->i64 = floatval;    break;
        case PSI_T_UINT64:              tmp->u64 = floatval;    break;
+#if HAVE_INT128
+       case PSI_T_INT128:              tmp->i128 = floatval;   break;
+       case PSI_T_UINT128:             tmp->u128 = floatval;   break;
+#endif
        case PSI_T_FLOAT:               tmp->fval = floatval;   break;
        case PSI_T_DOUBLE:              tmp->dval = floatval;   break;
 #ifdef HAVE_LONG_DOUBLE

diff --git a/src/module.c b/src/module.c
index a657aedd2f2cf95b32699040f4550cfe48629901..10636f918000cea0bdcc14124f09c54f75bf5e75 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -198,9 +198,32 @@ static PHP_FUNCTION(psi_validate_string)
        free(I);
 }
 
-static PHP_MINIT_FUNCTION(psi)
+static ZEND_RESULT_CODE psi_ops_load()
 {
        struct psi_context_ops *ops = NULL;
+#ifdef HAVE_LIBJIT
+       if (!strcasecmp(PSI_G(engine), "jit")) {
+               ops = psi_libjit_ops();
+       } else
+#endif
+#ifdef HAVE_LIBFFI
+               ops = psi_libffi_ops();
+#endif
+
+       if (!ops) {
+               php_error(E_WARNING, "No PSI engine found");
+               return FAILURE;
+       }
+
+       PSI_G(ops) = ops;
+       if (ops->load) {
+               return ops->load();
+       }
+       return SUCCESS;
+}
+
+static PHP_MINIT_FUNCTION(psi)
+{
        zend_class_entry ce = {0};
        unsigned flags = 0;
 
@@ -218,17 +241,7 @@ static PHP_MINIT_FUNCTION(psi)
        psi_object_handlers.free_obj = psi_object_free;
        psi_object_handlers.clone_obj = NULL;
 
-#ifdef HAVE_LIBJIT
-       if (!strcasecmp(PSI_G(engine), "jit")) {
-               ops = psi_libjit_ops();
-       } else
-#endif
-#ifdef HAVE_LIBFFI
-               ops = psi_libffi_ops();
-#endif
-
-       if (!ops) {
-               php_error(E_WARNING, "No PSI engine found");
+       if (SUCCESS != psi_ops_load()) {
                return FAILURE;
        }
 
@@ -242,7 +255,7 @@ static PHP_MINIT_FUNCTION(psi)
        PSI_G(search_path) = pemalloc(strlen(PSI_G(directory)) + strlen(psi_cpp_search) + 1 + 1, 1);
        sprintf(PSI_G(search_path), "%s:%s", PSI_G(directory), psi_cpp_search);
 
-       PSI_G(context) = psi_context_init(NULL, ops, psi_error_wrapper, flags);
+       PSI_G(context) = psi_context_init(NULL, PSI_G(ops), psi_error_wrapper, flags);
        psi_context_build(PSI_G(context), PSI_G(directory));
 
        return SUCCESS;
@@ -256,6 +269,10 @@ static PHP_MSHUTDOWN_FUNCTION(psi)
 
        psi_context_free(&PSI_G(context));
 
+       if (PSI_G(ops)->free) {
+               PSI_G(ops)->free();
+       }
+
        UNREGISTER_INI_ENTRIES();
 
        return SUCCESS;

diff --git a/src/parser.c b/src/parser.c
index aad454662c76db8cda45113826d71f417198c7be..95ddd2d057fd3092682e1594b79ff8ea1b22ab78 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.0.2 on Mon Sep 11 16:12:23 2017 */
+/* Generated by re2c 1.0.2 on Fri Oct 13 16:16:58 2017 */
 #line 1 "src/parser.re"
 /*******************************************************************************
  Copyright (c) 2016, Michael Wallner <mike@php.net>.

diff --git a/src/parser_proc.c b/src/parser_proc.c
index d6777076d745e75baf872470269ad2202c9c7acb..e2a58b068d5a74ff943eacd7b1fb7948250c2efe 100644 (file)
--- a/src/parser_proc.c
+++ b/src/parser_proc.c
@@ -276,16 +276,16 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  169
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   3764
+#define YYLAST   3793
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  128
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  135
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  624
+#define YYNRULES  625
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  879
+#define YYNSTATES  880
 /* 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
@@ -388,28 +388,28 @@ static const unsigned short int yyrline[] =
      828,   840,   841,   845,   855,   864,   876,   879,   882,   886,
      890,   894,   899,   904,   912,   913,   914,   920,   923,   926,
      932,   933,   937,   940,   943,   949,   952,   955,   963,   975,
-     978,   981,   988,   991,  1001,  1004,  1007,  1010,  1011,  1012,
-    1016,  1019,  1022,  1033,  1036,  1042,  1043,  1047,  1048,  1052,
-    1056,  1062,  1063,  1069,  1072,  1078,  1081,  1084,  1090,  1094,
-    1095,  1099,  1100,  1104,  1105,  1112,  1113,  1117,  1124,  1135,
-    1142,  1153,  1160,  1171,  1182,  1196,  1197,  1209,  1212,  1215,
-    1218,  1225,  1228,  1234,  1243,  1255,  1263,  1266,  1276,  1289,
-    1294,  1302,  1312,  1322,  1325,  1329,  1335,  1349,  1366,  1369,
-    1375,  1382,  1392,  1399,  1402,  1408,  1413,  1421,  1425,  1429,
-    1433,  1437,  1441,  1448,  1452,  1456,  1460,  1464,  1468,  1474,
-    1478,  1485,  1488,  1499,  1503,  1507,  1513,  1526,  1539,  1552,
-    1555,  1562,  1565,  1568,  1571,  1577,  1581,  1588,  1591,  1594,
-    1604,  1607,  1613,  1614,  1620,  1623,  1629,  1630,  1640,  1643,
-    1650,  1655,  1660,  1670,  1673,  1679,  1682,  1688,  1695,  1702,
-    1703,  1704,  1705,  1706,  1707,  1708,  1709,  1710,  1714,  1717,
-    1723,  1726,  1729,  1732,  1735,  1741,  1745,  1753,  1754,  1758,
-    1765,  1768,  1771,  1774,  1778,  1781,  1787,  1791,  1799,  1806,
-    1814,  1822,  1823,  1824,  1825,  1826,  1827,  1828,  1829,  1830,
-    1831,  1835,  1838,  1844,  1847,  1853,  1854,  1858,  1861,  1867,
-    1870,  1876,  1883,  1887,  1894,  1897,  1900,  1906,  1913,  1916,
-    1919,  1926,  1931,  1939,  1940,  1941,  1942,  1943,  1944,  1945,
-    1946,  1950,  1953,  1959,  1962,  1968,  1975,  1976,  1980,  1987,
-    1990,  1996,  2004,  2007,  2013
+     978,   981,   984,   991,   994,  1004,  1007,  1010,  1013,  1014,
+    1015,  1019,  1022,  1025,  1036,  1039,  1045,  1046,  1050,  1051,
+    1055,  1059,  1065,  1066,  1072,  1075,  1081,  1084,  1087,  1093,
+    1097,  1098,  1102,  1103,  1107,  1108,  1115,  1116,  1120,  1127,
+    1138,  1145,  1156,  1163,  1174,  1185,  1199,  1200,  1212,  1215,
+    1218,  1221,  1228,  1231,  1237,  1246,  1258,  1266,  1269,  1279,
+    1292,  1297,  1305,  1315,  1325,  1328,  1332,  1338,  1352,  1369,
+    1372,  1378,  1385,  1395,  1402,  1405,  1411,  1416,  1424,  1428,
+    1432,  1436,  1440,  1444,  1451,  1455,  1459,  1463,  1467,  1471,
+    1477,  1481,  1488,  1491,  1502,  1506,  1510,  1516,  1529,  1542,
+    1555,  1558,  1565,  1568,  1571,  1574,  1580,  1584,  1591,  1594,
+    1597,  1607,  1610,  1616,  1617,  1623,  1626,  1632,  1633,  1643,
+    1646,  1653,  1658,  1663,  1673,  1676,  1682,  1685,  1691,  1698,
+    1705,  1706,  1707,  1708,  1709,  1710,  1711,  1712,  1713,  1717,
+    1720,  1726,  1729,  1732,  1735,  1738,  1744,  1748,  1756,  1757,
+    1761,  1768,  1771,  1774,  1777,  1781,  1784,  1790,  1794,  1802,
+    1809,  1817,  1825,  1826,  1827,  1828,  1829,  1830,  1831,  1832,
+    1833,  1834,  1838,  1841,  1847,  1850,  1856,  1857,  1861,  1864,
+    1870,  1873,  1879,  1886,  1890,  1897,  1900,  1903,  1909,  1916,
+    1919,  1922,  1929,  1934,  1942,  1943,  1944,  1945,  1946,  1947,
+    1948,  1949,  1953,  1956,  1962,  1965,  1971,  1978,  1979,  1983,
+    1990,  1993,  1999,  2007,  2010,  2016
 };
 #endif
 
@@ -475,101 +475,101 @@ static const char *const yytname[] =
 };
 #endif
 
-#define YYPACT_NINF -692
-#define YYTABLE_NINF -623
+#define YYPACT_NINF -693
+#define YYTABLE_NINF -624
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const short int yypact[] =
 {
-     505,  -692,  -692,  -692,  -692,  -692,   108,  -692,  -692,  2618,
-    1668,   731,  -692,  -692,  1719,   552,  3473,  3473,  3473,  2425,
-      37,   261,    10,  -692,  1440,  1894,    71,   505,  -692,  -692,
-    -692,  -692,  -692,  2844,  -692,  -692,  -692,  -692,   143,   119,
-    -692,  -692,  -692,    65,  -692,   -23,  -692,  -692,    47,    84,
-     118,  -692,  -692,  -692,  -692,   140,  -692,   146,  -692,  -692,
-    -692,  -692,  -692,   831,  -692,    91,   100,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  2957,   -10,  -692,
-    -692,  -692,  -692,  3473,  3473,  3473,  2685,  -692,   104,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,   682,  -692,  -692,  -692,  -692,   124,   957,   957,
-      24,  -692,   682,  2505,  2618,  3473,  3473,  2120,   134,  -692,
-    -692,  -692,   158,  3473,   164,   164,    53,    53,   157,  -692,
-    -692,   178,   180,  -692,    91,   183,  -692,  -692,   190,  1894,
-     173,   175,  -692,   199,  -692,  2459,  1369,   -23,   173,  -692,
-    -692,   185,  -692,   192,  3473,  -692,   221,  -692,    67,  -692,
-    -692,   143,  -692,  -692,   197,   201,  2651,  2651,  3473,   181,
-    3473,  -692,  -692,    91,  -692,  -692,  -692,  -692,  -692,  -692,
-    2844,  -692,  -692,  -692,  -692,  -692,  -692,  -692,   110,   957,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,   957,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,    48,  2505,  -692,  -692,  -692,  -692,  3070,  2505,   202,
-    3627,  -692,   205,   133,  -692,   137,  -692,  -692,  -692,  -692,
-     198,   204,   204,    25,    25,  3183,   206,  -692,   173,  1209,
-    -692,   181,   209,   207,   211,  -692,  2053,  -692,    91,   185,
-    -692,  -692,  -692,   241,  -692,  -692,   222,  -692,    28,  2768,
-    2844,   129,  -692,  -692,   144,   215,    78,  -692,  2844,  2166,
-    2844,  3473,  2844,  -692,  -692,    12,  -692,  -692,  -692,  -692,
-    -692,  2392,  -692,   223,  3473,   247,  -692,  3473,   250,  -692,
-    -692,  -692,  -692,   458,   262,  -692,  2948,  3473,  -692,  -692,
-    2505,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  2505,
-    2505,  -692,   253,  1397,  2844,  2844,  -692,  -692,  -692,  -692,
-      91,  -692,  1601,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  1083,  -692,   165,   535,  -692,  -692,  -692,  -692,
-    -692,  -692,  1488,  -692,  2392,  -692,  3603,  -692,  -692,  3473,
-    -692,  -692,  -692,    26,  2957,    91,   192,   185,  1635,   185,
-    2313,  2392,  3473,  -692,   246,   256,  3651,   248,   258,  -692,
-     259,   268,   254,   273,    51,  -692,   274,   276,  -692,  -692,
-    -692,  2826,  -692,   260,  2844,  3242,    91,   277,  -692,  -692,
-    -692,   279,  3627,   283,   275,  3554,  -692,   292,  2120,   285,
-    -692,  -692,  2731,  1331,  3473,   164,   164,  -692,  -692,  3473,
-      90,  -692,  -692,  -692,   287,  -692,  3651,  -692,  -692,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,   286,
-     147,  -692,    10,  -692,   289,   731,   290,  3061,  -692,  -692,
-    2392,  2392,   291,  -692,  -692,  3183,  -692,    28,   293,  -692,
-    -692,   296,  3651,  -692,  1714,  -692,  2166,  -692,  2844,  -692,
-      10,  2844,  -692,  3473,  3355,  -692,  -692,  -692,  -692,  -692,
-    -692,   297,   300,  -692,  -692,  -692,  -692,  2505,  2505,   301,
-    -692,    33,   302,  -692,   285,   204,   204,   306,  -692,   390,
-     305,   390,   309,  2392,  -692,  3579,  -692,  -692,   185,   185,
-     127,   216,   196,   318,  3651,  -692,  -692,  -692,  -692,   319,
-    2279,  -692,   320,  2844,   182,  -692,   323,   247,   325,   957,
-    3414,  3627,  3675,   328,   324,   330,  2844,   329,   302,  2844,
-    2844,  -692,  -692,   390,  -692,    10,  1601,  -692,  2392,  -692,
-    -692,   318,  -692,  -692,  -692,  -692,   331,  2392,    10,  -692,
-    1827,   333,   337,  -692,   267,  -692,  -692,  -692,   338,   335,
-     347,   285,   339,  -692,   343,  -692,    27,  -692,  3699,    10,
-    3336,   341,   348,  -692,   342,  -692,  -692,   139,  -692,   350,
-     349,  -692,  2844,  -692,   361,   354,  2392,  1714,   355,  -692,
-    2166,  -692,  -692,   358,   366,   367,   285,   362,  1940,  3174,
-     246,  -692,  -692,  -692,   374,  2279,  -692,  -692,   375,   379,
-    -692,   380,   383,   384,  -692,  -692,  1714,  -692,   392,  -692,
-     390,   391,  2166,  -692,   394,  -692,  -692,  -692,  -692
+     694,  -693,  -693,  -693,  -693,  -693,    45,  -693,  -693,  2647,
+    1697,  1496,  -693,  -693,   436,  1370,  3502,  3502,  3502,  2454,
+      49,   270,    55,  -693,  1470,  1923,   141,   694,  -693,  -693,
+    -693,  -693,  -693,  2873,  -693,  -693,  -693,  -693,   157,   146,
+    -693,  -693,  -693,   154,  -693,   -54,  -693,  -693,    54,   145,
+     155,  -693,  -693,  -693,  -693,   159,  -693,   166,  -693,  -693,
+    -693,  -693,  -693,   832,  -693,   160,   126,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  2986,    -2,  -693,
+    -693,  -693,  -693,  3502,  3502,  3502,    72,  -693,    71,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,   460,  -693,  -693,  -693,  -693,   189,   958,   958,
+      20,  -693,   460,  2534,  2647,  3502,  3502,  2149,   193,  -693,
+    -693,  -693,   195,  3502,   194,   194,    38,    38,   196,  -693,
+    -693,   202,   207,  -693,   160,   210,  -693,  -693,   215,  1923,
+     211,   213,  -693,   227,  -693,  2488,  1398,   -54,   211,  -693,
+    -693,   214,  -693,   222,  3502,  -693,   249,  -693,   164,  -693,
+    -693,  -693,   239,  -693,  -693,   224,   229,  2680,  2680,  3502,
+     190,  3502,  -693,  -693,   160,  -693,  -693,  -693,  -693,  -693,
+    -693,  2873,  -693,  -693,  -693,  -693,  -693,  -693,  -693,   140,
+     958,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,   958,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,   191,  2534,  -693,  -693,  -693,  -693,  3099,  2534,
+     230,  3656,  -693,   232,    83,  -693,    88,  -693,  -693,  -693,
+    -693,   238,   228,   228,    56,    56,  3212,   250,  -693,   211,
+    1210,  -693,   190,   259,   262,   263,  -693,  2082,  -693,   160,
+     214,  -693,  -693,  -693,   289,  -693,  -693,   271,  -693,    17,
+    2714,  2873,   100,  -693,  -693,   131,   256,   149,  -693,  2873,
+    2195,  2873,  3502,  2873,  -693,  -693,    18,  -693,  -693,  -693,
+    -693,  -693,  2421,  -693,   267,  3502,   269,  -693,  3502,   273,
+    -693,  -693,  -693,  -693,   745,   279,  -693,  2977,  3502,  -693,
+    -693,  2534,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    2534,  2534,  -693,   274,  1429,  2873,  2873,  -693,  -693,  -693,
+    -693,   160,  -693,  1630,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  1084,  -693,   173,   301,  -693,  -693,  -693,
+    -693,  -693,  -693,  1517,  -693,  2421,  -693,  3632,  -693,  -693,
+    3502,  -693,  -693,  -693,    26,  2986,   160,   222,   214,  1664,
+     214,  2342,  2421,  3502,  -693,   268,   278,  3680,   272,   288,
+    -693,   293,   302,   287,   300,   163,  -693,   303,   306,  -693,
+    -693,  -693,  2855,  -693,   305,  2873,  3271,   160,   310,  -693,
+    -693,  -693,   311,  3656,   312,   299,  3583,  -693,   314,  2149,
+     313,  -693,  -693,  2760,  1332,  3502,   194,   194,  -693,  -693,
+    3502,    75,  -693,  -693,  -693,   315,  -693,  3680,  -693,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,
+     316,   142,  -693,    55,  -693,   319,  1496,   320,  3090,  -693,
+    -693,  2421,  2421,   327,  -693,  -693,  3212,  -693,    17,   329,
+    -693,  -693,   331,  3680,  -693,  1743,  -693,  2195,  -693,  2873,
+    -693,    55,  2873,  -693,  3502,  3384,  -693,  -693,  -693,  -693,
+    -693,  -693,   332,   333,  -693,  -693,  -693,  -693,  2534,  2534,
+     335,  -693,    28,   337,  -693,   313,   228,   228,   339,  -693,
+     528,   338,   528,   307,  2421,  -693,  3608,  -693,  -693,   214,
+     214,   104,   265,   383,   343,  3680,  -693,  -693,  -693,  -693,
+     345,  2308,  -693,   344,  2873,   167,  -693,   346,   269,   347,
+     958,  3443,  3656,  3704,   356,   348,   350,  2873,   354,   337,
+    2873,  2873,  -693,  -693,   528,  -693,    55,  1630,  -693,  2421,
+    -693,  -693,   343,  -693,  -693,  -693,  -693,   355,  2421,    55,
+    -693,  1856,   359,   358,  -693,   297,  -693,  -693,  -693,   363,
+     362,   378,   313,   370,  -693,   374,  -693,    27,  -693,  3728,
+      55,  3365,   372,   376,  -693,   373,  -693,  -693,   127,  -693,
+     380,   379,  -693,  2873,  -693,   390,   384,  2421,  1743,   382,
+    -693,  2195,  -693,  -693,   385,   395,   401,   313,   396,  1969,
+    3203,   268,  -693,  -693,  -693,   397,  2308,  -693,  -693,   398,
+     402,  -693,   399,   403,   404,  -693,  -693,  1743,  -693,   405,
+    -693,   528,   406,  2195,  -693,   407,  -693,  -693,  -693,  -693
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -578,131 +578,131 @@ static const short int yypact[] =
 static const unsigned short int yydefact[] =
 {
      277,   405,   402,   406,   400,   401,   403,   397,   398,     0,
-     396,     0,   282,   281,     0,     0,     0,     0,   509,     0,
-       0,     0,   622,   283,     0,     0,     0,   278,   279,   285,
-     284,   286,   290,   520,   388,   390,   389,   395,   409,   420,
-     394,   287,   289,     0,   288,   425,   443,   445,   446,     0,
-       0,   455,   292,   291,   293,     0,   294,     0,   404,   399,
-      33,    34,   610,   571,    24,   520,   526,    39,    38,    37,
+     396,     0,   282,   281,     0,     0,     0,     0,   510,     0,
+       0,     0,   623,   283,     0,     0,     0,   278,   279,   285,
+     284,   286,   290,   521,   388,   390,   389,   395,   409,   421,
+     394,   287,   289,     0,   288,   426,   444,   446,   447,     0,
+       0,   456,   292,   291,   293,     0,   294,     0,   404,   399,
+      33,    34,   611,   572,    24,   521,   527,    39,    38,    37,
       35,    36,    32,    31,    25,    29,    28,    26,    27,    40,
-     579,   578,   576,   574,   575,   577,   573,   572,   580,    30,
-     608,   606,   605,   607,   604,   603,   456,     0,   522,   524,
-      41,    42,   396,     0,     0,     0,     0,   444,   431,   387,
+     580,   579,   577,   575,   576,   578,   574,   573,   581,    30,
+     609,   607,   606,   608,   605,   604,   457,     0,   523,   525,
+      41,    42,   396,     0,     0,     0,     0,   445,   432,   387,
      296,   307,   304,   306,   308,   309,   320,   317,   318,   315,
      321,   316,     0,   319,   310,   311,   312,     0,   337,   337,
-       0,   300,     0,     0,     0,   509,   509,     0,     0,   372,
-     377,   465,   376,     0,   515,   515,   391,   392,   393,   506,
+       0,   300,     0,     0,     0,   510,   510,     0,     0,   372,
+     377,   466,   376,     0,   516,   516,   391,   392,   393,   507,
      358,   406,   397,   361,     0,     0,   357,   386,     0,     0,
-       0,     0,   624,     0,   623,   396,     0,   425,     0,     1,
-     280,   517,   466,     0,   521,   410,   414,   412,   416,   407,
-     421,   409,   408,   429,     0,     0,   457,   457,     0,     0,
-       0,   521,   527,   520,   468,   523,   525,   391,   392,   393,
-       0,   430,   323,   324,   325,   327,   328,   326,   322,   337,
-     302,   297,    68,    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,   158,   159,
-      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,   108,   106,   107,   105,   103,   104,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   160,   133,   134,   135,   136,   137,
-     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,   151,   152,   156,   153,   154,   155,   157,
-     339,   305,   338,   298,   313,   314,   299,   322,   301,   347,
-     348,     0,     0,    22,    23,    20,    21,     0,     0,   350,
-     303,   349,   456,   391,   508,   392,   507,   373,   369,   378,
-       0,     0,     0,     0,     0,     0,     0,   295,     0,     0,
-     435,     0,     0,     0,     0,   436,     0,   470,   520,   517,
-     415,   411,   417,   418,   413,   422,     0,   423,   458,     0,
-     520,     0,   459,   461,     0,   485,     0,   483,     0,   622,
-       0,     0,     0,   616,   617,     0,   548,   551,   550,   552,
-     553,     0,   554,     0,     0,   432,   433,     0,     0,   330,
-     340,   505,   504,     0,     0,   500,     0,     0,   345,   342,
-     352,     2,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    13,    12,    14,    15,    16,    17,    18,    19,     0,
-       0,   370,     0,     0,     0,     0,   473,   472,   474,   471,
-     520,   467,   362,   437,   186,   161,   162,   163,   164,   165,
-     166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-     274,   275,   187,   188,   189,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,   210,   211,   212,   213,   214,
-     215,   216,   217,   218,   224,   222,   223,   221,   219,   220,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-     245,   246,   247,   248,   276,   249,   250,   251,   252,   253,
-     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   265,   266,   267,   268,   272,   269,   270,   271,   273,
-     441,   442,     0,   439,     0,     0,   371,   424,   496,   494,
-     493,   495,     0,   518,     0,   497,     0,   487,   498,     0,
-     469,   419,   427,     0,   464,     0,   462,   517,     0,   517,
-       0,     0,     0,   482,     0,     0,   599,     0,     0,   598,
-      42,     0,     0,     0,     0,   619,     0,     0,   593,   528,
-     549,     0,   454,     0,     0,   331,   520,     0,   501,   503,
-     341,     0,   354,     0,   353,     0,   343,     0,     0,   511,
-     381,   374,   382,     0,   383,   515,   515,   380,   379,     0,
-     496,   366,   367,   368,     0,   364,   363,   438,   440,   529,
-     541,   542,   543,   544,   540,   545,   546,   547,   539,     0,
-       0,   533,   622,   538,    24,     0,     0,     0,   491,   519,
-       0,     0,     0,   428,   426,   463,   449,     0,     0,   460,
-     447,     0,   486,   484,     0,   555,   622,   597,     0,   537,
-     622,     0,   618,     0,   594,   591,   615,   453,   434,   332,
-     335,     0,   333,   502,   499,   346,   351,     0,     0,     0,
-     375,     0,   478,   475,   511,     0,     0,     0,   356,     0,
-       0,     0,   535,     0,   489,     0,   490,   451,   517,   517,
-     496,     0,    31,    30,   561,   566,   562,   564,   565,    41,
-       0,   600,   611,     0,     0,   620,   610,   596,     0,   337,
-       0,   355,   344,     0,   512,     0,     0,     0,   478,   385,
-     384,   452,   530,     0,   534,   622,   362,   488,     0,   450,
-     448,     0,   563,   585,   571,   586,     0,     0,   622,   567,
-     622,     0,     0,   621,     0,   329,   334,   336,     0,     0,
-       0,   511,   479,   476,     0,   531,     0,   536,   492,   622,
-       0,   581,     0,   613,   612,   601,   556,     0,   516,     0,
-       0,   480,     0,   477,     0,     0,     0,     0,     0,   602,
-     622,   609,   592,     0,     0,     0,   511,     0,   587,     0,
-     497,   583,   559,   557,   582,     0,   570,   614,     0,     0,
-     481,     0,     0,   588,   589,   568,     0,   558,     0,   513,
-       0,     0,   622,   584,     0,   532,   569,   590,   514
+       0,     0,   625,     0,   624,   396,     0,   426,     0,     1,
+     280,   518,   467,     0,   522,   411,   415,   413,   417,   410,
+     407,   422,   409,   408,   430,     0,     0,   458,   458,     0,
+       0,     0,   522,   528,   521,   469,   524,   526,   391,   392,
+     393,     0,   431,   323,   324,   325,   327,   328,   326,   322,
+     337,   302,   297,    68,    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,   158,
+     159,    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,   108,   106,   107,   105,   103,
+     104,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,   131,   132,   160,   133,   134,   135,   136,
+     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,   152,   156,   153,   154,   155,
+     157,   339,   305,   338,   298,   313,   314,   299,   322,   301,
+     347,   348,     0,     0,    22,    23,    20,    21,     0,     0,
+     350,   303,   349,   457,   391,   509,   392,   508,   373,   369,
+     378,     0,     0,     0,     0,     0,     0,     0,   295,     0,
+       0,   436,     0,     0,     0,     0,   437,     0,   471,   521,
+     518,   416,   412,   418,   419,   414,   423,     0,   424,   459,
+       0,   521,     0,   460,   462,     0,   486,     0,   484,     0,
+     623,     0,     0,     0,   617,   618,     0,   549,   552,   551,
+     553,   554,     0,   555,     0,     0,   433,   434,     0,     0,
+     330,   340,   506,   505,     0,     0,   501,     0,     0,   345,
+     342,   352,     2,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    13,    12,    14,    15,    16,    17,    18,    19,
+       0,     0,   370,     0,     0,     0,     0,   474,   473,   475,
+     472,   521,   468,   362,   438,   186,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   274,   275,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
+     214,   215,   216,   217,   218,   224,   222,   223,   221,   219,
+     220,   225,   226,   227,   228,   229,   230,   231,   232,   233,
+     234,   235,   236,   237,   238,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   276,   249,   250,   251,   252,
+     253,   254,   255,   256,   257,   258,   259,   260,   261,   262,
+     263,   264,   265,   266,   267,   268,   272,   269,   270,   271,
+     273,   442,   443,     0,   440,     0,     0,   371,   425,   497,
+     495,   494,   496,     0,   519,     0,   498,     0,   488,   499,
+       0,   470,   420,   428,     0,   465,     0,   463,   518,     0,
+     518,     0,     0,     0,   483,     0,     0,   600,     0,     0,
+     599,    42,     0,     0,     0,     0,   620,     0,     0,   594,
+     529,   550,     0,   455,     0,     0,   331,   521,     0,   502,
+     504,   341,     0,   354,     0,   353,     0,   343,     0,     0,
+     512,   381,   374,   382,     0,   383,   516,   516,   380,   379,
+       0,   497,   366,   367,   368,     0,   364,   363,   439,   441,
+     530,   542,   543,   544,   545,   541,   546,   547,   548,   540,
+       0,     0,   534,   623,   539,    24,     0,     0,     0,   492,
+     520,     0,     0,     0,   429,   427,   464,   450,     0,     0,
+     461,   448,     0,   487,   485,     0,   556,   623,   598,     0,
+     538,   623,     0,   619,     0,   595,   592,   616,   454,   435,
+     332,   335,     0,   333,   503,   500,   346,   351,     0,     0,
+       0,   375,     0,   479,   476,   512,     0,     0,     0,   356,
+       0,     0,     0,   536,     0,   490,     0,   491,   452,   518,
+     518,   497,     0,    31,    30,   562,   567,   563,   565,   566,
+      41,     0,   601,   612,     0,     0,   621,   611,   597,     0,
+     337,     0,   355,   344,     0,   513,     0,     0,     0,   479,
+     385,   384,   453,   531,     0,   535,   623,   362,   489,     0,
+     451,   449,     0,   564,   586,   572,   587,     0,     0,   623,
+     568,   623,     0,     0,   622,     0,   329,   334,   336,     0,
+       0,     0,   512,   480,   477,     0,   532,     0,   537,   493,
+     623,     0,   582,     0,   614,   613,   602,   557,     0,   517,
+       0,     0,   481,     0,   478,     0,     0,     0,     0,     0,
+     603,   623,   610,   593,     0,     0,     0,   512,     0,   588,
+       0,   498,   584,   560,   558,   583,     0,   571,   615,     0,
+       0,   482,     0,     0,   589,   590,   569,     0,   559,     0,
+     514,     0,     0,   623,   585,     0,   533,   570,   591,   515
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -692,  -331,  -122,    -4,    93,  -692,  -692,  -692,   401,  -692,
-    -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,  -692,   298,
-    -692,  -692,  -692,  -126,  -692,  -308,  -692,  -692,  -692,  -692,
-    -692,  -357,  -692,  -692,   269,  -220,    22,  -212,  -158,    -9,
-    -692,  -692,  -692,   399,  -692,  -692,   263,  -692,  -692,  -692,
-    -692,   280,  -692,  -692,  -692,  -692,  -624,  -692,  -124,  -692,
-    -140,   419,    32,     0,    45,  -692,  -692,   264,  -464,     8,
-     -33,  -692,  -692,    85,  -337,  -692,  -324,  -692,     4,  -692,
-    -157,  -349,  -692,  -117,  -692,    49,  -692,  -436,  -418,    83,
-    -691,  -125,  -370,   -59,    -1,  -692,   372,  -692,   435,  -692,
-    -281,  -634,  -674,  -692,   102,  -379,  -692,  -392,  -657,    77,
-    -275,  -692,  -692,  -666,  -692,  -692,  -692,  -692,  -692,  -692,
-    -692,  -692,  -692,  -665,  -395,  -369,  -692,  -692,  -692,  -692,
-    -692,  -692,  -236,   -21,  -658
+    -693,  -323,  -129,    -7,   108,  -693,  -693,  -693,   415,  -693,
+    -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,  -693,   322,
+    -693,  -693,  -693,  -126,  -693,  -301,  -693,  -693,  -693,  -693,
+    -693,  -341,  -693,  -693,   282,  -203,    22,  -189,  -156,    -6,
+    -693,  -693,  -693,   423,  -693,  -693,   285,  -693,  -693,  -693,
+    -693,   304,  -693,  -693,  -693,  -693,  -504,  -693,  -135,  -693,
+    -119,   444,    47,     3,    40,  -693,  -693,   281,  -463,     5,
+     -33,  -693,  -693,   105,  -346,  -693,  -305,  -693,     7,  -693,
+    -138,  -342,  -693,  -121,  -693,    52,  -693,  -428,  -418,    80,
+    -692,  -124,  -351,   -51,    -3,  -693,   394,  -693,   473,  -693,
+    -243,  -639,  -682,  -693,   128,  -387,  -693,  -366,  -666,   120,
+    -232,  -693,  -693,  -660,  -693,  -693,  -693,  -693,  -693,  -693,
+    -693,  -693,  -693,  -669,  -395,  -376,  -693,  -693,  -693,  -693,
+    -693,  -693,  -193,   -21,  -664
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const short int yydefgoto[] =
 {
-      -1,   691,   594,   171,   330,   580,    26,    27,    28,    29,
-      30,   127,   128,   129,   130,   336,   131,   132,   133,   209,
-     210,   721,   722,   331,   332,   350,   643,   644,    31,   155,
-     156,   664,   665,    32,   138,   649,   650,   651,    33,    34,
-      35,    36,    37,    38,    39,    40,   179,   381,   384,   182,
-      41,   185,   603,    42,    43,   201,   415,    44,   581,   582,
-     583,    45,    46,    47,   141,    49,    50,   391,   392,    51,
-     595,    52,    53,   457,   458,   653,   777,   812,   143,   396,
-     397,   616,   597,   598,   637,   425,    55,   144,   145,   149,
-     732,   361,   377,   173,   417,    98,    99,    56,    57,   680,
-     681,   617,   682,   683,   405,   406,   407,   851,   852,   853,
-     756,   757,   758,   100,   838,   854,   796,   862,   863,   408,
-     627,   768,   409,   618,   619,   101,   801,   824,   410,   411,
-     412,   624,   625,   621,   164
+      -1,   692,   595,   171,   331,   581,    26,    27,    28,    29,
+      30,   127,   128,   129,   130,   337,   131,   132,   133,   210,
+     211,   722,   723,   332,   333,   351,   644,   645,    31,   155,
+     156,   665,   666,    32,   138,   650,   651,   652,    33,    34,
+      35,    36,    37,    38,    39,    40,   180,   382,   385,   183,
+      41,   186,   604,    42,    43,   202,   416,    44,   582,   583,
+     584,    45,    46,    47,   141,    49,    50,   392,   393,    51,
+     596,    52,    53,   458,   459,   654,   778,   813,   143,   397,
+     398,   617,   598,   599,   638,   426,    55,   144,   145,   149,
+     733,   362,   378,   173,   418,    98,    99,    56,    57,   681,
+     682,   618,   683,   684,   406,   407,   408,   852,   853,   854,
+     757,   758,   759,   100,   839,   855,   797,   863,   864,   409,
+     628,   769,   410,   619,   620,   101,   802,   825,   411,   412,
+     413,   625,   626,   622,   164
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -710,764 +710,770 @@ static const short int yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const short int yytable[] =
 {
-     172,   163,   109,   333,    54,    96,   190,   628,    97,   600,
-     157,   348,   146,   147,   148,   140,   351,   655,   108,   450,
-     362,   363,   364,   142,   454,   455,   630,   596,   390,   390,
-     620,    54,   174,   620,   426,   656,   370,   139,   759,    66,
-     429,   761,   107,   778,   375,    48,   760,   755,   742,   629,
-     334,   709,   693,   160,   162,    48,   456,   168,   774,   694,
-      65,   453,   631,   158,   191,   782,    48,   785,   775,    48,
-      48,   169,    48,   382,   421,   422,   383,    66,  -446,  -465,
-     423,  -465,   712,   419,  -515,   713,   795,   764,   360,  -515,
-     767,   834,   424,   194,   759,   450,   183,   157,   450,   197,
-     198,   199,   184,   799,   398,   399,   400,   401,   402,   815,
-     403,   404,   612,   666,   195,   613,   186,    58,   208,    59,
-     831,  -365,   642,  -365,  -365,   180,     4,     5,   337,   349,
-     352,   353,   355,    97,   414,   823,  -455,   140,   200,   359,
-      66,   645,   646,   335,   699,   142,   699,   175,   176,   177,
-     187,   742,   178,   365,   211,   860,    62,   841,  -496,   357,
-    -496,  -496,   607,   608,   821,   358,   140,   416,  -391,  -510,
-     379,   759,  -392,  -510,   142,   857,   188,   609,   610,   855,
-     740,   741,   189,   864,   395,   835,   413,   192,   139,   759,
-    -455,   368,   191,  -510,   393,   393,   875,   107,   867,   360,
-     759,  -359,   669,  -360,    48,   630,   366,   877,   855,   369,
-      48,   371,   655,   793,   794,   803,   634,   655,   354,   356,
-     348,   367,   372,   376,   378,   351,   348,   380,   418,   386,
-     656,   351,   387,   452,   430,   656,   451,   696,   586,   700,
-     453,   585,   587,   687,   463,   688,   462,   601,   602,    90,
-      91,    92,    93,    94,    95,   611,   632,   398,   399,   400,
-     401,   402,   702,   403,   404,     1,     2,     3,     4,     5,
-       6,     7,     8,   398,   399,   400,   401,   402,     9,   403,
-     404,   634,   635,   102,   639,   647,   704,   705,   706,   707,
-      11,   708,   709,   717,   710,   652,    80,    81,    82,    83,
-      84,    85,    86,    87,    88,   711,   714,   715,   348,   727,
-     724,   450,   725,   351,   450,   450,   726,   729,   738,   599,
-     731,   739,   -24,   743,   747,   791,   748,   348,   348,   749,
-     769,   606,   351,   351,   770,   773,   776,   620,   349,   781,
-     783,   745,   746,   428,   349,   103,   104,   105,   106,   786,
-     797,   798,    22,   808,   800,   754,  -595,   172,   804,   809,
-     813,   461,   810,   819,   827,   614,   825,   622,   826,   626,
-     829,   828,   830,   832,   833,   837,   840,   191,   789,   790,
-     157,   839,   844,   845,   159,   847,   848,   604,   856,   174,
-     708,   858,   859,   670,   787,   861,   671,   623,   779,   780,
-     672,   659,   673,   674,   675,   676,   677,   678,   866,   868,
-     633,   754,   869,   379,   636,   870,   871,   874,   872,   771,
-     772,   657,   658,   641,   876,   420,   349,   878,   170,   817,
-     338,   620,   842,   734,   686,   373,   730,   666,   181,   818,
-     450,   450,   668,   167,   385,   349,   349,   374,   820,   459,
-     390,   394,   390,   140,   814,   703,   161,   654,   843,   191,
-     784,   142,     1,     2,     3,     4,     5,     6,     7,     8,
-     196,   620,   638,   584,   873,   615,   792,   765,     0,   620,
-     102,     0,     0,     0,   421,   422,     0,   849,   754,     0,
-     652,     0,     0,     0,     0,   652,     0,     0,     0,     0,
-       0,     0,   424,   620,     0,     0,   754,     0,     0,     1,
-       2,     3,     4,     5,     6,     7,     8,   754,     0,     0,
-       0,     0,     9,     0,     0,     0,     0,    10,     0,     0,
-     735,   736,     0,     0,    11,    12,    13,     0,   670,     0,
-       0,   671,   103,   104,   105,   672,    14,   673,   674,   675,
-     676,   677,   678,     0,     0,     0,     1,     2,     3,     4,
-       5,     6,     7,     8,     0,     0,     0,     0,   679,   134,
-       0,     0,     0,     0,   102,     0,     0,   723,     0,     0,
-       0,    11,     0,     0,     0,     0,     0,     0,    15,    16,
-      17,    18,    19,    20,    21,   692,    22,     0,     0,     0,
-     194,   718,     0,     0,   695,   348,   348,     0,   395,     0,
-     351,   351,     0,     0,     0,     0,   393,     0,   393,   172,
-       0,    23,     0,     0,     0,     0,    24,     0,    25,     0,
-       0,   720,     0,     0,     0,   191,   135,   136,    18,   106,
-       0,     0,     0,   805,     0,     0,     0,     0,   140,     0,
-     359,   174,   654,   140,     0,   737,   142,   654,     0,     0,
-       0,   142,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   137,     0,   762,   157,     0,   416,     0,
-       0,   416,     0,     0,     0,    60,     0,     0,     0,   763,
-       0,   461,     0,     0,    61,     0,   604,     0,     0,    62,
-      63,   202,   203,   204,    64,     0,     0,     0,     0,   623,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   349,   349,     0,     0,     0,     0,     0,
-     802,     0,     0,     0,     0,     1,     2,     3,     4,     5,
-       6,     7,     8,   811,     0,     0,   657,   658,    67,    68,
-      69,    70,    71,   102,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   816,     0,   807,     0,     0,     0,
-      72,     0,    73,    74,    75,    76,    77,    78,     0,    79,
-       0,     0,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,     0,   846,
-       0,     0,     0,   205,   850,   206,   207,     0,     0,     0,
-       0,     0,     0,     0,     0,   103,   104,   105,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  -571,     0,   850,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,     0,  -571,     0,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,
-    -571,  -571,  -571,  -571,  -571,  -571,  -571,  -571,     0,  -571,
-    -571,     0,  -571,  -571,  -571,  -571,  -571,   212,     0,     0,
-     213,   214,   215,   216,   217,   218,   219,   220,   221,   222,
+     172,   163,    96,   334,   349,   109,    97,    54,   629,   146,
+     147,   148,   352,   157,   191,   108,   455,   456,   140,   631,
+     142,   363,   364,   365,   621,   371,   656,   621,   451,   601,
+     174,   391,   391,   376,    54,   597,   657,   139,   762,   756,
+      48,   761,   427,   779,   743,   760,   335,    66,   430,    65,
+      48,   710,   694,   775,    58,   630,    59,   107,   783,   695,
+     786,    48,   192,   776,    48,    48,    66,    48,   160,  -516,
+     632,   185,   168,   361,  -516,   158,     1,     2,     3,     4,
+       5,     6,     7,     8,   420,  -447,  -466,   457,  -466,   154,
+     195,   835,   454,   796,   102,   800,   198,   199,   200,   162,
+     157,   760,   816,  -456,   451,   201,  -365,   451,  -365,  -365,
+     399,   400,   401,   402,   403,   209,   404,   405,  -391,  -511,
+     832,   667,   196,  -392,  -511,   338,   350,   353,   354,   356,
+     643,    97,   824,   608,   609,  -497,   360,  -497,  -497,   336,
+     140,   169,   142,   415,    62,   842,   700,   743,   700,   646,
+     647,   366,   181,     4,     5,   861,   103,   104,   105,   358,
+     822,   175,   176,   177,   610,   611,   178,   380,   417,   140,
+     383,   142,   858,   384,   856,   741,   742,   187,   760,   179,
+     865,   836,   396,   613,   414,   184,   614,   188,   139,   876,
+     868,   192,   394,   394,   713,   189,   760,   714,   631,    48,
+     804,   635,   190,   856,   878,    48,   369,   760,   765,    66,
+     670,   768,   107,   193,   349,   355,   357,   422,   423,   212,
+     349,   656,   352,   424,   359,  -359,   656,  -456,   352,   361,
+    -360,   657,  -511,   367,   464,   425,   657,    90,    91,    92,
+      93,    94,    95,   175,   176,   177,   368,   370,   178,   372,
+     373,   688,   377,   689,   379,   381,   387,   697,   419,   701,
+     388,   179,   431,   452,   454,   399,   400,   401,   402,   403,
+     703,   404,   405,   453,     1,     2,     3,     4,     5,     6,
+       7,     8,   399,   400,   401,   402,   403,     9,   404,   405,
+     463,   586,   102,   587,   588,   602,   612,   603,   653,    11,
+     633,   640,   349,   635,   671,   636,   648,   672,   705,   706,
+     352,   673,   707,   674,   675,   676,   677,   678,   679,   708,
+     451,   349,   349,   451,   451,   709,   710,   711,   600,   352,
+     352,   621,   712,   728,   680,   715,   350,   716,   718,   730,
+     607,   429,   350,   725,   726,   727,   739,   787,   732,   746,
+     747,   740,   -24,   744,   103,   104,   105,   106,   172,   462,
+     748,    22,   749,   755,   750,   770,   615,   771,   623,   774,
+     627,   777,   782,   784,   792,   798,   192,   799,   801,  -596,
+     805,   809,   811,   810,   157,   814,   605,   820,   174,   827,
+     780,   781,   826,   159,   828,   624,   829,   830,   790,   791,
+     794,   795,   788,   831,   833,   834,   838,   841,   634,   840,
+     660,   380,   845,   846,   848,   857,   849,   709,   637,   755,
+     859,   642,   658,   659,   350,   621,   860,   772,   773,   862,
+     875,   867,   869,   843,   871,   870,   872,   687,   873,   877,
+     879,   421,   170,   350,   350,   667,   818,   819,   374,   451,
+     451,   735,   844,   391,   339,   391,   821,   140,   192,   142,
+     731,   655,   182,    60,   669,   621,   110,   386,   167,   395,
+     460,   375,    61,   621,   815,   704,   639,    62,    63,   203,
+     204,   205,    64,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,   197,   653,   161,   850,   755,   621,   653,   785,
+     585,   874,   111,   112,   113,   114,   115,   116,   117,   118,
+     119,   120,   121,   122,   755,   123,   124,   125,   126,   616,
+     793,   766,     0,     0,     0,   755,    67,    68,    69,    70,
+      71,   671,   736,   737,   672,     0,     0,     0,   673,     0,
+     674,   675,   676,   677,   678,   679,     0,     0,    72,     0,
+      73,    74,    75,    76,    77,    78,     0,    79,     0,     0,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,     0,     0,     0,     0,
+       0,   206,     0,   207,   208,     0,   724,     0,     0,     0,
+       0,     0,     0,   693,     0,     0,     0,     0,   195,   349,
+     349,     0,   719,   696,     0,     0,   396,   352,   352,     0,
+       0,     0,     0,     0,   394,     0,   394,     0,     0,     0,
+     172,     0,     0,     0,     0,     0,     0,     0,     0,   721,
+       0,     0,     0,     0,   192,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   806,     0,     0,     0,   360,     0,
+     174,     0,   140,   738,   142,     0,   655,   140,     0,   142,
+       0,   655,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   763,     0,     0,   417,
+     157,     0,   417,     0,     0,     0,     0,     0,     0,   462,
+     764,     0,     0,     0,     0,   605,     0,     0,     1,     2,
+       3,     4,     5,     6,     7,     8,     0,   624,     0,     0,
+       0,     9,     0,     0,     0,     0,    10,     0,     0,     0,
+       0,   350,   350,    11,    12,    13,     0,     0,     0,     0,
+       0,   803,     0,     0,     0,    14,     0,     0,     0,     0,
+       0,     0,     0,     0,   812,     0,     0,   658,   659,     1,
+       2,     3,     4,     5,     6,     7,     8,     0,     0,     0,
+       0,     0,     0,     0,   808,   817,     0,   102,     0,     0,
+       0,   422,   423,     0,     0,     0,     0,    15,    16,    17,
+      18,    19,    20,    21,     0,    22,     0,     0,     0,   425,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     847,     0,     0,     0,     0,   851,     0,     0,     0,     0,
+      23,     0,     0,     0,     0,    24,     0,    25,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   103,
+     104,   105,  -572,     0,   851,  -572,  -572,  -572,  -572,  -572,
+    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
+    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
+    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
+    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
+    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
+    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
+    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
+    -572,  -572,     0,  -572,     0,  -572,  -572,  -572,  -572,  -572,
+    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
+    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,
+    -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,  -572,     0,
+    -572,  -572,     0,  -572,  -572,  -572,  -572,  -572,   213,     0,
+       0,   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,   239,     0,   240,   241,
+     233,   234,   235,   236,   237,   238,   239,   240,     0,   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,   288,     0,   289,     0,
-     290,   291,   292,   293,   294,   295,   296,   297,   298,   299,
+     282,   283,   284,   285,   286,   287,   288,   289,     0,   290,
+       0,   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,   322,   323,     0,     0,   324,     0,   325,   326,
-     327,   328,   329,   464,     0,     0,   465,   466,   467,   468,
+     320,   321,   322,   323,   324,     0,     0,   325,     0,   326,
+     327,   328,   329,   330,   465,     0,     0,   466,   467,   468,
      469,   470,   471,   472,   473,   474,   475,   476,   477,   478,
      479,   480,   481,   482,   483,   484,   485,   486,   487,   488,
-     489,   490,   491,     0,   492,   493,   494,   495,   496,   369,
-     667,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     489,   490,   491,   492,     0,   493,   494,   495,   496,   497,
+     370,   668,   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,   537,   538,     0,   539,     0,   540,   541,   542,   543,
+     536,   537,   538,   539,     0,   540,     0,   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,   571,   572,   573,
-       0,     0,   574,     0,   575,   576,   577,   578,   579,   464,
-       0,     0,   465,   466,   467,   468,   469,   470,   471,   472,
+     574,     0,     0,   575,     0,   576,   577,   578,   579,   580,
+     465,     0,     0,   466,   467,   468,   469,   470,   471,   472,
      473,   474,   475,   476,   477,   478,   479,   480,   481,   482,
-     483,   484,   485,   486,   487,   488,   489,   490,   491,     0,
-     492,   493,   494,   495,   496,   369,     0,   497,   498,   499,
+     483,   484,   485,   486,   487,   488,   489,   490,   491,   492,
+       0,   493,   494,   495,   496,   497,   370,     0,   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,   537,   538,     0,
-     539,     0,   540,   541,   542,   543,   544,   545,   546,   547,
+     530,   531,   532,   533,   534,   535,   536,   537,   538,   539,
+       0,   540,     0,   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,   571,   572,   573,     0,     0,   574,     0,
-     575,   576,   577,   578,   579,     1,     2,     3,     4,     5,
-       6,     7,     8,     0,     0,     0,     0,     0,     9,     0,
-       0,     0,     0,   102,     0,     0,     0,     0,     0,     0,
-      11,     0,     0,     0,     0,     0,     0,     0,   733,     0,
+     568,   569,   570,   571,   572,   573,   574,     0,     0,   575,
+       0,   576,   577,   578,   579,   580,     1,     2,     3,     4,
+       5,     6,     7,     8,     0,     0,     0,     0,     0,     9,
+       0,     0,     0,     0,   102,     0,     0,     0,     0,     0,
+       0,    11,     0,     0,     0,     0,     0,     0,     0,   734,
+       0,     0,     0,     0,     1,     2,     3,     4,     5,     6,
+       7,     8,     0,     0,     0,     0,     0,   134,     0,     0,
+       0,     0,   102,     0,     0,     0,     0,     0,     0,    11,
+       0,     0,     1,     2,     3,     4,     5,     6,     7,     8,
+       0,     0,     0,     0,     0,     9,   135,   136,    18,   106,
+     102,     0,     0,     0,     0,     0,     0,    11,     0,     0,
        0,     0,     0,     1,     2,     3,     4,     5,     6,     7,
        8,     0,     0,     0,     0,     0,     9,     0,     0,     0,
-       0,   102,     0,     0,     0,     0,     0,     0,    11,     0,
-       0,     1,     2,     3,     4,     5,     6,     7,     8,     0,
-       0,     0,     0,     0,     9,   135,   136,    18,   106,   102,
-       0,     0,     0,     0,     0,     0,    11,     0,     0,     0,
+       0,   102,     0,   649,   135,   136,    18,   106,    11,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     1,     2,     3,     4,     5,     6,
-       7,     8,   648,   135,   136,    18,   106,     9,     0,     0,
-       0,     0,   165,     0,     0,     0,     0,     0,     0,    11,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   135,   136,    18,   106,     0,     0,     0,     0,     0,
-     137,    60,     1,     2,     3,     4,     5,     6,     7,     8,
-      61,     0,     0,     0,     0,    62,    63,   588,     0,     0,
-     684,   589,     0,   590,     0,   591,   341,    11,   648,     0,
-     592,     0,     0,   166,   103,   104,   105,   106,     0,     0,
-       0,     0,     0,     0,     0,   343,   344,    66,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   345,   346,
-       0,     0,     0,     0,    67,    68,    69,    70,    71,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   103,   104,   105,   685,    72,     0,    73,    74,
-      75,    76,    77,    78,     0,    79,     0,     0,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    95,    60,     0,     0,     0,     0,     0,
-       0,     0,     0,    61,     0,     0,     0,     0,    62,    63,
-     660,   661,   662,    64,   589,     0,   590,   663,   591,   341,
-       0,     0,     0,   592,     0,     0,     0,     0,     0,     1,
-       2,     3,     4,     5,     6,     7,     8,     0,   343,   344,
-      66,     0,   697,     0,     0,     0,     0,   102,     0,     0,
-       0,   345,   346,     0,    11,     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,
-     102,    73,    74,    75,    76,    77,    78,    11,    79,   698,
-       0,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    60,     0,   103,
-     104,   105,   389,     0,     0,     0,    61,     0,     0,     0,
-       0,    62,    63,   750,     0,     0,    64,   589,     0,   590,
-       0,   591,   341,     0,     0,     0,   592,     0,     0,   110,
-       0,     0,   103,   104,   105,   106,     0,     0,   162,     0,
-       0,   343,   344,    66,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   345,   346,     0,     0,     0,     0,
-      67,    68,    69,    70,    71,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,     0,   123,   124,
-     125,   126,    72,   751,   752,    74,    75,    76,    77,    78,
-       0,    79,     0,     0,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,   753,    90,    91,    92,    93,    94,    95,
-      60,     0,     0,     0,     0,     0,     0,     0,     0,    61,
-       0,     0,     0,     0,    62,    63,   588,     0,     0,    64,
-     589,     0,   590,     0,   591,   341,     0,     0,     0,   592,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   162,     0,     0,   343,   344,    66,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   345,   346,     0,
-       0,   822,     0,    67,    68,    69,    70,    71,     1,     2,
-       3,     4,     5,     6,     7,     8,     0,     0,     0,     0,
-       0,     9,     0,     0,     0,    72,   102,    73,    74,    75,
-      76,    77,    78,    11,    79,     0,     0,    80,    81,    82,
+       7,     8,   135,   136,    18,   106,     0,     9,     0,     0,
+       0,   137,   165,     0,     0,     0,     0,     0,     0,    11,
+       1,     2,     3,     4,     5,     6,     7,     8,     0,     0,
+       0,     0,     0,   135,   136,    18,   106,     0,   102,   137,
+      60,     1,     2,     3,     4,     5,     6,     7,     8,    61,
+       0,     0,     0,     0,    62,    63,   589,     0,     0,   685,
+     590,     0,   591,     0,   592,   342,    11,     0,     0,   593,
+     649,     0,     0,   166,   103,   104,   105,   106,     0,     0,
+       0,     0,     0,     0,   344,   345,    66,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   346,   347,     0,
+     103,   104,   105,    67,    68,    69,    70,    71,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   103,   104,   105,   686,    72,     0,    73,    74,    75,
+      76,    77,    78,     0,    79,     0,     0,    80,    81,    82,
       83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
       93,    94,    95,    60,     0,     0,     0,     0,     0,     0,
-       0,     0,    61,     0,     0,     0,     0,    62,    63,   588,
-       0,     0,    64,   589,  -622,   590,     0,   591,   341,     0,
-       0,     0,   592,     0,     0,     0,     0,     0,   103,   104,
-     105,   106,     0,     0,   162,     0,     0,   343,   344,    66,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     345,   346,     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,    79,     0,     0,
+       0,     0,    61,     0,     0,     0,     0,    62,    63,   661,
+     662,   663,    64,   590,     0,   591,   664,   592,   342,     0,
+       0,     0,   593,     0,     0,     0,     0,     0,     1,     2,
+       3,     4,     5,     6,     7,     8,     0,   344,   345,    66,
+       0,   698,     0,     0,     0,     0,   102,     0,     0,     0,
+     346,   347,     0,    11,     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,   102,
+      73,    74,    75,    76,    77,    78,    11,    79,   699,     0,
       80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    95,    60,     0,     0,     0,
-       0,     0,     0,     0,     0,    61,     0,     0,     0,     0,
-      62,    63,   588,     0,     0,    64,   589,     0,   590,     0,
-     591,   341,     0,     0,     0,   592,     0,     0,     0,     0,
-       0,     0,   593,     0,     0,     0,     0,     0,     0,     0,
-     343,   344,    66,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   345,   346,     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,   102,    73,    74,    75,    76,    77,    78,    11,
+      90,    91,    92,    93,    94,    95,    60,     0,   103,   104,
+     105,   390,     0,     0,     0,    61,     0,     0,     0,     0,
+      62,    63,   751,     0,     0,    64,   590,     0,   591,     0,
+     592,   342,     0,     0,     0,   593,     0,     0,     0,     0,
+       0,   103,   104,   105,   106,     0,     0,   162,     0,     0,
+     344,   345,    66,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   346,   347,     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,   752,   753,    74,    75,    76,    77,    78,     0,
       79,     0,     0,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    60,
+      87,    88,   754,    90,    91,    92,    93,    94,    95,    60,
        0,     0,     0,     0,     0,     0,     0,     0,    61,     0,
-       0,     0,     0,    62,    63,   588,     0,     0,    64,   589,
-       0,   590,     0,   591,   341,     0,     0,     0,   592,     0,
-       0,     0,     0,     0,   135,   136,    18,   106,     0,     0,
-     162,     0,     0,   343,   344,    66,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   345,   346,     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,    79,     0,     0,    80,    81,    82,    83,
+       0,     0,     0,    62,    63,   589,     0,     0,    64,   590,
+       0,   591,     0,   592,   342,     0,     0,     0,   593,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     162,     0,     0,   344,   345,    66,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   346,   347,     0,     0,
+     823,     0,    67,    68,    69,    70,    71,     1,     2,     3,
+       4,     5,     6,     7,     8,     0,     0,     0,     0,     0,
+       9,     0,     0,     0,    72,   102,    73,    74,    75,    76,
+      77,    78,    11,    79,     0,     0,    80,    81,    82,    83,
       84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
       94,    95,    60,     0,     0,     0,     0,     0,     0,     0,
-       0,    61,     0,     0,     0,     0,    62,    63,   750,     0,
-       0,    64,   589,     0,   590,     0,   591,   341,     0,     0,
-       0,   592,     0,     0,     0,     0,     0,     1,     2,     3,
-       4,     5,     6,     7,     8,     0,   343,   344,    66,     0,
-     697,     0,     0,     0,     0,   102,     0,     0,     0,   345,
-     346,     0,    11,     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,   751,   752,
-      74,    75,    76,    77,    78,     0,    79,   701,     0,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,   753,    90,
-      91,    92,    93,    94,    95,    60,     0,   103,   104,   105,
-     389,     0,     0,     0,    61,     0,     0,     0,     0,    62,
-      63,   588,     0,     0,    64,   589,     0,   590,     0,   591,
-     341,     0,     0,     0,   592,     0,     0,     0,   150,     1,
-       2,   151,     4,     5,     6,   152,     8,   153,     0,   343,
-     344,    66,   154,     0,     0,     0,     0,   102,     0,     0,
-       0,     0,   345,   346,     0,     0,     0,     0,    67,    68,
+       0,    61,     0,     0,     0,     0,    62,    63,   589,     0,
+       0,    64,   590,  -623,   591,     0,   592,   342,     0,     0,
+       0,   593,     0,     0,     0,     0,     0,   103,   104,   105,
+     106,     0,     0,   162,     0,     0,   344,   345,    66,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   346,
+     347,     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,    79,     0,     0,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,    95,    60,     0,     0,     0,     0,
+       0,     0,     0,     0,    61,     0,     0,     0,     0,    62,
+      63,   589,     0,     0,    64,   590,     0,   591,     0,   592,
+     342,     0,     0,     0,   593,     0,     0,     0,     0,     0,
+       0,   594,     0,     0,     0,     0,     0,     0,     0,   344,
+     345,    66,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   346,   347,     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,   102,    73,    74,    75,    76,    77,    78,    11,    79,
        0,     0,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    60,   103,
-     104,   105,     0,     0,     0,     0,     0,    61,     0,     0,
-       0,     0,    62,    63,     0,     0,     0,    64,     0,     0,
-     339,     0,   340,   341,     0,     0,     0,   342,     0,     0,
-       0,     0,     0,   103,   104,   105,   106,     0,     0,     0,
-       0,     0,   343,   344,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   345,   346,     0,     0,     0,
+      88,    89,    90,    91,    92,    93,    94,    95,    60,     0,
+       0,     0,     0,     0,     0,     0,     0,    61,     0,     0,
+       0,     0,    62,    63,   589,     0,     0,    64,   590,     0,
+     591,     0,   592,   342,     0,     0,     0,   593,     0,     0,
+       0,     0,     0,   135,   136,    18,   106,     0,     0,   162,
+       0,     0,   344,   345,    66,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   346,   347,     0,     0,     0,
        0,    67,    68,    69,    70,    71,     0,     0,     0,     0,
-       0,     0,     0,   347,     0,     0,     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,    79,     0,     0,    80,    81,    82,    83,    84,
       85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
       95,    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,     1,     2,     3,     4,     5,
-       6,     7,     8,     0,     0,     0,     0,    66,   388,     0,
-       0,     0,     0,   102,     0,     0,     0,     0,     0,     0,
-      11,     0,     0,     0,    67,    68,    69,    70,    71,     1,
-       2,     3,     4,     5,     6,     7,     8,     0,     0,     0,
-       0,     0,   154,     0,     0,     0,    72,   102,    73,    74,
-      75,    76,    77,    78,     0,    79,     0,     0,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    95,    60,   103,   104,   105,   389,     0,
+      61,     0,     0,     0,     0,    62,    63,   751,     0,     0,
+      64,   590,     0,   591,     0,   592,   342,     0,     0,     0,
+     593,     0,     0,     0,     0,     0,     1,     2,     3,     4,
+       5,     6,     7,     8,     0,   344,   345,    66,     0,   698,
+       0,     0,     0,     0,   102,     0,     0,     0,   346,   347,
+       0,    11,     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,   752,   753,    74,
+      75,    76,    77,    78,     0,    79,   702,     0,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,   754,    90,    91,
+      92,    93,    94,    95,    60,     0,   103,   104,   105,   390,
        0,     0,     0,    61,     0,     0,     0,     0,    62,    63,
-       0,     0,     0,    64,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  -520,     0,     0,     0,     0,     0,   103,
-     104,   105,     1,     2,     3,     4,     5,     6,     7,     8,
-      66,     0,     0,     0,     0,   605,     0,     0,     0,     0,
-     102,     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,    79,     0,
+     589,     0,     0,    64,   590,     0,   591,     0,   592,   342,
+       0,     0,     0,   593,     0,     0,     0,   150,     1,     2,
+     151,     4,     5,     6,   152,     8,   153,     0,   344,   345,
+      66,   154,     0,     0,     0,     0,   102,     0,     0,     0,
+       0,   346,   347,     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,
+     102,    73,    74,    75,    76,    77,    78,    11,    79,     0,
        0,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    60,     0,     0,
-       0,     0,   103,   104,   105,     0,    61,   716,     0,     0,
-       0,    62,    63,     0,     0,     0,    64,     0,   431,   432,
-     433,   434,   435,   436,   437,   438,   439,   440,   441,   442,
-     443,   444,   445,   446,   447,   448,     0,     0,     0,     0,
-       0,   690,     0,    66,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      89,    90,    91,    92,    93,    94,    95,    60,   103,   104,
+     105,     0,     0,     0,     0,     0,    61,     0,     0,     0,
+       0,    62,    63,     0,     0,     0,    64,     0,     0,   340,
+       0,   341,   342,     0,     0,     0,   343,     0,     0,     0,
+       0,     0,   103,   104,   105,   106,     0,     0,     0,     0,
+       0,   344,   345,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   346,   347,     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,   348,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    72,     0,    73,    74,    75,    76,    77,    78,
        0,    79,     0,     0,    80,    81,    82,    83,    84,    85,
       86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
       60,     0,     0,     0,     0,     0,     0,     0,     0,    61,
        0,     0,     0,     0,    62,    63,     0,     0,     0,    64,
-       0,   640,     0,     0,     0,     0,     0,     0,     0,   193,
-     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
-     441,   442,   443,   444,   445,   446,   447,   448,     0,     0,
-       0,     0,     0,   449,     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,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    65,
+       0,     0,     0,     0,     1,     2,     3,     4,     5,     6,
+       7,     8,     0,     0,     0,     0,    66,   389,     0,     0,
+       0,     0,   102,     0,     0,     0,     0,     0,     0,    11,
+       0,     0,     0,    67,    68,    69,    70,    71,     1,     2,
+       3,     4,     5,     6,     7,     8,     0,     0,     0,     0,
+       0,   606,     0,     0,     0,    72,   102,    73,    74,    75,
       76,    77,    78,     0,    79,     0,     0,    80,    81,    82,
       83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    60,     0,     0,     0,     0,     0,     0,
+      93,    94,    95,    60,   103,   104,   105,   390,     0,     0,
        0,     0,    61,     0,     0,     0,     0,    62,    63,     0,
-       0,     0,    64,     0,   744,     0,     0,     0,     0,     0,
-       0,     0,   427,   431,   432,   433,   434,   435,   436,   437,
-     438,   439,   440,   441,   442,   443,   444,   445,   446,   447,
-     448,     0,     0,     0,     0,     0,   690,     0,     0,     0,
+       0,     0,    64,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  -521,     0,     0,     0,     0,     0,   103,   104,
+     105,     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,    79,     0,     0,
       80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
       90,    91,    92,    93,    94,    95,    60,     0,     0,     0,
-       0,     0,     0,     0,     0,    61,     0,     0,     0,     0,
-      62,    63,     0,     0,     0,    64,     0,   865,     0,     0,
-       0,     0,     0,     0,     0,   460,   431,   432,   433,   434,
+       0,     0,     0,     0,     0,    61,   717,     0,     0,     0,
+      62,    63,     0,     0,     0,    64,     0,   432,   433,   434,
      435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
-     445,   446,   447,   448,     0,     0,     0,     0,     0,   690,
-       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,
+     445,   446,   447,   448,   449,     0,     0,     0,     0,     0,
+     691,     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,
       79,     0,     0,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,     0,
-       0,     0,     0,     0,     0,     0,   719,     0,    67,    68,
-      69,    70,    71,     0,     0,     0,     0,     0,     0,     0,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    60,
+       0,     0,     0,     0,     0,     0,     0,     0,    61,     0,
+       0,     0,     0,    62,    63,     0,     0,     0,    64,     0,
+     641,     0,     0,     0,     0,     0,     0,     0,   194,   432,
+     433,   434,   435,   436,   437,   438,   439,   440,   441,   442,
+     443,   444,   445,   446,   447,   448,   449,     0,     0,     0,
+       0,     0,   450,     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,    79,     0,     0,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    60,     0,     0,     0,     0,     0,     0,     0,
+       0,    61,     0,     0,     0,     0,    62,    63,     0,     0,
+       0,    64,     0,   745,     0,     0,     0,     0,     0,     0,
+       0,   428,   432,   433,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+       0,     0,     0,     0,     0,   691,     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,    79,     0,     0,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,    95,    60,     0,     0,     0,     0,
+       0,     0,     0,     0,    61,     0,     0,     0,     0,    62,
+      63,     0,     0,     0,    64,     0,   866,     0,     0,     0,
+       0,     0,     0,     0,   461,   432,   433,   434,   435,   436,
+     437,   438,   439,   440,   441,   442,   443,   444,   445,   446,
+     447,   448,   449,     0,     0,     0,     0,     0,   691,     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,    79,
        0,     0,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    60,     0,
-       0,     0,     0,     0,     0,     0,     0,    61,     0,     0,
-     836,     0,   766,    63,     0,     0,     0,    64,   431,   432,
-     433,   434,   435,   436,   437,   438,   439,   440,   441,   442,
-     443,   444,   445,   446,   447,   448,     0,     0,     0,     0,
-       0,   690,     0,     0,    66,     0,     0,     0,     0,     0,
-       0,     0,     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,    79,     0,     0,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,     0,     0,     0,     0,     0,    60,     0,   806,     0,
+      88,    89,    90,    91,    92,    93,    94,    95,     0,     0,
+       0,     0,     0,     0,     0,   720,     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,    79,     0,
+       0,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    95,    60,     0,     0,
+       0,     0,     0,     0,     0,     0,    61,     0,     0,   837,
+       0,   767,    63,     0,     0,     0,    64,   432,   433,   434,
+     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
+     445,   446,   447,   448,   449,     0,     0,     0,     0,     0,
+     691,     0,     0,    66,     0,     0,     0,     0,     0,     0,
+       0,     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,    79,     0,     0,    80,    81,    82,    83,    84,    85,
       86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-       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,     0,     0,     0,     0,    60,     0,   807,     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,
       79,     0,     0,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,   728,
-       0,     0,     0,     0,     0,     0,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,   440,   441,   442,   443,   444,
-     445,   446,   447,   448,   788,     0,     0,     0,     0,   449,
-       0,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-     440,   441,   442,   443,   444,   445,   446,   447,   448,     0,
-       0,     0,   689,     0,   690,   431,   432,   433,   434,   435,
-     436,   437,   438,   439,   440,   441,   442,   443,   444,   445,
-     446,   447,   448,     0,     0,     0,     0,     0,   690,   431,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,     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,    79,
+       0,     0,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,   729,     0,
+       0,     0,     0,     0,     0,   432,   433,   434,   435,   436,
+     437,   438,   439,   440,   441,   442,   443,   444,   445,   446,
+     447,   448,   449,   789,     0,     0,     0,     0,   450,     0,
      432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
-     442,   443,   444,   445,   446,   447,   448,     0,     0,     0,
-       0,     0,   449,   431,   432,   433,   434,   435,   436,   437,
+     442,   443,   444,   445,   446,   447,   448,   449,     0,     0,
+       0,   690,     0,   691,   432,   433,   434,   435,   436,   437,
      438,   439,   440,   441,   442,   443,   444,   445,   446,   447,
-     448,     0,     0,     0,     0,     0,   690,   431,   432,   433,
+     448,   449,     0,     0,     0,     0,     0,   691,   432,   433,
      434,   435,   436,   437,   438,   439,   440,   441,   442,   443,
-     444,   445,   446,   447,   448,     0,     0,     0,     0,     0,
-     449,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-     440,   441,   442,   443,   444,   445,   446,   447,   448,     0,
-       0,     0,     0,     0,   690
+     444,   445,   446,   447,   448,   449,     0,     0,     0,     0,
+       0,   450,   432,   433,   434,   435,   436,   437,   438,   439,
+     440,   441,   442,   443,   444,   445,   446,   447,   448,   449,
+       0,     0,     0,     0,     0,   691,   432,   433,   434,   435,
+     436,   437,   438,   439,   440,   441,   442,   443,   444,   445,
+     446,   447,   448,   449,     0,     0,     0,     0,     0,   450,
+     432,   433,   434,   435,   436,   437,   438,   439,   440,   441,
+     442,   443,   444,   445,   446,   447,   448,   449,     0,     0,
+       0,     0,     0,   691
 };
 
 static const short int yycheck[] =
 {
-      33,    22,    11,   129,     0,     9,    65,   402,     9,   379,
-      19,   133,    16,    17,    18,    15,   133,   453,    10,   350,
-     145,   146,   147,    15,   361,   362,   405,   376,   186,   187,
-     399,    27,    33,   402,   342,   453,   160,    15,   704,    49,
-     348,   706,    10,   734,   168,     0,   704,   704,   682,    37,
-      26,    24,    26,    21,    44,    10,    31,    25,    25,    33,
-      32,    36,   411,    26,    65,   739,    21,   741,    35,    24,
-      25,     0,    27,     6,    26,    27,     9,    49,    31,    32,
-      32,    34,    31,   209,    31,    34,   752,   711,    35,    36,
-     714,    64,    44,    97,   760,   426,    31,   106,   429,   103,
-     104,   105,   125,   760,    92,    93,    94,    95,    96,   783,
-      98,    99,    34,   462,   124,    37,    32,     9,   122,    11,
-     811,    31,   430,    33,    34,     6,     7,     8,   132,   133,
-     134,   135,   136,   134,   193,   800,    32,   137,    34,   143,
-      49,   449,   450,   119,   608,   137,   610,     4,     5,     6,
-      32,   785,     9,   154,    30,   846,    17,    18,    31,   137,
-      33,    34,    33,    34,   798,    31,   166,   200,    35,    36,
-     174,   837,    35,    36,   166,   840,    36,    33,    34,   837,
-      33,    34,    36,   848,   188,   819,   190,    87,   166,   855,
-      32,   159,   193,    36,   186,   187,   870,   165,   855,    35,
-     866,    23,    37,    23,   159,   584,    23,   872,   866,    36,
-     165,    36,   648,    17,    18,    33,    34,   653,   135,   136,
-     342,    31,    23,    38,    32,   342,   348,     6,   118,    32,
-     648,   348,    31,    35,    32,   653,    31,   607,    31,   609,
-      36,    32,    31,   592,   368,   594,    40,     6,    26,   110,
-     111,   112,   113,   114,   115,    40,    33,    92,    93,    94,
-      95,    96,   611,    98,    99,     4,     5,     6,     7,     8,
-       9,    10,    11,    92,    93,    94,    95,    96,    17,    98,
-      99,    34,    32,    22,    22,    32,    40,    31,    40,    31,
-      29,    32,    24,    33,    40,   453,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,    32,    32,    31,   430,    34,
-      33,   642,    33,   430,   645,   646,    33,    25,    31,   378,
-      35,    35,    33,    33,    33,   109,    33,   449,   450,    33,
-      33,   390,   449,   450,    34,    34,    34,   706,   342,    33,
-      35,   690,   691,   347,   348,    84,    85,    86,    87,    40,
-      32,    32,    91,    25,    34,   704,    33,   390,    33,    35,
-      31,   365,    32,    32,    97,   398,    33,   400,    31,   402,
-      35,    33,    25,    34,    31,    34,    34,   378,   748,   749,
-     389,    33,    32,    34,   123,    24,    32,   388,    33,   390,
-      32,    25,    25,     3,   743,    33,     6,   401,   735,   736,
-      10,   460,    12,    13,    14,    15,    16,    17,    34,    34,
-     414,   760,    33,   417,   423,    35,    33,    25,    34,   727,
-     728,   454,   455,   427,    33,   332,   430,    33,    27,   786,
-     132,   800,   827,   653,   592,   166,   648,   786,    39,   788,
-     771,   772,   582,    24,   181,   449,   450,   167,   797,   364,
-     608,   187,   610,   453,   778,   612,    21,   453,   827,   460,
-     741,   453,     4,     5,     6,     7,     8,     9,    10,    11,
-      98,   840,   423,   371,   866,   398,   751,   713,    -1,   848,
-      22,    -1,    -1,    -1,    26,    27,    -1,   836,   837,    -1,
-     648,    -1,    -1,    -1,    -1,   653,    -1,    -1,    -1,    -1,
-      -1,    -1,    44,   872,    -1,    -1,   855,    -1,    -1,     4,
-       5,     6,     7,     8,     9,    10,    11,   866,    -1,    -1,
-      -1,    -1,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,
-     655,   656,    -1,    -1,    29,    30,    31,    -1,     3,    -1,
-      -1,     6,    84,    85,    86,    10,    41,    12,    13,    14,
-      15,    16,    17,    -1,    -1,    -1,     4,     5,     6,     7,
-       8,     9,    10,    11,    -1,    -1,    -1,    -1,    33,    17,
-      -1,    -1,    -1,    -1,    22,    -1,    -1,   636,    -1,    -1,
-      -1,    29,    -1,    -1,    -1,    -1,    -1,    -1,    83,    84,
-      85,    86,    87,    88,    89,   599,    91,    -1,    -1,    -1,
-     604,   634,    -1,    -1,   605,   727,   728,    -1,   612,    -1,
-     727,   728,    -1,    -1,    -1,    -1,   608,    -1,   610,   652,
-      -1,   116,    -1,    -1,    -1,    -1,   121,    -1,   123,    -1,
-      -1,   635,    -1,    -1,    -1,   636,    84,    85,    86,    87,
-      -1,    -1,    -1,   769,    -1,    -1,    -1,    -1,   648,    -1,
-     654,   652,   648,   653,    -1,   659,   648,   653,    -1,    -1,
-      -1,   653,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   121,    -1,   708,   685,    -1,   711,    -1,
-      -1,   714,    -1,    -1,    -1,     3,    -1,    -1,    -1,   710,
-      -1,   695,    -1,    -1,    12,    -1,   697,    -1,    -1,    17,
-      18,    19,    20,    21,    22,    -1,    -1,    -1,    -1,   713,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   727,   728,    -1,    -1,    -1,    -1,    -1,
-     763,    -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,
-       9,    10,    11,   776,    -1,    -1,   779,   780,    66,    67,
-      68,    69,    70,    22,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   785,    -1,   770,    -1,    -1,    -1,
-      88,    -1,    90,    91,    92,    93,    94,    95,    -1,    97,
-      -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,    -1,   832,
-      -1,    -1,    -1,   121,   837,   123,   124,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    84,    85,    86,    -1,    -1,
+      33,    22,     9,   129,   133,    11,     9,     0,   403,    16,
+      17,    18,   133,    19,    65,    10,   362,   363,    15,   406,
+      15,   145,   146,   147,   400,   160,   454,   403,   351,   380,
+      33,   187,   188,   168,    27,   377,   454,    15,   707,   705,
+       0,   705,   343,   735,   683,   705,    26,    49,   349,    32,
+      10,    24,    26,    25,     9,    37,    11,    10,   740,    33,
+     742,    21,    65,    35,    24,    25,    49,    27,    21,    31,
+     412,   125,    25,    35,    36,    26,     4,     5,     6,     7,
+       8,     9,    10,    11,   210,    31,    32,    31,    34,    17,
+      97,    64,    36,   753,    22,   761,   103,   104,   105,    44,
+     106,   761,   784,    32,   427,    34,    31,   430,    33,    34,
+      92,    93,    94,    95,    96,   122,    98,    99,    35,    36,
+     812,   463,   124,    35,    36,   132,   133,   134,   135,   136,
+     431,   134,   801,    33,    34,    31,   143,    33,    34,   119,
+     137,     0,   137,   194,    17,    18,   609,   786,   611,   450,
+     451,   154,     6,     7,     8,   847,    84,    85,    86,   137,
+     799,     4,     5,     6,    33,    34,     9,   174,   201,   166,
+       6,   166,   841,     9,   838,    33,    34,    32,   838,    22,
+     849,   820,   189,    34,   191,    31,    37,    32,   166,   871,
+     856,   194,   187,   188,    31,    36,   856,    34,   585,   159,
+      33,    34,    36,   867,   873,   165,   159,   867,   712,    49,
+      37,   715,   165,    87,   343,   135,   136,    26,    27,    30,
+     349,   649,   343,    32,    31,    23,   654,    32,   349,    35,
+      23,   649,    36,    23,   369,    44,   654,   110,   111,   112,
+     113,   114,   115,     4,     5,     6,    31,    36,     9,    36,
+      23,   593,    38,   595,    32,     6,    32,   608,   118,   610,
+      31,    22,    32,    31,    36,    92,    93,    94,    95,    96,
+     612,    98,    99,    35,     4,     5,     6,     7,     8,     9,
+      10,    11,    92,    93,    94,    95,    96,    17,    98,    99,
+      40,    32,    22,    31,    31,     6,    40,    26,   454,    29,
+      33,    22,   431,    34,     3,    32,    32,     6,    40,    31,
+     431,    10,    40,    12,    13,    14,    15,    16,    17,    31,
+     643,   450,   451,   646,   647,    32,    24,    40,   379,   450,
+     451,   707,    32,    34,    33,    32,   343,    31,    33,    25,
+     391,   348,   349,    33,    33,    33,    31,    40,    35,   691,
+     692,    35,    33,    33,    84,    85,    86,    87,   391,   366,
+      33,    91,    33,   705,    33,    33,   399,    34,   401,    34,
+     403,    34,    33,    35,   109,    32,   379,    32,    34,    33,
+      33,    25,    32,    35,   390,    31,   389,    32,   391,    31,
+     736,   737,    33,   123,    97,   402,    33,    35,   749,   750,
+      17,    18,   744,    25,    34,    31,    34,    34,   415,    33,
+     461,   418,    32,    34,    24,    33,    32,    32,   424,   761,
+      25,   428,   455,   456,   431,   801,    25,   728,   729,    33,
+      25,    34,    34,   828,    35,    33,    33,   593,    34,    33,
+      33,   333,    27,   450,   451,   787,   787,   789,   166,   772,
+     773,   654,   828,   609,   132,   611,   798,   454,   461,   454,
+     649,   454,    39,     3,   583,   841,    30,   182,    24,   188,
+     365,   167,    12,   849,   779,   613,   424,    17,    18,    19,
+      20,    21,    22,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,    98,   649,    21,   837,   838,   873,   654,   742,
+     372,   867,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,   856,    79,    80,    81,    82,   399,
+     752,   714,    -1,    -1,    -1,   867,    66,    67,    68,    69,
+      70,     3,   656,   657,     6,    -1,    -1,    -1,    10,    -1,
+      12,    13,    14,    15,    16,    17,    -1,    -1,    88,    -1,
+      90,    91,    92,    93,    94,    95,    -1,    97,    -1,    -1,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,    -1,    -1,    -1,    -1,
+      -1,   121,    -1,   123,   124,    -1,   637,    -1,    -1,    -1,
+      -1,    -1,    -1,   600,    -1,    -1,    -1,    -1,   605,   728,
+     729,    -1,   635,   606,    -1,    -1,   613,   728,   729,    -1,
+      -1,    -1,    -1,    -1,   609,    -1,   611,    -1,    -1,    -1,
+     653,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   636,
+      -1,    -1,    -1,    -1,   637,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   770,    -1,    -1,    -1,   655,    -1,
+     653,    -1,   649,   660,   649,    -1,   649,   654,    -1,   654,
+      -1,   654,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   709,    -1,    -1,   712,
+     686,    -1,   715,    -1,    -1,    -1,    -1,    -1,    -1,   696,
+     711,    -1,    -1,    -1,    -1,   698,    -1,    -1,     4,     5,
+       6,     7,     8,     9,    10,    11,    -1,   714,    -1,    -1,
+      -1,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,    -1,
+      -1,   728,   729,    29,    30,    31,    -1,    -1,    -1,    -1,
+      -1,   764,    -1,    -1,    -1,    41,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   777,    -1,    -1,   780,   781,     4,
+       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   771,   786,    -1,    22,    -1,    -1,
+      -1,    26,    27,    -1,    -1,    -1,    -1,    83,    84,    85,
+      86,    87,    88,    89,    -1,    91,    -1,    -1,    -1,    44,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     0,    -1,   866,     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,   116,    -1,   118,
-     119,    -1,   121,   122,   123,   124,   125,     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,   116,    -1,    -1,   119,    -1,   121,   122,
-     123,   124,   125,     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,   116,
-      -1,    -1,   119,    -1,   121,   122,   123,   124,   125,     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,   116,    -1,    -1,   119,    -1,
-     121,   122,   123,   124,   125,     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,    -1,    -1,    -1,    -1,    -1,    37,    -1,
+     833,    -1,    -1,    -1,    -1,   838,    -1,    -1,    -1,    -1,
+     116,    -1,    -1,    -1,    -1,   121,    -1,   123,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,
+      85,    86,     0,    -1,   867,     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,   116,    -1,
+     118,   119,    -1,   121,   122,   123,   124,   125,     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,   116,    -1,    -1,   119,    -1,   121,
+     122,   123,   124,   125,     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,
+     116,    -1,    -1,   119,    -1,   121,   122,   123,   124,   125,
+       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,   116,    -1,    -1,   119,
+      -1,   121,   122,   123,   124,   125,     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,    -1,    -1,    -1,    -1,    -1,    37,
+      -1,    -1,    -1,    -1,     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,     4,     5,     6,     7,     8,     9,    10,    11,
+      -1,    -1,    -1,    -1,    -1,    17,    84,    85,    86,    87,
+      22,    -1,    -1,    -1,    -1,    -1,    -1,    29,    -1,    -1,
       -1,    -1,    -1,     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,     4,     5,     6,     7,     8,     9,    10,    11,    -1,
-      -1,    -1,    -1,    -1,    17,    84,    85,    86,    87,    22,
-      -1,    -1,    -1,    -1,    -1,    -1,    29,    -1,    -1,    -1,
+      -1,    22,    -1,   121,    84,    85,    86,    87,    29,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,     9,
-      10,    11,   121,    84,    85,    86,    87,    17,    -1,    -1,
-      -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,    29,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    84,    85,    86,    87,    -1,    -1,    -1,    -1,    -1,
-     121,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    -1,    -1,    -1,    -1,    17,    18,    19,    -1,    -1,
-      22,    23,    -1,    25,    -1,    27,    28,    29,   121,    -1,
-      32,    -1,    -1,    83,    84,    85,    86,    87,    -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,    -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,    97,    -1,    -1,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,     3,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -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,    -1,     4,
-       5,     6,     7,     8,     9,    10,    11,    -1,    47,    48,
-      49,    -1,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,
-      -1,    60,    61,    -1,    29,    -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,    97,    64,
-      -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,     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,    30,
-      -1,    -1,    84,    85,    86,    87,    -1,    -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,    66,    67,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    -1,    79,    80,
-      81,    82,    88,    89,    90,    91,    92,    93,    94,    95,
-      -1,    97,    -1,    -1,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,
+      10,    11,    84,    85,    86,    87,    -1,    17,    -1,    -1,
+      -1,   121,    22,    -1,    -1,    -1,    -1,    -1,    -1,    29,
+       4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
+      -1,    -1,    -1,    84,    85,    86,    87,    -1,    22,   121,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    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,    -1,    -1,    -1,    -1,
-      -1,    44,    -1,    -1,    47,    48,    49,    -1,    -1,    -1,
+      23,    -1,    25,    -1,    27,    28,    29,    -1,    -1,    32,
+     121,    -1,    -1,    83,    84,    85,    86,    87,    -1,    -1,
+      -1,    -1,    -1,    -1,    47,    48,    49,    -1,    -1,    -1,
       -1,    -1,    -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,    97,    -1,    -1,   100,   101,   102,
+      84,    85,    86,    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,    97,    -1,    -1,   100,   101,   102,
      103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
      113,   114,   115,     3,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    19,
-      -1,    -1,    22,    23,    24,    25,    -1,    27,    28,    -1,
-      -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,    84,    85,
-      86,    87,    -1,    -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,    -1,
-      90,    91,    92,    93,    94,    95,    -1,    97,    -1,    -1,
+      20,    21,    22,    23,    -1,    25,    26,    27,    28,    -1,
+      -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,     4,     5,
+       6,     7,     8,     9,    10,    11,    -1,    47,    48,    49,
+      -1,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,    -1,
+      60,    61,    -1,    29,    -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,    97,    64,    -1,
      100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,   114,   115,     3,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,
+     110,   111,   112,   113,   114,   115,     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,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    84,    85,    86,    87,    -1,    -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,
+      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,
       97,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
      107,   108,   109,   110,   111,   112,   113,   114,   115,     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,    -1,    84,    85,    86,    87,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -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,    -1,    90,    91,    92,    93,
-      94,    95,    -1,    97,    -1,    -1,   100,   101,   102,   103,
+      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,    97,    -1,    -1,   100,   101,   102,   103,
      104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
      114,   115,     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,    -1,     4,     5,     6,
-       7,     8,     9,    10,    11,    -1,    47,    48,    49,    -1,
-      17,    -1,    -1,    -1,    -1,    22,    -1,    -1,    -1,    60,
-      61,    -1,    29,    -1,    -1,    66,    67,    68,    69,    70,
+      -1,    22,    23,    24,    25,    -1,    27,    28,    -1,    -1,
+      -1,    32,    -1,    -1,    -1,    -1,    -1,    84,    85,    86,
+      87,    -1,    -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,    97,    64,    -1,   100,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    -1,    90,
+      91,    92,    93,    94,    95,    -1,    97,    -1,    -1,   100,
      101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-     111,   112,   113,   114,   115,     3,    -1,    84,    85,    86,
-      87,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
+     111,   112,   113,   114,   115,     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,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    -1,    47,
-      48,    49,    17,    -1,    -1,    -1,    -1,    22,    -1,    -1,
+      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,    97,
       -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,     3,    84,
-      85,    86,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,
-      -1,    -1,    17,    18,    -1,    -1,    -1,    22,    -1,    -1,
+     108,   109,   110,   111,   112,   113,   114,   115,     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,    -1,    84,    85,    86,    87,    -1,    -1,    -1,
-      -1,    -1,    47,    48,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    84,    85,    86,    87,    -1,    -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,    78,    -1,    -1,    -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,    97,    -1,    -1,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,     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,     4,     5,     6,     7,     8,
-       9,    10,    11,    -1,    -1,    -1,    -1,    49,    17,    -1,
-      -1,    -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,
-      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,    -1,    97,    -1,    -1,   100,   101,
+      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,     4,     5,     6,     7,
+       8,     9,    10,    11,    -1,    47,    48,    49,    -1,    17,
+      -1,    -1,    -1,    -1,    22,    -1,    -1,    -1,    60,    61,
+      -1,    29,    -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,    97,    64,    -1,   100,   101,
      102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,     3,    84,    85,    86,    87,    -1,
+     112,   113,   114,   115,     3,    -1,    84,    85,    86,    87,
       -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,    84,
-      85,    86,     4,     5,     6,     7,     8,     9,    10,    11,
-      49,    -1,    -1,    -1,    -1,    17,    -1,    -1,    -1,    -1,
-      22,    -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,    97,    -1,
+      19,    -1,    -1,    22,    23,    -1,    25,    -1,    27,    28,
+      -1,    -1,    -1,    32,    -1,    -1,    -1,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    -1,    47,    48,
+      49,    17,    -1,    -1,    -1,    -1,    22,    -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,    97,    -1,
       -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,     3,    -1,    -1,
-      -1,    -1,    84,    85,    86,    -1,    12,    31,    -1,    -1,
-      -1,    17,    18,    -1,    -1,    -1,    22,    -1,    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,    49,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     109,   110,   111,   112,   113,   114,   115,     3,    84,    85,
+      86,    -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,    84,    85,    86,    87,    -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,    -1,    -1,    -1,    -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,    97,    -1,    -1,   100,   101,   102,   103,   104,   105,
      106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
        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,    -1,    -1,    -1,    -1,    88,    -1,    90,    91,    92,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,
+      -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,     9,
+      10,    11,    -1,    -1,    -1,    -1,    49,    17,    -1,    -1,
+      -1,    -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,    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,    -1,    97,    -1,    -1,   100,   101,   102,
      103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+     113,   114,   115,     3,    84,    85,    86,    87,    -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,    22,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,    84,    85,
+      86,    -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,    88,    -1,
       90,    91,    92,    93,    94,    95,    -1,    97,    -1,    -1,
      100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
      110,   111,   112,   113,   114,   115,     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,     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,    -1,    -1,    -1,    -1,    12,    31,    -1,    -1,    -1,
+      17,    18,    -1,    -1,    -1,    22,    -1,    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,    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,    88,    -1,    90,    91,    92,    93,    94,    95,    -1,
       97,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    64,    -1,    66,    67,
-      68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,     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,
+      -1,    -1,    -1,    -1,    88,    -1,    90,    91,    92,    93,
+      94,    95,    -1,    97,    -1,    -1,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,     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,    -1,    -1,    -1,    -1,    88,    -1,    90,
+      91,    92,    93,    94,    95,    -1,    97,    -1,    -1,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,     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,     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,    97,
       -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,     3,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,
-      34,    -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,     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,    97,    -1,    -1,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,    -1,    -1,    -1,    -1,    -1,     3,    -1,    64,    -1,
+     108,   109,   110,   111,   112,   113,   114,   115,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    64,    -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,    97,    -1,
+      -1,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+     109,   110,   111,   112,   113,   114,   115,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    34,
+      -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,     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,    97,    -1,    -1,   100,   101,   102,   103,   104,   105,
      106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-      -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,    -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,
       97,    -1,    -1,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,    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,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,    -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,    97,
+      -1,    -1,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,    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,    -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
+      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
@@ -1491,77 +1497,77 @@ static const unsigned short int yystos[] =
      191,   192,   197,   206,   215,   216,   131,   131,   131,   217,
        3,     6,    10,    12,    17,   157,   158,   167,    26,   123,
      190,   226,    44,   261,   262,    22,    83,   189,   190,     0,
-     136,   131,   198,   221,   222,     4,     5,     6,     9,   174,
-       6,   171,   177,    31,   125,   179,    32,    32,    36,    36,
-     221,   222,    87,    32,   131,   124,   224,   131,   131,   131,
-      34,   183,    19,    20,    21,   121,   123,   124,   131,   147,
-     148,    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,
-      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,    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,   119,   121,   122,   123,   124,   125,
-     132,   151,   152,   151,    26,   119,   143,   131,   147,    25,
-      27,    28,    32,    47,    48,    60,    61,    78,   130,   131,
-     153,   211,   131,   131,   217,   131,   217,   164,    31,   131,
-      35,   219,   219,   219,   219,   222,    23,    31,   190,    36,
-     186,    36,    23,   162,   179,   186,    38,   220,    32,   131,
-       6,   175,     6,     9,   176,   174,    32,    31,    17,    87,
-     166,   195,   196,   197,   195,   131,   207,   208,    92,    93,
-      94,    95,    96,    98,    99,   232,   233,   234,   247,   250,
-     256,   257,   258,   131,   221,   184,   198,   222,   118,   151,
-     132,    26,    27,    32,    44,   213,   153,    32,   131,   153,
-      32,    42,    43,    44,    45,    46,    47,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    65,
-     129,    31,    35,    36,   202,   202,    31,   201,   202,   201,
-      32,   131,    40,   186,     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,   116,   119,   121,   122,   123,   124,   125,
-     133,   186,   187,   188,   232,    32,    31,    31,    19,    23,
-      25,    27,    32,    39,   130,   198,   209,   210,   211,   221,
-     220,     6,    26,   180,   222,    17,   221,    33,    34,    33,
-      34,    40,    34,    37,   198,   237,   209,   229,   251,   252,
-     253,   261,   198,   131,   259,   260,   198,   248,   252,    37,
-     233,   209,    33,   131,    34,    32,   167,   212,   213,    22,
-      33,   131,   153,   154,   155,   153,   153,    32,   121,   163,
-     164,   165,   166,   203,   206,   215,   216,   198,   198,   221,
-      19,    20,    21,    26,   159,   160,   209,    37,   188,    37,
-       3,     6,    10,    12,    13,    14,    15,    16,    17,    33,
-     227,   228,   230,   231,    22,    87,   166,   209,   209,    39,
-      65,   129,   131,    26,    33,   222,   220,    17,    64,   196,
-     220,    64,   209,   208,    40,    31,    40,    31,    32,    24,
-      40,    32,    31,    34,    32,    31,    31,    33,   198,    64,
-     131,   149,   150,   221,    33,    33,    33,    34,    35,    25,
-     165,    35,   218,    37,   163,   219,   219,   131,    31,    35,
-      33,    34,   229,    33,    33,   209,   209,    33,    33,    33,
-      19,    89,    90,   109,   209,   236,   238,   239,   240,   241,
-     262,   251,   198,   261,   184,   260,    17,   184,   249,    33,
-      34,   153,   153,    34,    25,    35,    34,   204,   218,   202,
-     202,    33,   230,    35,   228,   230,    40,   209,    35,   220,
-     220,   109,   238,    17,    18,   241,   244,    32,    32,   236,
-      34,   254,   198,    33,    33,   151,    64,   131,    25,    35,
-      32,   198,   205,    31,   204,   230,   261,   159,   209,    32,
-     209,   229,    64,   251,   255,    33,    31,    97,    33,    35,
-      25,   218,    34,    31,    64,   229,    34,    34,   242,    33,
-      34,    18,   252,   253,    32,    34,   198,    24,    32,   209,
-     198,   235,   236,   237,   243,   262,    33,   251,    25,    25,
-     218,    33,   245,   246,   251,    33,    34,   236,    34,    33,
-      35,    33,    34,   235,    25,   230,    33,   251,    33
+     136,   131,   198,   221,   222,     4,     5,     6,     9,    22,
+     174,     6,   171,   177,    31,   125,   179,    32,    32,    36,
+      36,   221,   222,    87,    32,   131,   124,   224,   131,   131,
+     131,    34,   183,    19,    20,    21,   121,   123,   124,   131,
+     147,   148,    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,    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,
+      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,   119,   121,   122,   123,   124,
+     125,   132,   151,   152,   151,    26,   119,   143,   131,   147,
+      25,    27,    28,    32,    47,    48,    60,    61,    78,   130,
+     131,   153,   211,   131,   131,   217,   131,   217,   164,    31,
+     131,    35,   219,   219,   219,   219,   222,    23,    31,   190,
+      36,   186,    36,    23,   162,   179,   186,    38,   220,    32,
+     131,     6,   175,     6,     9,   176,   174,    32,    31,    17,
+      87,   166,   195,   196,   197,   195,   131,   207,   208,    92,
+      93,    94,    95,    96,    98,    99,   232,   233,   234,   247,
+     250,   256,   257,   258,   131,   221,   184,   198,   222,   118,
+     151,   132,    26,    27,    32,    44,   213,   153,    32,   131,
+     153,    32,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      65,   129,    31,    35,    36,   202,   202,    31,   201,   202,
+     201,    32,   131,    40,   186,     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,   116,   119,   121,   122,   123,   124,
+     125,   133,   186,   187,   188,   232,    32,    31,    31,    19,
+      23,    25,    27,    32,    39,   130,   198,   209,   210,   211,
+     221,   220,     6,    26,   180,   222,    17,   221,    33,    34,
+      33,    34,    40,    34,    37,   198,   237,   209,   229,   251,
+     252,   253,   261,   198,   131,   259,   260,   198,   248,   252,
+      37,   233,   209,    33,   131,    34,    32,   167,   212,   213,
+      22,    33,   131,   153,   154,   155,   153,   153,    32,   121,
+     163,   164,   165,   166,   203,   206,   215,   216,   198,   198,
+     221,    19,    20,    21,    26,   159,   160,   209,    37,   188,
+      37,     3,     6,    10,    12,    13,    14,    15,    16,    17,
+      33,   227,   228,   230,   231,    22,    87,   166,   209,   209,
+      39,    65,   129,   131,    26,    33,   222,   220,    17,    64,
+     196,   220,    64,   209,   208,    40,    31,    40,    31,    32,
+      24,    40,    32,    31,    34,    32,    31,    31,    33,   198,
+      64,   131,   149,   150,   221,    33,    33,    33,    34,    35,
+      25,   165,    35,   218,    37,   163,   219,   219,   131,    31,
+      35,    33,    34,   229,    33,    33,   209,   209,    33,    33,
+      33,    19,    89,    90,   109,   209,   236,   238,   239,   240,
+     241,   262,   251,   198,   261,   184,   260,    17,   184,   249,
+      33,    34,   153,   153,    34,    25,    35,    34,   204,   218,
+     202,   202,    33,   230,    35,   228,   230,    40,   209,    35,
+     220,   220,   109,   238,    17,    18,   241,   244,    32,    32,
+     236,    34,   254,   198,    33,    33,   151,    64,   131,    25,
+      35,    32,   198,   205,    31,   204,   230,   261,   159,   209,
+      32,   209,   229,    64,   251,   255,    33,    31,    97,    33,
+      35,    25,   218,    34,    31,    64,   229,    34,    34,   242,
+      33,    34,    18,   252,   253,    32,    34,   198,    24,    32,
+     209,   198,   235,   236,   237,   243,   262,    33,   251,    25,
+      25,   218,    33,   245,   246,   251,    33,    34,   236,    34,
+      33,    35,    33,    34,   235,    25,   230,    33,   251,    33
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
@@ -1608,28 +1614,28 @@ static const unsigned short int yyr1[] =
      164,   165,   165,   165,   165,   165,   166,   166,   166,   167,
      167,   168,   168,   168,   169,   169,   169,   170,   170,   170,
      171,   171,   172,   172,   172,   173,   173,   173,   173,   174,
-     174,   174,   174,   174,   175,   175,   176,   176,   176,   176,
-     177,   177,   177,   178,   178,   179,   179,   180,   180,   181,
-     182,   183,   183,   184,   184,   185,   185,   185,   186,   187,
-     187,   188,   188,   189,   189,   190,   190,   191,   191,   192,
-     192,   193,   193,   193,   193,   194,   194,   195,   195,   195,
-     195,   196,   196,   196,   196,   197,   197,   197,   197,   198,
-     198,   199,   200,   201,   201,   202,   203,   203,   204,   204,
-     205,   205,   206,   207,   207,   208,   208,   209,   209,   209,
-     209,   209,   209,   210,   210,   210,   210,   210,   210,   211,
-     211,   212,   212,   213,   213,   213,   214,   215,   216,   217,
-     217,   218,   218,   218,   218,   219,   219,   220,   220,   220,
-     221,   221,   222,   222,   223,   223,   224,   224,   225,   225,
-     226,   226,   226,   227,   227,   228,   228,   229,   230,   231,
-     231,   231,   231,   231,   231,   231,   231,   231,   232,   232,
-     233,   233,   233,   233,   233,   234,   234,   235,   235,   235,
-     236,   236,   236,   236,   236,   236,   237,   237,   238,   239,
-     240,   241,   241,   241,   241,   241,   241,   241,   241,   241,
-     241,   242,   242,   243,   243,   244,   244,   245,   245,   246,
-     246,   247,   248,   248,   249,   249,   249,   250,   251,   251,
-     251,   252,   252,   253,   253,   253,   253,   253,   253,   253,
-     253,   254,   254,   255,   255,   256,   257,   257,   258,   259,
-     259,   260,   261,   261,   262
+     174,   174,   174,   174,   174,   175,   175,   176,   176,   176,
+     176,   177,   177,   177,   178,   178,   179,   179,   180,   180,
+     181,   182,   183,   183,   184,   184,   185,   185,   185,   186,
+     187,   187,   188,   188,   189,   189,   190,   190,   191,   191,
+     192,   192,   193,   193,   193,   193,   194,   194,   195,   195,
+     195,   195,   196,   196,   196,   196,   197,   197,   197,   197,
+     198,   198,   199,   200,   201,   201,   202,   203,   203,   204,
+     204,   205,   205,   206,   207,   207,   208,   208,   209,   209,
+     209,   209,   209,   209,   210,   210,   210,   210,   210,   210,
+     211,   211,   212,   212,   213,   213,   213,   214,   215,   216,
+     217,   217,   218,   218,   218,   218,   219,   219,   220,   220,
+     220,   221,   221,   222,   222,   223,   223,   224,   224,   225,
+     225,   226,   226,   226,   227,   227,   228,   228,   229,   230,
+     231,   231,   231,   231,   231,   231,   231,   231,   231,   232,
+     232,   233,   233,   233,   233,   233,   234,   234,   235,   235,
+     235,   236,   236,   236,   236,   236,   236,   237,   237,   238,
+     239,   240,   241,   241,   241,   241,   241,   241,   241,   241,
+     241,   241,   242,   242,   243,   243,   244,   244,   245,   245,
+     246,   246,   247,   248,   248,   249,   249,   249,   250,   251,
+     251,   251,   252,   252,   253,   253,   253,   253,   253,   253,
+     253,   253,   254,   254,   255,   255,   256,   257,   257,   258,
+     259,   259,   260,   261,   261,   262
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1676,28 +1682,28 @@ static const unsigned char yyr2[] =
        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,     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,     1,     2,     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,     6,     1,     0,     1,     1,     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,     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,     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,     1,     2,     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,     6,     1,     0,     1,     1,     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
 };
 
 
@@ -1742,6 +1748,7 @@ static const unsigned char yydprec[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     1,     2,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     2,     1,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1749,6 +1756,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,     2,     1,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1758,15 +1766,13 @@ 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,     2,     1,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       2,     1,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     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.  */
@@ -1834,7 +1840,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
 };
 
 /* YYIMMEDIATE[RULE-NUM] -- True iff rule #RULE-NUM is not to be deferred, as
@@ -1903,7 +1909,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
 };
 
 /* YYCONFLP[YYPACT[STATE-NUM]] -- Pointer into YYCONFL of start of
@@ -1919,17 +1925,17 @@ 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,     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,     7,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   261,     0,   263,   265,
+       0,     0,     0,     0,     0,     0,     0,     0,   255,     0,
+       0,     0,     0,   257,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   269,     0,   271,   273,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   257,     0,   259,   261,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     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,
-     267,   269,     0,     0,     0,     0,     0,     0,   251,     0,
-       0,     0,   253,     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,
@@ -1938,17 +1944,18 @@ 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,   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,     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,
-       0,     0,   263,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   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,   271,     0,     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,   275,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1994,8 +2001,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,     0,
-       0,     7,     0,     0,     9,    11,    13,    15,    17,    19,
+       0,     0,     9,     0,     0,    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,
@@ -2003,11 +2009,13 @@ static const unsigned short int yyconflp[] =
      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,
+     161,   163,     0,   165,     0,   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,   231,     0,   233,
-     235,     0,   237,   239,   241,   243,   245,     0,     0,     0,
+     217,   219,   221,   223,   225,   227,   229,   231,   233,     0,
+     235,   237,     0,   239,   241,   243,   245,   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,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2080,9 +2088,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,     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,     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,
@@ -2159,10 +2166,10 @@ 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,   247,     0,     0,     0,
-       0,   249,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   249,     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,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2286,43 +2293,46 @@ 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,
-     273,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   275
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   277,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   279
 };
 
 /* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by
    0, pointed into by YYCONFLP.  */
 static const short int yyconfl[] =
 {
-       0,   396,     0,   396,     0,   465,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   609,     0,   609,
-       0,   609,     0,   609,     0,   609,     0,   396,     0,   396,
-       0,   510,     0,   510,     0,    42,     0,   496,     0,   496,
-       0,   496,     0,   396,     0,   560,     0,   560,     0,   560,
-       0,   610,     0,   344,     0,   492,     0
+       0,   396,     0,   396,     0,   409,     0,   466,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   610,
+       0,   610,     0,   610,     0,   610,     0,   610,     0,   396,
+       0,   396,     0,   409,     0,   511,     0,   511,     0,    42,
+       0,   497,     0,   497,     0,   497,     0,   396,     0,   561,
+       0,   561,     0,   561,     0,   611,     0,   344,     0,   493,
+       0
 };
 
 /* Error token number */
@@ -2759,7 +2769,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        }
 }
-#line 2763 "src/parser_proc.c" /* glr.c:816  */
+#line 2773 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 285:
@@ -2772,7 +2782,7 @@ 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 2776 "src/parser_proc.c" /* glr.c:816  */
+#line 2786 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 286:
@@ -2780,7 +2790,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        psi_parser_proc_add_const(P, (*(struct psi_const **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2784 "src/parser_proc.c" /* glr.c:816  */
+#line 2794 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 287:
@@ -2788,7 +2798,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        psi_parser_proc_add_decl(P, (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2792 "src/parser_proc.c" /* glr.c:816  */
+#line 2802 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 290:
@@ -2796,7 +2806,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        psi_parser_proc_add_typedef(P, (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2800 "src/parser_proc.c" /* glr.c:816  */
+#line 2810 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 291:
@@ -2804,7 +2814,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        psi_parser_proc_add_struct(P, (*(struct psi_decl_struct **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2808 "src/parser_proc.c" /* glr.c:816  */
+#line 2818 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 292:
@@ -2812,7 +2822,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        psi_parser_proc_add_union(P, (*(struct psi_decl_union **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2816 "src/parser_proc.c" /* glr.c:816  */
+#line 2826 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 293:
@@ -2820,7 +2830,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        psi_parser_proc_add_enum(P, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2824 "src/parser_proc.c" /* glr.c:816  */
+#line 2834 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 294:
@@ -2828,7 +2838,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        psi_parser_proc_add_impl(P, (*(struct psi_impl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2832 "src/parser_proc.c" /* glr.c:816  */
+#line 2842 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 295:
@@ -2836,7 +2846,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 2840 "src/parser_proc.c" /* glr.c:816  */
+#line 2850 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 296:
@@ -2844,7 +2854,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = NULL;
 }
-#line 2848 "src/parser_proc.c" /* glr.c:816  */
+#line 2858 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 297:
@@ -2852,7 +2862,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = (*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 2856 "src/parser_proc.c" /* glr.c:816  */
+#line 2866 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 298:
@@ -2880,7 +2890,7 @@ 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 2884 "src/parser_proc.c" /* glr.c:816  */
+#line 2894 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 299:
@@ -2889,7 +2899,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 2893 "src/parser_proc.c" /* glr.c:816  */
+#line 2903 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 300:
@@ -2898,7 +2908,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 2902 "src/parser_proc.c" /* glr.c:816  */
+#line 2912 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 301:
@@ -2908,7 +2918,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 2912 "src/parser_proc.c" /* glr.c:816  */
+#line 2922 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 302:
@@ -2917,7 +2927,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 2921 "src/parser_proc.c" /* glr.c:816  */
+#line 2931 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 303:
@@ -2926,7 +2936,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 2930 "src/parser_proc.c" /* glr.c:816  */
+#line 2940 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 304:
@@ -2935,7 +2945,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 2939 "src/parser_proc.c" /* glr.c:816  */
+#line 2949 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 305:
@@ -2944,7 +2954,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = NULL;
 }
-#line 2948 "src/parser_proc.c" /* glr.c:816  */
+#line 2958 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 329:
@@ -2954,7 +2964,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 2958 "src/parser_proc.c" /* glr.c:816  */
+#line 2968 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 330:
@@ -2964,7 +2974,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 2968 "src/parser_proc.c" /* glr.c:816  */
+#line 2978 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 331:
@@ -2972,7 +2982,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL);
 }
-#line 2976 "src/parser_proc.c" /* glr.c:816  */
+#line 2986 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 332:
@@ -2980,7 +2990,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL); /* FIXME */
 }
-#line 2984 "src/parser_proc.c" /* glr.c:816  */
+#line 2994 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 334:
@@ -2988,7 +2998,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 2992 "src/parser_proc.c" /* glr.c:816  */
+#line 3002 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 335:
@@ -2998,7 +3008,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3002 "src/parser_proc.c" /* glr.c:816  */
+#line 3012 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 336:
@@ -3008,7 +3018,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3012 "src/parser_proc.c" /* glr.c:816  */
+#line 3022 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 337:
@@ -3016,7 +3026,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3020 "src/parser_proc.c" /* glr.c:816  */
+#line 3030 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 339:
@@ -3025,7 +3035,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3029 "src/parser_proc.c" /* glr.c:816  */
+#line 3039 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 340:
@@ -3034,7 +3044,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3038 "src/parser_proc.c" /* glr.c:816  */
+#line 3048 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 341:
@@ -3043,7 +3053,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3047 "src/parser_proc.c" /* glr.c:816  */
+#line 3057 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 342:
@@ -3052,7 +3062,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3056 "src/parser_proc.c" /* glr.c:816  */
+#line 3066 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 343:
@@ -3061,7 +3071,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3065 "src/parser_proc.c" /* glr.c:816  */
+#line 3075 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 344:
@@ -3070,7 +3080,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3074 "src/parser_proc.c" /* glr.c:816  */
+#line 3084 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 345:
@@ -3085,7 +3095,7 @@ 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 3089 "src/parser_proc.c" /* glr.c:816  */
+#line 3099 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 346:
@@ -3100,7 +3110,7 @@ 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 3104 "src/parser_proc.c" /* glr.c:816  */
+#line 3114 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 347:
@@ -3110,7 +3120,7 @@ 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)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3114 "src/parser_proc.c" /* glr.c:816  */
+#line 3124 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 348:
@@ -3120,7 +3130,7 @@ 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)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3124 "src/parser_proc.c" /* glr.c:816  */
+#line 3134 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 349:
@@ -3129,7 +3139,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3133 "src/parser_proc.c" /* glr.c:816  */
+#line 3143 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 350:
@@ -3140,7 +3150,7 @@ 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)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3144 "src/parser_proc.c" /* glr.c:816  */
+#line 3154 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 351:
@@ -3151,7 +3161,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                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 3155 "src/parser_proc.c" /* glr.c:816  */
+#line 3165 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 352:
@@ -3159,7 +3169,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3163 "src/parser_proc.c" /* glr.c:816  */
+#line 3173 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 354:
@@ -3168,7 +3178,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3172 "src/parser_proc.c" /* glr.c:816  */
+#line 3182 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 355:
@@ -3176,7 +3186,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(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 3180 "src/parser_proc.c" /* glr.c:816  */
+#line 3190 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 356:
@@ -3185,7 +3195,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3189 "src/parser_proc.c" /* glr.c:816  */
+#line 3199 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 357:
@@ -3193,7 +3203,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(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 3197 "src/parser_proc.c" /* glr.c:816  */
+#line 3207 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 362:
@@ -3201,7 +3211,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_impl_def_val **)(&(*yyvalp))) = NULL;
 }
-#line 3205 "src/parser_proc.c" /* glr.c:816  */
+#line 3215 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 363:
@@ -3237,7 +3247,7 @@ 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 3241 "src/parser_proc.c" /* glr.c:816  */
+#line 3251 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 364:
@@ -3246,7 +3256,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3250 "src/parser_proc.c" /* glr.c:816  */
+#line 3260 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 369:
@@ -3254,7 +3264,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3258 "src/parser_proc.c" /* glr.c:816  */
+#line 3268 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 370:
@@ -3268,7 +3278,7 @@ 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 3272 "src/parser_proc.c" /* glr.c:816  */
+#line 3282 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 371:
@@ -3276,7 +3286,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3280 "src/parser_proc.c" /* glr.c:816  */
+#line 3290 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 372:
@@ -3284,7 +3294,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3288 "src/parser_proc.c" /* glr.c:816  */
+#line 3298 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 373:
@@ -3292,7 +3302,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3296 "src/parser_proc.c" /* glr.c:816  */
+#line 3306 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 374:
@@ -3300,7 +3310,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3304 "src/parser_proc.c" /* glr.c:816  */
+#line 3314 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 375:
@@ -3308,7 +3318,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3312 "src/parser_proc.c" /* glr.c:816  */
+#line 3322 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 377:
@@ -3321,7 +3331,7 @@ 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 3325 "src/parser_proc.c" /* glr.c:816  */
+#line 3335 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 378:
@@ -3337,7 +3347,7 @@ 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 3341 "src/parser_proc.c" /* glr.c:816  */
+#line 3351 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 379:
@@ -3351,7 +3361,7 @@ 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 3355 "src/parser_proc.c" /* glr.c:816  */
+#line 3365 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 380:
@@ -3365,7 +3375,7 @@ 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 3369 "src/parser_proc.c" /* glr.c:816  */
+#line 3379 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 382:
@@ -3374,7 +3384,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3378 "src/parser_proc.c" /* glr.c:816  */
+#line 3388 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 383:
@@ -3389,7 +3399,7 @@ 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 3393 "src/parser_proc.c" /* glr.c:816  */
+#line 3403 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 384:
@@ -3403,7 +3413,7 @@ 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 3407 "src/parser_proc.c" /* glr.c:816  */
+#line 3417 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 385:
@@ -3417,7 +3427,7 @@ 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 3421 "src/parser_proc.c" /* glr.c:816  */
+#line 3431 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 386:
@@ -3425,7 +3435,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_decl_type **)(&(*yyvalp))) = (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3429 "src/parser_proc.c" /* glr.c:816  */
+#line 3439 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 387:
@@ -3433,7 +3443,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_decl_type **)(&(*yyvalp))) = (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3437 "src/parser_proc.c" /* glr.c:816  */
+#line 3447 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 389:
@@ -3442,7 +3452,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3446 "src/parser_proc.c" /* glr.c:816  */
+#line 3456 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 391:
@@ -3452,7 +3462,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3456 "src/parser_proc.c" /* glr.c:816  */
+#line 3466 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 392:
@@ -3462,7 +3472,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3466 "src/parser_proc.c" /* glr.c:816  */
+#line 3476 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 393:
@@ -3472,7 +3482,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3476 "src/parser_proc.c" /* glr.c:816  */
+#line 3486 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 396:
@@ -3480,7 +3490,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3484 "src/parser_proc.c" /* glr.c:816  */
+#line 3494 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 397:
@@ -3488,7 +3498,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3492 "src/parser_proc.c" /* glr.c:816  */
+#line 3502 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 398:
@@ -3496,7 +3506,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3500 "src/parser_proc.c" /* glr.c:816  */
+#line 3510 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 399:
@@ -3504,7 +3514,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(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 3508 "src/parser_proc.c" /* glr.c:816  */
+#line 3518 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 402:
@@ -3512,7 +3522,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3516 "src/parser_proc.c" /* glr.c:816  */
+#line 3526 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 403:
@@ -3520,7 +3530,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3524 "src/parser_proc.c" /* glr.c:816  */
+#line 3534 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 404:
@@ -3528,7 +3538,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(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 3532 "src/parser_proc.c" /* glr.c:816  */
+#line 3542 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 405:
@@ -3536,7 +3546,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3540 "src/parser_proc.c" /* glr.c:816  */
+#line 3550 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 406:
@@ -3544,7 +3554,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3548 "src/parser_proc.c" /* glr.c:816  */
+#line 3558 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 407:
@@ -3557,7 +3567,7 @@ 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 3561 "src/parser_proc.c" /* glr.c:816  */
+#line 3571 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 408:
@@ -3571,7 +3581,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
        }
 }
-#line 3575 "src/parser_proc.c" /* glr.c:816  */
+#line 3585 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 409:
@@ -3579,7 +3589,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3583 "src/parser_proc.c" /* glr.c:816  */
+#line 3593 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 410:
@@ -3587,11 +3597,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3591 "src/parser_proc.c" /* glr.c:816  */
+#line 3601 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 411:
 #line 981 "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 3609 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 412:
+#line 984 "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)));
@@ -3599,19 +3617,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 3603 "src/parser_proc.c" /* glr.c:816  */
+#line 3621 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 412:
-#line 988 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 413:
+#line 991 "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 3611 "src/parser_proc.c" /* glr.c:816  */
+#line 3629 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 413:
-#line 991 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 414:
+#line 994 "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)));
@@ -3619,43 +3637,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 3623 "src/parser_proc.c" /* glr.c:816  */
+#line 3641 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 414:
-#line 1001 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 415:
+#line 1004 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3631 "src/parser_proc.c" /* glr.c:816  */
+#line 3649 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 416:
-#line 1007 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 417:
+#line 1010 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3639 "src/parser_proc.c" /* glr.c:816  */
+#line 3657 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 420:
-#line 1016 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 421:
+#line 1019 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3647 "src/parser_proc.c" /* glr.c:816  */
+#line 3665 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 421:
-#line 1019 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 422:
+#line 1022 "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 3673 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 422:
-#line 1022 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 423:
+#line 1025 "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)));
@@ -3664,15 +3682,7 @@ 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 3668 "src/parser_proc.c" /* glr.c:816  */
-    break;
-
-  case 423:
-#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 3676 "src/parser_proc.c" /* glr.c:816  */
+#line 3686 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 424:
@@ -3680,47 +3690,47 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3684 "src/parser_proc.c" /* glr.c:816  */
+#line 3694 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 430:
-#line 1056 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 425:
+#line 1039 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       psi_decl_arg_free(&(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
+       (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3692 "src/parser_proc.c" /* glr.c:816  */
+#line 3702 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 432:
-#line 1063 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 431:
+#line 1059 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
+       psi_decl_arg_free(&(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3700 "src/parser_proc.c" /* glr.c:816  */
+#line 3710 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 433:
-#line 1069 "src/parser_proc_grammar.y" /* glr.c:816  */
+#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)));
+       psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3708 "src/parser_proc.c" /* glr.c:816  */
+#line 3718 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 434:
 #line 1072 "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)));
+       (*(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 3716 "src/parser_proc.c" /* glr.c:816  */
+#line 3726 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 435:
-#line 1078 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1075 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
+       (*(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 3724 "src/parser_proc.c" /* glr.c:816  */
+#line 3734 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 436:
@@ -3728,7 +3738,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3732 "src/parser_proc.c" /* glr.c:816  */
+#line 3742 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 437:
@@ -3736,20 +3746,28 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3740 "src/parser_proc.c" /* glr.c:816  */
+#line 3750 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 438:
+#line 1087 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
+}
+#line 3758 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 444:
-#line 1105 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 445:
+#line 1108 "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 3749 "src/parser_proc.c" /* glr.c:816  */
+#line 3767 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 447:
-#line 1117 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 448:
+#line 1120 "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))) {
@@ -3757,11 +3775,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 3761 "src/parser_proc.c" /* glr.c:816  */
+#line 3779 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 448:
-#line 1124 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 449:
+#line 1127 "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;
@@ -3770,11 +3788,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 3774 "src/parser_proc.c" /* glr.c:816  */
+#line 3792 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 449:
-#line 1135 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 450:
+#line 1138 "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))) {
@@ -3782,11 +3800,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 3786 "src/parser_proc.c" /* glr.c:816  */
+#line 3804 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 450:
-#line 1142 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 451:
+#line 1145 "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;
@@ -3795,11 +3813,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 3799 "src/parser_proc.c" /* glr.c:816  */
+#line 3817 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 451:
-#line 1153 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 452:
+#line 1156 "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;
@@ -3807,11 +3825,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 3811 "src/parser_proc.c" /* glr.c:816  */
+#line 3829 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 452:
-#line 1160 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 453:
+#line 1163 "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;
@@ -3823,11 +3841,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 3827 "src/parser_proc.c" /* glr.c:816  */
+#line 3845 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 453:
-#line 1171 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 454:
+#line 1174 "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;
@@ -3839,11 +3857,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 3843 "src/parser_proc.c" /* glr.c:816  */
+#line 3861 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 454:
-#line 1182 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 455:
+#line 1185 "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;
@@ -3855,11 +3873,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 3859 "src/parser_proc.c" /* glr.c:816  */
+#line 3877 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 456:
-#line 1197 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 457:
+#line 1200 "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),
@@ -3869,15 +3887,7 @@ 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 3873 "src/parser_proc.c" /* glr.c:816  */
-    break;
-
-  case 457:
-#line 1209 "src/parser_proc_grammar.y" /* glr.c:816  */
-    {
-       (*(struct psi_plist **)(&(*yyvalp))) = NULL;
-}
-#line 3881 "src/parser_proc.c" /* glr.c:816  */
+#line 3891 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 458:
@@ -3885,46 +3895,54 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3889 "src/parser_proc.c" /* glr.c:816  */
+#line 3899 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 459:
 #line 1215 "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)));
+       (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3897 "src/parser_proc.c" /* glr.c:816  */
+#line 3907 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 460:
 #line 1218 "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)));
+       (*(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 3905 "src/parser_proc.c" /* glr.c:816  */
+#line 3915 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 461:
-#line 1225 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1221 "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));
+       (*(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 3913 "src/parser_proc.c" /* glr.c:816  */
+#line 3923 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 462:
 #line 1228 "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 3931 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 463:
+#line 1231 "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 3924 "src/parser_proc.c" /* glr.c:816  */
+#line 3942 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 463:
-#line 1234 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 464:
+#line 1237 "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),
@@ -3934,11 +3952,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 3938 "src/parser_proc.c" /* glr.c:816  */
+#line 3956 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 464:
-#line 1243 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 465:
+#line 1246 "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),
@@ -3948,11 +3966,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 3952 "src/parser_proc.c" /* glr.c:816  */
+#line 3970 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 465:
-#line 1255 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 466:
+#line 1258 "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),
@@ -3961,19 +3979,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 3965 "src/parser_proc.c" /* glr.c:816  */
+#line 3983 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 466:
-#line 1263 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 467:
+#line 1266 "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 3973 "src/parser_proc.c" /* glr.c:816  */
+#line 3991 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 467:
-#line 1266 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 468:
+#line 1269 "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(
@@ -3984,11 +4002,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 3988 "src/parser_proc.c" /* glr.c:816  */
+#line 4006 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 468:
-#line 1276 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 469:
+#line 1279 "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(
@@ -3999,31 +4017,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 4003 "src/parser_proc.c" /* glr.c:816  */
+#line 4021 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 469:
-#line 1289 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 470:
+#line 1292 "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 4013 "src/parser_proc.c" /* glr.c:816  */
+#line 4031 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 470:
-#line 1294 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 471:
+#line 1297 "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 4023 "src/parser_proc.c" /* glr.c:816  */
+#line 4041 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 471:
-#line 1302 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 472:
+#line 1305 "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)));
@@ -4031,11 +4049,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 4035 "src/parser_proc.c" /* glr.c:816  */
+#line 4053 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 472:
-#line 1312 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 473:
+#line 1315 "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)));
@@ -4043,27 +4061,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 4047 "src/parser_proc.c" /* glr.c:816  */
+#line 4065 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 473:
-#line 1322 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 474:
+#line 1325 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4055 "src/parser_proc.c" /* glr.c:816  */
+#line 4073 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 475:
-#line 1329 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 476:
+#line 1332 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 4063 "src/parser_proc.c" /* glr.c:816  */
+#line 4081 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 476:
-#line 1335 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 477:
+#line 1338 "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)));
@@ -4078,11 +4096,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 4082 "src/parser_proc.c" /* glr.c:816  */
+#line 4100 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 477:
-#line 1349 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 478:
+#line 1352 "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)));
@@ -4097,27 +4115,27 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 4101 "src/parser_proc.c" /* glr.c:816  */
+#line 4119 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 478:
-#line 1366 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 479:
+#line 1369 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4109 "src/parser_proc.c" /* glr.c:816  */
+#line 4127 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 479:
-#line 1369 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 480:
+#line 1372 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4117 "src/parser_proc.c" /* glr.c:816  */
+#line 4135 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 480:
-#line 1375 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 481:
+#line 1378 "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)));
@@ -4125,11 +4143,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 4129 "src/parser_proc.c" /* glr.c:816  */
+#line 4147 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 481:
-#line 1382 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 482:
+#line 1385 "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)));
@@ -4137,189 +4155,189 @@ 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 4141 "src/parser_proc.c" /* glr.c:816  */
+#line 4159 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 482:
-#line 1392 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 483:
+#line 1395 "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 4150 "src/parser_proc.c" /* glr.c:816  */
+#line 4168 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 483:
-#line 1399 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 484:
+#line 1402 "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 4158 "src/parser_proc.c" /* glr.c:816  */
+#line 4176 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 484:
-#line 1402 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 485:
+#line 1405 "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 4166 "src/parser_proc.c" /* glr.c:816  */
+#line 4184 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 485:
-#line 1408 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 486:
+#line 1411 "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 4176 "src/parser_proc.c" /* glr.c:816  */
+#line 4194 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 486:
-#line 1413 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 487:
+#line 1416 "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 4186 "src/parser_proc.c" /* glr.c:816  */
+#line 4204 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 487:
-#line 1421 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 488:
+#line 1424 "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 4195 "src/parser_proc.c" /* glr.c:816  */
+#line 4213 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 488:
-#line 1425 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 489:
+#line 1428 "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 4204 "src/parser_proc.c" /* glr.c:816  */
+#line 4222 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 489:
-#line 1429 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 490:
+#line 1432 "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 4213 "src/parser_proc.c" /* glr.c:816  */
+#line 4231 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 490:
-#line 1433 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 491:
+#line 1436 "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 4222 "src/parser_proc.c" /* glr.c:816  */
+#line 4240 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 491:
-#line 1437 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 492:
+#line 1440 "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 4231 "src/parser_proc.c" /* glr.c:816  */
+#line 4249 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 492:
-#line 1441 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 493:
+#line 1444 "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 4240 "src/parser_proc.c" /* glr.c:816  */
+#line 4258 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 493:
-#line 1448 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 494:
+#line 1451 "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 4249 "src/parser_proc.c" /* glr.c:816  */
+#line 4267 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 494:
-#line 1452 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 495:
+#line 1455 "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 4258 "src/parser_proc.c" /* glr.c:816  */
+#line 4276 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 495:
-#line 1456 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 496:
+#line 1459 "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 4267 "src/parser_proc.c" /* glr.c:816  */
+#line 4285 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 496:
-#line 1460 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 497:
+#line 1463 "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 4276 "src/parser_proc.c" /* glr.c:816  */
+#line 4294 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 497:
-#line 1464 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 498:
+#line 1467 "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 4285 "src/parser_proc.c" /* glr.c:816  */
+#line 4303 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 498:
-#line 1468 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 499:
+#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));
 }
-#line 4293 "src/parser_proc.c" /* glr.c:816  */
+#line 4311 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 499:
-#line 1474 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 500:
+#line 1477 "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 4302 "src/parser_proc.c" /* glr.c:816  */
+#line 4320 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 500:
-#line 1478 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 501:
+#line 1481 "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 4311 "src/parser_proc.c" /* glr.c:816  */
+#line 4329 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 501:
-#line 1485 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 502:
+#line 1488 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4319 "src/parser_proc.c" /* glr.c:816  */
+#line 4337 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 502:
-#line 1488 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 503:
+#line 1491 "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 *);
@@ -4328,37 +4346,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 4332 "src/parser_proc.c" /* glr.c:816  */
+#line 4350 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 503:
-#line 1499 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 504:
+#line 1502 "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 4341 "src/parser_proc.c" /* glr.c:816  */
+#line 4359 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 504:
-#line 1503 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 505:
+#line 1506 "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 4350 "src/parser_proc.c" /* glr.c:816  */
+#line 4368 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 505:
-#line 1507 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 506:
+#line 1510 "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 4358 "src/parser_proc.c" /* glr.c:816  */
+#line 4376 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 506:
-#line 1513 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 507:
+#line 1516 "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)));
@@ -4369,11 +4387,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 4373 "src/parser_proc.c" /* glr.c:816  */
+#line 4391 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 507:
-#line 1526 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 508:
+#line 1529 "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)));
@@ -4384,11 +4402,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 4388 "src/parser_proc.c" /* glr.c:816  */
+#line 4406 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 508:
-#line 1539 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 509:
+#line 1542 "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)));
@@ -4399,82 +4417,74 @@ 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 4403 "src/parser_proc.c" /* glr.c:816  */
-    break;
-
-  case 509:
-#line 1552 "src/parser_proc_grammar.y" /* glr.c:816  */
-    {
-       (*(struct psi_token **)(&(*yyvalp))) = NULL;
-}
-#line 4411 "src/parser_proc.c" /* glr.c:816  */
+#line 4421 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 510:
 #line 1555 "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;
+       (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 4420 "src/parser_proc.c" /* glr.c:816  */
+#line 4429 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 511:
-#line 1562 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1558 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_layout **)(&(*yyvalp))) = NULL;
+       (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
+       (*(struct psi_token **)(&(*yyvalp)))->type = PSI_T_NAME;
 }
-#line 4428 "src/parser_proc.c" /* glr.c:816  */
+#line 4438 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 512:
 #line 1565 "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));
+       (*(struct psi_layout **)(&(*yyvalp))) = NULL;
 }
-#line 4436 "src/parser_proc.c" /* glr.c:816  */
+#line 4446 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 513:
 #line 1568 "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);
+       (*(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 4444 "src/parser_proc.c" /* glr.c:816  */
+#line 4454 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 514:
 #line 1571 "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));
+       (*(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 4452 "src/parser_proc.c" /* glr.c:816  */
+#line 4462 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 515:
-#line 1577 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1574 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_layout*)(&(*yyvalp))).pos = 0;
-       (*(struct psi_layout*)(&(*yyvalp))).len = 0;
+       (*(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 4461 "src/parser_proc.c" /* glr.c:816  */
+#line 4470 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 516:
-#line 1581 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1580 "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);
+       (*(struct psi_layout*)(&(*yyvalp))).pos = 0;
+       (*(struct psi_layout*)(&(*yyvalp))).len = 0;
 }
-#line 4470 "src/parser_proc.c" /* glr.c:816  */
+#line 4479 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 517:
-#line 1588 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1584 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(size_t*)(&(*yyvalp))) = 0;
+       (*(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 4478 "src/parser_proc.c" /* glr.c:816  */
+#line 4488 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 518:
@@ -4482,11 +4492,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4486 "src/parser_proc.c" /* glr.c:816  */
+#line 4496 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 519:
 #line 1594 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(size_t*)(&(*yyvalp))) = 0;
+}
+#line 4504 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 520:
+#line 1597 "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);
@@ -4494,88 +4512,88 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(size_t*)(&(*yyvalp))) = 0;
        }
 }
-#line 4498 "src/parser_proc.c" /* glr.c:816  */
+#line 4516 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 520:
-#line 1604 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 521:
+#line 1607 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4506 "src/parser_proc.c" /* glr.c:816  */
+#line 4524 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 521:
-#line 1607 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 522:
+#line 1610 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4514 "src/parser_proc.c" /* glr.c:816  */
+#line 4532 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 523:
-#line 1614 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 524:
+#line 1617 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 4522 "src/parser_proc.c" /* glr.c:816  */
+#line 4540 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 524:
-#line 1620 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 525:
+#line 1623 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 1;
 }
-#line 4530 "src/parser_proc.c" /* glr.c:816  */
+#line 4548 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 525:
-#line 1623 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 526:
+#line 1626 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)) + 1;
 }
-#line 4538 "src/parser_proc.c" /* glr.c:816  */
+#line 4556 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 528:
-#line 1640 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 529:
+#line 1643 "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 4546 "src/parser_proc.c" /* glr.c:816  */
+#line 4564 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 529:
-#line 1643 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 530:
+#line 1646 "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 4555 "src/parser_proc.c" /* glr.c:816  */
+#line 4573 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 530:
-#line 1650 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 531:
+#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 (-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 4565 "src/parser_proc.c" /* glr.c:816  */
+#line 4583 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 531:
-#line 1655 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 532:
+#line 1658 "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 4575 "src/parser_proc.c" /* glr.c:816  */
+#line 4593 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 532:
-#line 1660 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 533:
+#line 1663 "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)));
@@ -4583,346 +4601,338 @@ 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 4587 "src/parser_proc.c" /* glr.c:816  */
+#line 4605 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 533:
-#line 1670 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 534:
+#line 1673 "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 4595 "src/parser_proc.c" /* glr.c:816  */
+#line 4613 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 534:
-#line 1673 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 535:
+#line 1676 "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 4603 "src/parser_proc.c" /* glr.c:816  */
+#line 4621 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 535:
-#line 1679 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 536:
+#line 1682 "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 4611 "src/parser_proc.c" /* glr.c:816  */
+#line 4629 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 536:
-#line 1682 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 537:
+#line 1685 "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 4619 "src/parser_proc.c" /* glr.c:816  */
+#line 4637 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 537:
-#line 1688 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 538:
+#line 1691 "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 4628 "src/parser_proc.c" /* glr.c:816  */
+#line 4646 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 538:
-#line 1695 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 539:
+#line 1698 "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 4637 "src/parser_proc.c" /* glr.c:816  */
-    break;
-
-  case 548:
-#line 1714 "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 4645 "src/parser_proc.c" /* glr.c:816  */
+#line 4655 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 549:
 #line 1717 "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)));
+       (*(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 4653 "src/parser_proc.c" /* glr.c:816  */
+#line 4663 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 550:
-#line 1723 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1720 "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));
+       (*(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 4661 "src/parser_proc.c" /* glr.c:816  */
+#line 4671 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 551:
 #line 1726 "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));
+       (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_return_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4669 "src/parser_proc.c" /* glr.c:816  */
+#line 4679 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 552:
 #line 1729 "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));
+       (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_let_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4677 "src/parser_proc.c" /* glr.c:816  */
+#line 4687 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 553:
 #line 1732 "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));
+       (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_set_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4685 "src/parser_proc.c" /* glr.c:816  */
+#line 4695 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 554:
 #line 1735 "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));
+       (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_assert_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4693 "src/parser_proc.c" /* glr.c:816  */
+#line 4703 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 555:
-#line 1741 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1738 "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 4711 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 556:
+#line 1744 "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 4702 "src/parser_proc.c" /* glr.c:816  */
+#line 4720 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 556:
-#line 1745 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 557:
+#line 1748 "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 4712 "src/parser_proc.c" /* glr.c:816  */
+#line 4730 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 558:
-#line 1754 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 559:
+#line 1757 "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 4721 "src/parser_proc.c" /* glr.c:816  */
+#line 4739 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 559:
-#line 1758 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 560:
+#line 1761 "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 4730 "src/parser_proc.c" /* glr.c:816  */
-    break;
-
-  case 560:
-#line 1765 "src/parser_proc_grammar.y" /* glr.c:816  */
-    {
-       (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_NULL, NULL);
-}
-#line 4738 "src/parser_proc.c" /* glr.c:816  */
+#line 4748 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 561:
 #line 1768 "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)));
+       (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_NULL, NULL);
 }
-#line 4746 "src/parser_proc.c" /* glr.c:816  */
+#line 4756 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 562:
 #line 1771 "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_exp **)(&(*yyvalp))) = psi_let_exp_init_ex(NULL, PSI_LET_NUMEXP, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4754 "src/parser_proc.c" /* glr.c:816  */
+#line 4764 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 563:
 #line 1774 "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 4763 "src/parser_proc.c" /* glr.c:816  */
+#line 4772 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 564:
-#line 1778 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1777 "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)));
+       (*(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 4771 "src/parser_proc.c" /* glr.c:816  */
+#line 4781 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 565:
 #line 1781 "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)));
+       (*(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 4779 "src/parser_proc.c" /* glr.c:816  */
+#line 4789 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 566:
-#line 1787 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1784 "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 4797 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 567:
+#line 1790 "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 4788 "src/parser_proc.c" /* glr.c:816  */
+#line 4806 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 567:
-#line 1791 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 568:
+#line 1794 "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 4798 "src/parser_proc.c" /* glr.c:816  */
+#line 4816 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 568:
-#line 1799 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 569:
+#line 1802 "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 4807 "src/parser_proc.c" /* glr.c:816  */
+#line 4825 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 569:
-#line 1806 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 570:
+#line 1809 "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 4817 "src/parser_proc.c" /* glr.c:816  */
+#line 4835 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 570:
-#line 1814 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 571:
+#line 1817 "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 4827 "src/parser_proc.c" /* glr.c:816  */
-    break;
-
-  case 581:
-#line 1835 "src/parser_proc_grammar.y" /* glr.c:816  */
-    {
-       (*(struct psi_plist **)(&(*yyvalp))) = NULL;
-}
-#line 4835 "src/parser_proc.c" /* glr.c:816  */
+#line 4845 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 582:
 #line 1838 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
+       (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4843 "src/parser_proc.c" /* glr.c:816  */
+#line 4853 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 583:
-#line 1844 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1841 "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)));
+       (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4851 "src/parser_proc.c" /* glr.c:816  */
+#line 4861 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 584:
 #line 1847 "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)));
+       (*(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 4859 "src/parser_proc.c" /* glr.c:816  */
+#line 4869 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 587:
-#line 1858 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 585:
+#line 1850 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_plist **)(&(*yyvalp))) = NULL;
+       (*(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 4867 "src/parser_proc.c" /* glr.c:816  */
+#line 4877 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 588:
 #line 1861 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
+       (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4875 "src/parser_proc.c" /* glr.c:816  */
+#line 4885 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 589:
-#line 1867 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1864 "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)));
+       (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4883 "src/parser_proc.c" /* glr.c:816  */
+#line 4893 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 590:
 #line 1870 "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)));
+       (*(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 4891 "src/parser_proc.c" /* glr.c:816  */
+#line 4901 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 591:
-#line 1876 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1873 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_return_stmt **)(&(*yyvalp))) = psi_return_stmt_init((*(struct psi_return_exp **)(&((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)));
+       (*(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 4900 "src/parser_proc.c" /* glr.c:816  */
+#line 4909 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 592:
-#line 1883 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1879 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_return_exp **)(&(*yyvalp))) = psi_return_exp_init((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))));
-       (*(struct psi_return_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->token);
+       (*(struct psi_return_stmt **)(&(*yyvalp))) = psi_return_stmt_init((*(struct psi_return_exp **)(&((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 4909 "src/parser_proc.c" /* glr.c:816  */
+#line 4918 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 593:
-#line 1887 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1886 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_return_exp **)(&(*yyvalp))) = psi_return_exp_init(NULL, NULL, psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))));
-       (*(struct psi_return_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
+       (*(struct psi_return_exp **)(&(*yyvalp))) = psi_return_exp_init((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))));
+       (*(struct psi_return_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->token);
 }
-#line 4918 "src/parser_proc.c" /* glr.c:816  */
+#line 4927 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 594:
-#line 1894 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1890 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_plist **)(&(*yyvalp))) = NULL;
+       (*(struct psi_return_exp **)(&(*yyvalp))) = psi_return_exp_init(NULL, NULL, psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))));
+       (*(struct psi_return_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
 }
-#line 4926 "src/parser_proc.c" /* glr.c:816  */
+#line 4936 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 595:
@@ -4930,165 +4940,173 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4934 "src/parser_proc.c" /* glr.c:816  */
+#line 4944 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 596:
 #line 1900 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
+       (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4942 "src/parser_proc.c" /* glr.c:816  */
+#line 4952 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 597:
-#line 1906 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1903 "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)));
+       (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4951 "src/parser_proc.c" /* glr.c:816  */
+#line 4960 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 598:
-#line 1913 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1909 "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)));
+       (*(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 4959 "src/parser_proc.c" /* glr.c:816  */
+#line 4969 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 599:
 #line 1916 "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)));
+       (*(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 4967 "src/parser_proc.c" /* glr.c:816  */
+#line 4977 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 600:
 #line 1919 "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 4985 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 601:
+#line 1922 "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 4976 "src/parser_proc.c" /* glr.c:816  */
+#line 4994 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 601:
-#line 1926 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 602:
+#line 1929 "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 4986 "src/parser_proc.c" /* glr.c:816  */
+#line 5004 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 602:
-#line 1931 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 603:
+#line 1934 "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 4996 "src/parser_proc.c" /* glr.c:816  */
+#line 5014 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 611:
-#line 1950 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 612:
+#line 1953 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 5004 "src/parser_proc.c" /* glr.c:816  */
+#line 5022 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 612:
-#line 1953 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 613:
+#line 1956 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 5012 "src/parser_proc.c" /* glr.c:816  */
+#line 5030 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 613:
-#line 1959 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 614:
+#line 1962 "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 5020 "src/parser_proc.c" /* glr.c:816  */
+#line 5038 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 614:
-#line 1962 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 615:
+#line 1965 "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 5028 "src/parser_proc.c" /* glr.c:816  */
+#line 5046 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 615:
-#line 1968 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 616:
+#line 1971 "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 5037 "src/parser_proc.c" /* glr.c:816  */
+#line 5055 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 618:
-#line 1980 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 619:
+#line 1983 "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 5046 "src/parser_proc.c" /* glr.c:816  */
+#line 5064 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 619:
-#line 1987 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 620:
+#line 1990 "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 5054 "src/parser_proc.c" /* glr.c:816  */
+#line 5072 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 620:
-#line 1990 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 621:
+#line 1993 "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 5062 "src/parser_proc.c" /* glr.c:816  */
+#line 5080 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 621:
-#line 1996 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 622:
+#line 1999 "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 5072 "src/parser_proc.c" /* glr.c:816  */
+#line 5090 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 622:
-#line 2004 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 623:
+#line 2007 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = false;
 }
-#line 5080 "src/parser_proc.c" /* glr.c:816  */
+#line 5098 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 623:
-#line 2007 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 624:
+#line 2010 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = true;
 }
-#line 5088 "src/parser_proc.c" /* glr.c:816  */
+#line 5106 "src/parser_proc.c" /* glr.c:816  */
     break;
 
 
-#line 5092 "src/parser_proc.c" /* glr.c:816  */
+#line 5110 "src/parser_proc.c" /* glr.c:816  */
       default: break;
     }
 
@@ -5139,709 +5157,709 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct psi_parser
           case 129: /* binary_op_token  */
 #line 262 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5143 "src/parser_proc.c" /* glr.c:846  */
+#line 5161 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 130: /* unary_op_token  */
 #line 262 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5149 "src/parser_proc.c" /* glr.c:846  */
+#line 5167 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 131: /* name_token  */
 #line 262 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5155 "src/parser_proc.c" /* glr.c:846  */
+#line 5173 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 132: /* any_noeol_token  */
 #line 262 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5161 "src/parser_proc.c" /* glr.c:846  */
+#line 5179 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 137: /* lib  */
 #line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5167 "src/parser_proc.c" /* glr.c:846  */
+#line 5185 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 138: /* cpp  */
 #line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 5173 "src/parser_proc.c" /* glr.c:846  */
+#line 5191 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 139: /* cpp_exp  */
 #line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 5179 "src/parser_proc.c" /* glr.c:846  */
+#line 5197 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 141: /* cpp_message_token  */
 #line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5185 "src/parser_proc.c" /* glr.c:846  */
+#line 5203 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 142: /* cpp_include_token  */
 #line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5191 "src/parser_proc.c" /* glr.c:846  */
+#line 5209 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 143: /* cpp_header_token  */
 #line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5197 "src/parser_proc.c" /* glr.c:846  */
+#line 5215 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 144: /* cpp_no_arg_token  */
 #line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5203 "src/parser_proc.c" /* glr.c:846  */
+#line 5221 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 145: /* cpp_name_arg_token  */
 #line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5209 "src/parser_proc.c" /* glr.c:846  */
+#line 5227 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 146: /* cpp_exp_arg_token  */
 #line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5215 "src/parser_proc.c" /* glr.c:846  */
+#line 5233 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 147: /* cpp_special_name_token  */
 #line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5221 "src/parser_proc.c" /* glr.c:846  */
+#line 5239 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 148: /* cpp_macro_decl  */
 #line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_macro_decl_free(&(*(struct psi_cpp_macro_decl **)(&(*yyvaluep))));}
-#line 5227 "src/parser_proc.c" /* glr.c:846  */
+#line 5245 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 149: /* cpp_macro_sig  */
 #line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5233 "src/parser_proc.c" /* glr.c:846  */
+#line 5251 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 150: /* cpp_macro_sig_args  */
 #line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5239 "src/parser_proc.c" /* glr.c:846  */
+#line 5257 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 151: /* cpp_macro_decl_tokens  */
 #line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5245 "src/parser_proc.c" /* glr.c:846  */
+#line 5263 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 152: /* cpp_macro_decl_token_list  */
 #line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5251 "src/parser_proc.c" /* glr.c:846  */
+#line 5269 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 153: /* cpp_macro_exp  */
 #line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 5257 "src/parser_proc.c" /* glr.c:846  */
+#line 5275 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 154: /* cpp_macro_call_args  */
 #line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5263 "src/parser_proc.c" /* glr.c:846  */
+#line 5281 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 155: /* cpp_macro_call_arg_list  */
 #line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5269 "src/parser_proc.c" /* glr.c:846  */
+#line 5287 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 156: /* constant  */
 #line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_free(&(*(struct psi_const **)(&(*yyvaluep))));}
-#line 5275 "src/parser_proc.c" /* glr.c:846  */
+#line 5293 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 157: /* constant_type  */
 #line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_type_free(&(*(struct psi_const_type **)(&(*yyvaluep))));}
-#line 5281 "src/parser_proc.c" /* glr.c:846  */
+#line 5299 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 158: /* constant_type_token  */
 #line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5287 "src/parser_proc.c" /* glr.c:846  */
+#line 5305 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 159: /* impl_def_val  */
 #line 287 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_def_val_free(&(*(struct psi_impl_def_val **)(&(*yyvaluep))));}
-#line 5293 "src/parser_proc.c" /* glr.c:846  */
+#line 5311 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 160: /* impl_def_val_token  */
 #line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5299 "src/parser_proc.c" /* glr.c:846  */
+#line 5317 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 161: /* decl_typedef  */
 #line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5305 "src/parser_proc.c" /* glr.c:846  */
+#line 5323 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 162: /* typedef  */
 #line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5311 "src/parser_proc.c" /* glr.c:846  */
+#line 5329 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 163: /* typedef_anon  */
 #line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5317 "src/parser_proc.c" /* glr.c:846  */
+#line 5335 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 164: /* typedef_decl  */
 #line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5323 "src/parser_proc.c" /* glr.c:846  */
+#line 5341 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 165: /* typedef_anon_decl  */
 #line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5329 "src/parser_proc.c" /* glr.c:846  */
+#line 5347 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 166: /* qualified_decl_type  */
 #line 293 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 5335 "src/parser_proc.c" /* glr.c:846  */
+#line 5353 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 167: /* decl_type  */
 #line 293 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 5341 "src/parser_proc.c" /* glr.c:846  */
+#line 5359 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 168: /* decl_type_complex  */
 #line 293 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 5347 "src/parser_proc.c" /* glr.c:846  */
+#line 5365 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 169: /* decl_type_simple  */
 #line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5353 "src/parser_proc.c" /* glr.c:846  */
+#line 5371 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 170: /* decl_real_type  */
 #line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5359 "src/parser_proc.c" /* glr.c:846  */
+#line 5377 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 171: /* int_signed  */
 #line 268 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5365 "src/parser_proc.c" /* glr.c:846  */
+#line 5383 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 172: /* int_width  */
 #line 265 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5371 "src/parser_proc.c" /* glr.c:846  */
+#line 5389 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 173: /* decl_int_type  */
 #line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5377 "src/parser_proc.c" /* glr.c:846  */
+#line 5395 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 174: /* int_signed_types  */
 #line 265 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5383 "src/parser_proc.c" /* glr.c:846  */
+#line 5401 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 175: /* signed_short_types  */
 #line 268 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5389 "src/parser_proc.c" /* glr.c:846  */
+#line 5407 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 176: /* signed_long_types  */
 #line 268 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5395 "src/parser_proc.c" /* glr.c:846  */
+#line 5413 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 177: /* int_width_types  */
 #line 265 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5401 "src/parser_proc.c" /* glr.c:846  */
+#line 5419 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 178: /* decl_stmt  */
 #line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5407 "src/parser_proc.c" /* glr.c:846  */
+#line 5425 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 184: /* decl_vars  */
 #line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5413 "src/parser_proc.c" /* glr.c:846  */
+#line 5431 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 189: /* decl  */
 #line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5419 "src/parser_proc.c" /* glr.c:846  */
+#line 5437 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 190: /* decl_body  */
 #line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5425 "src/parser_proc.c" /* glr.c:846  */
+#line 5443 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 191: /* decl_func_body  */
 #line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5431 "src/parser_proc.c" /* glr.c:846  */
+#line 5449 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 192: /* decl_functor_body  */
 #line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5437 "src/parser_proc.c" /* glr.c:846  */
+#line 5455 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 193: /* decl_functor  */
 #line 297 "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 5461 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 194: /* decl_func  */
 #line 297 "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 5467 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 195: /* decl_args  */
 #line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5455 "src/parser_proc.c" /* glr.c:846  */
+#line 5473 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 196: /* decl_anon_arg  */
 #line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5461 "src/parser_proc.c" /* glr.c:846  */
+#line 5479 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 197: /* decl_arg  */
 #line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5467 "src/parser_proc.c" /* glr.c:846  */
+#line 5485 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 198: /* decl_var  */
 #line 299 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_var_free(&(*(struct psi_decl_var **)(&(*yyvaluep))));}
-#line 5473 "src/parser_proc.c" /* glr.c:846  */
+#line 5491 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 199: /* decl_union  */
 #line 303 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_union_free(&(*(struct psi_decl_union **)(&(*yyvaluep))));}
-#line 5479 "src/parser_proc.c" /* glr.c:846  */
+#line 5497 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 200: /* decl_struct  */
 #line 301 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_struct_free(&(*(struct psi_decl_struct **)(&(*yyvaluep))));}
-#line 5485 "src/parser_proc.c" /* glr.c:846  */
+#line 5503 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 201: /* decl_struct_args  */
 #line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5491 "src/parser_proc.c" /* glr.c:846  */
+#line 5509 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 202: /* struct_args_block  */
 #line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5497 "src/parser_proc.c" /* glr.c:846  */
+#line 5515 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 203: /* struct_args  */
 #line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5503 "src/parser_proc.c" /* glr.c:846  */
+#line 5521 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 204: /* struct_arg_var_list  */
 #line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5509 "src/parser_proc.c" /* glr.c:846  */
+#line 5527 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 205: /* decl_vars_with_layout  */
 #line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5515 "src/parser_proc.c" /* glr.c:846  */
+#line 5533 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 206: /* decl_enum  */
 #line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_free(&(*(struct psi_decl_enum **)(&(*yyvaluep))));}
-#line 5521 "src/parser_proc.c" /* glr.c:846  */
+#line 5539 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 207: /* decl_enum_items  */
 #line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5527 "src/parser_proc.c" /* glr.c:846  */
+#line 5545 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 208: /* decl_enum_item  */
 #line 307 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_item_free(&(*(struct psi_decl_enum_item **)(&(*yyvaluep))));}
-#line 5533 "src/parser_proc.c" /* glr.c:846  */
+#line 5551 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 209: /* num_exp  */
 #line 365 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 5539 "src/parser_proc.c" /* glr.c:846  */
+#line 5557 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 210: /* number  */
 #line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5545 "src/parser_proc.c" /* glr.c:846  */
+#line 5563 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 211: /* sizeof  */
 #line 317 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5551 "src/parser_proc.c" /* glr.c:846  */
+#line 5569 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 212: /* sizeof_body  */
 #line 317 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5557 "src/parser_proc.c" /* glr.c:846  */
+#line 5575 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 213: /* sizeof_body_notypes  */
 #line 317 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5563 "src/parser_proc.c" /* glr.c:846  */
+#line 5581 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 214: /* enum_name  */
 #line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5569 "src/parser_proc.c" /* glr.c:846  */
+#line 5587 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 215: /* union_name  */
 #line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5575 "src/parser_proc.c" /* glr.c:846  */
+#line 5593 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 216: /* struct_name  */
 #line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5581 "src/parser_proc.c" /* glr.c:846  */
+#line 5599 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 217: /* optional_name  */
 #line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5587 "src/parser_proc.c" /* glr.c:846  */
+#line 5605 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 218: /* decl_layout  */
 #line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_layout_free(&(*(struct psi_layout **)(&(*yyvaluep))));}
-#line 5593 "src/parser_proc.c" /* glr.c:846  */
+#line 5611 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 219: /* align_and_size  */
 #line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5599 "src/parser_proc.c" /* glr.c:846  */
+#line 5617 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 220: /* array_size  */
 #line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5605 "src/parser_proc.c" /* glr.c:846  */
+#line 5623 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 221: /* indirection  */
 #line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5611 "src/parser_proc.c" /* glr.c:846  */
+#line 5629 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 222: /* pointers  */
 #line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5617 "src/parser_proc.c" /* glr.c:846  */
+#line 5635 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 223: /* asterisks  */
 #line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5623 "src/parser_proc.c" /* glr.c:846  */
+#line 5641 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 225: /* impl  */
 #line 320 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_free(&(*(struct psi_impl **)(&(*yyvaluep))));}
-#line 5629 "src/parser_proc.c" /* glr.c:846  */
+#line 5647 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 226: /* impl_func  */
 #line 322 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_func_free(&(*(struct psi_impl_func **)(&(*yyvaluep))));}
-#line 5635 "src/parser_proc.c" /* glr.c:846  */
+#line 5653 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 227: /* impl_args  */
 #line 362 "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 5659 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 228: /* impl_arg  */
 #line 324 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_arg_free(&(*(struct psi_impl_arg **)(&(*yyvaluep))));}
-#line 5647 "src/parser_proc.c" /* glr.c:846  */
+#line 5665 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 229: /* impl_var  */
 #line 328 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_var_free(&(*(struct psi_impl_var **)(&(*yyvaluep))));}
-#line 5653 "src/parser_proc.c" /* glr.c:846  */
+#line 5671 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 230: /* impl_type  */
 #line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_type_free(&(*(struct psi_impl_type **)(&(*yyvaluep))));}
-#line 5659 "src/parser_proc.c" /* glr.c:846  */
+#line 5677 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 231: /* impl_type_token  */
 #line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5665 "src/parser_proc.c" /* glr.c:846  */
+#line 5683 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 232: /* impl_stmts  */
 #line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5671 "src/parser_proc.c" /* glr.c:846  */
+#line 5689 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 233: /* impl_stmt  */
 #line 358 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_stmt_free(&(*(struct psi_token ***)(&(*yyvaluep))));}
-#line 5677 "src/parser_proc.c" /* glr.c:846  */
+#line 5695 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 234: /* let_stmt  */
 #line 331 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_stmt_free(&(*(struct psi_let_stmt **)(&(*yyvaluep))));}
-#line 5683 "src/parser_proc.c" /* glr.c:846  */
+#line 5701 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 235: /* let_exp  */
 #line 333 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5689 "src/parser_proc.c" /* glr.c:846  */
+#line 5707 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 236: /* let_exp_byref  */
 #line 333 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5695 "src/parser_proc.c" /* glr.c:846  */
+#line 5713 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 237: /* let_exp_assign  */
 #line 333 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5701 "src/parser_proc.c" /* glr.c:846  */
+#line 5719 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 238: /* let_calloc  */
 #line 335 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_calloc_free(&(*(struct psi_let_calloc **)(&(*yyvaluep))));}
-#line 5707 "src/parser_proc.c" /* glr.c:846  */
+#line 5725 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 239: /* let_callback  */
 #line 337 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_callback_free(&(*(struct psi_let_callback **)(&(*yyvaluep))));}
-#line 5713 "src/parser_proc.c" /* glr.c:846  */
+#line 5731 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 240: /* let_func  */
 #line 339 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_func_free(&(*(struct psi_let_func **)(&(*yyvaluep))));}
-#line 5719 "src/parser_proc.c" /* glr.c:846  */
+#line 5737 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 241: /* let_func_token  */
 #line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5725 "src/parser_proc.c" /* glr.c:846  */
+#line 5743 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 242: /* let_func_exps  */
 #line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5731 "src/parser_proc.c" /* glr.c:846  */
+#line 5749 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 243: /* let_exps  */
 #line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5737 "src/parser_proc.c" /* glr.c:846  */
+#line 5755 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 244: /* callback_rval  */
 #line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5743 "src/parser_proc.c" /* glr.c:846  */
+#line 5761 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 245: /* callback_arg_list  */
 #line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5749 "src/parser_proc.c" /* glr.c:846  */
+#line 5767 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 246: /* callback_args  */
 #line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5755 "src/parser_proc.c" /* glr.c:846  */
+#line 5773 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 247: /* return_stmt  */
 #line 349 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_return_stmt_free(&(*(struct psi_return_stmt **)(&(*yyvaluep))));}
-#line 5761 "src/parser_proc.c" /* glr.c:846  */
+#line 5779 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 248: /* return_exp  */
 #line 351 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_return_exp_free(&(*(struct psi_return_exp **)(&(*yyvaluep))));}
-#line 5767 "src/parser_proc.c" /* glr.c:846  */
+#line 5785 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 249: /* call_decl_vars  */
 #line 309 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5773 "src/parser_proc.c" /* glr.c:846  */
+#line 5791 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 250: /* set_stmt  */
 #line 341 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_stmt_free(&(*(struct psi_set_stmt **)(&(*yyvaluep))));}
-#line 5779 "src/parser_proc.c" /* glr.c:846  */
+#line 5797 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 251: /* set_exp  */
 #line 343 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_exp_free(&(*(struct psi_set_exp **)(&(*yyvaluep))));}
-#line 5785 "src/parser_proc.c" /* glr.c:846  */
+#line 5803 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 252: /* set_func  */
 #line 345 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_func_free(&(*(struct psi_set_func **)(&(*yyvaluep))));}
-#line 5791 "src/parser_proc.c" /* glr.c:846  */
+#line 5809 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 253: /* set_func_token  */
 #line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5797 "src/parser_proc.c" /* glr.c:846  */
+#line 5815 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 254: /* set_func_exps  */
 #line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5803 "src/parser_proc.c" /* glr.c:846  */
+#line 5821 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 255: /* set_exps  */
 #line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5809 "src/parser_proc.c" /* glr.c:846  */
+#line 5827 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 256: /* assert_stmt  */
 #line 347 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_assert_stmt_free(&(*(struct psi_assert_stmt **)(&(*yyvaluep))));}
-#line 5815 "src/parser_proc.c" /* glr.c:846  */
+#line 5833 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 257: /* assert_stmt_token  */
 #line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5821 "src/parser_proc.c" /* glr.c:846  */
+#line 5839 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 258: /* free_stmt  */
 #line 353 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_stmt_free(&(*(struct psi_free_stmt **)(&(*yyvaluep))));}
-#line 5827 "src/parser_proc.c" /* glr.c:846  */
+#line 5845 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 259: /* free_exps  */
 #line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5833 "src/parser_proc.c" /* glr.c:846  */
+#line 5851 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 260: /* free_exp  */
 #line 355 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_exp_free(&(*(struct psi_free_exp **)(&(*yyvaluep))));}
-#line 5839 "src/parser_proc.c" /* glr.c:846  */
+#line 5857 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 261: /* reference  */
 #line 372 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5845 "src/parser_proc.c" /* glr.c:846  */
+#line 5863 "src/parser_proc.c" /* glr.c:846  */
         break;
 
 
@@ -5898,7 +5916,7 @@ yylhsNonterm (yyRuleNum yyrule)
 }
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-692)))
+  (!!((Yystate) == (-693)))
 
 /** True iff LR state YYSTATE has only a default reduction (regardless
  *  of token).  */
@@ -7194,7 +7212,7 @@ yyparse (struct psi_parser *P, struct psi_plist *tokens, size_t *index)
 {
 }
 
-#line 7198 "src/parser_proc.c" /* glr.c:2270  */
+#line 7216 "src/parser_proc.c" /* glr.c:2270  */
 
   if (! yyinitGLRStack (yystackp, YYINITDEPTH))
     goto yyexhaustedlab;
@@ -7500,7 +7518,7 @@ yypdumpstack (yyGLRStack* yystackp)
 #define yydebug psi_parser_proc_debug
 #define yynerrs psi_parser_proc_nerrs
 
-#line 2016 "src/parser_proc_grammar.y" /* glr.c:2584  */
+#line 2019 "src/parser_proc_grammar.y" /* glr.c:2584  */
 
 
 /* epilogue */

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index 408a09337ffa4068f44d773fdec703cde58d81e0..9970c40c3d4de0d9308222283d535fa1fe1a04d2 100644 (file)
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -837,8 +837,8 @@ typedef_decl[def]:
 ;
 
 typedef_anon_decl[def]:
-       typedef_decl
-|      qualified_decl_type[type] {
+       typedef_decl %dprec 2
+|      qualified_decl_type[type] %dprec 1 {
        $def = psi_decl_arg_init($type, psi_decl_var_init(NULL, 0, 0));
        $def->var->token = psi_token_copy($type->token);
 }
@@ -975,6 +975,9 @@ int_signed_types[type]:
        %empty {
        $type = NULL;
 }
+|      NAME {
+       $type = psi_token_copy($NAME);
+}
 |      CHAR {
        $type = psi_token_copy($CHAR);
 }
@@ -1222,10 +1225,10 @@ decl_args[args]:
 
 decl_anon_arg[arg]:
 /* FIXME decl_functor_body_anon */
-       decl_arg {
+       decl_arg %dprec 2 {
        $arg = $decl_arg;
 }
-|      qualified_decl_type[type] indirection {
+|      qualified_decl_type[type] indirection %dprec 1 {
        $arg = psi_decl_arg_init(
                $type, 
                psi_decl_var_init(NULL, $indirection, 0)

diff --git a/src/token.c b/src/token.c
index 5f177c43c5d6af795f945e6bc37de9557dbb2677..f9b69f68ba0bf738115c8b53bb2c65af1da58840 100644 (file)
--- a/src/token.c
+++ b/src/token.c
@@ -199,7 +199,7 @@ void psi_token_dump(int fd, struct psi_token *t)
 {
        size_t i;
 
-       dprintf(fd, "TOKEN %p (%d) ", t, t->type);
+       dprintf(fd, "TOKEN %p (%ld) ", t, t->type);
        if (t->type == PSI_T_EOF) {
                dprintf(fd, "EOF");
        } else {

diff --git a/src/token.h b/src/token.h
index 643864662d82bb5f54eeabb34d3dad71e220d5ee..6fc78753ea8c9264b3982ab7f98584cc6141bd4d 100644 (file)
--- a/src/token.h
+++ b/src/token.h
@@ -89,15 +89,29 @@ static inline size_t psi_offset_padding(size_t diff, size_t alignment) {
 # 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 PSI_T_INT64 (PSI_T_LONG << 0xa)
+# define PSI_T_UINT64 -(PSI_T_LONG << 0xa)
 # 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;
+#if HAVE_INT128
+# define PSI_T_INT128 (PSI_T_LONG << 0xb)
+# define PSI_T_UINT128 -(PSI_T_LONG << 0xb)
+# define SIZEOF_INT128_T SIZEOF___INT128
+# define SIZEOF_UINT128_T SIZEOF_UNSIGNED___INT128
+# define ALIGNOF_INT128_T ALIGNOF___INT128
+# define ALIGNOF_UINT128_T ALIGNOF___INT128
+# define INT128_MAX ((__int128) (UINT128_MAX >> 1))
+# define INT128_MIN (-INT128_MAX-1)
+# define UINT128_MAX ((unsigned __int128) ~ 0)
+typedef __int128 int128_t;
+typedef unsigned __int128 uint128_t;
+#endif
+
+typedef int64_t token_t;
 
 static inline size_t psi_t_alignment(token_t t)
 {
@@ -111,6 +125,10 @@ static inline size_t psi_t_alignment(token_t t)
        PSI_ALIGNOF(UINT32);
        PSI_ALIGNOF(INT64);
        PSI_ALIGNOF(UINT64);
+#if HAVE_INT128
+       PSI_ALIGNOF(INT128);
+       PSI_ALIGNOF(UINT128);
+#endif
        case PSI_T_FLOAT:
                return ALIGNOF_FLOAT;
        case PSI_T_DOUBLE:
@@ -142,6 +160,10 @@ static inline size_t psi_t_size(token_t t)
        PSI_SIZEOF(UINT32);
        PSI_SIZEOF(INT64);
        PSI_SIZEOF(UINT64);
+#if HAVE_INT128
+       PSI_SIZEOF(INT128);
+       PSI_SIZEOF(UINT128);
+#endif
        case PSI_T_FLOAT:
                return SIZEOF_FLOAT;
        case PSI_T_DOUBLE:

diff --git a/src/types/impl_val.h b/src/types/impl_val.h
index 1e6c119f06e61974c2b4d48c76fd1f89c9ccd38f..69c31b65fcf54bd18635bb0933b88d52b98bc99a 100644 (file)
--- a/src/types/impl_val.h
+++ b/src/types/impl_val.h
@@ -43,6 +43,10 @@ typedef union impl_val {
        uint32_t u32;
        int64_t i64;
        uint64_t u64;
+#if HAVE_INT128
+       int128_t i128;
+       uint128_t u128;
+#endif
        float fval;
        double dval;
 #ifdef HAVE_LONG_DOUBLE

diff --git a/src/types/number.c b/src/types/number.c
index 5f44f6d0cc5bf3b4605b59538039357400bd87c2..523ea5b77205e71539681feac7385e999f24efb9 100644 (file)
--- a/src/types/number.c
+++ b/src/types/number.c
@@ -558,7 +558,7 @@ static inline token_t psi_number_eval_constant(struct psi_number *exp,
                if (frame) PSI_DEBUG_PRINT(frame->context, " %" PRIdval, res->dval);
                return PSI_T_DOUBLE;
        default:
-               if (frame) PSI_DEBUG_PRINT(frame->context, " ?(t=%d)", exp->data.cnst->type->type);
+               if (frame) PSI_DEBUG_PRINT(frame->context, " ?(t=%ld)", exp->data.cnst->type->type);
                return 0;
        }
 }