parser: fix debug

diff --git a/src/parser.c b/src/parser.c
index 5974f5e179dc5c02de4b8ef0905ad58436988b85..74cfe6c2aa69cc98638c6177cde6eefdde0489e9 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 1.0.2 on Wed Sep  6 11:22:03 2017 */
+/* Generated by re2c 1.0.2 on Thu Sep  7 14:09:09 2017 */
 #line 1 "src/parser.re"
 /*******************************************************************************
  Copyright (c) 2016, Michael Wallner <mike@php.net>.

diff --git a/src/parser_proc.c b/src/parser_proc.c
index dd5bf7683c66351385ebce4cef9b5860f31dd2a5..a24bbbcdfc7bd02cdc415385e77c25b3a14f100b 100644 (file)
--- a/src/parser_proc.c
+++ b/src/parser_proc.c
@@ -103,6 +103,7 @@ static YYSTYPE yyval_default;
 #include "plist.h"
 #include "parser.h"
 
+#define YYDEBUG 1
 #define PSI_PARSER_PROC_DEBUG 1
 
 static int psi_parser_proc_lex(YYSTYPE *u, struct psi_parser *P, struct psi_plist *tokens, size_t *index);
@@ -176,7 +177,7 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp
 
 /* end code */
 
-#line 180 "src/parser_proc.c" /* glr.c:264  */
+#line 181 "src/parser_proc.c" /* glr.c:264  */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -354,24 +355,11 @@ static const unsigned char yytranslate[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     395,   395,   395,   395,   396,   396,   396,   396,   396,   396,
-     396,   396,   396,   396,   396,   396,   396,   396,   396,   396,
-     396,   396,   397,   397,   397,   397,   397,   397,   397,   397,
+       0,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     396,   396,   396,   396,   397,   397,   397,   397,   397,   397,
      397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
-     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
-     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
-     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
-     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
-     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
-     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
-     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
-     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
-     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
-     397,   397,   397,   397,   397,   397,   397,   397,   397,   397,
-     397,   397,   397,   397,   397,   397,   397,   398,   398,   398,
-     398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
+     397,   397,   398,   398,   398,   398,   398,   398,   398,   398,
      398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
      398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
      398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
@@ -383,42 +371,55 @@ static const unsigned short int yyrline[] =
      398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
      398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
      398,   398,   398,   398,   398,   398,   398,   398,   398,   398,
-     402,   403,   406,   407,   410,   411,   412,   413,   419,   427,
-     430,   433,   434,   435,   438,   441,   444,   447,   453,   459,
-     462,   468,   491,   495,   499,   504,   508,   512,   516,   523,
-     524,   528,   529,   533,   534,   535,   539,   540,   544,   545,
-     549,   550,   551,   555,   556,   560,   561,   562,   563,   564,
-     565,   566,   570,   575,   583,   586,   589,   590,   596,   601,
-     609,   612,   616,   620,   627,   631,   635,   639,   644,   654,
-     664,   669,   674,   678,   684,   693,   696,   700,   704,   710,
-     717,   723,   724,   725,   726,   730,   733,   764,   771,   772,
-     773,   774,   778,   781,   790,   796,   799,   805,   808,   814,
-     815,   823,   834,   843,   852,   860,   861,   865,   875,   884,
-     896,   899,   902,   906,   910,   914,   919,   924,   932,   933,
-     934,   937,   943,   946,   949,   955,   956,   957,   958,   959,
-     960,   961,   962,   966,   967,   971,   974,   977,   983,   986,
-     989,   997,  1009,  1012,  1015,  1022,  1025,  1035,  1038,  1041,
-    1044,  1045,  1046,  1050,  1053,  1056,  1067,  1070,  1076,  1077,
-    1081,  1082,  1086,  1090,  1096,  1097,  1103,  1106,  1112,  1115,
-    1118,  1124,  1128,  1129,  1133,  1134,  1138,  1139,  1146,  1147,
-    1151,  1158,  1169,  1176,  1187,  1194,  1205,  1216,  1230,  1231,
-    1243,  1246,  1249,  1252,  1259,  1262,  1268,  1277,  1289,  1297,
-    1300,  1310,  1323,  1328,  1336,  1346,  1356,  1359,  1363,  1369,
-    1383,  1400,  1403,  1409,  1416,  1426,  1433,  1436,  1442,  1447,
-    1455,  1459,  1463,  1467,  1471,  1475,  1482,  1486,  1490,  1494,
-    1498,  1504,  1508,  1515,  1518,  1529,  1533,  1537,  1543,  1556,
-    1569,  1582,  1585,  1592,  1595,  1598,  1601,  1607,  1611,  1618,
-    1621,  1624,  1634,  1637,  1643,  1644,  1650,  1653,  1659,  1660,
-    1670,  1673,  1680,  1685,  1690,  1700,  1703,  1709,  1712,  1718,
-    1725,  1732,  1733,  1734,  1735,  1736,  1737,  1738,  1739,  1740,
-    1744,  1747,  1753,  1756,  1759,  1762,  1765,  1771,  1775,  1783,
-    1784,  1788,  1795,  1798,  1801,  1805,  1808,  1811,  1817,  1821,
-    1829,  1836,  1844,  1852,  1853,  1854,  1855,  1856,  1857,  1858,
-    1859,  1860,  1861,  1865,  1868,  1874,  1877,  1883,  1884,  1888,
-    1891,  1897,  1900,  1906,  1913,  1920,  1923,  1926,  1933,  1938,
-    1946,  1947,  1948,  1949,  1950,  1951,  1952,  1953,  1957,  1960,
-    1966,  1969,  1975,  1982,  1983,  1987,  1994,  1997,  2003,  2011,
-    2014,  2020
+     398,   398,   398,   398,   398,   398,   398,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     403,   404,   407,   408,   411,   412,   413,   414,   420,   428,
+     431,   434,   435,   436,   439,   442,   445,   448,   454,   460,
+     463,   469,   492,   496,   500,   505,   509,   513,   517,   524,
+     525,   529,   530,   534,   535,   536,   540,   541,   545,   546,
+     550,   551,   552,   556,   557,   561,   562,   563,   564,   565,
+     566,   567,   571,   576,   584,   587,   590,   591,   597,   602,
+     610,   613,   617,   621,   628,   632,   636,   640,   645,   655,
+     665,   670,   675,   679,   685,   694,   697,   701,   705,   711,
+     718,   724,   725,   726,   727,   731,   734,   765,   772,   773,
+     774,   775,   779,   782,   791,   797,   800,   806,   809,   815,
+     816,   824,   835,   844,   853,   861,   862,   866,   876,   885,
+     897,   900,   903,   907,   911,   915,   920,   925,   933,   934,
+     935,   938,   944,   947,   950,   956,   957,   958,   959,   960,
+     961,   962,   963,   967,   968,   972,   975,   978,   984,   987,
+     990,   998,  1010,  1013,  1016,  1023,  1026,  1036,  1039,  1042,
+    1045,  1046,  1047,  1051,  1054,  1057,  1068,  1071,  1077,  1078,
+    1082,  1083,  1087,  1091,  1097,  1098,  1104,  1107,  1113,  1116,
+    1119,  1125,  1129,  1130,  1134,  1135,  1139,  1140,  1147,  1148,
+    1152,  1159,  1170,  1177,  1188,  1195,  1206,  1217,  1231,  1232,
+    1244,  1247,  1250,  1253,  1260,  1263,  1269,  1278,  1290,  1298,
+    1301,  1311,  1324,  1329,  1337,  1347,  1357,  1360,  1364,  1370,
+    1384,  1401,  1404,  1410,  1417,  1427,  1434,  1437,  1443,  1448,
+    1456,  1460,  1464,  1468,  1472,  1476,  1483,  1487,  1491,  1495,
+    1499,  1505,  1509,  1516,  1519,  1530,  1534,  1538,  1544,  1557,
+    1570,  1583,  1586,  1593,  1596,  1599,  1602,  1608,  1612,  1619,
+    1622,  1625,  1635,  1638,  1644,  1645,  1651,  1654,  1660,  1661,
+    1671,  1674,  1681,  1686,  1691,  1701,  1704,  1710,  1713,  1719,
+    1726,  1733,  1734,  1735,  1736,  1737,  1738,  1739,  1740,  1741,
+    1745,  1748,  1754,  1757,  1760,  1763,  1766,  1772,  1776,  1784,
+    1785,  1789,  1796,  1799,  1802,  1806,  1809,  1812,  1818,  1822,
+    1830,  1837,  1845,  1853,  1854,  1855,  1856,  1857,  1858,  1859,
+    1860,  1861,  1862,  1866,  1869,  1875,  1878,  1884,  1885,  1889,
+    1892,  1898,  1901,  1907,  1914,  1921,  1924,  1927,  1934,  1939,
+    1947,  1948,  1949,  1950,  1951,  1952,  1953,  1954,  1958,  1961,
+    1967,  1970,  1976,  1983,  1984,  1988,  1995,  1998,  2004,  2012,
+    2015,  2021
 };
 #endif
 
