bitfield support

diff --git a/src/context.c b/src/context.c
index d1eb05e35323aed7137f258c808b24420cb402e6..584994f3fd38be672509fca4f49ea15ae26d5c1d 100644 (file)
--- a/src/context.c
+++ b/src/context.c
@@ -146,7 +146,7 @@ struct psi_context *psi_context_init(struct psi_context *C, struct psi_context_o
                        type = psi_decl_type_init(member->type_tag, member->type_name);
                        dvar = psi_decl_var_init(member->var_name, member->pointer_level, member->array_size);
                        darg = psi_decl_arg_init(type, dvar);
-                       darg->layout = psi_layout_init(member->offset, member->size);
+                       darg->layout = psi_layout_init(member->offset, member->size, NULL);
 
                        switch (predef_composite->type_tag) {
                        case PSI_T_STRUCT:

diff --git a/src/libffi.c b/src/libffi.c
index 644b0fed5d8b6d70f64dd34205d62081653b34cd..f607c39a9c3ba15e049b294d06a7f8e602d052ee 100644 (file)
--- a/src/libffi.c
+++ b/src/libffi.c
@@ -300,14 +300,21 @@ static size_t psi_ffi_struct_type_pad(ffi_type **els, size_t padding) {
 }
 
 static ffi_type **psi_ffi_struct_type_elements(struct psi_decl_struct *strct) {
-       size_t i = 0, argc = psi_plist_count(strct->args), nels = 0, offset = 0, maxalign = 0;
+       size_t i = 0, argc = psi_plist_count(strct->args), nels = 0, offset = 0, maxalign = 0, last_arg_pos = -1;
        ffi_type **tmp, **els = calloc(argc + 1, sizeof(*els));
        struct psi_decl_arg *darg;
 
        while (psi_plist_get(strct->args, i++, &darg)) {
-               ffi_type *type = malloc(sizeof(*type));
+               ffi_type *type;
                size_t padding;
 
+               if (darg->layout->pos == last_arg_pos) {
+                       /* skip bit fields */
+                       continue;
+               }
+               last_arg_pos = darg->layout->pos;
+
+               type = malloc(sizeof(*type));
                *type = *psi_ffi_decl_arg_type(darg);
 
                if (type->alignment > maxalign) {

diff --git a/src/libjit.c b/src/libjit.c
index a32742a1f709e05649ceee603a0f2fc8a8960522..51bdec5830cf63e524954c49f4b8df3c2c1c07d4 100644 (file)
--- a/src/libjit.c
+++ b/src/libjit.c
@@ -128,15 +128,23 @@ static unsigned psi_jit_struct_type_elements(struct psi_decl_struct *strct,
                jit_type_t **fields)
 {
        size_t i = 0, argc = psi_plist_count(strct->args), nels = 0, offset = 0,
-                       maxalign;
+                       maxalign, last_arg_pos = -1;
        struct psi_decl_arg *darg;
 
        *fields = calloc(argc + 1, sizeof(*fields));
 
        while (psi_plist_get(strct->args, i++, &darg)) {
-               jit_type_t type = jit_type_copy(psi_jit_decl_arg_type(darg));
+               jit_type_t type;
                size_t padding, alignment;
 
+               if (darg->layout->pos == last_arg_pos) {
+                       /* skip bit fields */
+                       continue;
+               }
+               last_arg_pos = darg->layout->pos;
+
+               type = jit_type_copy(psi_jit_decl_arg_type(darg));
+
                if ((alignment = jit_type_get_alignment(type)) > maxalign) {
                        maxalign = alignment;
                }

diff --git a/src/parser.c b/src/parser.c
index 862c9ad1511f3aa7d1525498d2a3bc05002f5ce4..30cbbbff7bc8505428592e8629b2ce9dcaae9cc7 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 on Thu Mar 30 16:01:25 2017 */
+/* Generated by re2c 0.16 on Fri Mar 31 10:18:09 2017 */
 #line 1 "src/parser.re"
 /*******************************************************************************
  Copyright (c) 2016, Michael Wallner <mike@php.net>.
@@ -10347,30 +10347,41 @@ yy596:
                        }
 yy600:
                        ++cur;
-#line 461 "src/parser.re"
-                       { goto character; }
+#line 471 "src/parser.re"
+                       { escaped = false; goto character; }
 #line 10353 "src/parser.c"
 yy602:
                        ++cur;
-#line 459 "src/parser.re"
+#line 458 "src/parser.re"
                        { NEWLINE(); goto character; }
 #line 10358 "src/parser.c"
 yy604:
                        ++cur;
-#line 458 "src/parser.re"
-                       { if (escaped) goto character; cur -= 1; NEWTOKEN(PSI_T_QUOTED_CHAR); cur += 1; token->flags = char_width; goto start; }
-#line 10363 "src/parser.c"
+#line 460 "src/parser.re"
+                       {
+                       if (escaped) {
+                               escaped = false;
+                               goto character;
+                       }
+                       cur -= 1;
+                       NEWTOKEN(PSI_T_QUOTED_CHAR);
+                       cur += 1;
+                       token->flags = char_width;
+                       goto start;
+               }
+#line 10373 "src/parser.c"
 yy606:
                        ++cur;
-#line 460 "src/parser.re"
+#line 459 "src/parser.re"
                        { escaped = !escaped; }
-#line 10368 "src/parser.c"
+#line 10378 "src/parser.c"
                }
-#line 463 "src/parser.re"
+#line 473 "src/parser.re"
+
 
        string: ;
                
-#line 10374 "src/parser.c"
+#line 10385 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10384,31 +10395,41 @@ yy606:
                        }
 yy610:
                        ++cur;
-#line 470 "src/parser.re"
-                       { goto string; }
-#line 10390 "src/parser.c"
+#line 491 "src/parser.re"
+                       { escaped = false; goto string; }
+#line 10401 "src/parser.c"
 yy612:
                        ++cur;
-#line 468 "src/parser.re"
+#line 478 "src/parser.re"
                        { NEWLINE(); goto string; }
-#line 10395 "src/parser.c"
+#line 10406 "src/parser.c"
 yy614:
                        ++cur;
-#line 467 "src/parser.re"
-                       { if (escaped) goto string; cur -= 1; NEWTOKEN(PSI_T_QUOTED_STRING); cur += 1; token->flags = char_width; goto start; }
-#line 10400 "src/parser.c"
+#line 480 "src/parser.re"
+                       {
+                       if (escaped) {
+                               escaped = false;
+                               goto string;
+                       }
+                       cur -= 1;
+                       NEWTOKEN(PSI_T_QUOTED_STRING);
+                       cur += 1;
+                       token->flags = char_width;
+                       goto start;
+               }
+#line 10421 "src/parser.c"
 yy616:
                        ++cur;
-#line 469 "src/parser.re"
+#line 479 "src/parser.re"
                        { escaped = !escaped; goto string; }
-#line 10405 "src/parser.c"
+#line 10426 "src/parser.c"
                }
-#line 472 "src/parser.re"
+#line 493 "src/parser.re"
 
 
        comment: ;
                
-#line 10412 "src/parser.c"
+#line 10433 "src/parser.c"
                {
                        unsigned char yych;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
@@ -10422,14 +10443,14 @@ yy616:
 yy620:
                        ++cur;
 yy621:
-#line 479 "src/parser.re"
+#line 500 "src/parser.re"
                        { goto comment; }
-#line 10428 "src/parser.c"
+#line 10449 "src/parser.c"
 yy622:
                        ++cur;
-#line 477 "src/parser.re"
+#line 498 "src/parser.re"
                        { NEWLINE(); goto comment; }
-#line 10433 "src/parser.c"
+#line 10454 "src/parser.c"
 yy624:
                        yych = *++cur;
                        switch (yych) {
@@ -10438,16 +10459,16 @@ yy624:
                        }
 yy625:
                        ++cur;
-#line 478 "src/parser.re"
+#line 499 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); goto start; }
-#line 10444 "src/parser.c"
+#line 10465 "src/parser.c"
                }
-#line 481 "src/parser.re"
+#line 502 "src/parser.re"
 
 
        comment_sl: ;
                
-#line 10451 "src/parser.c"
+#line 10472 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10459,22 +10480,22 @@ yy625:
                        }
 yy629:
                        ++cur;
-#line 487 "src/parser.re"
+#line 508 "src/parser.re"
                        { goto comment_sl; }
-#line 10465 "src/parser.c"
+#line 10486 "src/parser.c"
 yy631:
                        ++cur;
-#line 486 "src/parser.re"
+#line 507 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); NEWLINE(); goto start; }
-#line 10470 "src/parser.c"
+#line 10491 "src/parser.c"
                }
-#line 489 "src/parser.re"
+#line 510 "src/parser.re"
 
 
        cpp_attribute: ;
 
                
-#line 10478 "src/parser.c"
+#line 10499 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10488,26 +10509,26 @@ yy631:
                        }
 yy635:
                        ++cur;
-#line 498 "src/parser.re"
+#line 519 "src/parser.re"
                        { goto cpp_attribute; }
-#line 10494 "src/parser.c"
+#line 10515 "src/parser.c"
 yy637:
                        ++cur;
-#line 497 "src/parser.re"
+#line 518 "src/parser.re"
                        { NEWLINE(); goto cpp_attribute; }
-#line 10499 "src/parser.c"
+#line 10520 "src/parser.c"
 yy639:
                        ++cur;
-#line 495 "src/parser.re"
+#line 516 "src/parser.re"
                        { ++parens; goto cpp_attribute; }
-#line 10504 "src/parser.c"
+#line 10525 "src/parser.c"
 yy641:
                        ++cur;
-#line 496 "src/parser.re"
+#line 517 "src/parser.re"
                        { if (parens == 1) { NEWTOKEN(PSI_T_CPP_ATTRIBUTE); goto start; } else { --parens; goto cpp_attribute; } }
-#line 10509 "src/parser.c"
+#line 10530 "src/parser.c"
                }
-#line 500 "src/parser.re"
+#line 521 "src/parser.re"
 
 error: ;
 

diff --git a/src/parser_proc.c b/src/parser_proc.c
index 2b125639371eadfb3ccab8dc15ae4c611699c745..dcaa7aba4ded6e9cb6e308fc5b72508efb950234 100644 (file)
--- a/src/parser_proc.c
+++ b/src/parser_proc.c
@@ -287,16 +287,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  165
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   3031
+#define YYLAST   3136
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  132
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  119
+#define YYNNTS  121
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  468
+#define YYNRULES  472
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  685
+#define YYNSTATES  696
 /* 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
@@ -392,19 +392,20 @@ static const unsigned short int yyrline[] =
      979,   985,   988,   994,   995,  1002,  1003,  1007,  1014,  1025,
     1032,  1043,  1050,  1061,  1072,  1086,  1087,  1099,  1102,  1105,
     1108,  1114,  1122,  1125,  1135,  1148,  1153,  1161,  1171,  1181,
-    1184,  1188,  1194,  1198,  1212,  1216,  1233,  1240,  1243,  1249,
-    1254,  1262,  1266,  1270,  1274,  1278,  1282,  1289,  1293,  1297,
-    1301,  1308,  1321,  1334,  1347,  1350,  1357,  1360,  1366,  1370,
-    1377,  1380,  1386,  1389,  1395,  1396,  1402,  1405,  1417,  1420,
-    1427,  1432,  1437,  1447,  1450,  1456,  1459,  1465,  1472,  1479,
-    1480,  1481,  1482,  1483,  1484,  1485,  1486,  1487,  1491,  1494,
-    1500,  1503,  1506,  1509,  1512,  1518,  1522,  1530,  1531,  1535,
-    1542,  1545,  1548,  1551,  1554,  1560,  1564,  1572,  1579,  1587,
-    1595,  1596,  1597,  1598,  1599,  1600,  1601,  1602,  1603,  1604,
-    1608,  1611,  1617,  1620,  1626,  1627,  1631,  1634,  1640,  1643,
-    1649,  1656,  1663,  1666,  1669,  1676,  1681,  1689,  1690,  1691,
-    1692,  1693,  1694,  1695,  1696,  1700,  1703,  1709,  1712,  1718,
-    1725,  1726,  1730,  1737,  1740,  1746,  1754,  1757,  1763
+    1184,  1188,  1194,  1208,  1225,  1228,  1234,  1241,  1251,  1258,
+    1261,  1267,  1272,  1280,  1284,  1288,  1292,  1296,  1300,  1307,
+    1311,  1315,  1319,  1326,  1339,  1352,  1365,  1368,  1375,  1378,
+    1381,  1384,  1390,  1394,  1401,  1404,  1410,  1413,  1419,  1420,
+    1426,  1429,  1441,  1444,  1451,  1456,  1461,  1471,  1474,  1480,
+    1483,  1489,  1496,  1503,  1504,  1505,  1506,  1507,  1508,  1509,
+    1510,  1511,  1515,  1518,  1524,  1527,  1530,  1533,  1536,  1542,
+    1546,  1554,  1555,  1559,  1566,  1569,  1572,  1575,  1578,  1584,
+    1588,  1596,  1603,  1611,  1619,  1620,  1621,  1622,  1623,  1624,
+    1625,  1626,  1627,  1628,  1632,  1635,  1641,  1644,  1650,  1651,
+    1655,  1658,  1664,  1667,  1673,  1680,  1687,  1690,  1693,  1700,
+    1705,  1713,  1714,  1715,  1716,  1717,  1718,  1719,  1720,  1724,
+    1727,  1733,  1736,  1742,  1749,  1750,  1754,  1761,  1764,  1770,
+    1778,  1781,  1787
 };
 #endif
 
@@ -451,49 +452,49 @@ static const char *const yytname[] =
   "decl", "decl_body", "decl_func_body", "decl_functor_body",
   "decl_functor", "decl_func", "decl_args", "decl_arg", "decl_var",
   "decl_union", "decl_struct", "decl_struct_args", "struct_args_block",
-  "struct_args", "decl_enum", "decl_enum_items", "decl_enum_item",
-  "num_exp", "number", "enum_name", "union_name", "struct_name",
-  "optional_name", "decl_layout", "align_and_size", "array_size",
-  "indirection", "pointers", "asterisks", "impl", "impl_func", "impl_args",
-  "impl_arg", "impl_var", "impl_type", "impl_type_token", "impl_stmts",
-  "impl_stmt", "let_stmt", "let_exp", "let_exp_byref", "let_exp_assign",
-  "let_calloc", "let_callback", "let_func", "let_func_token",
-  "let_func_exps", "let_exps", "callback_rval", "callback_arg_list",
-  "callback_args", "return_stmt", "set_stmt", "set_exp", "set_func",
-  "set_func_token", "set_func_exps", "set_exps", "assert_stmt",
-  "assert_stmt_token", "free_stmt", "free_exps", "free_exp", "reference",
-  "byref", YY_NULLPTR
+  "struct_args", "struct_arg_var_list", "decl_vars_with_layout",
+  "decl_enum", "decl_enum_items", "decl_enum_item", "num_exp", "number",
+  "enum_name", "union_name", "struct_name", "optional_name", "decl_layout",
+  "align_and_size", "array_size", "indirection", "pointers", "asterisks",
+  "impl", "impl_func", "impl_args", "impl_arg", "impl_var", "impl_type",
+  "impl_type_token", "impl_stmts", "impl_stmt", "let_stmt", "let_exp",
+  "let_exp_byref", "let_exp_assign", "let_calloc", "let_callback",
+  "let_func", "let_func_token", "let_func_exps", "let_exps",
+  "callback_rval", "callback_arg_list", "callback_args", "return_stmt",
+  "set_stmt", "set_exp", "set_func", "set_func_token", "set_func_exps",
+  "set_exps", "assert_stmt", "assert_stmt_token", "free_stmt", "free_exps",
+  "free_exp", "reference", "byref", YY_NULLPTR
 };
 #endif
 
 #define YYPACT_NINF -540
-#define YYTABLE_NINF -467
+#define YYTABLE_NINF -471
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const short int yypact[] =
 {
-     924,  -540,  -540,  -540,  -540,  -540,    31,  -540,  -540,  2059,
-    -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  2586,  -540,
-    -540,   247,  2613,  2442,  2442,  2442,   248,    46,    19,    86,
-    -540,  2663,   124,   924,  -540,  -540,  -540,  -540,  -540,  2108,
-    -540,  -540,  -540,  -540,  -540,    73,    56,  -540,  -540,  -540,
-     110,    24,  -540,  -540,    15,   137,   150,  -540,  -540,  -540,
-    -540,   135,  -540,   140,  -540,  -540,  -540,  -540,  -540,   634,
-    -540,   146,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
+     932,  -540,  -540,  -540,  -540,  -540,   153,  -540,  -540,  2000,
+    -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  2605,  -540,
+    -540,   385,  2633,  2383,  2383,  2383,  2501,    21,   -57,     9,
+    -540,  2660,    97,   932,  -540,  -540,  -540,  -540,  -540,  2049,
+    -540,  -540,  -540,  -540,  -540,    60,    81,  -540,  -540,  -540,
+      40,   -27,  -540,  -540,    80,    76,   103,  -540,  -540,  -540,
+    -540,   105,  -540,   113,  -540,  -540,  -540,  -540,  -540,   642,
+    -540,    64,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
     -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
     -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
-    -540,  2226,   -16,  -540,  -540,  -540,  2442,  2442,  2442,  2767,
-    -540,    11,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
-    -540,  -540,  -540,  -540,   883,  -540,  -540,  -540,  -540,   182,
-     764,   764,    -5,  -540,   883,  1941,  2442,  2442,   184,  1705,
-    -540,  -540,   181,  2442,   183,   183,    81,    81,   180,  -540,
-    -540,   192,   194,  -540,   146,   196,  -540,  -540,   191,   187,
-    -540,   201,  -540,  2690,    24,  -540,  -540,   189,  -540,   199,
-    2442,  -540,   228,  -540,    78,  -540,  -540,    73,  -540,  -540,
-     200,   204,  2717,  2717,  2442,   113,  2442,  -540,   146,  -540,
-    -540,  -540,  -540,  -540,  -540,  2108,  -540,  -540,  -540,  -540,
-    -540,  -540,   126,   764,  -540,  -540,  -540,  -540,  -540,  -540,
+    -540,  2167,   -13,  -540,  -540,  -540,  2383,  2383,  2383,  2764,
+    -540,   106,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
+    -540,  -540,  -540,  -540,   891,  -540,  -540,  -540,  -540,   139,
+     772,   772,    -8,  -540,   891,  1882,  2383,  2383,   140,   516,
+    -540,  -540,   141,  2383,   174,   174,    42,    42,   177,  -540,
+    -540,   151,   185,  -540,    64,   190,  -540,  -540,   186,   180,
+    -540,   193,  -540,  2710,   -27,  -540,  -540,   181,  -540,   189,
+    2383,  -540,   222,  -540,    67,  -540,  -540,    60,  -540,  -540,
+     191,   203,  2737,  2737,  2383,   100,  2383,  -540,    64,  -540,
+    -540,  -540,  -540,  -540,  -540,  2049,  -540,  -540,  -540,  -540,
+    -540,  -540,   107,   772,  -540,  -540,  -540,  -540,  -540,  -540,
     -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
     -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
     -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
@@ -506,42 +507,43 @@ static const short int yypact[] =
     -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
     -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
     -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
-     764,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  1941,
-    -540,  -540,  -540,  -540,  2275,  1941,   223,  2888,    32,  -540,
-      32,  -540,  -540,  -540,  -540,   234,   237,   237,    83,    83,
-    2393,   230,  -540,   113,   243,   255,   264,  -540,   146,   189,
-    -540,  -540,  -540,  -540,  -540,  -540,   265,  -540,    10,    54,
-    -540,   121,   252,   103,  -540,  2108,  1520,  2108,  2442,    74,
-    -540,  -540,   144,  -540,  -540,  -540,  -540,  -540,  1823,  -540,
-     261,  2442,   262,  -540,  2442,   263,  -540,  -540,   478,  2442,
-    -540,  -540,  1941,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
+     772,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  1882,
+    -540,  -540,  -540,  -540,  2216,  1882,   206,  2993,    96,  -540,
+      96,  -540,  -540,  -540,  -540,   204,   205,   205,    49,    49,
+    2334,   202,  -540,   100,   213,   221,   226,  -540,    64,   181,
+    -540,  -540,  -540,  -540,  -540,  -540,   227,  -540,    -1,   119,
+    -540,   134,   214,    83,  -540,  2049,  1528,  2049,  2383,    90,
+    -540,  -540,    93,  -540,  -540,  -540,  -540,  -540,  1764,  -540,
+     223,  2383,   224,  -540,  2383,   230,  -540,  -540,  2836,  2383,
+    -540,  -540,  1882,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
     -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,
-    -540,  1941,  1941,   266,  2613,  2108,  2108,  -540,  -540,  -540,
-    -540,   146,  -540,    68,   251,    44,  -540,   258,  2442,  -540,
-    -540,     4,   189,  1018,   189,  2559,  1823,  2442,  -540,   259,
-     271,  -540,  -540,  -540,  1048,  1823,  -540,  2912,  -540,   268,
-     273,  -540,   277,   279,   270,   293,   111,  -540,  -540,   280,
-     277,  -540,  -540,   409,  -540,   298,  2108,  2442,  -540,   304,
-    2888,   305,   307,  2839,  -540,   312,   125,  1677,  -540,  -540,
-    2442,  -540,  -540,  -540,  -540,  -540,   319,  -540,  -540,  -540,
-    -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,   317,   133,
-    -540,    86,  -540,  -540,   320,  -540,  -540,  -540,    10,   321,
-    -540,  -540,   322,  2912,  -540,  1166,  -540,   323,  2794,   324,
-     548,  -540,  1823,  1823,  1520,  -540,  2108,  -540,    86,  2108,
-    -540,  2442,  -540,  -540,  -540,  -540,  -540,   326,   327,  -540,
-    -540,  1941,  1941,   328,  2108,   325,   332,  -540,   139,   331,
-    -540,   274,   330,   274,   329,  -540,   189,   189,  -540,    97,
-     334,  2912,  -540,  -540,  -540,  -540,   335,  1638,  1823,  -540,
-    2864,  -540,  -540,   336,  2108,   156,  -540,   764,  2442,  2888,
-    2936,   344,   112,   340,  -540,  2108,   342,  -540,  -540,   274,
-    -540,    86,    68,  -540,  -540,  -540,  -540,  -540,   343,  1823,
-      86,  -540,  -540,  1823,  1284,   345,   346,  -540,  -540,  -540,
-     347,  -540,   349,   134,  -540,  -540,     1,  -540,    86,  2812,
-     348,  2960,   350,  -540,   351,  -540,  -540,  -540,   352,  -540,
-     355,   356,  1823,  1166,   354,  -540,  1520,   357,   360,  1402,
-    2782,   259,  -540,  -540,  -540,   362,  1638,  -540,  -540,   361,
-     363,   364,   365,  -540,  -540,  1166,  -540,  -540,   274,   368,
-    1520,  -540,  -540,  -540,  -540
+    -540,  1882,  1882,   231,  2633,  2049,  2049,  -540,  -540,  -540,
+    -540,    64,  -540,    29,   135,    35,  -540,   225,  2383,  -540,
+    -540,    56,   181,  1026,   181,  2528,  1764,  2383,  -540,   236,
+     234,  -540,  -540,  -540,  1056,  1764,  -540,  3017,  -540,   237,
+     235,  -540,   246,   253,   241,   250,    88,  -540,  -540,   252,
+     246,  -540,  -540,  2809,  -540,   251,  2049,  2383,  -540,   255,
+    2993,   256,   257,  2944,  -540,   259,   258,  2556,  -540,  -540,
+    2383,  -540,  -540,  -540,  -540,  -540,   261,  -540,  -540,  -540,
+    -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,   262,   150,
+    -540,     9,  -540,  -540,   265,  -540,  -540,  -540,    -1,   266,
+    -540,  -540,   267,  3017,  -540,  1174,  -540,   269,  2812,   270,
+    2866,  -540,  1764,  1764,  1528,  -540,  2049,  -540,     9,  2049,
+    -540,  2383,  -540,  -540,  -540,  -540,  -540,   271,   260,  -540,
+    -540,  1882,  1882,   274,    20,   276,  -540,   258,   272,  -540,
+     240,   277,   240,   273,  -540,   181,   181,  -540,   168,   282,
+    3017,  -540,  -540,  -540,  -540,   283,  1646,  1764,  -540,  2969,
+    -540,  -540,   284,  2049,   172,  -540,   772,  2383,  2993,  3041,
+     263,   281,   285,  2049,   288,   276,  -540,  -540,   240,  -540,
+       9,    29,  -540,  -540,  -540,  -540,  -540,   289,  1764,     9,
+    -540,  -540,  1764,  1292,   287,   292,  -540,  -540,  -540,   291,
+     290,   299,   258,   293,  -540,   297,  -540,     1,  -540,     9,
+    2919,   295,  3065,   298,  -540,   300,  -540,  -540,  -540,   301,
+     303,  -540,  2049,  -540,   306,   307,  1764,  1174,   305,  -540,
+    1528,   314,   316,   258,   311,  1410,  2893,   236,  -540,  -540,
+    -540,   312,  1646,  -540,  -540,   313,   315,  -540,   310,   317,
+     318,  -540,  -540,  1174,  -540,   322,  -540,   240,   320,  1528,
+    -540,   321,  -540,  -540,  -540,  -540
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -551,24 +553,24 @@ static const unsigned short int yydefact[] =
 {
      163,   284,   281,   285,   279,   280,   282,   268,   269,     0,
      271,   272,   273,   274,   275,   276,   277,   278,   267,   168,
-     167,     0,     0,     0,     0,   364,     0,     0,     0,   466,
-     169,     0,     0,   164,   165,   171,   170,   172,   175,   372,
+     167,     0,     0,     0,     0,   366,     0,     0,     0,   470,
+     169,     0,     0,   164,   165,   171,   170,   172,   175,   376,
      258,   260,   259,   265,   266,   288,   298,   264,   173,   174,
        0,   303,   313,   315,   316,     0,     0,   325,   177,   176,
-     178,     0,   179,     0,   283,   270,    32,    33,   454,   420,
-      24,   372,   376,    38,    37,    36,    34,    35,    31,    30,
-      28,    27,    25,    26,   428,   427,   425,   423,   424,   426,
-     422,   421,   429,    29,   452,   450,   449,   451,   448,   447,
-     326,     0,   374,    39,    40,   267,     0,     0,     0,     0,
+     178,     0,   179,     0,   283,   270,    32,    33,   458,   424,
+      24,   376,   380,    38,    37,    36,    34,    35,    31,    30,
+      28,    27,    25,    26,   432,   431,   429,   427,   428,   430,
+     426,   425,   433,    29,   456,   454,   453,   455,   452,   451,
+     326,     0,   378,    39,    40,   267,     0,     0,     0,     0,
      314,   309,   181,   192,   189,   191,   193,   194,   205,   202,
      203,   200,   206,   201,     0,   204,   195,   196,   197,     0,
-     219,   219,     0,   185,     0,     0,   364,   364,     0,   372,
-     252,   331,   251,     0,   368,   368,   261,   262,   263,   361,
+     219,   219,     0,   185,     0,     0,   366,   366,     0,   376,
+     252,   331,   251,     0,   372,   372,   261,   262,   263,   363,
      239,   285,   268,   242,     0,     0,   238,   257,     0,     0,
-     468,     0,   467,   267,   303,     1,   166,   370,   332,     0,
-     373,   289,   293,   291,   295,   286,   299,   288,   287,   307,
-       0,     0,   327,   327,     0,     0,     0,   373,   372,   334,
-     377,   375,   261,   262,   263,     0,   308,   208,   209,   210,
+     472,     0,   471,   267,   303,     1,   166,   374,   332,     0,
+     377,   289,   293,   291,   295,   286,   299,   288,   287,   307,
+       0,     0,   327,   327,     0,     0,     0,   377,   376,   334,
+     381,   379,   261,   262,   263,     0,   308,   208,   209,   210,
      212,   211,   207,   219,   187,   182,    74,    41,    42,    43,
       44,    45,    46,    47,    48,    49,    50,    51,    52,    53,
       54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
@@ -583,58 +585,60 @@ static const unsigned short int yydefact[] =
      145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
      155,   156,   157,   158,   161,   159,   160,   162,   221,   190,
      220,   183,   198,   199,   184,   207,   186,   229,   230,     0,
-      22,    23,    20,    21,     0,     0,   231,   188,   261,   363,
-     262,   362,   250,   256,   253,     0,     0,     0,     0,     0,
-       0,     0,   180,     0,     0,     0,     0,   336,   372,   370,
+      22,    23,    20,    21,     0,     0,   231,   188,   261,   365,
+     262,   364,   250,   256,   253,     0,     0,     0,     0,     0,
+       0,     0,   180,     0,     0,     0,     0,   336,   376,   374,
      294,   290,   296,   297,   292,   300,     0,   301,   328,     0,
-     329,     0,   349,     0,   347,     0,   466,     0,     0,     0,
-     460,   461,     0,   398,   401,   400,   402,   403,     0,   404,
+     329,     0,   351,     0,   349,     0,   470,     0,     0,     0,
+     464,   465,     0,   402,   405,   404,   406,   407,     0,   408,
        0,     0,   310,   311,     0,     0,   214,   222,     0,     0,
      227,   224,   233,     2,     3,     4,     5,     6,     7,     8,
        9,    10,    11,    13,    12,    14,    15,    16,    17,    18,
       19,     0,     0,     0,     0,     0,     0,   339,   338,   340,
-     337,   372,   333,   243,     0,     0,   302,     0,     0,   335,
-     305,     0,   370,     0,   370,     0,     0,     0,   346,     0,
-       0,   358,   357,   359,     0,     0,   360,   443,   351,     0,
-       0,   442,    40,     0,     0,     0,     0,   463,   453,     0,
-       0,   378,   399,     0,   324,     0,     0,   215,   223,     0,
-     235,     0,   234,     0,   225,     0,   366,     0,   255,   254,
-       0,   245,   247,   248,   246,   249,     0,   244,   379,   391,
-     392,   393,   394,   390,   395,   396,   397,   389,     0,     0,
-     383,   466,   388,   371,     0,   306,   304,   319,     0,     0,
-     330,   317,     0,   350,   348,     0,   405,    24,     0,     0,
-       0,   355,     0,     0,   466,   441,     0,   387,   466,     0,
-     462,     0,   440,   459,   323,   312,   217,     0,   216,   228,
-     232,     0,     0,     0,     0,     0,     0,   341,   366,     0,
-     237,     0,     0,     0,   385,   321,   370,   370,   410,    30,
-      29,   414,   415,   411,   412,   413,    39,     0,     0,   353,
-       0,   354,   444,   455,     0,     0,   464,   219,     0,   236,
-     226,     0,     0,     0,   342,     0,     0,   322,   380,     0,
-     384,   466,   243,   320,   318,   434,   420,   435,     0,     0,
-     466,   416,   352,     0,   466,     0,     0,   465,   213,   218,
-       0,   343,     0,     0,   344,   381,     0,   386,   466,     0,
-     430,   356,     0,   457,   456,   445,   406,   369,     0,   345,
-       0,     0,     0,     0,     0,   446,   466,     0,     0,   436,
-       0,   360,   432,   409,   407,   431,     0,   419,   458,     0,
-       0,     0,   437,   438,   417,     0,   408,   367,     0,     0,
-     466,   433,   382,   418,   439
+     337,   376,   333,   243,     0,     0,   302,     0,     0,   335,
+     305,     0,   374,     0,   374,     0,     0,     0,   348,     0,
+       0,   360,   359,   361,     0,     0,   362,   447,   353,     0,
+       0,   446,    40,     0,     0,     0,     0,   467,   457,     0,
+       0,   382,   403,     0,   324,     0,     0,   215,   223,     0,
+     235,     0,   234,     0,   225,     0,   368,     0,   255,   254,
+       0,   245,   247,   248,   246,   249,     0,   244,   383,   395,
+     396,   397,   398,   394,   399,   400,   401,   393,     0,     0,
+     387,   470,   392,   375,     0,   306,   304,   319,     0,     0,
+     330,   317,     0,   352,   350,     0,   409,    24,     0,     0,
+       0,   357,     0,     0,   470,   445,     0,   391,   470,     0,
+     466,     0,   444,   463,   323,   312,   217,     0,   216,   228,
+     232,     0,     0,     0,     0,   344,   341,   368,     0,   237,
+       0,     0,     0,   389,   321,   374,   374,   414,    30,    29,
+     418,   419,   415,   416,   417,    39,     0,     0,   355,     0,
+     356,   448,   459,     0,     0,   468,   219,     0,   236,   226,
+       0,   369,     0,     0,     0,   344,   322,   384,     0,   388,
+     470,   243,   320,   318,   438,   424,   439,     0,     0,   470,
+     420,   354,     0,   470,     0,     0,   469,   213,   218,     0,
+       0,     0,   368,   345,   342,     0,   385,     0,   390,   470,
+       0,   434,   358,     0,   461,   460,   449,   410,   373,     0,
+       0,   346,     0,   343,     0,     0,     0,     0,     0,   450,
+     470,     0,     0,   368,     0,   440,     0,   362,   436,   413,
+     411,   435,     0,   423,   462,     0,     0,   347,     0,     0,
+     441,   442,   421,     0,   412,     0,   370,     0,     0,   470,
+     437,     0,   386,   422,   443,   371
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -540,  -336,  -119,    -3,    65,  -540,  -540,   375,  -540,  -540,
-    -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,   276,  -540,
-    -540,  -540,  -122,  -540,  -322,  -540,  -540,  -540,  -540,  -540,
-    -201,  -540,  -540,  -409,   -15,   -24,  -540,  -540,  -540,   275,
-     366,  -540,  -540,   236,  -540,  -540,  -540,  -540,   253,  -540,
-    -540,  -540,  -540,  -519,   385,     0,   -19,    13,  -540,  -540,
-     235,   -14,   -39,  -540,  -540,    62,  -159,  -540,    36,  -540,
-     -35,  -357,  -540,  -540,  -540,  -540,    63,  -145,   -17,  -341,
-     -61,    -4,  -540,  -540,   396,  -540,  -148,  -494,  -539,  -540,
-      64,  -355,  -540,  -249,  -521,    45,  -540,  -540,  -540,  -511,
-    -540,  -540,  -540,  -540,  -540,  -540,  -540,  -518,    42,  -374,
-    -540,  -540,  -540,  -540,  -540,  -540,  -118,   -28,  -516
+    -540,  -333,  -119,    -3,    31,  -540,  -540,   329,  -540,  -540,
+    -540,  -540,  -540,  -540,  -540,  -540,  -540,  -540,   229,  -540,
+    -540,  -540,  -122,  -540,  -320,  -540,  -540,  -540,  -540,  -540,
+    -246,  -540,  -540,  -398,   -15,   -24,  -540,  -540,  -540,   228,
+     323,  -540,  -540,   194,  -540,  -540,  -540,  -540,   208,  -540,
+    -540,  -540,  -540,  -183,   337,     0,   -19,    13,  -540,  -540,
+     187,   -14,   -39,  -540,  -540,    14,  -227,  -540,  -230,  -540,
+      39,  -540,   -81,  -355,  -540,  -540,  -540,  -540,    77,  -539,
+       6,  -358,   -61,    -4,  -540,  -540,   349,  -540,  -194,  -497,
+    -538,  -540,    16,  -362,  -540,  -302,  -506,    -2,  -540,  -540,
+    -540,  -518,  -540,  -540,  -540,  -540,  -540,  -540,  -540,  -517,
+      -7,  -374,  -540,  -540,  -540,  -540,  -540,  -540,  -167,   -28,
+    -512
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
@@ -646,12 +650,13 @@ static const short int yydefgoto[] =
      506,   507,    38,   138,    39,    40,    41,    42,    43,    44,
       45,    46,    47,   175,   371,   374,   178,    48,   181,   451,
       49,    50,   196,   402,    51,    52,    53,   141,    55,    56,
-     379,    57,   466,    58,    59,   438,   439,   497,   143,   383,
-     384,   467,   468,    61,   144,   145,   149,   566,   356,   367,
-     169,   404,   102,    62,    63,   519,   520,   469,   521,   522,
-     392,   393,   394,   662,   663,   664,   583,   584,   585,   103,
-     654,   665,   618,   671,   672,   395,   396,   470,   471,   104,
-     625,   644,   397,   398,   399,   476,   477,   473,   162
+     379,    57,   466,    58,    59,   438,   439,   497,   604,   633,
+     143,   383,   384,   467,   468,    61,   144,   145,   149,   565,
+     356,   367,   169,   404,   102,    62,    63,   519,   520,   469,
+     521,   522,   392,   393,   394,   668,   669,   670,   582,   583,
+     584,   103,   658,   671,   617,   679,   680,   395,   396,   470,
+     471,   104,   624,   645,   397,   398,   399,   476,   477,   473,
+     162
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -660,153 +665,142 @@ static const short int yydefgoto[] =
 static const short int yytable[] =
 {
      168,   161,   157,   140,   111,   101,   100,   139,   142,   331,
-     186,   432,   472,    54,   582,   480,   345,   408,   110,   587,
-     146,   147,   148,   411,   586,   496,   592,   574,   449,   332,
-     595,    54,   608,   547,   611,   170,    60,   482,   525,   190,
-      64,   483,    65,   526,    54,   602,    54,   509,    71,  -325,
-     510,   195,  -316,  -331,   511,  -331,   512,   513,   514,   515,
-     516,   517,   176,     4,     5,    72,   621,   187,   617,    60,
-     635,   650,   432,  -365,  -365,   432,   586,   171,   172,   173,
-     158,   406,   174,   518,   372,   157,   633,   373,   568,   482,
-     490,    68,   478,   452,   453,   501,   502,   503,   189,   533,
-     168,   504,   505,   192,   193,   194,   643,   540,   541,   493,
-     494,   527,   191,   531,   615,   616,    29,   574,  -368,   333,
-     437,   202,   355,  -368,   165,   434,   640,   401,   357,   358,
-     359,   335,   346,   348,   350,   170,   160,   666,   668,   682,
-     354,   673,   586,   457,   651,   676,   458,   179,   550,   631,
-     360,   551,   486,   180,   432,   586,   403,   432,   432,   666,
-     454,   455,   684,   110,   586,   564,   565,   369,   380,   380,
-     472,   649,   572,   573,   486,   182,    54,   184,   581,   605,
-     565,   382,   185,   400,   187,   590,   591,   481,   183,    94,
-      95,    96,    97,    98,    99,   627,   486,   435,   436,   349,
-     351,    72,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,   385,   386,   387,   388,   389,   390,   391,   205,  -325,
-     345,   352,  -365,  -240,   355,  -241,   345,   361,   362,   363,
-     581,   622,   364,   366,   370,   613,   614,   368,   376,   599,
-     600,   377,   385,   386,   387,   388,   389,   390,   391,   405,
-     472,   150,     1,     2,   151,     4,     5,     6,   152,     8,
-     153,   412,   639,   432,   432,   154,   641,    10,    11,    12,
-      13,    14,    15,    16,    17,   433,   443,   509,   105,   434,
-     510,   445,   472,   112,   511,   472,   512,   513,   514,   515,
-     516,   517,   446,   345,   508,   660,   581,   447,   456,   450,
-     484,   487,   486,   523,   495,   535,   472,   448,   536,   581,
-     545,   547,   345,   345,   544,   546,   548,   552,   581,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   549,   125,   126,   127,   128,   346,   554,   106,   107,
-     108,   410,   346,   559,   560,   563,   459,   561,   474,   385,
-     386,   387,   388,   389,   390,   391,   570,   442,   571,   575,
-     576,   577,   -24,   588,   187,   597,   603,   598,   601,   604,
-     607,   609,   619,   620,   101,   612,   624,   630,   632,   634,
-     500,   638,   648,   646,   645,   475,   647,   658,   653,   655,
-     669,   656,   657,   667,   659,   407,   498,   499,   485,   670,
-     677,   369,   675,   679,   678,   680,   489,   683,   166,   346,
-     336,   637,   177,   375,   353,   140,   164,   365,   381,   139,
-     142,   440,   534,   606,   159,   610,   681,   444,   346,   346,
-     460,   479,     0,   596,     0,     0,     0,   187,     0,   530,
-       0,   530,   345,   345,     0,   524,   553,   555,     0,   539,
-       0,     0,     0,     0,   382,     0,     0,   413,   414,   415,
-     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,   428,   429,   430,   628,     0,     0,   140,     0,
-     542,     0,   139,   142,   556,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   569,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   593,     0,     0,
-     403,     0,     0,     0,   157,     0,     0,   488,     0,     0,
-     594,     0,     0,     0,   101,   403,   413,   414,   415,   416,
-     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,   428,   429,   430,     0,     0,     0,     0,   475,   431,
-       0,     0,     0,     0,     0,   626,     0,     0,   346,   346,
-       0,     0,     0,     0,     0,     0,   403,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   636,     0,     0,     0,   589,     0,     0,
-       0,     0,     0,     0,     0,   629,   413,   414,   415,   416,
-     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,   428,   429,   430,   661,     0,     0,     0,     0,   542,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  -420,     0,   661,  -420,  -420,  -420,
-    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
-    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
-    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
-    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
-    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
-    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
-    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
-    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
-       0,  -420,     0,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
-    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
-    -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,  -420,
-    -420,  -420,  -420,  -420,  -420,  -420,     0,  -420,  -420,     0,
-    -420,  -420,  -420,  -420,   206,     0,     0,   207,   208,   209,
-     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
-     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
-       0,   240,   241,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-       0,   289,     0,   290,   291,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,    66,     0,   323,     0,
-     324,   325,   326,   327,     0,    67,     0,     0,     0,     0,
-      68,    69,     0,     0,     0,     0,     0,     0,     0,     0,
-     197,   198,   199,    70,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     1,     2,
-       3,     4,     5,     6,     7,     8,     0,     0,     0,     0,
-       0,     9,     0,    10,    11,    12,    13,    14,    15,    16,
-      17,     0,     0,     0,    18,    73,    74,    75,    76,    77,
-      19,    20,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    21,     0,     0,     0,     0,     0,    78,     0,    79,
-       0,    80,    81,    82,    83,     0,     0,     0,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,     0,     0,     0,     0,     0,   200,
-       0,   201,     0,    22,    23,    24,    25,    26,    27,    28,
-       0,    29,     1,     2,     3,     4,     5,     6,     7,     8,
-       0,     0,     0,     0,     0,   528,     0,    10,    11,    12,
-      13,    14,    15,    16,    17,    30,     0,     0,   105,     0,
-      31,    66,     1,     2,     3,     4,     5,     6,     7,     8,
-      67,     0,     0,     0,     0,    68,    69,    10,    11,    12,
-      13,    14,    15,    16,    17,     0,     0,     0,   537,   461,
-       0,   462,     0,   463,     0,     0,   464,     0,   529,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   340,   341,    72,     0,     0,     0,     0,   106,   107,
-     108,   109,     0,     0,   342,   343,     0,     0,     0,     0,
-      73,    74,    75,    76,    77,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   106,   107,
-     108,   538,    78,     0,    79,     0,    80,    81,    82,    83,
-       0,     0,     0,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,    66,
-       0,     0,     0,     0,     0,     0,     0,     0,    67,     0,
-       0,     0,     0,    68,    69,     0,     0,     0,     0,     0,
-       0,     0,     0,   578,     0,     0,    70,   461,     0,   462,
-       0,   463,     0,     0,   464,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   160,     0,     0,   340,
-     341,    72,     0,     0,     0,     0,     0,     0,     0,     0,
+     186,   449,   472,    54,   432,   480,   345,   585,   110,   408,
+     146,   147,   148,   586,   573,   411,   332,   591,   605,   581,
+     482,    54,   607,   547,   610,   170,   496,    71,   509,    60,
+      29,   510,   190,   483,    54,   511,    54,   512,   513,   514,
+     515,   516,   517,   601,    72,   158,   501,   502,   503,   160,
+     616,   602,   504,   505,   171,   172,   173,   187,   585,   174,
+     636,   654,    60,   372,   518,   432,   373,   179,   432,  -372,
+     620,   406,   482,   355,  -372,   157,   437,   176,     4,     5,
+     525,   434,   490,   651,   527,   526,   531,   165,   189,   567,
+     168,   533,   180,   192,   193,   194,   644,    68,   478,   540,
+     541,   493,   494,   573,   182,   191,   333,  -316,  -331,    72,
+    -331,   202,   641,   457,   677,   550,   458,   401,   551,   435,
+     436,   335,   346,   348,   350,   170,   481,  -367,  -367,   585,
+     354,   183,   655,   674,  -325,   672,   195,   184,   681,   692,
+     360,   357,   358,   359,   585,   185,   403,   432,   452,   453,
+     432,   432,    64,   110,    65,   585,   684,   369,   380,   380,
+     472,   672,   694,   454,   455,   205,    54,   352,   508,  -325,
+     580,   382,  -240,   400,   187,   614,   615,   589,   590,   571,
+     572,   385,   386,   387,   388,   389,   390,   391,   385,   386,
+     387,   388,   389,   390,   391,    94,    95,    96,    97,    98,
+      99,   626,   486,   349,   351,   355,  -241,   612,   613,  -367,
+     345,   361,   363,   362,   364,   366,   345,   368,   370,   376,
+     405,   580,   621,   385,   386,   387,   388,   389,   390,   391,
+     377,   598,   599,   509,   412,   433,   510,   434,   443,   472,
+     511,   445,   512,   513,   514,   515,   516,   517,   446,   447,
+     456,   450,   484,   640,   486,   432,   432,   642,   487,   495,
+     523,   536,   545,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,   535,   544,   546,   547,   472,   548,   549,   552,
+     554,   472,   563,   345,   559,   560,   629,   561,   569,   564,
+     597,   666,   580,   570,   574,   575,   576,   448,   -24,   587,
+     596,   606,   345,   345,   600,   472,   603,   580,   608,   611,
+     618,   619,   630,   631,   623,   634,   646,   639,   580,   647,
+     648,   649,   650,   652,   653,   657,   346,   659,   664,   661,
+     660,   410,   346,   662,   673,   665,   459,   675,   474,   676,
+     678,   687,   683,   685,   686,   691,   688,   442,   689,   693,
+     695,   407,   166,   336,   187,   638,   594,   353,   164,   177,
+     381,   375,   365,   440,   101,   635,   534,   159,   609,   444,
+     500,   690,   479,   460,   595,   475,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   498,   499,   485,     0,
+       0,   369,     0,     0,     0,     0,   489,     0,     0,   346,
+       0,     0,     0,     0,     0,   140,     0,     0,     0,   139,
+     142,   112,     0,     0,     0,     0,     0,     0,   346,   346,
+       0,     0,     0,     0,     0,     0,     0,   187,     0,   530,
+       0,   530,   345,   345,     0,   524,     0,   555,     0,   539,
+       0,     0,     0,     0,   382,     0,     0,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   124,     0,
+     125,   126,   127,   128,   627,     0,     0,     0,   140,     0,
+       0,     0,   139,   142,   556,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   568,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   592,     0,     0,
+     403,     0,     0,     0,   157,     0,     0,     0,     0,    66,
+     593,     0,     0,     0,   101,     0,     0,     0,    67,     0,
+       0,     0,     0,    68,    69,    10,    11,    12,    13,    14,
+      15,    16,    17,     0,     0,     0,    70,     0,   475,     0,
+       0,     0,     0,     0,   625,     0,     0,     0,   346,   346,
+       0,     0,     0,     0,   632,     0,     0,     0,     0,     0,
+       0,    72,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   637,     0,     0,     0,     0,     0,    73,    74,
+      75,    76,    77,     0,   628,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      78,     0,    79,   663,    80,    81,    82,    83,   667,     0,
+       0,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,     0,     0,     0,
+       0,     0,  -424,     0,   667,  -424,  -424,  -424,  -424,  -424,
+    -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,
+    -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,
+    -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,
+    -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,
+    -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,
+    -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,
+    -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,
+    -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,     0,  -424,
+       0,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,
+    -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,
+    -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,  -424,
+    -424,  -424,  -424,  -424,     0,  -424,  -424,     0,  -424,  -424,
+    -424,  -424,   206,     0,     0,   207,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,   219,   220,   221,
+     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,   237,   238,   239,     0,   240,
+     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
+     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
+     281,   282,   283,   284,   285,   286,   287,   288,     0,   289,
+       0,   290,   291,   292,   293,   294,   295,   296,   297,   298,
+     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     319,   320,   321,   322,    66,     0,   323,     0,   324,   325,
+     326,   327,     0,    67,     0,     0,     0,     0,    68,    69,
+       0,     0,     0,     0,     0,     0,     0,     0,   197,   198,
+     199,    70,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     1,     2,     3,     4,
+       5,     6,     7,     8,     0,     0,     0,     0,     0,     9,
+       0,    10,    11,    12,    13,    14,    15,    16,    17,     0,
+       0,     0,    18,    73,    74,    75,    76,    77,    19,    20,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    21,
+       0,     0,     0,     0,     0,    78,     0,    79,     0,    80,
+      81,    82,    83,     0,     0,     0,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,     0,     0,     0,     0,     0,   200,     0,   201,
+       0,    22,    23,    24,    25,    26,    27,    28,     0,    29,
+       1,     2,     3,     4,     5,     6,     7,     8,     0,     0,
+       0,     0,     0,   528,     0,    10,    11,    12,    13,    14,
+      15,    16,    17,    30,     0,     0,   105,     0,    31,    66,
+       1,     2,     3,     4,     5,     6,     7,     8,    67,     0,
+       0,     0,     0,    68,    69,    10,    11,    12,    13,    14,
+      15,    16,    17,     0,     0,     0,   537,   461,     0,   462,
+       0,   463,     0,     0,   464,     0,   529,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   340,
+     341,    72,     0,     0,     0,     0,   106,   107,   108,   109,
        0,     0,   342,   343,     0,     0,     0,     0,    73,    74,
       75,    76,    77,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      78,     0,   579,     0,    80,    81,    82,    83,     0,     0,
+       0,     0,     0,     0,     0,     0,   106,   107,   108,   538,
+      78,     0,    79,     0,    80,    81,    82,    83,     0,     0,
        0,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-     580,    94,    95,    96,    97,    98,    99,    66,     0,     0,
+      93,    94,    95,    96,    97,    98,    99,    66,     0,     0,
        0,     0,     0,     0,     0,     0,    67,     0,     0,     0,
        0,    68,    69,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    70,   461,     0,   462,     0,   463,
+       0,   577,     0,     0,    70,   461,     0,   462,     0,   463,
        0,     0,   464,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,   160,     0,     0,   340,   341,    72,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     342,   343,     0,     0,   642,     0,    73,    74,    75,    76,
+     342,   343,     0,     0,     0,     0,    73,    74,    75,    76,
       77,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    78,     0,
-      79,     0,    80,    81,    82,    83,     0,     0,     0,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+     578,     0,    80,    81,    82,    83,     0,     0,     0,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,   579,    94,
       95,    96,    97,    98,    99,    66,     0,     0,     0,     0,
        0,     0,     0,     0,    67,     0,     0,     0,     0,    68,
       69,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    70,   461,  -466,   462,     0,   463,     0,     0,
+       0,     0,    70,   461,     0,   462,     0,   463,     0,     0,
      464,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,   160,     0,     0,   340,   341,    72,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,   342,   343,
-       0,     0,     0,     0,    73,    74,    75,    76,    77,     0,
+       0,     0,   643,     0,    73,    74,    75,    76,    77,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    78,     0,    79,     0,
       80,    81,    82,    83,     0,     0,     0,    84,    85,    86,
@@ -814,7 +808,7 @@ static const short int yytable[] =
       97,    98,    99,    66,     0,     0,     0,     0,     0,     0,
        0,     0,    67,     0,     0,     0,     0,    68,    69,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      70,   461,     0,   462,     0,   463,     0,     0,   464,     0,
+      70,   461,  -470,   462,     0,   463,     0,     0,   464,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
      160,     0,     0,   340,   341,    72,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   342,   343,     0,     0,
@@ -825,284 +819,294 @@ static const short int yytable[] =
       89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
       99,    66,     0,     0,     0,     0,     0,     0,     0,     0,
       67,     0,     0,     0,     0,    68,    69,     0,     0,     0,
-       0,     0,     0,     0,     0,   578,     0,     0,    70,   461,
+       0,     0,     0,     0,     0,     0,     0,     0,    70,   461,
        0,   462,     0,   463,     0,     0,   464,     0,     0,     0,
-       0,     1,     2,     3,     4,     5,     6,     7,     8,     0,
-       0,   340,   341,    72,     9,     0,    10,    11,    12,    13,
-      14,    15,    16,    17,   342,   343,     0,   105,    66,     0,
-      73,    74,    75,    76,    77,     0,     0,    67,     0,     0,
-     567,     0,    68,    69,    10,    11,    12,    13,    14,    15,
-      16,    17,    78,     0,   579,    70,    80,    81,    82,    83,
+       0,     0,     0,     0,     0,     0,     0,     0,   160,     0,
+       0,   340,   341,    72,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   342,   343,     0,     0,     0,     0,
+      73,    74,    75,    76,    77,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    78,     0,    79,     0,    80,    81,    82,    83,
        0,     0,     0,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,   580,    94,    95,    96,    97,    98,    99,     0,
-      72,     0,     0,     0,     0,     0,     0,   136,   137,    25,
-     109,     0,     0,     0,     0,     0,     0,    73,    74,    75,
-      76,    77,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    78,
-       0,    79,     0,    80,    81,    82,    83,     0,     0,     0,
-      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,    66,     0,     0,     0,
-       0,     0,     0,     0,     0,    67,     0,     0,     0,     0,
-      68,    69,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    70,   461,     0,   462,     0,   463,     0,
-       0,   464,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   340,   341,    72,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   342,
-     343,     0,     0,     0,     0,    73,    74,    75,    76,    77,
+      91,    92,    93,    94,    95,    96,    97,    98,    99,    66,
+       0,     0,     0,     0,     0,     0,     0,     0,    67,     0,
+       0,     0,     0,    68,    69,     0,     0,     0,     0,     0,
+       0,     0,     0,   577,     0,     0,    70,   461,     0,   462,
+       0,   463,     0,     0,   464,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   340,
+     341,    72,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   342,   343,     0,     0,     0,     0,    73,    74,
+      75,    76,    77,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    78,     0,    79,
-       0,    80,    81,    82,    83,     0,     0,     0,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,    66,     0,     0,     0,     0,     0,
-       0,     0,     0,    67,     0,     0,     0,     0,    68,    69,
+      78,     0,   578,     0,    80,    81,    82,    83,     0,     0,
+       0,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+     579,    94,    95,    96,    97,    98,    99,    66,     0,     0,
+       0,     0,     0,     0,     0,     0,    67,     0,     0,     0,
+       0,    68,    69,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    70,   461,     0,   462,     0,   463,
+       0,     0,   464,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   340,   341,    72,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    70,     0,     0,   337,     0,   338,     0,     0,   339,
+     342,   343,     0,     0,     0,     0,    73,    74,    75,    76,
+      77,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    78,     0,
+      79,     0,    80,    81,    82,    83,     0,     0,     0,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,    66,     0,     0,     0,     0,
+       0,     0,     0,     0,    67,     0,     0,     0,     0,    68,
+      69,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    70,     0,     0,   337,     0,   338,     0,     0,
+     339,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   340,   341,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   342,   343,
+       0,     0,     0,     0,    73,    74,    75,    76,    77,     0,
+       0,     0,     0,     0,     0,     0,   344,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    78,     0,    79,     0,
+      80,    81,    82,    83,     0,     0,     0,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,    66,     0,     0,     0,     0,     0,     0,
+       0,     0,    67,     0,     0,     0,     0,    68,    69,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   340,   341,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   342,   343,     0,
-       0,     0,     0,    73,    74,    75,    76,    77,     0,     0,
-       0,     0,     0,     0,     0,   344,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    78,     0,    79,     0,    80,
-      81,    82,    83,     0,     0,     0,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-      98,    99,    66,     0,     0,     0,     0,     0,     0,     0,
+      70,     0,     0,     0,     0,     0,     0,     0,    71,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    66,     0,     0,    72,     0,     0,     0,     0,
        0,    67,     0,     0,     0,     0,    68,    69,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    70,
-       0,     0,     0,     0,     0,     0,     0,    71,     0,     0,
+       0,     0,    73,    74,    75,    76,    77,     0,     0,    70,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    66,     0,     0,    72,     0,     0,     0,     0,     0,
-      67,     0,     0,     0,     0,    68,    69,     0,     0,     0,
-       0,    73,    74,    75,    76,    77,     0,     0,    70,     0,
+       0,     0,     0,     0,    78,     0,    79,     0,    80,    81,
+      82,    83,     0,     0,    72,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
+      99,    73,    74,    75,    76,    77,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    78,     0,    79,     0,    80,    81,    82,
-      83,     0,     0,    72,    84,    85,    86,    87,    88,    89,
+      83,     0,     0,     0,    84,    85,    86,    87,    88,    89,
       90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-      73,    74,    75,    76,    77,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    78,     0,    79,     0,    80,    81,    82,    83,
-       0,     0,     0,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,    66,
+      66,     0,     0,     0,     0,     0,     0,     0,     0,    67,
+       0,     0,     0,     0,    68,    69,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    70,     0,     0,
+       0,     0,     0,     0,     0,   188,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    66,
        0,     0,     0,     0,     0,     0,     0,     0,    67,     0,
-       0,     0,     0,    68,    69,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,     0,     0,     0,   188,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    66,     0,
-       0,     0,     0,     0,     0,     0,     0,    67,     0,     0,
-       0,     0,    68,    69,     0,     0,     0,     0,    73,    74,
-      75,    76,    77,     0,     0,    70,     0,     0,     0,     0,
-       0,     0,     0,   409,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    68,    69,     0,     0,     0,     0,    73,
+      74,    75,    76,    77,     0,     0,    70,     0,     0,     0,
+       0,     0,     0,     0,   409,     0,     0,     0,     0,     0,
+       0,    78,     0,    79,     0,    80,    81,    82,    83,     0,
+       0,     0,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,    73,    74,
+      75,    76,    77,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       78,     0,    79,     0,    80,    81,    82,    83,     0,     0,
        0,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,    73,    74,    75,
-      76,    77,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    78,
-       0,    79,     0,    80,    81,    82,    83,     0,     0,     0,
-      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,    66,     0,     0,     0,
+      93,    94,    95,    96,    97,    98,    99,    66,     0,     0,
+       0,     0,     0,     0,     0,     0,    67,     0,     0,     0,
+       0,    68,    69,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    70,     0,     0,     0,     0,     0,
+       0,     0,   441,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    66,     0,     0,     0,
        0,     0,     0,     0,     0,    67,     0,     0,     0,     0,
-      68,    69,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    70,     0,     0,     0,     0,     0,     0,
-       0,   441,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    66,     0,     0,     0,     0,
-       0,     0,     0,     0,    67,     0,     0,     0,     0,    68,
-      69,     0,     0,     0,     0,    73,    74,    75,    76,    77,
-       0,     0,    70,     0,     0,     0,     0,     0,     0,     0,
+      68,    69,     0,     0,     0,     0,    73,    74,    75,    76,
+      77,     0,     0,    70,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    78,     0,
+      79,     0,    80,    81,    82,    83,     0,     0,     0,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,    73,    74,    75,    76,    77,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,    78,     0,    79,
        0,    80,    81,    82,    83,     0,     0,     0,    84,    85,
       86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,    73,    74,    75,    76,    77,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    78,     0,    79,     0,
-      80,    81,    82,    83,     0,     0,     0,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,     1,     2,     3,     4,     5,     6,     7,
-       8,     0,     0,     0,     0,     0,   528,     0,    10,    11,
-      12,    13,    14,    15,    16,    17,     0,     0,     0,   105,
+      96,    97,    98,    99,   150,     1,     2,   151,     4,     5,
+       6,   152,     8,   153,     0,     0,     0,     0,   154,     0,
+      10,    11,    12,    13,    14,    15,    16,    17,     0,     0,
+       0,   105,     1,     2,     3,     4,     5,     6,     7,     8,
+       0,     0,     0,     0,     0,   528,     0,    10,    11,    12,
+      13,    14,    15,    16,    17,     0,     0,     0,   105,     0,
        1,     2,     3,     4,     5,     6,     7,     8,     0,     0,
        0,     0,     0,     9,     0,    10,    11,    12,    13,    14,
-      15,    16,    17,     0,     0,     0,   105,     1,     2,     3,
-       4,     5,     6,     7,     8,     0,     0,     0,     0,   532,
-       9,     0,    10,    11,    12,    13,    14,    15,    16,    17,
-       0,     0,     0,   105,     0,     0,     0,     0,     0,   106,
-     107,   108,   109,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     1,     2,     3,
-       4,     5,     6,     7,     8,     0,   106,   107,   108,   109,
+      15,    16,    17,     0,     0,     0,   105,     0,     0,     0,
+       0,   106,   107,   108,     0,     0,     0,     0,   532,   566,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     1,
+       2,     3,     4,     5,     6,     7,     8,     0,   106,   107,
+     108,   109,     9,     0,    10,    11,    12,    13,    14,    15,
+      16,    17,     0,     0,     0,   105,     0,     1,     2,     3,
+       4,     5,     6,     7,     8,     0,   136,   137,    25,   109,
        9,     0,    10,    11,    12,    13,    14,    15,    16,    17,
-       0,     0,     0,   163,     1,     2,     3,     4,     5,     6,
+       0,     0,     0,   105,     1,     2,     3,     4,     5,     6,
+       7,     8,     0,     0,     0,     0,     0,     9,     0,    10,
+      11,    12,    13,    14,    15,    16,    17,     0,     0,     0,
+     163,     0,     0,     0,     0,   106,   107,   108,   109,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     1,     2,     3,     4,     5,     6,
        7,     8,     0,   136,   137,    25,   109,     9,     0,    10,
       11,    12,    13,    14,    15,    16,    17,     0,     0,     0,
      105,     1,     2,     3,     4,     5,     6,     7,     8,     0,
-       0,     0,     0,     0,   378,     0,    10,    11,    12,    13,
-      14,    15,    16,    17,     0,     0,     0,   105,     0,     0,
-       0,     0,     0,   106,   107,   108,   109,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     1,     2,     3,     4,     5,     6,     7,     8,     0,
-     106,   107,   108,   109,   154,     0,    10,    11,    12,    13,
+     106,   107,   108,   109,   378,     0,    10,    11,    12,    13,
       14,    15,    16,    17,     0,     0,     0,   105,     1,     2,
-       3,     4,     5,     6,     7,     8,     0,   106,   107,   108,
-     109,     0,     0,    10,    11,    12,    13,    14,    15,    16,
-      17,   674,     0,     0,   105,     0,     0,     0,     0,     0,
-     413,   414,   415,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   428,   429,   430,     0,     0,
-       0,     0,   652,   542,     0,     0,     0,   106,   107,   108,
-     413,   414,   415,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   428,   429,   430,     0,     0,
-     562,     0,     0,   542,   106,   107,   108,   413,   414,   415,
+       3,     4,     5,     6,     7,     8,     0,     0,     0,     0,
+       0,   154,     0,    10,    11,    12,    13,    14,    15,    16,
+      17,     0,     0,     0,   105,     0,     0,     0,     0,     0,
+     106,   107,   108,   109,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     1,     2,     3,     4,
+       5,     6,     7,     8,     0,     0,     0,   106,   107,   108,
+     109,    10,    11,    12,    13,    14,    15,    16,    17,     0,
+       0,     0,   105,     0,     0,     0,   553,     0,     0,     0,
+       0,     0,     0,     0,   106,   107,   108,   413,   414,   415,
      416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,   428,   429,   430,   623,     0,     0,     0,     0,
-     431,     0,   413,   414,   415,   416,   417,   418,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-       0,     0,     0,     0,     0,   542,   413,   414,   415,   416,
-     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,   428,   429,   430,     0,     0,     0,     0,     0,   431,
-     413,   414,   415,   416,   417,   418,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   428,   429,   430,     0,     0,
-       0,     0,     0,   542,   413,   414,   415,   416,   417,   418,
+     426,   427,   428,   429,   430,   488,     0,     0,     0,     0,
+     542,     0,     0,     0,   413,   414,   415,   416,   417,   418,
      419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
-     429,   430,     0,     0,     0,     0,     0,   431,   413,   414,
-     415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,     0,     0,     0,     0,
-       0,   542
+     429,   430,   106,   107,   108,   588,     0,   431,     0,     0,
+       0,     0,     0,     0,   413,   414,   415,   416,   417,   418,
+     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
+     429,   430,   682,     0,     0,     0,     0,   542,     0,     0,
+       0,   413,   414,   415,   416,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,   430,   656,
+       0,     0,     0,     0,   542,     0,     0,   413,   414,   415,
+     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
+     426,   427,   428,   429,   430,   562,     0,     0,     0,     0,
+     542,     0,   413,   414,   415,   416,   417,   418,   419,   420,
+     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
+     622,     0,     0,     0,     0,   431,     0,   413,   414,   415,
+     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
+     426,   427,   428,   429,   430,     0,     0,     0,     0,     0,
+     542,   413,   414,   415,   416,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,   430,     0,
+       0,     0,     0,     0,   431,   413,   414,   415,   416,   417,
+     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,   430,     0,     0,     0,     0,     0,   542,   413,
+     414,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,   430,     0,     0,     0,
+       0,     0,   431,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,     0,     0,     0,     0,     0,   542
 };
 
 static const short int yycheck[] =
 {
       39,    29,    26,    22,    18,     9,     9,    22,    22,   131,
-      71,   347,   386,     0,   535,   389,   135,   339,    18,   535,
-      23,    24,    25,   345,   535,   434,   544,   521,   369,    34,
-     549,    18,   571,    32,   573,    39,     0,   392,    34,    55,
-       9,   398,    11,    39,    31,   564,    33,     3,    38,    38,
-       6,    40,    37,    38,    10,    40,    12,    13,    14,    15,
-      16,    17,     6,     7,     8,    55,   587,    71,   579,    33,
-     609,    70,   408,    41,    42,   411,   587,     4,     5,     6,
-      34,   203,     9,    39,     6,   109,   605,     9,   497,   444,
-     412,    17,    18,    39,    40,    27,    28,    29,   101,   456,
-     139,    33,    34,   106,   107,   108,   624,   464,   465,   431,
-     432,   452,   128,   454,    17,    18,    97,   611,    37,   124,
-      37,   124,    41,    42,     0,    42,   620,   188,   145,   146,
-     147,   134,   135,   136,   137,   139,    50,   653,   656,   678,
-     143,   659,   653,    40,   638,   666,    43,    37,    37,    37,
-     154,    40,    40,   129,   490,   666,   195,   493,   494,   675,
-      39,    40,   680,   163,   675,    40,    41,   170,   182,   183,
-     544,    37,    39,    40,    40,    38,   163,    42,   535,    40,
-      41,   184,    42,   186,   188,   542,   543,    43,    38,   115,
-     116,   117,   118,   119,   120,    39,    40,   356,   357,   136,
-     137,    55,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,    98,    99,   100,   101,   102,   103,   104,    36,    38,
-     339,    37,    42,    31,    41,    31,   345,    31,    37,    42,
-     587,   588,    31,    44,     6,   576,   577,    38,    38,   561,
-     562,    37,    98,    99,   100,   101,   102,   103,   104,   123,
-     624,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    38,   619,   599,   600,    17,   623,    19,    20,    21,
-      22,    23,    24,    25,    26,    41,    46,     3,    30,    42,
-       6,    38,   656,    36,    10,   659,    12,    13,    14,    15,
-      16,    17,    37,   412,    43,   652,   653,    33,    46,    34,
-      39,    38,    40,    45,    38,    46,   680,   368,    37,   666,
-      37,    32,   431,   432,    46,    38,    46,    37,   675,    72,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    38,    85,    86,    87,    88,   339,    39,    90,    91,
-      92,   344,   345,    39,    39,    33,   385,    40,   387,    98,
-      99,   100,   101,   102,   103,   104,    37,   360,    41,    39,
-      39,    39,    39,    39,   368,    39,    41,    40,    40,    37,
-      39,    41,    38,    38,   378,    46,    40,    33,    38,    37,
-     441,    38,    33,    37,    39,   388,    39,    32,    40,    39,
-      33,    40,    40,    39,    38,   330,   435,   436,   401,    39,
-      39,   404,    40,    39,    41,    40,   409,    39,    33,   412,
-     134,   612,    46,   177,   139,   434,    31,   164,   183,   434,
-     434,   359,   457,   568,    28,   573,   675,   363,   431,   432,
-     385,   389,    -1,   551,    -1,    -1,    -1,   441,    -1,   453,
-      -1,   455,   561,   562,    -1,   448,    37,   486,    -1,   464,
-      -1,    -1,    -1,    -1,   457,    -1,    -1,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,   597,    -1,    -1,   497,    -1,
-      71,    -1,   497,   497,   487,    -1,    -1,    -1,    -1,    -1,
+      71,   369,   386,     0,   347,   389,   135,   535,    18,   339,
+      23,    24,    25,   535,   521,   345,    34,   544,   567,   535,
+     392,    18,   570,    32,   572,    39,   434,    38,     3,     0,
+      97,     6,    55,   398,    31,    10,    33,    12,    13,    14,
+      15,    16,    17,    33,    55,    34,    27,    28,    29,    50,
+     578,    41,    33,    34,     4,     5,     6,    71,   586,     9,
+     608,    70,    33,     6,    39,   408,     9,    37,   411,    37,
+     586,   203,   444,    41,    42,   109,    37,     6,     7,     8,
+      34,    42,   412,   632,   452,    39,   454,     0,   101,   497,
+     139,   456,   129,   106,   107,   108,   623,    17,    18,   464,
+     465,   431,   432,   610,    38,   128,   124,    37,    38,    55,
+      40,   124,   619,    40,   663,    37,    43,   188,    40,   356,
+     357,   134,   135,   136,   137,   139,    43,    41,    42,   657,
+     143,    38,   639,   660,    38,   657,    40,    42,   665,   687,
+     154,   145,   146,   147,   672,    42,   195,   490,    39,    40,
+     493,   494,     9,   163,    11,   683,   672,   170,   182,   183,
+     544,   683,   689,    39,    40,    36,   163,    37,    43,    38,
+     535,   184,    31,   186,   188,    17,    18,   542,   543,    39,
+      40,    98,    99,   100,   101,   102,   103,   104,    98,    99,
+     100,   101,   102,   103,   104,   115,   116,   117,   118,   119,
+     120,    39,    40,   136,   137,    41,    31,   575,   576,    42,
+     339,    31,    42,    37,    31,    44,   345,    38,     6,    38,
+     123,   586,   587,    98,    99,   100,   101,   102,   103,   104,
+      37,   561,   562,     3,    38,    41,     6,    42,    46,   623,
+      10,    38,    12,    13,    14,    15,    16,    17,    37,    33,
+      46,    34,    39,   618,    40,   598,   599,   622,    38,    38,
+      45,    37,    37,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,    46,    46,    38,    32,   660,    46,    38,    37,
+      39,   665,    33,   412,    39,    39,    33,    40,    37,    41,
+      40,   656,   657,    41,    39,    39,    39,   368,    39,    39,
+      39,    39,   431,   432,    40,   689,    40,   672,    41,    46,
+      38,    38,    41,    38,    40,    37,    39,    38,   683,    37,
+      39,    41,    33,    40,    37,    40,   339,    39,    32,    38,
+      40,   344,   345,    40,    39,    38,   385,    33,   387,    33,
+      39,    41,    40,    40,    39,    33,    39,   360,    40,    39,
+      39,   330,    33,   134,   368,   611,   549,   139,    31,    46,
+     183,   177,   164,   359,   378,   605,   457,    28,   572,   363,
+     441,   683,   389,   385,   551,   388,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   435,   436,   401,    -1,
+      -1,   404,    -1,    -1,    -1,    -1,   409,    -1,    -1,   412,
+      -1,    -1,    -1,    -1,    -1,   434,    -1,    -1,    -1,   434,
+     434,    36,    -1,    -1,    -1,    -1,    -1,    -1,   431,   432,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   441,    -1,   453,
+      -1,   455,   561,   562,    -1,   448,    -1,   486,    -1,   464,
+      -1,    -1,    -1,    -1,   457,    -1,    -1,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    -1,
+      85,    86,    87,    88,   596,    -1,    -1,    -1,   497,    -1,
+      -1,    -1,   497,   497,   487,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,   500,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,   546,    -1,    -1,
-     549,    -1,    -1,    -1,   538,    -1,    -1,    39,    -1,    -1,
-     548,    -1,    -1,    -1,   528,   564,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    -1,    -1,    -1,    -1,   551,    71,
-      -1,    -1,    -1,    -1,    -1,   594,    -1,    -1,   561,   562,
-      -1,    -1,    -1,    -1,    -1,    -1,   605,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   611,    -1,    -1,    -1,    39,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   598,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,   653,    -1,    -1,    -1,    -1,    71,
+     549,    -1,    -1,    -1,   538,    -1,    -1,    -1,    -1,     3,
+     548,    -1,    -1,    -1,   528,    -1,    -1,    -1,    12,    -1,
+      -1,    -1,    -1,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    -1,    -1,    -1,    30,    -1,   551,    -1,
+      -1,    -1,    -1,    -1,   593,    -1,    -1,    -1,   561,   562,
+      -1,    -1,    -1,    -1,   603,    -1,    -1,    -1,    -1,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   610,    -1,    -1,    -1,    -1,    -1,    72,    73,
+      74,    75,    76,    -1,   597,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,     0,    -1,   675,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      -1,    87,    -1,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,    -1,   123,   124,    -1,
-     126,   127,   128,   129,     0,    -1,    -1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      -1,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      -1,    87,    -1,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,     3,    -1,   124,    -1,
-     126,   127,   128,   129,    -1,    12,    -1,    -1,    -1,    -1,
-      17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      27,    28,    29,    30,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     4,     5,
-       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
-      -1,    17,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    -1,    -1,    -1,    30,    72,    73,    74,    75,    76,
-      36,    37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    47,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,
-      -1,    98,    99,   100,   101,    -1,    -1,    -1,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,    -1,    -1,    -1,    -1,    -1,   126,
-      -1,   128,    -1,    89,    90,    91,    92,    93,    94,    95,
-      -1,    97,     4,     5,     6,     7,     8,     9,    10,    11,
-      -1,    -1,    -1,    -1,    -1,    17,    -1,    19,    20,    21,
-      22,    23,    24,    25,    26,   121,    -1,    -1,    30,    -1,
-     126,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    -1,    -1,    -1,    -1,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    -1,    -1,    -1,    30,    31,
-      -1,    33,    -1,    35,    -1,    -1,    38,    -1,    70,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    53,    54,    55,    -1,    -1,    -1,    -1,    90,    91,
-      92,    93,    -1,    -1,    66,    67,    -1,    -1,    -1,    -1,
-      72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,
-      92,    93,    94,    -1,    96,    -1,    98,    99,   100,   101,
-      -1,    -1,    -1,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,     3,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
-      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    27,    -1,    -1,    30,    31,    -1,    33,
-      -1,    35,    -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,    53,
-      54,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    -1,    96,   652,    98,    99,   100,   101,   657,    -1,
+      -1,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,    -1,    -1,    -1,
+      -1,    -1,     0,    -1,   683,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    -1,    87,
+      -1,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,    -1,   123,   124,    -1,   126,   127,
+     128,   129,     0,    -1,    -1,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    -1,    37,
+      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
+      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
+      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    -1,    87,
+      -1,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,     3,    -1,   124,    -1,   126,   127,
+     128,   129,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    27,    28,
+      29,    30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     4,     5,     6,     7,
+       8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,    17,
+      -1,    19,    20,    21,    22,    23,    24,    25,    26,    -1,
+      -1,    -1,    30,    72,    73,    74,    75,    76,    36,    37,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    47,
+      -1,    -1,    -1,    -1,    -1,    94,    -1,    96,    -1,    98,
+      99,   100,   101,    -1,    -1,    -1,   105,   106,   107,   108,
+     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
+     119,   120,    -1,    -1,    -1,    -1,    -1,   126,    -1,   128,
+      -1,    89,    90,    91,    92,    93,    94,    95,    -1,    97,
+       4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
+      -1,    -1,    -1,    17,    -1,    19,    20,    21,    22,    23,
+      24,    25,    26,   121,    -1,    -1,    30,    -1,   126,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    -1,
+      -1,    -1,    -1,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    -1,    -1,    -1,    30,    31,    -1,    33,
+      -1,    35,    -1,    -1,    38,    -1,    70,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,
+      54,    55,    -1,    -1,    -1,    -1,    90,    91,    92,    93,
       -1,    -1,    66,    67,    -1,    -1,    -1,    -1,    72,    73,
       74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    92,    93,
       94,    -1,    96,    -1,    98,    99,   100,   101,    -1,    -1,
       -1,   105,   106,   107,   108,   109,   110,   111,   112,   113,
      114,   115,   116,   117,   118,   119,   120,     3,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
       -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
+      -1,    27,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
       -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    50,    -1,    -1,    53,    54,    55,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      66,    67,    -1,    -1,    70,    -1,    72,    73,    74,    75,
+      66,    67,    -1,    -1,    -1,    -1,    72,    73,    74,    75,
       76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,
       96,    -1,    98,    99,   100,   101,    -1,    -1,    -1,   105,
@@ -1110,11 +1114,11 @@ static const short int yycheck[] =
      116,   117,   118,   119,   120,     3,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
       18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    30,    31,    32,    33,    -1,    35,    -1,    -1,
+      -1,    -1,    30,    31,    -1,    33,    -1,    35,    -1,    -1,
       38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    50,    -1,    -1,    53,    54,    55,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,
-      -1,    -1,    -1,    -1,    72,    73,    74,    75,    76,    -1,
+      -1,    -1,    70,    -1,    72,    73,    74,    75,    76,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,    -1,
       98,    99,   100,   101,    -1,    -1,    -1,   105,   106,   107,
@@ -1122,7 +1126,7 @@ static const short int yycheck[] =
      118,   119,   120,     3,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      30,    31,    -1,    33,    -1,    35,    -1,    -1,    38,    -1,
+      30,    31,    32,    33,    -1,    35,    -1,    -1,    38,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       50,    -1,    -1,    53,    54,    55,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    -1,    -1,
@@ -1133,144 +1137,165 @@ static const short int yycheck[] =
      110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
      120,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    27,    -1,    -1,    30,    31,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,    31,
       -1,    33,    -1,    35,    -1,    -1,    38,    -1,    -1,    -1,
-      -1,     4,     5,     6,     7,     8,     9,    10,    11,    -1,
-      -1,    53,    54,    55,    17,    -1,    19,    20,    21,    22,
-      23,    24,    25,    26,    66,    67,    -1,    30,     3,    -1,
-      72,    73,    74,    75,    76,    -1,    -1,    12,    -1,    -1,
-      43,    -1,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    94,    -1,    96,    30,    98,    99,   100,   101,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,
+      -1,    53,    54,    55,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    66,    67,    -1,    -1,    -1,    -1,
+      72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    -1,    96,    -1,    98,    99,   100,   101,
       -1,    -1,    -1,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,    -1,
-      55,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,    92,
-      93,    -1,    -1,    -1,    -1,    -1,    -1,    72,    73,    74,
-      75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      -1,    96,    -1,    98,    99,   100,   101,    -1,    -1,    -1,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,     3,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,
-      17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,    -1,
-      -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    53,    54,    55,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,
-      67,    -1,    -1,    -1,    -1,    72,    73,    74,    75,    76,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,     3,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
+      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    27,    -1,    -1,    30,    31,    -1,    33,
+      -1,    35,    -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,
+      54,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    66,    67,    -1,    -1,    -1,    -1,    72,    73,
+      74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,
-      -1,    98,    99,   100,   101,    -1,    -1,    -1,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,     3,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,
+      94,    -1,    96,    -1,    98,    99,   100,   101,    -1,    -1,
+      -1,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
+      -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    54,    55,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    30,    -1,    -1,    33,    -1,    35,    -1,    -1,    38,
+      66,    67,    -1,    -1,    -1,    -1,    72,    73,    74,    75,
+      76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,
+      96,    -1,    98,    99,   100,   101,    -1,    -1,    -1,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,     3,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
+      18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    30,    -1,    -1,    33,    -1,    35,    -1,    -1,
+      38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    53,    54,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,
+      -1,    -1,    -1,    -1,    72,    73,    74,    75,    76,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,    -1,
+      98,    99,   100,   101,    -1,    -1,    -1,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    53,    54,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    -1,
-      -1,    -1,    -1,    72,    73,    74,    75,    76,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    84,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    94,    -1,    96,    -1,    98,
-      99,   100,   101,    -1,    -1,    -1,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,    -1,    -1,    55,    -1,    -1,    -1,    -1,
       -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,    -1,    -1,
+      -1,    -1,    72,    73,    74,    75,    76,    -1,    -1,    30,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
-      12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
-      -1,    72,    73,    74,    75,    76,    -1,    -1,    30,    -1,
+      -1,    -1,    -1,    -1,    94,    -1,    96,    -1,    98,    99,
+     100,   101,    -1,    -1,    55,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,    72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    94,    -1,    96,    -1,    98,    99,   100,
-     101,    -1,    -1,    55,   105,   106,   107,   108,   109,   110,
+     101,    -1,    -1,    -1,   105,   106,   107,   108,   109,   110,
      111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-      72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    94,    -1,    96,    -1,    98,    99,   100,   101,
-      -1,    -1,    -1,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,     3,
+       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,
+      -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    38,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
-      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    30,    -1,    -1,    -1,
+      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    72,
+      73,    74,    75,    76,    -1,    -1,    30,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,
-      -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    72,    73,
-      74,    75,    76,    -1,    -1,    30,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    94,    -1,    96,    -1,    98,    99,   100,   101,    -1,
+      -1,    -1,   105,   106,   107,   108,   109,   110,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,    72,    73,
+      74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       94,    -1,    96,    -1,    98,    99,   100,   101,    -1,    -1,
       -1,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,    72,    73,    74,
-      75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      -1,    96,    -1,    98,    99,   100,   101,    -1,    -1,    -1,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,     3,    -1,    -1,    -1,
+     114,   115,   116,   117,   118,   119,   120,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     3,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,
-      17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     3,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
-      18,    -1,    -1,    -1,    -1,    72,    73,    74,    75,    76,
-      -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      17,    18,    -1,    -1,    -1,    -1,    72,    73,    74,    75,
+      76,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,
+      96,    -1,    98,    99,   100,   101,    -1,    -1,    -1,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,    72,    73,    74,    75,    76,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,
       -1,    98,    99,   100,   101,    -1,    -1,    -1,   105,   106,
      107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,    72,    73,    74,    75,    76,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,    -1,
-      98,    99,   100,   101,    -1,    -1,    -1,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,     4,     5,     6,     7,     8,     9,    10,
-      11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    19,    20,
-      21,    22,    23,    24,    25,    26,    -1,    -1,    -1,    30,
+     117,   118,   119,   120,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    -1,    -1,    -1,    -1,    17,    -1,
+      19,    20,    21,    22,    23,    24,    25,    26,    -1,    -1,
+      -1,    30,     4,     5,     6,     7,     8,     9,    10,    11,
+      -1,    -1,    -1,    -1,    -1,    17,    -1,    19,    20,    21,
+      22,    23,    24,    25,    26,    -1,    -1,    -1,    30,    -1,
        4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
       -1,    -1,    -1,    17,    -1,    19,    20,    21,    22,    23,
-      24,    25,    26,    -1,    -1,    -1,    30,     4,     5,     6,
-       7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    70,
-      17,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
-      -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    90,
-      91,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     4,     5,     6,
+      24,    25,    26,    -1,    -1,    -1,    30,    -1,    -1,    -1,
+      -1,    90,    91,    92,    -1,    -1,    -1,    -1,    70,    43,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     4,
+       5,     6,     7,     8,     9,    10,    11,    -1,    90,    91,
+      92,    93,    17,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    -1,    -1,    -1,    30,    -1,     4,     5,     6,
        7,     8,     9,    10,    11,    -1,    90,    91,    92,    93,
       17,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
       -1,    -1,    -1,    30,     4,     5,     6,     7,     8,     9,
+      10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    -1,    -1,    -1,
+      30,    -1,    -1,    -1,    -1,    90,    91,    92,    93,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,     9,
       10,    11,    -1,    90,    91,    92,    93,    17,    -1,    19,
       20,    21,    22,    23,    24,    25,    26,    -1,    -1,    -1,
       30,     4,     5,     6,     7,     8,     9,    10,    11,    -1,
-      -1,    -1,    -1,    -1,    17,    -1,    19,    20,    21,    22,
-      23,    24,    25,    26,    -1,    -1,    -1,    30,    -1,    -1,
-      -1,    -1,    -1,    90,    91,    92,    93,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     4,     5,     6,     7,     8,     9,    10,    11,    -1,
       90,    91,    92,    93,    17,    -1,    19,    20,    21,    22,
       23,    24,    25,    26,    -1,    -1,    -1,    30,     4,     5,
-       6,     7,     8,     9,    10,    11,    -1,    90,    91,    92,
-      93,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    39,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    -1,    -1,
-      -1,    -1,    40,    71,    -1,    -1,    -1,    90,    91,    92,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    -1,    -1,
-      41,    -1,    -1,    71,    90,    91,    92,    48,    49,    50,
+       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
+      -1,    17,    -1,    19,    20,    21,    22,    23,    24,    25,
+      26,    -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,
+      90,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     4,     5,     6,     7,
+       8,     9,    10,    11,    -1,    -1,    -1,    90,    91,    92,
+      93,    19,    20,    21,    22,    23,    24,    25,    26,    -1,
+      -1,    -1,    30,    -1,    -1,    -1,    37,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    90,    91,    92,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    39,    -1,    -1,    -1,    -1,
+      71,    -1,    -1,    -1,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    90,    91,    92,    39,    -1,    71,    -1,    -1,
+      -1,    -1,    -1,    -1,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    39,    -1,    -1,    -1,    -1,    71,    -1,    -1,
+      -1,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    40,
+      -1,    -1,    -1,    -1,    71,    -1,    -1,    48,    49,    50,
       51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
       61,    62,    63,    64,    65,    41,    -1,    -1,    -1,    -1,
       71,    -1,    48,    49,    50,    51,    52,    53,    54,    55,
       56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      -1,    -1,    -1,    -1,    -1,    71,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    -1,    -1,    -1,    -1,    -1,    71,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    -1,    -1,
-      -1,    -1,    -1,    71,    48,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    -1,    -1,    -1,    -1,    -1,    71,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    -1,    -1,    -1,    -1,
-      -1,    71
+      41,    -1,    -1,    -1,    -1,    71,    -1,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    -1,    -1,    -1,    -1,    -1,
+      71,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    -1,
+      -1,    -1,    -1,    -1,    71,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    -1,    -1,    -1,    -1,    -1,    71,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,    63,    64,    65,    -1,    -1,    -1,
+      -1,    -1,    71,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    -1,    -1,    -1,    -1,    -1,    71
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1283,19 +1308,19 @@ static const unsigned char yystos[] =
      121,   126,   137,   138,   139,   140,   141,   159,   164,   166,
      167,   168,   169,   170,   171,   172,   173,   174,   179,   182,
      183,   186,   187,   188,   189,   190,   191,   193,   195,   196,
-     200,   205,   215,   216,     9,    11,     3,    12,    17,    18,
+     202,   207,   217,   218,     9,    11,     3,    12,    17,    18,
       30,    38,    55,    72,    73,    74,    75,    76,    94,    96,
       98,    99,   100,   101,   105,   106,   107,   108,   109,   110,
      111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     135,   213,   214,   231,   241,    30,    90,    91,    92,    93,
+     135,   215,   216,   233,   243,    30,    90,    91,    92,    93,
      187,   193,    36,    72,    73,    74,    75,    76,    77,    78,
       79,    80,    81,    82,    83,    85,    86,    87,    88,   142,
      143,   144,   145,   147,   148,   149,    90,    91,   165,   166,
-     188,   189,   193,   200,   206,   207,   135,   135,   135,   208,
-       3,     6,    10,    12,    17,   160,   161,   167,    34,   216,
-      50,   249,   250,    30,   186,     0,   139,   135,   194,   212,
-     213,     4,     5,     6,     9,   175,     6,   172,   178,    37,
-     129,   180,    38,    38,    42,    42,   212,   213,    38,   135,
+     188,   189,   193,   202,   208,   209,   135,   135,   135,   210,
+       3,     6,    10,    12,    17,   160,   161,   167,    34,   218,
+      50,   251,   252,    30,   186,     0,   139,   135,   194,   214,
+     215,     4,     5,     6,     9,   175,     6,   172,   178,    37,
+     129,   180,    38,    38,    42,    42,   214,   215,    38,   135,
       55,   128,   135,   135,   135,    40,   184,    27,    28,    29,
      126,   128,   135,   150,   151,    36,     0,     3,     4,     5,
        6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
@@ -1311,41 +1336,42 @@ static const unsigned char yystos[] =
      109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
      119,   120,   121,   124,   126,   127,   128,   129,   136,   154,
      155,   154,    34,   124,   146,   135,   150,    33,    35,    38,
-      53,    54,    66,    67,    84,   134,   135,   156,   135,   208,
-     135,   208,    37,   171,   135,    41,   210,   210,   210,   210,
-     213,    31,    37,    42,    31,   180,    44,   211,    38,   135,
+      53,    54,    66,    67,    84,   134,   135,   156,   135,   210,
+     135,   210,    37,   171,   135,    41,   212,   212,   212,   212,
+     215,    31,    37,    42,    31,   180,    44,   213,    38,   135,
        6,   176,     6,     9,   177,   175,    38,    37,    17,   192,
-     193,   192,   135,   201,   202,    98,    99,   100,   101,   102,
-     103,   104,   222,   223,   224,   237,   238,   244,   245,   246,
-     135,   212,   185,   194,   213,   123,   154,   136,   156,    38,
+     193,   192,   135,   203,   204,    98,    99,   100,   101,   102,
+     103,   104,   224,   225,   226,   239,   240,   246,   247,   248,
+     135,   214,   185,   194,   215,   123,   154,   136,   156,    38,
      135,   156,    38,    48,    49,    50,    51,    52,    53,    54,
       55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
       65,    71,   133,    41,    42,   198,   198,    37,   197,   198,
-     197,    38,   135,    46,   222,    38,    37,    33,   212,   211,
+     197,    38,   135,    46,   224,    38,    37,    33,   214,   213,
       34,   181,    39,    40,    39,    40,    46,    40,    43,   194,
-     227,    31,    33,    35,    38,   134,   194,   203,   204,   219,
-     239,   240,   241,   249,   194,   135,   247,   248,    18,   240,
-     241,    43,   223,   203,    39,   135,    40,    38,    39,   135,
+     229,    31,    33,    35,    38,   134,   194,   205,   206,   221,
+     241,   242,   243,   251,   194,   135,   249,   250,    18,   242,
+     243,    43,   225,   205,    39,   135,    40,    38,    39,   135,
      156,   157,   158,   156,   156,    38,   165,   199,   194,   194,
-     212,    27,    28,    29,    33,    34,   162,   163,    43,     3,
-       6,    10,    12,    13,    14,    15,    16,    17,    39,   217,
-     218,   220,   221,    45,   135,    34,    39,   211,    17,    70,
-     193,   211,    70,   203,   202,    46,    37,    30,    93,   166,
-     203,   203,    71,   133,    46,    37,    38,    32,    46,    38,
+     214,    27,    28,    29,    33,    34,   162,   163,    43,     3,
+       6,    10,    12,    13,    14,    15,    16,    17,    39,   219,
+     220,   222,   223,    45,   135,    34,    39,   213,    17,    70,
+     193,   213,    70,   205,   204,    46,    37,    30,    93,   166,
+     205,   205,    71,   133,    46,    37,    38,    32,    46,    38,
       37,    40,    37,    37,    39,   194,   135,   152,   153,    39,
-      39,    40,    41,    33,    40,    41,   209,    43,   165,   135,
-      37,    41,    39,    40,   219,    39,    39,    39,    27,    96,
-     114,   203,   226,   228,   229,   230,   231,   250,    39,    39,
-     203,   203,   239,   194,   249,   185,   248,    39,    40,   156,
-     156,    40,   185,    41,    37,    40,   209,    39,   220,    41,
-     218,   220,    46,   211,   211,    17,    18,   231,   234,    38,
-      38,   226,   203,    41,    40,   242,   194,    39,   154,   135,
-      33,    37,    38,   185,    37,   220,   249,   162,    38,   203,
-     219,   203,    70,   239,   243,    39,    37,    39,    33,    37,
-      70,   219,    40,    40,   232,    39,    40,    40,    32,    38,
-     203,   194,   225,   226,   227,   233,   250,    39,   239,    33,
-      39,   235,   236,   239,    39,    40,   226,    39,    41,    39,
-      40,   225,   220,    39,   239
+      39,    40,    41,    33,    41,   211,    43,   165,   135,    37,
+      41,    39,    40,   221,    39,    39,    39,    27,    96,   114,
+     205,   228,   230,   231,   232,   233,   252,    39,    39,   205,
+     205,   241,   194,   251,   185,   250,    39,    40,   156,   156,
+      40,    33,    41,    40,   200,   211,    39,   222,    41,   220,
+     222,    46,   213,   213,    17,    18,   233,   236,    38,    38,
+     228,   205,    41,    40,   244,   194,    39,   154,   135,    33,
+      41,    38,   194,   201,    37,   200,   222,   251,   162,    38,
+     205,   221,   205,    70,   241,   245,    39,    37,    39,    41,
+      33,   211,    40,    37,    70,   221,    40,    40,   234,    39,
+      40,    38,    40,   194,    32,    38,   205,   194,   227,   228,
+     229,   235,   252,    39,   241,    33,    33,   211,    39,   237,
+     238,   241,    39,    40,   228,    40,    39,    41,    39,    40,
+     227,    33,   222,    39,   241,    39
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
@@ -1385,19 +1411,20 @@ static const unsigned char yyr1[] =
      184,   185,   185,   186,   186,   187,   187,   188,   188,   189,
      189,   190,   190,   190,   190,   191,   191,   192,   192,   192,
      192,   193,   193,   193,   193,   194,   194,   195,   196,   197,
-     197,   198,   199,   199,   199,   199,   200,   201,   201,   202,
-     202,   203,   203,   203,   203,   203,   203,   204,   204,   204,
-     204,   205,   206,   207,   208,   208,   209,   209,   210,   210,
+     197,   198,   199,   199,   200,   200,   201,   201,   202,   203,
+     203,   204,   204,   205,   205,   205,   205,   205,   205,   206,
+     206,   206,   206,   207,   208,   209,   210,   210,   211,   211,
      211,   211,   212,   212,   213,   213,   214,   214,   215,   215,
-     216,   216,   216,   217,   217,   218,   218,   219,   220,   221,
-     221,   221,   221,   221,   221,   221,   221,   221,   222,   222,
-     223,   223,   223,   223,   223,   224,   224,   225,   225,   225,
-     226,   226,   226,   226,   226,   227,   227,   228,   229,   230,
-     231,   231,   231,   231,   231,   231,   231,   231,   231,   231,
-     232,   232,   233,   233,   234,   234,   235,   235,   236,   236,
-     237,   238,   239,   239,   239,   240,   240,   241,   241,   241,
-     241,   241,   241,   241,   241,   242,   242,   243,   243,   244,
-     245,   245,   246,   247,   247,   248,   249,   249,   250
+     216,   216,   217,   217,   218,   218,   218,   219,   219,   220,
+     220,   221,   222,   223,   223,   223,   223,   223,   223,   223,
+     223,   223,   224,   224,   225,   225,   225,   225,   225,   226,
+     226,   227,   227,   227,   228,   228,   228,   228,   228,   229,
+     229,   230,   231,   232,   233,   233,   233,   233,   233,   233,
+     233,   233,   233,   233,   234,   234,   235,   235,   236,   236,
+     237,   237,   238,   238,   239,   240,   241,   241,   241,   242,
+     242,   243,   243,   243,   243,   243,   243,   243,   243,   244,
+     244,   245,   245,   246,   247,   247,   248,   249,   249,   250,
+     251,   251,   252
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1437,19 +1464,20 @@ static const unsigned char yyr2[] =
        2,     1,     3,     1,     2,     1,     1,     5,     7,     5,
        7,     6,     7,     6,     5,     1,     2,     0,     1,     1,
        3,     1,     2,     4,     3,     3,     2,     4,     4,     1,
-       1,     3,     3,     4,     4,     5,     4,     1,     3,     1,
-       3,     1,     4,     3,     3,     2,     5,     1,     1,     1,
-       1,     2,     2,     2,     0,     1,     0,     7,     0,     7,
-       0,     3,     0,     1,     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,     1,     1,     3,     4,     6,     8,     5,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       0,     2,     1,     3,     1,     1,     0,     1,     1,     3,
-       3,     3,     1,     1,     3,     5,     6,     1,     1,     1,
-       1,     1,     1,     1,     1,     0,     2,     1,     3,     3,
-       1,     1,     3,     1,     3,     4,     0,     1,     1
+       1,     3,     4,     5,     0,     2,     2,     4,     4,     1,
+       3,     1,     3,     1,     4,     3,     3,     2,     5,     1,
+       1,     1,     1,     2,     2,     2,     0,     1,     0,     2,
+       7,     9,     0,     7,     0,     3,     0,     1,     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,     1,     1,     3,
+       4,     6,     8,     5,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     2,     1,     3,     1,     1,
+       0,     1,     1,     3,     3,     3,     1,     1,     3,     5,
+       6,     1,     1,     1,     1,     1,     1,     1,     1,     0,
+       2,     1,     3,     3,     1,     1,     3,     1,     3,     4,
+       0,     1,     1
 };
 
 
@@ -1502,7 +1530,8 @@ static const unsigned char yydprec[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0
 };
 
 /* YYMERGER[RULE-NUM] -- Index of merging function for rule #RULE-NUM.  */
@@ -1554,7 +1583,8 @@ static const unsigned char yymerger[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0
 };
 
 /* YYIMMEDIATE[RULE-NUM] -- True iff rule #RULE-NUM is not to be deferred, as
@@ -1607,7 +1637,8 @@ static const yybool yyimmediate[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0
 };
 
 /* YYCONFLP[YYPACT[STATE-NUM]] -- Pointer into YYCONFL of start of
@@ -1621,13 +1652,14 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     5,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     5,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1645,6 +1677,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,   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,     0,
@@ -1652,7 +1685,6 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   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,     0,     0,     0,     0,     0,     0,     0,
@@ -1679,20 +1711,20 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     7,     0,     0,     9,    11,    13,
-      15,    17,    19,    21,    23,    25,    27,    29,    31,    33,
-      35,    37,    39,    41,    43,    45,    47,    49,    51,    53,
-      55,    57,    59,    61,    63,    65,    67,    69,    71,    73,
-      75,    77,    79,    81,    83,    85,    87,    89,    91,    93,
-      95,    97,    99,   101,   103,   105,   107,   109,   111,   113,
-     115,   117,   119,   121,   123,   125,   127,   129,   131,   133,
-     135,   137,   139,   141,   143,   145,   147,   149,   151,   153,
-     155,   157,   159,   161,   163,   165,   167,   169,   171,   173,
-       0,   175,     0,   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,   233,   235,   237,   239,   241,     0,   243,   245,     0,
-     247,   249,   251,   253,     0,     0,     0,     0,     0,     0,
+       0,     0,     7,     0,     0,     9,    11,    13,    15,    17,
+      19,    21,    23,    25,    27,    29,    31,    33,    35,    37,
+      39,    41,    43,    45,    47,    49,    51,    53,    55,    57,
+      59,    61,    63,    65,    67,    69,    71,    73,    75,    77,
+      79,    81,    83,    85,    87,    89,    91,    93,    95,    97,
+      99,   101,   103,   105,   107,   109,   111,   113,   115,   117,
+     119,   121,   123,   125,   127,   129,   131,   133,   135,   137,
+     139,   141,   143,   145,   147,   149,   151,   153,   155,   157,
+     159,   161,   163,   165,   167,   169,   171,   173,     0,   175,
+       0,   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,   233,
+     235,   237,   239,   241,     0,   243,   245,     0,   247,   249,
+     251,   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,
@@ -1876,8 +1908,9 @@ 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,     1,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     3,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     1,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     3,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1916,43 +1949,51 @@ 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,   261,     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,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   261,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   263
 };
 
 /* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by
    0, pointed into by YYCONFLP.  */
 static const short int yyconfl[] =
 {
-       0,   267,     0,   267,     0,   331,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   453,     0,   453,     0,   453,
-       0,   453,     0,   453,     0,   267,     0,   267,     0,   267,
-       0,   226,     0,   356,     0
+       0,   267,     0,   267,     0,   331,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   457,     0,   457,     0,   457,
+       0,   457,     0,   457,     0,   267,     0,   267,     0,   267,
+       0,   226,     0,   358,     0
 };
 
 /* Error token number */
@@ -2389,7 +2430,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 2393 "src/parser_proc.c" /* glr.c:816  */
+#line 2434 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 171:
@@ -2402,7 +2443,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 2406 "src/parser_proc.c" /* glr.c:816  */
+#line 2447 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 172:
@@ -2410,7 +2451,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 2414 "src/parser_proc.c" /* glr.c:816  */
+#line 2455 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 173:
@@ -2418,7 +2459,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 2422 "src/parser_proc.c" /* glr.c:816  */
+#line 2463 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 175:
@@ -2426,7 +2467,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 2430 "src/parser_proc.c" /* glr.c:816  */
+#line 2471 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 176:
@@ -2434,7 +2475,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 2438 "src/parser_proc.c" /* glr.c:816  */
+#line 2479 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 177:
@@ -2442,7 +2483,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 2446 "src/parser_proc.c" /* glr.c:816  */
+#line 2487 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 178:
@@ -2450,7 +2491,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 2454 "src/parser_proc.c" /* glr.c:816  */
+#line 2495 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 179:
@@ -2458,7 +2499,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 2462 "src/parser_proc.c" /* glr.c:816  */
+#line 2503 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 180:
@@ -2466,7 +2507,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 2470 "src/parser_proc.c" /* glr.c:816  */
+#line 2511 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 181:
@@ -2474,7 +2515,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = NULL;
 }
-#line 2478 "src/parser_proc.c" /* glr.c:816  */
+#line 2519 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 182:
@@ -2482,7 +2523,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 2486 "src/parser_proc.c" /* glr.c:816  */
+#line 2527 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 183:
@@ -2510,7 +2551,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 2514 "src/parser_proc.c" /* glr.c:816  */
+#line 2555 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 184:
@@ -2519,7 +2560,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 2523 "src/parser_proc.c" /* glr.c:816  */
+#line 2564 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 185:
@@ -2528,7 +2569,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 2532 "src/parser_proc.c" /* glr.c:816  */
+#line 2573 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 186:
@@ -2538,7 +2579,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 2542 "src/parser_proc.c" /* glr.c:816  */
+#line 2583 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 187:
@@ -2547,7 +2588,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 2551 "src/parser_proc.c" /* glr.c:816  */
+#line 2592 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 188:
@@ -2556,7 +2597,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 2560 "src/parser_proc.c" /* glr.c:816  */
+#line 2601 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 189:
@@ -2565,7 +2606,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 2569 "src/parser_proc.c" /* glr.c:816  */
+#line 2610 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 190:
@@ -2574,7 +2615,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 2578 "src/parser_proc.c" /* glr.c:816  */
+#line 2619 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 213:
@@ -2584,7 +2625,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 2588 "src/parser_proc.c" /* glr.c:816  */
+#line 2629 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 214:
@@ -2594,7 +2635,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 2598 "src/parser_proc.c" /* glr.c:816  */
+#line 2639 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 215:
@@ -2602,7 +2643,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL);
 }
-#line 2606 "src/parser_proc.c" /* glr.c:816  */
+#line 2647 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 217:
@@ -2612,7 +2653,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 2616 "src/parser_proc.c" /* glr.c:816  */
+#line 2657 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 218:
@@ -2622,7 +2663,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 2626 "src/parser_proc.c" /* glr.c:816  */
+#line 2667 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 219:
@@ -2630,7 +2671,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 2634 "src/parser_proc.c" /* glr.c:816  */
+#line 2675 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 221:
@@ -2639,7 +2680,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 2643 "src/parser_proc.c" /* glr.c:816  */
+#line 2684 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 222:
@@ -2648,7 +2689,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 2652 "src/parser_proc.c" /* glr.c:816  */
+#line 2693 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 223:
@@ -2657,7 +2698,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 2661 "src/parser_proc.c" /* glr.c:816  */
+#line 2702 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 224:
@@ -2666,7 +2707,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 2670 "src/parser_proc.c" /* glr.c:816  */
+#line 2711 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 225:
@@ -2675,7 +2716,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 2679 "src/parser_proc.c" /* glr.c:816  */
+#line 2720 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 226:
@@ -2684,7 +2725,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 2688 "src/parser_proc.c" /* glr.c:816  */
+#line 2729 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 227:
@@ -2699,7 +2740,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 2703 "src/parser_proc.c" /* glr.c:816  */
+#line 2744 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 228:
@@ -2714,7 +2755,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 2718 "src/parser_proc.c" /* glr.c:816  */
+#line 2759 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 229:
@@ -2724,7 +2765,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 2728 "src/parser_proc.c" /* glr.c:816  */
+#line 2769 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 230:
@@ -2734,7 +2775,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 2738 "src/parser_proc.c" /* glr.c:816  */
+#line 2779 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 231:
@@ -2745,7 +2786,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 2749 "src/parser_proc.c" /* glr.c:816  */
+#line 2790 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 232:
@@ -2756,7 +2797,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 2760 "src/parser_proc.c" /* glr.c:816  */
+#line 2801 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 233:
@@ -2764,7 +2805,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 2768 "src/parser_proc.c" /* glr.c:816  */
+#line 2809 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 235:
@@ -2773,7 +2814,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 2777 "src/parser_proc.c" /* glr.c:816  */
+#line 2818 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 236:
@@ -2781,7 +2822,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 2785 "src/parser_proc.c" /* glr.c:816  */
+#line 2826 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 237:
@@ -2790,7 +2831,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 2794 "src/parser_proc.c" /* glr.c:816  */
+#line 2835 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 238:
@@ -2798,7 +2839,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 2802 "src/parser_proc.c" /* glr.c:816  */
+#line 2843 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 243:
@@ -2806,7 +2847,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_impl_def_val **)(&(*yyvalp))) = NULL;
 }
-#line 2810 "src/parser_proc.c" /* glr.c:816  */
+#line 2851 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 244:
@@ -2815,7 +2856,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 2819 "src/parser_proc.c" /* glr.c:816  */
+#line 2860 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 250:
@@ -2823,7 +2864,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 2827 "src/parser_proc.c" /* glr.c:816  */
+#line 2868 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 252:
@@ -2836,7 +2877,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 2840 "src/parser_proc.c" /* glr.c:816  */
+#line 2881 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 253:
@@ -2851,7 +2892,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->token);
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.enm = (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 2855 "src/parser_proc.c" /* glr.c:816  */
+#line 2896 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 254:
@@ -2864,7 +2905,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct->align = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).pos;
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).len;
 }
-#line 2868 "src/parser_proc.c" /* glr.c:816  */
+#line 2909 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 255:
@@ -2877,7 +2918,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn->align = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).pos;
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).len;
 }
-#line 2881 "src/parser_proc.c" /* glr.c:816  */
+#line 2922 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 256:
@@ -2887,7 +2928,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 (-1)].yystate.yysemantics.yysval)), psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0, 0));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2891 "src/parser_proc.c" /* glr.c:816  */
+#line 2932 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 257:
@@ -2895,7 +2936,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 2899 "src/parser_proc.c" /* glr.c:816  */
+#line 2940 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 259:
@@ -2904,7 +2945,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 2908 "src/parser_proc.c" /* glr.c:816  */
+#line 2949 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 261:
@@ -2914,7 +2955,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 2918 "src/parser_proc.c" /* glr.c:816  */
+#line 2959 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 262:
@@ -2924,7 +2965,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 2928 "src/parser_proc.c" /* glr.c:816  */
+#line 2969 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 263:
@@ -2934,7 +2975,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 2938 "src/parser_proc.c" /* glr.c:816  */
+#line 2979 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 266:
@@ -2942,7 +2983,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 2946 "src/parser_proc.c" /* glr.c:816  */
+#line 2987 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 267:
@@ -2950,7 +2991,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 2954 "src/parser_proc.c" /* glr.c:816  */
+#line 2995 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 268:
@@ -2958,7 +2999,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 2962 "src/parser_proc.c" /* glr.c:816  */
+#line 3003 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 269:
@@ -2966,7 +3007,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 2970 "src/parser_proc.c" /* glr.c:816  */
+#line 3011 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 270:
@@ -2974,7 +3015,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 2978 "src/parser_proc.c" /* glr.c:816  */
+#line 3019 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 281:
@@ -2982,7 +3023,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 2986 "src/parser_proc.c" /* glr.c:816  */
+#line 3027 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 282:
@@ -2990,7 +3031,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 2994 "src/parser_proc.c" /* glr.c:816  */
+#line 3035 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 283:
@@ -2998,7 +3039,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 3002 "src/parser_proc.c" /* glr.c:816  */
+#line 3043 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 284:
@@ -3006,7 +3047,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 3010 "src/parser_proc.c" /* glr.c:816  */
+#line 3051 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 285:
@@ -3014,7 +3055,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 3018 "src/parser_proc.c" /* glr.c:816  */
+#line 3059 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 286:
@@ -3027,7 +3068,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 3031 "src/parser_proc.c" /* glr.c:816  */
+#line 3072 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 287:
@@ -3041,7 +3082,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 3045 "src/parser_proc.c" /* glr.c:816  */
+#line 3086 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 288:
@@ -3049,7 +3090,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3053 "src/parser_proc.c" /* glr.c:816  */
+#line 3094 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 289:
@@ -3057,7 +3098,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 3061 "src/parser_proc.c" /* glr.c:816  */
+#line 3102 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 290:
@@ -3069,7 +3110,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 3073 "src/parser_proc.c" /* glr.c:816  */
+#line 3114 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 291:
@@ -3077,7 +3118,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 3081 "src/parser_proc.c" /* glr.c:816  */
+#line 3122 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 292:
@@ -3089,7 +3130,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 3093 "src/parser_proc.c" /* glr.c:816  */
+#line 3134 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 293:
@@ -3097,7 +3138,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3101 "src/parser_proc.c" /* glr.c:816  */
+#line 3142 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 295:
@@ -3105,7 +3146,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3109 "src/parser_proc.c" /* glr.c:816  */
+#line 3150 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 298:
@@ -3113,7 +3154,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3117 "src/parser_proc.c" /* glr.c:816  */
+#line 3158 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 299:
@@ -3121,7 +3162,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 3125 "src/parser_proc.c" /* glr.c:816  */
+#line 3166 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 300:
@@ -3134,7 +3175,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 3138 "src/parser_proc.c" /* glr.c:816  */
+#line 3179 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 301:
@@ -3142,7 +3183,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3146 "src/parser_proc.c" /* glr.c:816  */
+#line 3187 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 302:
@@ -3150,7 +3191,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3154 "src/parser_proc.c" /* glr.c:816  */
+#line 3195 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 308:
@@ -3158,7 +3199,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        psi_decl_arg_free(&(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3162 "src/parser_proc.c" /* glr.c:816  */
+#line 3203 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 310:
@@ -3166,7 +3207,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3170 "src/parser_proc.c" /* glr.c:816  */
+#line 3211 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 311:
@@ -3174,7 +3215,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(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 3178 "src/parser_proc.c" /* glr.c:816  */
+#line 3219 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 312:
@@ -3182,7 +3223,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_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3186 "src/parser_proc.c" /* glr.c:816  */
+#line 3227 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 314:
@@ -3191,7 +3232,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3195 "src/parser_proc.c" /* glr.c:816  */
+#line 3236 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 317:
@@ -3203,7 +3244,7 @@ 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 3207 "src/parser_proc.c" /* glr.c:816  */
+#line 3248 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 318:
@@ -3216,7 +3257,7 @@ 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 3220 "src/parser_proc.c" /* glr.c:816  */
+#line 3261 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 319:
@@ -3228,7 +3269,7 @@ 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 3232 "src/parser_proc.c" /* glr.c:816  */
+#line 3273 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 320:
@@ -3241,7 +3282,7 @@ 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 3245 "src/parser_proc.c" /* glr.c:816  */
+#line 3286 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 321:
@@ -3253,7 +3294,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 (-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 3257 "src/parser_proc.c" /* glr.c:816  */
+#line 3298 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 322:
@@ -3269,7 +3310,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 (-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 3273 "src/parser_proc.c" /* glr.c:816  */
+#line 3314 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 323:
@@ -3285,7 +3326,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 (-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 3289 "src/parser_proc.c" /* glr.c:816  */
+#line 3330 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 324:
@@ -3301,7 +3342,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 (-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 3305 "src/parser_proc.c" /* glr.c:816  */
+#line 3346 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 326:
@@ -3315,7 +3356,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 3319 "src/parser_proc.c" /* glr.c:816  */
+#line 3360 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 327:
@@ -3323,7 +3364,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3327 "src/parser_proc.c" /* glr.c:816  */
+#line 3368 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 328:
@@ -3331,7 +3372,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3335 "src/parser_proc.c" /* glr.c:816  */
+#line 3376 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 329:
@@ -3339,7 +3380,7 @@ 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), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3343 "src/parser_proc.c" /* glr.c:816  */
+#line 3384 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 330:
@@ -3347,7 +3388,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_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3351 "src/parser_proc.c" /* glr.c:816  */
+#line 3392 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 331:
@@ -3360,7 +3401,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 3364 "src/parser_proc.c" /* glr.c:816  */
+#line 3405 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 332:
@@ -3368,7 +3409,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 (-1)].yystate.yysemantics.yysval)), (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3372 "src/parser_proc.c" /* glr.c:816  */
+#line 3413 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 333:
@@ -3383,7 +3424,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 3387 "src/parser_proc.c" /* glr.c:816  */
+#line 3428 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 334:
@@ -3398,7 +3439,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 3402 "src/parser_proc.c" /* glr.c:816  */
+#line 3443 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 335:
@@ -3408,7 +3449,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3412 "src/parser_proc.c" /* glr.c:816  */
+#line 3453 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 336:
@@ -3418,7 +3459,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(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 3422 "src/parser_proc.c" /* glr.c:816  */
+#line 3463 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 337:
@@ -3430,7 +3471,7 @@ 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 3434 "src/parser_proc.c" /* glr.c:816  */
+#line 3475 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 338:
@@ -3442,7 +3483,7 @@ 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 3446 "src/parser_proc.c" /* glr.c:816  */
+#line 3487 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 339:
@@ -3450,7 +3491,7 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3454 "src/parser_proc.c" /* glr.c:816  */
+#line 3495 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 341:
@@ -3458,202 +3499,224 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3462 "src/parser_proc.c" /* glr.c:816  */
+#line 3503 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 342:
 #line 1194 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].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 (-2)].yystate.yysemantics.yysval)));
+       (*(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)));
+       if ((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))) {
+               size_t i = 0;
+               struct psi_decl_arg *arg;
+               
+               while (psi_plist_get((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), i++, &arg)) {
+                       arg->type = psi_decl_type_copy((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type);
+                       (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&(*yyvalp))), &arg);
+               }
+               free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
+       }
 }
-#line 3471 "src/parser_proc.c" /* glr.c:816  */
+#line 3522 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 343:
-#line 1198 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1208 "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 (-3)].yystate.yysemantics.yysval)));
-       {
+       (*(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)));
+       if ((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))) {
                size_t i = 0;
-               struct psi_decl_var *var;
+               struct psi_decl_arg *arg;
                
-               while (psi_plist_get((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), i++, &var)) {
-                       struct psi_decl_arg *arg = psi_decl_arg_init(psi_decl_type_copy((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type), var);
-                       
+               while (psi_plist_get((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), i++, &arg)) {
+                       arg->type = psi_decl_type_copy((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type);
                        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&(*yyvalp))), &arg);
                }
+               free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
-       free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3490 "src/parser_proc.c" /* glr.c:816  */
+#line 3541 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 344:
-#line 1212 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1225 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
-       (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
+       (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3499 "src/parser_proc.c" /* glr.c:816  */
+#line 3549 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 345:
-#line 1216 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1228 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
+}
+#line 3557 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 346:
+#line 1234 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(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)));
        {
-               size_t i = 0;
-               struct psi_decl_var *var;
-               
-               while (psi_plist_get((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), i++, &var)) {
-                       struct psi_decl_arg *arg = psi_decl_arg_init(psi_decl_type_copy((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type), var);
-                       
-                       (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&(*yyvalp))), &arg);
-               }
+               struct psi_decl_arg *arg = psi_decl_arg_init(NULL, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
+               arg->layout = (*(struct psi_layout **)(&((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), &arg);
        }
-       free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3518 "src/parser_proc.c" /* glr.c:816  */
+#line 3569 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 346:
-#line 1233 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 347:
+#line 1241 "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)));
+               arg->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
+               (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), &arg);
+       }
+}
+#line 3581 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 348:
+#line 1251 "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 3527 "src/parser_proc.c" /* glr.c:816  */
+#line 3590 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 347:
-#line 1240 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 349:
+#line 1258 "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 3535 "src/parser_proc.c" /* glr.c:816  */
+#line 3598 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 348:
-#line 1243 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 350:
+#line 1261 "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 3543 "src/parser_proc.c" /* glr.c:816  */
+#line 3606 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 349:
-#line 1249 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 351:
+#line 1267 "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 3553 "src/parser_proc.c" /* glr.c:816  */
+#line 3616 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 350:
-#line 1254 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 352:
+#line 1272 "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 3563 "src/parser_proc.c" /* glr.c:816  */
+#line 3626 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 351:
-#line 1262 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 353:
+#line 1280 "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 3572 "src/parser_proc.c" /* glr.c:816  */
+#line 3635 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 352:
-#line 1266 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 354:
+#line 1284 "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 3581 "src/parser_proc.c" /* glr.c:816  */
+#line 3644 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 353:
-#line 1270 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 355:
+#line 1288 "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 3590 "src/parser_proc.c" /* glr.c:816  */
+#line 3653 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 354:
-#line 1274 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 356:
+#line 1292 "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 3599 "src/parser_proc.c" /* glr.c:816  */
+#line 3662 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 355:
-#line 1278 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 357:
+#line 1296 "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 3608 "src/parser_proc.c" /* glr.c:816  */
+#line 3671 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 356:
-#line 1282 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 358:
+#line 1300 "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 3617 "src/parser_proc.c" /* glr.c:816  */
+#line 3680 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 357:
-#line 1289 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 359:
+#line 1307 "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 3626 "src/parser_proc.c" /* glr.c:816  */
+#line 3689 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 358:
-#line 1293 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 360:
+#line 1311 "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 3635 "src/parser_proc.c" /* glr.c:816  */
+#line 3698 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 359:
-#line 1297 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 361:
+#line 1315 "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 3644 "src/parser_proc.c" /* glr.c:816  */
+#line 3707 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 360:
-#line 1301 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 362:
+#line 1319 "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 3653 "src/parser_proc.c" /* glr.c:816  */
+#line 3716 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 361:
-#line 1308 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 363:
+#line 1326 "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)));
@@ -3664,11 +3727,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 3668 "src/parser_proc.c" /* glr.c:816  */
+#line 3731 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 362:
-#line 1321 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 364:
+#line 1339 "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)));
@@ -3679,11 +3742,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 3683 "src/parser_proc.c" /* glr.c:816  */
+#line 3746 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 363:
-#line 1334 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 365:
+#line 1352 "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)));
@@ -3694,155 +3757,171 @@ 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 3698 "src/parser_proc.c" /* glr.c:816  */
+#line 3761 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 364:
-#line 1347 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 366:
+#line 1365 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3706 "src/parser_proc.c" /* glr.c:816  */
+#line 3769 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 365:
-#line 1350 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 367:
+#line 1368 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&(*yyvalp)))->type = PSI_T_NAME;
 }