@@ -2904,18 +2905,18 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
   switch (yyn)
     {
         case 297:
-#line 413 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 414 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                psi_cpp_exp_exec((*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), P->preproc, PSI_DATA(P));
                psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        }
 }
-#line 2915 "src/parser_proc.c" /* glr.c:816  */
+#line 2916 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 298:
-#line 419 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 420 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if (P->file.ln) {
                P->error(PSI_DATA(P), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), PSI_WARNING,
@@ -2924,91 +2925,91 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                P->file.ln = strndup((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->size);
        }
 }
-#line 2928 "src/parser_proc.c" /* glr.c:816  */
+#line 2929 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 299:
-#line 427 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 428 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_const(P, (*(struct psi_const **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2936 "src/parser_proc.c" /* glr.c:816  */
+#line 2937 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 300:
-#line 430 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 431 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_decl(P, (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2944 "src/parser_proc.c" /* glr.c:816  */
+#line 2945 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 303:
-#line 435 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 436 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_typedef(P, (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2952 "src/parser_proc.c" /* glr.c:816  */
+#line 2953 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 304:
-#line 438 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 439 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_struct(P, (*(struct psi_decl_struct **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2960 "src/parser_proc.c" /* glr.c:816  */
+#line 2961 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 305:
-#line 441 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 442 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_union(P, (*(struct psi_decl_union **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2968 "src/parser_proc.c" /* glr.c:816  */
+#line 2969 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 306:
-#line 444 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 445 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_enum(P, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2976 "src/parser_proc.c" /* glr.c:816  */
+#line 2977 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 307:
-#line 447 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 448 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_parser_proc_add_impl(P, (*(struct psi_impl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2984 "src/parser_proc.c" /* glr.c:816  */
+#line 2985 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 308:
-#line 453 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 454 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 2992 "src/parser_proc.c" /* glr.c:816  */
+#line 2993 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 309:
-#line 459 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 460 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = NULL;
 }
-#line 3000 "src/parser_proc.c" /* glr.c:816  */
+#line 3001 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 310:
-#line 462 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 463 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = (*(struct psi_cpp_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3008 "src/parser_proc.c" /* glr.c:816  */
+#line 3009 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 311:
-#line 468 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 469 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                struct psi_token *msg = NULL;
@@ -3032,201 +3033,201 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        }
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3036 "src/parser_proc.c" /* glr.c:816  */
+#line 3037 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 312:
-#line 491 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 492 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))));
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3045 "src/parser_proc.c" /* glr.c:816  */
+#line 3046 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 313:
-#line 495 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 496 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, NULL);
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3054 "src/parser_proc.c" /* glr.c:816  */
+#line 3055 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 314:
-#line 499 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 500 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))));
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3064 "src/parser_proc.c" /* glr.c:816  */
+#line 3065 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 315:
-#line 504 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 505 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_cpp_macro_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3073 "src/parser_proc.c" /* glr.c:816  */
+#line 3074 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 316:
-#line 508 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 509 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3082 "src/parser_proc.c" /* glr.c:816  */
+#line 3083 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 317:
-#line 512 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 513 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, NULL);
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3091 "src/parser_proc.c" /* glr.c:816  */
+#line 3092 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 318:
-#line 516 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 517 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = NULL;
 }
-#line 3100 "src/parser_proc.c" /* glr.c:816  */
+#line 3101 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 342:
-#line 570 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 571 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_cpp_macro_decl **)(&(*yyvalp))) = psi_cpp_macro_decl_init((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), NULL);
        (*(struct psi_cpp_macro_decl **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)));
 }
-#line 3110 "src/parser_proc.c" /* glr.c:816  */
+#line 3111 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 343:
-#line 575 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 576 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_cpp_macro_decl **)(&(*yyvalp))) = psi_cpp_macro_decl_init(NULL, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), NULL);
        (*(struct psi_cpp_macro_decl **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3120 "src/parser_proc.c" /* glr.c:816  */
+#line 3121 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 344:
-#line 583 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 584 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL);
 }
-#line 3128 "src/parser_proc.c" /* glr.c:816  */
+#line 3129 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 345:
-#line 586 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 587 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL); /* FIXME */
 }
-#line 3136 "src/parser_proc.c" /* glr.c:816  */
+#line 3137 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 347:
-#line 590 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 591 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3144 "src/parser_proc.c" /* glr.c:816  */
+#line 3145 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 348:
-#line 596 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 597 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_token_free), &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3154 "src/parser_proc.c" /* glr.c:816  */
+#line 3155 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 349:
-#line 601 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 602 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_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 3164 "src/parser_proc.c" /* glr.c:816  */
+#line 3165 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 350:
-#line 609 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 610 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3172 "src/parser_proc.c" /* glr.c:816  */
+#line 3173 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 352:
-#line 616 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 617 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_token_free), &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3181 "src/parser_proc.c" /* glr.c:816  */
+#line 3182 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 353:
-#line 620 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 621 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3190 "src/parser_proc.c" /* glr.c:816  */
+#line 3191 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 354:
-#line 627 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 628 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_unary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type, (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 3199 "src/parser_proc.c" /* glr.c:816  */
+#line 3200 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 355:
-#line 631 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 632 "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 3208 "src/parser_proc.c" /* glr.c:816  */
+#line 3209 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 356:
-#line 635 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 636 "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 3217 "src/parser_proc.c" /* glr.c:816  */
+#line 3218 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 357:
-#line 639 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 640 "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 3226 "src/parser_proc.c" /* glr.c:816  */
+#line 3227 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 358:
-#line 644 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 645 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                uint8_t exists;
@@ -3237,11 +3238,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        }
 }
-#line 3241 "src/parser_proc.c" /* glr.c:816  */
+#line 3242 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 359:
-#line 654 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 655 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                uint8_t exists;
@@ -3252,112 +3253,112 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3256 "src/parser_proc.c" /* glr.c:816  */
+#line 3257 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 360:
-#line 664 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 665 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->flags));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3266 "src/parser_proc.c" /* glr.c:816  */
+#line 3267 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 361:
-#line 669 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 670 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3276 "src/parser_proc.c" /* glr.c:816  */
+#line 3277 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 362:
-#line 674 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 675 "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 3285 "src/parser_proc.c" /* glr.c:816  */
+#line 3286 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 363:
-#line 678 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 679 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init(PSI_T_DEFINE, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3296 "src/parser_proc.c" /* glr.c:816  */
+#line 3297 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 364:
-#line 684 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 685 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init(PSI_T_FUNCTION,
                psi_cpp_macro_call_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 0));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 3307 "src/parser_proc.c" /* glr.c:816  */
+#line 3308 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 365:
-#line 693 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 694 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3315 "src/parser_proc.c" /* glr.c:816  */
+#line 3316 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 367:
-#line 700 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 701 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_num_exp_free), 
                &(*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3324 "src/parser_proc.c" /* glr.c:816  */
+#line 3325 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 368:
-#line 704 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 705 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3332 "src/parser_proc.c" /* glr.c:816  */
+#line 3333 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 369:
-#line 710 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 711 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_const **)(&(*yyvalp))) = psi_const_init((*(struct psi_const_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_impl_def_val **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_const **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 3341 "src/parser_proc.c" /* glr.c:816  */
+#line 3342 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 370:
-#line 717 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 718 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_const_type **)(&(*yyvalp))) = psi_const_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
 }
-#line 3349 "src/parser_proc.c" /* glr.c:816  */
+#line 3350 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 375:
-#line 730 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 731 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_def_val **)(&(*yyvalp))) = NULL;
 }