-#line 3715 "src/parser_proc.c" /* glr.c:816  */
+#line 3778 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 366:
-#line 1357 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 368:
+#line 1375 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = NULL;
 }
-#line 3723 "src/parser_proc.c" /* glr.c:816  */
+#line 3786 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 367:
-#line 1360 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 369:
+#line 1378 "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));
+       (*(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 3731 "src/parser_proc.c" /* glr.c:816  */
+#line 3794 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 368:
-#line 1366 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 370:
+#line 1381 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(struct psi_layout **)(&(*yyvalp))) = psi_layout_init(atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text), NULL);
+}
+#line 3802 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 371:
+#line 1384 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(struct psi_layout **)(&(*yyvalp))) = psi_layout_init(atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text), psi_layout_init(0, atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-7)].yystate.yysemantics.yysval))->text), NULL));
+}
+#line 3810 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 372:
+#line 1390 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout*)(&(*yyvalp))).pos = 0;
        (*(struct psi_layout*)(&(*yyvalp))).len = 0;
 }
-#line 3740 "src/parser_proc.c" /* glr.c:816  */
+#line 3819 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 369:
-#line 1370 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 373:
+#line 1394 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout*)(&(*yyvalp))).pos = atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text);
        (*(struct psi_layout*)(&(*yyvalp))).len = atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text);
 }
-#line 3749 "src/parser_proc.c" /* glr.c:816  */
+#line 3828 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 370:
-#line 1377 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 374:
+#line 1401 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 3757 "src/parser_proc.c" /* glr.c:816  */
+#line 3836 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 371:
-#line 1380 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 375:
+#line 1404 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text);
 }
-#line 3765 "src/parser_proc.c" /* glr.c:816  */
+#line 3844 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 372:
-#line 1386 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 376:
+#line 1410 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 3773 "src/parser_proc.c" /* glr.c:816  */
+#line 3852 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 373:
-#line 1389 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 377:
+#line 1413 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3781 "src/parser_proc.c" /* glr.c:816  */
+#line 3860 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 375:
-#line 1396 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 379:
+#line 1420 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3789 "src/parser_proc.c" /* glr.c:816  */
+#line 3868 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 376:
-#line 1402 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 380:
+#line 1426 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 1;
 }
-#line 3797 "src/parser_proc.c" /* glr.c:816  */
+#line 3876 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 377:
-#line 1405 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 381:
+#line 1429 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)) + 1;
 }
-#line 3805 "src/parser_proc.c" /* glr.c:816  */
+#line 3884 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 378:
-#line 1417 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 382:
+#line 1441 "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 3813 "src/parser_proc.c" /* glr.c:816  */
+#line 3892 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 379:
-#line 1420 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 383:
+#line 1444 "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 3822 "src/parser_proc.c" /* glr.c:816  */
+#line 3901 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 380:
-#line 1427 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 384:
+#line 1451 "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 3832 "src/parser_proc.c" /* glr.c:816  */
+#line 3911 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 381:
-#line 1432 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 385:
+#line 1456 "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 3842 "src/parser_proc.c" /* glr.c:816  */
+#line 3921 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 382:
-#line 1437 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 386:
+#line 1461 "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)));
@@ -3850,461 +3929,461 @@ 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 3854 "src/parser_proc.c" /* glr.c:816  */
+#line 3933 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 383:
-#line 1447 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 387:
+#line 1471 "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 3862 "src/parser_proc.c" /* glr.c:816  */
+#line 3941 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 384:
-#line 1450 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 388:
+#line 1474 "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 3870 "src/parser_proc.c" /* glr.c:816  */
+#line 3949 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 385:
-#line 1456 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 389:
+#line 1480 "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 3878 "src/parser_proc.c" /* glr.c:816  */
+#line 3957 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 386:
-#line 1459 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 390:
+#line 1483 "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 3886 "src/parser_proc.c" /* glr.c:816  */
+#line 3965 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 387:
-#line 1465 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 391:
+#line 1489 "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 3895 "src/parser_proc.c" /* glr.c:816  */
+#line 3974 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 388:
-#line 1472 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 392:
+#line 1496 "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 3904 "src/parser_proc.c" /* glr.c:816  */
+#line 3983 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 398:
-#line 1491 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 402:
+#line 1515 "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 3912 "src/parser_proc.c" /* glr.c:816  */
+#line 3991 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 399:
-#line 1494 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 403:
+#line 1518 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), &(*(struct psi_token ***)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3920 "src/parser_proc.c" /* glr.c:816  */
+#line 3999 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 400:
-#line 1500 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 404:
+#line 1524 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_return_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3928 "src/parser_proc.c" /* glr.c:816  */
+#line 4007 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 401:
-#line 1503 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 405:
+#line 1527 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_let_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3936 "src/parser_proc.c" /* glr.c:816  */
+#line 4015 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 402:
-#line 1506 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 406:
+#line 1530 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_set_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3944 "src/parser_proc.c" /* glr.c:816  */
+#line 4023 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 403:
-#line 1509 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 407:
+#line 1533 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token ***)(&(*yyvalp))) = (struct psi_token **) (*(struct psi_assert_stmt **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3952 "src/parser_proc.c" /* glr.c:816  */
+#line 4031 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 404:
-#line 1512 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 408:
+#line 1536 "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 3960 "src/parser_proc.c" /* glr.c:816  */
+#line 4039 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 405:
-#line 1518 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 409:
+#line 1542 "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 3969 "src/parser_proc.c" /* glr.c:816  */
+#line 4048 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 406:
-#line 1522 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 410:
+#line 1546 "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 3979 "src/parser_proc.c" /* glr.c:816  */
+#line 4058 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 408:
-#line 1531 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 412:
+#line 1555 "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 3988 "src/parser_proc.c" /* glr.c:816  */
+#line 4067 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 409:
-#line 1535 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 413:
+#line 1559 "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 3997 "src/parser_proc.c" /* glr.c:816  */
+#line 4076 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 410:
-#line 1542 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 414:
+#line 1566 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_NULL, NULL);
 }