-#line 3357 "src/parser_proc.c" /* glr.c:816  */
+#line 3358 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 376:
-#line 733 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 734 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if (psi_num_exp_validate(PSI_DATA(P), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), NULL, NULL, NULL, NULL, NULL)) {
                impl_val res = {0};
@@ -3389,28 +3390,28 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        }
        psi_num_exp_free(&(*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3393 "src/parser_proc.c" /* glr.c:816  */
+#line 3394 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 377:
-#line 764 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 765 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_def_val **)(&(*yyvalp))) = psi_impl_def_val_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_impl_def_val **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3402 "src/parser_proc.c" /* glr.c:816  */
+#line 3403 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 382:
-#line 778 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 779 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3410 "src/parser_proc.c" /* glr.c:816  */
+#line 3411 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 383:
-#line 781 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 782 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_VOID, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text),
@@ -3420,51 +3421,51 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3424 "src/parser_proc.c" /* glr.c:816  */
+#line 3425 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 384:
-#line 790 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 791 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3432 "src/parser_proc.c" /* glr.c:816  */
+#line 3433 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 385:
-#line 796 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 797 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3440 "src/parser_proc.c" /* glr.c:816  */
+#line 3441 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 386:
-#line 799 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 800 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3448 "src/parser_proc.c" /* glr.c:816  */
+#line 3449 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 387:
-#line 805 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 806 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3456 "src/parser_proc.c" /* glr.c:816  */
+#line 3457 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 388:
-#line 808 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 809 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3464 "src/parser_proc.c" /* glr.c:816  */
+#line 3465 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 390:
-#line 815 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 816 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_FUNCTION, (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->var->name),
@@ -3473,11 +3474,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->token);
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.func = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3477 "src/parser_proc.c" /* glr.c:816  */
+#line 3478 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 391:
-#line 823 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 824 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
@@ -3489,11 +3490,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.enm = (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
        psi_parser_proc_add_enum(P, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3493 "src/parser_proc.c" /* glr.c:816  */
+#line 3494 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 392:
-#line 834 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 835 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_STRUCT, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval));
@@ -3503,11 +3504,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).len;
        psi_parser_proc_add_struct(P, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct);
 }
-#line 3507 "src/parser_proc.c" /* glr.c:816  */
+#line 3508 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 393:
-#line 843 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 844 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_UNION, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text), (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval));
@@ -3517,30 +3518,30 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).len;
        psi_parser_proc_add_union(P, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn);
 }
-#line 3521 "src/parser_proc.c" /* glr.c:816  */
+#line 3522 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 394:
-#line 852 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 853 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0, 0));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3531 "src/parser_proc.c" /* glr.c:816  */
+#line 3532 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 396:
-#line 861 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 862 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), psi_decl_var_init(NULL, 0, 0));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
 }
-#line 3540 "src/parser_proc.c" /* glr.c:816  */
+#line 3541 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 397:
-#line 865 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 866 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_ENUM, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->name),
@@ -3551,11 +3552,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.enm = (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        psi_parser_proc_add_enum(P, (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3555 "src/parser_proc.c" /* glr.c:816  */
+#line 3556 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 398:
-#line 875 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 876 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_STRUCT, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text), psi_decl_var_init(NULL, 0, 0));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
@@ -3565,11 +3566,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len;
        psi_parser_proc_add_struct(P, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct);
 }
-#line 3569 "src/parser_proc.c" /* glr.c:816  */
+#line 3570 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 399:
-#line 884 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 885 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_UNION, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text), psi_decl_var_init(NULL, 0, 0));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
@@ -3579,146 +3580,146 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len;
        psi_parser_proc_add_union(P, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn);
 }
-#line 3583 "src/parser_proc.c" /* glr.c:816  */
+#line 3584 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 400:
-#line 896 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 897 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_type **)(&(*yyvalp))) = (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3591 "src/parser_proc.c" /* glr.c:816  */
+#line 3592 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 401:
-#line 899 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 900 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_type **)(&(*yyvalp))) = (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3599 "src/parser_proc.c" /* glr.c:816  */
+#line 3600 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 403:
-#line 906 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 907 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_type **)(&(*yyvalp))) = psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_decl_type **)(&(*yyvalp)))->token = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3608 "src/parser_proc.c" /* glr.c:816  */
+#line 3609 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 405:
-#line 914 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 915 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_type **)(&(*yyvalp))) = psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_decl_type **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3618 "src/parser_proc.c" /* glr.c:816  */
+#line 3619 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 406:
-#line 919 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 920 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_type **)(&(*yyvalp))) = psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_decl_type **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3628 "src/parser_proc.c" /* glr.c:816  */
+#line 3629 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 407:
-#line 924 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 925 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_type **)(&(*yyvalp))) = psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        (*(struct psi_decl_type **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3638 "src/parser_proc.c" /* glr.c:816  */
+#line 3639 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 410:
-#line 934 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 935 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3646 "src/parser_proc.c" /* glr.c:816  */
+#line 3647 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 411:
-#line 937 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 938 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3654 "src/parser_proc.c" /* glr.c:816  */
+#line 3655 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 412:
-#line 943 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 944 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3662 "src/parser_proc.c" /* glr.c:816  */
+#line 3663 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 413:
-#line 946 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 947 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3670 "src/parser_proc.c" /* glr.c:816  */
+#line 3671 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 414:
-#line 949 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 950 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3678 "src/parser_proc.c" /* glr.c:816  */
+#line 3679 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 425:
-#line 971 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 972 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3686 "src/parser_proc.c" /* glr.c:816  */
+#line 3687 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 426:
-#line 974 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 975 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3694 "src/parser_proc.c" /* glr.c:816  */
+#line 3695 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 427:
-#line 977 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 978 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3702 "src/parser_proc.c" /* glr.c:816  */
+#line 3703 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 428:
-#line 983 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 984 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3710 "src/parser_proc.c" /* glr.c:816  */
+#line 3711 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 429:
-#line 986 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 987 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3718 "src/parser_proc.c" /* glr.c:816  */
+#line 3719 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 430:
-#line 989 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 990 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3727,11 +3728,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3731 "src/parser_proc.c" /* glr.c:816  */
+#line 3732 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 431:
-#line 997 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 998 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3741,27 +3742,27 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
        }
 }
-#line 3745 "src/parser_proc.c" /* glr.c:816  */
+#line 3746 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 432:
-#line 1009 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1010 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3753 "src/parser_proc.c" /* glr.c:816  */
+#line 3754 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 433:
-#line 1012 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1013 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3761 "src/parser_proc.c" /* glr.c:816  */
+#line 3762 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 434:
-#line 1015 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1016 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3769,19 +3770,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3773 "src/parser_proc.c" /* glr.c:816  */
+#line 3774 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 435:
-#line 1022 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1023 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3781 "src/parser_proc.c" /* glr.c:816  */
+#line 3782 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 436:
-#line 1025 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1026 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3789,43 +3790,43 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3793 "src/parser_proc.c" /* glr.c:816  */
+#line 3794 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 437:
-#line 1035 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1036 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3801 "src/parser_proc.c" /* glr.c:816  */
+#line 3802 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 439:
-#line 1041 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1042 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3809 "src/parser_proc.c" /* glr.c:816  */
+#line 3810 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 443:
-#line 1050 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1051 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3817 "src/parser_proc.c" /* glr.c:816  */
+#line 3818 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 444:
-#line 1053 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1054 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3825 "src/parser_proc.c" /* glr.c:816  */
+#line 3826 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 445:
-#line 1056 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1057 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -3834,92 +3835,92 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3838 "src/parser_proc.c" /* glr.c:816  */
+#line 3839 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 446:
-#line 1067 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1068 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3846 "src/parser_proc.c" /* glr.c:816  */
+#line 3847 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 447:
-#line 1070 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1071 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3854 "src/parser_proc.c" /* glr.c:816  */
+#line 3855 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 453:
-#line 1090 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1091 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_decl_arg_free(&(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3862 "src/parser_proc.c" /* glr.c:816  */
+#line 3863 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 455:
-#line 1097 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1098 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3870 "src/parser_proc.c" /* glr.c:816  */
+#line 3871 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 456:
-#line 1103 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1104 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_var_free), &(*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3878 "src/parser_proc.c" /* glr.c:816  */
+#line 3879 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 457:
-#line 1106 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1107 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3886 "src/parser_proc.c" /* glr.c:816  */
+#line 3887 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 458:
-#line 1112 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1113 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3894 "src/parser_proc.c" /* glr.c:816  */
+#line 3895 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 459:
-#line 1115 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1116 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3902 "src/parser_proc.c" /* glr.c:816  */
+#line 3903 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 460:
-#line 1118 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1119 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3910 "src/parser_proc.c" /* glr.c:816  */
+#line 3911 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 467:
-#line 1139 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1140 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_decl **)(&(*yyvalp)))->abi = psi_decl_abi_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text);
 }