-#line 4005 "src/parser_proc.c" /* glr.c:816  */
+#line 4084 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 411:
-#line 1545 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 415:
+#line 1569 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLOC, (*(struct psi_let_calloc **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4013 "src/parser_proc.c" /* glr.c:816  */
+#line 4092 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 412:
-#line 1548 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 416:
+#line 1572 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLBACK, (*(struct psi_let_callback **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4021 "src/parser_proc.c" /* glr.c:816  */
+#line 4100 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 413:
-#line 1551 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 417:
+#line 1575 "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 4029 "src/parser_proc.c" /* glr.c:816  */
+#line 4108 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 414:
-#line 1554 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 418:
+#line 1578 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init_ex(NULL, PSI_LET_NUMEXP, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4037 "src/parser_proc.c" /* glr.c:816  */
+#line 4116 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 415:
-#line 1560 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 419:
+#line 1584 "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 4046 "src/parser_proc.c" /* glr.c:816  */
+#line 4125 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 416:
-#line 1564 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 420:
+#line 1588 "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 4056 "src/parser_proc.c" /* glr.c:816  */
+#line 4135 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 417:
-#line 1572 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 421:
+#line 1596 "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 4065 "src/parser_proc.c" /* glr.c:816  */
+#line 4144 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 418:
-#line 1579 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 422:
+#line 1603 "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 4075 "src/parser_proc.c" /* glr.c:816  */
+#line 4154 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 419:
-#line 1587 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 423:
+#line 1611 "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 4085 "src/parser_proc.c" /* glr.c:816  */
+#line 4164 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 430:
-#line 1608 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 434:
+#line 1632 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4093 "src/parser_proc.c" /* glr.c:816  */
+#line 4172 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 431:
-#line 1611 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 435:
+#line 1635 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4101 "src/parser_proc.c" /* glr.c:816  */
+#line 4180 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 432:
-#line 1617 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 436:
+#line 1641 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_let_exp_free), &(*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4109 "src/parser_proc.c" /* glr.c:816  */
+#line 4188 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 433:
-#line 1620 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 437:
+#line 1644 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_let_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4117 "src/parser_proc.c" /* glr.c:816  */
+#line 4196 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 436:
-#line 1631 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 440:
+#line 1655 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4125 "src/parser_proc.c" /* glr.c:816  */
+#line 4204 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 437:
-#line 1634 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 441:
+#line 1658 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4133 "src/parser_proc.c" /* glr.c:816  */
+#line 4212 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 438:
-#line 1640 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 442:
+#line 1664 "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 4141 "src/parser_proc.c" /* glr.c:816  */
+#line 4220 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 439:
-#line 1643 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 443:
+#line 1667 "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 4149 "src/parser_proc.c" /* glr.c:816  */
+#line 4228 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 440:
-#line 1649 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 444:
+#line 1673 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_return_stmt **)(&(*yyvalp))) = psi_return_stmt_init(psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))));
        (*(struct psi_return_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4158 "src/parser_proc.c" /* glr.c:816  */
+#line 4237 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 441:
-#line 1656 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 445:
+#line 1680 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_stmt **)(&(*yyvalp))) = psi_set_stmt_init((*(struct psi_set_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_set_stmt **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4167 "src/parser_proc.c" /* glr.c:816  */
+#line 4246 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 442:
-#line 1663 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 446:
+#line 1687 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_exp **)(&(*yyvalp))) = psi_set_exp_init(PSI_SET_FUNC, (*(struct psi_set_func **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4175 "src/parser_proc.c" /* glr.c:816  */
+#line 4254 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 443:
-#line 1666 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 447:
+#line 1690 "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 4183 "src/parser_proc.c" /* glr.c:816  */
+#line 4262 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 444:
-#line 1669 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 448:
+#line 1693 "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 4192 "src/parser_proc.c" /* glr.c:816  */
+#line 4271 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 445:
-#line 1676 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 449:
+#line 1700 "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 4202 "src/parser_proc.c" /* glr.c:816  */
+#line 4281 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 446:
-#line 1681 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 450:
+#line 1705 "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 4212 "src/parser_proc.c" /* glr.c:816  */
+#line 4291 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 455:
-#line 1700 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 459:
+#line 1724 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4220 "src/parser_proc.c" /* glr.c:816  */
+#line 4299 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 456:
-#line 1703 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 460:
+#line 1727 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4228 "src/parser_proc.c" /* glr.c:816  */
+#line 4307 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 457:
-#line 1709 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 461:
+#line 1733 "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 4236 "src/parser_proc.c" /* glr.c:816  */
+#line 4315 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 458:
-#line 1712 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 462:
+#line 1736 "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 4244 "src/parser_proc.c" /* glr.c:816  */
+#line 4323 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 459:
-#line 1718 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 463:
+#line 1742 "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 4253 "src/parser_proc.c" /* glr.c:816  */
+#line 4332 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 462:
-#line 1730 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 466:
+#line 1754 "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 4262 "src/parser_proc.c" /* glr.c:816  */
+#line 4341 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 463:
-#line 1737 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 467:
+#line 1761 "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 4270 "src/parser_proc.c" /* glr.c:816  */
+#line 4349 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 464:
-#line 1740 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 468:
+#line 1764 "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 4278 "src/parser_proc.c" /* glr.c:816  */
+#line 4357 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 465:
-#line 1746 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 469:
+#line 1770 "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 4288 "src/parser_proc.c" /* glr.c:816  */
+#line 4367 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 466:
-#line 1754 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 470:
+#line 1778 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = false;
 }
-#line 4296 "src/parser_proc.c" /* glr.c:816  */
+#line 4375 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 467:
-#line 1757 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 471:
+#line 1781 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = true;
 }