-#line 3919 "src/parser_proc.c" /* glr.c:816  */
+#line 3920 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 470:
-#line 1151 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1152 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        if ((*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
@@ -3927,11 +3928,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        }
 }
-#line 3931 "src/parser_proc.c" /* glr.c:816  */
+#line 3932 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 471:
-#line 1158 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1159 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)));
        (*(struct psi_decl **)(&(*yyvalp)))->varargs = 1;
@@ -3940,11 +3941,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        }
 }
-#line 3944 "src/parser_proc.c" /* glr.c:816  */
+#line 3945 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 472:
-#line 1169 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1170 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
        if ((*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
@@ -3952,11 +3953,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        }
 }
-#line 3956 "src/parser_proc.c" /* glr.c:816  */
+#line 3957 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 473:
-#line 1176 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1177 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init((*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)), (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)));
        (*(struct psi_decl **)(&(*yyvalp)))->varargs = 1;
@@ -3965,11 +3966,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_decl **)(&(*yyvalp)))->func->var->array_size = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        }
 }
-#line 3969 "src/parser_proc.c" /* glr.c:816  */
+#line 3970 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 474:
-#line 1187 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1188 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
@@ -3977,11 +3978,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3981 "src/parser_proc.c" /* glr.c:816  */
+#line 3982 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 475:
-#line 1194 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1195 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
@@ -3993,11 +3994,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 3997 "src/parser_proc.c" /* glr.c:816  */
+#line 3998 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 476:
-#line 1205 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1206 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
@@ -4009,11 +4010,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4013 "src/parser_proc.c" /* glr.c:816  */
+#line 4014 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 477:
-#line 1216 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1217 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
@@ -4025,11 +4026,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4029 "src/parser_proc.c" /* glr.c:816  */
+#line 4030 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 479:
-#line 1231 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1232 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text),
@@ -4039,62 +4040,62 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4043 "src/parser_proc.c" /* glr.c:816  */
+#line 4044 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 480:
-#line 1243 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1244 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4051 "src/parser_proc.c" /* glr.c:816  */
+#line 4052 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 481:
-#line 1246 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1247 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4059 "src/parser_proc.c" /* glr.c:816  */
+#line 4060 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 482:
-#line 1249 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1250 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4067 "src/parser_proc.c" /* glr.c:816  */
+#line 4068 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 483:
-#line 1252 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1253 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4075 "src/parser_proc.c" /* glr.c:816  */
+#line 4076 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 484:
-#line 1259 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1260 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4083 "src/parser_proc.c" /* glr.c:816  */
+#line 4084 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 485:
-#line 1262 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1263 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), 
                psi_decl_var_init(NULL, (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), 0)
        );
 }
-#line 4094 "src/parser_proc.c" /* glr.c:816  */
+#line 4095 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 486:
-#line 1268 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1269 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text),
@@ -4104,11 +4105,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4108 "src/parser_proc.c" /* glr.c:816  */
+#line 4109 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 487:
-#line 1277 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1278 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text),
@@ -4118,11 +4119,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4122 "src/parser_proc.c" /* glr.c:816  */
+#line 4123 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 488:
-#line 1289 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1290 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_FUNCTION, (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->var->name),
@@ -4131,19 +4132,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->token);
        (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.func = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4135 "src/parser_proc.c" /* glr.c:816  */
+#line 4136 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 489:
-#line 1297 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1298 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4143 "src/parser_proc.c" /* glr.c:816  */
+#line 4144 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 490:
-#line 1300 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1301 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
@@ -4154,11 +4155,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4158 "src/parser_proc.c" /* glr.c:816  */
+#line 4159 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 491:
-#line 1310 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1311 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
@@ -4169,31 +4170,31 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 4173 "src/parser_proc.c" /* glr.c:816  */
+#line 4174 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 492:
-#line 1323 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1324 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_var **)(&(*yyvalp))) = psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text, (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)) + !! (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_var **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4183 "src/parser_proc.c" /* glr.c:816  */
+#line 4184 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 493:
-#line 1328 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1329 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_var **)(&(*yyvalp))) = psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text, !! (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_decl_var **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4193 "src/parser_proc.c" /* glr.c:816  */
+#line 4194 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 494:
-#line 1336 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1337 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_union **)(&(*yyvalp))) = psi_decl_union_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -4201,11 +4202,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_union **)(&(*yyvalp)))->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len;
        (*(struct psi_decl_union **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4205 "src/parser_proc.c" /* glr.c:816  */
+#line 4206 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 495:
-#line 1346 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1347 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_struct **)(&(*yyvalp))) = psi_decl_struct_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -4213,27 +4214,27 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_decl_struct **)(&(*yyvalp)))->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).len;
        (*(struct psi_decl_struct **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
 }
-#line 4217 "src/parser_proc.c" /* glr.c:816  */
+#line 4218 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 496:
-#line 1356 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1357 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4225 "src/parser_proc.c" /* glr.c:816  */
+#line 4226 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 498:
-#line 1363 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1364 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 4233 "src/parser_proc.c" /* glr.c:816  */
+#line 4234 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 499:
-#line 1369 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1370 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
@@ -4248,11 +4249,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 4252 "src/parser_proc.c" /* glr.c:816  */
+#line 4253 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 500:
-#line 1383 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1384 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), &(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
@@ -4267,27 +4268,27 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 4271 "src/parser_proc.c" /* glr.c:816  */
+#line 4272 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 501:
-#line 1400 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1401 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4279 "src/parser_proc.c" /* glr.c:816  */
+#line 4280 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 502:
-#line 1403 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1404 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4287 "src/parser_proc.c" /* glr.c:816  */
+#line 4288 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 503:
-#line 1409 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1410 "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)));
@@ -4295,11 +4296,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &arg);
        }
 }
-#line 4299 "src/parser_proc.c" /* glr.c:816  */
+#line 4300 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 504:
-#line 1416 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1417 "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)));
@@ -4307,180 +4308,180 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)), &arg);
        }
 }
-#line 4311 "src/parser_proc.c" /* glr.c:816  */
+#line 4312 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 505:
-#line 1426 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1427 "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 4320 "src/parser_proc.c" /* glr.c:816  */
+#line 4321 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 506:
-#line 1433 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1434 "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 4328 "src/parser_proc.c" /* glr.c:816  */
+#line 4329 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 507:
-#line 1436 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1437 "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 4336 "src/parser_proc.c" /* glr.c:816  */
+#line 4337 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 508:
-#line 1442 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1443 "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 4346 "src/parser_proc.c" /* glr.c:816  */
+#line 4347 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 509:
-#line 1447 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1448 "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 4356 "src/parser_proc.c" /* glr.c:816  */
+#line 4357 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 510:
-#line 1455 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1456 "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 4365 "src/parser_proc.c" /* glr.c:816  */
+#line 4366 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 511:
-#line 1459 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1460 "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 4374 "src/parser_proc.c" /* glr.c:816  */
+#line 4375 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 512:
-#line 1463 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1464 "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 4383 "src/parser_proc.c" /* glr.c:816  */
+#line 4384 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 513:
-#line 1467 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1468 "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 4392 "src/parser_proc.c" /* glr.c:816  */
+#line 4393 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 514:
-#line 1471 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1472 "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 4401 "src/parser_proc.c" /* glr.c:816  */
+#line 4402 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 515:
-#line 1475 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1476 "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 4410 "src/parser_proc.c" /* glr.c:816  */
+#line 4411 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 516:
-#line 1482 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1483 "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 4419 "src/parser_proc.c" /* glr.c:816  */
+#line 4420 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 517:
-#line 1486 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1487 "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 4428 "src/parser_proc.c" /* glr.c:816  */
+#line 4429 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 518:
-#line 1490 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1491 "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 4437 "src/parser_proc.c" /* glr.c:816  */
+#line 4438 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 519:
-#line 1494 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1495 "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 4446 "src/parser_proc.c" /* glr.c:816  */
+#line 4447 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 520:
-#line 1498 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1499 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4454 "src/parser_proc.c" /* glr.c:816  */
+#line 4455 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 521:
-#line 1504 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1505 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 4463 "src/parser_proc.c" /* glr.c:816  */
+#line 4464 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 522:
-#line 1508 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1509 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 4472 "src/parser_proc.c" /* glr.c:816  */
+#line 4473 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 523:
-#line 1515 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1516 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4480 "src/parser_proc.c" /* glr.c:816  */
+#line 4481 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 524:
-#line 1518 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1519 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                int8_t sizeof_void_p = sizeof(void *);
@@ -4489,37 +4490,37 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_SIZEOF, (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), 0);
        }
 }