-#line 4304 "src/parser_proc.c" /* glr.c:816  */
+#line 4383 "src/parser_proc.c" /* glr.c:816  */
     break;
 
 
-#line 4308 "src/parser_proc.c" /* glr.c:816  */
+#line 4387 "src/parser_proc.c" /* glr.c:816  */
       default: break;
     }
 
@@ -4355,649 +4434,661 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct psi_parser
           case 133: /* binary_op_token  */
 #line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4359 "src/parser_proc.c" /* glr.c:846  */
+#line 4438 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 134: /* unary_op_token  */
 #line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4365 "src/parser_proc.c" /* glr.c:846  */
+#line 4444 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 135: /* name_token  */
 #line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4371 "src/parser_proc.c" /* glr.c:846  */
+#line 4450 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 136: /* any_noeol_token  */
 #line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4377 "src/parser_proc.c" /* glr.c:846  */
+#line 4456 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 140: /* lib  */
 #line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4383 "src/parser_proc.c" /* glr.c:846  */
+#line 4462 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 141: /* cpp  */
 #line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 4389 "src/parser_proc.c" /* glr.c:846  */
+#line 4468 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 142: /* cpp_exp  */
 #line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 4395 "src/parser_proc.c" /* glr.c:846  */
+#line 4474 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 144: /* cpp_message_token  */
 #line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4401 "src/parser_proc.c" /* glr.c:846  */
+#line 4480 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 145: /* cpp_include_token  */
 #line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4407 "src/parser_proc.c" /* glr.c:846  */
+#line 4486 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 146: /* cpp_header_token  */
 #line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4413 "src/parser_proc.c" /* glr.c:846  */
+#line 4492 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 147: /* cpp_no_arg_token  */
 #line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4419 "src/parser_proc.c" /* glr.c:846  */
+#line 4498 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 148: /* cpp_name_arg_token  */
 #line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4425 "src/parser_proc.c" /* glr.c:846  */
+#line 4504 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 149: /* cpp_exp_arg_token  */
 #line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4431 "src/parser_proc.c" /* glr.c:846  */
+#line 4510 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 150: /* cpp_special_name_token  */
 #line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4437 "src/parser_proc.c" /* glr.c:846  */
+#line 4516 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 151: /* cpp_macro_decl  */
 #line 288 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_macro_decl_free(&(*(struct psi_cpp_macro_decl **)(&(*yyvaluep))));}
-#line 4443 "src/parser_proc.c" /* glr.c:846  */
+#line 4522 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 152: /* cpp_macro_sig  */
 #line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4449 "src/parser_proc.c" /* glr.c:846  */
+#line 4528 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 153: /* cpp_macro_sig_args  */
 #line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4455 "src/parser_proc.c" /* glr.c:846  */
+#line 4534 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 154: /* cpp_macro_decl_tokens  */
 #line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4461 "src/parser_proc.c" /* glr.c:846  */
+#line 4540 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 155: /* cpp_macro_decl_token_list  */
 #line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4467 "src/parser_proc.c" /* glr.c:846  */
+#line 4546 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 156: /* cpp_macro_exp  */
 #line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 4473 "src/parser_proc.c" /* glr.c:846  */
+#line 4552 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 157: /* cpp_macro_call_args  */
 #line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4479 "src/parser_proc.c" /* glr.c:846  */
+#line 4558 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 158: /* cpp_macro_call_arg_list  */
 #line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4485 "src/parser_proc.c" /* glr.c:846  */
+#line 4564 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 159: /* constant  */
 #line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_free(&(*(struct psi_const **)(&(*yyvaluep))));}
-#line 4491 "src/parser_proc.c" /* glr.c:846  */
+#line 4570 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 160: /* constant_type  */
 #line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_type_free(&(*(struct psi_const_type **)(&(*yyvaluep))));}
-#line 4497 "src/parser_proc.c" /* glr.c:846  */
+#line 4576 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 161: /* constant_type_token  */
 #line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4503 "src/parser_proc.c" /* glr.c:846  */
+#line 4582 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 162: /* impl_def_val  */
 #line 302 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_def_val_free(&(*(struct psi_impl_def_val **)(&(*yyvaluep))));}
-#line 4509 "src/parser_proc.c" /* glr.c:846  */
+#line 4588 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 163: /* impl_def_val_token  */
 #line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4515 "src/parser_proc.c" /* glr.c:846  */
+#line 4594 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 164: /* decl_typedef  */
 #line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4521 "src/parser_proc.c" /* glr.c:846  */
+#line 4600 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 165: /* typedef  */
 #line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4527 "src/parser_proc.c" /* glr.c:846  */
+#line 4606 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 166: /* const_decl_type  */
 #line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 4533 "src/parser_proc.c" /* glr.c:846  */
+#line 4612 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 167: /* decl_type  */
 #line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 4539 "src/parser_proc.c" /* glr.c:846  */
+#line 4618 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 168: /* decl_type_complex  */
 #line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 4545 "src/parser_proc.c" /* glr.c:846  */
+#line 4624 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 169: /* decl_type_simple  */
 #line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4551 "src/parser_proc.c" /* glr.c:846  */
+#line 4630 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 170: /* decl_real_type  */
 #line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4557 "src/parser_proc.c" /* glr.c:846  */
+#line 4636 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 171: /* decl_stdint_type  */
 #line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4563 "src/parser_proc.c" /* glr.c:846  */
+#line 4642 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 172: /* int_signed  */
 #line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4569 "src/parser_proc.c" /* glr.c:846  */
+#line 4648 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 173: /* int_width  */
 #line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4575 "src/parser_proc.c" /* glr.c:846  */
+#line 4654 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 174: /* decl_int_type  */
 #line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4581 "src/parser_proc.c" /* glr.c:846  */
+#line 4660 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 175: /* int_signed_types  */
 #line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4587 "src/parser_proc.c" /* glr.c:846  */
+#line 4666 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 176: /* signed_short_types  */
 #line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4593 "src/parser_proc.c" /* glr.c:846  */
+#line 4672 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 177: /* signed_long_types  */
 #line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4599 "src/parser_proc.c" /* glr.c:846  */
+#line 4678 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 178: /* int_width_types  */
 #line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4605 "src/parser_proc.c" /* glr.c:846  */
+#line 4684 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 179: /* decl_stmt  */
 #line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4611 "src/parser_proc.c" /* glr.c:846  */
+#line 4690 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 185: /* decl_vars  */
 #line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4617 "src/parser_proc.c" /* glr.c:846  */
+#line 4696 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 186: /* decl  */
 #line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4623 "src/parser_proc.c" /* glr.c:846  */
+#line 4702 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 187: /* decl_body  */
 #line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4629 "src/parser_proc.c" /* glr.c:846  */
+#line 4708 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 188: /* decl_func_body  */
 #line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4635 "src/parser_proc.c" /* glr.c:846  */
+#line 4714 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 189: /* decl_functor_body  */
 #line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4641 "src/parser_proc.c" /* glr.c:846  */
+#line 4720 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 190: /* decl_functor  */
 #line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4647 "src/parser_proc.c" /* glr.c:846  */
+#line 4726 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 191: /* decl_func  */
 #line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4653 "src/parser_proc.c" /* glr.c:846  */
+#line 4732 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 192: /* decl_args  */
 #line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4659 "src/parser_proc.c" /* glr.c:846  */
+#line 4738 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 193: /* decl_arg  */
 #line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4665 "src/parser_proc.c" /* glr.c:846  */
+#line 4744 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 194: /* decl_var  */
 #line 317 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_var_free(&(*(struct psi_decl_var **)(&(*yyvaluep))));}
-#line 4671 "src/parser_proc.c" /* glr.c:846  */
+#line 4750 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 195: /* decl_union  */
 #line 321 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_union_free(&(*(struct psi_decl_union **)(&(*yyvaluep))));}
-#line 4677 "src/parser_proc.c" /* glr.c:846  */
+#line 4756 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 196: /* decl_struct  */
 #line 319 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_struct_free(&(*(struct psi_decl_struct **)(&(*yyvaluep))));}
-#line 4683 "src/parser_proc.c" /* glr.c:846  */
+#line 4762 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 197: /* decl_struct_args  */
 #line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4689 "src/parser_proc.c" /* glr.c:846  */
+#line 4768 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 198: /* struct_args_block  */
 #line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4695 "src/parser_proc.c" /* glr.c:846  */
+#line 4774 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 199: /* struct_args  */
 #line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4701 "src/parser_proc.c" /* glr.c:846  */
+#line 4780 "src/parser_proc.c" /* glr.c:846  */
+        break;
+
+    case 200: /* struct_arg_var_list  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+      {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
+#line 4786 "src/parser_proc.c" /* glr.c:846  */
+        break;
+
+    case 201: /* decl_vars_with_layout  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+      {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
+#line 4792 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 200: /* decl_enum  */
+    case 202: /* decl_enum  */
 #line 323 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_free(&(*(struct psi_decl_enum **)(&(*yyvaluep))));}
-#line 4707 "src/parser_proc.c" /* glr.c:846  */
+#line 4798 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 201: /* decl_enum_items  */
+    case 203: /* decl_enum_items  */
 #line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4713 "src/parser_proc.c" /* glr.c:846  */
+#line 4804 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 202: /* decl_enum_item  */
+    case 204: /* decl_enum_item  */
 #line 325 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_item_free(&(*(struct psi_decl_enum_item **)(&(*yyvaluep))));}
-#line 4719 "src/parser_proc.c" /* glr.c:846  */
+#line 4810 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 203: /* num_exp  */
+    case 205: /* num_exp  */
 #line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 4725 "src/parser_proc.c" /* glr.c:846  */
+#line 4816 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 204: /* number  */
+    case 206: /* number  */
 #line 380 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 4731 "src/parser_proc.c" /* glr.c:846  */
+#line 4822 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 205: /* enum_name  */
+    case 207: /* enum_name  */
 #line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4737 "src/parser_proc.c" /* glr.c:846  */
+#line 4828 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 206: /* union_name  */
+    case 208: /* union_name  */
 #line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4743 "src/parser_proc.c" /* glr.c:846  */
+#line 4834 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 207: /* struct_name  */
+    case 209: /* struct_name  */
 #line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4749 "src/parser_proc.c" /* glr.c:846  */
+#line 4840 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 208: /* optional_name  */
+    case 210: /* optional_name  */
 #line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4755 "src/parser_proc.c" /* glr.c:846  */
+#line 4846 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 209: /* decl_layout  */
+    case 211: /* decl_layout  */
 #line 332 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_layout_free(&(*(struct psi_layout **)(&(*yyvaluep))));}
-#line 4761 "src/parser_proc.c" /* glr.c:846  */
+#line 4852 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 210: /* align_and_size  */
+    case 212: /* align_and_size  */
 #line 330 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4767 "src/parser_proc.c" /* glr.c:846  */
+#line 4858 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 211: /* array_size  */
+    case 213: /* array_size  */
 #line 383 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4773 "src/parser_proc.c" /* glr.c:846  */
+#line 4864 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 212: /* indirection  */
+    case 214: /* indirection  */
 #line 383 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4779 "src/parser_proc.c" /* glr.c:846  */
+#line 4870 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 213: /* pointers  */
+    case 215: /* pointers  */
 #line 383 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4785 "src/parser_proc.c" /* glr.c:846  */
+#line 4876 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 214: /* asterisks  */
+    case 216: /* asterisks  */
 #line 383 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4791 "src/parser_proc.c" /* glr.c:846  */
+#line 4882 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 215: /* impl  */
+    case 217: /* impl  */
 #line 335 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_free(&(*(struct psi_impl **)(&(*yyvaluep))));}
-#line 4797 "src/parser_proc.c" /* glr.c:846  */
+#line 4888 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 216: /* impl_func  */
+    case 218: /* impl_func  */
 #line 337 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_func_free(&(*(struct psi_impl_func **)(&(*yyvaluep))));}
-#line 4803 "src/parser_proc.c" /* glr.c:846  */
+#line 4894 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 217: /* impl_args  */
+    case 219: /* impl_args  */
 #line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4809 "src/parser_proc.c" /* glr.c:846  */
+#line 4900 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 218: /* impl_arg  */
+    case 220: /* impl_arg  */
 #line 339 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_arg_free(&(*(struct psi_impl_arg **)(&(*yyvaluep))));}
-#line 4815 "src/parser_proc.c" /* glr.c:846  */
+#line 4906 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 219: /* impl_var  */
+    case 221: /* impl_var  */
 #line 343 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_var_free(&(*(struct psi_impl_var **)(&(*yyvaluep))));}