-#line 4493 "src/parser_proc.c" /* glr.c:816  */
+#line 4494 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 525:
-#line 1529 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1530 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        int8_t sizeof_void_p = sizeof(void *);
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT8, &sizeof_void_p, 0);
 }
-#line 4502 "src/parser_proc.c" /* glr.c:816  */
+#line 4503 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 526:
-#line 1533 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1534 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        int8_t sizeof_a = sizeof('a');
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT8, &sizeof_a, 0);
 }
-#line 4511 "src/parser_proc.c" /* glr.c:816  */
+#line 4512 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 527:
-#line 1537 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1538 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT64, &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->size, 0);
 }
-#line 4519 "src/parser_proc.c" /* glr.c:816  */
+#line 4520 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 528:
-#line 1543 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1544 "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)));
@@ -4530,11 +4531,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 4534 "src/parser_proc.c" /* glr.c:816  */
+#line 4535 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 529:
-#line 1556 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1557 "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)));
@@ -4545,11 +4546,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 4549 "src/parser_proc.c" /* glr.c:816  */
+#line 4550 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 530:
-#line 1569 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1570 "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)));
@@ -4560,94 +4561,94 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_append("@", psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 1, digest);
        }
 }
-#line 4564 "src/parser_proc.c" /* glr.c:816  */
+#line 4565 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 531:
-#line 1582 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1583 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 4572 "src/parser_proc.c" /* glr.c:816  */
+#line 4573 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 532:
-#line 1585 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1586 "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 4581 "src/parser_proc.c" /* glr.c:816  */
+#line 4582 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 533:
-#line 1592 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1593 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = NULL;
 }
-#line 4589 "src/parser_proc.c" /* glr.c:816  */
+#line 4590 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 534:
-#line 1595 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1596 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = psi_layout_init(0, 0, psi_layout_init(0, atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text), NULL));
 }
-#line 4597 "src/parser_proc.c" /* glr.c:816  */
+#line 4598 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 535:
-#line 1598 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1599 "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 4605 "src/parser_proc.c" /* glr.c:816  */
+#line 4606 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 536:
-#line 1601 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1602 "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 4613 "src/parser_proc.c" /* glr.c:816  */
+#line 4614 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 537:
-#line 1607 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1608 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout*)(&(*yyvalp))).pos = 0;
        (*(struct psi_layout*)(&(*yyvalp))).len = 0;
 }
-#line 4622 "src/parser_proc.c" /* glr.c:816  */
+#line 4623 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 538:
-#line 1611 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1612 "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 4631 "src/parser_proc.c" /* glr.c:816  */
+#line 4632 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 539:
-#line 1618 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1619 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4639 "src/parser_proc.c" /* glr.c:816  */
+#line 4640 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 540:
-#line 1621 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1622 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4647 "src/parser_proc.c" /* glr.c:816  */
+#line 4648 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 541:
-#line 1624 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1625 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if (psi_num_exp_validate(PSI_DATA(P), (*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), NULL, NULL, NULL, NULL, NULL)) {
                (*(size_t*)(&(*yyvalp))) = psi_long_num_exp((*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), NULL, &P->preproc->defs);
@@ -4655,88 +4656,88 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(size_t*)(&(*yyvalp))) = 0;
        }
 }
-#line 4659 "src/parser_proc.c" /* glr.c:816  */
+#line 4660 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 542:
-#line 1634 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1635 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4667 "src/parser_proc.c" /* glr.c:816  */
+#line 4668 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 543:
-#line 1637 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1638 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4675 "src/parser_proc.c" /* glr.c:816  */
+#line 4676 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 545:
-#line 1644 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1645 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 4683 "src/parser_proc.c" /* glr.c:816  */
+#line 4684 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 546:
-#line 1650 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1651 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 1;
 }
-#line 4691 "src/parser_proc.c" /* glr.c:816  */
+#line 4692 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 547:
-#line 1653 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1654 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)) + 1;
 }
-#line 4699 "src/parser_proc.c" /* glr.c:816  */
+#line 4700 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 550:
-#line 1670 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1671 "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 4707 "src/parser_proc.c" /* glr.c:816  */
+#line 4708 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 551:
-#line 1673 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1674 "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 4716 "src/parser_proc.c" /* glr.c:816  */
+#line 4717 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 552:
-#line 1680 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1681 "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 4726 "src/parser_proc.c" /* glr.c:816  */
+#line 4727 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 553:
-#line 1685 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1686 "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 4736 "src/parser_proc.c" /* glr.c:816  */
+#line 4737 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 554:
-#line 1690 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1691 "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)));
@@ -4744,470 +4745,470 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        (*(struct psi_impl_func **)(&(*yyvalp)))->vararg = psi_impl_arg_init((*(struct psi_impl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-6)].yystate.yysemantics.yysval)), psi_impl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(bool*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))), NULL);
        (*(struct psi_impl_func **)(&(*yyvalp)))->vararg->var->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 4748 "src/parser_proc.c" /* glr.c:816  */
+#line 4749 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 555:
-#line 1700 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1701 "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 4756 "src/parser_proc.c" /* glr.c:816  */
+#line 4757 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 556:
-#line 1703 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1704 "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 4764 "src/parser_proc.c" /* glr.c:816  */
+#line 4765 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 557:
-#line 1709 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1710 "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 4772 "src/parser_proc.c" /* glr.c:816  */
+#line 4773 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 558:
-#line 1712 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1713 "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 4780 "src/parser_proc.c" /* glr.c:816  */
+#line 4781 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 559:
-#line 1718 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1719 "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 4789 "src/parser_proc.c" /* glr.c:816  */
+#line 4790 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 560:
-#line 1725 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1726 "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 4798 "src/parser_proc.c" /* glr.c:816  */
+#line 4799 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 570:
-#line 1744 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1745 "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 4806 "src/parser_proc.c" /* glr.c:816  */
+#line 4807 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 571:
-#line 1747 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1748 "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 4814 "src/parser_proc.c" /* glr.c:816  */
+#line 4815 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 572:
-#line 1753 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1754 "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 4822 "src/parser_proc.c" /* glr.c:816  */
+#line 4823 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 573:
-#line 1756 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1757 "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 4830 "src/parser_proc.c" /* glr.c:816  */
+#line 4831 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 574:
-#line 1759 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1760 "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 4838 "src/parser_proc.c" /* glr.c:816  */
+#line 4839 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 575:
-#line 1762 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1763 "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 4846 "src/parser_proc.c" /* glr.c:816  */
+#line 4847 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 576:
-#line 1765 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1766 "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 4854 "src/parser_proc.c" /* glr.c:816  */
+#line 4855 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 577:
-#line 1771 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1772 "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 4863 "src/parser_proc.c" /* glr.c:816  */
+#line 4864 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 578:
-#line 1775 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1776 "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 4873 "src/parser_proc.c" /* glr.c:816  */
+#line 4874 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 580:
-#line 1784 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1785 "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 4882 "src/parser_proc.c" /* glr.c:816  */
+#line 4883 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 581:
-#line 1788 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1789 "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 4891 "src/parser_proc.c" /* glr.c:816  */
+#line 4892 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 582:
-#line 1795 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1796 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_NULL, NULL);
 }
-#line 4899 "src/parser_proc.c" /* glr.c:816  */
+#line 4900 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 583:
-#line 1798 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1799 "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 4907 "src/parser_proc.c" /* glr.c:816  */
+#line 4908 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 584:
-#line 1801 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1802 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_CALLOC, (*(struct psi_let_calloc **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_let_calloc **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->static_memory = 1;
 }