-#line 4821 "src/parser_proc.c" /* glr.c:846  */
+#line 4912 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 220: /* impl_type  */
+    case 222: /* impl_type  */
 #line 341 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_type_free(&(*(struct psi_impl_type **)(&(*yyvaluep))));}
-#line 4827 "src/parser_proc.c" /* glr.c:846  */
+#line 4918 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 221: /* impl_type_token  */
+    case 223: /* impl_type_token  */
 #line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4833 "src/parser_proc.c" /* glr.c:846  */
+#line 4924 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 222: /* impl_stmts  */
+    case 224: /* impl_stmts  */
 #line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4839 "src/parser_proc.c" /* glr.c:846  */
+#line 4930 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 223: /* impl_stmt  */
+    case 225: /* impl_stmt  */
 #line 371 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_stmt_free(&(*(struct psi_token ***)(&(*yyvaluep))));}
-#line 4845 "src/parser_proc.c" /* glr.c:846  */
+#line 4936 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 224: /* let_stmt  */
+    case 226: /* let_stmt  */
 #line 346 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_stmt_free(&(*(struct psi_let_stmt **)(&(*yyvaluep))));}
-#line 4851 "src/parser_proc.c" /* glr.c:846  */
+#line 4942 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 225: /* let_exp  */
+    case 227: /* let_exp  */
 #line 348 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 4857 "src/parser_proc.c" /* glr.c:846  */
+#line 4948 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 226: /* let_exp_byref  */
+    case 228: /* let_exp_byref  */
 #line 348 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 4863 "src/parser_proc.c" /* glr.c:846  */
+#line 4954 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 227: /* let_exp_assign  */
+    case 229: /* let_exp_assign  */
 #line 348 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 4869 "src/parser_proc.c" /* glr.c:846  */
+#line 4960 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 228: /* let_calloc  */
+    case 230: /* let_calloc  */
 #line 350 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_calloc_free(&(*(struct psi_let_calloc **)(&(*yyvaluep))));}
-#line 4875 "src/parser_proc.c" /* glr.c:846  */
+#line 4966 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 229: /* let_callback  */
+    case 231: /* let_callback  */
 #line 352 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_callback_free(&(*(struct psi_let_callback **)(&(*yyvaluep))));}
-#line 4881 "src/parser_proc.c" /* glr.c:846  */
+#line 4972 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 230: /* let_func  */
+    case 232: /* let_func  */
 #line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_func_free(&(*(struct psi_let_func **)(&(*yyvaluep))));}
-#line 4887 "src/parser_proc.c" /* glr.c:846  */
+#line 4978 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 231: /* let_func_token  */
+    case 233: /* let_func_token  */
 #line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4893 "src/parser_proc.c" /* glr.c:846  */
+#line 4984 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 232: /* let_func_exps  */
+    case 234: /* let_func_exps  */
 #line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4899 "src/parser_proc.c" /* glr.c:846  */
+#line 4990 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 233: /* let_exps  */
+    case 235: /* let_exps  */
 #line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4905 "src/parser_proc.c" /* glr.c:846  */
+#line 4996 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 234: /* callback_rval  */
+    case 236: /* callback_rval  */
 #line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4911 "src/parser_proc.c" /* glr.c:846  */
+#line 5002 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 235: /* callback_arg_list  */
+    case 237: /* callback_arg_list  */
 #line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4917 "src/parser_proc.c" /* glr.c:846  */
+#line 5008 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 236: /* callback_args  */
+    case 238: /* callback_args  */
 #line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4923 "src/parser_proc.c" /* glr.c:846  */
+#line 5014 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 237: /* return_stmt  */
+    case 239: /* return_stmt  */
 #line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_return_stmt_free(&(*(struct psi_return_stmt **)(&(*yyvaluep))));}
-#line 4929 "src/parser_proc.c" /* glr.c:846  */
+#line 5020 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 238: /* set_stmt  */
+    case 240: /* set_stmt  */
 #line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_stmt_free(&(*(struct psi_set_stmt **)(&(*yyvaluep))));}
-#line 4935 "src/parser_proc.c" /* glr.c:846  */
+#line 5026 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 239: /* set_exp  */
+    case 241: /* set_exp  */
 #line 358 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_exp_free(&(*(struct psi_set_exp **)(&(*yyvaluep))));}
-#line 4941 "src/parser_proc.c" /* glr.c:846  */
+#line 5032 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 240: /* set_func  */
+    case 242: /* set_func  */
 #line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_func_free(&(*(struct psi_set_func **)(&(*yyvaluep))));}
-#line 4947 "src/parser_proc.c" /* glr.c:846  */
+#line 5038 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 241: /* set_func_token  */
+    case 243: /* set_func_token  */
 #line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4953 "src/parser_proc.c" /* glr.c:846  */
+#line 5044 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 242: /* set_func_exps  */
+    case 244: /* set_func_exps  */
 #line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4959 "src/parser_proc.c" /* glr.c:846  */
+#line 5050 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 243: /* set_exps  */
+    case 245: /* set_exps  */
 #line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4965 "src/parser_proc.c" /* glr.c:846  */
+#line 5056 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 244: /* assert_stmt  */
+    case 246: /* assert_stmt  */
 #line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_assert_stmt_free(&(*(struct psi_assert_stmt **)(&(*yyvaluep))));}
-#line 4971 "src/parser_proc.c" /* glr.c:846  */
+#line 5062 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 245: /* assert_stmt_token  */
+    case 247: /* assert_stmt_token  */
 #line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4977 "src/parser_proc.c" /* glr.c:846  */
+#line 5068 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 246: /* free_stmt  */
+    case 248: /* free_stmt  */
 #line 366 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_stmt_free(&(*(struct psi_free_stmt **)(&(*yyvaluep))));}
-#line 4983 "src/parser_proc.c" /* glr.c:846  */
+#line 5074 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 247: /* free_exps  */
+    case 249: /* free_exps  */
 #line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4989 "src/parser_proc.c" /* glr.c:846  */
+#line 5080 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 248: /* free_exp  */
+    case 250: /* free_exp  */
 #line 368 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_exp_free(&(*(struct psi_free_exp **)(&(*yyvaluep))));}
-#line 4995 "src/parser_proc.c" /* glr.c:846  */
+#line 5086 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 249: /* reference  */
+    case 251: /* reference  */
 #line 385 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5001 "src/parser_proc.c" /* glr.c:846  */
+#line 5092 "src/parser_proc.c" /* glr.c:846  */
         break;
 
 
@@ -6350,7 +6441,7 @@ yyparse (struct psi_parser *P, struct psi_plist *tokens, size_t *index)
 {
 }
 
-#line 6354 "src/parser_proc.c" /* glr.c:2270  */
+#line 6445 "src/parser_proc.c" /* glr.c:2270  */
 
   if (! yyinitGLRStack (yystackp, YYINITDEPTH))
     goto yyexhaustedlab;
@@ -6656,7 +6747,7 @@ yypdumpstack (yyGLRStack* yystackp)
 #define yydebug psi_parser_proc_debug
 #define yynerrs psi_parser_proc_nerrs
 
-#line 1766 "src/parser_proc_grammar.y" /* glr.c:2584  */
+#line 1790 "src/parser_proc_grammar.y" /* glr.c:2584  */
 
 
 /* epilogue */

diff --git a/src/parser_proc.h b/src/parser_proc.h
index ae6ced11e41256ef7770ecf0d81411b86bfd5a0b..9b09ccda9d746f32a0432f71d82dfeff5f576de3 100644 (file)
--- a/src/parser_proc.h
+++ b/src/parser_proc.h
@@ -314,6 +314,10 @@ union YYSTYPE
   struct psi_plist * PSI_T_struct_args_block;
   /* struct_args  */
   struct psi_plist * PSI_T_struct_args;
+  /* struct_arg_var_list  */
+  struct psi_plist * PSI_T_struct_arg_var_list;
+  /* decl_vars_with_layout  */
+  struct psi_plist * PSI_T_decl_vars_with_layout;
   /* decl_enum_items  */
   struct psi_plist * PSI_T_decl_enum_items;
   /* impl_args  */
@@ -666,7 +670,7 @@ union YYSTYPE
   struct psi_token * PSI_T_assert_stmt_token;
   /* impl_stmt  */
   struct psi_token ** PSI_T_impl_stmt;
-#line 670 "src/parser_proc.h" /* glr.c:197  */
+#line 674 "src/parser_proc.h" /* glr.c:197  */
 };
 
 typedef union YYSTYPE YYSTYPE;

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index 7b57269ac6279492afc7eda278b89c635f36cd3f..feff14a23cdaaec27bc183191da012652a59dc38 100644 (file)
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -323,8 +323,8 @@ struct psi_parser;
 %destructor    {psi_decl_enum_free(&$$);}                      decl_enum
 %type          <struct psi_decl_enum_item *>           decl_enum_item
 %destructor    {psi_decl_enum_item_free(&$$);}         decl_enum_item
-%type          <struct psi_plist *>                            decl_args decl_struct_args struct_args_block struct_args decl_enum_items decl_vars
-%destructor    {psi_plist_free($$);}                           decl_args decl_struct_args struct_args_block struct_args decl_enum_items decl_vars
+%type          <struct psi_plist *>                            decl_args decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout
+%destructor    {psi_plist_free($$);}                           decl_args decl_struct_args struct_args_block struct_args struct_arg_var_list decl_enum_items decl_vars decl_vars_with_layout
 
 %type          <struct psi_layout>                                     align_and_size
 %destructor    {}                                                                      align_and_size
@@ -1191,41 +1191,59 @@ struct_args_block[args]:
 ;
 
 struct_args[args]:
-       typedef[arg] decl_layout[layout] EOS {
+       typedef[arg] decl_layout[layout] struct_arg_var_list[vars] EOS {
        $arg->layout = $layout;
        $args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &$arg);
-}
-|      typedef[arg] COMMA decl_vars[vars] EOS {
-       $args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &$arg);
-       {
+       if ($vars) {
                size_t i = 0;
-               struct psi_decl_var *var;
+               struct psi_decl_arg *arg;
                
-               while (psi_plist_get($vars, i++, &var)) {
-                       struct psi_decl_arg *arg = psi_decl_arg_init(psi_decl_type_copy($arg->type), var);
-                       
+               while (psi_plist_get($vars, i++, &arg)) {
+                       arg->type = psi_decl_type_copy($arg->type);
                        $args = psi_plist_add($args, &arg);
                }
+               free($vars);
        }
-       free($vars);
 }
-|      struct_args[args_] typedef[arg] decl_layout[layout] EOS {
+|      struct_args[args_] typedef[arg] decl_layout[layout] struct_arg_var_list[vars] EOS {
        $arg->layout = $layout;
        $args = psi_plist_add($args_, &$arg);
-}
-|      struct_args[args_] typedef[arg] COMMA decl_vars[vars] EOS {
-       $args = psi_plist_add($args_, &$arg);
-       {
+       if ($vars) {
                size_t i = 0;
-               struct psi_decl_var *var;
+               struct psi_decl_arg *arg;
                
-               while (psi_plist_get($vars, i++, &var)) {
-                       struct psi_decl_arg *arg = psi_decl_arg_init(psi_decl_type_copy($arg->type), var);
-                       
+               while (psi_plist_get($vars, i++, &arg)) {
+                       arg->type = psi_decl_type_copy($arg->type);
                        $args = psi_plist_add($args, &arg);
                }
+               free($vars);
+       }
+}
+;
+
+struct_arg_var_list[vars]:
+       %empty {
+       $vars = NULL;
+}
+|      COMMA decl_vars_with_layout[vars_] {
+       $vars = $vars_;
+}
+;
+
+decl_vars_with_layout[vars]:
+       decl_var[var] decl_layout[layout] {
+       {
+               struct psi_decl_arg *arg = psi_decl_arg_init(NULL, $var);
+               arg->layout = $layout;
+               $vars = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &arg);
+       }
+}
+|      decl_vars_with_layout[vars_] COMMA decl_var[var] decl_layout[layout] {
+       {
+               struct psi_decl_arg *arg = psi_decl_arg_init(NULL, $var);
+               arg->layout = $layout;
+               $vars = psi_plist_add($vars_, &arg);
        }
-       free($vars);
 }
 ;
 
@@ -1357,8 +1375,14 @@ decl_layout[l]:
        %empty {
        $l = NULL;
 }
+|      COLON NUMBER[width] {
+       $l = psi_layout_init(0, 0, psi_layout_init(0, atol($width->text), NULL));
+}
 |      COLON COLON LPAREN NUMBER[align] COMMA NUMBER[size] RPAREN {
-       $l = psi_layout_init(atol($align->text), atol($size->text));
+       $l = psi_layout_init(atol($align->text), atol($size->text), NULL);
+}
+|      COLON NUMBER[width] COLON COLON LPAREN NUMBER[align] COMMA NUMBER[size] RPAREN {
+       $l = psi_layout_init(atol($align->text), atol($size->text), psi_layout_init(0, atol($width->text), NULL));
 }
 ;
 

diff --git a/src/token.c b/src/token.c
index f375065c625fbda34aadadce6d034d6e1bfca673..5f177c43c5d6af795f945e6bc37de9557dbb2677 100644 (file)
--- a/src/token.c
+++ b/src/token.c
@@ -204,7 +204,7 @@ void psi_token_dump(int fd, struct psi_token *t)
                dprintf(fd, "EOF");
        } else {
                dprintf(fd, "\"");
-               for (i = 0; i < MIN(t->size, 16); ++i) {
+               for (i = 0; i < t->size; ++i) {
                        switch (t->text[i]) {
                        case '\0':
                                dprintf(fd, "\\0");
@@ -242,7 +242,7 @@ void psi_token_dump(int fd, struct psi_token *t)
                                break;
                        }
                }
-               dprintf(fd, "%s\"", t->size > 16 ? "..." : "");
+               dprintf(fd, "\"");
        }
        dprintf(fd, " at col %u in %s on line %u\n", t->col, t->file, t->line);
 }

diff --git a/src/types/decl_struct.c b/src/types/decl_struct.c
index bdee3fec00ae58168477a0bb2b6347e041b2a208..ab0d9a1a9fe2545d6bcbea572e1f81e952fe7d94 100644 (file)
--- a/src/types/decl_struct.c
+++ b/src/types/decl_struct.c
@@ -96,7 +96,7 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s)
                        return false;
                }
 
-               if (darg->layout) {
+               if (darg->layout && darg->layout->len) {
                        pos = darg->layout->pos;
                        align = psi_decl_arg_align(darg, &pos, &len);
 
@@ -115,13 +115,53 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s)
                        }
                } else {
                        if (i) {
-                               pos = prev_arg->layout->pos + prev_arg->layout->len;
+                               if (prev_arg->layout->bfw && darg->layout->bfw) {
+                                       struct psi_decl_type *real = NULL;
+                                       size_t max_bfw = 8 * psi_decl_type_get_size(prev_arg->type, &real);
+
+                                       switch (real->type) {
+                                       case PSI_T_INT8:
+                                       case PSI_T_UINT8:
+                                       case PSI_T_INT16:
+                                       case PSI_T_UINT16:
+                                       case PSI_T_INT32:
+                                       case PSI_T_UINT32:
+                                       case PSI_T_INT64:
+                                       case PSI_T_UINT64:
+                                               break;
+                                       default:
+                                               data->error(data, darg->token, PSI_WARNING,
+                                                               "Unsupported type for bit field: %s", real->name);
+                                               return false;
+                                       }
+                                       darg->layout->bfw->pos = prev_arg->layout->bfw->pos + prev_arg->layout->bfw->len;
+                                       if (max_bfw >= darg->layout->bfw->pos + darg->layout->bfw->len) {
+                                               pos = prev_arg->layout->pos;
+                                       } else {
+                                               darg->layout->bfw->pos = 0;
+                                               pos = prev_arg->layout->pos + prev_arg->layout->len;
+                                       }
+                               } else {
+                                       pos = prev_arg->layout->pos + prev_arg->layout->len;
+                               }
                        } else {
                                pos = 0;
                        }
 
                        align = psi_decl_arg_align(darg, &pos, &len);
-                       darg->layout = psi_layout_init(pos, len);
+
+                       if (darg->layout) {
+                               if (darg->layout->pos != pos) {
+                                       data->error(data, darg->token, PSI_WARNING,
+                                                       "Computed offset %zu of %s.%s does not match"
+                                                       " pre-defined offset %zu",
+                                                       pos, s->name, darg->var->name, darg->layout->pos);
+                               }
+                               darg->layout->pos = pos;
+                               darg->layout->len = len;
+                       } else {
+                               darg->layout = psi_layout_init(pos, len, NULL);
+                       }
                }
 
                if (align > s->align) {

diff --git a/src/types/decl_type.c b/src/types/decl_type.c
index 590c8eea126896150c512456c6cb88272118d9a1..c3901ca971a079805c6d9dbb7d8a63c09d21d982 100644 (file)
--- a/src/types/decl_type.c
+++ b/src/types/decl_type.c
@@ -275,6 +275,9 @@ void psi_decl_type_dump_args_with_layout(int fd, struct psi_plist *args,
                while (psi_plist_get(args, i++, &sarg)) {
                        dprintf(fd, "%s", psi_t_indent(level));
                        psi_decl_arg_dump(fd, sarg, level);
+                       if (sarg->layout->bfw) {
+                               dprintf(fd, ":%zu", sarg->layout->bfw->len);
+                       }
                        dprintf(fd, "::(%zu, %zu);\n", sarg->layout->pos,
                                        sarg->layout->len);
                }

diff --git a/src/types/decl_union.c b/src/types/decl_union.c
index f3299976d53eaf9c3e393a5fbf512ac7769622d6..71e70eb378b2bf5b7bfd7141037f1d4f94b7038a 100644 (file)
--- a/src/types/decl_union.c
+++ b/src/types/decl_union.c
@@ -92,7 +92,7 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u)
                        return false;
                }
 
-               if (darg->layout) {
+               if (darg->layout && darg->layout->len) {
                        pos = darg->layout->pos;
 
                        align = psi_decl_arg_align(darg, &pos, &len);
@@ -114,7 +114,18 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u)
                        pos = 0;
 
                        align = psi_decl_arg_align(darg, &pos, &len);
-                       darg->layout = psi_layout_init(pos, len);
+
+                       if (darg->layout) {
+                               if (darg->layout->pos != 0) {
+                                       data->error(data, darg->token, PSI_WARNING,
+                                                       "Offset of %s.%s should be 0", u->name,
+                                                       darg->var->name);
+                                       darg->layout->pos = 0;
+                               }
+                               darg->layout->len = len;
+                       } else {
+                               darg->layout = psi_layout_init(pos, len, NULL);
+                       }
                }
                if (len > size) {
                        size = len;

diff --git a/src/types/layout.c b/src/types/layout.c
index 3c8deaab3f9b7908327db56a45f9f4f2ac4164ec..1a7dcb644a3ca3dd7aa60bc8f600326d78d1ddb7 100644 (file)
--- a/src/types/layout.c
+++ b/src/types/layout.c
@@ -28,14 +28,15 @@
 
 #include <assert.h>
 
-struct psi_layout *psi_layout_init(size_t pos, size_t len)
+struct psi_layout *psi_layout_init(size_t pos, size_t len, struct psi_layout *bfw)
 {
        struct psi_layout *l = calloc(1, sizeof(*l));
 
-       assert(pos + len);
+       assert(pos + len + (intptr_t) bfw);
 
        l->pos = pos;
        l->len = len;
+       l->bfw = bfw;
 
        return l;
 }
@@ -43,8 +44,13 @@ struct psi_layout *psi_layout_init(size_t pos, size_t len)
 void psi_layout_free(struct psi_layout **l_ptr)
 {
        if (*l_ptr) {
-               free(*l_ptr);
+               struct psi_layout *l = *l_ptr;
                *l_ptr = NULL;
+
+               if (l->bfw) {
+                       psi_layout_free(&l->bfw);
+               }
+               free(l);
        }
 }
 

diff --git a/src/types/layout.h b/src/types/layout.h
index 64688d44c54401b5368396f382dd82f9e1242bed..8bb20f6b21ea4afd790765b0b4e6a7d94ba36f09 100644 (file)
--- a/src/types/layout.h
+++ b/src/types/layout.h
@@ -29,10 +29,10 @@
 struct psi_layout {
        size_t pos;
        size_t len;
-       size_t bfw;
+       struct psi_layout *bfw;
 };
 
-struct psi_layout *psi_layout_init(size_t pos, size_t len);
+struct psi_layout *psi_layout_init(size_t pos, size_t len, struct psi_layout *bfw);
 void psi_layout_free(struct psi_layout **l_ptr);
 
 int psi_layout_sort_cmp(const void *_a, const void *_b);