-#line 4916 "src/parser_proc.c" /* glr.c:816  */
+#line 4917 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 585:
-#line 1805 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1806 "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 4924 "src/parser_proc.c" /* glr.c:816  */
+#line 4925 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 586:
-#line 1808 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1809 "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 4932 "src/parser_proc.c" /* glr.c:816  */
+#line 4933 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 587:
-#line 1811 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1812 "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 4940 "src/parser_proc.c" /* glr.c:816  */
+#line 4941 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 588:
-#line 1817 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1818 "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 4949 "src/parser_proc.c" /* glr.c:816  */
+#line 4950 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 589:
-#line 1821 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1822 "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 4959 "src/parser_proc.c" /* glr.c:816  */
+#line 4960 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 590:
-#line 1829 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1830 "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 4968 "src/parser_proc.c" /* glr.c:816  */
+#line 4969 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 591:
-#line 1836 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1837 "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 4978 "src/parser_proc.c" /* glr.c:816  */
+#line 4979 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 592:
-#line 1844 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1845 "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 4988 "src/parser_proc.c" /* glr.c:816  */
+#line 4989 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 603:
-#line 1865 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1866 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4996 "src/parser_proc.c" /* glr.c:816  */
+#line 4997 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 604:
-#line 1868 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1869 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 5004 "src/parser_proc.c" /* glr.c:816  */
+#line 5005 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 605:
-#line 1874 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1875 "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 5012 "src/parser_proc.c" /* glr.c:816  */
+#line 5013 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 606:
-#line 1877 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1878 "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 5020 "src/parser_proc.c" /* glr.c:816  */
+#line 5021 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 609:
-#line 1888 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1889 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 5028 "src/parser_proc.c" /* glr.c:816  */
+#line 5029 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 610:
-#line 1891 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1892 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 5036 "src/parser_proc.c" /* glr.c:816  */
+#line 5037 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 611:
-#line 1897 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1898 "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 5044 "src/parser_proc.c" /* glr.c:816  */
+#line 5045 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 612:
-#line 1900 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1901 "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 5052 "src/parser_proc.c" /* glr.c:816  */
+#line 5053 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 613:
-#line 1906 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1907 "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 5061 "src/parser_proc.c" /* glr.c:816  */
+#line 5062 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 614:
-#line 1913 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1914 "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 5070 "src/parser_proc.c" /* glr.c:816  */
+#line 5071 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 615:
-#line 1920 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1921 "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 5078 "src/parser_proc.c" /* glr.c:816  */
+#line 5079 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 616:
-#line 1923 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1924 "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 5086 "src/parser_proc.c" /* glr.c:816  */
+#line 5087 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 617:
-#line 1926 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1927 "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 5095 "src/parser_proc.c" /* glr.c:816  */
+#line 5096 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 618:
-#line 1933 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1934 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_set_func **)(&(*yyvalp))) = psi_set_func_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-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 5105 "src/parser_proc.c" /* glr.c:816  */
+#line 5106 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 619:
-#line 1938 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1939 "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 5115 "src/parser_proc.c" /* glr.c:816  */
+#line 5116 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 628:
-#line 1957 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1958 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 5123 "src/parser_proc.c" /* glr.c:816  */
+#line 5124 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 629:
-#line 1960 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1961 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 5131 "src/parser_proc.c" /* glr.c:816  */
+#line 5132 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 630:
-#line 1966 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1967 "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 5139 "src/parser_proc.c" /* glr.c:816  */
+#line 5140 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 631:
-#line 1969 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1970 "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 5147 "src/parser_proc.c" /* glr.c:816  */
+#line 5148 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 632:
-#line 1975 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1976 "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 5156 "src/parser_proc.c" /* glr.c:816  */
+#line 5157 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 635:
-#line 1987 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1988 "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 5165 "src/parser_proc.c" /* glr.c:816  */
+#line 5166 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 636:
-#line 1994 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1995 "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 5173 "src/parser_proc.c" /* glr.c:816  */
+#line 5174 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 637:
-#line 1997 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 1998 "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 5181 "src/parser_proc.c" /* glr.c:816  */
+#line 5182 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 638:
-#line 2003 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 2004 "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 5191 "src/parser_proc.c" /* glr.c:816  */
+#line 5192 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 639:
-#line 2011 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 2012 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = false;
 }
-#line 5199 "src/parser_proc.c" /* glr.c:816  */
+#line 5200 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 640:
-#line 2014 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 2015 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = true;
 }
-#line 5207 "src/parser_proc.c" /* glr.c:816  */
+#line 5208 "src/parser_proc.c" /* glr.c:816  */
     break;
 
 
-#line 5211 "src/parser_proc.c" /* glr.c:816  */
+#line 5212 "src/parser_proc.c" /* glr.c:816  */
       default: break;
     }
 
@@ -5256,705 +5257,705 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct psi_parser
   switch (yytype)
     {
           case 136: /* binary_op_token  */
-#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5262 "src/parser_proc.c" /* glr.c:846  */
+#line 5263 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 137: /* unary_op_token  */
-#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5268 "src/parser_proc.c" /* glr.c:846  */
+#line 5269 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 138: /* name_token  */
-#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5274 "src/parser_proc.c" /* glr.c:846  */
+#line 5275 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 139: /* any_noeol_token  */
-#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5280 "src/parser_proc.c" /* glr.c:846  */
+#line 5281 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 144: /* lib  */
-#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5286 "src/parser_proc.c" /* glr.c:846  */
+#line 5287 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 145: /* cpp  */
-#line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 5292 "src/parser_proc.c" /* glr.c:846  */
+#line 5293 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 146: /* cpp_exp  */
-#line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 5298 "src/parser_proc.c" /* glr.c:846  */
+#line 5299 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 148: /* cpp_message_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5304 "src/parser_proc.c" /* glr.c:846  */
+#line 5305 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 149: /* cpp_include_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5310 "src/parser_proc.c" /* glr.c:846  */
+#line 5311 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 150: /* cpp_header_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5316 "src/parser_proc.c" /* glr.c:846  */
+#line 5317 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 151: /* cpp_no_arg_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5322 "src/parser_proc.c" /* glr.c:846  */
+#line 5323 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 152: /* cpp_name_arg_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5328 "src/parser_proc.c" /* glr.c:846  */
+#line 5329 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 153: /* cpp_exp_arg_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5334 "src/parser_proc.c" /* glr.c:846  */
+#line 5335 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 154: /* cpp_special_name_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5340 "src/parser_proc.c" /* glr.c:846  */
+#line 5341 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 155: /* cpp_macro_decl  */
-#line 287 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 288 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_macro_decl_free(&(*(struct psi_cpp_macro_decl **)(&(*yyvaluep))));}
-#line 5346 "src/parser_proc.c" /* glr.c:846  */
+#line 5347 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 156: /* cpp_macro_sig  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5352 "src/parser_proc.c" /* glr.c:846  */
+#line 5353 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 157: /* cpp_macro_sig_args  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5358 "src/parser_proc.c" /* glr.c:846  */
+#line 5359 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 158: /* cpp_macro_decl_tokens  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5364 "src/parser_proc.c" /* glr.c:846  */
+#line 5365 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 159: /* cpp_macro_decl_token_list  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5370 "src/parser_proc.c" /* glr.c:846  */
+#line 5371 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 160: /* cpp_macro_exp  */
-#line 291 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 5376 "src/parser_proc.c" /* glr.c:846  */
+#line 5377 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 161: /* cpp_macro_call_args  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5382 "src/parser_proc.c" /* glr.c:846  */
+#line 5383 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 162: /* cpp_macro_call_arg_list  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5388 "src/parser_proc.c" /* glr.c:846  */
+#line 5389 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 163: /* constant  */
-#line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_free(&(*(struct psi_const **)(&(*yyvaluep))));}
-#line 5394 "src/parser_proc.c" /* glr.c:846  */
+#line 5395 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 164: /* constant_type  */
-#line 299 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_type_free(&(*(struct psi_const_type **)(&(*yyvaluep))));}
-#line 5400 "src/parser_proc.c" /* glr.c:846  */
+#line 5401 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 165: /* constant_type_token  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5406 "src/parser_proc.c" /* glr.c:846  */
+#line 5407 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 166: /* impl_def_val  */
-#line 301 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 302 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_def_val_free(&(*(struct psi_impl_def_val **)(&(*yyvaluep))));}
-#line 5412 "src/parser_proc.c" /* glr.c:846  */
+#line 5413 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 167: /* impl_def_val_token  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5418 "src/parser_proc.c" /* glr.c:846  */
+#line 5419 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 168: /* decl_typedef  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5424 "src/parser_proc.c" /* glr.c:846  */
+#line 5425 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 169: /* typedef  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5430 "src/parser_proc.c" /* glr.c:846  */
+#line 5431 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 170: /* typedef_anon  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5436 "src/parser_proc.c" /* glr.c:846  */
+#line 5437 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 171: /* typedef_decl  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5442 "src/parser_proc.c" /* glr.c:846  */
+#line 5443 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 172: /* typedef_anon_decl  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5448 "src/parser_proc.c" /* glr.c:846  */
+#line 5449 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 173: /* qualified_decl_type  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 5454 "src/parser_proc.c" /* glr.c:846  */
+#line 5455 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 174: /* decl_type  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 5460 "src/parser_proc.c" /* glr.c:846  */
+#line 5461 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 175: /* decl_type_complex  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 5466 "src/parser_proc.c" /* glr.c:846  */
+#line 5467 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 176: /* decl_type_simple  */
-#line 304 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5472 "src/parser_proc.c" /* glr.c:846  */
+#line 5473 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 177: /* decl_real_type  */
-#line 304 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5478 "src/parser_proc.c" /* glr.c:846  */
+#line 5479 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 178: /* decl_stdint_type  */
-#line 307 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5484 "src/parser_proc.c" /* glr.c:846  */
+#line 5485 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 179: /* int_signed  */
-#line 282 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5490 "src/parser_proc.c" /* glr.c:846  */
+#line 5491 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 180: /* int_width  */
-#line 279 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5496 "src/parser_proc.c" /* glr.c:846  */
+#line 5497 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 181: /* decl_int_type  */
-#line 304 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5502 "src/parser_proc.c" /* glr.c:846  */
+#line 5503 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 182: /* int_signed_types  */
-#line 279 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5508 "src/parser_proc.c" /* glr.c:846  */
+#line 5509 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 183: /* signed_short_types  */
-#line 282 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5514 "src/parser_proc.c" /* glr.c:846  */
+#line 5515 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 184: /* signed_long_types  */
-#line 282 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5520 "src/parser_proc.c" /* glr.c:846  */
+#line 5521 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 185: /* int_width_types  */
-#line 279 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5526 "src/parser_proc.c" /* glr.c:846  */
+#line 5527 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 186: /* decl_stmt  */
-#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5532 "src/parser_proc.c" /* glr.c:846  */
+#line 5533 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 192: /* decl_vars  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5538 "src/parser_proc.c" /* glr.c:846  */
+#line 5539 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 197: /* decl  */
-#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5544 "src/parser_proc.c" /* glr.c:846  */
+#line 5545 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 198: /* decl_body  */
-#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5550 "src/parser_proc.c" /* glr.c:846  */
+#line 5551 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 199: /* decl_func_body  */
-#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5556 "src/parser_proc.c" /* glr.c:846  */
+#line 5557 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 200: /* decl_functor_body  */
-#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 5562 "src/parser_proc.c" /* glr.c:846  */
+#line 5563 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 201: /* decl_functor  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5568 "src/parser_proc.c" /* glr.c:846  */
+#line 5569 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 202: /* decl_func  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5574 "src/parser_proc.c" /* glr.c:846  */
+#line 5575 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 203: /* decl_args  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5580 "src/parser_proc.c" /* glr.c:846  */
+#line 5581 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 204: /* decl_anon_arg  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5586 "src/parser_proc.c" /* glr.c:846  */
+#line 5587 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 205: /* decl_arg  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 5592 "src/parser_proc.c" /* glr.c:846  */
+#line 5593 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 206: /* decl_var  */
-#line 316 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 317 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_var_free(&(*(struct psi_decl_var **)(&(*yyvaluep))));}
-#line 5598 "src/parser_proc.c" /* glr.c:846  */
+#line 5599 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 207: /* decl_union  */
-#line 320 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 321 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_union_free(&(*(struct psi_decl_union **)(&(*yyvaluep))));}
-#line 5604 "src/parser_proc.c" /* glr.c:846  */
+#line 5605 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 208: /* decl_struct  */
-#line 318 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 319 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_struct_free(&(*(struct psi_decl_struct **)(&(*yyvaluep))));}
-#line 5610 "src/parser_proc.c" /* glr.c:846  */
+#line 5611 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 209: /* decl_struct_args  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5616 "src/parser_proc.c" /* glr.c:846  */
+#line 5617 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 210: /* struct_args_block  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5622 "src/parser_proc.c" /* glr.c:846  */
+#line 5623 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 211: /* struct_args  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5628 "src/parser_proc.c" /* glr.c:846  */
+#line 5629 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 212: /* struct_arg_var_list  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5634 "src/parser_proc.c" /* glr.c:846  */
+#line 5635 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 213: /* decl_vars_with_layout  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5640 "src/parser_proc.c" /* glr.c:846  */
+#line 5641 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 214: /* decl_enum  */
-#line 322 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 323 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_free(&(*(struct psi_decl_enum **)(&(*yyvaluep))));}
-#line 5646 "src/parser_proc.c" /* glr.c:846  */
+#line 5647 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 215: /* decl_enum_items  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5652 "src/parser_proc.c" /* glr.c:846  */
+#line 5653 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 216: /* decl_enum_item  */
-#line 324 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 325 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_item_free(&(*(struct psi_decl_enum_item **)(&(*yyvaluep))));}
-#line 5658 "src/parser_proc.c" /* glr.c:846  */
+#line 5659 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 217: /* num_exp  */
-#line 380 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 381 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 5664 "src/parser_proc.c" /* glr.c:846  */
+#line 5665 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 218: /* number  */
-#line 382 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 383 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5670 "src/parser_proc.c" /* glr.c:846  */
+#line 5671 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 219: /* sizeof  */
-#line 334 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 335 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5676 "src/parser_proc.c" /* glr.c:846  */
+#line 5677 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 220: /* sizeof_body  */
-#line 334 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 335 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5682 "src/parser_proc.c" /* glr.c:846  */
+#line 5683 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 221: /* sizeof_body_notypes  */
-#line 334 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 335 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5688 "src/parser_proc.c" /* glr.c:846  */
+#line 5689 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 222: /* enum_name  */
-#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5694 "src/parser_proc.c" /* glr.c:846  */
+#line 5695 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 223: /* union_name  */
-#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5700 "src/parser_proc.c" /* glr.c:846  */
+#line 5701 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 224: /* struct_name  */
-#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5706 "src/parser_proc.c" /* glr.c:846  */
+#line 5707 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 225: /* optional_name  */
-#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5712 "src/parser_proc.c" /* glr.c:846  */
+#line 5713 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 226: /* decl_layout  */
-#line 331 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 332 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_layout_free(&(*(struct psi_layout **)(&(*yyvaluep))));}
-#line 5718 "src/parser_proc.c" /* glr.c:846  */
+#line 5719 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 227: /* align_and_size  */
-#line 329 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 330 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5724 "src/parser_proc.c" /* glr.c:846  */
+#line 5725 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 228: /* array_size  */
-#line 385 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 386 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5730 "src/parser_proc.c" /* glr.c:846  */
+#line 5731 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 229: /* indirection  */
-#line 385 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 386 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5736 "src/parser_proc.c" /* glr.c:846  */
+#line 5737 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 230: /* pointers  */
-#line 385 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 386 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5742 "src/parser_proc.c" /* glr.c:846  */
+#line 5743 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 231: /* asterisks  */
-#line 385 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 386 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5748 "src/parser_proc.c" /* glr.c:846  */
+#line 5749 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 233: /* impl  */
-#line 337 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 338 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_free(&(*(struct psi_impl **)(&(*yyvaluep))));}
-#line 5754 "src/parser_proc.c" /* glr.c:846  */
+#line 5755 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 234: /* impl_func  */
-#line 339 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 340 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_func_free(&(*(struct psi_impl_func **)(&(*yyvaluep))));}
-#line 5760 "src/parser_proc.c" /* glr.c:846  */
+#line 5761 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 235: /* impl_args  */
-#line 377 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5766 "src/parser_proc.c" /* glr.c:846  */
+#line 5767 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 236: /* impl_arg  */
-#line 341 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 342 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_arg_free(&(*(struct psi_impl_arg **)(&(*yyvaluep))));}
-#line 5772 "src/parser_proc.c" /* glr.c:846  */
+#line 5773 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 237: /* impl_var  */
-#line 345 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 346 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_var_free(&(*(struct psi_impl_var **)(&(*yyvaluep))));}
-#line 5778 "src/parser_proc.c" /* glr.c:846  */
+#line 5779 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 238: /* impl_type  */
-#line 343 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 344 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_type_free(&(*(struct psi_impl_type **)(&(*yyvaluep))));}
-#line 5784 "src/parser_proc.c" /* glr.c:846  */
+#line 5785 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 239: /* impl_type_token  */
-#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 376 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5790 "src/parser_proc.c" /* glr.c:846  */
+#line 5791 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 240: /* impl_stmts  */
-#line 377 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5796 "src/parser_proc.c" /* glr.c:846  */
+#line 5797 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 241: /* impl_stmt  */
-#line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 374 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_stmt_free(&(*(struct psi_token ***)(&(*yyvaluep))));}
-#line 5802 "src/parser_proc.c" /* glr.c:846  */
+#line 5803 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 242: /* let_stmt  */
-#line 348 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 349 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_stmt_free(&(*(struct psi_let_stmt **)(&(*yyvaluep))));}
-#line 5808 "src/parser_proc.c" /* glr.c:846  */
+#line 5809 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 243: /* let_exp  */
-#line 350 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 351 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5814 "src/parser_proc.c" /* glr.c:846  */
+#line 5815 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 244: /* let_exp_byref  */
-#line 350 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 351 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5820 "src/parser_proc.c" /* glr.c:846  */
+#line 5821 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 245: /* let_exp_assign  */
-#line 350 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 351 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5826 "src/parser_proc.c" /* glr.c:846  */
+#line 5827 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 246: /* let_calloc  */
-#line 352 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 353 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_calloc_free(&(*(struct psi_let_calloc **)(&(*yyvaluep))));}
-#line 5832 "src/parser_proc.c" /* glr.c:846  */
+#line 5833 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 247: /* let_callback  */
-#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 355 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_callback_free(&(*(struct psi_let_callback **)(&(*yyvaluep))));}
-#line 5838 "src/parser_proc.c" /* glr.c:846  */
+#line 5839 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 248: /* let_func  */
-#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_func_free(&(*(struct psi_let_func **)(&(*yyvaluep))));}
-#line 5844 "src/parser_proc.c" /* glr.c:846  */
+#line 5845 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 249: /* let_func_token  */
-#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 376 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5850 "src/parser_proc.c" /* glr.c:846  */
+#line 5851 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 250: /* let_func_exps  */
-#line 377 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5856 "src/parser_proc.c" /* glr.c:846  */
+#line 5857 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 251: /* let_exps  */
-#line 377 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5862 "src/parser_proc.c" /* glr.c:846  */
+#line 5863 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 252: /* callback_rval  */
-#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 376 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5868 "src/parser_proc.c" /* glr.c:846  */
+#line 5869 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 253: /* callback_arg_list  */
-#line 377 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5874 "src/parser_proc.c" /* glr.c:846  */
+#line 5875 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 254: /* callback_args  */
-#line 377 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5880 "src/parser_proc.c" /* glr.c:846  */
+#line 5881 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 255: /* return_stmt  */
-#line 366 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_return_stmt_free(&(*(struct psi_return_stmt **)(&(*yyvaluep))));}
-#line 5886 "src/parser_proc.c" /* glr.c:846  */
+#line 5887 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 256: /* set_stmt  */
-#line 358 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_stmt_free(&(*(struct psi_set_stmt **)(&(*yyvaluep))));}
-#line 5892 "src/parser_proc.c" /* glr.c:846  */
+#line 5893 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 257: /* set_exp  */
-#line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 361 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_exp_free(&(*(struct psi_set_exp **)(&(*yyvaluep))));}
-#line 5898 "src/parser_proc.c" /* glr.c:846  */
+#line 5899 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 258: /* set_func  */
-#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_func_free(&(*(struct psi_set_func **)(&(*yyvaluep))));}
-#line 5904 "src/parser_proc.c" /* glr.c:846  */
+#line 5905 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 259: /* set_func_token  */
-#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 376 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5910 "src/parser_proc.c" /* glr.c:846  */
+#line 5911 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 260: /* set_func_exps  */
-#line 377 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5916 "src/parser_proc.c" /* glr.c:846  */
+#line 5917 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 261: /* set_exps  */
-#line 377 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5922 "src/parser_proc.c" /* glr.c:846  */
+#line 5923 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 262: /* assert_stmt  */
-#line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 365 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_assert_stmt_free(&(*(struct psi_assert_stmt **)(&(*yyvaluep))));}
-#line 5928 "src/parser_proc.c" /* glr.c:846  */
+#line 5929 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 263: /* assert_stmt_token  */
-#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 376 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5934 "src/parser_proc.c" /* glr.c:846  */
+#line 5935 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 264: /* free_stmt  */
-#line 368 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 369 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_stmt_free(&(*(struct psi_free_stmt **)(&(*yyvaluep))));}
-#line 5940 "src/parser_proc.c" /* glr.c:846  */
+#line 5941 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 265: /* free_exps  */
-#line 377 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5946 "src/parser_proc.c" /* glr.c:846  */
+#line 5947 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 266: /* free_exp  */
-#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 371 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_exp_free(&(*(struct psi_free_exp **)(&(*yyvaluep))));}
-#line 5952 "src/parser_proc.c" /* glr.c:846  */
+#line 5953 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 267: /* reference  */
-#line 387 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 388 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5958 "src/parser_proc.c" /* glr.c:846  */
+#line 5959 "src/parser_proc.c" /* glr.c:846  */
         break;
 
 
@@ -7303,11 +7304,11 @@ yyparse (struct psi_parser *P, struct psi_plist *tokens, size_t *index)
   yylval = yyval_default;
 
   /* User initialization code.  */
-  #line 113 "src/parser_proc_grammar.y" /* glr.c:2270  */
+  #line 114 "src/parser_proc_grammar.y" /* glr.c:2270  */
 {
 }
 
-#line 7311 "src/parser_proc.c" /* glr.c:2270  */
+#line 7312 "src/parser_proc.c" /* glr.c:2270  */
 
   if (! yyinitGLRStack (yystackp, YYINITDEPTH))
     goto yyexhaustedlab;
@@ -7613,7 +7614,7 @@ yypdumpstack (yyGLRStack* yystackp)
 #define yydebug psi_parser_proc_debug
 #define yynerrs psi_parser_proc_nerrs
 
-#line 2023 "src/parser_proc_grammar.y" /* glr.c:2584  */
+#line 2024 "src/parser_proc_grammar.y" /* glr.c:2584  */
 
 
 /* epilogue */

diff --git a/src/parser_proc.h b/src/parser_proc.h
index 318fc93e735829dbd2189dcea37b8bc6b6c8cedc..e7f59614175c396ffd1b9805ce6a9a678bb1a360 100644 (file)
--- a/src/parser_proc.h
+++ b/src/parser_proc.h
@@ -40,7 +40,7 @@
 extern int psi_parser_proc_debug;
 #endif
 /* "%code requires" blocks.  */
-#line 89 "src/parser_proc_grammar.y" /* glr.c:197  */
+#line 90 "src/parser_proc_grammar.y" /* glr.c:197  */
 
 #include "plist.h"
 #include "types/layout.h"

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index bee3cf243eb5379f30039f0e6034977b5781a53c..6fa4ab0bfb9ace332bb39f08688661e81217123a 100644 (file)
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -12,6 +12,7 @@
 #include "plist.h"
 #include "parser.h"
 
+#define YYDEBUG 1
 #define PSI_PARSER_PROC_DEBUG 1
 
 static int psi_parser_proc_lex(YYSTYPE *u, struct psi_parser *P, struct psi_plist *tokens, size_t *index);