cpp: sizeof, anon decls, etc

diff --git a/src/parser.c b/src/parser.c
index 4e979dd0fa684cfa0861455a7cc68719320a0ce1..f130933456398c378ae0804fe3cee6d1c387105e 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 on Thu Jul 27 12:41:40 2017 */
+/* Generated by re2c 1.0.2 on Mon Sep  4 19:48:37 2017 */
 #line 1 "src/parser.re"
 /*******************************************************************************
  Copyright (c) 2016, Michael Wallner <mike@php.net>.
@@ -33,6 +33,7 @@
 #include "parser.h"
 
 #define YYMAXFILL 15
+
 #ifndef YYMAXFILL
 # define YYMAXFILL 256
 #endif
@@ -278,7 +279,7 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                tok = cur;
 
                
-#line 282 "src/parser.c"
+#line 283 "src/parser.c"
                {
                        unsigned char yych;
                        unsigned int yyaccept = 0;
@@ -403,9 +404,9 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
 yy2:
                        ++cur;
 yy3:
-#line 452 "src/parser.re"
+#line 455 "src/parser.re"
                        { NEWTOKEN(-2); goto error; }
-#line 409 "src/parser.c"
+#line 410 "src/parser.c"
 yy4:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -417,39 +418,39 @@ yy4:
                        default:        goto yy6;
                        }
 yy6:
-#line 451 "src/parser.re"
+#line 454 "src/parser.re"
                        { NEWTOKEN(PSI_T_WHITESPACE); goto start; }
-#line 423 "src/parser.c"
+#line 424 "src/parser.c"
 yy7:
                        ++cur;
-#line 450 "src/parser.re"
+#line 453 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
-#line 428 "src/parser.c"
+#line 429 "src/parser.c"
 yy9:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '=':       goto yy104;
                        default:        goto yy10;
                        }
 yy10:
 #line 349 "src/parser.re"
                        { NEWTOKEN(PSI_T_NOT); goto start; }
-#line 438 "src/parser.c"
+#line 439 "src/parser.c"
 yy11:
                        ++cur;
 #line 322 "src/parser.re"
                        { escaped = false; tok += 1; goto string; }
-#line 443 "src/parser.c"
+#line 444 "src/parser.c"
 yy13:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '#':       goto yy106;
                        default:        goto yy14;
                        }
 yy14:
 #line 332 "src/parser.re"
                        { NEWTOKEN(PSI_T_HASH); goto start; }
-#line 453 "src/parser.c"
+#line 454 "src/parser.c"
 yy15:
                        yych = *++cur;
                        switch (yych) {
@@ -524,37 +525,37 @@ yy16:
                        ++cur;
 #line 350 "src/parser.re"
                        { NEWTOKEN(PSI_T_MODULO); goto start; }
-#line 528 "src/parser.c"
+#line 529 "src/parser.c"
 yy18:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '&':       goto yy111;
                        default:        goto yy19;
                        }
 yy19:
 #line 351 "src/parser.re"
                        { NEWTOKEN(PSI_T_AMPERSAND); goto start; }
-#line 538 "src/parser.c"
+#line 539 "src/parser.c"
 yy20:
                        ++cur;
 #line 321 "src/parser.re"
                        { escaped = false; tok += 1; goto character; }
-#line 543 "src/parser.c"
+#line 544 "src/parser.c"
 yy22:
                        ++cur;
 #line 333 "src/parser.re"
                        { NEWTOKEN(PSI_T_LPAREN); goto start; }
-#line 548 "src/parser.c"
+#line 549 "src/parser.c"
 yy24:
                        ++cur;
 #line 334 "src/parser.re"
                        { NEWTOKEN(PSI_T_RPAREN); goto start; }
-#line 553 "src/parser.c"
+#line 554 "src/parser.c"
 yy26:
                        ++cur;
 #line 347 "src/parser.re"
                        { NEWTOKEN(PSI_T_ASTERISK); goto start; }
-#line 558 "src/parser.c"
+#line 559 "src/parser.c"
 yy28:
                        yyaccept = 0;
                        yych = *(mrk = ++cur);
@@ -575,12 +576,12 @@ yy28:
 yy29:
 #line 352 "src/parser.re"
                        { NEWTOKEN(PSI_T_PLUS); goto start; }
-#line 579 "src/parser.c"
+#line 580 "src/parser.c"
 yy30:
                        ++cur;
 #line 336 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMA); goto start; }
-#line 584 "src/parser.c"
+#line 585 "src/parser.c"
 yy32:
                        yyaccept = 1;
                        yych = *(mrk = ++cur);
@@ -601,7 +602,7 @@ yy32:
 yy33:
 #line 353 "src/parser.re"
                        { NEWTOKEN(PSI_T_MINUS); goto start; }
-#line 605 "src/parser.c"
+#line 606 "src/parser.c"
 yy34:
                        yyaccept = 2;
                        yych = *(mrk = ++cur);
@@ -622,10 +623,10 @@ yy34:
 yy35:
 #line 364 "src/parser.re"
                        { NEWTOKEN(PSI_T_PERIOD); goto start; }
-#line 626 "src/parser.c"
+#line 627 "src/parser.c"
 yy36:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '*':       goto yy119;
                        case '/':       goto yy121;
                        default:        goto yy37;
@@ -633,41 +634,27 @@ yy36:
 yy37:
 #line 354 "src/parser.re"
                        { NEWTOKEN(PSI_T_SLASH); goto start; }
-#line 637 "src/parser.c"
+#line 638 "src/parser.c"
 yy38:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
                        case '.':       goto yy123;
-                       case '0':
-                       case '1':
-                       case '2':
-                       case '3':
-                       case '4':
-                       case '5':
-                       case '6':
-                       case '7':       goto yy125;
                        case 'E':
                        case 'e':       goto yy127;
-                       case 'L':
-                       case 'l':       goto yy128;
-                       case 'U':
-                       case 'u':       goto yy130;
                        case 'X':
                        case 'x':       goto yy132;
-                       default:        goto yy39;
+                       default:        goto yy126;
                        }
 yy39:
 #line 308 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT; goto start; }
-#line 665 "src/parser.c"
+#line 653 "src/parser.c"
 yy40:
                        yyaccept = 3;
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
-                       ctxmrk = cur;
                        switch (yych) {
                        case '.':       goto yy123;
                        case '0':
@@ -692,12 +679,12 @@ yy42:
                        ++cur;
 #line 337 "src/parser.re"
                        { NEWTOKEN(PSI_T_COLON); goto start; }
-#line 696 "src/parser.c"
+#line 683 "src/parser.c"
 yy44:
                        ++cur;
 #line 335 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOS); goto start; }
-#line 701 "src/parser.c"
+#line 688 "src/parser.c"
 yy46:
                        yyaccept = 4;
                        yych = *(mrk = ++cur);
@@ -775,20 +762,20 @@ yy46:
 yy47:
 #line 362 "src/parser.re"
                        { NEWTOKEN(PSI_T_LCHEVR); goto start; }
-#line 779 "src/parser.c"
+#line 766 "src/parser.c"
 yy48:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '=':       goto yy139;
                        default:        goto yy49;
                        }
 yy49:
 #line 346 "src/parser.re"
                        { NEWTOKEN(PSI_T_EQUALS); goto start; }
-#line 789 "src/parser.c"
+#line 776 "src/parser.c"
 yy50:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '=':       goto yy141;
                        case '>':       goto yy143;
                        default:        goto yy51;
@@ -796,12 +783,12 @@ yy50:
 yy51:
 #line 363 "src/parser.re"
                        { NEWTOKEN(PSI_T_RCHEVR); goto start; }
-#line 800 "src/parser.c"
+#line 787 "src/parser.c"
 yy52:
                        ++cur;
 #line 366 "src/parser.re"
                        { NEWTOKEN(PSI_T_IIF); goto start; }
-#line 805 "src/parser.c"
+#line 792 "src/parser.c"
 yy54:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -811,9 +798,9 @@ yy54:
                        default:        goto yy62;
                        }
 yy55:
-#line 445 "src/parser.re"
+#line 448 "src/parser.re"
                        { NEWTOKEN(PSI_T_NAME); goto start; }
-#line 817 "src/parser.c"
+#line 804 "src/parser.c"
 yy56:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -953,7 +940,6 @@ yy63:
 yy64:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
                        case '"':
                        case '\'':      goto yy161;
@@ -1032,7 +1018,6 @@ yy71:
 yy72:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
                        case '"':
                        case '\'':      goto yy177;
@@ -1060,10 +1045,10 @@ yy75:
                        ++cur;
 #line 340 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACKET); goto start; }
-#line 1064 "src/parser.c"
+#line 1049 "src/parser.c"
 yy77:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case 0x00:
                        case 0x01:
                        case 0x02:
@@ -1144,17 +1129,17 @@ yy77:
 yy78:
 #line 355 "src/parser.re"
                        { NEWTOKEN(PSI_T_BSLASH); goto start; }
-#line 1148 "src/parser.c"
+#line 1133 "src/parser.c"
 yy79:
                        ++cur;
 #line 341 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACKET); goto start; }
-#line 1153 "src/parser.c"
+#line 1138 "src/parser.c"
 yy81:
                        ++cur;
 #line 357 "src/parser.re"
                        { NEWTOKEN(PSI_T_CARET); goto start; }
-#line 1158 "src/parser.c"
+#line 1143 "src/parser.c"
 yy83:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -1277,7 +1262,6 @@ yy93:
 yy94:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
                        case '"':
                        case '\'':      goto yy200;
@@ -1298,37 +1282,37 @@ yy96:
                        ++cur;
 #line 338 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACE); goto start; }
-#line 1302 "src/parser.c"
+#line 1286 "src/parser.c"
 yy98:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case '|':       goto yy206;
                        default:        goto yy99;
                        }
 yy99:
 #line 356 "src/parser.re"
                        { NEWTOKEN(PSI_T_PIPE); goto start; }
-#line 1312 "src/parser.c"
+#line 1296 "src/parser.c"
 yy100:
                        ++cur;
 #line 339 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACE); goto start; }
-#line 1317 "src/parser.c"
+#line 1301 "src/parser.c"
 yy102:
                        ++cur;
 #line 348 "src/parser.re"
                        { NEWTOKEN(PSI_T_TILDE); goto start; }
-#line 1322 "src/parser.c"
+#line 1306 "src/parser.c"
 yy104:
                        ++cur;
 #line 342 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_NE); goto start; }
-#line 1327 "src/parser.c"
+#line 1311 "src/parser.c"
 yy106:
                        ++cur;
 #line 331 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_PASTE); goto start; }
-#line 1332 "src/parser.c"
+#line 1316 "src/parser.c"
 yy108:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -1402,14 +1386,14 @@ yy108:
                        default:        goto yy108;
                        }
 yy110:
-#line 447 "src/parser.re"
+#line 450 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; }
-#line 1408 "src/parser.c"
+#line 1392 "src/parser.c"
 yy111:
                        ++cur;
 #line 344 "src/parser.re"
                        { NEWTOKEN(PSI_T_AND); goto start; }
-#line 1413 "src/parser.c"
+#line 1397 "src/parser.c"
 yy113:
                        yych = *++cur;
                        switch (yych) {
@@ -1441,80 +1425,83 @@ yy114:
                        case 10:        goto yy241;
                        case 11:        goto yy243;
                        case 12:        goto yy252;
-                       case 13:        goto yy271;
-                       case 14:        goto yy302;
-                       case 15:        goto yy304;
-                       case 16:        goto yy310;
-                       case 17:        goto yy318;
-                       case 18:        goto yy330;
-                       case 19:        goto yy338;
-                       case 20:        goto yy342;
-                       case 21:        goto yy348;
-                       case 22:        goto yy350;
-                       case 23:        goto yy354;
-                       case 24:        goto yy361;
-                       case 25:        goto yy363;
-                       case 26:        goto yy373;
-                       case 27:        goto yy375;
-                       case 28:        goto yy382;
-                       case 29:        goto yy385;
-                       case 30:        goto yy387;
-                       case 31:        goto yy389;
-                       case 32:        goto yy393;
-                       case 33:        goto yy398;
-                       case 34:        goto yy416;
-                       case 35:        goto yy423;
-                       case 36:        goto yy426;
-                       case 37:        goto yy433;
-                       case 38:        goto yy442;
-                       case 39:        goto yy445;
-                       case 40:        goto yy450;
-                       case 41:        goto yy452;
-                       case 42:        goto yy456;
-                       case 43:        goto yy459;
-                       case 44:        goto yy461;
-                       case 45:        goto yy463;
-                       case 46:        goto yy468;
-                       case 47:        goto yy470;
-                       case 48:        goto yy472;
-                       case 49:        goto yy474;
-                       case 50:        goto yy476;
-                       case 51:        goto yy481;
-                       case 52:        goto yy490;
-                       case 53:        goto yy495;
-                       case 54:        goto yy497;
-                       case 55:        goto yy499;
-                       case 56:        goto yy501;
-                       case 57:        goto yy509;
-                       case 58:        goto yy513;
-                       case 59:        goto yy517;
-                       case 60:        goto yy519;
-                       case 61:        goto yy524;
-                       case 62:        goto yy529;
-                       case 63:        goto yy531;
-                       case 64:        goto yy536;
-                       case 65:        goto yy538;
-                       case 66:        goto yy540;
-                       case 67:        goto yy544;
-                       case 68:        goto yy549;
-                       case 69:        goto yy552;
-                       case 70:        goto yy554;
-                       case 71:        goto yy556;
-                       case 72:        goto yy558;
-                       case 73:        goto yy563;
-                       case 74:        goto yy565;
-                       case 75:        goto yy574;
-                       case 76:        goto yy576;
-                       case 77:        goto yy578;
-                       case 78:        goto yy580;
-                       case 79:        goto yy585;
-                       case 80:        goto yy587;
-                       case 81:        goto yy595;
-                       case 82:        goto yy599;
-                       case 83:        goto yy603;
-                       case 84:        goto yy607;
-                       case 85:        goto yy609;
-                       default:        goto yy614;
+                       case 13:        goto yy272;
+                       case 14:        goto yy305;
+                       case 15:        goto yy307;
+                       case 16:        goto yy313;
+                       case 17:        goto yy321;
+                       case 18:        goto yy333;
+                       case 19:        goto yy341;
+                       case 20:        goto yy345;
+                       case 21:        goto yy352;
+                       case 22:        goto yy354;
+                       case 23:        goto yy358;
+                       case 24:        goto yy365;
+                       case 25:        goto yy367;
+                       case 26:        goto yy378;
+                       case 27:        goto yy381;
+                       case 28:        goto yy388;
+                       case 29:        goto yy391;
+                       case 30:        goto yy393;
+                       case 31:        goto yy395;
+                       case 32:        goto yy399;
+                       case 33:        goto yy404;
+                       case 34:        goto yy422;
+                       case 35:        goto yy430;
+                       case 36:        goto yy433;
+                       case 37:        goto yy440;
+                       case 38:        goto yy450;
+                       case 39:        goto yy454;
+                       case 40:        goto yy459;
+                       case 41:        goto yy461;
+                       case 42:        goto yy465;
+                       case 43:        goto yy468;
+                       case 44:        goto yy470;
+                       case 45:        goto yy472;
+                       case 46:        goto yy477;
+                       case 47:        goto yy479;
+                       case 48:        goto yy481;
+                       case 49:        goto yy483;
+                       case 50:        goto yy485;
+                       case 51:        goto yy490;
+                       case 52:        goto yy500;
+                       case 53:        goto yy505;
+                       case 54:        goto yy507;
+                       case 55:        goto yy509;
+                       case 56:        goto yy511;
+                       case 57:        goto yy513;
+                       case 58:        goto yy522;
+                       case 59:        goto yy526;
+                       case 60:        goto yy530;
+                       case 61:        goto yy532;
+                       case 62:        goto yy537;
+                       case 63:        goto yy542;
+                       case 64:        goto yy544;
+                       case 65:        goto yy550;
+                       case 66:        goto yy552;
+                       case 67:        goto yy554;
+                       case 68:        goto yy558;
+                       case 69:        goto yy563;
+                       case 70:        goto yy567;
+                       case 71:        goto yy569;
+                       case 72:        goto yy571;
+                       case 73:        goto yy573;
+                       case 74:        goto yy578;
+                       case 75:        goto yy580;
+                       case 76:        goto yy586;
+                       case 77:        goto yy591;
+                       case 78:        goto yy593;
+                       case 79:        goto yy595;
+                       case 80:        goto yy597;
+                       case 81:        goto yy599;
+                       case 82:        goto yy604;
+                       case 83:        goto yy606;
+                       case 84:        goto yy614;
+                       case 85:        goto yy618;
+                       case 86:        goto yy622;
+                       case 87:        goto yy626;
+                       case 88:        goto yy628;
+                       default:        goto yy633;
                        }
 yy115:
                        yych = *++cur;
@@ -1527,7 +1514,6 @@ yy116:
                        mrk = ++cur;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
-                       ctxmrk = cur;
                        switch (yych) {
                        case '0':
                        case '1':
@@ -1550,23 +1536,22 @@ yy116:
 yy118:
 #line 314 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT; goto start; }
-#line 1554 "src/parser.c"
+#line 1540 "src/parser.c"
 yy119:
                        ++cur;
 #line 328 "src/parser.re"
                        { goto comment; }
-#line 1559 "src/parser.c"
+#line 1545 "src/parser.c"
 yy121:
                        ++cur;
 #line 329 "src/parser.re"
                        { goto comment_sl; }
-#line 1564 "src/parser.c"
+#line 1550 "src/parser.c"
 yy123:
                        yyaccept = 6;
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
-                       ctxmrk = cur;
                        switch (yych) {
                        case '0':
                        case '1':
@@ -1592,7 +1577,7 @@ yy125:
                        ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
-                       ctxmrk = cur;
+yy126:
                        switch (yych) {
                        case '0':
                        case '1':
@@ -1636,22 +1621,22 @@ yy128:
                        default:        goto yy129;
                        }
 yy129:
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 310 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 1643 "src/parser.c"
+#line 1628 "src/parser.c"
 yy130:
-                       ++cur;
-                       switch ((yych = *cur)) {
+                       yych = *++cur;
+                       switch (yych) {
                        case 'L':
                        case 'l':       goto yy218;
                        default:        goto yy131;
                        }
 yy131:
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 309 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_U; cur += 1; goto start; }
-#line 1655 "src/parser.c"
+#line 1640 "src/parser.c"
 yy132:
                        yych = *++cur;
                        switch (yych) {
@@ -1757,27 +1742,27 @@ yy135:
                        ++cur;
 #line 358 "src/parser.re"
                        { NEWTOKEN(PSI_T_LSHIFT); goto start; }
-#line 1761 "src/parser.c"
+#line 1746 "src/parser.c"
 yy137:
                        ++cur;
 #line 360 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_LE); goto start; }
-#line 1766 "src/parser.c"
+#line 1751 "src/parser.c"
 yy139:
                        ++cur;
 #line 343 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_EQ); goto start; }
-#line 1771 "src/parser.c"
+#line 1756 "src/parser.c"
 yy141:
                        ++cur;
 #line 361 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_GE); goto start; }
-#line 1776 "src/parser.c"
+#line 1761 "src/parser.c"
 yy143:
                        ++cur;
 #line 359 "src/parser.re"
                        { NEWTOKEN(PSI_T_RSHIFT); goto start; }
-#line 1781 "src/parser.c"
+#line 1766 "src/parser.c"
 yy145:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2034,9 +2019,9 @@ yy158:
                        default:        goto yy61;
                        }
 yy159:
-#line 396 "src/parser.re"
+#line 399 "src/parser.re"
                        { NEWTOKEN(PSI_T_IF); goto start; }
-#line 2040 "src/parser.c"
+#line 2025 "src/parser.c"
 yy160:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2049,10 +2034,10 @@ yy160:
                        }
 yy161:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 326 "src/parser.re"
                        { char_width = SIZEOF_WCHAR_T/8; }
-#line 2056 "src/parser.c"
+#line 2041 "src/parser.c"
 yy163:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2168,10 +2153,10 @@ yy176:
                        }
 yy177:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 325 "src/parser.re"
                        { char_width = 4; }
-#line 2175 "src/parser.c"
+#line 2160 "src/parser.c"
 yy179:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2270,16 +2255,17 @@ yy182:
                        default:        goto yy182;
                        }
 yy184:
-#line 446 "src/parser.re"
+#line 449 "src/parser.re"
                        { NEWTOKEN(PSI_T_NSNAME); goto start; }
-#line 2276 "src/parser.c"
+#line 2261 "src/parser.c"
 yy185:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'a':       goto yy261;
                        case 'e':       goto yy262;
-                       case 'r':       goto yy263;
+                       case 'i':       goto yy263;
+                       case 'r':       goto yy264;
                        default:        goto yy62;
                        }
 yy186:
@@ -2287,14 +2273,14 @@ yy186:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':       goto yy224;
-                       case 'o':       goto yy264;
+                       case 'o':       goto yy265;
                        default:        goto yy62;
                        }
 yy187:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy265;
+                       case 'a':       goto yy266;
                        default:        goto yy62;
                        }
 yy188:
@@ -2303,14 +2289,14 @@ yy188:
                        switch (yych) {
                        case 'U':
                        case 'u':       goto yy226;
-                       case 'n':       goto yy266;
+                       case 'n':       goto yy267;
                        default:        goto yy62;
                        }
 yy189:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'u':       goto yy267;
+                       case 'u':       goto yy268;
                        default:        goto yy62;
                        }
 yy190:
@@ -2319,7 +2305,7 @@ yy190:
                        switch (yych) {
                        case 'D':
                        case 'd':       goto yy230;
-                       case 'u':       goto yy268;
+                       case 'u':       goto yy269;
                        default:        goto yy62;
                        }
 yy191:
@@ -2327,7 +2313,7 @@ yy191:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':       goto yy233;
-                       case 'o':       goto yy269;
+                       case 'o':       goto yy270;
                        default:        goto yy62;
                        }
 yy192:
@@ -2337,7 +2323,7 @@ yy192:
                        case 'C':
                        case 'c':       goto yy238;
                        case 'T':       goto yy239;
-                       case 't':       goto yy270;
+                       case 't':       goto yy271;
                        default:        goto yy62;
                        }
 yy193:
@@ -2346,14 +2332,14 @@ yy193:
                        switch (yych) {
                        case 'B':
                        case 'b':       goto yy242;
-                       case 'n':       goto yy272;
+                       case 'n':       goto yy273;
                        default:        goto yy62;
                        }
 yy194:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy273;
+                       case 'n':       goto yy274;
                        default:        goto yy62;
                        }
 yy195:
@@ -2362,21 +2348,22 @@ yy195:
                        switch (yych) {
                        case 'E':
                        case 'e':       goto yy249;
-                       case 'a':       goto yy274;
+                       case 'a':       goto yy275;
                        default:        goto yy62;
                        }
 yy196:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy275;
+                       case 'o':       goto yy276;
                        default:        goto yy62;
                        }
 yy197:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy276;
+                       case 'g':       goto yy277;
+                       case 'z':       goto yy278;
                        default:        goto yy62;
                        }
 yy198:
@@ -2386,35 +2373,34 @@ yy198:
                        case 'A':
                        case 'a':       goto yy253;
                        case 'R':       goto yy254;
-                       case 'r':       goto yy277;
+                       case 'r':       goto yy279;
                        default:        goto yy62;
                        }
 yy199:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'p':       goto yy278;
+                       case 'p':       goto yy280;
                        default:        goto yy62;
                        }
 yy200:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 324 "src/parser.re"
                        { char_width = 2; }
-#line 2405 "src/parser.c"
+#line 2392 "src/parser.c"
 yy202:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
-                       ctxmrk = cur;
                        switch (yych) {
-                       case '"':       goto yy279;
+                       case '"':       goto yy281;
                        default:        goto yy62;
                        }
 yy203:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy281;
+                       case 'n':       goto yy283;
                        default:        goto yy62;
                        }
 yy204:
@@ -2423,69 +2409,70 @@ yy204:
                        switch (yych) {
                        case 'D':
                        case 'd':       goto yy258;
-                       case 'i':       goto yy282;
-                       case 's':       goto yy283;
+                       case 'i':       goto yy284;
+                       case 's':       goto yy285;
                        default:        goto yy62;
                        }
 yy205:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy284;
+                       case 'i':       goto yy286;
+                       case 'l':       goto yy287;
                        default:        goto yy62;
                        }
 yy206:
                        ++cur;
 #line 345 "src/parser.re"
                        { NEWTOKEN(PSI_T_OR); goto start; }
-#line 2442 "src/parser.c"
+#line 2429 "src/parser.c"
 yy208:
                        ++cur;
 #line 365 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELLIPSIS); goto start; }
-#line 2447 "src/parser.c"
+#line 2434 "src/parser.c"
 yy210:
                        yych = *++cur;
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy285;
+                       case 'd':       goto yy288;
                        case 'F':
-                       case 'f':       goto yy287;
+                       case 'f':       goto yy290;
                        case 'L':
-                       case 'l':       goto yy289;
+                       case 'l':       goto yy292;
                        default:        goto yy114;
                        }
 yy211:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 315 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_F; cur += 1; goto start; }
-#line 2464 "src/parser.c"
+#line 2451 "src/parser.c"
 yy213:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 316 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 2470 "src/parser.c"
+#line 2457 "src/parser.c"
 yy215:
                        yych = *++cur;
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy291;
+                       case 'u':       goto yy294;
                        default:        goto yy114;
                        }
 yy216:
                        ++cur;
 yy217:
-                       cur = ctxmrk;
+                       cur -= 2;
 #line 311 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_UL; cur += 2; goto start; }
-#line 2484 "src/parser.c"
+#line 2471 "src/parser.c"
 yy218:
                        yych = *++cur;
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy291;
+                       case 'l':       goto yy294;
                        default:        goto yy217;
                        }
 yy219:
@@ -2493,9 +2480,8 @@ yy219:
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
-                       ctxmrk = cur;
                        switch (yych) {
-                       case '.':       goto yy293;
+                       case '.':       goto yy296;
                        case '0':
                        case '1':
                        case '2':
@@ -2528,17 +2514,17 @@ yy219:
                        }
 yy221:
                        ++cur;
-#line 448 "src/parser.re"
+#line 451 "src/parser.re"
                        { tok += 1; cur -= 1; NEWTOKEN(PSI_T_CPP_HEADER); cur += 1; goto start; }
-#line 2534 "src/parser.c"
+#line 2520 "src/parser.c"
 yy223:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy295;
+                       case 'a':       goto yy298;
                        case 'V':
-                       case 'v':       goto yy296;
+                       case 'v':       goto yy299;
                        default:        goto yy62;
                        }
 yy224:
@@ -2546,7 +2532,7 @@ yy224:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy297;
+                       case 'l':       goto yy300;
                        default:        goto yy62;
                        }
 yy225:
@@ -2554,7 +2540,7 @@ yy225:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy298;
+                       case 'l':       goto yy301;
                        default:        goto yy62;
                        }
 yy226:
@@ -2562,7 +2548,7 @@ yy226:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy299;
+                       case 'n':       goto yy302;
                        default:        goto yy62;
                        }
 yy227:
@@ -2570,7 +2556,7 @@ yy227:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy300;
+                       case 'i':       goto yy303;
                        default:        goto yy62;
                        }
 yy228:
@@ -2578,7 +2564,7 @@ yy228:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy301;
+                       case 'f':       goto yy304;
                        default:        goto yy62;
                        }
 yy229:
@@ -2586,7 +2572,7 @@ yy229:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy303;
+                       case 'e':       goto yy306;
                        default:        goto yy62;
                        }
 yy230:
@@ -2594,7 +2580,7 @@ yy230:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy305;
+                       case 'i':       goto yy308;
                        default:        goto yy62;
                        }
 yy231:
@@ -2602,7 +2588,7 @@ yy231:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy306;
+                       case 'o':       goto yy309;
                        default:        goto yy62;
                        }
 yy232:
@@ -2610,7 +2596,7 @@ yy232:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy307;
+                       case 's':       goto yy310;
                        default:        goto yy62;
                        }
 yy233:
@@ -2618,7 +2604,7 @@ yy233:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy308;
+                       case 'a':       goto yy311;
                        default:        goto yy62;
                        }
 yy234:
@@ -2626,7 +2612,7 @@ yy234:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy309;
+                       case 'e':       goto yy312;
                        default:        goto yy62;
                        }
 yy235:
@@ -2634,7 +2620,7 @@ yy235:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy311;
+                       case 'c':       goto yy314;
                        default:        goto yy62;
                        }
 yy236:
@@ -2642,7 +2628,7 @@ yy236:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy312;
+                       case 'e':       goto yy315;
                        default:        goto yy62;
                        }
 yy237:
@@ -2650,7 +2636,7 @@ yy237:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy313;
+                       case 'd':       goto yy316;
                        default:        goto yy62;
                        }
 yy238:
@@ -2658,7 +2644,7 @@ yy238:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy314;
+                       case 'l':       goto yy317;
                        default:        goto yy62;
                        }
 yy239:
@@ -2666,7 +2652,7 @@ yy239:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy315;
+                       case 'v':       goto yy318;
                        default:        goto yy62;
                        }
 yy240:
@@ -2741,9 +2727,9 @@ yy240:
                        default:        goto yy61;
                        }
 yy241:
-#line 421 "src/parser.re"
+#line 424 "src/parser.re"
                        { NEWTOKEN(PSI_T_LET); goto start; }
-#line 2747 "src/parser.c"
+#line 2733 "src/parser.c"
 yy242:
                        yyaccept = 11;
                        yych = *(mrk = ++cur);
@@ -2816,15 +2802,15 @@ yy242:
                        default:        goto yy61;
                        }
 yy243:
-#line 420 "src/parser.re"
+#line 423 "src/parser.re"
                        { NEWTOKEN(PSI_T_LIB); goto start; }
-#line 2822 "src/parser.c"
+#line 2808 "src/parser.c"
 yy244:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy316;
+                       case 'e':       goto yy319;
                        default:        goto yy62;
                        }
 yy245:
@@ -2832,7 +2818,7 @@ yy245:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy317;
+                       case 'l':       goto yy320;
                        default:        goto yy62;
                        }
 yy246:
@@ -2840,9 +2826,9 @@ yy246:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy319;
+                       case 'e':       goto yy322;
                        case 'V':
-                       case 'v':       goto yy320;
+                       case 'v':       goto yy323;
                        default:        goto yy62;
                        }
 yy247:
@@ -2850,7 +2836,7 @@ yy247:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'H':
-                       case 'h':       goto yy321;
+                       case 'h':       goto yy324;
                        default:        goto yy62;
                        }
 yy248:
@@ -2858,14 +2844,14 @@ yy248:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy322;
+                       case 't':       goto yy325;
                        default:        goto yy62;
                        }
 yy249:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy323;
+                       case '_':       goto yy326;
                        default:        goto yy62;
                        }
 yy250:
@@ -2873,7 +2859,7 @@ yy250:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy324;
+                       case 'u':       goto yy327;
                        default:        goto yy62;
                        }
 yy251:
@@ -2948,15 +2934,15 @@ yy251:
                        default:        goto yy61;
                        }
 yy252:
-#line 422 "src/parser.re"
+#line 425 "src/parser.re"
                        { NEWTOKEN(PSI_T_SET); goto start; }
-#line 2954 "src/parser.c"
+#line 2940 "src/parser.c"
 yy253:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy325;
+                       case 't':       goto yy328;
                        default:        goto yy62;
                        }
 yy254:
@@ -2964,11 +2950,11 @@ yy254:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy326;
+                       case 'i':       goto yy329;
                        case 'L':
-                       case 'l':       goto yy327;
+                       case 'l':       goto yy330;
                        case 'V':
-                       case 'v':       goto yy328;
+                       case 'v':       goto yy331;
                        default:        goto yy62;
                        }
 yy255:
@@ -2976,7 +2962,7 @@ yy255:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'P':
-                       case 'p':       goto yy329;
+                       case 'p':       goto yy332;
                        default:        goto yy62;
                        }
 yy256:
@@ -2984,17 +2970,17 @@ yy256:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy331;
+                       case 'a':       goto yy334;
                        case 'B':
-                       case 'b':       goto yy332;
+                       case 'b':       goto yy335;
                        case 'F':
-                       case 'f':       goto yy333;
+                       case 'f':       goto yy336;
                        case 'I':
-                       case 'i':       goto yy334;
+                       case 'i':       goto yy337;
                        case 'O':
-                       case 'o':       goto yy335;
+                       case 'o':       goto yy338;
                        case 'S':
-                       case 's':       goto yy336;
+                       case 's':       goto yy339;
                        default:        goto yy62;
                        }
 yy257:
@@ -3002,7 +2988,7 @@ yy257:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy337;
+                       case 'e':       goto yy340;
                        default:        goto yy62;
                        }
 yy258:
@@ -3010,7 +2996,7 @@ yy258:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy339;
+                       case 'e':       goto yy342;
                        default:        goto yy62;
                        }
 yy259:
@@ -3018,7 +3004,7 @@ yy259:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy340;
+                       case 'n':       goto yy343;
                        default:        goto yy62;
                        }
 yy260:
@@ -3026,76 +3012,83 @@ yy260:
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy341;
+                       case 'l':       goto yy344;
                        default:        goto yy62;
                        }
 yy261:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy343;
-                       case 't':       goto yy344;
+                       case 's':       goto yy346;
+                       case 't':       goto yy347;
                        default:        goto yy62;
                        }
 yy262:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'x':       goto yy345;
+                       case 'x':       goto yy348;
                        default:        goto yy62;
                        }
 yy263:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy346;
+                       case 'n':       goto yy349;
                        default:        goto yy62;
                        }
 yy264:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':       goto yy297;
-                       case 'l':       goto yy347;
+                       case 'e':       goto yy350;
                        default:        goto yy62;
                        }
 yy265:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy349;
+                       case 'L':       goto yy300;
+                       case 'l':       goto yy351;
                        default:        goto yy62;
                        }
 yy266:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy351;
+                       case 'r':       goto yy353;
                        default:        goto yy62;
                        }
 yy267:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'b':       goto yy352;
+                       case 's':       goto yy355;
                        default:        goto yy62;
                        }
 yy268:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy353;
+                       case 'b':       goto yy356;
                        default:        goto yy62;
                        }
 yy269:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':       goto yy308;
-                       case 'a':       goto yy355;
+                       case 'm':       goto yy357;
                        default:        goto yy62;
                        }
 yy270:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':       goto yy311;
+                       case 'a':       goto yy359;
+                       default:        goto yy62;
+                       }
+yy271:
                        yyaccept = 13;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3162,134 +3155,148 @@ yy270:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy271;
-                       case '1':       goto yy356;
-                       case '3':       goto yy357;
-                       case '6':       goto yy358;
-                       case '8':       goto yy359;
+                       case 0x7F:      goto yy272;
+                       case '1':       goto yy360;
+                       case '3':       goto yy361;
+                       case '6':       goto yy362;
+                       case '8':       goto yy363;
                        case 'V':
-                       case 'v':       goto yy315;
+                       case 'v':       goto yy318;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy271:
-#line 382 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT); goto start; }
-#line 3179 "src/parser.c"
 yy272:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'e':       goto yy360;
-                       default:        goto yy62;
-                       }
+#line 385 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT); goto start; }
+#line 3172 "src/parser.c"
 yy273:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy362;
+                       case 'e':       goto yy364;
                        default:        goto yy62;
                        }
 yy274:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy364;
+                       case 'g':       goto yy366;
                        default:        goto yy62;
                        }
 yy275:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy365;
+                       case 'g':       goto yy368;
                        default:        goto yy62;
                        }
 yy276:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy366;
+                       case 'r':       goto yy369;
                        default:        goto yy62;
                        }
 yy277:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy370;
+                       default:        goto yy62;
+                       }
+yy278:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy371;
+                       default:        goto yy62;
+                       }
+yy279:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy326;
+                       case 'i':       goto yy329;
                        case 'L':
-                       case 'l':       goto yy327;
+                       case 'l':       goto yy330;
                        case 'V':
-                       case 'v':       goto yy328;
-                       case 'u':       goto yy367;
+                       case 'v':       goto yy331;
+                       case 'u':       goto yy372;
                        default:        goto yy62;
                        }
-yy278:
+yy280:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy368;
+                       case 'e':       goto yy373;
                        default:        goto yy62;
                        }
-yy279:
+yy281:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 1;
 #line 323 "src/parser.re"
                        { char_width = 1; }
 #line 3240 "src/parser.c"
-yy281:
+yy283:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy369;
+                       case 't':       goto yy374;
                        default:        goto yy62;
                        }
-yy282:
+yy284:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy370;
+                       case 'o':       goto yy375;
                        default:        goto yy62;
                        }
-yy283:
+yy285:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy371;
+                       case 'i':       goto yy376;
                        default:        goto yy62;
                        }
-yy284:
+yy286:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy372;
+                       case 'd':       goto yy377;
                        default:        goto yy62;
                        }
-yy285:
+yy287:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'a':       goto yy379;
+                       default:        goto yy62;
+                       }
+yy288:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 2;
 #line 318 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DD; cur += 2; goto start; }
-#line 3274 "src/parser.c"
-yy287:
+#line 3281 "src/parser.c"
+yy290:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 2;
 #line 317 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DF; cur += 2; goto start; }
-#line 3280 "src/parser.c"
-yy289:
+#line 3287 "src/parser.c"
+yy292:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 2;
 #line 319 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DL; cur += 2; goto start; }
-#line 3286 "src/parser.c"
-yy291:
+#line 3293 "src/parser.c"
+yy294:
                        ++cur;
-                       cur = ctxmrk;
+                       cur -= 3;
 #line 312 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_ULL; cur += 3; goto start; }
-#line 3292 "src/parser.c"
-yy293:
+#line 3299 "src/parser.c"
+yy296:
                        ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -3315,64 +3322,64 @@ yy293:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy293;
+                       case 'f':       goto yy296;
                        case 'P':
                        case 'p':       goto yy127;
                        default:        goto yy114;
                        }
-yy295:
+yy298:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy374;
+                       case 'y':       goto yy380;
                        default:        goto yy62;
                        }
-yy296:
+yy299:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy376;
+                       case 'a':       goto yy382;
                        default:        goto yy62;
                        }
-yy297:
+yy300:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy377;
+                       case 'v':       goto yy383;
                        default:        goto yy62;
                        }
-yy298:
+yy301:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy378;
+                       case 'a':       goto yy384;
                        case 'B':
-                       case 'b':       goto yy379;
+                       case 'b':       goto yy385;
                        case 'O':
-                       case 'o':       goto yy380;
+                       case 'o':       goto yy386;
                        default:        goto yy62;
                        }
-yy299:
+yy302:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy381;
+                       case 't':       goto yy387;
                        default:        goto yy62;
                        }
-yy300:
+yy303:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy383;
+                       case 'n':       goto yy389;
                        default:        goto yy62;
                        }
-yy301:
+yy304:
                        yyaccept = 14;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3439,15 +3446,15 @@ yy301:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy302;
+                       case 0x7F:      goto yy305;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy302:
-#line 400 "src/parser.re"
+yy305:
+#line 403 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELIF); goto start; }
-#line 3450 "src/parser.c"
-yy303:
+#line 3457 "src/parser.c"
+yy306:
                        yyaccept = 15;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3514,47 +3521,47 @@ yy303:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy304;
+                       case 0x7F:      goto yy307;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy304:
-#line 399 "src/parser.re"
+yy307:
+#line 402 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELSE); goto start; }
-#line 3525 "src/parser.c"
-yy305:
+#line 3532 "src/parser.c"
+yy308:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy384;
+                       case 'f':       goto yy390;
                        default:        goto yy62;
                        }
-yy306:
+yy309:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy386;
+                       case 'r':       goto yy392;
                        default:        goto yy62;
                        }
-yy307:
+yy310:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy388;
+                       case 'e':       goto yy394;
                        default:        goto yy62;
                        }
-yy308:
+yy311:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy390;
+                       case 't':       goto yy396;
                        default:        goto yy62;
                        }
-yy309:
+yy312:
                        yyaccept = 16;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3621,63 +3628,63 @@ yy309:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy310;
+                       case 0x7F:      goto yy313;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy310:
-#line 426 "src/parser.re"
+yy313:
+#line 429 "src/parser.re"
                        { NEWTOKEN(PSI_T_FREE); goto start; }
-#line 3632 "src/parser.c"
-yy311:
+#line 3639 "src/parser.c"
+yy314:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy391;
+                       case 't':       goto yy397;
                        default:        goto yy62;
                        }
-yy312:
+yy315:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy392;
+                       case 'f':       goto yy398;
                        default:        goto yy62;
                        }
-yy313:
+yy316:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy394;
+                       case 'e':       goto yy400;
                        default:        goto yy62;
                        }
-yy314:
+yy317:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy395;
+                       case 'u':       goto yy401;
                        default:        goto yy62;
                        }
-yy315:
+yy318:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy396;
+                       case 'a':       goto yy402;
                        default:        goto yy62;
                        }
-yy316:
+yy319:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy397;
+                       case 'd':       goto yy403;
                        default:        goto yy62;
                        }
-yy317:
+yy320:
                        yyaccept = 17;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3744,94 +3751,94 @@ yy317:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy318;
+                       case 0x7F:      goto yy321;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy318:
-#line 411 "src/parser.re"
+yy321:
+#line 414 "src/parser.re"
                        { NEWTOKEN(PSI_T_NULL); goto start; }
-#line 3755 "src/parser.c"
-yy319:
+#line 3762 "src/parser.c"
+yy322:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy399;
+                       case 'c':       goto yy405;
                        default:        goto yy62;
                        }
-yy320:
+yy323:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy400;
+                       case 'a':       goto yy406;
                        default:        goto yy62;
                        }
-yy321:
+yy324:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy401;
+                       case 'v':       goto yy407;
                        default:        goto yy62;
                        }
-yy322:
+yy325:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy402;
+                       case '_':       goto yy408;
                        default:        goto yy62;
                        }
-yy323:
+yy326:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy403;
+                       case 'a':       goto yy409;
                        default:        goto yy62;
                        }
-yy324:
+yy327:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy404;
+                       case 'r':       goto yy410;
                        default:        goto yy62;
                        }
-yy325:
+yy328:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy405;
+                       case 'i':       goto yy411;
                        default:        goto yy62;
                        }
-yy326:
+yy329:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy406;
+                       case 'n':       goto yy412;
                        default:        goto yy62;
                        }
-yy327:
+yy330:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy407;
+                       case 'e':       goto yy413;
                        default:        goto yy62;
                        }
-yy328:
+yy331:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy408;
+                       case 'a':       goto yy414;
                        default:        goto yy62;
                        }
-yy329:
+yy332:
                        yyaccept = 18;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -3898,63 +3905,63 @@ yy329:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy330;
+                       case 0x7F:      goto yy333;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy330:
-#line 427 "src/parser.re"
+yy333:
+#line 430 "src/parser.re"
                        { NEWTOKEN(PSI_T_TEMP); goto start; }
-#line 3909 "src/parser.c"
-yy331:
+#line 3916 "src/parser.c"
+yy334:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy409;
+                       case 'r':       goto yy415;
                        default:        goto yy62;
                        }
-yy332:
+yy335:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy410;
+                       case 'o':       goto yy416;
                        default:        goto yy62;
                        }
-yy333:
+yy336:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy411;
+                       case 'l':       goto yy417;
                        default:        goto yy62;
                        }
-yy334:
+yy337:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy412;
+                       case 'n':       goto yy418;
                        default:        goto yy62;
                        }
-yy335:
+yy338:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy413;
+                       case 'b':       goto yy419;
                        default:        goto yy62;
                        }
-yy336:
+yy339:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy414;
+                       case 't':       goto yy420;
                        default:        goto yy62;
                        }
-yy337:
+yy340:
                        yyaccept = 19;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4021,31 +4028,31 @@ yy337:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy338;
+                       case 0x7F:      goto yy341;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy338:
-#line 409 "src/parser.re"
+yy341:
+#line 412 "src/parser.re"
                        { NEWTOKEN(PSI_T_TRUE); goto start; }
-#line 4032 "src/parser.c"
-yy339:
+#line 4039 "src/parser.c"
+yy342:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy415;
+                       case 'f':       goto yy421;
                        default:        goto yy62;
                        }
-yy340:
+yy343:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy417;
+                       case 'i':       goto yy423;
                        default:        goto yy62;
                        }
-yy341:
+yy344:
                        yyaccept = 20;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4112,43 +4119,50 @@ yy341:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy342;
+                       case 0x7F:      goto yy345;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy342:
-#line 436 "src/parser.re"
+yy345:
+#line 439 "src/parser.re"
                        { NEWTOKEN(PSI_T_ZVAL); goto start; }
-#line 4123 "src/parser.c"
-yy343:
+#line 4130 "src/parser.c"
+yy346:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy418;
+                       case 'm':       goto yy424;
                        default:        goto yy62;
                        }
-yy344:
+yy347:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy419;
+                       case 't':       goto yy425;
                        default:        goto yy62;
                        }
-yy345:
+yy348:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy420;
+                       case 't':       goto yy426;
                        default:        goto yy62;
                        }
-yy346:
+yy349:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy421;
+                       case 'l':       goto yy427;
                        default:        goto yy62;
                        }
-yy347:
+yy350:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 's':       goto yy428;
+                       default:        goto yy62;
+                       }
+yy351:
                        yyaccept = 21;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4215,17 +4229,17 @@ yy347:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy348;
+                       case 0x7F:      goto yy352;
                        case 'V':
-                       case 'v':       goto yy377;
+                       case 'v':       goto yy383;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy348:
-#line 379 "src/parser.re"
+yy352:
+#line 382 "src/parser.re"
                        { NEWTOKEN(PSI_T_BOOL); goto start; }
-#line 4228 "src/parser.c"
-yy349:
+#line 4242 "src/parser.c"
+yy353:
                        yyaccept = 22;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4292,29 +4306,29 @@ yy349:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy350;
+                       case 0x7F:      goto yy354;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy350:
-#line 380 "src/parser.re"
+yy354:
+#line 383 "src/parser.re"
                        { NEWTOKEN(PSI_T_CHAR); goto start; }
-#line 4303 "src/parser.c"
-yy351:
+#line 4317 "src/parser.c"
+yy355:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy422;
+                       case 't':       goto yy429;
                        default:        goto yy62;
                        }
-yy352:
+yy356:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'l':       goto yy424;
+                       case 'l':       goto yy431;
                        default:        goto yy62;
                        }
-yy353:
+yy357:
                        yyaccept = 23;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4381,51 +4395,51 @@ yy353:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy354;
+                       case 0x7F:      goto yy358;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy354:
-#line 376 "src/parser.re"
+yy358:
+#line 379 "src/parser.re"
                        { NEWTOKEN(PSI_T_ENUM); goto start; }
-#line 4392 "src/parser.c"
-yy355:
+#line 4406 "src/parser.c"
+yy359:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':       goto yy390;
-                       case 't':       goto yy425;
+                       case 'T':       goto yy396;
+                       case 't':       goto yy432;
                        default:        goto yy62;
                        }
-yy356:
+yy360:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '6':       goto yy427;
+                       case '6':       goto yy434;
                        default:        goto yy62;
                        }
-yy357:
+yy361:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '2':       goto yy428;
+                       case '2':       goto yy435;
                        default:        goto yy62;
                        }
-yy358:
+yy362:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '4':       goto yy429;
+                       case '4':       goto yy436;
                        default:        goto yy62;
                        }
-yy359:
+yy363:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy430;
+                       case '_':       goto yy437;
                        default:        goto yy62;
                        }
-yy360:
+yy364:
                        yyaccept = 24;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4492,15 +4506,15 @@ yy360:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy361;
+                       case 0x7F:      goto yy365;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy361:
-#line 372 "src/parser.re"
+yy365:
+#line 375 "src/parser.re"
                        { NEWTOKEN(PSI_T_LINE); goto start; }
-#line 4503 "src/parser.c"
-yy362:
+#line 4517 "src/parser.c"
+yy366:
                        yyaccept = 25;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4567,74 +4581,81 @@ yy362:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy363;
+                       case 0x7F:      goto yy367;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy363:
-#line 383 "src/parser.re"
+yy367:
+#line 386 "src/parser.re"
                        { NEWTOKEN(PSI_T_LONG); goto start; }
-#line 4578 "src/parser.c"
-yy364:
+#line 4592 "src/parser.c"
+yy368:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy431;
+                       case 'm':       goto yy438;
                        default:        goto yy62;
                        }
-yy365:
+yy369:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy432;
+                       case 't':       goto yy439;
                        default:        goto yy62;
                        }
-yy366:
+yy370:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy434;
+                       case 'e':       goto yy441;
                        default:        goto yy62;
                        }
-yy367:
+yy371:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'c':       goto yy435;
+                       case 'o':       goto yy442;
                        default:        goto yy62;
                        }
-yy368:
+yy372:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy436;
+                       case 'c':       goto yy443;
                        default:        goto yy62;
                        }
-yy369:
+yy373:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '1':       goto yy437;
-                       case '3':       goto yy438;
-                       case '6':       goto yy439;
-                       case '8':       goto yy440;
+                       case 'd':       goto yy444;
                        default:        goto yy62;
                        }
-yy370:
+yy374:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy441;
+                       case '1':       goto yy445;
+                       case '3':       goto yy446;
+                       case '6':       goto yy447;
+                       case '8':       goto yy448;
                        default:        goto yy62;
                        }
-yy371:
+yy375:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy443;
+                       case 'n':       goto yy449;
                        default:        goto yy62;
                        }
-yy372:
+yy376:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'g':       goto yy451;
+                       default:        goto yy62;
+                       }
+yy377:
                        yyaccept = 26;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4701,15 +4722,22 @@ yy372:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy373;
+                       case 0x7F:      goto yy378;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy373:
-#line 378 "src/parser.re"
+yy378:
+#line 381 "src/parser.re"
                        { NEWTOKEN(PSI_T_VOID); goto start; }
-#line 4712 "src/parser.c"
-yy374:
+#line 4733 "src/parser.c"
+yy379:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy452;
+                       default:        goto yy62;
+                       }
+yy380:
                        yyaccept = 27;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4776,55 +4804,55 @@ yy374:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy375;
+                       case 0x7F:      goto yy381;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy375:
-#line 415 "src/parser.re"
+yy381:
+#line 418 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRAY); goto start; }
-#line 4787 "src/parser.c"
-yy376:
+#line 4815 "src/parser.c"
+yy382:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy444;
+                       case 'l':       goto yy453;
                        default:        goto yy62;
                        }
-yy377:
+yy383:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy446;
+                       case 'a':       goto yy455;
                        default:        goto yy62;
                        }
-yy378:
+yy384:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy447;
+                       case 'b':       goto yy456;
                        default:        goto yy62;
                        }
-yy379:
+yy385:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy448;
+                       case 'a':       goto yy457;
                        default:        goto yy62;
                        }
-yy380:
+yy386:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy449;
+                       case 'c':       goto yy458;
                        default:        goto yy62;
                        }
-yy381:
+yy387:
                        yyaccept = 28;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4891,23 +4919,23 @@ yy381:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy382;
+                       case 0x7F:      goto yy388;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy382:
-#line 437 "src/parser.re"
+yy388:
+#line 440 "src/parser.re"
                        { NEWTOKEN(PSI_T_COUNT); goto start; }
-#line 4902 "src/parser.c"
-yy383:
+#line 4930 "src/parser.c"
+yy389:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy451;
+                       case 'e':       goto yy460;
                        default:        goto yy62;
                        }
-yy384:
+yy390:
                        yyaccept = 29;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -4974,15 +5002,15 @@ yy384:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy385;
+                       case 0x7F:      goto yy391;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy385:
-#line 401 "src/parser.re"
+yy391:
+#line 404 "src/parser.re"
                        { NEWTOKEN(PSI_T_ENDIF); goto start; }
-#line 4985 "src/parser.c"
-yy386:
+#line 5013 "src/parser.c"
+yy392:
                        yyaccept = 30;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5049,15 +5077,15 @@ yy386:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy387;
+                       case 0x7F:      goto yy393;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy387:
-#line 406 "src/parser.re"
+yy393:
+#line 409 "src/parser.re"
                        { NEWTOKEN(PSI_T_ERROR); goto start; }
-#line 5060 "src/parser.c"
-yy388:
+#line 5088 "src/parser.c"
+yy394:
                        yyaccept = 31;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5124,31 +5152,31 @@ yy388:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy389;
+                       case 0x7F:      goto yy395;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy389:
-#line 410 "src/parser.re"
+yy395:
+#line 413 "src/parser.re"
                        { NEWTOKEN(PSI_T_FALSE); goto start; }
-#line 5135 "src/parser.c"
-yy390:
+#line 5163 "src/parser.c"
+yy396:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy453;
+                       case 'v':       goto yy462;
                        default:        goto yy62;
                        }
-yy391:
+yy397:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy454;
+                       case 'i':       goto yy463;
                        default:        goto yy62;
                        }
-yy392:
+yy398:
                        yyaccept = 32;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5215,39 +5243,39 @@ yy392:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy393;
+                       case 0x7F:      goto yy399;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy393:
-#line 397 "src/parser.re"
+yy399:
+#line 400 "src/parser.re"
                        { NEWTOKEN(PSI_T_IFDEF); goto start; }
-#line 5226 "src/parser.c"
-yy394:
+#line 5254 "src/parser.c"
+yy400:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy455;
+                       case 'f':       goto yy464;
                        default:        goto yy62;
                        }
-yy395:
+yy401:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy457;
+                       case 'd':       goto yy466;
                        default:        goto yy62;
                        }
-yy396:
+yy402:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy458;
+                       case 'l':       goto yy467;
                        default:        goto yy62;
                        }
-yy397:
+yy403:
                        yyaccept = 33;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5314,143 +5342,143 @@ yy397:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy398;
+                       case 0x7F:      goto yy404;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy398:
-#line 412 "src/parser.re"
+yy404:
+#line 415 "src/parser.re"
                        { NEWTOKEN(PSI_T_MIXED); goto start; }
-#line 5325 "src/parser.c"
-yy399:
+#line 5353 "src/parser.c"
+yy405:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy460;
+                       case 't':       goto yy469;
                        default:        goto yy62;
                        }
-yy400:
+yy406:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy462;
+                       case 'l':       goto yy471;
                        default:        goto yy62;
                        }
-yy401:
+yy407:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy464;
+                       case 'a':       goto yy473;
                        default:        goto yy62;
                        }
-yy402:
+yy408:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy465;
+                       case 'a':       goto yy474;
                        default:        goto yy62;
                        }
-yy403:
+yy409:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy466;
+                       case 's':       goto yy475;
                        default:        goto yy62;
                        }
-yy404:
+yy410:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy467;
+                       case 'n':       goto yy476;
                        default:        goto yy62;
                        }
-yy405:
+yy411:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy469;
+                       case 'c':       goto yy478;
                        default:        goto yy62;
                        }
-yy406:
+yy412:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy471;
+                       case 'g':       goto yy480;
                        default:        goto yy62;
                        }
-yy407:
+yy413:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy473;
+                       case 'n':       goto yy482;
                        default:        goto yy62;
                        }
-yy408:
+yy414:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy475;
+                       case 'l':       goto yy484;
                        default:        goto yy62;
                        }
-yy409:
+yy415:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy477;
+                       case 'r':       goto yy486;
                        default:        goto yy62;
                        }
-yy410:
+yy416:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy478;
+                       case 'o':       goto yy487;
                        default:        goto yy62;
                        }
-yy411:
+yy417:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy479;
+                       case 'o':       goto yy488;
                        default:        goto yy62;
                        }
-yy412:
+yy418:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy480;
+                       case 't':       goto yy489;
                        default:        goto yy62;
                        }
-yy413:
+yy419:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy482;
+                       case 'j':       goto yy491;
                        default:        goto yy62;
                        }
-yy414:
+yy420:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy483;
+                       case 'r':       goto yy492;
                        default:        goto yy62;
                        }
-yy415:
+yy421:
                        yyaccept = 34;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5517,51 +5545,58 @@ yy415:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy416;
+                       case 0x7F:      goto yy422;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy416:
-#line 404 "src/parser.re"
+yy422:
+#line 407 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNDEF); goto start; }
-#line 5528 "src/parser.c"
-yy417:
+#line 5556 "src/parser.c"
+yy423:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy484;
+                       case 'n':       goto yy493;
                        default:        goto yy62;
                        }
-yy418:
+yy424:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy485;
+                       case '_':       goto yy494;
                        default:        goto yy62;
                        }
-yy419:
+yy425:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy486;
+                       case 'r':       goto yy495;
                        default:        goto yy62;
                        }
-yy420:
+yy426:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy487;
+                       case 'e':       goto yy496;
                        default:        goto yy62;
                        }
-yy421:
+yy427:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy488;
+                       case 'i':       goto yy497;
                        default:        goto yy62;
                        }
-yy422:
+yy428:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy498;
+                       default:        goto yy62;
+                       }
+yy429:
                        yyaccept = 35;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5628,22 +5663,22 @@ yy422:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy423;
+                       case 0x7F:      goto yy430;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy423:
-#line 377 "src/parser.re"
+yy430:
+#line 380 "src/parser.re"
                        { NEWTOKEN(PSI_T_CONST); goto start; }
-#line 5639 "src/parser.c"
-yy424:
+#line 5674 "src/parser.c"
+yy431:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy489;
+                       case 'e':       goto yy499;
                        default:        goto yy62;
                        }
-yy425:
+yy432:
                        yyaccept = 36;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5710,52 +5745,52 @@ yy425:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy426;
+                       case 0x7F:      goto yy433;
                        case 'V':
-                       case 'v':       goto yy453;
+                       case 'v':       goto yy462;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy426:
-#line 384 "src/parser.re"
+yy433:
+#line 387 "src/parser.re"
                        { NEWTOKEN(PSI_T_FLOAT); goto start; }
-#line 5723 "src/parser.c"
-yy427:
+#line 5758 "src/parser.c"
+yy434:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy491;
+                       case '_':       goto yy501;
                        default:        goto yy62;
                        }
-yy428:
+yy435:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy492;
+                       case '_':       goto yy502;
                        default:        goto yy62;
                        }
-yy429:
+yy436:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy493;
+                       case '_':       goto yy503;
                        default:        goto yy62;
                        }
-yy430:
+yy437:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy494;
+                       case 't':       goto yy504;
                        default:        goto yy62;
                        }
-yy431:
+yy438:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy496;
+                       case 'a':       goto yy506;
                        default:        goto yy62;
                        }
-yy432:
+yy439:
                        yyaccept = 37;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5822,64 +5857,71 @@ yy432:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy433;
+                       case 0x7F:      goto yy440;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy433:
-#line 381 "src/parser.re"
+yy440:
+#line 384 "src/parser.re"
                        { NEWTOKEN(PSI_T_SHORT); goto start; }
-#line 5833 "src/parser.c"
-yy434:
+#line 5868 "src/parser.c"
+yy441:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy498;
+                       case 'd':       goto yy508;
                        default:        goto yy62;
                        }
-yy435:
+yy442:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy500;
+                       case 'f':       goto yy510;
                        default:        goto yy62;
                        }
-yy436:
+yy443:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy502;
+                       case 't':       goto yy512;
                        default:        goto yy62;
                        }
-yy437:
+yy444:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '6':       goto yy503;
+                       case 'e':       goto yy514;
                        default:        goto yy62;
                        }
-yy438:
+yy445:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '2':       goto yy504;
+                       case '6':       goto yy515;
                        default:        goto yy62;
                        }
-yy439:
+yy446:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '4':       goto yy505;
+                       case '2':       goto yy516;
                        default:        goto yy62;
                        }
-yy440:
+yy447:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy506;
+                       case '4':       goto yy517;
                        default:        goto yy62;
                        }
-yy441:
+yy448:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy518;
+                       default:        goto yy62;
+                       }
+yy449:
                        yyaccept = 38;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -5946,22 +5988,29 @@ yy441:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy442;
+                       case 0x7F:      goto yy450;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy442:
-#line 375 "src/parser.re"
+yy450:
+#line 378 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNION); goto start; }
-#line 5957 "src/parser.c"
-yy443:
+#line 5999 "src/parser.c"
+yy451:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy507;
+                       case 'n':       goto yy519;
                        default:        goto yy62;
                        }
-yy444:
+yy452:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy520;
+                       default:        goto yy62;
+                       }
+yy453:
                        yyaccept = 39;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6028,39 +6077,39 @@ yy444:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy445;
+                       case 0x7F:      goto yy454;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy445:
-#line 434 "src/parser.re"
+yy454:
+#line 437 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRVAL); goto start; }
-#line 6039 "src/parser.c"
-yy446:
+#line 6088 "src/parser.c"
+yy455:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy508;
+                       case 'l':       goto yy521;
                        default:        goto yy62;
                        }
-yy447:
+yy456:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy510;
+                       case 'l':       goto yy523;
                        default:        goto yy62;
                        }
-yy448:
+yy457:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy511;
+                       case 'c':       goto yy524;
                        default:        goto yy62;
                        }
-yy449:
+yy458:
                        yyaccept = 40;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6127,15 +6176,15 @@ yy449:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy450;
+                       case 0x7F:      goto yy459;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy450:
-#line 438 "src/parser.re"
+yy459:
+#line 441 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLOC); goto start; }
-#line 6138 "src/parser.c"
-yy451:
+#line 6187 "src/parser.c"
+yy460:
                        yyaccept = 41;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6202,33 +6251,33 @@ yy451:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy452;
+                       case 0x7F:      goto yy461;
                        case 'D':
-                       case 'd':       goto yy512;
+                       case 'd':       goto yy525;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy452:
-#line 402 "src/parser.re"
+yy461:
+#line 405 "src/parser.re"
                        { NEWTOKEN(PSI_T_DEFINE); goto start; }
-#line 6215 "src/parser.c"
-yy453:
+#line 6264 "src/parser.c"
+yy462:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy514;
+                       case 'a':       goto yy527;
                        default:        goto yy62;
                        }
-yy454:
+yy463:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy515;
+                       case 'o':       goto yy528;
                        default:        goto yy62;
                        }
-yy455:
+yy464:
                        yyaccept = 42;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6295,23 +6344,23 @@ yy455:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy456;
+                       case 0x7F:      goto yy465;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy456:
-#line 398 "src/parser.re"
+yy465:
+#line 401 "src/parser.re"
                        { NEWTOKEN(PSI_T_IFNDEF); goto start; }
-#line 6306 "src/parser.c"
-yy457:
+#line 6355 "src/parser.c"
+yy466:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy516;
+                       case 'e':       goto yy529;
                        default:        goto yy62;
                        }
-yy458:
+yy467:
                        yyaccept = 43;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6378,15 +6427,15 @@ yy458:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy459;
+                       case 0x7F:      goto yy468;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy459:
-#line 431 "src/parser.re"
+yy468:
+#line 434 "src/parser.re"
                        { NEWTOKEN(PSI_T_INTVAL); goto start; }
-#line 6389 "src/parser.c"
-yy460:
+#line 6438 "src/parser.c"
+yy469:
                        yyaccept = 44;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6453,15 +6502,15 @@ yy460:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy461;
+                       case 0x7F:      goto yy470;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy461:
-#line 416 "src/parser.re"
+yy470:
+#line 419 "src/parser.re"
                        { NEWTOKEN(PSI_T_OBJECT); goto start; }
-#line 6464 "src/parser.c"
-yy462:
+#line 6513 "src/parser.c"
+yy471:
                        yyaccept = 45;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6528,39 +6577,39 @@ yy462:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy463;
+                       case 0x7F:      goto yy472;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy463:
-#line 435 "src/parser.re"
+yy472:
+#line 438 "src/parser.re"
                        { NEWTOKEN(PSI_T_OBJVAL); goto start; }
-#line 6539 "src/parser.c"
-yy464:
+#line 6588 "src/parser.c"
+yy473:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy518;
+                       case 'l':       goto yy531;
                        default:        goto yy62;
                        }
-yy465:
+yy474:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy520;
+                       case 's':       goto yy533;
                        default:        goto yy62;
                        }
-yy466:
+yy475:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy521;
+                       case 's':       goto yy534;
                        default:        goto yy62;
                        }
-yy467:
+yy476:
                        yyaccept = 46;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6627,15 +6676,15 @@ yy467:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy468;
+                       case 0x7F:      goto yy477;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy468:
-#line 425 "src/parser.re"
+yy477:
+#line 428 "src/parser.re"
                        { NEWTOKEN(PSI_T_RETURN); goto start; }
-#line 6638 "src/parser.c"
-yy469:
+#line 6687 "src/parser.c"
+yy478:
                        yyaccept = 47;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6702,15 +6751,15 @@ yy469:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy470;
+                       case 0x7F:      goto yy479;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy470:
-#line 418 "src/parser.re"
+yy479:
+#line 421 "src/parser.re"
                        { NEWTOKEN(PSI_T_STATIC); goto start; }
-#line 6713 "src/parser.c"
-yy471:
+#line 6762 "src/parser.c"
+yy480:
                        yyaccept = 48;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6777,15 +6826,15 @@ yy471:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy472;
+                       case 0x7F:      goto yy481;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy472:
-#line 414 "src/parser.re"
+yy481:
+#line 417 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRING); goto start; }
-#line 6788 "src/parser.c"
-yy473:
+#line 6837 "src/parser.c"
+yy482:
                        yyaccept = 49;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6852,15 +6901,15 @@ yy473:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy474;
+                       case 0x7F:      goto yy483;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy474:
-#line 428 "src/parser.re"
+yy483:
+#line 431 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRLEN); goto start; }
-#line 6863 "src/parser.c"
-yy475:
+#line 6912 "src/parser.c"
+yy484:
                        yyaccept = 50;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -6927,39 +6976,39 @@ yy475:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy476;
+                       case 0x7F:      goto yy485;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy476:
-#line 429 "src/parser.re"
+yy485:
+#line 432 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRVAL); goto start; }
-#line 6938 "src/parser.c"
-yy477:
+#line 6987 "src/parser.c"
+yy486:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy522;
+                       case 'a':       goto yy535;
                        default:        goto yy62;
                        }
-yy478:
+yy487:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy523;
+                       case 'l':       goto yy536;
                        default:        goto yy62;
                        }
-yy479:
+yy488:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy525;
+                       case 'a':       goto yy538;
                        default:        goto yy62;
                        }
-yy480:
+yy489:
                        yyaccept = 51;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7026,67 +7075,74 @@ yy480:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy481;
+                       case 0x7F:      goto yy490;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy481:
-#line 442 "src/parser.re"
+yy490:
+#line 445 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_INT); goto start; }
-#line 7037 "src/parser.c"
-yy482:
+#line 7086 "src/parser.c"
+yy491:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy526;
+                       case 'e':       goto yy539;
                        default:        goto yy62;
                        }
-yy483:
+yy492:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy527;
+                       case 'i':       goto yy540;
                        default:        goto yy62;
                        }
-yy484:
+yy493:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy528;
+                       case 'g':       goto yy541;
                        default:        goto yy62;
                        }
-yy485:
+yy494:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy530;
+                       case '_':       goto yy543;
                        default:        goto yy62;
                        }
-yy486:
+yy495:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy532;
+                       case 'i':       goto yy545;
                        default:        goto yy62;
                        }
-yy487:
+yy496:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy533;
+                       case 'n':       goto yy546;
                        default:        goto yy62;
                        }
-yy488:
+yy497:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy534;
+                       case 'n':       goto yy547;
                        default:        goto yy62;
                        }
-yy489:
+yy498:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'r':       goto yy548;
+                       default:        goto yy62;
+                       }
+yy499:
                        yyaccept = 52;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7153,36 +7209,36 @@ yy489:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy490;
+                       case 0x7F:      goto yy500;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy490:
-#line 385 "src/parser.re"
+yy500:
+#line 388 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOUBLE); goto start; }
-#line 7164 "src/parser.c"
-yy491:
+#line 7220 "src/parser.c"
+yy501:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy535;
+                       case 't':       goto yy549;
                        default:        goto yy62;
                        }
-yy492:
+yy502:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy537;
+                       case 't':       goto yy551;
                        default:        goto yy62;
                        }
-yy493:
+yy503:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy539;
+                       case 't':       goto yy553;
                        default:        goto yy62;
                        }
-yy494:
+yy504:
                        yyaccept = 53;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7249,15 +7305,15 @@ yy494:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy495;
+                       case 0x7F:      goto yy505;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy495:
-#line 386 "src/parser.re"
+yy505:
+#line 389 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT8); goto start; }
-#line 7260 "src/parser.c"
-yy496:
+#line 7316 "src/parser.c"
+yy506:
                        yyaccept = 54;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7324,15 +7380,15 @@ yy496:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy497;
+                       case 0x7F:      goto yy507;
                        case '\\':      goto yy146;
-                       default:        goto yy541;
+                       default:        goto yy555;
                        }
-yy497:
+yy507:
 #line 367 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRAGMA); goto start; }
-#line 7335 "src/parser.c"
-yy498:
+#line 7391 "src/parser.c"
+yy508:
                        yyaccept = 55;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7399,15 +7455,15 @@ yy498:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy499;
+                       case 0x7F:      goto yy509;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy499:
-#line 395 "src/parser.re"
+yy509:
+#line 398 "src/parser.re"
                        { NEWTOKEN(PSI_T_SIGNED); goto start; }
-#line 7410 "src/parser.c"
-yy500:
+#line 7466 "src/parser.c"
+yy510:
                        yyaccept = 56;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7474,57 +7530,15 @@ yy500:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy501;
+                       case 0x7F:      goto yy511;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy501:
+yy511:
 #line 374 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STRUCT); goto start; }
-#line 7485 "src/parser.c"
-yy502:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'f':       goto yy543;
-                       default:        goto yy62;
-                       }
-yy503:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy545;
-                       default:        goto yy62;
-                       }
-yy504:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy546;
-                       default:        goto yy62;
-                       }
-yy505:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy547;
-                       default:        goto yy62;
-                       }
-yy506:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy548;
-                       default:        goto yy62;
-                       }
-yy507:
-                       yyaccept = 5;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'e':       goto yy550;
-                       default:        goto yy62;
-                       }
-yy508:
+                       { NEWTOKEN(PSI_T_SIZEOF); goto start; }
+#line 7541 "src/parser.c"
+yy512:
                        yyaccept = 57;
                        yych = *(mrk = ++cur);
                        switch (yych) {
@@ -7591,38 +7605,71 @@ yy508:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy509;
+                       case 0x7F:      goto yy513;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy509:
-#line 433 "src/parser.re"
-                       { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
-#line 7602 "src/parser.c"
-yy510:
+yy513:
+#line 377 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRUCT); goto start; }
+#line 7616 "src/parser.c"
+yy514:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy551;
+                       case 'f':       goto yy557;
                        default:        goto yy62;
                        }
-yy511:
+yy515:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'K':
-                       case 'k':       goto yy553;
+                       case '_':       goto yy559;
                        default:        goto yy62;
                        }
-yy512:
-                       yyaccept = 58;
+yy516:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 0x00:
-                       case 0x01:
-                       case 0x02:
-                       case 0x03:
+                       case '_':       goto yy560;
+                       default:        goto yy62;
+                       }
+yy517:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy561;
+                       default:        goto yy62;
+                       }
+yy518:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy562;
+                       default:        goto yy62;
+                       }
+yy519:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy564;
+                       default:        goto yy62;
+                       }
+yy520:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'l':       goto yy565;
+                       default:        goto yy62;
+                       }
+yy521:
+                       yyaccept = 58;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
                        case 0x04:
                        case 0x05:
                        case 0x06:
@@ -7682,32 +7729,123 @@ yy512:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy513;
+                       case 0x7F:      goto yy522;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy513:
-#line 403 "src/parser.re"
+yy522:
+#line 436 "src/parser.re"
+                       { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
+#line 7740 "src/parser.c"
+yy523:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy566;
+                       default:        goto yy62;
+                       }
+yy524:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'K':
+                       case 'k':       goto yy568;
+                       default:        goto yy62;
+                       }
+yy525:
+                       yyaccept = 59;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy526;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
+                       }
+yy526:
+#line 406 "src/parser.re"
                        { NEWTOKEN(PSI_T_DEFINED); goto start; }
-#line 7693 "src/parser.c"
-yy514:
+#line 7831 "src/parser.c"
+yy527:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy555;
+                       case 'l':       goto yy570;
                        default:        goto yy62;
                        }
-yy515:
+yy528:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy557;
+                       case 'n':       goto yy572;
                        default:        goto yy62;
                        }
-yy516:
-                       yyaccept = 59;
+yy529:
+                       yyaccept = 60;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7773,17 +7911,17 @@ yy516:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy517;
+                       case 0x7F:      goto yy530;
                        case '\\':      goto yy146;
-                       case '_':       goto yy559;
+                       case '_':       goto yy574;
                        default:        goto yy61;
                        }
-yy517:
-#line 407 "src/parser.re"
+yy530:
+#line 410 "src/parser.re"
                        { NEWTOKEN(PSI_T_INCLUDE); goto start; }
-#line 7785 "src/parser.c"
-yy518:
-                       yyaccept = 60;
+#line 7923 "src/parser.c"
+yy531:
+                       yyaccept = 61;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7849,40 +7987,40 @@ yy518:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy519;
+                       case 0x7F:      goto yy532;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy519:
-#line 430 "src/parser.re"
+yy532:
+#line 433 "src/parser.re"
                        { NEWTOKEN(PSI_T_PATHVAL); goto start; }
-#line 7860 "src/parser.c"
-yy520:
+#line 7998 "src/parser.c"
+yy533:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy560;
+                       case 's':       goto yy575;
                        default:        goto yy62;
                        }
-yy521:
+yy534:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy561;
+                       case 'e':       goto yy576;
                        default:        goto yy62;
                        }
-yy522:
+yy535:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy562;
+                       case 'y':       goto yy577;
                        default:        goto yy62;
                        }
-yy523:
-                       yyaccept = 61;
+yy536:
+                       yyaccept = 62;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7948,40 +8086,40 @@ yy523:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy524;
+                       case 0x7F:      goto yy537;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy524:
-#line 444 "src/parser.re"
+yy537:
+#line 447 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_BOOL); goto start; }
-#line 7959 "src/parser.c"
-yy525:
+#line 8097 "src/parser.c"
+yy538:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy564;
+                       case 't':       goto yy579;
                        default:        goto yy62;
                        }
-yy526:
+yy539:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy566;
+                       case 'c':       goto yy581;
                        default:        goto yy62;
                        }
-yy527:
+yy540:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy567;
+                       case 'n':       goto yy582;
                        default:        goto yy62;
                        }
-yy528:
-                       yyaccept = 62;
+yy541:
+                       yyaccept = 63;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8047,16 +8185,16 @@ yy528:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy529;
+                       case 0x7F:      goto yy542;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy529:
-#line 405 "src/parser.re"
+yy542:
+#line 408 "src/parser.re"
                        { NEWTOKEN(PSI_T_WARNING); goto start; }
-#line 8058 "src/parser.c"
-yy530:
-                       yyaccept = 63;
+#line 8196 "src/parser.c"
+yy543:
+                       yyaccept = 64;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8122,37 +8260,44 @@ yy530:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy531;
+                       case 0x7F:      goto yy544;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy531:
-#line 371 "src/parser.re"
+yy544:
+#line 372 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_ASM); goto start; }
-#line 8133 "src/parser.c"
-yy532:
+#line 8271 "src/parser.c"
+yy545:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'b':       goto yy568;
+                       case 'b':       goto yy583;
                        default:        goto yy62;
                        }
-yy533:
+yy546:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 's':       goto yy569;
+                       case 's':       goto yy584;
                        default:        goto yy62;
                        }
-yy534:
+yy547:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy570;
+                       case 'e':       goto yy585;
                        default:        goto yy62;
                        }
-yy535:
-                       yyaccept = 64;
+yy548:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy587;
+                       default:        goto yy62;
+                       }
+yy549:
+                       yyaccept = 65;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8218,16 +8363,16 @@ yy535:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy536;
+                       case 0x7F:      goto yy550;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy536:
-#line 388 "src/parser.re"
+yy550:
+#line 391 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT16); goto start; }
-#line 8229 "src/parser.c"
-yy537:
-                       yyaccept = 65;
+#line 8374 "src/parser.c"
+yy551:
+                       yyaccept = 66;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8293,16 +8438,16 @@ yy537:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy538;
+                       case 0x7F:      goto yy552;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy538:
-#line 390 "src/parser.re"
+yy552:
+#line 393 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT32); goto start; }
-#line 8304 "src/parser.c"
-yy539:
-                       yyaccept = 66;
+#line 8449 "src/parser.c"
+yy553:
+                       yyaccept = 67;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8368,15 +8513,15 @@ yy539:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy540;
+                       case 0x7F:      goto yy554;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy540:
-#line 392 "src/parser.re"
+yy554:
+#line 395 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT64); goto start; }
-#line 8379 "src/parser.c"
-yy541:
+#line 8524 "src/parser.c"
+yy555:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -8447,11 +8592,11 @@ yy541:
                        case '~':
                        case 0x7F:      goto yy55;
                        case '\\':      goto yy146;
-                       case 'o':       goto yy571;
-                       default:        goto yy541;
+                       case 'o':       goto yy588;
+                       default:        goto yy555;
                        }
-yy543:
-                       yyaccept = 67;
+yy557:
+                       yyaccept = 68;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8517,37 +8662,37 @@ yy543:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy544;
+                       case 0x7F:      goto yy558;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy544:
-#line 373 "src/parser.re"
+yy558:
+#line 376 "src/parser.re"
                        { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
-#line 8528 "src/parser.c"
-yy545:
+#line 8673 "src/parser.c"
+yy559:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy573;
+                       case 't':       goto yy590;
                        default:        goto yy62;
                        }
-yy546:
+yy560:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy575;
+                       case 't':       goto yy592;
                        default:        goto yy62;
                        }
-yy547:
+yy561:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy577;
+                       case 't':       goto yy594;
                        default:        goto yy62;
                        }
-yy548:
-                       yyaccept = 68;
+yy562:
+                       yyaccept = 69;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8613,23 +8758,30 @@ yy548:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy549;
+                       case 0x7F:      goto yy563;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy549:
-#line 387 "src/parser.re"
+yy563:
+#line 390 "src/parser.re"
                        { NEWTOKEN(PSI_T_UINT8); goto start; }
-#line 8624 "src/parser.c"
-yy550:
+#line 8769 "src/parser.c"
+yy564:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'd':       goto yy579;
+                       case 'd':       goto yy596;
                        default:        goto yy62;
                        }
-yy551:
-                       yyaccept = 69;
+yy565:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy598;
+                       default:        goto yy62;
+                       }
+yy566:
+                       yyaccept = 70;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8695,16 +8847,16 @@ yy551:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy552;
+                       case 0x7F:      goto yy567;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy552:
-#line 413 "src/parser.re"
+yy567:
+#line 416 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLABLE); goto start; }
-#line 8706 "src/parser.c"
-yy553:
-                       yyaccept = 70;
+#line 8858 "src/parser.c"
+yy568:
+                       yyaccept = 71;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8770,16 +8922,16 @@ yy553:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy554;
+                       case 0x7F:      goto yy569;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy554:
-#line 417 "src/parser.re"
+yy569:
+#line 420 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLBACK); goto start; }
-#line 8781 "src/parser.c"
-yy555:
-                       yyaccept = 71;
+#line 8933 "src/parser.c"
+yy570:
+                       yyaccept = 72;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8845,16 +8997,16 @@ yy555:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy556;
+                       case 0x7F:      goto yy571;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy556:
-#line 432 "src/parser.re"
+yy571:
+#line 435 "src/parser.re"
                        { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
-#line 8856 "src/parser.c"
-yy557:
-                       yyaccept = 72;
+#line 9008 "src/parser.c"
+yy572:
+                       yyaccept = 73;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8920,40 +9072,40 @@ yy557:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy558;
+                       case 0x7F:      goto yy573;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy558:
-#line 419 "src/parser.re"
+yy573:
+#line 422 "src/parser.re"
                        { NEWTOKEN(PSI_T_FUNCTION); goto start; }
-#line 8931 "src/parser.c"
-yy559:
+#line 9083 "src/parser.c"
+yy574:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy581;
+                       case 'n':       goto yy600;
                        default:        goto yy62;
                        }
-yy560:
+yy575:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy582;
+                       case 'e':       goto yy601;
                        default:        goto yy62;
                        }
-yy561:
+yy576:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy583;
+                       case 'r':       goto yy602;
                        default:        goto yy62;
                        }
-yy562:
-                       yyaccept = 73;
+yy577:
+                       yyaccept = 74;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9019,16 +9171,16 @@ yy562:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy563;
+                       case 0x7F:      goto yy578;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy563:
-#line 440 "src/parser.re"
+yy578:
+#line 443 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
-#line 9030 "src/parser.c"
-yy564:
-                       yyaccept = 74;
+#line 9182 "src/parser.c"
+yy579:
+                       yyaccept = 75;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9094,57 +9246,205 @@ yy564:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy565;
+                       case 0x7F:      goto yy580;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy565:
-#line 443 "src/parser.re"
+yy580:
+#line 446 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
-#line 9105 "src/parser.c"
-yy566:
+#line 9257 "src/parser.c"
+yy581:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy584;
+                       case 't':       goto yy603;
                        default:        goto yy62;
                        }
-yy567:
+yy582:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy586;
+                       case 'g':       goto yy605;
                        default:        goto yy62;
                        }
-yy568:
+yy583:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'u':       goto yy588;
+                       case 'u':       goto yy607;
                        default:        goto yy62;
                        }
-yy569:
+yy584:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy608;
+                       default:        goto yy62;
+                       }
+yy585:
+                       yyaccept = 76;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy586;
+                       case '\\':      goto yy146;
+                       default:        goto yy61;
+                       }
+yy586:
+#line 369 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_INLINE); goto start; }
+#line 9362 "src/parser.c"
+yy587:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy589;
+                       case 'c':       goto yy609;
                        default:        goto yy62;
                        }
-yy570:
-                       yyaccept = 5;
+yy588:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy55;
+                       case '\\':      goto yy146;
+                       case 'n':       goto yy610;
+                       case 'o':       goto yy588;
+                       default:        goto yy555;
+                       }
+yy590:
+                       yyaccept = 77;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'c':       goto yy590;
-                       default:        goto yy62;
-                       }
-yy571:
-                       yyaccept = 5;
-                       mrk = ++cur;
-                       if (lim <= cur) if (cur >= lim) goto done;;
-                       yych = *cur;
-                       switch (yych) {
                        case 0x00:
                        case 0x01:
                        case 0x02:
@@ -9208,14 +9508,16 @@ yy571:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy55;
+                       case 0x7F:      goto yy591;
                        case '\\':      goto yy146;
-                       case 'n':       goto yy591;
-                       case 'o':       goto yy571;
-                       default:        goto yy541;
+                       default:        goto yy61;
                        }
-yy573:
-                       yyaccept = 75;
+yy591:
+#line 392 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT16); goto start; }
+#line 9519 "src/parser.c"
+yy592:
+                       yyaccept = 78;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9281,16 +9583,16 @@ yy573:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy574;
+                       case 0x7F:      goto yy593;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy574:
-#line 389 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT16); goto start; }
-#line 9292 "src/parser.c"
-yy575:
-                       yyaccept = 76;
+yy593:
+#line 394 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT32); goto start; }
+#line 9594 "src/parser.c"
+yy594:
+                       yyaccept = 79;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9356,16 +9658,16 @@ yy575:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy576;
+                       case 0x7F:      goto yy595;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy576:
-#line 391 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT32); goto start; }
-#line 9367 "src/parser.c"
-yy577:
-                       yyaccept = 77;
+yy595:
+#line 396 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT64); goto start; }
+#line 9669 "src/parser.c"
+yy596:
+                       yyaccept = 80;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9431,16 +9733,16 @@ yy577:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy578;
+                       case 0x7F:      goto yy597;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy578:
-#line 393 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT64); goto start; }
-#line 9442 "src/parser.c"
-yy579:
-                       yyaccept = 78;
+yy597:
+#line 397 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
+#line 9744 "src/parser.c"
+yy598:
+                       yyaccept = 81;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9506,40 +9808,40 @@ yy579:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy580;
+                       case 0x7F:      goto yy599;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy580:
-#line 394 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
-#line 9517 "src/parser.c"
-yy581:
+yy599:
+#line 373 "src/parser.re"
+                       { NEWTOKEN(PSI_T_VOLATILE); goto start; }
+#line 9819 "src/parser.c"
+yy600:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy592;
+                       case 'e':       goto yy611;
                        default:        goto yy62;
                        }
-yy582:
+yy601:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy593;
+                       case 'r':       goto yy612;
                        default:        goto yy62;
                        }
-yy583:
+yy602:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy594;
+                       case 't':       goto yy613;
                        default:        goto yy62;
                        }
-yy584:
-                       yyaccept = 79;
+yy603:
+                       yyaccept = 82;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9605,16 +9907,16 @@ yy584:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy585;
+                       case 0x7F:      goto yy604;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy585:
-#line 439 "src/parser.re"
+yy604:
+#line 442 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_OBJECT); goto start; }
-#line 9616 "src/parser.c"
-yy586:
-                       yyaccept = 80;
+#line 9918 "src/parser.c"
+yy605:
+                       yyaccept = 83;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9680,36 +9982,36 @@ yy586:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy587;
+                       case 0x7F:      goto yy606;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy587:
-#line 441 "src/parser.re"
+yy606:
+#line 444 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_STRING); goto start; }
-#line 9691 "src/parser.c"
-yy588:
+#line 9993 "src/parser.c"
+yy607:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy596;
+                       case 't':       goto yy615;
                        default:        goto yy62;
                        }
-yy589:
+yy608:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'o':       goto yy597;
+                       case 'o':       goto yy616;
                        default:        goto yy62;
                        }
-yy590:
+yy609:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy598;
+                       case 't':       goto yy617;
                        default:        goto yy62;
                        }
-yy591:
+yy610:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -9780,28 +10082,28 @@ yy591:
                        case '~':
                        case 0x7F:      goto yy55;
                        case '\\':      goto yy146;
-                       case 'c':       goto yy600;
-                       case 'o':       goto yy571;
-                       default:        goto yy541;
+                       case 'c':       goto yy619;
+                       case 'o':       goto yy588;
+                       default:        goto yy555;
                        }
-yy592:
+yy611:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'X':
-                       case 'x':       goto yy601;
+                       case 'x':       goto yy620;
                        default:        goto yy62;
                        }
-yy593:
+yy612:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy602;
+                       case 't':       goto yy621;
                        default:        goto yy62;
                        }
-yy594:
-                       yyaccept = 81;
+yy613:
+                       yyaccept = 84;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9867,30 +10169,30 @@ yy594:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy595;
+                       case 0x7F:      goto yy614;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy595:
-#line 423 "src/parser.re"
+yy614:
+#line 426 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
-#line 9878 "src/parser.c"
-yy596:
+#line 10180 "src/parser.c"
+yy615:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy604;
+                       case 'e':       goto yy623;
                        default:        goto yy62;
                        }
-yy597:
+yy616:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'n':       goto yy605;
+                       case 'n':       goto yy624;
                        default:        goto yy62;
                        }
-yy598:
-                       yyaccept = 82;
+yy617:
+                       yyaccept = 85;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9956,15 +10258,15 @@ yy598:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy599;
+                       case 0x7F:      goto yy618;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy599:
-#line 369 "src/parser.re"
+yy618:
+#line 370 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_RESTRICT); goto start; }
-#line 9967 "src/parser.c"
-yy600:
+#line 10269 "src/parser.c"
+yy619:
                        yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10035,20 +10337,20 @@ yy600:
                        case '~':
                        case 0x7F:      goto yy55;
                        case '\\':      goto yy146;
-                       case 'e':       goto yy606;
-                       case 'o':       goto yy571;
-                       default:        goto yy541;
+                       case 'e':       goto yy625;
+                       case 'o':       goto yy588;
+                       default:        goto yy555;
                        }
-yy601:
+yy620:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy608;
+                       case 't':       goto yy627;
                        default:        goto yy62;
                        }
-yy602:
-                       yyaccept = 83;
+yy621:
+                       yyaccept = 86;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10114,30 +10416,30 @@ yy602:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy603;
+                       case 0x7F:      goto yy622;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy603:
-#line 424 "src/parser.re"
+yy622:
+#line 427 "src/parser.re"
                        { NEWTOKEN(PSI_T_POST_ASSERT); goto start; }
-#line 10125 "src/parser.c"
-yy604:
+#line 10427 "src/parser.c"
+yy623:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy610;
+                       case '_':       goto yy629;
                        default:        goto yy62;
                        }
-yy605:
+yy624:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy611;
+                       case '_':       goto yy630;
                        default:        goto yy62;
                        }
-yy606:
-                       yyaccept = 84;
+yy625:
+                       yyaccept = 87;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -10205,17 +10507,17 @@ yy606:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy607;
+                       case 0x7F:      goto yy626;
                        case '\\':      goto yy146;
-                       case 'o':       goto yy571;
-                       default:        goto yy541;
+                       case 'o':       goto yy588;
+                       default:        goto yy555;
                        }
-yy607:
+yy626:
 #line 368 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRAGMA_ONCE); goto start; }
-#line 10217 "src/parser.c"
-yy608:
-                       yyaccept = 85;
+#line 10519 "src/parser.c"
+yy627:
+                       yyaccept = 88;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10281,101 +10583,40 @@ yy608:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy609;
+                       case 0x7F:      goto yy628;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy609:
-#line 408 "src/parser.re"
+yy628:
+#line 411 "src/parser.re"
                        { NEWTOKEN(PSI_T_INCLUDE_NEXT); goto start; }
-#line 10292 "src/parser.c"
-yy610:
+#line 10594 "src/parser.c"
+yy629:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy612;
+                       case '_':       goto yy631;
                        default:        goto yy62;
                        }
-yy611:
+yy630:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy613;
+                       case '_':       goto yy632;
                        default:        goto yy62;
                        }
-yy612:
+yy631:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 0x00:
-                       case 0x01:
-                       case 0x02:
-                       case 0x03:
-                       case 0x04:
-                       case 0x05:
-                       case 0x06:
-                       case 0x07:
-                       case 0x08:
-                       case '\n':
-                       case '\v':
-                       case '\r':
-                       case 0x0E:
-                       case 0x0F:
-                       case 0x10:
-                       case 0x11:
-                       case 0x12:
-                       case 0x13:
-                       case 0x14:
-                       case 0x15:
-                       case 0x16:
-                       case 0x17:
-                       case 0x18:
-                       case 0x19:
-                       case 0x1A:
-                       case 0x1B:
-                       case 0x1C:
-                       case 0x1D:
-                       case 0x1E:
-                       case 0x1F:
-                       case '!':
-                       case '"':
-                       case '#':
-                       case '$':
-                       case '%':
-                       case '&':
-                       case '\'':
-                       case ')':
-                       case '*':
-                       case '+':
-                       case ',':
-                       case '-':
-                       case '.':
-                       case '/':
-                       case ':':
-                       case ';':
-                       case '<':
-                       case '=':
-                       case '>':
-                       case '?':
-                       case '@':
-                       case '[':
-                       case ']':
-                       case '^':
-                       case '`':
-                       case '{':
-                       case '|':
-                       case '}':
-                       case '~':
-                       case 0x7F:      goto yy55;
                        case '\t':
                        case '\f':
-                       case ' ':       goto yy615;
-                       case '(':       goto yy617;
-                       case '\\':      goto yy146;
-                       default:        goto yy61;
+                       case ' ':       goto yy634;
+                       case '(':       goto yy636;
+                       default:        goto yy62;
                        }
-yy613:
-                       yyaccept = 86;
+yy632:
+                       yyaccept = 89;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -10441,67 +10682,67 @@ yy613:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy614;
+                       case 0x7F:      goto yy633;
                        case '\\':      goto yy146;
                        default:        goto yy61;
                        }
-yy614:
-#line 370 "src/parser.re"
+yy633:
+#line 371 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_EXTENSION); goto start; }
-#line 10452 "src/parser.c"
-yy615:
+#line 10693 "src/parser.c"
+yy634:
                        ++cur;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\t':
                        case '\f':
-                       case ' ':       goto yy615;
-                       case '(':       goto yy617;
+                       case ' ':       goto yy634;
+                       case '(':       goto yy636;
                        default:        goto yy114;
                        }
-yy617:
+yy636:
                        yych = *++cur;
                        switch (yych) {
-                       case '(':       goto yy618;
+                       case '(':       goto yy637;
                        default:        goto yy114;
                        }
-yy618:
+yy637:
                        ++cur;
-#line 449 "src/parser.re"
+#line 452 "src/parser.re"
                        { parens = 2; goto cpp_attribute; }
-#line 10474 "src/parser.c"
+#line 10715 "src/parser.c"
                }
-#line 455 "src/parser.re"
+#line 458 "src/parser.re"
 
 
        character: ;
                
-#line 10481 "src/parser.c"
+#line 10722 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy624;
-                       case '\'':      goto yy626;
-                       case '\\':      goto yy628;
-                       default:        goto yy622;
+                       case '\r':      goto yy643;
+                       case '\'':      goto yy645;
+                       case '\\':      goto yy647;
+                       default:        goto yy641;
                        }
-yy622:
+yy641:
                        ++cur;
-#line 473 "src/parser.re"
+#line 476 "src/parser.re"
                        { escaped = false; goto character; }
-#line 10497 "src/parser.c"
-yy624:
+#line 10738 "src/parser.c"
+yy643:
                        ++cur;
-#line 460 "src/parser.re"
+#line 463 "src/parser.re"
                        { NEWLINE(); goto character; }
-#line 10502 "src/parser.c"
-yy626:
+#line 10743 "src/parser.c"
+yy645:
                        ++cur;
-#line 462 "src/parser.re"
+#line 465 "src/parser.re"
                        {
                        if (escaped) {
                                escaped = false;
@@ -10513,43 +10754,43 @@ yy626:
                        token->flags = char_width;
                        goto start;
                }
-#line 10517 "src/parser.c"
-yy628:
+#line 10758 "src/parser.c"
+yy647:
                        ++cur;
-#line 461 "src/parser.re"
+#line 464 "src/parser.re"
                        { escaped = !escaped;  goto character; }
-#line 10522 "src/parser.c"
+#line 10763 "src/parser.c"
                }
-#line 475 "src/parser.re"
+#line 478 "src/parser.re"
 
 
        string: ;
                
-#line 10529 "src/parser.c"
+#line 10770 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy634;
-                       case '"':       goto yy636;
-                       case '\\':      goto yy638;
-                       default:        goto yy632;
+                       case '\r':      goto yy653;
+                       case '"':       goto yy655;
+                       case '\\':      goto yy657;
+                       default:        goto yy651;
                        }
-yy632:
+yy651:
                        ++cur;
-#line 493 "src/parser.re"
+#line 496 "src/parser.re"
                        { escaped = false; goto string; }
-#line 10545 "src/parser.c"
-yy634:
+#line 10786 "src/parser.c"
+yy653:
                        ++cur;
-#line 480 "src/parser.re"
+#line 483 "src/parser.re"
                        { NEWLINE(); goto string; }
-#line 10550 "src/parser.c"
-yy636:
+#line 10791 "src/parser.c"
+yy655:
                        ++cur;
-#line 482 "src/parser.re"
+#line 485 "src/parser.re"
                        {
                        if (escaped) {
                                escaped = false;
@@ -10561,118 +10802,118 @@ yy636:
                        token->flags = char_width;
                        goto start;
                }
-#line 10565 "src/parser.c"
-yy638:
+#line 10806 "src/parser.c"
+yy657:
                        ++cur;
-#line 481 "src/parser.re"
+#line 484 "src/parser.re"
                        { escaped = !escaped; goto string; }
-#line 10570 "src/parser.c"
+#line 10811 "src/parser.c"
                }
-#line 495 "src/parser.re"
+#line 498 "src/parser.re"
 
 
        comment: ;
                
-#line 10577 "src/parser.c"
+#line 10818 "src/parser.c"
                {
                        unsigned char yych;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy644;
-                       case '*':       goto yy646;
-                       default:        goto yy642;
+                       case '\r':      goto yy663;
+                       case '*':       goto yy665;
+                       default:        goto yy661;
                        }
-yy642:
+yy661:
                        ++cur;
-yy643:
-#line 502 "src/parser.re"
+yy662:
+#line 505 "src/parser.re"
                        { goto comment; }
-#line 10593 "src/parser.c"
-yy644:
+#line 10834 "src/parser.c"
+yy663:
                        ++cur;
-#line 500 "src/parser.re"
+#line 503 "src/parser.re"
                        { NEWLINE(); goto comment; }
-#line 10598 "src/parser.c"
-yy646:
+#line 10839 "src/parser.c"
+yy665:
                        yych = *++cur;
                        switch (yych) {
-                       case '/':       goto yy647;
-                       default:        goto yy643;
+                       case '/':       goto yy666;
+                       default:        goto yy662;
                        }
-yy647:
+yy666:
                        ++cur;
-#line 501 "src/parser.re"
+#line 504 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); goto start; }
-#line 10609 "src/parser.c"
+#line 10850 "src/parser.c"
                }
-#line 504 "src/parser.re"
+#line 507 "src/parser.re"
 
 
        comment_sl: ;
                
-#line 10616 "src/parser.c"
+#line 10857 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy653;
-                       default:        goto yy651;
+                       case '\r':      goto yy672;
+                       default:        goto yy670;
                        }
-yy651:
+yy670:
                        ++cur;
-#line 510 "src/parser.re"
+#line 513 "src/parser.re"
                        { goto comment_sl; }
-#line 10630 "src/parser.c"
-yy653:
+#line 10871 "src/parser.c"
+yy672:
                        ++cur;
-#line 509 "src/parser.re"
+#line 512 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); NEWLINE(); goto start; }
-#line 10635 "src/parser.c"
+#line 10876 "src/parser.c"
                }
-#line 512 "src/parser.re"
+#line 515 "src/parser.re"
 
 
        cpp_attribute: ;
 
                
-#line 10643 "src/parser.c"
+#line 10884 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy659;
-                       case '(':       goto yy661;
-                       case ')':       goto yy663;
-                       default:        goto yy657;
+                       case '\r':      goto yy678;
+                       case '(':       goto yy680;
+                       case ')':       goto yy682;
+                       default:        goto yy676;
                        }
-yy657:
+yy676:
                        ++cur;
-#line 521 "src/parser.re"
+#line 524 "src/parser.re"
                        { goto cpp_attribute; }
-#line 10659 "src/parser.c"
-yy659:
+#line 10900 "src/parser.c"
+yy678:
                        ++cur;
-#line 520 "src/parser.re"
+#line 523 "src/parser.re"
                        { NEWLINE(); goto cpp_attribute; }
-#line 10664 "src/parser.c"
-yy661:
+#line 10905 "src/parser.c"
+yy680:
                        ++cur;
-#line 518 "src/parser.re"
+#line 521 "src/parser.re"
                        { ++parens; goto cpp_attribute; }
-#line 10669 "src/parser.c"
-yy663:
+#line 10910 "src/parser.c"
+yy682:
                        ++cur;
-#line 519 "src/parser.re"
+#line 522 "src/parser.re"
                        { if (parens == 1) { NEWTOKEN(PSI_T_CPP_ATTRIBUTE); goto start; } else { --parens; goto cpp_attribute; } }
-#line 10674 "src/parser.c"
+#line 10915 "src/parser.c"
                }
-#line 523 "src/parser.re"
+#line 526 "src/parser.re"
 
 error: ;
 

diff --git a/src/parser.re b/src/parser.re
index fb4e35bb3933e3fa4847ad04eb0f98d89bf2e12e..a5f271d328c000c537764ebcef9799eafb31187b 100644 (file)
--- a/src/parser.re
+++ b/src/parser.re
@@ -366,9 +366,12 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                "?"                             { NEWTOKEN(PSI_T_IIF); goto start; }
                "pragma"                { NEWTOKEN(PSI_T_PRAGMA); goto start; }
                "pragma" W+ "once"      { NEWTOKEN(PSI_T_PRAGMA_ONCE); goto start; }
+               "__inline"              { NEWTOKEN(PSI_T_CPP_INLINE); goto start; }
                "__restrict"    { NEWTOKEN(PSI_T_CPP_RESTRICT); goto start; }
                "__extension__" { NEWTOKEN(PSI_T_CPP_EXTENSION); goto start; }
                "__asm__"               { NEWTOKEN(PSI_T_CPP_ASM); goto start; }
+               "volatile"              { NEWTOKEN(PSI_T_VOLATILE); goto start; }
+               "sizeof"                { NEWTOKEN(PSI_T_SIZEOF); goto start; }
                "line"                  { NEWTOKEN(PSI_T_LINE); goto start; }
                "typedef"               { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
                "struct"                { NEWTOKEN(PSI_T_STRUCT); goto start; }

diff --git a/src/parser_proc.c b/src/parser_proc.c
index 8c700d09f605f7fddf737d53bcc05fe66900b691..41b3e66bbfa0e74308ebf97d60c8277b72de590b 100644 (file)
--- a/src/parser_proc.c
+++ b/src/parser_proc.c
@@ -100,6 +100,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);
 static void psi_parser_proc_error(struct psi_parser *P, struct psi_plist *tokens, size_t *index, const char *msg);
@@ -161,7 +162,7 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp
 
 /* end code */
 
-#line 165 "src/parser_proc.c" /* glr.c:264  */
+#line 166 "src/parser_proc.c" /* glr.c:264  */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -266,18 +267,18 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  169
+#define YYFINAL  178
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   3407
+#define YYLAST   4188
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  132
+#define YYNTOKENS  135
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  123
+#define YYNNTS  134
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  485
+#define YYNRULES  641
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  718
+#define YYNSTATES  893
 /* YYMAXRHS -- Maximum number of symbols on right-hand side of rule.  */
 #define YYMAXRHS 13
 /* YYMAXLEFT -- Maximum number of symbols to the left of a handle
@@ -286,7 +287,7 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp
 
 /* YYTRANSLATE(X) -- Bison symbol number corresponding to X.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   386
+#define YYMAXUTOK   389
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -332,62 +333,78 @@ static const unsigned char yytranslate[] =
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134
 };
 
 #if YYDEBUG
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   373,   373,   373,   373,   373,   373,   373,   373,   373,
-     373,   373,   373,   373,   373,   373,   373,   373,   373,   373,
-     374,   374,   374,   374,   375,   375,   375,   375,   375,   375,
-     375,   375,   375,   375,   375,   375,   375,   375,   375,   375,
-     375,   375,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   376,   376,   376,   376,   376,   376,
-     376,   376,   376,   376,   380,   381,   384,   385,   388,   389,
-     390,   391,   397,   405,   408,   411,   412,   415,   418,   421,
-     424,   430,   436,   439,   445,   468,   472,   476,   481,   485,
-     489,   493,   500,   501,   505,   506,   510,   511,   512,   516,
-     517,   521,   522,   526,   527,   528,   532,   533,   537,   538,
-     539,   540,   541,   542,   546,   551,   559,   562,   565,   566,
-     572,   577,   585,   588,   592,   596,   603,   607,   611,   615,
-     620,   630,   640,   645,   650,   656,   665,   668,   672,   676,
-     682,   689,   695,   696,   697,   698,   702,   705,   736,   743,
-     744,   745,   746,   750,   753,   762,   768,   769,   777,   788,
-     797,   806,   814,   817,   821,   825,   829,   834,   839,   847,
-     848,   849,   852,   858,   861,   864,   870,   871,   872,   873,
-     874,   875,   876,   877,   881,   882,   886,   889,   892,   898,
-     901,   904,   912,   924,   927,   930,   937,   940,   950,   953,
-     956,   959,   960,   964,   967,   970,   981,   984,   990,   991,
-     995,   996,  1000,  1004,  1010,  1011,  1017,  1020,  1026,  1027,
-    1034,  1035,  1039,  1046,  1057,  1064,  1075,  1082,  1093,  1104,
-    1118,  1119,  1131,  1134,  1137,  1140,  1147,  1150,  1156,  1165,
-    1177,  1185,  1188,  1198,  1211,  1216,  1224,  1234,  1244,  1247,
-    1251,  1257,  1271,  1288,  1291,  1297,  1304,  1314,  1321,  1324,
-    1330,  1335,  1343,  1347,  1351,  1355,  1359,  1363,  1370,  1374,
-    1378,  1382,  1389,  1402,  1415,  1428,  1431,  1438,  1441,  1444,
-    1447,  1453,  1457,  1464,  1467,  1470,  1476,  1479,  1485,  1486,
-    1492,  1495,  1501,  1502,  1512,  1515,  1522,  1527,  1532,  1542,
-    1545,  1551,  1554,  1560,  1567,  1574,  1575,  1576,  1577,  1578,
-    1579,  1580,  1581,  1582,  1586,  1589,  1595,  1598,  1601,  1604,
-    1607,  1613,  1617,  1625,  1626,  1630,  1637,  1640,  1643,  1647,
-    1650,  1653,  1659,  1663,  1671,  1678,  1686,  1694,  1695,  1696,
-    1697,  1698,  1699,  1700,  1701,  1702,  1703,  1707,  1710,  1716,
-    1719,  1725,  1726,  1730,  1733,  1739,  1742,  1748,  1755,  1762,
-    1765,  1768,  1775,  1780,  1788,  1789,  1790,  1791,  1792,  1793,
-    1794,  1795,  1799,  1802,  1808,  1811,  1817,  1824,  1825,  1829,
-    1836,  1839,  1845,  1853,  1856,  1862
+       0,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     380,   380,   380,   380,   380,   380,   380,   380,   380,   380,
+     381,   381,   381,   381,   382,   382,   382,   382,   382,   382,
+     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
+     382,   382,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   384,   384,   384,
+     384,   384,   384,   384,   384,   384,   384,   384,   384,   384,
+     384,   384,   384,   384,   384,   384,   384,   384,   384,   384,
+     384,   384,   384,   384,   384,   384,   384,   384,   384,   384,
+     384,   384,   384,   384,   384,   384,   384,   384,   384,   384,
+     384,   384,   384,   384,   384,   384,   384,   384,   384,   384,
+     384,   384,   384,   384,   384,   384,   384,   384,   384,   384,
+     384,   384,   384,   384,   384,   384,   384,   384,   384,   384,
+     384,   384,   384,   384,   384,   384,   384,   384,   384,   384,
+     384,   384,   384,   384,   384,   384,   384,   384,   384,   384,
+     384,   384,   384,   384,   384,   384,   384,   384,   384,   384,
+     384,   384,   384,   384,   384,   384,   384,   384,   384,   384,
+     384,   384,   384,   384,   384,   384,   384,   384,   384,   384,
+     388,   389,   392,   393,   396,   397,   398,   399,   405,   413,
+     416,   419,   420,   421,   424,   427,   430,   433,   439,   445,
+     448,   454,   477,   481,   485,   490,   494,   498,   502,   509,
+     510,   514,   515,   519,   520,   521,   525,   526,   530,   531,
+     535,   536,   537,   541,   542,   546,   547,   548,   549,   550,
+     551,   552,   556,   561,   569,   572,   575,   576,   582,   587,
+     595,   598,   602,   606,   613,   617,   621,   625,   630,   640,
+     650,   655,   660,   664,   670,   679,   682,   686,   690,   696,
+     703,   709,   710,   711,   712,   716,   719,   750,   757,   758,
+     759,   760,   764,   767,   776,   782,   785,   791,   794,   800,
+     801,   809,   820,   829,   838,   846,   847,   851,   861,   870,
+     882,   885,   888,   892,   896,   900,   905,   910,   918,   919,
+     920,   923,   929,   932,   935,   941,   942,   943,   944,   945,
+     946,   947,   948,   952,   953,   957,   960,   963,   969,   972,
+     975,   983,   995,   998,  1001,  1008,  1011,  1021,  1024,  1027,
+    1030,  1031,  1032,  1036,  1039,  1042,  1053,  1056,  1062,  1063,
+    1067,  1068,  1072,  1076,  1082,  1083,  1089,  1092,  1098,  1101,
+    1104,  1110,  1114,  1115,  1119,  1120,  1124,  1125,  1132,  1133,
+    1137,  1144,  1155,  1162,  1173,  1180,  1191,  1202,  1216,  1217,
+    1229,  1232,  1235,  1238,  1245,  1248,  1254,  1263,  1275,  1283,
+    1286,  1296,  1309,  1314,  1331,  1341,  1351,  1354,  1358,  1364,
+    1378,  1395,  1398,  1404,  1411,  1421,  1428,  1431,  1437,  1442,
+    1450,  1454,  1458,  1462,  1466,  1470,  1477,  1481,  1485,  1489,
+    1493,  1499,  1503,  1510,  1513,  1524,  1528,  1532,  1538,  1551,
+    1564,  1577,  1580,  1587,  1590,  1593,  1596,  1602,  1606,  1613,
+    1616,  1619,  1629,  1632,  1638,  1639,  1645,  1648,  1654,  1655,
+    1665,  1668,  1675,  1680,  1685,  1695,  1698,  1704,  1707,  1713,
+    1720,  1727,  1728,  1729,  1730,  1731,  1732,  1733,  1734,  1735,
+    1739,  1742,  1748,  1751,  1754,  1757,  1760,  1766,  1770,  1778,
+    1779,  1783,  1790,  1793,  1796,  1800,  1803,  1806,  1812,  1816,
+    1824,  1831,  1839,  1847,  1848,  1849,  1850,  1851,  1852,  1853,
+    1854,  1855,  1856,  1860,  1863,  1869,  1872,  1878,  1879,  1883,
+    1886,  1892,  1895,  1901,  1908,  1915,  1918,  1921,  1928,  1933,
+    1941,  1942,  1943,  1944,  1945,  1946,  1947,  1948,  1952,  1955,
+    1961,  1964,  1970,  1977,  1978,  1982,  1989,  1992,  1998,  2006,
+    2009,  2015
 };
 #endif
 
@@ -401,23 +418,24 @@ static const char *const yytname[] =
   "MIXED", "ARRAY", "OBJECT", "CALLABLE", "VOID", "ZVAL", "INT8", "UINT8",
   "INT16", "UINT16", "INT32", "UINT32", "INT64", "UINT64", "NULL", "TRUE",
   "FALSE", "NAME", "NSNAME", "DOLLAR_NAME", "NUMBER", "QUOTED_STRING",
-  "QUOTED_CHAR", "\"end of line\"", "\";\"", "\"(\"", "\")\"", "\",\"",
-  "\":\"", "\"{\"", "\"}\"", "\"[\"", "\"]\"", "\"=\"", "\"#\"", "\"|\"",
-  "\"^\"", "\"&\"", "\"<<\"", "\">>\"", "\"+\"", "\"-\"", "\"*\"", "\"/\"",
-  "\"%\"", "\"<\"", "\">\"", "\">=\"", "\"<=\"", "\"||\"", "\"&&\"",
-  "\"==\"", "\"!=\"", "\"~\"", "\"!\"", "\".\"", "\"\\\\\"", "\"...\"",
-  "\"?\"", "PRAGMA", "PRAGMA_ONCE", "LINE", "ERROR", "WARNING", "IF",
-  "IFDEF", "IFNDEF", "ELSE", "ELIF", "ENDIF", "DEFINE", "DEFINED", "UNDEF",
-  "IMPORT", "INCLUDE", "INCLUDE_NEXT", "TYPEDEF", "STRUCT", "UNION",
-  "ENUM", "CONST", "LIB", "STATIC", "CALLBACK", "FUNCTION", "LET", "SET",
-  "TEMP", "FREE", "RETURN", "PRE_ASSERT", "POST_ASSERT", "BOOLVAL",
-  "INTVAL", "STRVAL", "PATHVAL", "STRLEN", "FLOATVAL", "ARRVAL", "OBJVAL",
-  "COUNT", "CALLOC", "TO_BOOL", "TO_INT", "TO_STRING", "TO_FLOAT",
-  "TO_ARRAY", "TO_OBJECT", "COMMENT", "WHITESPACE", "NO_WHITESPACE",
-  "CPP_HEADER", "CPP_ATTRIBUTE", "CPP_EXTENSION", "CPP_PASTE",
-  "CPP_RESTRICT", "CPP_ASM", "BINARY", "UNARY", "$accept",
-  "binary_op_token", "unary_op_token", "name_token", "any_noeol_token",
-  "file", "blocks", "block", "lib", "cpp", "cpp_exp", "cpp_ignored_token",
+  "QUOTED_CHAR", "SIZEOF", "VOLATILE", "\"end of line\"", "\";\"", "\"(\"",
+  "\")\"", "\",\"", "\":\"", "\"{\"", "\"}\"", "\"[\"", "\"]\"", "\"=\"",
+  "\"#\"", "\"|\"", "\"^\"", "\"&\"", "\"<<\"", "\">>\"", "\"+\"", "\"-\"",
+  "\"*\"", "\"/\"", "\"%\"", "\"<\"", "\">\"", "\">=\"", "\"<=\"",
+  "\"||\"", "\"&&\"", "\"==\"", "\"!=\"", "\"~\"", "\"!\"", "\".\"",
+  "\"\\\\\"", "\"...\"", "\"?\"", "PRAGMA", "PRAGMA_ONCE", "LINE", "ERROR",
+  "WARNING", "IF", "IFDEF", "IFNDEF", "ELSE", "ELIF", "ENDIF", "DEFINE",
+  "DEFINED", "UNDEF", "IMPORT", "INCLUDE", "INCLUDE_NEXT", "TYPEDEF",
+  "STRUCT", "UNION", "ENUM", "CONST", "LIB", "STATIC", "CALLBACK",
+  "FUNCTION", "LET", "SET", "TEMP", "FREE", "RETURN", "PRE_ASSERT",
+  "POST_ASSERT", "BOOLVAL", "INTVAL", "STRVAL", "PATHVAL", "STRLEN",
+  "FLOATVAL", "ARRVAL", "OBJVAL", "COUNT", "CALLOC", "TO_BOOL", "TO_INT",
+  "TO_STRING", "TO_FLOAT", "TO_ARRAY", "TO_OBJECT", "COMMENT",
+  "WHITESPACE", "NO_WHITESPACE", "CPP_HEADER", "CPP_ATTRIBUTE",
+  "CPP_EXTENSION", "CPP_PASTE", "CPP_INLINE", "CPP_RESTRICT", "CPP_ASM",
+  "BINARY", "UNARY", "$accept", "binary_op_token", "unary_op_token",
+  "name_token", "any_noeol_token", "any_nobrace_token", "file", "blocks",
+  "block", "lib", "cpp", "cpp_exp", "cpp_ignored_token",
   "cpp_message_token", "cpp_include_token", "cpp_header_token",
   "cpp_no_arg_token", "cpp_name_arg_token", "cpp_exp_arg_token",
   "cpp_special_name_token", "cpp_macro_decl", "cpp_macro_sig",
@@ -425,18 +443,21 @@ static const char *const yytname[] =
   "cpp_macro_decl_token_list", "cpp_macro_exp", "cpp_macro_call_args",
   "cpp_macro_call_arg_list", "constant", "constant_type",
   "constant_type_token", "impl_def_val", "impl_def_val_token",
-  "decl_typedef", "typedef", "const_decl_type", "decl_type",
+  "decl_typedef", "typedef", "typedef_anon", "typedef_decl",
+  "typedef_anon_decl", "qualified_decl_type", "decl_type",
   "decl_type_complex", "decl_type_simple", "decl_real_type",
   "decl_stdint_type", "int_signed", "int_width", "decl_int_type",
   "int_signed_types", "signed_short_types", "signed_long_types",
   "int_width_types", "decl_stmt", "decl_asm", "ignored_quoted_strings",
   "decl_ext_var_stmt", "decl_ext_var", "decl_ext_var_list", "decl_vars",
-  "decl", "decl_body", "decl_func_body", "decl_functor_body",
-  "decl_functor", "decl_func", "decl_args", "decl_anon_arg", "decl_arg",
-  "decl_var", "decl_union", "decl_struct", "decl_struct_args",
-  "struct_args_block", "struct_args", "struct_arg_var_list",
-  "decl_vars_with_layout", "decl_enum", "decl_enum_items",
-  "decl_enum_item", "num_exp", "number", "enum_name", "union_name",
+  "ignored_decl", "ignored_decl_body", "ignored_decl_body_stmts",
+  "ignored_decl_body_stmt", "decl", "decl_body", "decl_func_body",
+  "decl_functor_body", "decl_functor", "decl_func", "decl_args",
+  "decl_anon_arg", "decl_arg", "decl_var", "decl_union", "decl_struct",
+  "decl_struct_args", "struct_args_block", "struct_args",
+  "struct_arg_var_list", "decl_vars_with_layout", "decl_enum",
+  "decl_enum_items", "decl_enum_item", "num_exp", "number", "sizeof",
+  "sizeof_body", "sizeof_body_notypes", "enum_name", "union_name",
   "struct_name", "optional_name", "decl_layout", "align_and_size",
   "array_size", "indirection", "pointers", "asterisks", "asterisk", "impl",
   "impl_func", "impl_args", "impl_arg", "impl_var", "impl_type",
@@ -450,85 +471,103 @@ static const char *const yytname[] =
 };
 #endif
 
-#define YYPACT_NINF -565
-#define YYTABLE_NINF -484
+#define YYPACT_NINF -722
+#define YYTABLE_NINF -640
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const short int yypact[] =
 {
-     954,  -565,  -565,  -565,  -565,  -565,   113,  -565,  -565,  2258,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  2910,  -565,
-    -565,   192,  2937,  2766,  2766,  2766,   541,    35,    10,    50,
-    -565,   313,    95,   954,  -565,  -565,  -565,  -565,  -565,  2307,
-    -565,  -565,  -565,  -565,  -565,    41,    36,  -565,  -565,  -565,
-      75,    -4,  -565,  -565,    79,    77,   106,  -565,  -565,  -565,
-    -565,    91,  -565,   116,  -565,  -565,  -565,  -565,  -565,   664,
-    -565,   105,    71,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  2425,   -22,  -565,  -565,  -565,  -565,  2766,  2766,
-    2766,  3091,  -565,   107,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,   913,  -565,  -565,  -565,
-    -565,   149,   794,   794,     3,  -565,   913,  2140,  2258,  2766,
-    2766,   150,  1904,  -565,  -565,   153,  2766,   154,   154,    33,
-      33,   162,  -565,  -565,   175,   184,  -565,   105,   187,  -565,
-    -565,   182,   197,  -565,   198,  -565,  2987,  3014,    -4,  -565,
-    -565,   196,  -565,   204,  2766,  -565,   239,  -565,    73,  -565,
-    -565,    41,  -565,  -565,   208,   210,  3041,  3041,  2766,   -41,
-    2766,  -565,  -565,   105,  -565,  -565,  -565,  -565,  -565,  -565,
-    2307,  -565,  -565,  -565,  -565,  -565,  -565,   126,   794,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,   794,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  2140,  -565,  -565,  -565,  -565,  2474,
-    2140,   215,  3264,   211,    13,  -565,    13,  -565,  -565,  -565,
-    -565,   214,   216,   216,    30,    30,  2592,   213,  -565,   -41,
-     218,   220,   224,     8,  -565,   105,   196,  -565,  -565,  -565,
-    -565,  -565,  -565,   228,  -565,     1,  3118,  2307,    45,  -565,
-    -565,   129,   217,    46,  -565,  2307,  1786,  2307,  2766,    81,
-    -565,  -565,   109,  -565,  -565,  -565,  -565,  -565,  2022,  -565,
-     237,  2766,   241,  -565,  2766,   244,  -565,  -565,  3136,  2766,
-    -565,  -565,  2140,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  2140,  2140,  -565,   245,  3014,  2307,  2307,  -565,  -565,
-    -565,  -565,   105,  -565,  1196,   123,   371,  -565,  -565,   240,
-    -565,  2766,  -565,  -565,    42,  2425,   105,   204,   196,  1048,
-     196,  2883,  2022,  2766,  -565,   238,   249,  -565,  -565,  -565,
-    1078,  2022,  -565,  3288,  -565,   242,   250,  -565,   255,   262,
-     251,   257,    56,  -565,  -565,   259,   255,  -565,  -565,  3108,
-    -565,   260,  2307,  2643,  -565,   263,  3264,   265,   266,  3215,
-    -565,   274,   267,  1945,  -565,  -565,  2766,  -565,  -565,  -565,
-    -565,   272,  -565,  3288,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -565,  -565,  -565,   269,   141,  -565,    50,  -565,  -565,
-     276,  -565,  -565,  2592,  -565,     1,   286,  -565,  -565,   289,
-    3288,  -565,  1314,  -565,   290,   485,   292,  3163,  -565,  2022,
-    2022,  1786,  -565,  2307,  -565,    50,  2307,  -565,  2766,  -565,
-    -565,  -565,  -565,  -565,  -565,   301,   273,  -565,  -565,  2140,
-    2140,   302,     7,   305,  -565,   267,   307,  -565,   464,   300,
-     464,   306,  -565,   196,   196,  -565,   233,   125,   315,  3288,
-    -565,  -565,  -565,  -565,   316,  1432,  2022,  -565,  3240,  -565,
-    -565,   311,  2307,   143,  -565,   794,  2717,  3264,  3312,   322,
-     319,   323,  2307,   320,   305,  -565,  -565,   464,  -565,    50,
-    1196,  -565,  -565,   315,  -565,  -565,  -565,  -565,   324,  2022,
-      50,  -565,  -565,  2022,  1550,   325,   328,  -565,  -565,  -565,
-    -565,   330,   326,   337,   267,   331,  -565,   335,  -565,    -2,
-    -565,    50,   594,   333,  3336,   336,  -565,   339,  -565,  -565,
-    -565,   338,   342,  -565,  2307,  -565,   357,   352,  2022,  1314,
-     353,  -565,  1786,   360,   361,   267,   356,  1668,  3190,   238,
-    -565,  -565,  -565,   359,  1432,  -565,  -565,   369,   358,  -565,
-     355,   362,   372,  -565,  -565,  1314,  -565,   367,  -565,   464,
-     374,  1786,  -565,   376,  -565,  -565,  -565,  -565
+     481,  -722,  -722,  -722,  -722,  -722,    47,  -722,  -722,  3033,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  3652,   726,
+    -722,  -722,   477,  1491,  3454,  3454,  3454,  1825,    48,   278,
+      12,  -722,  1620,  3686,    93,   481,  -722,  -722,  -722,  -722,
+    -722,  3109,  -722,  -722,  -722,  -722,  -722,    91,   147,  -722,
+    -722,  -722,    64,  -722,   -21,  -722,  -722,    70,    84,   122,
+    -722,  -722,  -722,  -722,   120,  -722,   126,  -722,  -722,  -722,
+    -722,  -722,   837,  -722,   115,    80,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,   685,   -18,  -722,  -722,  -722,
+    -722,  3454,  3454,  3454,  2065,  -722,    59,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    1357,  -722,  -722,  -722,  -722,   158,   970,   970,    14,  -722,
+    1357,  2864,  3033,  3454,  3454,  3731,   160,  -722,  2984,  -722,
+    -722,   162,  3454,   163,   163,    82,    82,   161,  -722,  -722,
+     178,   179,  -722,   115,   181,  -722,  -722,   174,  3686,   171,
+     172,  -722,   187,  -722,  3765,  1528,   -21,   171,  -722,  -722,
+     173,  -722,   180,  3454,  -722,   217,  -722,    68,  -722,  -722,
+      91,  -722,  -722,   184,   186,  3810,  3810,  3454,   258,  3454,
+    -722,  -722,   115,  -722,  -722,  -722,  -722,  -722,  -722,  3109,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,   102,   970,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,   970,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,    19,  2864,  -722,
+    -722,  -722,  -722,  3158,  2864,   188,  4043,  -722,   190,    98,
+    -722,   103,  -722,  -722,  -722,  -722,  -722,   191,   189,   189,
+      36,    36,  3278,   192,  -722,   171,  1236,  -722,   258,   195,
+     198,   199,  -722,  2384,  -722,   115,   173,  -722,  -722,  -722,
+     233,  -722,  -722,   208,  -722,    15,  2665,  3109,   116,  -722,
+    -722,   136,   197,    77,  -722,  3109,  2504,  3109,  3454,   132,
+    -722,  -722,   159,  -722,  -722,  -722,  -722,  -722,  2624,  -722,
+     202,  3454,   213,  -722,  3454,   234,  -722,  -722,  -722,  -722,
+    3844,   227,  -722,  3889,  3454,  -722,  -722,  2864,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  2864,  2864,  -722,   236,
+    1570,  3109,  3109,  -722,  -722,  -722,  -722,   115,  -722,  1784,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  1103,  -722,   166,    73,
+    -722,  -722,  -722,  -722,  -722,  1664,  -722,  2624,  -722,  2965,
+    -722,  -722,  3454,  -722,  -722,  -722,    26,   685,   115,   180,
+     173,  3573,   173,  3607,  2624,  3454,  -722,   225,   238,  4067,
+     230,   240,  -722,   241,   248,   242,   251,    76,  -722,  -722,
+     253,   241,  -722,  -722,  3856,  -722,   252,  3109,  3329,   115,
+     255,  -722,  -722,  -722,   264,  4043,   265,   267,  3994,  -722,
+     261,  3731,   268,  -722,  -722,  2744,  1399,  3454,   163,   163,
+    -722,  -722,  3454,  -722,  -722,  -722,  -722,   271,  -722,  4067,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,   269,   138,  -722,    12,  -722,   266,   726,   273,
+    3916,  -722,  -722,  2624,  2624,   277,  -722,  -722,  3278,  -722,
+      15,   279,  -722,  -722,   290,  4067,  -722,  1904,  -722,  2504,
+    -722,  3109,  -722,    12,  3109,  -722,  3454,  -722,  -722,  -722,
+    -722,  -722,  -722,   292,   293,  -722,  -722,  -722,  -722,  2864,
+    2864,   294,  -722,    30,   295,  -722,   268,   189,   189,   299,
+    -722,   519,   291,   519,   297,  2624,  -722,  4019,  -722,  -722,
+     173,   173,  -722,   231,   214,   301,  4067,  -722,  -722,  -722,
+    -722,   303,  2024,  -722,   304,  3109,   142,  -722,   970,  3405,
+    4043,  4091,   315,   309,   313,  3109,   326,   295,  3109,  3109,
+    -722,  -722,   519,  -722,    12,  1784,  -722,  2624,  -722,  -722,
+     301,  -722,  -722,  -722,  -722,   327,  2624,    12,  -722,  2144,
+     328,   339,  -722,  -722,  -722,  -722,   338,   337,   348,   268,
+     340,  -722,   344,  -722,    20,  -722,  4115,    12,  3969,   342,
+     347,  -722,   343,  -722,  -722,  -722,   349,   350,  -722,  3109,
+    -722,   358,   353,  2624,  1904,   354,  -722,  2504,   363,   364,
+     268,   357,  2264,  3943,   225,  -722,  -722,  -722,   360,  2024,
+    -722,  -722,   362,   359,  -722,   356,   366,   370,  -722,  -722,
+    1904,  -722,   372,  -722,   519,   374,  2504,  -722,   375,  -722,
+    -722,  -722,  -722
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -536,114 +575,134 @@ static const short int yypact[] =
      means the default is an error.  */
 static const unsigned short int yydefact[] =
 {
-     164,   289,   286,   290,   284,   285,   287,   273,   274,     0,
-     276,   277,   278,   279,   280,   281,   282,   283,   272,   169,
-     168,     0,     0,     0,     0,   375,     0,     0,     0,   483,
-     170,     0,     0,   165,   166,   172,   171,   173,   176,   386,
-     263,   265,   264,   270,   271,   293,   303,   269,   174,   175,
-       0,   308,   318,   320,   321,     0,     0,   330,   178,   177,
-     179,     0,   180,     0,   288,   275,    33,    34,   471,   437,
-      24,   386,   392,    39,    38,    37,    35,    36,    32,    31,
-      25,    29,    28,    26,    27,   445,   444,   442,   440,   441,
-     443,   439,   438,   446,    30,   469,   467,   466,   468,   465,
-     464,   331,     0,   388,   390,    40,    41,   272,     0,     0,
-       0,     0,   319,   314,   182,   193,   190,   192,   194,   195,
-     206,   203,   204,   201,   207,   202,     0,   205,   196,   197,
-     198,     0,   222,   222,     0,   186,     0,     0,     0,   375,
-     375,     0,   386,   257,   340,   256,     0,   381,   381,   266,
-     267,   268,   372,   242,   290,   273,   245,     0,     0,   241,
-     262,     0,     0,   485,     0,   484,   272,     0,   308,     1,
-     167,   383,   341,     0,   387,   294,   298,   296,   300,   291,
-     304,   293,   292,   312,     0,     0,   332,   332,     0,     0,
-       0,   387,   393,   386,   343,   389,   391,   266,   267,   268,
-       0,   313,   209,   210,   211,   213,   212,   208,   222,   188,
-     183,    75,    42,    43,    44,    45,    46,    47,    48,    49,
+     290,   428,   425,   429,   423,   424,   426,   412,   413,     0,
+     415,   416,   417,   418,   419,   420,   421,   422,   411,     0,
+     295,   294,     0,     0,     0,     0,   531,     0,     0,     0,
+     639,   296,     0,     0,     0,   291,   292,   298,   297,   299,
+     303,   542,   402,   404,   403,   409,   410,   432,   443,   408,
+     300,   302,     0,   301,   448,   466,   468,   469,     0,     0,
+     478,   305,   304,   306,     0,   307,     0,   427,   414,    33,
+      34,   627,   593,    24,   542,   548,    39,    38,    37,    35,
+      36,    32,    31,    25,    29,    28,    26,    27,   601,   600,
+     598,   596,   597,   599,   595,   594,   602,    30,   625,   623,
+     622,   624,   621,   620,   479,     0,   544,   546,    40,    41,
+     411,     0,     0,     0,     0,   467,   454,   401,   309,   320,
+     317,   319,   321,   322,   333,   330,   331,   328,   334,   329,
+       0,   332,   323,   324,   325,     0,   350,   350,     0,   313,
+       0,     0,     0,   531,   531,     0,     0,   385,   542,   390,
+     488,   389,     0,   537,   537,   405,   406,   407,   528,   371,
+     429,   412,   374,     0,     0,   370,   400,     0,     0,     0,
+       0,   641,     0,   640,   411,     0,   448,     0,     1,   293,
+     539,   489,     0,   543,   433,   437,   435,   439,   430,   444,
+     432,   431,   452,     0,     0,   480,   480,     0,     0,     0,
+     543,   549,   542,   491,   545,   547,   405,   406,   407,     0,
+     453,   336,   337,   338,   340,   341,   339,   335,   350,   315,
+     310,    75,    42,    43,    44,    45,    46,    47,    48,    49,
       50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
       60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,   105,   106,   107,   108,   109,   115,
-     113,   114,   112,   110,   111,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,   132,   133,   134,   135,   136,   137,   138,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,   152,   153,   154,   155,   156,   157,   158,   159,   162,
-     160,   161,   163,   224,   191,   223,   184,   199,   200,   185,
-     208,   187,   232,   233,     0,    22,    23,    20,    21,     0,
-       0,   234,   189,   331,   266,   374,   267,   373,   253,   261,
-     258,     0,     0,     0,     0,     0,     0,     0,   181,     0,
-       0,     0,     0,     0,   345,   386,   383,   299,   295,   301,
-     302,   297,   305,     0,   306,   333,     0,   386,     0,   334,
-     336,     0,   360,     0,   358,     0,   483,     0,     0,     0,
-     477,   478,     0,   414,   417,   416,   418,   419,     0,   420,
-       0,     0,   315,   316,     0,     0,   215,   225,     0,     0,
-     230,   227,   236,     2,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    13,    12,    14,    15,    16,    17,    18,
-      19,     0,     0,   254,     0,     0,     0,     0,   348,   347,
-     349,   346,   386,   342,   246,     0,     0,   255,   307,     0,
-     384,     0,   344,   310,     0,   339,     0,   337,   383,     0,
-     383,     0,     0,     0,   357,     0,     0,   369,   368,   370,
-       0,     0,   371,   460,   362,     0,     0,   459,    41,     0,
-       0,     0,     0,   480,   470,     0,     0,   394,   415,     0,
-     329,     0,     0,   216,   226,     0,   238,     0,   237,     0,
-     228,     0,   377,     0,   260,   259,     0,   249,   250,   251,
-     252,     0,   248,   247,   395,   407,   408,   409,   410,   406,
-     411,   412,   413,   405,     0,     0,   399,   483,   404,   385,
-       0,   311,   309,   338,   324,     0,     0,   335,   322,     0,
-     361,   359,     0,   421,    24,     0,     0,     0,   366,     0,
-       0,   483,   458,     0,   403,   483,     0,   479,     0,   457,
-     476,   328,   317,   217,   220,     0,   218,   231,   235,     0,
-       0,     0,     0,   353,   350,   377,     0,   240,     0,     0,
-       0,   401,   326,   383,   383,   426,     0,    31,    30,   431,
-     432,   427,   429,   430,    40,     0,     0,   364,     0,   365,
-     461,   472,     0,     0,   481,   222,     0,   239,   229,     0,
-     378,     0,     0,     0,   353,   327,   396,     0,   400,   483,
-     246,   325,   323,     0,   428,   451,   437,   452,     0,     0,
-     483,   433,   363,     0,   483,     0,     0,   482,   214,   219,
-     221,     0,     0,     0,   377,   354,   351,     0,   397,     0,
-     402,   483,     0,   447,   367,     0,   474,   473,   462,   422,
-     382,     0,     0,   355,     0,   352,     0,     0,     0,     0,
-       0,   463,   483,     0,     0,   377,     0,   453,     0,   371,
-     449,   425,   423,   448,     0,   436,   475,     0,     0,   356,
-       0,     0,   454,   455,   434,     0,   424,     0,   379,     0,
-       0,   483,   450,     0,   398,   435,   456,   380
+      70,    71,    72,    73,    74,   165,   166,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
+      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
+     109,   115,   113,   114,   112,   110,   111,   116,   117,   118,
+     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
+     149,   150,   151,   152,   153,   154,   155,   156,   157,   158,
+     159,   163,   160,   161,   162,   164,   352,   318,   351,   311,
+     326,   327,   312,   335,   314,   360,   361,     0,     0,    22,
+      23,    20,    21,     0,     0,   363,   316,   362,   479,   405,
+     530,   406,   529,   386,   382,   394,   391,     0,     0,     0,
+       0,     0,     0,     0,   308,     0,     0,   458,     0,     0,
+       0,     0,   459,     0,   493,   542,   539,   438,   434,   440,
+     441,   436,   445,     0,   446,   481,     0,   542,     0,   482,
+     484,     0,   508,     0,   506,     0,   639,     0,     0,     0,
+     633,   634,     0,   570,   573,   572,   574,   575,     0,   576,
+       0,     0,   455,   456,     0,     0,   343,   353,   527,   526,
+       0,     0,   522,     0,     0,   358,   355,   365,     2,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    13,    12,
+      14,    15,    16,    17,    18,    19,     0,     0,   383,     0,
+       0,     0,     0,   496,   495,   497,   494,   542,   490,   375,
+     460,   200,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   192,   193,   194,
+     195,   196,   197,   198,   199,   288,   289,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
+     214,   215,   216,   217,   218,   219,   220,   221,   222,   223,
+     224,   225,   226,   227,   228,   229,   230,   231,   232,   238,
+     236,   237,   235,   233,   234,   239,   240,   241,   242,   243,
+     244,   245,   246,   247,   248,   249,   250,   251,   252,   253,
+     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,   282,   286,
+     283,   284,   285,   287,   464,   465,     0,   462,     0,     0,
+     384,   447,   517,   516,   518,     0,   540,     0,   519,     0,
+     510,   520,     0,   492,   442,   450,     0,   487,     0,   485,
+     539,     0,   539,     0,     0,     0,   505,     0,     0,   616,
+       0,     0,   615,    41,     0,     0,     0,     0,   636,   626,
+       0,     0,   550,   571,     0,   477,     0,     0,   344,   542,
+       0,   523,   525,   354,     0,   367,     0,   366,     0,   356,
+       0,     0,   533,   395,   387,   396,     0,   397,   537,   537,
+     393,   392,     0,   378,   379,   380,   381,     0,   377,   376,
+     461,   463,   551,   563,   564,   565,   566,   562,   567,   568,
+     569,   561,     0,     0,   555,   639,   560,    24,     0,     0,
+       0,   514,   541,     0,     0,     0,   451,   449,   486,   472,
+       0,     0,   483,   470,     0,   509,   507,     0,   577,   639,
+     614,     0,   559,   639,     0,   635,     0,   613,   632,   476,
+     457,   345,   348,     0,   346,   524,   521,   359,   364,     0,
+       0,     0,   388,     0,   501,   498,   533,     0,     0,     0,
+     369,     0,     0,     0,   557,     0,   512,     0,   513,   474,
+     539,   539,   582,     0,    31,    30,   587,   588,   583,   585,
+     586,    40,     0,   617,   628,     0,     0,   637,   350,     0,
+     368,   357,     0,   534,     0,     0,     0,   501,   399,   398,
+     475,   552,     0,   556,   639,   375,   511,     0,   473,   471,
+       0,   584,   607,   593,   608,     0,     0,   639,   589,   639,
+       0,     0,   638,   342,   347,   349,     0,     0,     0,   533,
+     502,   499,     0,   553,     0,   558,   515,   639,     0,   603,
+       0,   630,   629,   618,   578,   538,     0,     0,   503,     0,
+     500,     0,     0,     0,     0,     0,   619,   639,     0,     0,
+     533,     0,   609,     0,   519,   605,   581,   579,   604,     0,
+     592,   631,     0,     0,   504,     0,     0,   610,   611,   590,
+       0,   580,     0,   535,     0,     0,   639,   606,     0,   554,
+     591,   612,   536
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -565,  -317,  -130,     0,    82,  -565,  -565,   383,  -565,  -565,
-    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,   282,  -565,
-    -565,  -565,  -128,  -565,  -328,  -565,  -565,  -565,  -565,  -565,
-    -210,  -565,  -565,  -154,   -11,   -23,  -565,  -565,  -565,   279,
-     377,  -565,  -565,   243,  -565,  -565,  -565,  -565,   258,  -565,
-    -565,  -565,  -565,  -141,   396,    -1,   -16,    18,  -565,  -565,
-     246,  -312,   -14,   -39,  -565,  -565,    65,  -285,  -565,  -196,
-    -565,    38,  -565,   -38,  -389,  -565,  -565,  -565,  -565,    63,
-    -564,   -20,  -350,   -61,    -7,  -565,   329,  -565,   408,  -565,
-    -153,  -506,  -561,  -565,    69,  -368,  -565,  -266,  -532,    48,
-    -156,  -565,  -565,  -500,  -565,  -565,  -565,  -565,  -565,  -565,
-    -565,  -533,    47,  -384,  -565,  -565,  -565,  -565,  -565,  -565,
-    -124,   -28,  -538
+    -722,  -352,  -128,    -7,    65,  -722,  -722,  -722,   382,  -722,
+    -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,  -722,   280,
+    -722,  -722,  -722,  -134,  -722,  -315,  -722,  -722,  -722,  -722,
+    -722,  -386,  -722,  -722,   243,  -255,    22,  -249,    -2,   -12,
+    -722,  -722,  -722,  -138,   377,  -722,  -722,   239,  -722,  -722,
+    -722,  -722,   250,  -722,  -722,  -722,  -722,  -301,  -722,  -141,
+    -722,  -170,   409,    17,   -15,    33,  -722,  -722,   246,  -504,
+     -14,   -41,  -722,  -722,    62,  -348,  -722,  -353,  -722,     6,
+    -722,  -190,  -359,  -722,  -117,  -722,     7,  -722,  -454,  -450,
+      43,  -712,  -129,  -384,   -63,    -4,  -722,   345,  -722,   420,
+    -722,  -313,  -648,  -721,  -722,    66,  -400,  -722,  -428,  -704,
+      38,  -312,  -722,  -722,  -666,  -722,  -722,  -722,  -722,  -722,
+    -722,  -722,  -691,    39,  -387,  -722,  -722,  -722,  -722,  -722,
+    -722,  -274,   -29,  -680
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const short int yydefgoto[] =
 {
-      -1,   560,   481,   171,   333,    32,    33,    34,    35,    36,
-     131,   132,   133,   134,   339,   135,   136,   137,   208,   209,
-     575,   576,   334,   335,   352,   507,   508,    37,   158,   159,
-     521,   522,    38,   141,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,   179,   378,   381,   182,    48,   185,   464,
-      49,    50,   201,   412,    51,    52,    53,   144,    55,    56,
-     388,   389,    57,   482,    58,    59,   449,   450,   513,   623,
-     655,   146,   393,   394,   483,   484,    61,   147,   148,   152,
-     583,   362,   374,   173,   414,   103,   104,    62,    63,   535,
-     536,   485,   537,   538,   402,   403,   404,   690,   691,   692,
-     601,   602,   603,   105,   680,   693,   638,   701,   702,   405,
-     406,   486,   487,   106,   645,   667,   407,   408,   409,   492,
-     493,   489,   165
+      -1,   714,   617,   180,   346,   604,    34,    35,    36,    37,
+      38,   135,   136,   137,   138,   352,   139,   140,   141,   218,
+     219,   743,   744,   347,   348,   366,   666,   667,    39,   164,
+     165,   687,   688,    40,   146,   672,   673,   674,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,   188,   398,   401,
+     191,    50,   194,   626,    51,    52,   210,   432,    53,   605,
+     606,   607,    54,    55,    56,   150,    58,    59,   408,   409,
+      60,   618,    61,    62,   474,   475,   676,   796,   830,   152,
+     413,   414,   639,   620,   621,   660,   442,    64,   153,   154,
+     158,   754,   378,   394,   182,   434,   106,   107,    65,    66,
+     703,   704,   640,   705,   706,   422,   423,   424,   865,   866,
+     867,   778,   779,   780,   108,   855,   868,   815,   876,   877,
+     425,   426,   641,   642,   109,   820,   842,   427,   428,   429,
+     647,   648,   644,   173
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -651,824 +710,1014 @@ static const short int yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const short int yytable[] =
 {
-     172,   164,   102,   160,   113,   336,   143,   350,   145,   101,
-     190,   142,   488,   371,   605,   496,   418,   112,    54,   499,
-     600,   624,   421,   149,   150,   151,   462,   626,   610,   629,
-     564,   591,   174,    72,   498,   442,    54,   337,    60,    71,
-     620,   459,   180,     4,     5,   175,   176,   177,   621,    54,
-     178,    54,   604,   460,  -376,  -376,    72,   395,   396,   397,
-     398,   399,   400,   401,   191,   523,   658,   448,   676,   161,
-    -381,    60,   445,   641,   361,  -381,   541,   446,   447,   379,
-     416,   542,   380,   550,   468,   469,   473,   498,   160,   474,
-     673,   557,   558,   567,   506,   169,   568,   637,    68,   494,
-     163,   442,   194,   172,   442,   604,   195,    29,   197,   198,
-     199,   666,   183,   509,   510,   186,  -321,  -340,   544,  -340,
-     548,   699,    64,   591,    65,   184,   207,   338,   363,   364,
-     365,   102,   411,   188,   663,   174,   340,   351,   353,   354,
-     356,   694,   635,   636,   187,  -330,   360,   200,   714,   696,
-     366,   143,   497,   145,   703,   677,   142,   547,   189,   547,
-      72,   413,   706,   599,   192,   112,   524,   694,   470,   471,
-     608,   609,   390,   390,   376,   387,   387,   488,   716,   604,
-     589,   590,   647,   502,    54,   210,   191,   358,   392,   442,
-     410,  -330,   442,   442,   604,   361,    95,    96,    97,    98,
-      99,   100,   355,   357,  -376,   604,  -243,   395,   396,   397,
-     398,   399,   400,   401,   350,  -244,   599,   642,   367,   368,
-     350,   395,   396,   397,   398,   399,   400,   401,   114,   370,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,   369,
-     373,   523,   375,   631,   632,   377,   383,   384,   443,   415,
-     662,   617,   618,   422,   664,   444,   456,   457,   445,   454,
-     488,   458,   463,   472,   115,   116,   117,   118,   119,   120,
-     121,   122,   123,   124,   125,   126,   500,   127,   128,   129,
-     130,   502,   503,   511,   552,   539,   553,   562,   561,   688,
-     599,   512,   350,   563,   564,   566,   569,   565,   488,   571,
-     442,   442,   577,   488,   578,   599,   579,   581,   582,   587,
-     588,   350,   350,   616,   461,   592,   599,     1,     2,     3,
-       4,     5,     6,     7,     8,   593,   467,   488,   594,   -24,
-       9,   606,    10,    11,    12,    13,    14,    15,    16,    17,
-     615,   627,   619,   166,   351,   622,   625,   633,   172,   420,
-     351,   644,   630,   639,   640,   651,   475,   656,   490,   585,
-     652,   653,   661,   160,   668,   669,   453,   671,   191,   670,
-     672,   674,   675,   679,   525,   681,   683,   526,   465,   682,
-     174,   527,   684,   528,   529,   530,   531,   532,   533,   686,
-     687,   516,   695,   697,   698,   700,   709,   708,   491,   705,
-     713,   710,   167,   108,   109,   110,   111,   514,   515,   707,
-     534,   501,   711,   715,   376,   717,   170,   417,   341,   505,
-     660,   359,   351,   181,   382,   613,   372,   168,   657,   143,
-     451,   145,   196,   391,   142,   551,   162,   628,   455,   712,
-     634,   351,   351,   476,   614,   191,   495,     0,     0,   350,
-     350,     0,     0,     0,     0,   390,     0,   390,   387,   543,
-     387,   540,     0,   572,     0,   194,     0,   525,     0,   556,
-     526,     0,     0,   392,   527,     0,   528,   529,   530,   531,
-     532,   533,     0,     0,     0,     0,     0,   648,     0,     1,
-       2,     3,     4,     5,     6,     7,     8,   143,     0,   145,
-       0,     0,   142,   574,    10,    11,    12,    13,    14,    15,
-      16,    17,     0,     0,     0,   107,   586,     0,     0,     0,
-       0,     0,     0,     0,   611,     0,     0,   413,     0,     0,
-       0,     0,   160,     0,     0,     0,     0,   612,   465,     0,
-       0,     0,     0,   453,   153,     1,     2,   154,     4,     5,
-       6,   155,     8,   156,     0,     0,     0,     0,   157,     0,
-      10,    11,    12,    13,    14,    15,    16,    17,   491,     0,
-       0,   107,     0,   646,     0,   108,   109,   110,     0,   351,
-     351,     0,     0,   654,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   659,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   650,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   108,   109,   110,   678,   685,     0,     0,     0,     0,
-     689,     0,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
-       0,     0,     0,     0,  -437,   559,   689,  -437,  -437,  -437,
-    -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,
-    -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,
-    -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,
-    -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,
-    -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,
-    -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,
-    -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,
-    -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,
-       0,  -437,     0,  -437,  -437,  -437,  -437,  -437,  -437,  -437,
-    -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,
-    -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,  -437,
-    -437,  -437,  -437,  -437,  -437,  -437,     0,  -437,  -437,     0,
-    -437,  -437,  -437,  -437,   211,     0,     0,   212,   213,   214,
-     215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   227,   228,   229,   230,   231,   232,   233,   234,
-     235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-       0,   245,   246,   247,   248,   249,   250,   251,   252,   253,
-     254,   255,   256,   257,   258,   259,   260,   261,   262,   263,
-     264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
-     274,   275,   276,   277,   278,   279,   280,   281,   282,   283,
-     284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
-       0,   294,     0,   295,   296,   297,   298,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,   326,   327,    66,     0,   328,     0,
-     329,   330,   331,   332,     0,    67,     0,     0,     0,     0,
-      68,    69,     0,     0,     0,     0,     0,     0,     0,     0,
-     202,   203,   204,    70,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     1,     2,
-       3,     4,     5,     6,     7,     8,     0,     0,     0,     0,
-       0,     9,     0,    10,    11,    12,    13,    14,    15,    16,
-      17,     0,     0,     0,    18,    73,    74,    75,    76,    77,
-      19,    20,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    21,     0,     0,     0,     0,     0,    78,     0,    79,
-      80,    81,    82,    83,    84,     0,     0,     0,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,     0,     0,     0,     0,     0,   205,
-       0,   206,     0,    22,    23,    24,    25,    26,    27,    28,
-       0,    29,     1,     2,     3,     4,     5,     6,     7,     8,
-       0,     0,     0,     0,     0,   545,     0,    10,    11,    12,
-      13,    14,    15,    16,    17,    30,     0,     0,   107,     0,
-      31,    66,     1,     2,     3,     4,     5,     6,     7,     8,
-      67,     0,     0,     0,     0,    68,    69,    10,    11,    12,
-      13,    14,    15,    16,    17,     0,     0,     0,   554,   477,
-       0,   478,     0,   479,     0,     0,   480,     0,   546,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   345,   346,    72,     0,     0,     0,     0,   108,   109,
-     110,   386,     0,     0,   347,   348,     0,     0,     0,     0,
-      73,    74,    75,    76,    77,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   108,   109,
-     110,   555,    78,     0,    79,    80,    81,    82,    83,    84,
-       0,     0,     0,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    95,    96,    97,    98,    99,   100,    66,
-       0,     0,     0,     0,     0,     0,     0,     0,    67,     0,
-       0,     0,     0,    68,    69,     0,     0,     0,     0,     0,
-       0,     0,     0,   517,   518,   519,    70,   477,     0,   478,
-     520,   479,     0,     0,   480,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   345,
-     346,    72,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   347,   348,     0,     0,     0,     0,    73,    74,
-      75,    76,    77,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      78,     0,    79,    80,    81,    82,    83,    84,     0,     0,
-       0,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,    66,     0,     0,
-       0,     0,     0,     0,     0,     0,    67,     0,     0,     0,
-       0,    68,    69,     0,     0,     0,     0,     0,     0,     0,
-       0,   595,     0,     0,    70,   477,     0,   478,     0,   479,
-       0,     0,   480,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   163,     0,     0,   345,   346,    72,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     347,   348,     0,     0,     0,     0,    73,    74,    75,    76,
-      77,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    78,   596,
-     597,    80,    81,    82,    83,    84,     0,     0,     0,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,   598,    95,
-      96,    97,    98,    99,   100,    66,     0,     0,     0,     0,
-       0,     0,     0,     0,    67,     0,     0,     0,     0,    68,
-      69,     0,     0,     0,     0,     0,     0,     0,     0,   595,
-       0,     0,    70,   477,     0,   478,     0,   479,     0,     0,
-     480,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   345,   346,    72,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   347,   348,
-       0,     0,     0,     0,    73,    74,    75,    76,    77,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    78,   596,   597,    80,
-      81,    82,    83,    84,     0,     0,     0,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,   598,    95,    96,    97,
-      98,    99,   100,    66,     0,     0,     0,     0,     0,     0,
-       0,     0,    67,     0,     0,     0,     0,    68,    69,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      70,   477,     0,   478,     0,   479,     0,     0,   480,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     163,     0,     0,   345,   346,    72,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   347,   348,     0,     0,
-     665,     0,    73,    74,    75,    76,    77,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    78,     0,    79,    80,    81,    82,
-      83,    84,     0,     0,     0,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,    66,     0,     0,     0,     0,     0,     0,     0,     0,
-      67,     0,     0,     0,     0,    68,    69,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    70,   477,
-    -483,   478,     0,   479,     0,     0,   480,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   163,     0,
-       0,   345,   346,    72,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   347,   348,     0,     0,     0,     0,
-      73,    74,    75,    76,    77,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    78,     0,    79,    80,    81,    82,    83,    84,
-       0,     0,     0,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    95,    96,    97,    98,    99,   100,    66,
-       0,     0,     0,     0,     0,     0,     0,     0,    67,     0,
-       0,     0,     0,    68,    69,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    70,   477,     0,   478,
-       0,   479,     0,     0,   480,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   163,     0,     0,   345,
-     346,    72,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   347,   348,     0,     0,     0,     0,    73,    74,
-      75,    76,    77,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      78,     0,    79,    80,    81,    82,    83,    84,     0,     0,
-       0,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,    66,     0,     0,
-       0,     0,     0,     0,     0,     0,    67,     0,     0,     0,
-       0,    68,    69,    10,    11,    12,    13,    14,    15,    16,
-      17,     0,     0,     0,    70,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     1,
-       2,     3,     4,     5,     6,     7,     8,     0,     0,    72,
-       0,     0,     9,     0,    10,    11,    12,    13,    14,    15,
-      16,    17,     0,     0,     0,   107,    73,    74,    75,    76,
-      77,     0,     0,     0,     0,     0,     0,     0,   584,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    78,     0,
-      79,    80,    81,    82,    83,    84,     0,     0,     0,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,    66,     0,     0,     0,     0,
-       0,     0,     0,     0,    67,   139,   140,    25,   111,    68,
-      69,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    70,   477,     0,   478,     0,   479,     0,     0,
-     480,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   345,   346,    72,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   347,   348,
-       0,     0,     0,     0,    73,    74,    75,    76,    77,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    78,     0,    79,    80,
-      81,    82,    83,    84,     0,     0,     0,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-      98,    99,   100,    66,     0,     0,     0,     0,     0,     0,
-       0,     0,    67,     0,     0,     0,     0,    68,    69,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      70,     0,     0,   342,     0,   343,     0,     0,   344,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   345,   346,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   347,   348,     0,     0,
-       0,     0,    73,    74,    75,    76,    77,     0,     0,     0,
-       0,     0,     0,     0,   349,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    78,     0,    79,    80,    81,    82,
-      83,    84,     0,     0,     0,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,    66,     0,     0,     0,     0,     0,     0,     0,     0,
-      67,     0,     0,     0,     0,    68,    69,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    70,     0,
-       0,     0,     0,     0,     0,     0,    71,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      66,     0,     0,    72,     0,     0,     0,     0,     0,    67,
-       0,     0,     0,     0,    68,    69,     0,     0,     0,     0,
-      73,    74,    75,    76,    77,     0,     0,    70,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    78,     0,    79,    80,    81,    82,    83,    84,
-       0,     0,    72,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    95,    96,    97,    98,    99,   100,    73,
-      74,    75,    76,    77,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    78,     0,    79,    80,    81,    82,    83,    84,     0,
-       0,     0,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,    66,     0,
-       0,     0,     0,     0,     0,     0,     0,    67,     0,     0,
-       0,     0,    68,    69,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    70,     0,     0,     0,     0,
-       0,     0,     0,   193,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    66,     0,     0,
-       0,     0,     0,     0,     0,     0,    67,     0,     0,     0,
-       0,    68,    69,     0,     0,     0,     0,    73,    74,    75,
-      76,    77,     0,     0,    70,     0,     0,     0,     0,     0,
-       0,     0,   419,     0,     0,     0,     0,     0,     0,    78,
-       0,    79,    80,    81,    82,    83,    84,     0,     0,     0,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,    73,    74,    75,    76,
-      77,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    78,     0,
-      79,    80,    81,    82,    83,    84,     0,     0,     0,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,    66,     0,     0,     0,     0,
-       0,     0,     0,     0,    67,     0,     0,     0,     0,    68,
-      69,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    70,     0,     0,     0,     0,     0,     0,     0,
-     452,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    66,     0,     0,     0,
-       0,     0,     0,     0,     0,    67,     0,     0,     0,     0,
-      68,    69,     0,     0,    73,    74,    75,    76,    77,     0,
-       0,     0,     0,    70,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    78,     0,    79,    80,
-      81,    82,    83,    84,     0,     0,     0,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-      98,    99,   100,   573,     0,    73,    74,    75,    76,    77,
-      66,     0,     0,     0,     0,     0,     0,     0,     0,    67,
-       0,     0,     0,     0,    68,    69,     0,    78,     0,    79,
-      80,    81,    82,    83,    84,     0,     0,    70,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,     0,     0,     0,     0,     0,    66,
-       0,     0,     0,     0,     0,     0,     0,     0,    67,     0,
-       0,     0,     0,    68,    69,     0,     0,   649,     0,    73,
-      74,    75,    76,    77,     0,     0,    70,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    78,     0,    79,    80,    81,    82,    83,    84,     0,
-       0,     0,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,    73,    74,
-      75,    76,    77,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      78,     0,    79,    80,    81,    82,    83,    84,     0,     0,
-       0,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,     1,     2,     3,
-       4,     5,     6,     7,     8,     0,     0,     0,     0,     0,
-     545,     0,    10,    11,    12,    13,    14,    15,    16,    17,
-       0,     0,     0,   107,     1,     2,     3,     4,     5,     6,
+     181,   172,   104,   349,   116,   105,    63,   117,   149,   151,
+     375,   199,   623,   364,   467,   166,   678,   155,   156,   157,
+     679,   148,   653,   777,   367,   379,   380,   381,   387,   643,
+     471,   472,   651,    57,   619,   115,   392,   183,   783,    75,
+     801,    63,   804,   443,   797,   147,   169,   782,   350,   446,
+     177,    57,   732,   438,   439,    74,    67,   764,    68,   440,
+     716,   781,    57,   793,   171,    57,    57,   717,    57,   654,
+     200,   441,    75,   794,   399,   473,   693,   400,   818,   694,
+     470,   833,   167,   695,   436,   696,   697,   698,   699,   700,
+     701,   467,   851,   178,   467,   184,   185,   186,   203,  -478,
+     187,   209,   166,   192,   206,   207,   208,   181,   814,  -469,
+    -488,   193,  -488,   204,   702,   735,   781,   848,   736,   635,
+     689,  -537,   636,   217,   195,   377,  -537,   722,   841,   722,
+     149,   151,   665,   353,   365,   368,   369,   371,   105,   431,
+     351,  -405,  -532,   148,   183,   376,  -406,  -532,   874,    71,
+     649,   668,   669,   189,     4,     5,   764,   630,   631,   382,
+     149,   151,   196,   889,   197,   881,   871,   373,   433,   839,
+     198,   878,    75,   148,   869,   201,   396,   632,   633,   762,
+     763,   410,   410,   822,   657,   385,   370,   372,   781,   852,
+     412,   115,   430,   407,   407,   891,   220,   147,   200,   374,
+     869,    57,  -478,   781,   652,  -532,   377,    57,   653,  -372,
+    -373,   692,   383,   384,   781,   386,   388,   678,   389,   393,
+     395,   679,   678,   397,   403,   404,   679,   435,   447,   468,
+     364,   812,   813,   470,   469,   609,   364,   610,   611,   624,
+     479,   367,   625,   655,   480,   634,   719,   367,   723,    98,
+      99,   100,   101,   102,   103,   657,   710,   662,   711,   415,
+     416,   417,   418,   419,   420,   421,   415,   416,   417,   418,
+     419,   420,   421,   727,   658,   725,   670,   728,   729,   730,
+     732,   731,     1,     2,     3,     4,     5,     6,     7,     8,
+     733,   734,   737,   739,   751,     9,   746,    10,    11,    12,
+      13,    14,    15,    16,    17,   747,   748,   -24,   110,   749,
+     760,   753,   761,   467,   765,    19,   467,   467,   769,   364,
+     770,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+     367,   771,   622,   788,   802,   789,   792,   795,   364,   364,
+     800,   816,   643,   817,   629,   805,   819,   810,   826,   367,
+     367,   365,   827,   828,   767,   768,   445,   365,   415,   416,
+     417,   418,   419,   420,   421,   831,   181,   837,   776,   843,
+     111,   112,   113,   114,   637,   478,   645,    30,   844,   845,
+     846,   847,   849,   850,   854,   857,   808,   809,   856,   858,
+     861,   200,   859,   862,   166,   870,   872,   873,   875,   884,
+     883,   627,   880,   183,   882,   888,   806,   885,   168,   798,
+     799,   646,   886,   437,   682,   890,   892,   179,   390,   835,
+     354,   756,   752,   776,   656,   190,   391,   396,   659,   402,
+     680,   681,   643,   786,   790,   791,   691,   664,   467,   467,
+     365,   176,   411,   476,   832,   726,   689,   661,   836,   170,
+     803,   205,   887,   638,   608,   149,   151,   838,   650,   365,
+     365,   811,   787,     0,     0,     0,     0,     0,   675,     0,
+     643,     0,     0,   200,     0,   643,   677,     0,     0,     0,
+       0,     0,     0,     0,     0,     1,     2,     3,     4,     5,
+       6,     7,     8,     0,   863,   776,     0,     0,     9,   643,
+      10,    11,    12,    13,    14,    15,    16,    17,     0,     0,
+     776,    18,     0,     0,     0,   118,     0,     0,    19,    20,
+      21,   776,   693,     0,     0,   694,     0,     0,     0,   695,
+      22,   696,   697,   698,   699,   700,   701,   375,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   757,
+     758,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,     0,   131,   132,   133,   134,     0,     0,
+       0,     0,    23,    24,    25,    26,    27,    28,    29,     0,
+      30,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   745,     0,     0,     0,
+       0,     0,     0,     0,    31,     0,     0,     0,     0,    32,
+       0,    33,     0,   709,     0,   715,   740,   410,     0,   410,
+     203,   364,   364,     0,   718,     0,     0,     0,   412,   407,
+       0,   407,   367,   367,   181,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   742,     0,     0,   823,   200,   149,   151,     0,     0,
+       0,   149,   151,     0,     0,     0,     0,     0,     0,   675,
+     376,   183,     0,     0,   675,   759,     0,   677,     0,     0,
+       0,     0,   677,     0,     0,     0,     0,     0,    69,     0,
+     784,     0,     0,   433,     0,     0,   166,    70,     0,     0,
+       0,     0,    71,    72,   785,     0,     0,     0,     0,     0,
+       0,   478,     0,     0,     0,    73,   627,     0,     0,     0,
+       0,     0,     0,     0,     0,   202,     0,     0,     0,   646,
+       1,     2,     3,     4,     5,     6,     7,     8,     0,     0,
+       0,     0,   365,   365,   821,    10,    11,    12,    13,    14,
+      15,    16,    17,     0,   829,     0,   110,   680,   681,    76,
+      77,    78,    79,    80,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   834,     0,     0,     0,     0,
+       0,    81,   825,    82,    83,    84,    85,    86,    87,     0,
+       0,     0,    88,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   860,     0,
+       0,     0,     0,   864,     0,     0,     0,     0,   111,   112,
+     113,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,  -593,     0,   864,
+    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
+    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
+    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
+    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
+    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
+    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
+    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
+    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
+    -593,  -593,  -593,  -593,  -593,     0,  -593,     0,  -593,  -593,
+    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
+    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
+    -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,  -593,
+    -593,     0,  -593,  -593,     0,  -593,  -593,  -593,  -593,  -593,
+     221,     0,     0,   222,   223,   224,   225,   226,   227,   228,
+     229,   230,   231,   232,   233,   234,   235,   236,   237,   238,
+     239,   240,   241,   242,   243,   244,   245,   246,   247,   248,
+     249,   250,   251,   252,   253,   254,   255,   256,     0,   257,
+     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
+     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
+     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
+     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
+     298,   299,   300,   301,   302,   303,   304,   305,     0,   306,
+       0,   307,   308,   309,   310,   311,   312,   313,   314,   315,
+     316,   317,   318,   319,   320,   321,   322,   323,   324,   325,
+     326,   327,   328,   329,   330,   331,   332,   333,   334,   335,
+     336,   337,   338,   339,     0,     0,   340,     0,   341,   342,
+     343,   344,   345,   481,     0,     0,   482,   483,   484,   485,
+     486,   487,   488,   489,   490,   491,   492,   493,   494,   495,
+     496,   497,   498,   499,   500,   501,   502,   503,   504,   505,
+     506,   507,   508,   509,   510,   511,   512,   513,   514,   515,
+     516,     0,   517,   518,   519,   520,   521,   386,   690,   522,
+     523,   524,   525,   526,   527,   528,   529,   530,   531,   532,
+     533,   534,   535,   536,   537,   538,   539,   540,   541,   542,
+     543,   544,   545,   546,   547,   548,   549,   550,   551,   552,
+     553,   554,   555,   556,   557,   558,   559,   560,   561,   562,
+     563,     0,   564,     0,   565,   566,   567,   568,   569,   570,
+     571,   572,   573,   574,   575,   576,   577,   578,   579,   580,
+     581,   582,   583,   584,   585,   586,   587,   588,   589,   590,
+     591,   592,   593,   594,   595,   596,   597,     0,     0,   598,
+       0,   599,   600,   601,   602,   603,   481,     0,     0,   482,
+     483,   484,   485,   486,   487,   488,   489,   490,   491,   492,
+     493,   494,   495,   496,   497,   498,   499,   500,   501,   502,
+     503,   504,   505,   506,   507,   508,   509,   510,   511,   512,
+     513,   514,   515,   516,     0,   517,   518,   519,   520,   521,
+     386,     0,   522,   523,   524,   525,   526,   527,   528,   529,
+     530,   531,   532,   533,   534,   535,   536,   537,   538,   539,
+     540,   541,   542,   543,   544,   545,   546,   547,   548,   549,
+     550,   551,   552,   553,   554,   555,   556,   557,   558,   559,
+     560,   561,   562,   563,     0,   564,     0,   565,   566,   567,
+     568,   569,   570,   571,   572,   573,   574,   575,   576,   577,
+     578,   579,   580,   581,   582,   583,   584,   585,   586,   587,
+     588,   589,   590,   591,   592,   593,   594,   595,   596,   597,
+      69,     0,   598,     0,   599,   600,   601,   602,   603,    70,
+       0,     0,     0,     0,    71,    72,     0,     0,     0,     0,
+       0,     0,     0,     0,   211,   212,   213,    73,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     1,     2,     3,     4,     5,     6,     7,
+       8,     0,     0,     0,     0,     0,     9,     0,    10,    11,
+      12,    13,    14,    15,    16,    17,     0,     0,     0,   110,
+       0,    76,    77,    78,    79,    80,    19,     0,     0,     0,
+       0,     0,     0,     0,   755,     0,     0,     0,     0,     0,
+       0,     0,     0,    81,     0,    82,    83,    84,    85,    86,
+      87,     0,     0,     0,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+       0,     0,     0,     0,     0,   214,     0,   215,   216,     0,
+       0,   143,   144,    26,   114,     1,     2,     3,     4,     5,
+       6,     7,     8,     0,     0,     0,     0,     0,   142,     0,
+      10,    11,    12,    13,    14,    15,    16,    17,     0,     0,
+       0,   110,     0,     0,     0,     0,     0,   671,    19,     0,
+       0,     0,     1,     2,     3,     4,     5,     6,     7,     8,
+       0,     0,     0,     0,     0,     9,     0,    10,    11,    12,
+      13,    14,    15,    16,    17,     0,     0,     0,   110,     0,
+       0,     0,     0,     0,     0,    19,     0,     0,     0,     0,
+       0,     0,     0,     0,     1,     2,     3,     4,     5,     6,
+       7,     8,     0,   143,   144,    26,   114,     9,     0,    10,
+      11,    12,    13,    14,    15,    16,    17,     0,     0,     0,
+     110,     0,     0,     0,     0,     0,     0,    19,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   145,
+     143,   144,    26,   114,     1,     2,     3,     4,     5,     6,
        7,     8,     0,     0,     0,     0,     0,     9,     0,    10,
       11,    12,    13,    14,    15,    16,    17,     0,     0,     0,
-     107,     1,     2,     3,     4,     5,     6,     7,     8,     0,
-       0,     0,     0,   549,   138,     0,    10,    11,    12,    13,
-      14,    15,    16,    17,     0,     0,     0,   107,     0,     0,
-       0,     0,     0,   108,   109,   110,   386,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     1,     2,     3,     4,     5,     6,     7,     8,     0,
-     108,   109,   110,   111,     9,     0,    10,    11,    12,    13,
-      14,    15,    16,    17,     0,     0,     0,   107,     1,     2,
-       3,     4,     5,     6,     7,     8,     0,   139,   140,    25,
-     111,     9,     0,    10,    11,    12,    13,    14,    15,    16,
-      17,     0,     0,     0,   107,     1,     2,     3,     4,     5,
-       6,     7,     8,     0,     0,     0,     0,     0,   385,     0,
-      10,    11,    12,    13,    14,    15,    16,    17,     0,     0,
-       0,   107,     0,     0,     0,     0,     0,   108,   109,   110,
-     111,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     174,     0,     0,     0,     0,     0,   145,    19,     0,     0,
+       0,     0,   143,   144,    26,   114,     0,    69,     1,     2,
+       3,     4,     5,     6,     7,     8,    70,     0,     0,     0,
+       0,    71,    72,    10,    11,    12,    13,    14,    15,    16,
+      17,     0,     0,     0,   707,   612,     0,   613,   671,   614,
+     357,    19,     0,     0,   615,     0,     0,     0,     0,     0,
+       0,   175,   111,   112,   113,   114,     0,     0,     0,   359,
+     360,    75,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   361,   362,     0,     0,     0,     0,    76,    77,
+      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   111,   112,   113,   708,
+      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
+       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
+       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
+       0,   683,   684,   685,    73,   612,     0,   613,   686,   614,
+     357,     0,     0,     0,   615,     0,     0,     0,   159,     1,
+       2,   160,     4,     5,     6,   161,     8,   162,     0,   359,
+     360,    75,   163,     0,    10,    11,    12,    13,    14,    15,
+      16,    17,   361,   362,     0,   110,     0,     0,    76,    77,
+      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
+       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,   111,   112,   113,
+       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
+       0,   772,     0,     0,    73,   612,     0,   613,     0,   614,
+     357,     0,     0,     0,   615,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   171,     0,     0,   359,
+     360,    75,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   361,   362,     0,     0,     0,     0,    76,    77,
+      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      81,   773,   774,    83,    84,    85,    86,    87,     0,     0,
+       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+     775,    98,    99,   100,   101,   102,   103,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
+       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
+       0,   772,     0,     0,    73,   612,     0,   613,     0,   614,
+     357,     0,     0,     0,   615,     0,     0,     0,     0,     1,
+       2,     3,     4,     5,     6,     7,     8,     0,     0,   359,
+     360,    75,   163,     0,    10,    11,    12,    13,    14,    15,
+      16,    17,   361,   362,     0,   110,     0,     0,    76,    77,
+      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      81,   773,   774,    83,    84,    85,    86,    87,     0,     0,
+       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+     775,    98,    99,   100,   101,   102,   103,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,   111,   112,   113,
+       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    73,   612,     0,   613,     0,   614,
+     357,     0,     0,     0,   615,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   171,     0,     0,   359,
+     360,    75,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   361,   362,     0,     0,   840,     0,    76,    77,
+      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
+       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
+       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    73,   612,  -639,   613,     0,   614,
+     357,     0,     0,     0,   615,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   171,     0,     0,   359,
+     360,    75,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   361,   362,     0,     0,     0,     0,    76,    77,
+      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
+       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
+       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    73,   612,     0,   613,     0,   614,
+     357,     0,     0,     0,   615,     0,     0,     0,     0,     0,
+       0,   616,     0,     0,     0,     0,     0,     0,     0,   359,
+     360,    75,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   361,   362,     0,     0,     0,     0,    76,    77,
+      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
+       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
+       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    73,   612,     0,   613,     0,   614,
+     357,     0,     0,     0,   615,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   171,     0,     0,   359,
+     360,    75,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   361,   362,     0,     0,     0,     0,    76,    77,
+      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
+       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
+       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    73,   612,     0,   613,     0,   614,
+     357,     0,     0,     0,   615,     0,     0,     0,     0,     1,
+       2,     3,     4,     5,     6,     7,     8,     0,     0,   359,
+     360,    75,   628,     0,    10,    11,    12,    13,    14,    15,
+      16,    17,   361,   362,     0,   110,     0,     0,    76,    77,
+      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
+       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,   111,   112,   113,
+       0,    71,    72,    10,    11,    12,    13,    14,    15,    16,
+      17,     0,     0,     0,    73,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  -542,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    75,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    76,    77,
+      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
+       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
+       0,    71,    72,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    73,     0,     0,   355,     0,   356,
+     357,     0,     0,     0,   358,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   359,
+     360,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   361,   362,     0,     0,     0,     0,    76,    77,
+      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
+     363,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
+       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
+       0,    71,    72,    10,    11,    12,    13,    14,    15,    16,
+      17,     0,   712,     0,    73,   448,   449,   450,   451,   452,
+     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
+     463,   464,   465,     0,     0,     0,    69,     0,   713,     0,
+       0,    75,     0,     0,     0,    70,     0,     0,     0,     0,
+      71,    72,     0,     0,     0,     0,     0,     0,    76,    77,
+      78,    79,    80,    73,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    74,     0,     0,     0,     0,     0,     0,
+      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
+      75,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,    76,    77,    78,
+      79,    80,    69,     0,     0,     0,     0,     0,     0,     0,
+       0,    70,     0,     0,     0,     0,    71,    72,     0,    81,
+       0,    82,    83,    84,    85,    86,    87,     0,     0,    73,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,     0,     0,     0,     0,
+       0,    69,     0,     0,     0,     0,    75,     0,     0,     0,
+      70,     0,     0,     0,     0,    71,    72,     0,     0,     0,
+       0,     0,     0,    76,    77,    78,    79,    80,    73,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   444,     0,
+       0,     0,     0,     0,     0,    81,     0,    82,    83,    84,
+      85,    86,    87,     0,     0,     0,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,    76,    77,    78,    79,    80,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    81,     0,    82,    83,    84,    85,
+      86,    87,     0,     0,     0,    88,    89,    90,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,    69,     0,     0,     0,     0,     0,     0,     0,     0,
+      70,     0,     0,     0,     0,    71,    72,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    73,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   477,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    69,     0,     0,     0,     0,     0,     0,     0,
+       0,    70,     0,     0,     0,     0,    71,    72,     0,     0,
+       0,     0,    76,    77,    78,    79,    80,     0,     0,    73,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    81,     0,    82,    83,    84,    85,
+      86,    87,     0,     0,     0,    88,    89,    90,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,   741,     0,    76,    77,    78,    79,    80,    69,     0,
+       0,     0,     0,     0,     0,     0,     0,    70,     0,     0,
+       0,     0,    71,    72,     0,    81,     0,    82,    83,    84,
+      85,    86,    87,     0,     0,    73,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,     0,     0,     0,     0,     0,    69,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,     0,     0,     0,
+       0,    71,    72,     0,     0,     0,     0,   824,     0,    76,
+      77,    78,    79,    80,    73,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    81,     0,    82,    83,    84,    85,    86,    87,     0,
+       0,     0,    88,    89,    90,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,    76,    77,
+      78,    79,    80,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      81,     0,    82,    83,    84,    85,    86,    87,     0,     0,
+       0,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,     1,     2,     3,
+       4,     5,     6,     7,     8,     0,     0,     0,     0,     0,
+     720,     0,    10,    11,    12,    13,    14,    15,    16,    17,
+       0,     0,     0,   110,     0,     0,     0,     0,     0,     0,
+      19,     1,     2,     3,     4,     5,     6,     7,     8,     0,
+       0,     0,     0,     0,   720,     0,    10,    11,    12,    13,
+      14,    15,    16,    17,     0,     0,     0,   110,     0,     0,
+       0,     0,     0,     0,    19,   721,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     1,     2,     3,     4,
+       5,     6,     7,     8,     0,   111,   112,   113,   406,     9,
+       0,    10,    11,    12,    13,    14,    15,    16,    17,   724,
+       0,     0,   110,     0,     0,     0,     0,     0,     0,    19,
+       1,     2,     3,     4,     5,     6,     7,     8,     0,   111,
+     112,   113,   406,     9,     0,    10,    11,    12,    13,    14,
+      15,    16,    17,     0,     0,     0,   110,     0,     0,     0,
+       0,     0,     0,    19,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     1,     2,     3,     4,     5,
-       6,     7,     8,     0,   139,   140,    25,   111,   157,     0,
+       6,     7,     8,     0,   111,   112,   113,   114,     9,     0,
       10,    11,    12,    13,    14,    15,    16,    17,     0,     0,
-       0,   107,     1,     2,     3,     4,     5,     6,     7,     8,
-       0,   108,   109,   110,   386,   466,     0,    10,    11,    12,
-      13,    14,    15,    16,    17,   570,     0,     0,   107,     0,
-       0,     0,     0,     0,     0,     0,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,   439,   440,     0,   504,     0,     0,     0,   559,
-       0,   108,   109,   110,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-     439,   440,   607,     0,     0,     0,     0,   441,   108,   109,
-     110,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,   434,   435,   436,   437,   438,   439,   440,   704,
-       0,     0,     0,     0,   559,     0,     0,     0,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,   440,   580,     0,     0,     0,
-       0,   559,     0,   423,   424,   425,   426,   427,   428,   429,
-     430,   431,   432,   433,   434,   435,   436,   437,   438,   439,
-     440,   643,     0,     0,     0,     0,   441,     0,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,   437,   438,   439,   440,     0,     0,     0,     0,
-       0,   559,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   437,   438,   439,   440,
-       0,     0,     0,     0,     0,   441,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-     437,   438,   439,   440,     0,     0,     0,     0,     0,   559,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,   437,   438,   439,   440,     0,     0,
-       0,     0,     0,   441,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-     439,   440,     0,     0,     0,     0,     0,   559
+       0,   110,     0,     0,     0,     0,     0,     0,    19,     1,
+       2,     3,     4,     5,     6,     7,     8,     0,   111,   112,
+     113,   114,     9,     0,    10,    11,    12,    13,    14,    15,
+      16,    17,     0,     0,     0,   110,     0,     0,     0,     0,
+       0,     0,    19,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     1,     2,     3,     4,     5,     6,
+       7,     8,     0,   143,   144,    26,   114,   405,     0,    10,
+      11,    12,    13,    14,    15,    16,    17,     0,     0,     0,
+     110,     0,     0,     0,     0,     0,     0,    19,     1,     2,
+       3,     4,     5,     6,     7,     8,     0,   111,   112,   113,
+     114,     0,     0,    10,    11,    12,    13,    14,    15,    16,
+      17,     0,     0,     0,   110,     0,     0,     0,   438,   439,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   738,   441,     0,     0,     0,
+       0,     0,   111,   112,   113,   406,   448,   449,   450,   451,
+     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
+     462,   463,   464,   465,     0,     0,     0,     0,     0,   713,
+     663,     0,     0,     0,     0,     0,   111,   112,   113,   448,
+     449,   450,   451,   452,   453,   454,   455,   456,   457,   458,
+     459,   460,   461,   462,   463,   464,   465,   766,     0,     0,
+       0,     0,   466,     0,     0,     0,   448,   449,   450,   451,
+     452,   453,   454,   455,   456,   457,   458,   459,   460,   461,
+     462,   463,   464,   465,   879,     0,     0,     0,     0,   713,
+       0,     0,     0,   448,   449,   450,   451,   452,   453,   454,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
+     465,   853,     0,     0,     0,     0,   713,     0,     0,   448,
+     449,   450,   451,   452,   453,   454,   455,   456,   457,   458,
+     459,   460,   461,   462,   463,   464,   465,   750,     0,     0,
+       0,     0,   713,     0,   448,   449,   450,   451,   452,   453,
+     454,   455,   456,   457,   458,   459,   460,   461,   462,   463,
+     464,   465,   807,     0,     0,     0,     0,   466,     0,   448,
+     449,   450,   451,   452,   453,   454,   455,   456,   457,   458,
+     459,   460,   461,   462,   463,   464,   465,     0,     0,     0,
+       0,     0,   713,   448,   449,   450,   451,   452,   453,   454,
+     455,   456,   457,   458,   459,   460,   461,   462,   463,   464,
+     465,     0,     0,     0,     0,     0,   466,   448,   449,   450,
+     451,   452,   453,   454,   455,   456,   457,   458,   459,   460,
+     461,   462,   463,   464,   465,     0,     0,     0,     0,     0,
+     713,   448,   449,   450,   451,   452,   453,   454,   455,   456,
+     457,   458,   459,   460,   461,   462,   463,   464,   465,     0,
+       0,     0,     0,     0,   466,   448,   449,   450,   451,   452,
+     453,   454,   455,   456,   457,   458,   459,   460,   461,   462,
+     463,   464,   465,     0,     0,     0,     0,     0,   713
 };
 
 static const short int yycheck[] =
 {
-      39,    29,     9,    26,    18,   133,    22,   137,    22,     9,
-      71,    22,   396,   167,   552,   399,   344,    18,     0,   408,
-     552,   585,   350,    23,    24,    25,   376,   588,   561,   590,
-      32,   537,    39,    55,   402,   352,    18,    34,     0,    38,
-      33,    33,     6,     7,     8,     4,     5,     6,    41,    31,
-       9,    33,   552,    45,    41,    42,    55,    98,    99,   100,
-     101,   102,   103,   104,    71,   454,   627,    37,    70,    34,
-      37,    33,    42,   605,    41,    42,    34,   362,   363,     6,
-     208,    39,     9,   472,    39,    40,    40,   455,   111,    43,
-     654,   480,   481,    37,   422,     0,    40,   597,    17,    18,
-      50,   418,   102,   142,   421,   605,   128,    97,   108,   109,
-     110,   644,    37,   441,   442,    38,    37,    38,   468,    40,
-     470,   685,     9,   629,    11,   129,   126,   124,   148,   149,
-     150,   138,   193,    42,   640,   142,   136,   137,   138,   139,
-     140,   679,    17,    18,    38,    38,   146,    40,   709,   682,
-     157,   167,    43,   167,   687,   661,   167,   469,    42,   471,
-      55,   200,   694,   552,    93,   166,    43,   705,    39,    40,
-     559,   560,   186,   187,   174,   186,   187,   561,   711,   679,
-      39,    40,    39,    40,   166,    36,   193,    37,   188,   506,
-     190,    38,   509,   510,   694,    41,   115,   116,   117,   118,
-     119,   120,   139,   140,    42,   705,    31,    98,    99,   100,
-     101,   102,   103,   104,   344,    31,   605,   606,    31,    37,
-     350,    98,    99,   100,   101,   102,   103,   104,    36,    31,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,    42,
-      44,   630,    38,   593,   594,     6,    38,    37,    37,   123,
-     639,   579,   580,    38,   643,    41,    38,    37,    42,    46,
-     644,    37,    34,    46,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    39,    85,    86,    87,
-      88,    40,    38,    38,    46,    45,    37,    37,    46,   678,
-     679,   445,   422,    38,    32,    38,    37,    46,   682,    39,
-     617,   618,    39,   687,    39,   694,    40,    33,    41,    37,
-      41,   441,   442,    40,   375,    39,   705,     4,     5,     6,
-       7,     8,     9,    10,    11,    39,   387,   711,    39,    39,
-      17,    39,    19,    20,    21,    22,    23,    24,    25,    26,
-      39,    41,    40,    30,   344,    40,    39,   114,   387,   349,
-     350,    40,    46,    38,    38,    33,   395,    37,   397,   513,
-      41,    38,    38,   386,    39,    37,   366,    41,   375,    39,
-      33,    40,    37,    40,     3,    39,    38,     6,   385,    40,
-     387,    10,    40,    12,    13,    14,    15,    16,    17,    32,
-      38,   452,    39,    33,    33,    39,    41,    39,   398,    40,
-      33,    39,    89,    90,    91,    92,    93,   446,   447,    40,
-      39,   411,    40,    39,   414,    39,    33,   335,   136,   419,
-     630,   142,   422,    46,   181,   566,   168,    31,   624,   445,
-     365,   445,   103,   187,   445,   473,    28,   590,   369,   705,
-     596,   441,   442,   395,   568,   452,   399,    -1,    -1,   579,
-     580,    -1,    -1,    -1,    -1,   469,    -1,   471,   469,   466,
-     471,   461,    -1,   502,    -1,   465,    -1,     3,    -1,   480,
-       6,    -1,    -1,   473,    10,    -1,    12,    13,    14,    15,
-      16,    17,    -1,    -1,    -1,    -1,    -1,   615,    -1,     4,
-       5,     6,     7,     8,     9,    10,    11,   513,    -1,   513,
-      -1,    -1,   513,   503,    19,    20,    21,    22,    23,    24,
-      25,    26,    -1,    -1,    -1,    30,   516,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   563,    -1,    -1,   566,    -1,    -1,
-      -1,    -1,   555,    -1,    -1,    -1,    -1,   565,   545,    -1,
-      -1,    -1,    -1,   543,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    12,    -1,    -1,    -1,    -1,    17,    -1,
-      19,    20,    21,    22,    23,    24,    25,    26,   568,    -1,
-      -1,    30,    -1,   612,    -1,    90,    91,    92,    -1,   579,
-     580,    -1,    -1,   622,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   629,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   616,    -1,    -1,    -1,
+      41,    30,     9,   137,    18,     9,     0,    19,    23,    23,
+     148,    74,   396,   141,   366,    27,   470,    24,    25,    26,
+     470,    23,   422,   727,   141,   154,   155,   156,   169,   416,
+     378,   379,   419,     0,   393,    18,   177,    41,   729,    57,
+     761,    35,   763,   358,   756,    23,    29,   727,    34,   364,
+      33,    18,    32,    34,    35,    40,     9,   705,    11,    40,
+      34,   727,    29,    33,    52,    32,    33,    41,    35,   428,
+      74,    52,    57,    43,     6,    39,     3,     9,   782,     6,
+      44,   802,    34,    10,   218,    12,    13,    14,    15,    16,
+      17,   443,    72,     0,   446,     4,     5,     6,   105,    40,
+       9,    42,   114,    39,   111,   112,   113,   148,   774,    39,
+      40,   132,    42,   131,    41,    39,   782,   829,    42,    42,
+     479,    39,    45,   130,    40,    43,    44,   631,   819,   633,
+     145,   145,   447,   140,   141,   142,   143,   144,   142,   202,
+     126,    43,    44,   145,   148,   152,    43,    44,   860,    17,
+      18,   466,   467,     6,     7,     8,   804,    41,    42,   163,
+     175,   175,    40,   884,    44,   869,   857,   145,   209,   817,
+      44,   862,    57,   175,   854,    95,   183,    41,    42,    41,
+      42,   195,   196,    41,    42,   168,   143,   144,   854,   837,
+     197,   174,   199,   195,   196,   886,    38,   175,   202,    39,
+     880,   168,    40,   869,    45,    44,    43,   174,   608,    31,
+      31,    45,    31,    39,   880,    44,    44,   671,    31,    46,
+      40,   671,   676,     6,    40,    39,   676,   125,    40,    39,
+     358,    17,    18,    44,    43,    40,   364,    39,    39,     6,
+      48,   358,    34,    41,   385,    48,   630,   364,   632,   117,
+     118,   119,   120,   121,   122,    42,   615,    30,   617,   100,
+     101,   102,   103,   104,   105,   106,   100,   101,   102,   103,
+     104,   105,   106,    48,    40,   634,    40,    39,    48,    39,
+      32,    40,     4,     5,     6,     7,     8,     9,    10,    11,
+      48,    40,    39,    41,    33,    17,    41,    19,    20,    21,
+      22,    23,    24,    25,    26,    41,    41,    41,    30,    42,
+      39,    43,    43,   665,    41,    37,   668,   669,    41,   447,
+      41,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     447,    41,   395,    41,    43,    42,    42,    42,   466,   467,
+      41,    40,   729,    40,   407,    48,    42,   116,    33,   466,
+     467,   358,    43,    40,   713,   714,   363,   364,   100,   101,
+     102,   103,   104,   105,   106,    39,   407,    40,   727,    41,
+      92,    93,    94,    95,   415,   382,   417,    99,    39,    41,
+      43,    33,    42,    39,    42,    42,   770,   771,    41,    40,
+      32,   395,    42,    40,   406,    41,    33,    33,    41,    43,
+      41,   405,    42,   407,    42,    33,   765,    41,   130,   757,
+     758,   418,    42,   348,   477,    41,    41,    35,   175,   805,
+     140,   676,   671,   782,   431,    48,   176,   434,   440,   190,
+     471,   472,   819,   734,   749,   750,   606,   444,   790,   791,
+     447,    32,   196,   381,   797,   635,   805,   440,   807,    29,
+     763,   106,   880,   415,   388,   470,   470,   816,   419,   466,
+     467,   773,   736,    -1,    -1,    -1,    -1,    -1,   470,    -1,
+     857,    -1,    -1,   477,    -1,   862,   470,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,
+       9,    10,    11,    -1,   853,   854,    -1,    -1,    17,   886,
+      19,    20,    21,    22,    23,    24,    25,    26,    -1,    -1,
+     869,    30,    -1,    -1,    -1,    38,    -1,    -1,    37,    38,
+      39,   880,     3,    -1,    -1,     6,    -1,    -1,    -1,    10,
+      49,    12,    13,    14,    15,    16,    17,   675,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   678,
+     679,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    -1,    87,    88,    89,    90,    -1,    -1,
+      -1,    -1,    91,    92,    93,    94,    95,    96,    97,    -1,
+      99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   659,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   123,    -1,    -1,    -1,    -1,   128,
+      -1,   130,    -1,   615,    -1,   622,   657,   631,    -1,   633,
+     627,   749,   750,    -1,   628,    -1,    -1,    -1,   635,   631,
+      -1,   633,   749,   750,   675,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    90,    91,    92,    40,   674,    -1,    -1,    -1,    -1,
-     679,    -1,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      -1,    -1,    -1,    -1,     0,    71,   705,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      -1,    87,    -1,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,    -1,   123,   124,    -1,
-     126,   127,   128,   129,     0,    -1,    -1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      -1,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      -1,    87,    -1,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,     3,    -1,   124,    -1,
-     126,   127,   128,   129,    -1,    12,    -1,    -1,    -1,    -1,
-      17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      27,    28,    29,    30,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     4,     5,
-       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
-      -1,    17,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    -1,    -1,    -1,    30,    72,    73,    74,    75,    76,
-      36,    37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    47,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,
-      97,    98,    99,   100,   101,    -1,    -1,    -1,   105,   106,
+      -1,   658,    -1,    -1,   788,   659,   671,   671,    -1,    -1,
+      -1,   676,   676,    -1,    -1,    -1,    -1,    -1,    -1,   671,
+     677,   675,    -1,    -1,   676,   682,    -1,   671,    -1,    -1,
+      -1,    -1,   676,    -1,    -1,    -1,    -1,    -1,     3,    -1,
+     731,    -1,    -1,   734,    -1,    -1,   708,    12,    -1,    -1,
+      -1,    -1,    17,    18,   733,    -1,    -1,    -1,    -1,    -1,
+      -1,   718,    -1,    -1,    -1,    30,   720,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,   736,
+       4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
+      -1,    -1,   749,   750,   785,    19,    20,    21,    22,    23,
+      24,    25,    26,    -1,   795,    -1,    30,   798,   799,    74,
+      75,    76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   804,    -1,    -1,    -1,    -1,
+      -1,    96,   789,    98,    99,   100,   101,   102,   103,    -1,
+      -1,    -1,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   849,    -1,
+      -1,    -1,    -1,   854,    -1,    -1,    -1,    -1,    92,    93,
+      94,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     0,    -1,   880,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    -1,    89,    -1,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
+     123,    -1,   125,   126,    -1,   128,   129,   130,   131,   132,
+       0,    -1,    -1,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    -1,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    -1,    89,
+      -1,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   121,   122,   123,    -1,    -1,   126,    -1,   128,   129,
+     130,   131,   132,     0,    -1,    -1,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    -1,    39,    40,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    -1,    89,    -1,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,   105,   106,
      107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,    -1,    -1,    -1,    -1,    -1,   126,
-      -1,   128,    -1,    89,    90,    91,    92,    93,    94,    95,
-      -1,    97,     4,     5,     6,     7,     8,     9,    10,    11,
+     117,   118,   119,   120,   121,   122,   123,    -1,    -1,   126,
+      -1,   128,   129,   130,   131,   132,     0,    -1,    -1,     3,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    -1,    39,    40,    41,    42,    43,
+      44,    -1,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    -1,    89,    -1,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+       3,    -1,   126,    -1,   128,   129,   130,   131,   132,    12,
+      -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    27,    28,    29,    30,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     4,     5,     6,     7,     8,     9,    10,
+      11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    19,    20,
+      21,    22,    23,    24,    25,    26,    -1,    -1,    -1,    30,
+      -1,    74,    75,    76,    77,    78,    37,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    45,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    96,    -1,    98,    99,   100,   101,   102,
+     103,    -1,    -1,    -1,   107,   108,   109,   110,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
+      -1,    -1,    -1,    -1,    -1,   128,    -1,   130,   131,    -1,
+      -1,    92,    93,    94,    95,     4,     5,     6,     7,     8,
+       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,
+      19,    20,    21,    22,    23,    24,    25,    26,    -1,    -1,
+      -1,    30,    -1,    -1,    -1,    -1,    -1,   128,    37,    -1,
+      -1,    -1,     4,     5,     6,     7,     8,     9,    10,    11,
       -1,    -1,    -1,    -1,    -1,    17,    -1,    19,    20,    21,
-      22,    23,    24,    25,    26,   121,    -1,    -1,    30,    -1,
-     126,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    -1,    -1,    -1,    -1,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    -1,    -1,    -1,    30,    31,
-      -1,    33,    -1,    35,    -1,    -1,    38,    -1,    70,    -1,
+      22,    23,    24,    25,    26,    -1,    -1,    -1,    30,    -1,
+      -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,     9,
+      10,    11,    -1,    92,    93,    94,    95,    17,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    -1,    -1,    -1,
+      30,    -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   128,
+      92,    93,    94,    95,     4,     5,     6,     7,     8,     9,
+      10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    -1,    -1,    -1,
+      30,    -1,    -1,    -1,    -1,    -1,   128,    37,    -1,    -1,
+      -1,    -1,    92,    93,    94,    95,    -1,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    -1,    -1,    -1,
+      -1,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    -1,    -1,    -1,    30,    31,    -1,    33,   128,    35,
+      36,    37,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
+      -1,    91,    92,    93,    94,    95,    -1,    -1,    -1,    55,
+      56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    74,    75,
+      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,    95,
+      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    27,    28,    29,    30,    31,    -1,    33,    34,    35,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    -1,    55,
+      56,    57,    17,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    68,    69,    -1,    30,    -1,    -1,    74,    75,
+      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    53,    54,    55,    -1,    -1,    -1,    -1,    90,    91,
-      92,    93,    -1,    -1,    66,    67,    -1,    -1,    -1,    -1,
-      72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,    91,
-      92,    93,    94,    -1,    96,    97,    98,    99,   100,   101,
-      -1,    -1,    -1,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,     3,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
-      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    27,    28,    29,    30,    31,    -1,    33,
-      34,    35,    -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,
-      54,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    66,    67,    -1,    -1,    -1,    -1,    72,    73,
-      74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    92,    93,    94,
+      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    27,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,    55,
+      56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    74,    75,
+      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      94,    -1,    96,    97,    98,    99,   100,   101,    -1,    -1,
-      -1,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,     3,    -1,    -1,
+      96,    97,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
       -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    27,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
-      -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    50,    -1,    -1,    53,    54,    55,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      66,    67,    -1,    -1,    -1,    -1,    72,    73,    74,    75,
-      76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    95,
-      96,    97,    98,    99,   100,   101,    -1,    -1,    -1,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,     3,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
-      18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    27,
-      -1,    -1,    30,    31,    -1,    33,    -1,    35,    -1,    -1,
-      38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    53,    54,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,
-      -1,    -1,    -1,    -1,    72,    73,    74,    75,    76,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    95,    96,    97,
-      98,    99,   100,   101,    -1,    -1,    -1,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,     3,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,     4,
+       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    55,
+      56,    57,    17,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    68,    69,    -1,    30,    -1,    -1,    74,    75,
+      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      30,    31,    -1,    33,    -1,    35,    -1,    -1,    38,    -1,
+      96,    97,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    92,    93,    94,
+      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,    55,
+      56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    68,    69,    -1,    -1,    72,    -1,    74,    75,
+      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      50,    -1,    -1,    53,    54,    55,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    -1,    -1,
-      70,    -1,    72,    73,    74,    75,    76,    -1,    -1,    -1,
+      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    30,    31,    32,    33,    -1,    35,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,    55,
+      56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    74,    75,
+      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    94,    -1,    96,    97,    98,    99,
-     100,   101,    -1,    -1,    -1,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,    31,
-      32,    33,    -1,    35,    -1,    -1,    38,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,
-      -1,    53,    54,    55,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    66,    67,    -1,    -1,    -1,    -1,
-      72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,
+      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
+      -1,    47,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,
+      56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    74,    75,
+      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    94,    -1,    96,    97,    98,    99,   100,   101,
-      -1,    -1,    -1,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,     3,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
-      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    30,    31,    -1,    33,
-      -1,    35,    -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,    53,
-      54,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    66,    67,    -1,    -1,    -1,    -1,    72,    73,
-      74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,    55,
+      56,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    74,    75,
+      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      94,    -1,    96,    97,    98,    99,   100,   101,    -1,    -1,
-      -1,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,     3,    -1,    -1,
+      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,     4,
+       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    55,
+      56,    57,    17,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    68,    69,    -1,    30,    -1,    -1,    74,    75,
+      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    92,    93,    94,
       -1,    17,    18,    19,    20,    21,    22,    23,    24,    25,
       26,    -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     4,
-       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    55,
-      -1,    -1,    17,    -1,    19,    20,    21,    22,    23,    24,
-      25,    26,    -1,    -1,    -1,    30,    72,    73,    74,    75,
-      76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    43,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,
-      96,    97,    98,    99,   100,   101,    -1,    -1,    -1,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,     3,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    12,    90,    91,    92,    93,    17,
-      18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    30,    31,    -1,    33,    -1,    35,    -1,    -1,
-      38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    53,    54,    55,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,
-      -1,    -1,    -1,    -1,    72,    73,    74,    75,    76,    -1,
+      -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,    97,
-      98,    99,   100,   101,    -1,    -1,    -1,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,     3,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
+      -1,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    74,    75,
+      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      30,    -1,    -1,    33,    -1,    35,    -1,    -1,    38,    -1,
+      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    30,    -1,    -1,    33,    -1,    35,
+      36,    -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,
+      56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    68,    69,    -1,    -1,    -1,    -1,    74,    75,
+      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      86,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     3,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
+      -1,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    -1,    47,    -1,    30,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    -1,    -1,    -1,     3,    -1,    73,    -1,
+      -1,    57,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,
+      17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    74,    75,
+      76,    77,    78,    30,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    40,    -1,    -1,    -1,    -1,    -1,    -1,
+      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      57,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,    74,    75,    76,
+      77,    78,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,    96,
+      -1,    98,    99,   100,   101,   102,   103,    -1,    -1,    30,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,   121,   122,    -1,    -1,    -1,    -1,
+      -1,     3,    -1,    -1,    -1,    -1,    57,    -1,    -1,    -1,
+      12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
+      -1,    -1,    -1,    74,    75,    76,    77,    78,    30,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,
+      -1,    -1,    -1,    -1,    -1,    96,    -1,    98,    99,   100,
+     101,   102,   103,    -1,    -1,    -1,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+     121,   122,    74,    75,    76,    77,    78,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    53,    54,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    -1,    -1,
-      -1,    -1,    72,    73,    74,    75,    76,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    84,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    94,    -1,    96,    97,    98,    99,
-     100,   101,    -1,    -1,    -1,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    96,    -1,    98,    99,   100,   101,
+     102,   103,    -1,    -1,    -1,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
+     122,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    38,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       3,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    12,
-      -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,
-      72,    73,    74,    75,    76,    -1,    -1,    30,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    94,    -1,    96,    97,    98,    99,   100,   101,
-      -1,    -1,    55,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,    72,
-      73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,
+      -1,    -1,    74,    75,    76,    77,    78,    -1,    -1,    30,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    -1,    96,    97,    98,    99,   100,   101,    -1,
-      -1,    -1,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,     3,    -1,
+      -1,    -1,    -1,    -1,    96,    -1,    98,    99,   100,   101,
+     102,   103,    -1,    -1,    -1,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
+     122,    72,    -1,    74,    75,    76,    77,    78,     3,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,
-      -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,    -1,    -1,
+      -1,    -1,    17,    18,    -1,    96,    -1,    98,    99,   100,
+     101,   102,   103,    -1,    -1,    30,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+     121,   122,    -1,    -1,    -1,    -1,    -1,     3,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    17,    18,    -1,    -1,    -1,    -1,    72,    73,    74,
-      75,    76,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,    94,
-      -1,    96,    97,    98,    99,   100,   101,    -1,    -1,    -1,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,    72,    73,    74,    75,
-      76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,
-      96,    97,    98,    99,   100,   101,    -1,    -1,    -1,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,     3,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
-      18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     3,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,
-      17,    18,    -1,    -1,    72,    73,    74,    75,    76,    -1,
-      -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,    97,
-      98,    99,   100,   101,    -1,    -1,    -1,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,    70,    -1,    72,    73,    74,    75,    76,
-       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,
-      -1,    -1,    -1,    -1,    17,    18,    -1,    94,    -1,    96,
-      97,    98,    99,   100,   101,    -1,    -1,    30,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
-     117,   118,   119,   120,    -1,    -1,    -1,    -1,    -1,     3,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
-      -1,    -1,    -1,    17,    18,    -1,    -1,    70,    -1,    72,
-      73,    74,    75,    76,    -1,    -1,    30,    -1,    -1,    -1,
+      -1,    17,    18,    -1,    -1,    -1,    -1,    72,    -1,    74,
+      75,    76,    77,    78,    30,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    94,    -1,    96,    97,    98,    99,   100,   101,    -1,
-      -1,    -1,   105,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,   116,   117,   118,   119,   120,    72,    73,
-      74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    96,    -1,    98,    99,   100,   101,   102,   103,    -1,
+      -1,    -1,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,    74,    75,
+      76,    77,    78,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      94,    -1,    96,    97,    98,    99,   100,   101,    -1,    -1,
-      -1,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,     4,     5,     6,
+      96,    -1,    98,    99,   100,   101,   102,   103,    -1,    -1,
+      -1,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,     4,     5,     6,
        7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
       17,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
-      -1,    -1,    -1,    30,     4,     5,     6,     7,     8,     9,
-      10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    19,
-      20,    21,    22,    23,    24,    25,    26,    -1,    -1,    -1,
-      30,     4,     5,     6,     7,     8,     9,    10,    11,    -1,
-      -1,    -1,    -1,    70,    17,    -1,    19,    20,    21,    22,
+      -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,
+      37,     4,     5,     6,     7,     8,     9,    10,    11,    -1,
+      -1,    -1,    -1,    -1,    17,    -1,    19,    20,    21,    22,
       23,    24,    25,    26,    -1,    -1,    -1,    30,    -1,    -1,
-      -1,    -1,    -1,    90,    91,    92,    93,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     4,     5,     6,     7,     8,     9,    10,    11,    -1,
-      90,    91,    92,    93,    17,    -1,    19,    20,    21,    22,
-      23,    24,    25,    26,    -1,    -1,    -1,    30,     4,     5,
-       6,     7,     8,     9,    10,    11,    -1,    90,    91,    92,
-      93,    17,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    -1,    -1,    -1,    30,     4,     5,     6,     7,     8,
-       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,
-      19,    20,    21,    22,    23,    24,    25,    26,    -1,    -1,
-      -1,    30,    -1,    -1,    -1,    -1,    -1,    90,    91,    92,
-      93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    37,    72,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     4,     5,     6,     7,
+       8,     9,    10,    11,    -1,    92,    93,    94,    95,    17,
+      -1,    19,    20,    21,    22,    23,    24,    25,    26,    72,
+      -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    37,
+       4,     5,     6,     7,     8,     9,    10,    11,    -1,    92,
+      93,    94,    95,    17,    -1,    19,    20,    21,    22,    23,
+      24,    25,    26,    -1,    -1,    -1,    30,    -1,    -1,    -1,
+      -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,
-       9,    10,    11,    -1,    90,    91,    92,    93,    17,    -1,
+       9,    10,    11,    -1,    92,    93,    94,    95,    17,    -1,
       19,    20,    21,    22,    23,    24,    25,    26,    -1,    -1,
-      -1,    30,     4,     5,     6,     7,     8,     9,    10,    11,
-      -1,    90,    91,    92,    93,    17,    -1,    19,    20,    21,
-      22,    23,    24,    25,    26,    37,    -1,    -1,    30,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    -1,    39,    -1,    -1,    -1,    71,
-      -1,    90,    91,    92,    48,    49,    50,    51,    52,    53,
+      -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    37,     4,
+       5,     6,     7,     8,     9,    10,    11,    -1,    92,    93,
+      94,    95,    17,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,
+      -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,     9,
+      10,    11,    -1,    92,    93,    94,    95,    17,    -1,    19,
+      20,    21,    22,    23,    24,    25,    26,    -1,    -1,    -1,
+      30,    -1,    -1,    -1,    -1,    -1,    -1,    37,     4,     5,
+       6,     7,     8,     9,    10,    11,    -1,    92,    93,    94,
+      95,    -1,    -1,    19,    20,    21,    22,    23,    24,    25,
+      26,    -1,    -1,    -1,    30,    -1,    -1,    -1,    34,    35,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    39,    52,    -1,    -1,    -1,
+      -1,    -1,    92,    93,    94,    95,    50,    51,    52,    53,
       54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    39,    -1,    -1,    -1,    -1,    71,    90,    91,
-      92,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    39,
-      -1,    -1,    -1,    -1,    71,    -1,    -1,    -1,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    41,    -1,    -1,    -1,
-      -1,    71,    -1,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    41,    -1,    -1,    -1,    -1,    71,    -1,    48,    49,
-      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,    -1,    -1,    -1,    -1,
-      -1,    71,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      -1,    -1,    -1,    -1,    -1,    71,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    -1,    -1,    -1,    -1,    -1,    71,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    -1,    -1,
-      -1,    -1,    -1,    71,    48,    49,    50,    51,    52,    53,
+      64,    65,    66,    67,    -1,    -1,    -1,    -1,    -1,    73,
+      41,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    41,    -1,    -1,
+      -1,    -1,    73,    -1,    -1,    -1,    50,    51,    52,    53,
       54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    -1,    -1,    -1,    -1,    -1,    71
+      64,    65,    66,    67,    41,    -1,    -1,    -1,    -1,    73,
+      -1,    -1,    -1,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    42,    -1,    -1,    -1,    -1,    73,    -1,    -1,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    43,    -1,    -1,
+      -1,    -1,    73,    -1,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      66,    67,    43,    -1,    -1,    -1,    -1,    73,    -1,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    -1,    -1,    -1,
+      -1,    -1,    73,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    -1,    -1,    -1,    -1,    -1,    73,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    66,    67,    -1,    -1,    -1,    -1,    -1,
+      73,    50,    51,    52,    53,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,    63,    64,    65,    66,    67,    -1,
+      -1,    -1,    -1,    -1,    73,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    -1,    -1,    -1,    -1,    -1,    73
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
+static const unsigned short int yystos[] =
 {
        0,     4,     5,     6,     7,     8,     9,    10,    11,    17,
-      19,    20,    21,    22,    23,    24,    25,    26,    30,    36,
-      37,    47,    89,    90,    91,    92,    93,    94,    95,    97,
-     121,   126,   137,   138,   139,   140,   141,   159,   164,   166,
-     167,   168,   169,   170,   171,   172,   173,   174,   179,   182,
-     183,   186,   187,   188,   189,   190,   191,   194,   196,   197,
-     203,   208,   219,   220,     9,    11,     3,    12,    17,    18,
-      30,    38,    55,    72,    73,    74,    75,    76,    94,    96,
-      97,    98,    99,   100,   101,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,   135,   216,   217,   218,   235,   245,    30,    90,    91,
-      92,    93,   187,   194,    36,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    85,    86,    87,
-      88,   142,   143,   144,   145,   147,   148,   149,    17,    90,
-      91,   165,   166,   188,   189,   194,   203,   209,   210,   135,
-     135,   135,   211,     3,     6,    10,    12,    17,   160,   161,
-     167,    34,   220,    50,   253,   254,    30,    89,   186,     0,
-     139,   135,   195,   215,   216,     4,     5,     6,     9,   175,
-       6,   172,   178,    37,   129,   180,    38,    38,    42,    42,
-     215,   216,    93,    38,   135,   128,   218,   135,   135,   135,
-      40,   184,    27,    28,    29,   126,   128,   135,   150,   151,
-      36,     0,     3,     4,     5,     6,     7,     8,     9,    10,
+      19,    20,    21,    22,    23,    24,    25,    26,    30,    37,
+      38,    39,    49,    91,    92,    93,    94,    95,    96,    97,
+      99,   123,   128,   130,   141,   142,   143,   144,   145,   163,
+     168,   173,   174,   175,   176,   177,   178,   179,   180,   181,
+     186,   189,   190,   193,   197,   198,   199,   200,   201,   202,
+     205,   207,   208,   214,   222,   233,   234,     9,    11,     3,
+      12,    17,    18,    30,    40,    57,    74,    75,    76,    77,
+      78,    96,    98,    99,   100,   101,   102,   103,   107,   108,
+     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
+     119,   120,   121,   122,   138,   230,   231,   232,   249,   259,
+      30,    92,    93,    94,    95,   198,   205,   174,    38,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    87,    88,    89,    90,   146,   147,   148,   149,   151,
+     152,   153,    17,    92,    93,   128,   169,   171,   173,   199,
+     200,   205,   214,   223,   224,   138,   138,   138,   225,     3,
+       6,    10,    12,    17,   164,   165,   174,    34,   130,   198,
+     234,    52,   267,   268,    30,    91,   197,   198,     0,   143,
+     138,   206,   229,   230,     4,     5,     6,     9,   182,     6,
+     179,   185,    39,   132,   187,    40,    40,    44,    44,   229,
+     230,    95,    40,   138,   131,   232,   138,   138,   138,    42,
+     191,    27,    28,    29,   128,   130,   131,   138,   154,   155,
+      38,     0,     3,     4,     5,     6,     7,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
       21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    37,    38,    39,    40,    41,
+      31,    32,    33,    34,    35,    36,    37,    39,    40,    41,
       42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
       52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
       62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    87,    89,    90,    91,    92,    93,
+      82,    83,    84,    85,    86,    87,    89,    91,    92,    93,
       94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
      104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   124,   126,
-     127,   128,   129,   136,   154,   155,   154,    34,   124,   146,
-     135,   150,    33,    35,    38,    53,    54,    66,    67,    84,
-     134,   135,   156,   135,   135,   211,   135,   211,    37,   171,
-     135,    41,   213,   213,   213,   213,   216,    31,    37,    42,
-      31,   165,   180,    44,   214,    38,   135,     6,   176,     6,
-       9,   177,   175,    38,    37,    17,    93,   166,   192,   193,
-     194,   192,   135,   204,   205,    98,    99,   100,   101,   102,
-     103,   104,   226,   227,   228,   241,   242,   248,   249,   250,
-     135,   215,   185,   195,   216,   123,   154,   136,   156,    38,
-     135,   156,    38,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    71,   133,    37,    41,    42,   199,   199,    37,   198,
-     199,   198,    38,   135,    46,   226,    38,    37,    37,    33,
-      45,   215,   214,    34,   181,   216,    17,   215,    39,    40,
-      39,    40,    46,    40,    43,   195,   231,    31,    33,    35,
-      38,   134,   195,   206,   207,   223,   243,   244,   245,   253,
-     195,   135,   251,   252,    18,   244,   245,    43,   227,   206,
-      39,   135,    40,    38,    39,   135,   156,   157,   158,   156,
-     156,    38,   165,   200,   195,   195,   215,    27,    28,    29,
-      34,   162,   163,   206,    43,     3,     6,    10,    12,    13,
-      14,    15,    16,    17,    39,   221,   222,   224,   225,    45,
-     135,    34,    39,   216,   214,    17,    70,   193,   214,    70,
-     206,   205,    46,    37,    30,    93,   166,   206,   206,    71,
-     133,    46,    37,    38,    32,    46,    38,    37,    40,    37,
-      37,    39,   195,    70,   135,   152,   153,    39,    39,    40,
-      41,    33,    41,   212,    43,   165,   135,    37,    41,    39,
-      40,   223,    39,    39,    39,    27,    95,    96,   114,   206,
-     230,   232,   233,   234,   235,   254,    39,    39,   206,   206,
-     243,   195,   253,   185,   252,    39,    40,   156,   156,    40,
-      33,    41,    40,   201,   212,    39,   224,    41,   222,   224,
-      46,   214,   214,   114,   232,    17,    18,   235,   238,    38,
-      38,   230,   206,    41,    40,   246,   195,    39,   154,    70,
-     135,    33,    41,    38,   195,   202,    37,   201,   224,   253,
-     162,    38,   206,   223,   206,    70,   243,   247,    39,    37,
-      39,    41,    33,   212,    40,    37,    70,   223,    40,    40,
-     236,    39,    40,    38,    40,   195,    32,    38,   206,   195,
-     229,   230,   231,   237,   254,    39,   243,    33,    33,   212,
-      39,   239,   240,   243,    39,    40,   230,    40,    39,    41,
-      39,    40,   229,    33,   224,    39,   243,    39
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+     126,   128,   129,   130,   131,   132,   139,   158,   159,   158,
+      34,   126,   150,   138,   154,    33,    35,    36,    40,    55,
+      56,    68,    69,    86,   137,   138,   160,   219,   138,   138,
+     225,   138,   225,   171,    39,   178,   138,    43,   227,   227,
+     227,   227,   230,    31,    39,   198,    44,   194,    44,    31,
+     169,   187,   194,    46,   228,    40,   138,     6,   183,     6,
+       9,   184,   182,    40,    39,    17,    95,   173,   203,   204,
+     205,   203,   138,   215,   216,   100,   101,   102,   103,   104,
+     105,   106,   240,   241,   242,   255,   256,   262,   263,   264,
+     138,   229,   192,   206,   230,   125,   158,   139,    34,    35,
+      40,    52,   221,   160,    40,   138,   160,    40,    50,    51,
+      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,    73,   136,    39,    43,
+      44,   210,   210,    39,   209,   210,   209,    40,   138,    48,
+     194,     0,     3,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    39,    40,    41,
+      42,    43,    46,    47,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    89,    91,    92,    93,    94,    95,
+      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
+     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
+     116,   117,   118,   119,   120,   121,   122,   123,   126,   128,
+     129,   130,   131,   132,   140,   194,   195,   196,   240,    40,
+      39,    39,    31,    33,    35,    40,    47,   137,   206,   217,
+     218,   219,   229,   228,     6,    34,   188,   230,    17,   229,
+      41,    42,    41,    42,    48,    42,    45,   206,   245,   217,
+     237,   257,   258,   259,   267,   206,   138,   265,   266,    18,
+     258,   259,    45,   241,   217,    41,   138,    42,    40,   174,
+     220,   221,    30,    41,   138,   160,   161,   162,   160,   160,
+      40,   128,   170,   171,   172,   173,   211,   214,   223,   224,
+     206,   206,   229,    27,    28,    29,    34,   166,   167,   217,
+      45,   196,    45,     3,     6,    10,    12,    13,    14,    15,
+      16,    17,    41,   235,   236,   238,   239,    30,    95,   173,
+     217,   217,    47,    73,   136,   138,    34,    41,   230,   228,
+      17,    72,   204,   228,    72,   217,   216,    48,    39,    48,
+      39,    40,    32,    48,    40,    39,    42,    39,    39,    41,
+     206,    72,   138,   156,   157,   229,    41,    41,    41,    42,
+      43,    33,   172,    43,   226,    45,   170,   227,   227,   138,
+      39,    43,    41,    42,   237,    41,    41,   217,   217,    41,
+      41,    41,    27,    97,    98,   116,   217,   244,   246,   247,
+     248,   249,   268,   257,   206,   267,   192,   266,    41,    42,
+     160,   160,    42,    33,    43,    42,   212,   226,   210,   210,
+      41,   238,    43,   236,   238,    48,   217,    43,   228,   228,
+     116,   246,    17,    18,   249,   252,    40,    40,   244,    42,
+     260,   206,    41,   158,    72,   138,    33,    43,    40,   206,
+     213,    39,   212,   238,   267,   166,   217,    40,   217,   237,
+      72,   257,   261,    41,    39,    41,    43,    33,   226,    42,
+      39,    72,   237,    42,    42,   250,    41,    42,    40,    42,
+     206,    32,    40,   217,   206,   243,   244,   245,   251,   268,
+      41,   257,    33,    33,   226,    41,   253,   254,   257,    41,
+      42,   244,    42,    41,    43,    41,    42,   243,    33,   238,
+      41,   257,    41
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
+static const unsigned short int yyr1[] =
 {
-       0,   132,   133,   133,   133,   133,   133,   133,   133,   133,
-     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
-     134,   134,   134,   134,   135,   135,   135,   135,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-     135,   135,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+       0,   135,   136,   136,   136,   136,   136,   136,   136,   136,
      136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
-     136,   136,   136,   136,   137,   137,   138,   138,   139,   139,
+     137,   137,   137,   137,   138,   138,   138,   138,   138,   138,
+     138,   138,   138,   138,   138,   138,   138,   138,   138,   138,
+     138,   138,   139,   139,   139,   139,   139,   139,   139,   139,
+     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
+     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
+     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
+     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
      139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
-     139,   140,   141,   141,   142,   142,   142,   142,   142,   142,
-     142,   142,   143,   143,   144,   144,   145,   145,   145,   146,
-     146,   147,   147,   148,   148,   148,   149,   149,   150,   150,
-     150,   150,   150,   150,   151,   151,   152,   152,   152,   152,
-     153,   153,   154,   154,   155,   155,   156,   156,   156,   156,
-     156,   156,   156,   156,   156,   156,   157,   157,   158,   158,
-     159,   160,   161,   161,   161,   161,   162,   162,   162,   163,
-     163,   163,   163,   164,   164,   164,   165,   165,   165,   165,
-     165,   165,   166,   166,   167,   167,   168,   168,   168,   169,
-     169,   169,   169,   170,   170,   170,   171,   171,   171,   171,
-     171,   171,   171,   171,   172,   172,   173,   173,   173,   174,
-     174,   174,   174,   175,   175,   175,   175,   175,   176,   176,
-     177,   177,   177,   178,   178,   178,   179,   179,   180,   180,
-     181,   181,   182,   183,   184,   184,   185,   185,   186,   186,
-     187,   187,   188,   188,   189,   189,   190,   190,   190,   190,
-     191,   191,   192,   192,   192,   192,   193,   193,   193,   193,
-     194,   194,   194,   194,   195,   195,   196,   197,   198,   198,
-     199,   200,   200,   201,   201,   202,   202,   203,   204,   204,
-     205,   205,   206,   206,   206,   206,   206,   206,   207,   207,
-     207,   207,   208,   209,   210,   211,   211,   212,   212,   212,
-     212,   213,   213,   214,   214,   214,   215,   215,   216,   216,
-     217,   217,   218,   218,   219,   219,   220,   220,   220,   221,
-     221,   222,   222,   223,   224,   225,   225,   225,   225,   225,
-     225,   225,   225,   225,   226,   226,   227,   227,   227,   227,
-     227,   228,   228,   229,   229,   229,   230,   230,   230,   230,
-     230,   230,   231,   231,   232,   233,   234,   235,   235,   235,
-     235,   235,   235,   235,   235,   235,   235,   236,   236,   237,
-     237,   238,   238,   239,   239,   240,   240,   241,   242,   243,
-     243,   243,   244,   244,   245,   245,   245,   245,   245,   245,
-     245,   245,   246,   246,   247,   247,   248,   249,   249,   250,
-     251,   251,   252,   253,   253,   254
+     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
+     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
+     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
+     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
+     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
+     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
+     139,   139,   139,   139,   139,   139,   139,   140,   140,   140,
+     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
+     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
+     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
+     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
+     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
+     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
+     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
+     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
+     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
+     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
+     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
+     140,   140,   140,   140,   140,   140,   140,   140,   140,   140,
+     141,   141,   142,   142,   143,   143,   143,   143,   143,   143,
+     143,   143,   143,   143,   143,   143,   143,   143,   144,   145,
+     145,   146,   146,   146,   146,   146,   146,   146,   146,   147,
+     147,   148,   148,   149,   149,   149,   150,   150,   151,   151,
+     152,   152,   152,   153,   153,   154,   154,   154,   154,   154,
+     154,   154,   155,   155,   156,   156,   156,   156,   157,   157,
+     158,   158,   159,   159,   160,   160,   160,   160,   160,   160,
+     160,   160,   160,   160,   160,   161,   161,   162,   162,   163,
+     164,   165,   165,   165,   165,   166,   166,   166,   167,   167,
+     167,   167,   168,   168,   168,   169,   169,   170,   170,   171,
+     171,   171,   171,   171,   171,   172,   172,   172,   172,   172,
+     173,   173,   173,   174,   174,   175,   175,   175,   176,   176,
+     176,   176,   177,   177,   177,   178,   178,   178,   178,   178,
+     178,   178,   178,   179,   179,   180,   180,   180,   181,   181,
+     181,   181,   182,   182,   182,   182,   182,   183,   183,   184,
+     184,   184,   184,   185,   185,   185,   186,   186,   187,   187,
+     188,   188,   189,   190,   191,   191,   192,   192,   193,   193,
+     193,   194,   195,   195,   196,   196,   197,   197,   198,   198,
+     199,   199,   200,   200,   201,   201,   201,   201,   202,   202,
+     203,   203,   203,   203,   204,   204,   204,   204,   205,   205,
+     205,   205,   206,   206,   207,   208,   209,   209,   210,   211,
+     211,   212,   212,   213,   213,   214,   215,   215,   216,   216,
+     217,   217,   217,   217,   217,   217,   218,   218,   218,   218,
+     218,   219,   219,   220,   220,   221,   221,   221,   222,   223,
+     224,   225,   225,   226,   226,   226,   226,   227,   227,   228,
+     228,   228,   229,   229,   230,   230,   231,   231,   232,   232,
+     233,   233,   234,   234,   234,   235,   235,   236,   236,   237,
+     238,   239,   239,   239,   239,   239,   239,   239,   239,   239,
+     240,   240,   241,   241,   241,   241,   241,   242,   242,   243,
+     243,   243,   244,   244,   244,   244,   244,   244,   245,   245,
+     246,   247,   248,   249,   249,   249,   249,   249,   249,   249,
+     249,   249,   249,   250,   250,   251,   251,   252,   252,   253,
+     253,   254,   254,   255,   256,   257,   257,   257,   258,   258,
+     259,   259,   259,   259,   259,   259,   259,   259,   260,   260,
+     261,   261,   262,   263,   263,   264,   265,   265,   266,   267,
+     267,   268
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1490,39 +1739,55 @@ static const unsigned char yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     0,     1,     1,     2,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     3,     2,     3,     2,     2,     1,     2,     2,     2,
-       1,     2,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     6,     2,     0,     1,     1,     3,
-       1,     3,     0,     1,     1,     2,     3,     2,     3,     5,
-       2,     4,     1,     1,     1,     4,     0,     1,     1,     3,
-       6,     1,     1,     1,     1,     1,     0,     1,     1,     1,
-       1,     1,     1,     3,     4,     4,     1,     1,     2,     4,
-       4,     2,     2,     1,     1,     1,     2,     2,     2,     1,
-       1,     1,     1,     1,     1,     2,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     2,     1,
-       1,     2,     2,     0,     1,     2,     1,     2,     0,     1,
-       0,     1,     1,     0,     1,     2,     3,     4,     0,     4,
-       1,     2,     2,     3,     0,     2,     1,     3,     1,     2,
-       1,     1,     5,     7,     5,     7,     6,     7,     6,     5,
-       1,     2,     0,     1,     1,     3,     1,     2,     3,     2,
-       1,     2,     4,     3,     3,     2,     4,     4,     1,     1,
-       3,     4,     5,     0,     2,     2,     4,     4,     1,     3,
-       1,     3,     1,     4,     3,     3,     2,     5,     1,     1,
-       1,     1,     2,     2,     2,     0,     1,     0,     2,     7,
-       9,     0,     7,     0,     2,     3,     0,     1,     1,     2,
-       1,     2,     1,     2,     4,     5,     7,     8,    13,     1,
-       3,     2,     4,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     2,     1,     1,     1,     1,
-       1,     3,     6,     1,     2,     1,     1,     1,     2,     1,
-       1,     1,     3,     4,     6,     8,     5,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     0,     2,     1,
-       3,     1,     1,     0,     1,     1,     3,     3,     3,     1,
-       1,     3,     5,     6,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     2,     1,     3,     3,     1,     1,     3,
-       1,     3,     4,     0,     1,     1
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       0,     1,     1,     2,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     2,
+       3,     2,     2,     1,     2,     2,     2,     1,     2,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     6,     2,     0,     1,     1,     3,     1,     3,
+       0,     1,     1,     2,     3,     2,     3,     5,     2,     4,
+       1,     1,     1,     1,     4,     0,     1,     1,     3,     6,
+       1,     1,     1,     1,     1,     0,     1,     1,     1,     1,
+       1,     1,     3,     4,     4,     1,     2,     1,     2,     1,
+       1,     2,     4,     4,     2,     1,     1,     1,     3,     3,
+       2,     2,     1,     1,     1,     2,     2,     2,     1,     1,
+       1,     1,     1,     1,     2,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
+       2,     2,     0,     1,     2,     1,     2,     0,     1,     0,
+       1,     1,     2,     0,     1,     2,     3,     4,     0,     4,
+       1,     2,     2,     3,     0,     2,     1,     3,     3,     3,
+       4,     3,     1,     2,     1,     1,     1,     2,     1,     1,
+       5,     7,     5,     7,     6,     7,     6,     5,     1,     2,
+       0,     1,     1,     3,     1,     2,     3,     2,     1,     2,
+       4,     3,     3,     2,     4,     4,     1,     1,     3,     4,
+       5,     0,     2,     2,     4,     4,     1,     3,     1,     3,
+       1,     4,     3,     3,     2,     5,     1,     1,     1,     1,
+       1,     4,     2,     1,     2,     2,     1,     1,     2,     2,
+       2,     0,     1,     0,     2,     7,     9,     0,     7,     0,
+       2,     3,     0,     1,     1,     2,     1,     2,     1,     2,
+       4,     5,     7,     8,    13,     1,     3,     2,     4,     2,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     2,     1,     1,     1,     1,     1,     3,     6,     1,
+       2,     1,     1,     1,     2,     1,     1,     1,     3,     4,
+       6,     8,     5,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     0,     2,     1,     3,     1,     1,     0,
+       1,     1,     3,     3,     3,     1,     1,     3,     5,     6,
+       1,     1,     1,     1,     1,     1,     1,     1,     0,     2,
+       1,     3,     3,     1,     1,     3,     1,     3,     4,     0,
+       1,     1
 };
 
 
@@ -1577,7 +1842,23 @@ static const unsigned char yydprec[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0
 };
 
 /* YYMERGER[RULE-NUM] -- Index of merging function for rule #RULE-NUM.  */
@@ -1631,7 +1912,23 @@ static const unsigned char yymerger[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0
 };
 
 /* YYIMMEDIATE[RULE-NUM] -- True iff rule #RULE-NUM is not to be deferred, as
@@ -1686,7 +1983,23 @@ static const yybool yyimmediate[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0
 };
 
 /* YYCONFLP[YYPACT[STATE-NUM]] -- Pointer into YYCONFL of start of
@@ -1695,6 +2008,56 @@ static const yybool yyimmediate[] =
    yyconfl is terminated by a rule number of 0.  */
 static const unsigned short int yyconflp[] =
 {
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     5,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   265,     0,     0,     0,     0,   267,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   269,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1706,7 +2069,6 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     5,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1727,9 +2089,22 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   259,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     7,     0,     0,
+       9,    11,    13,    15,    17,    19,    21,    23,    25,    27,
+      29,    31,    33,    35,    37,    39,    41,    43,    45,    47,
+      49,    51,    53,    55,    57,    59,    61,    63,    65,    67,
+      69,    71,    73,    75,    77,    79,    81,    83,    85,    87,
+      89,    91,    93,    95,    97,    99,   101,   103,   105,   107,
+     109,   111,   113,   115,   117,   119,   121,   123,   125,   127,
+     129,   131,   133,   135,   137,   139,   141,   143,   145,   147,
+     149,   151,   153,   155,   157,   159,   161,   163,   165,   167,
+     169,   171,   173,   175,   177,     0,   179,     0,   181,   183,
+     185,   187,   189,   191,   193,   195,   197,   199,   201,   203,
+     205,   207,   209,   211,   213,   215,   217,   219,   221,   223,
+     225,   227,   229,   231,   233,   235,   237,   239,   241,   243,
+     245,     0,   247,   249,     0,   251,   253,   255,   257,   259,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1761,20 +2136,6 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     7,     0,     0,     9,    11,    13,
-      15,    17,    19,    21,    23,    25,    27,    29,    31,    33,
-      35,    37,    39,    41,    43,    45,    47,    49,    51,    53,
-      55,    57,    59,    61,    63,    65,    67,    69,    71,    73,
-      75,    77,    79,    81,    83,    85,    87,    89,    91,    93,
-      95,    97,    99,   101,   103,   105,   107,   109,   111,   113,
-     115,   117,   119,   121,   123,   125,   127,   129,   131,   133,
-     135,   137,   139,   141,   143,   145,   147,   149,   151,   153,
-     155,   157,   159,   161,   163,   165,   167,   169,   171,   173,
-       0,   175,     0,   177,   179,   181,   183,   185,   187,   189,
-     191,   193,   195,   197,   199,   201,   203,   205,   207,   209,
-     211,   213,   215,   217,   219,   221,   223,   225,   227,   229,
-     231,   233,   235,   237,   239,   241,     0,   243,   245,     0,
-     247,   249,   251,   253,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1987,16 +2348,12 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     1,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       3,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   255,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   257,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2017,6 +2374,29 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     1,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     3,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   261,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   263,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -2033,42 +2413,54 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   261,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   263
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   271,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   273
 };
 
 /* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by
    0, pointed into by YYCONFLP.  */
 static const short int yyconfl[] =
 {
-       0,   272,     0,   272,     0,   340,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   470,     0,   470,     0,   470,
-       0,   470,     0,   470,     0,   272,     0,   272,     0,   272,
-       0,   229,     0,   367,     0
+       0,   411,     0,   411,     0,   488,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   626,     0,   626,     0,   626,     0,   626,     0,   626,
+       0,   411,     0,   411,     0,   532,     0,   532,     0,   411,
+       0,   357,     0,   515,     0
 };
 
 /* Error token number */
@@ -2497,19 +2889,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     *yyvalp = yyvsp[YYFILL (1-yyrhslen)].yystate.yysemantics.yysval;
   switch (yyn)
     {
-        case 171:
-#line 391 "src/parser_proc_grammar.y" /* glr.c:816  */
+        case 297:
+#line 399 "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 2509 "src/parser_proc.c" /* glr.c:816  */
+#line 2901 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 172:
-#line 397 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 298:
+#line 405 "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,
@@ -2518,91 +2910,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 2522 "src/parser_proc.c" /* glr.c:816  */
+#line 2914 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 173:
-#line 405 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 299:
+#line 413 "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 2530 "src/parser_proc.c" /* glr.c:816  */
+#line 2922 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 174:
-#line 408 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 300:
+#line 416 "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 2538 "src/parser_proc.c" /* glr.c:816  */
+#line 2930 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 176:
-#line 412 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 303:
+#line 421 "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 2546 "src/parser_proc.c" /* glr.c:816  */
+#line 2938 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 177:
-#line 415 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 304:
+#line 424 "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 2554 "src/parser_proc.c" /* glr.c:816  */
+#line 2946 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 178:
-#line 418 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 305:
+#line 427 "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 2562 "src/parser_proc.c" /* glr.c:816  */
+#line 2954 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 179:
-#line 421 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 306:
+#line 430 "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 2570 "src/parser_proc.c" /* glr.c:816  */
+#line 2962 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 180:
-#line 424 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 307:
+#line 433 "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 2578 "src/parser_proc.c" /* glr.c:816  */
+#line 2970 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 181:
-#line 430 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 308:
+#line 439 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 2586 "src/parser_proc.c" /* glr.c:816  */
+#line 2978 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 182:
-#line 436 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 309:
+#line 445 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = NULL;
 }
-#line 2594 "src/parser_proc.c" /* glr.c:816  */
+#line 2986 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 183:
-#line 439 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 310:
+#line 448 "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 2602 "src/parser_proc.c" /* glr.c:816  */
+#line 2994 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 184:
-#line 445 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 311:
+#line 454 "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;
@@ -2626,201 +3018,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 2630 "src/parser_proc.c" /* glr.c:816  */
+#line 3022 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 185:
-#line 468 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 312:
+#line 477 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-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 2639 "src/parser_proc.c" /* glr.c:816  */
+#line 3031 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 186:
-#line 472 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 313:
+#line 481 "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 2648 "src/parser_proc.c" /* glr.c:816  */
+#line 3040 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 187:
-#line 476 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 314:
+#line 485 "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 2658 "src/parser_proc.c" /* glr.c:816  */
+#line 3050 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 188:
-#line 481 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 315:
+#line 490 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type, (*(struct psi_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 2667 "src/parser_proc.c" /* glr.c:816  */
+#line 3059 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 189:
-#line 485 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 316:
+#line 494 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-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 2676 "src/parser_proc.c" /* glr.c:816  */
+#line 3068 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 190:
-#line 489 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 317:
+#line 498 "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 2685 "src/parser_proc.c" /* glr.c:816  */
+#line 3077 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 191:
-#line 493 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 318:
+#line 502 "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 2694 "src/parser_proc.c" /* glr.c:816  */
+#line 3086 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 214:
-#line 546 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 342:
+#line 556 "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 2704 "src/parser_proc.c" /* glr.c:816  */
+#line 3096 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 215:
-#line 551 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 343:
+#line 561 "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 2714 "src/parser_proc.c" /* glr.c:816  */
+#line 3106 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 216:
-#line 559 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 344:
+#line 569 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL);
 }
-#line 2722 "src/parser_proc.c" /* glr.c:816  */
+#line 3114 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 217:
-#line 562 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 345:
+#line 572 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL); /* FIXME */
 }
-#line 2730 "src/parser_proc.c" /* glr.c:816  */
+#line 3122 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 219:
-#line 566 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 347:
+#line 576 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 2738 "src/parser_proc.c" /* glr.c:816  */
+#line 3130 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 220:
-#line 572 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 348:
+#line 582 "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 2748 "src/parser_proc.c" /* glr.c:816  */
+#line 3140 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 221:
-#line 577 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 349:
+#line 587 "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 2758 "src/parser_proc.c" /* glr.c:816  */
+#line 3150 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 222:
-#line 585 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 350:
+#line 595 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 2766 "src/parser_proc.c" /* glr.c:816  */
+#line 3158 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 224:
-#line 592 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 352:
+#line 602 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_token_free), &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2775 "src/parser_proc.c" /* glr.c:816  */
+#line 3167 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 225:
-#line 596 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 353:
+#line 606 "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 2784 "src/parser_proc.c" /* glr.c:816  */
+#line 3176 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 226:
-#line 603 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 354:
+#line 613 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_unary((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-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 2793 "src/parser_proc.c" /* glr.c:816  */
+#line 3185 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 227:
-#line 607 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 355:
+#line 617 "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 2802 "src/parser_proc.c" /* glr.c:816  */
+#line 3194 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 228:
-#line 611 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 356:
+#line 621 "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 2811 "src/parser_proc.c" /* glr.c:816  */
+#line 3203 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 229:
-#line 615 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 357:
+#line 625 "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 2820 "src/parser_proc.c" /* glr.c:816  */
+#line 3212 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 230:
-#line 620 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 358:
+#line 630 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                uint8_t exists;
@@ -2831,11 +3223,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 2835 "src/parser_proc.c" /* glr.c:816  */
+#line 3227 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 231:
-#line 630 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 359:
+#line 640 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                uint8_t exists;
@@ -2846,103 +3238,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 2850 "src/parser_proc.c" /* glr.c:816  */
+#line 3242 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 232:
-#line 640 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 360:
+#line 650 "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 2860 "src/parser_proc.c" /* glr.c:816  */
+#line 3252 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 233:
-#line 645 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 361:
+#line 655 "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 2870 "src/parser_proc.c" /* glr.c:816  */
+#line 3262 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 234:
-#line 650 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 362:
+#line 660 "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 3271 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 363:
+#line 664 "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 2881 "src/parser_proc.c" /* glr.c:816  */
+#line 3282 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 235:
-#line 656 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 364:
+#line 670 "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 2892 "src/parser_proc.c" /* glr.c:816  */
+#line 3293 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 236:
-#line 665 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 365:
+#line 679 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 2900 "src/parser_proc.c" /* glr.c:816  */
+#line 3301 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 238:
-#line 672 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 367:
+#line 686 "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 2909 "src/parser_proc.c" /* glr.c:816  */
+#line 3310 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 239:
-#line 676 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 368:
+#line 690 "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 2917 "src/parser_proc.c" /* glr.c:816  */
+#line 3318 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 240:
-#line 682 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 369:
+#line 696 "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 2926 "src/parser_proc.c" /* glr.c:816  */
+#line 3327 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 241:
-#line 689 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 370:
+#line 703 "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 2934 "src/parser_proc.c" /* glr.c:816  */
+#line 3335 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 246:
-#line 702 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 375:
+#line 716 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_def_val **)(&(*yyvalp))) = NULL;
 }
-#line 2942 "src/parser_proc.c" /* glr.c:816  */
+#line 3343 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 247:
-#line 705 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 376:
+#line 719 "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};
@@ -2974,28 +3375,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 2978 "src/parser_proc.c" /* glr.c:816  */
+#line 3379 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 248:
-#line 736 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 377:
+#line 750 "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 2987 "src/parser_proc.c" /* glr.c:816  */
+#line 3388 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 253:
-#line 750 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 382:
+#line 764 "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 2995 "src/parser_proc.c" /* glr.c:816  */
+#line 3396 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 254:
-#line 753 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 383:
+#line 767 "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),
@@ -3005,19 +3406,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 3009 "src/parser_proc.c" /* glr.c:816  */
+#line 3410 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 255:
-#line 762 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 384:
+#line 776 "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 3017 "src/parser_proc.c" /* glr.c:816  */
+#line 3418 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 385:
+#line 782 "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 3426 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 386:
+#line 785 "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 3434 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 387:
+#line 791 "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 3442 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 388:
+#line 794 "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 3450 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 257:
-#line 769 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 390:
+#line 801 "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),
@@ -3026,11 +3459,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 3030 "src/parser_proc.c" /* glr.c:816  */
+#line 3463 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 258:
-#line 777 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 391:
+#line 809 "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(
@@ -3042,11 +3475,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 3046 "src/parser_proc.c" /* glr.c:816  */
+#line 3479 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 259:
-#line 788 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 392:
+#line 820 "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));
@@ -3056,11 +3489,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 3060 "src/parser_proc.c" /* glr.c:816  */
+#line 3493 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 260:
-#line 797 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 393:
+#line 829 "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));
@@ -3070,148 +3503,208 @@ 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 3074 "src/parser_proc.c" /* glr.c:816  */
+#line 3507 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 261:
-#line 806 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 394:
+#line 838 "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 3084 "src/parser_proc.c" /* glr.c:816  */
+#line 3517 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 396:
+#line 847 "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 3526 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 397:
+#line 851 "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),
+               psi_decl_var_init(NULL, 0, 0)
+       );
+       (*(struct psi_decl_arg **)(&(*yyvalp)))->var->token = psi_token_copy((*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
+       (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
+       (*(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 3541 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 398:
+#line 861 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_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));
+       (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct = 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)));
+       (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
+       (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct->align = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).pos;
+       (*(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 3555 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 399:
+#line 870 "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));
+       (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn = 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)));
+       (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
+       (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn->align = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)).pos;
+       (*(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 3569 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 262:
-#line 814 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 400:
+#line 882 "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 3577 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 401:
+#line 885 "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 3092 "src/parser_proc.c" /* glr.c:816  */
+#line 3585 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 264:
-#line 821 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 403:
+#line 892 "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 3101 "src/parser_proc.c" /* glr.c:816  */
+#line 3594 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 266:
-#line 829 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 405:
+#line 900 "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 3111 "src/parser_proc.c" /* glr.c:816  */
+#line 3604 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 267:
-#line 834 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 406:
+#line 905 "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 3121 "src/parser_proc.c" /* glr.c:816  */
+#line 3614 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 268:
-#line 839 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 407:
+#line 910 "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 3131 "src/parser_proc.c" /* glr.c:816  */
+#line 3624 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 271:
-#line 849 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 410:
+#line 920 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3139 "src/parser_proc.c" /* glr.c:816  */
+#line 3632 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 272:
-#line 852 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 411:
+#line 923 "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 3147 "src/parser_proc.c" /* glr.c:816  */
+#line 3640 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 273:
-#line 858 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 412:
+#line 929 "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 3155 "src/parser_proc.c" /* glr.c:816  */
+#line 3648 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 274:
-#line 861 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 413:
+#line 932 "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 3163 "src/parser_proc.c" /* glr.c:816  */
+#line 3656 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 275:
-#line 864 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 414:
+#line 935 "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 3171 "src/parser_proc.c" /* glr.c:816  */
+#line 3664 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 286:
-#line 886 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 425:
+#line 957 "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 3179 "src/parser_proc.c" /* glr.c:816  */
+#line 3672 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 287:
-#line 889 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 426:
+#line 960 "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 3187 "src/parser_proc.c" /* glr.c:816  */
+#line 3680 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 288:
-#line 892 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 427:
+#line 963 "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 3195 "src/parser_proc.c" /* glr.c:816  */
+#line 3688 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 289:
-#line 898 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 428:
+#line 969 "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 3203 "src/parser_proc.c" /* glr.c:816  */
+#line 3696 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 290:
-#line 901 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 429:
+#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 3211 "src/parser_proc.c" /* glr.c:816  */
+#line 3704 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 291:
-#line 904 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 430:
+#line 975 "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)));
@@ -3220,11 +3713,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 3224 "src/parser_proc.c" /* glr.c:816  */
+#line 3717 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 292:
-#line 912 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 431:
+#line 983 "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)));
@@ -3234,27 +3727,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 3238 "src/parser_proc.c" /* glr.c:816  */
+#line 3731 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 293:
-#line 924 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 432:
+#line 995 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3246 "src/parser_proc.c" /* glr.c:816  */
+#line 3739 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 294:
-#line 927 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 433:
+#line 998 "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 3254 "src/parser_proc.c" /* glr.c:816  */
+#line 3747 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 295:
-#line 930 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 434:
+#line 1001 "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)));
@@ -3262,19 +3755,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 3266 "src/parser_proc.c" /* glr.c:816  */
+#line 3759 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 296:
-#line 937 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 435:
+#line 1008 "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 3274 "src/parser_proc.c" /* glr.c:816  */
+#line 3767 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 297:
-#line 940 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 436:
+#line 1011 "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)));
@@ -3282,43 +3775,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 3286 "src/parser_proc.c" /* glr.c:816  */
+#line 3779 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 298:
-#line 950 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 437:
+#line 1021 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3294 "src/parser_proc.c" /* glr.c:816  */
+#line 3787 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 300:
-#line 956 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 439:
+#line 1027 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3302 "src/parser_proc.c" /* glr.c:816  */
+#line 3795 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 303:
-#line 964 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 443:
+#line 1036 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3310 "src/parser_proc.c" /* glr.c:816  */
+#line 3803 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 304:
-#line 967 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 444:
+#line 1039 "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 3318 "src/parser_proc.c" /* glr.c:816  */
+#line 3811 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 305:
-#line 970 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 445:
+#line 1042 "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)));
@@ -3327,68 +3820,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 3331 "src/parser_proc.c" /* glr.c:816  */
+#line 3824 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 306:
-#line 981 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 446:
+#line 1053 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3339 "src/parser_proc.c" /* glr.c:816  */
+#line 3832 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 307:
-#line 984 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 447:
+#line 1056 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3347 "src/parser_proc.c" /* glr.c:816  */
+#line 3840 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 313:
-#line 1004 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 453:
+#line 1076 "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 3355 "src/parser_proc.c" /* glr.c:816  */
+#line 3848 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 315:
-#line 1011 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 455:
+#line 1083 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3363 "src/parser_proc.c" /* glr.c:816  */
+#line 3856 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 316:
-#line 1017 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 456:
+#line 1089 "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 3371 "src/parser_proc.c" /* glr.c:816  */
+#line 3864 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 317:
-#line 1020 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 457:
+#line 1092 "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 3379 "src/parser_proc.c" /* glr.c:816  */
+#line 3872 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 319:
-#line 1027 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 458:
+#line 1098 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
+}
+#line 3880 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 459:
+#line 1101 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
+}
+#line 3888 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 460:
+#line 1104 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       psi_decl_free(&(*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
+}
+#line 3896 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 467:
+#line 1125 "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 3388 "src/parser_proc.c" /* glr.c:816  */
+#line 3905 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 322:
-#line 1039 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 470:
+#line 1137 "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))) {
@@ -3396,11 +3913,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 3400 "src/parser_proc.c" /* glr.c:816  */
+#line 3917 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 323:
-#line 1046 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 471:
+#line 1144 "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;
@@ -3409,11 +3926,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 3413 "src/parser_proc.c" /* glr.c:816  */
+#line 3930 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 324:
-#line 1057 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 472:
+#line 1155 "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))) {
@@ -3421,11 +3938,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 3425 "src/parser_proc.c" /* glr.c:816  */
+#line 3942 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 325:
-#line 1064 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 473:
+#line 1162 "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;
@@ -3434,11 +3951,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 3438 "src/parser_proc.c" /* glr.c:816  */
+#line 3955 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 326:
-#line 1075 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 474:
+#line 1173 "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;
@@ -3446,11 +3963,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 3450 "src/parser_proc.c" /* glr.c:816  */
+#line 3967 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 327:
-#line 1082 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 475:
+#line 1180 "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;
@@ -3462,11 +3979,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 3466 "src/parser_proc.c" /* glr.c:816  */
+#line 3983 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 328:
-#line 1093 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 476:
+#line 1191 "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;
@@ -3478,11 +3995,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 3482 "src/parser_proc.c" /* glr.c:816  */
+#line 3999 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 329:
-#line 1104 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 477:
+#line 1202 "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;
@@ -3494,11 +4011,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 3498 "src/parser_proc.c" /* glr.c:816  */
+#line 4015 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 331:
-#line 1119 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 479:
+#line 1217 "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),
@@ -3508,62 +4025,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 3512 "src/parser_proc.c" /* glr.c:816  */
+#line 4029 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 332:
-#line 1131 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 480:
+#line 1229 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3520 "src/parser_proc.c" /* glr.c:816  */
+#line 4037 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 333:
-#line 1134 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 481:
+#line 1232 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3528 "src/parser_proc.c" /* glr.c:816  */
+#line 4045 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 334:
-#line 1137 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 482:
+#line 1235 "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 3536 "src/parser_proc.c" /* glr.c:816  */
+#line 4053 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 335:
-#line 1140 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 483:
+#line 1238 "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 3544 "src/parser_proc.c" /* glr.c:816  */
+#line 4061 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 336:
-#line 1147 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 484:
+#line 1245 "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 3552 "src/parser_proc.c" /* glr.c:816  */
+#line 4069 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 337:
-#line 1150 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 485:
+#line 1248 "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 3563 "src/parser_proc.c" /* glr.c:816  */
+#line 4080 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 338:
-#line 1156 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 486:
+#line 1254 "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),
@@ -3573,11 +4090,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 3577 "src/parser_proc.c" /* glr.c:816  */
+#line 4094 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 339:
-#line 1165 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 487:
+#line 1263 "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),
@@ -3587,11 +4104,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 3591 "src/parser_proc.c" /* glr.c:816  */
+#line 4108 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 340:
-#line 1177 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 488:
+#line 1275 "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),
@@ -3600,19 +4117,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 3604 "src/parser_proc.c" /* glr.c:816  */
+#line 4121 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 341:
-#line 1185 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 489:
+#line 1283 "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 3612 "src/parser_proc.c" /* glr.c:816  */
+#line 4129 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 342:
-#line 1188 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 490:
+#line 1286 "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(
@@ -3623,11 +4140,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 3627 "src/parser_proc.c" /* glr.c:816  */
+#line 4144 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 343:
-#line 1198 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 491:
+#line 1296 "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(
@@ -3638,31 +4155,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 3642 "src/parser_proc.c" /* glr.c:816  */
+#line 4159 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 344:
-#line 1211 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 492:
+#line 1309 "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 3652 "src/parser_proc.c" /* glr.c:816  */
+#line 4169 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 345:
-#line 1216 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 493:
+#line 1314 "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 3662 "src/parser_proc.c" /* glr.c:816  */
+#line 4179 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 346:
-#line 1224 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 494:
+#line 1331 "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)));
@@ -3670,11 +4187,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 3674 "src/parser_proc.c" /* glr.c:816  */
+#line 4191 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 347:
-#line 1234 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 495:
+#line 1341 "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)));
@@ -3682,27 +4199,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 3686 "src/parser_proc.c" /* glr.c:816  */
+#line 4203 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 348:
-#line 1244 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 496:
+#line 1351 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3694 "src/parser_proc.c" /* glr.c:816  */
+#line 4211 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 350:
-#line 1251 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 498:
+#line 1358 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3702 "src/parser_proc.c" /* glr.c:816  */
+#line 4219 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 351:
-#line 1257 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 499:
+#line 1364 "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)));
@@ -3717,11 +4234,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3721 "src/parser_proc.c" /* glr.c:816  */
+#line 4238 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 352:
-#line 1271 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 500:
+#line 1378 "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)));
@@ -3736,27 +4253,27 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3740 "src/parser_proc.c" /* glr.c:816  */
+#line 4257 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 353:
-#line 1288 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 501:
+#line 1395 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3748 "src/parser_proc.c" /* glr.c:816  */
+#line 4265 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 354:
-#line 1291 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 502:
+#line 1398 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3756 "src/parser_proc.c" /* glr.c:816  */
+#line 4273 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 355:
-#line 1297 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 503:
+#line 1404 "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)));
@@ -3764,11 +4281,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 3768 "src/parser_proc.c" /* glr.c:816  */
+#line 4285 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 356:
-#line 1304 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 504:
+#line 1411 "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)));
@@ -3776,146 +4293,219 @@ 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 3780 "src/parser_proc.c" /* glr.c:816  */
+#line 4297 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 357:
-#line 1314 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 505:
+#line 1421 "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 3789 "src/parser_proc.c" /* glr.c:816  */
+#line 4306 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 358:
-#line 1321 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 506:
+#line 1428 "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 3797 "src/parser_proc.c" /* glr.c:816  */
+#line 4314 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 359:
-#line 1324 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 507:
+#line 1431 "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 3805 "src/parser_proc.c" /* glr.c:816  */
+#line 4322 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 360:
-#line 1330 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 508:
+#line 1437 "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 3815 "src/parser_proc.c" /* glr.c:816  */
+#line 4332 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 361:
-#line 1335 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 509:
+#line 1442 "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 3825 "src/parser_proc.c" /* glr.c:816  */
+#line 4342 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 362:
-#line 1343 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 510:
+#line 1450 "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 3834 "src/parser_proc.c" /* glr.c:816  */
+#line 4351 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 511:
+#line 1454 "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 4360 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 512:
+#line 1458 "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 4369 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 513:
+#line 1462 "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 4378 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 514:
+#line 1466 "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 4387 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 515:
+#line 1470 "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 4396 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 516:
+#line 1477 "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 4405 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 517:
+#line 1481 "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 4414 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 518:
+#line 1485 "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 4423 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 363:
-#line 1347 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 519:
+#line 1489 "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);
+       (*(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 3843 "src/parser_proc.c" /* glr.c:816  */
+#line 4432 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 364:
-#line 1351 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 520:
+#line 1493 "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)));
+       (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3852 "src/parser_proc.c" /* glr.c:816  */
+#line 4440 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 365:
-#line 1355 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 521:
+#line 1499 "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)));
+       (*(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 3861 "src/parser_proc.c" /* glr.c:816  */
+#line 4449 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 366:
-#line 1359 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 522:
+#line 1503 "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)));
+       (*(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 3870 "src/parser_proc.c" /* glr.c:816  */
+#line 4458 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 367:
-#line 1363 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 523:
+#line 1510 "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)));
+       (*(struct psi_number **)(&(*yyvalp))) = (*(struct psi_number **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3879 "src/parser_proc.c" /* glr.c:816  */
+#line 4466 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 368:
-#line 1370 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 524:
+#line 1513 "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)));
+       if ((*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
+               int8_t sizeof_void_p = sizeof(void *);
+               (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT8, &sizeof_void_p, 0);
+       } else {
+               (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_SIZEOF, (*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), 0);
+       }
 }
-#line 3888 "src/parser_proc.c" /* glr.c:816  */
+#line 4479 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 369:
-#line 1374 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 525:
+#line 1524 "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)));
+       int8_t sizeof_void_p = sizeof(void *);
+       (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT8, &sizeof_void_p, 0);
 }
-#line 3897 "src/parser_proc.c" /* glr.c:816  */
+#line 4488 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 370:
-#line 1378 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 526:
+#line 1528 "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)));
+       int8_t sizeof_a = sizeof('a');
+       (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT8, &sizeof_a, 0);
 }
-#line 3906 "src/parser_proc.c" /* glr.c:816  */
+#line 4497 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 371:
-#line 1382 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 527:
+#line 1532 "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);
+       (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_INT64, &(*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->size, 0);
 }
-#line 3915 "src/parser_proc.c" /* glr.c:816  */
+#line 4505 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 372:
-#line 1389 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 528:
+#line 1538 "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)));
@@ -3926,11 +4516,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 3930 "src/parser_proc.c" /* glr.c:816  */
+#line 4520 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 373:
-#line 1402 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 529:
+#line 1551 "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)));
@@ -3941,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 3945 "src/parser_proc.c" /* glr.c:816  */
+#line 4535 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 374:
-#line 1415 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 530:
+#line 1564 "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)));
@@ -3956,179 +4546,183 @@ 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 3960 "src/parser_proc.c" /* glr.c:816  */
+#line 4550 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 375:
-#line 1428 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 531:
+#line 1577 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3968 "src/parser_proc.c" /* glr.c:816  */
+#line 4558 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 376:
-#line 1431 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 532:
+#line 1580 "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 3977 "src/parser_proc.c" /* glr.c:816  */
+#line 4567 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 377:
-#line 1438 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 533:
+#line 1587 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = NULL;
 }
-#line 3985 "src/parser_proc.c" /* glr.c:816  */
+#line 4575 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 378:
-#line 1441 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 534:
+#line 1590 "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 3993 "src/parser_proc.c" /* glr.c:816  */
+#line 4583 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 379:
-#line 1444 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 535:
+#line 1593 "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 4001 "src/parser_proc.c" /* glr.c:816  */
+#line 4591 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 380:
-#line 1447 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 536:
+#line 1596 "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 4009 "src/parser_proc.c" /* glr.c:816  */
+#line 4599 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 381:
-#line 1453 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 537:
+#line 1602 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout*)(&(*yyvalp))).pos = 0;
        (*(struct psi_layout*)(&(*yyvalp))).len = 0;
 }
-#line 4018 "src/parser_proc.c" /* glr.c:816  */
+#line 4608 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 382:
-#line 1457 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 538:
+#line 1606 "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 4027 "src/parser_proc.c" /* glr.c:816  */
+#line 4617 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 383:
-#line 1464 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 539:
+#line 1613 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4035 "src/parser_proc.c" /* glr.c:816  */
+#line 4625 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 384:
-#line 1467 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 540:
+#line 1616 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4043 "src/parser_proc.c" /* glr.c:816  */
+#line 4633 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 385:
-#line 1470 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 541:
+#line 1619 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(size_t*)(&(*yyvalp))) = atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text);
+       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);
+       } else {
+               (*(size_t*)(&(*yyvalp))) = 0;
+       }
 }
-#line 4051 "src/parser_proc.c" /* glr.c:816  */
+#line 4645 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 386:
-#line 1476 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 542:
+#line 1629 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 4059 "src/parser_proc.c" /* glr.c:816  */
+#line 4653 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 387:
-#line 1479 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 543:
+#line 1632 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4067 "src/parser_proc.c" /* glr.c:816  */
+#line 4661 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 389:
-#line 1486 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 545:
+#line 1639 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 4075 "src/parser_proc.c" /* glr.c:816  */
+#line 4669 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 390:
-#line 1492 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 546:
+#line 1645 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 1;
 }
-#line 4083 "src/parser_proc.c" /* glr.c:816  */
+#line 4677 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 391:
-#line 1495 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 547:
+#line 1648 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)) + 1;
 }
-#line 4091 "src/parser_proc.c" /* glr.c:816  */
+#line 4685 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 394:
-#line 1512 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 550:
+#line 1665 "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 4099 "src/parser_proc.c" /* glr.c:816  */
+#line 4693 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 395:
-#line 1515 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 551:
+#line 1668 "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 4108 "src/parser_proc.c" /* glr.c:816  */
+#line 4702 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 396:
-#line 1522 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 552:
+#line 1675 "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 4118 "src/parser_proc.c" /* glr.c:816  */
+#line 4712 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 397:
-#line 1527 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 553:
+#line 1680 "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 4128 "src/parser_proc.c" /* glr.c:816  */
+#line 4722 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 398:
-#line 1532 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 554:
+#line 1685 "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)));
@@ -4136,470 +4730,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 4140 "src/parser_proc.c" /* glr.c:816  */
+#line 4734 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 399:
-#line 1542 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 555:
+#line 1695 "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 4148 "src/parser_proc.c" /* glr.c:816  */
+#line 4742 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 400:
-#line 1545 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 556:
+#line 1698 "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 4156 "src/parser_proc.c" /* glr.c:816  */
+#line 4750 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 401:
-#line 1551 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 557:
+#line 1704 "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 4164 "src/parser_proc.c" /* glr.c:816  */
+#line 4758 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 402:
-#line 1554 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 558:
+#line 1707 "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 4172 "src/parser_proc.c" /* glr.c:816  */
+#line 4766 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 403:
-#line 1560 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 559:
+#line 1713 "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 4181 "src/parser_proc.c" /* glr.c:816  */
+#line 4775 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 404:
-#line 1567 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 560:
+#line 1720 "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 4190 "src/parser_proc.c" /* glr.c:816  */
+#line 4784 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 414:
-#line 1586 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 570:
+#line 1739 "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 4198 "src/parser_proc.c" /* glr.c:816  */
+#line 4792 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 415:
-#line 1589 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 571:
+#line 1742 "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 4206 "src/parser_proc.c" /* glr.c:816  */
+#line 4800 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 416:
-#line 1595 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 572:
+#line 1748 "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 4214 "src/parser_proc.c" /* glr.c:816  */
+#line 4808 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 417:
-#line 1598 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 573:
+#line 1751 "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 4222 "src/parser_proc.c" /* glr.c:816  */
+#line 4816 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 418:
-#line 1601 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 574:
+#line 1754 "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 4230 "src/parser_proc.c" /* glr.c:816  */
+#line 4824 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 419:
-#line 1604 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 575:
+#line 1757 "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 4238 "src/parser_proc.c" /* glr.c:816  */
+#line 4832 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 420:
-#line 1607 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 576:
+#line 1760 "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 4246 "src/parser_proc.c" /* glr.c:816  */
+#line 4840 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 421:
-#line 1613 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 577:
+#line 1766 "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 4255 "src/parser_proc.c" /* glr.c:816  */
+#line 4849 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 422:
-#line 1617 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 578:
+#line 1770 "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 4265 "src/parser_proc.c" /* glr.c:816  */
+#line 4859 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 424:
-#line 1626 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 580:
+#line 1779 "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 4274 "src/parser_proc.c" /* glr.c:816  */
+#line 4868 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 425:
-#line 1630 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 581:
+#line 1783 "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 4283 "src/parser_proc.c" /* glr.c:816  */
+#line 4877 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 426:
-#line 1637 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 582:
+#line 1790 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_NULL, NULL);
 }
-#line 4291 "src/parser_proc.c" /* glr.c:816  */
+#line 4885 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 427:
-#line 1640 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 583:
+#line 1793 "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 4299 "src/parser_proc.c" /* glr.c:816  */
+#line 4893 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 428:
-#line 1643 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 584:
+#line 1796 "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 4308 "src/parser_proc.c" /* glr.c:816  */
+#line 4902 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 429:
-#line 1647 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 585:
+#line 1800 "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 4316 "src/parser_proc.c" /* glr.c:816  */
+#line 4910 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 430:
-#line 1650 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 586:
+#line 1803 "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 4324 "src/parser_proc.c" /* glr.c:816  */
+#line 4918 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 431:
-#line 1653 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 587:
+#line 1806 "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 4332 "src/parser_proc.c" /* glr.c:816  */
+#line 4926 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 432:
-#line 1659 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 588:
+#line 1812 "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 4341 "src/parser_proc.c" /* glr.c:816  */
+#line 4935 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 433:
-#line 1663 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 589:
+#line 1816 "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 4351 "src/parser_proc.c" /* glr.c:816  */
+#line 4945 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 434:
-#line 1671 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 590:
+#line 1824 "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 4360 "src/parser_proc.c" /* glr.c:816  */
+#line 4954 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 435:
-#line 1678 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 591:
+#line 1831 "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 4370 "src/parser_proc.c" /* glr.c:816  */
+#line 4964 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 436:
-#line 1686 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 592:
+#line 1839 "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 4380 "src/parser_proc.c" /* glr.c:816  */
+#line 4974 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 447:
-#line 1707 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 603:
+#line 1860 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4388 "src/parser_proc.c" /* glr.c:816  */
+#line 4982 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 448:
-#line 1710 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 604:
+#line 1863 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4396 "src/parser_proc.c" /* glr.c:816  */
+#line 4990 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 449:
-#line 1716 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 605:
+#line 1869 "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 4404 "src/parser_proc.c" /* glr.c:816  */
+#line 4998 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 450:
-#line 1719 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 606:
+#line 1872 "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 4412 "src/parser_proc.c" /* glr.c:816  */
+#line 5006 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 453:
-#line 1730 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 609:
+#line 1883 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4420 "src/parser_proc.c" /* glr.c:816  */
+#line 5014 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 454:
-#line 1733 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 610:
+#line 1886 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4428 "src/parser_proc.c" /* glr.c:816  */
+#line 5022 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 455:
-#line 1739 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 611:
+#line 1892 "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 4436 "src/parser_proc.c" /* glr.c:816  */
+#line 5030 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 456:
-#line 1742 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 612:
+#line 1895 "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 4444 "src/parser_proc.c" /* glr.c:816  */
+#line 5038 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 457:
-#line 1748 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 613:
+#line 1901 "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 4453 "src/parser_proc.c" /* glr.c:816  */
+#line 5047 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 458:
-#line 1755 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 614:
+#line 1908 "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 4462 "src/parser_proc.c" /* glr.c:816  */
+#line 5056 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 459:
-#line 1762 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 615:
+#line 1915 "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 4470 "src/parser_proc.c" /* glr.c:816  */
+#line 5064 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 460:
-#line 1765 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 616:
+#line 1918 "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 4478 "src/parser_proc.c" /* glr.c:816  */
+#line 5072 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 461:
-#line 1768 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 617:
+#line 1921 "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 4487 "src/parser_proc.c" /* glr.c:816  */
+#line 5081 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 462:
-#line 1775 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 618:
+#line 1928 "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 4497 "src/parser_proc.c" /* glr.c:816  */
+#line 5091 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 463:
-#line 1780 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 619:
+#line 1933 "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 4507 "src/parser_proc.c" /* glr.c:816  */
+#line 5101 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 472:
-#line 1799 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 628:
+#line 1952 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4515 "src/parser_proc.c" /* glr.c:816  */
+#line 5109 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 473:
-#line 1802 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 629:
+#line 1955 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4523 "src/parser_proc.c" /* glr.c:816  */
+#line 5117 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 474:
-#line 1808 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 630:
+#line 1961 "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 4531 "src/parser_proc.c" /* glr.c:816  */
+#line 5125 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 475:
-#line 1811 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 631:
+#line 1964 "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 4539 "src/parser_proc.c" /* glr.c:816  */
+#line 5133 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 476:
-#line 1817 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 632:
+#line 1970 "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 4548 "src/parser_proc.c" /* glr.c:816  */
+#line 5142 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 479:
-#line 1829 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 635:
+#line 1982 "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 4557 "src/parser_proc.c" /* glr.c:816  */
+#line 5151 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 480:
-#line 1836 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 636:
+#line 1989 "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 4565 "src/parser_proc.c" /* glr.c:816  */
+#line 5159 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 481:
-#line 1839 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 637:
+#line 1992 "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 4573 "src/parser_proc.c" /* glr.c:816  */
+#line 5167 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 482:
-#line 1845 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 638:
+#line 1998 "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 4583 "src/parser_proc.c" /* glr.c:816  */
+#line 5177 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 483:
-#line 1853 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 639:
+#line 2006 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = false;
 }
-#line 4591 "src/parser_proc.c" /* glr.c:816  */
+#line 5185 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 484:
-#line 1856 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 640:
+#line 2009 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = true;
 }
-#line 4599 "src/parser_proc.c" /* glr.c:816  */
+#line 5193 "src/parser_proc.c" /* glr.c:816  */
     break;
 
 
-#line 4603 "src/parser_proc.c" /* glr.c:816  */
+#line 5197 "src/parser_proc.c" /* glr.c:816  */
       default: break;
     }
 
@@ -4647,670 +5241,706 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct psi_parser
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   switch (yytype)
     {
-          case 133: /* binary_op_token  */
-#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
+          case 136: /* binary_op_token  */
+#line 262 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4654 "src/parser_proc.c" /* glr.c:846  */
+#line 5248 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 134: /* unary_op_token  */
-#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 137: /* unary_op_token  */
+#line 262 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4660 "src/parser_proc.c" /* glr.c:846  */
+#line 5254 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 135: /* name_token  */
-#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 138: /* name_token  */
+#line 262 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4666 "src/parser_proc.c" /* glr.c:846  */
+#line 5260 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 136: /* any_noeol_token  */
-#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 139: /* any_noeol_token  */
+#line 262 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4672 "src/parser_proc.c" /* glr.c:846  */
+#line 5266 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 140: /* lib  */
-#line 252 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 144: /* lib  */
+#line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4678 "src/parser_proc.c" /* glr.c:846  */
+#line 5272 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 141: /* cpp  */
-#line 267 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 145: /* cpp  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 4684 "src/parser_proc.c" /* glr.c:846  */
+#line 5278 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 142: /* cpp_exp  */
-#line 267 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 146: /* cpp_exp  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 4690 "src/parser_proc.c" /* glr.c:846  */
+#line 5284 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 144: /* cpp_message_token  */
-#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 148: /* cpp_message_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4696 "src/parser_proc.c" /* glr.c:846  */
+#line 5290 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 145: /* cpp_include_token  */
-#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 149: /* cpp_include_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4702 "src/parser_proc.c" /* glr.c:846  */
+#line 5296 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 146: /* cpp_header_token  */
-#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 150: /* cpp_header_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4708 "src/parser_proc.c" /* glr.c:846  */
+#line 5302 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 147: /* cpp_no_arg_token  */
-#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 151: /* cpp_no_arg_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4714 "src/parser_proc.c" /* glr.c:846  */
+#line 5308 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 148: /* cpp_name_arg_token  */
-#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 152: /* cpp_name_arg_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4720 "src/parser_proc.c" /* glr.c:846  */
+#line 5314 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 149: /* cpp_exp_arg_token  */
-#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 153: /* cpp_exp_arg_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4726 "src/parser_proc.c" /* glr.c:846  */
+#line 5320 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 150: /* cpp_special_name_token  */
-#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 154: /* cpp_special_name_token  */
+#line 259 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4732 "src/parser_proc.c" /* glr.c:846  */
+#line 5326 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 151: /* cpp_macro_decl  */
-#line 269 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 155: /* cpp_macro_decl  */
+#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_macro_decl_free(&(*(struct psi_cpp_macro_decl **)(&(*yyvaluep))));}
-#line 4738 "src/parser_proc.c" /* glr.c:846  */
+#line 5332 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 152: /* cpp_macro_sig  */
-#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 156: /* cpp_macro_sig  */
+#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4744 "src/parser_proc.c" /* glr.c:846  */
+#line 5338 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 153: /* cpp_macro_sig_args  */
-#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 157: /* cpp_macro_sig_args  */
+#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4750 "src/parser_proc.c" /* glr.c:846  */
+#line 5344 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 154: /* cpp_macro_decl_tokens  */
-#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 158: /* cpp_macro_decl_tokens  */
+#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4756 "src/parser_proc.c" /* glr.c:846  */
+#line 5350 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 155: /* cpp_macro_decl_token_list  */
-#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 159: /* cpp_macro_decl_token_list  */
+#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4762 "src/parser_proc.c" /* glr.c:846  */
+#line 5356 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 156: /* cpp_macro_exp  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 160: /* cpp_macro_exp  */
+#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 4768 "src/parser_proc.c" /* glr.c:846  */
+#line 5362 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 157: /* cpp_macro_call_args  */
-#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 161: /* cpp_macro_call_args  */
+#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4774 "src/parser_proc.c" /* glr.c:846  */
+#line 5368 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 158: /* cpp_macro_call_arg_list  */
-#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 162: /* cpp_macro_call_arg_list  */
+#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4780 "src/parser_proc.c" /* glr.c:846  */
+#line 5374 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 159: /* constant  */
-#line 279 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 163: /* constant  */
+#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_free(&(*(struct psi_const **)(&(*yyvaluep))));}
-#line 4786 "src/parser_proc.c" /* glr.c:846  */
+#line 5380 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 160: /* constant_type  */
-#line 281 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 164: /* constant_type  */
+#line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_type_free(&(*(struct psi_const_type **)(&(*yyvaluep))));}
-#line 4792 "src/parser_proc.c" /* glr.c:846  */
+#line 5386 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 161: /* constant_type_token  */
-#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 165: /* constant_type_token  */
+#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4798 "src/parser_proc.c" /* glr.c:846  */
+#line 5392 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 162: /* impl_def_val  */
-#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 166: /* impl_def_val  */
+#line 287 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_def_val_free(&(*(struct psi_impl_def_val **)(&(*yyvaluep))));}
-#line 4804 "src/parser_proc.c" /* glr.c:846  */
+#line 5398 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 163: /* impl_def_val_token  */
-#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 167: /* impl_def_val_token  */
+#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4810 "src/parser_proc.c" /* glr.c:846  */
+#line 5404 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 164: /* decl_typedef  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 168: /* decl_typedef  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4816 "src/parser_proc.c" /* glr.c:846  */
+#line 5410 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 165: /* typedef  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 169: /* typedef  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
+      {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
+#line 5416 "src/parser_proc.c" /* glr.c:846  */
+        break;
+
+    case 170: /* typedef_anon  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
+      {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
+#line 5422 "src/parser_proc.c" /* glr.c:846  */
+        break;
+
+    case 171: /* typedef_decl  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
+      {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
+#line 5428 "src/parser_proc.c" /* glr.c:846  */
+        break;
+
+    case 172: /* typedef_anon_decl  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4822 "src/parser_proc.c" /* glr.c:846  */
+#line 5434 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 166: /* const_decl_type  */
-#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 173: /* qualified_decl_type  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 4828 "src/parser_proc.c" /* glr.c:846  */
+#line 5440 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 167: /* decl_type  */
-#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 174: /* decl_type  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 4834 "src/parser_proc.c" /* glr.c:846  */
+#line 5446 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 168: /* decl_type_complex  */
-#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 175: /* decl_type_complex  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 4840 "src/parser_proc.c" /* glr.c:846  */
+#line 5452 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 169: /* decl_type_simple  */
-#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 176: /* decl_type_simple  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4846 "src/parser_proc.c" /* glr.c:846  */
+#line 5458 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 170: /* decl_real_type  */
-#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 177: /* decl_real_type  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4852 "src/parser_proc.c" /* glr.c:846  */
+#line 5464 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 171: /* decl_stdint_type  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 178: /* decl_stdint_type  */
+#line 293 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4858 "src/parser_proc.c" /* glr.c:846  */
+#line 5470 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 172: /* int_signed  */
-#line 264 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 179: /* int_signed  */
+#line 268 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4864 "src/parser_proc.c" /* glr.c:846  */
+#line 5476 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 173: /* int_width  */
-#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 180: /* int_width  */
+#line 265 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4870 "src/parser_proc.c" /* glr.c:846  */
+#line 5482 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 174: /* decl_int_type  */
-#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 181: /* decl_int_type  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4876 "src/parser_proc.c" /* glr.c:846  */
+#line 5488 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 175: /* int_signed_types  */
-#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 182: /* int_signed_types  */
+#line 265 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4882 "src/parser_proc.c" /* glr.c:846  */
+#line 5494 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 176: /* signed_short_types  */
-#line 264 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 183: /* signed_short_types  */
+#line 268 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4888 "src/parser_proc.c" /* glr.c:846  */
+#line 5500 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 177: /* signed_long_types  */
-#line 264 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 184: /* signed_long_types  */
+#line 268 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4894 "src/parser_proc.c" /* glr.c:846  */
+#line 5506 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 178: /* int_width_types  */
-#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 185: /* int_width_types  */
+#line 265 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4900 "src/parser_proc.c" /* glr.c:846  */
+#line 5512 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 179: /* decl_stmt  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 186: /* decl_stmt  */
+#line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4906 "src/parser_proc.c" /* glr.c:846  */
+#line 5518 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 185: /* decl_vars  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 192: /* decl_vars  */
+#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4912 "src/parser_proc.c" /* glr.c:846  */
+#line 5524 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 186: /* decl  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 197: /* decl  */
+#line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4918 "src/parser_proc.c" /* glr.c:846  */
+#line 5530 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 187: /* decl_body  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 198: /* decl_body  */
+#line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4924 "src/parser_proc.c" /* glr.c:846  */
+#line 5536 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 188: /* decl_func_body  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 199: /* decl_func_body  */
+#line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4930 "src/parser_proc.c" /* glr.c:846  */
+#line 5542 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 189: /* decl_functor_body  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 200: /* decl_functor_body  */
+#line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4936 "src/parser_proc.c" /* glr.c:846  */
+#line 5548 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 190: /* decl_functor  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 201: /* decl_functor  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4942 "src/parser_proc.c" /* glr.c:846  */
+#line 5554 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 191: /* decl_func  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 202: /* decl_func  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4948 "src/parser_proc.c" /* glr.c:846  */
+#line 5560 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 192: /* decl_args  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 203: /* decl_args  */
+#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4954 "src/parser_proc.c" /* glr.c:846  */
+#line 5566 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 193: /* decl_anon_arg  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 204: /* decl_anon_arg  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4960 "src/parser_proc.c" /* glr.c:846  */
+#line 5572 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 194: /* decl_arg  */
-#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 205: /* decl_arg  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4966 "src/parser_proc.c" /* glr.c:846  */
+#line 5578 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 195: /* decl_var  */
-#line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 206: /* decl_var  */
+#line 302 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_var_free(&(*(struct psi_decl_var **)(&(*yyvaluep))));}
-#line 4972 "src/parser_proc.c" /* glr.c:846  */
+#line 5584 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 196: /* decl_union  */
-#line 302 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 207: /* decl_union  */
+#line 306 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_union_free(&(*(struct psi_decl_union **)(&(*yyvaluep))));}
-#line 4978 "src/parser_proc.c" /* glr.c:846  */
+#line 5590 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 197: /* decl_struct  */
-#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 208: /* decl_struct  */
+#line 304 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_struct_free(&(*(struct psi_decl_struct **)(&(*yyvaluep))));}
-#line 4984 "src/parser_proc.c" /* glr.c:846  */
+#line 5596 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 198: /* decl_struct_args  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 209: /* decl_struct_args  */
+#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4990 "src/parser_proc.c" /* glr.c:846  */
+#line 5602 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 199: /* struct_args_block  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 210: /* struct_args_block  */
+#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4996 "src/parser_proc.c" /* glr.c:846  */
+#line 5608 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 200: /* struct_args  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 211: /* struct_args  */
+#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5002 "src/parser_proc.c" /* glr.c:846  */
+#line 5614 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 201: /* struct_arg_var_list  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 212: /* struct_arg_var_list  */
+#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5008 "src/parser_proc.c" /* glr.c:846  */
+#line 5620 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 202: /* decl_vars_with_layout  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 213: /* decl_vars_with_layout  */
+#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5014 "src/parser_proc.c" /* glr.c:846  */
+#line 5626 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 203: /* decl_enum  */
-#line 304 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 214: /* decl_enum  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_free(&(*(struct psi_decl_enum **)(&(*yyvaluep))));}
-#line 5020 "src/parser_proc.c" /* glr.c:846  */
+#line 5632 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 204: /* decl_enum_items  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 215: /* decl_enum_items  */
+#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5026 "src/parser_proc.c" /* glr.c:846  */
+#line 5638 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 205: /* decl_enum_item  */
-#line 306 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 216: /* decl_enum_item  */
+#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_item_free(&(*(struct psi_decl_enum_item **)(&(*yyvaluep))));}
-#line 5032 "src/parser_proc.c" /* glr.c:846  */
+#line 5644 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 206: /* num_exp  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 217: /* num_exp  */
+#line 366 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 5038 "src/parser_proc.c" /* glr.c:846  */
+#line 5650 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 207: /* number  */
-#line 361 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 218: /* number  */
+#line 368 "src/parser_proc_grammar.y" /* glr.c:846  */
+      {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
+#line 5656 "src/parser_proc.c" /* glr.c:846  */
+        break;
+
+    case 219: /* sizeof  */
+#line 320 "src/parser_proc_grammar.y" /* glr.c:846  */
+      {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
+#line 5662 "src/parser_proc.c" /* glr.c:846  */
+        break;
+
+    case 220: /* sizeof_body  */
+#line 320 "src/parser_proc_grammar.y" /* glr.c:846  */
+      {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
+#line 5668 "src/parser_proc.c" /* glr.c:846  */
+        break;
+
+    case 221: /* sizeof_body_notypes  */
+#line 320 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 5044 "src/parser_proc.c" /* glr.c:846  */
+#line 5674 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 208: /* enum_name  */
-#line 252 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 222: /* enum_name  */
+#line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5050 "src/parser_proc.c" /* glr.c:846  */
+#line 5680 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 209: /* union_name  */
-#line 252 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 223: /* union_name  */
+#line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5056 "src/parser_proc.c" /* glr.c:846  */
+#line 5686 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 210: /* struct_name  */
-#line 252 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 224: /* struct_name  */
+#line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5062 "src/parser_proc.c" /* glr.c:846  */
+#line 5692 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 211: /* optional_name  */
-#line 252 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 225: /* optional_name  */
+#line 256 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5068 "src/parser_proc.c" /* glr.c:846  */
+#line 5698 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 212: /* decl_layout  */
-#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 226: /* decl_layout  */
+#line 317 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_layout_free(&(*(struct psi_layout **)(&(*yyvaluep))));}
-#line 5074 "src/parser_proc.c" /* glr.c:846  */
+#line 5704 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 213: /* align_and_size  */
-#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 227: /* align_and_size  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5080 "src/parser_proc.c" /* glr.c:846  */
+#line 5710 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 214: /* array_size  */
-#line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 228: /* array_size  */
+#line 371 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5086 "src/parser_proc.c" /* glr.c:846  */
+#line 5716 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 215: /* indirection  */
-#line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 229: /* indirection  */
+#line 371 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5092 "src/parser_proc.c" /* glr.c:846  */
+#line 5722 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 216: /* pointers  */
-#line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 230: /* pointers  */
+#line 371 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5098 "src/parser_proc.c" /* glr.c:846  */
+#line 5728 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 217: /* asterisks  */
-#line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 231: /* asterisks  */
+#line 371 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5104 "src/parser_proc.c" /* glr.c:846  */
+#line 5734 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 219: /* impl  */
-#line 316 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 233: /* impl  */
+#line 323 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_free(&(*(struct psi_impl **)(&(*yyvaluep))));}
-#line 5110 "src/parser_proc.c" /* glr.c:846  */
+#line 5740 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 220: /* impl_func  */
-#line 318 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 234: /* impl_func  */
+#line 325 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_func_free(&(*(struct psi_impl_func **)(&(*yyvaluep))));}
-#line 5116 "src/parser_proc.c" /* glr.c:846  */
+#line 5746 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 221: /* impl_args  */
-#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 235: /* impl_args  */
+#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5122 "src/parser_proc.c" /* glr.c:846  */
+#line 5752 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 222: /* impl_arg  */
-#line 320 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 236: /* impl_arg  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_arg_free(&(*(struct psi_impl_arg **)(&(*yyvaluep))));}
-#line 5128 "src/parser_proc.c" /* glr.c:846  */
+#line 5758 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 223: /* impl_var  */
-#line 324 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 237: /* impl_var  */
+#line 331 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_var_free(&(*(struct psi_impl_var **)(&(*yyvaluep))));}
-#line 5134 "src/parser_proc.c" /* glr.c:846  */
+#line 5764 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 224: /* impl_type  */
-#line 322 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 238: /* impl_type  */
+#line 329 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_type_free(&(*(struct psi_impl_type **)(&(*yyvaluep))));}
-#line 5140 "src/parser_proc.c" /* glr.c:846  */
+#line 5770 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 225: /* impl_type_token  */
-#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 239: /* impl_type_token  */
+#line 361 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5146 "src/parser_proc.c" /* glr.c:846  */
+#line 5776 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 226: /* impl_stmts  */
-#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 240: /* impl_stmts  */
+#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5152 "src/parser_proc.c" /* glr.c:846  */
+#line 5782 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 227: /* impl_stmt  */
-#line 352 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 241: /* impl_stmt  */
+#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_stmt_free(&(*(struct psi_token ***)(&(*yyvaluep))));}
-#line 5158 "src/parser_proc.c" /* glr.c:846  */
+#line 5788 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 228: /* let_stmt  */
-#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 242: /* let_stmt  */
+#line 334 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_stmt_free(&(*(struct psi_let_stmt **)(&(*yyvaluep))));}
-#line 5164 "src/parser_proc.c" /* glr.c:846  */
+#line 5794 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 229: /* let_exp  */
-#line 329 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 243: /* let_exp  */
+#line 336 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5170 "src/parser_proc.c" /* glr.c:846  */
+#line 5800 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 230: /* let_exp_byref  */
-#line 329 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 244: /* let_exp_byref  */
+#line 336 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5176 "src/parser_proc.c" /* glr.c:846  */
+#line 5806 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 231: /* let_exp_assign  */
-#line 329 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 245: /* let_exp_assign  */
+#line 336 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5182 "src/parser_proc.c" /* glr.c:846  */
+#line 5812 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 232: /* let_calloc  */
-#line 331 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 246: /* let_calloc  */
+#line 338 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_calloc_free(&(*(struct psi_let_calloc **)(&(*yyvaluep))));}
-#line 5188 "src/parser_proc.c" /* glr.c:846  */
+#line 5818 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 233: /* let_callback  */
-#line 333 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 247: /* let_callback  */
+#line 340 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_callback_free(&(*(struct psi_let_callback **)(&(*yyvaluep))));}
-#line 5194 "src/parser_proc.c" /* glr.c:846  */
+#line 5824 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 234: /* let_func  */
-#line 335 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 248: /* let_func  */
+#line 342 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_func_free(&(*(struct psi_let_func **)(&(*yyvaluep))));}
-#line 5200 "src/parser_proc.c" /* glr.c:846  */
+#line 5830 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 235: /* let_func_token  */
-#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 249: /* let_func_token  */
+#line 361 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5206 "src/parser_proc.c" /* glr.c:846  */
+#line 5836 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 236: /* let_func_exps  */
-#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 250: /* let_func_exps  */
+#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5212 "src/parser_proc.c" /* glr.c:846  */
+#line 5842 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 237: /* let_exps  */
-#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 251: /* let_exps  */
+#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5218 "src/parser_proc.c" /* glr.c:846  */
+#line 5848 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 238: /* callback_rval  */
-#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 252: /* callback_rval  */
+#line 361 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5224 "src/parser_proc.c" /* glr.c:846  */
+#line 5854 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 239: /* callback_arg_list  */
-#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 253: /* callback_arg_list  */
+#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5230 "src/parser_proc.c" /* glr.c:846  */
+#line 5860 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 240: /* callback_args  */
-#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 254: /* callback_args  */
+#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5236 "src/parser_proc.c" /* glr.c:846  */
+#line 5866 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 241: /* return_stmt  */
-#line 345 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 255: /* return_stmt  */
+#line 352 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_return_stmt_free(&(*(struct psi_return_stmt **)(&(*yyvaluep))));}
-#line 5242 "src/parser_proc.c" /* glr.c:846  */
+#line 5872 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 242: /* set_stmt  */
-#line 337 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 256: /* set_stmt  */
+#line 344 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_stmt_free(&(*(struct psi_set_stmt **)(&(*yyvaluep))));}
-#line 5248 "src/parser_proc.c" /* glr.c:846  */
+#line 5878 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 243: /* set_exp  */
-#line 339 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 257: /* set_exp  */
+#line 346 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_exp_free(&(*(struct psi_set_exp **)(&(*yyvaluep))));}
-#line 5254 "src/parser_proc.c" /* glr.c:846  */
+#line 5884 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 244: /* set_func  */
-#line 341 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 258: /* set_func  */
+#line 348 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_func_free(&(*(struct psi_set_func **)(&(*yyvaluep))));}
-#line 5260 "src/parser_proc.c" /* glr.c:846  */
+#line 5890 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 245: /* set_func_token  */
-#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 259: /* set_func_token  */
+#line 361 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5266 "src/parser_proc.c" /* glr.c:846  */
+#line 5896 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 246: /* set_func_exps  */
-#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 260: /* set_func_exps  */
+#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5272 "src/parser_proc.c" /* glr.c:846  */
+#line 5902 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 247: /* set_exps  */
-#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 261: /* set_exps  */
+#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5278 "src/parser_proc.c" /* glr.c:846  */
+#line 5908 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 248: /* assert_stmt  */
-#line 343 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 262: /* assert_stmt  */
+#line 350 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_assert_stmt_free(&(*(struct psi_assert_stmt **)(&(*yyvaluep))));}
-#line 5284 "src/parser_proc.c" /* glr.c:846  */
+#line 5914 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 249: /* assert_stmt_token  */
-#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 263: /* assert_stmt_token  */
+#line 361 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5290 "src/parser_proc.c" /* glr.c:846  */
+#line 5920 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 250: /* free_stmt  */
-#line 347 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 264: /* free_stmt  */
+#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_stmt_free(&(*(struct psi_free_stmt **)(&(*yyvaluep))));}
-#line 5296 "src/parser_proc.c" /* glr.c:846  */
+#line 5926 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 251: /* free_exps  */
-#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 265: /* free_exps  */
+#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5302 "src/parser_proc.c" /* glr.c:846  */
+#line 5932 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 252: /* free_exp  */
-#line 349 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 266: /* free_exp  */
+#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_exp_free(&(*(struct psi_free_exp **)(&(*yyvaluep))));}
-#line 5308 "src/parser_proc.c" /* glr.c:846  */
+#line 5938 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 253: /* reference  */
-#line 366 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 267: /* reference  */
+#line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5314 "src/parser_proc.c" /* glr.c:846  */
+#line 5944 "src/parser_proc.c" /* glr.c:846  */
         break;
 
 
@@ -5367,7 +5997,7 @@ yylhsNonterm (yyRuleNum yyrule)
 }
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-565)))
+  (!!((Yystate) == (-722)))
 
 /** True iff LR state YYSTATE has only a default reduction (regardless
  *  of token).  */
@@ -6659,11 +7289,11 @@ yyparse (struct psi_parser *P, struct psi_plist *tokens, size_t *index)
   yylval = yyval_default;
 
   /* User initialization code.  */
-  #line 98 "src/parser_proc_grammar.y" /* glr.c:2270  */
+  #line 99 "src/parser_proc_grammar.y" /* glr.c:2270  */
 {
 }
 
-#line 6667 "src/parser_proc.c" /* glr.c:2270  */
+#line 7297 "src/parser_proc.c" /* glr.c:2270  */
 
   if (! yyinitGLRStack (yystackp, YYINITDEPTH))
     goto yyexhaustedlab;
@@ -6969,7 +7599,7 @@ yypdumpstack (yyGLRStack* yystackp)
 #define yydebug psi_parser_proc_debug
 #define yynerrs psi_parser_proc_nerrs
 
-#line 1865 "src/parser_proc_grammar.y" /* glr.c:2584  */
+#line 2018 "src/parser_proc_grammar.y" /* glr.c:2584  */
 
 
 /* epilogue */

diff --git a/src/parser_proc.h b/src/parser_proc.h
index 7a0525b66eb14cfee9b286f2c590f05c7f3829f6..9ab1a2223f1971bcfceef1df59fd7b336bff434a 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 74 "src/parser_proc_grammar.y" /* glr.c:197  */
+#line 75 "src/parser_proc_grammar.y" /* glr.c:197  */
 
 #include "plist.h"
 #include "types/layout.h"
@@ -89,102 +89,105 @@ struct psi_parser;
     PSI_T_NUMBER = 288,
     PSI_T_QUOTED_STRING = 289,
     PSI_T_QUOTED_CHAR = 290,
-    PSI_T_EOL = 291,
-    PSI_T_EOS = 292,
-    PSI_T_LPAREN = 293,
-    PSI_T_RPAREN = 294,
-    PSI_T_COMMA = 295,
-    PSI_T_COLON = 296,
-    PSI_T_LBRACE = 297,
-    PSI_T_RBRACE = 298,
-    PSI_T_LBRACKET = 299,
-    PSI_T_RBRACKET = 300,
-    PSI_T_EQUALS = 301,
-    PSI_T_HASH = 302,
-    PSI_T_PIPE = 303,
-    PSI_T_CARET = 304,
-    PSI_T_AMPERSAND = 305,
-    PSI_T_LSHIFT = 306,
-    PSI_T_RSHIFT = 307,
-    PSI_T_PLUS = 308,
-    PSI_T_MINUS = 309,
-    PSI_T_ASTERISK = 310,
-    PSI_T_SLASH = 311,
-    PSI_T_MODULO = 312,
-    PSI_T_LCHEVR = 313,
-    PSI_T_RCHEVR = 314,
-    PSI_T_CMP_GE = 315,
-    PSI_T_CMP_LE = 316,
-    PSI_T_OR = 317,
-    PSI_T_AND = 318,
-    PSI_T_CMP_EQ = 319,
-    PSI_T_CMP_NE = 320,
-    PSI_T_TILDE = 321,
-    PSI_T_NOT = 322,
-    PSI_T_PERIOD = 323,
-    PSI_T_BACKSLASH = 324,
-    PSI_T_ELLIPSIS = 325,
-    PSI_T_IIF = 326,
-    PSI_T_PRAGMA = 327,
-    PSI_T_PRAGMA_ONCE = 328,
-    PSI_T_LINE = 329,
-    PSI_T_ERROR = 330,
-    PSI_T_WARNING = 331,
-    PSI_T_IF = 332,
-    PSI_T_IFDEF = 333,
-    PSI_T_IFNDEF = 334,
-    PSI_T_ELSE = 335,
-    PSI_T_ELIF = 336,
-    PSI_T_ENDIF = 337,
-    PSI_T_DEFINE = 338,
-    PSI_T_DEFINED = 339,
-    PSI_T_UNDEF = 340,
-    PSI_T_IMPORT = 341,
-    PSI_T_INCLUDE = 342,
-    PSI_T_INCLUDE_NEXT = 343,
-    PSI_T_TYPEDEF = 344,
-    PSI_T_STRUCT = 345,
-    PSI_T_UNION = 346,
-    PSI_T_ENUM = 347,
-    PSI_T_CONST = 348,
-    PSI_T_LIB = 349,
-    PSI_T_STATIC = 350,
-    PSI_T_CALLBACK = 351,
-    PSI_T_FUNCTION = 352,
-    PSI_T_LET = 353,
-    PSI_T_SET = 354,
-    PSI_T_TEMP = 355,
-    PSI_T_FREE = 356,
-    PSI_T_RETURN = 357,
-    PSI_T_PRE_ASSERT = 358,
-    PSI_T_POST_ASSERT = 359,
-    PSI_T_BOOLVAL = 360,
-    PSI_T_INTVAL = 361,
-    PSI_T_STRVAL = 362,
-    PSI_T_PATHVAL = 363,
-    PSI_T_STRLEN = 364,
-    PSI_T_FLOATVAL = 365,
-    PSI_T_ARRVAL = 366,
-    PSI_T_OBJVAL = 367,
-    PSI_T_COUNT = 368,
-    PSI_T_CALLOC = 369,
-    PSI_T_TO_BOOL = 370,
-    PSI_T_TO_INT = 371,
-    PSI_T_TO_STRING = 372,
-    PSI_T_TO_FLOAT = 373,
-    PSI_T_TO_ARRAY = 374,
-    PSI_T_TO_OBJECT = 375,
-    PSI_T_COMMENT = 376,
-    PSI_T_WHITESPACE = 377,
-    PSI_T_NO_WHITESPACE = 378,
-    PSI_T_CPP_HEADER = 379,
-    PSI_T_CPP_ATTRIBUTE = 380,
-    PSI_T_CPP_EXTENSION = 381,
-    PSI_T_CPP_PASTE = 382,
-    PSI_T_CPP_RESTRICT = 383,
-    PSI_T_CPP_ASM = 384,
-    PSI_T_BINARY = 385,
-    PSI_T_UNARY = 386
+    PSI_T_SIZEOF = 291,
+    PSI_T_VOLATILE = 292,
+    PSI_T_EOL = 293,
+    PSI_T_EOS = 294,
+    PSI_T_LPAREN = 295,
+    PSI_T_RPAREN = 296,
+    PSI_T_COMMA = 297,
+    PSI_T_COLON = 298,
+    PSI_T_LBRACE = 299,
+    PSI_T_RBRACE = 300,
+    PSI_T_LBRACKET = 301,
+    PSI_T_RBRACKET = 302,
+    PSI_T_EQUALS = 303,
+    PSI_T_HASH = 304,
+    PSI_T_PIPE = 305,
+    PSI_T_CARET = 306,
+    PSI_T_AMPERSAND = 307,
+    PSI_T_LSHIFT = 308,
+    PSI_T_RSHIFT = 309,
+    PSI_T_PLUS = 310,
+    PSI_T_MINUS = 311,
+    PSI_T_ASTERISK = 312,
+    PSI_T_SLASH = 313,
+    PSI_T_MODULO = 314,
+    PSI_T_LCHEVR = 315,
+    PSI_T_RCHEVR = 316,
+    PSI_T_CMP_GE = 317,
+    PSI_T_CMP_LE = 318,
+    PSI_T_OR = 319,
+    PSI_T_AND = 320,
+    PSI_T_CMP_EQ = 321,
+    PSI_T_CMP_NE = 322,
+    PSI_T_TILDE = 323,
+    PSI_T_NOT = 324,
+    PSI_T_PERIOD = 325,
+    PSI_T_BACKSLASH = 326,
+    PSI_T_ELLIPSIS = 327,
+    PSI_T_IIF = 328,
+    PSI_T_PRAGMA = 329,
+    PSI_T_PRAGMA_ONCE = 330,
+    PSI_T_LINE = 331,
+    PSI_T_ERROR = 332,
+    PSI_T_WARNING = 333,
+    PSI_T_IF = 334,
+    PSI_T_IFDEF = 335,
+    PSI_T_IFNDEF = 336,
+    PSI_T_ELSE = 337,
+    PSI_T_ELIF = 338,
+    PSI_T_ENDIF = 339,
+    PSI_T_DEFINE = 340,
+    PSI_T_DEFINED = 341,
+    PSI_T_UNDEF = 342,
+    PSI_T_IMPORT = 343,
+    PSI_T_INCLUDE = 344,
+    PSI_T_INCLUDE_NEXT = 345,
+    PSI_T_TYPEDEF = 346,
+    PSI_T_STRUCT = 347,
+    PSI_T_UNION = 348,
+    PSI_T_ENUM = 349,
+    PSI_T_CONST = 350,
+    PSI_T_LIB = 351,
+    PSI_T_STATIC = 352,
+    PSI_T_CALLBACK = 353,
+    PSI_T_FUNCTION = 354,
+    PSI_T_LET = 355,
+    PSI_T_SET = 356,
+    PSI_T_TEMP = 357,
+    PSI_T_FREE = 358,
+    PSI_T_RETURN = 359,
+    PSI_T_PRE_ASSERT = 360,
+    PSI_T_POST_ASSERT = 361,
+    PSI_T_BOOLVAL = 362,
+    PSI_T_INTVAL = 363,
+    PSI_T_STRVAL = 364,
+    PSI_T_PATHVAL = 365,
+    PSI_T_STRLEN = 366,
+    PSI_T_FLOATVAL = 367,
+    PSI_T_ARRVAL = 368,
+    PSI_T_OBJVAL = 369,
+    PSI_T_COUNT = 370,
+    PSI_T_CALLOC = 371,
+    PSI_T_TO_BOOL = 372,
+    PSI_T_TO_INT = 373,
+    PSI_T_TO_STRING = 374,
+    PSI_T_TO_FLOAT = 375,
+    PSI_T_TO_ARRAY = 376,
+    PSI_T_TO_OBJECT = 377,
+    PSI_T_COMMENT = 378,
+    PSI_T_WHITESPACE = 379,
+    PSI_T_NO_WHITESPACE = 380,
+    PSI_T_CPP_HEADER = 381,
+    PSI_T_CPP_ATTRIBUTE = 382,
+    PSI_T_CPP_EXTENSION = 383,
+    PSI_T_CPP_PASTE = 384,
+    PSI_T_CPP_INLINE = 385,
+    PSI_T_CPP_RESTRICT = 386,
+    PSI_T_CPP_ASM = 387,
+    PSI_T_BINARY = 388,
+    PSI_T_UNARY = 389
   };
 #endif
 
@@ -230,6 +233,12 @@ union YYSTYPE
   struct psi_decl_arg * PSI_T_decl_typedef;
   /* typedef  */
   struct psi_decl_arg * PSI_T_typedef;
+  /* typedef_anon  */
+  struct psi_decl_arg * PSI_T_typedef_anon;
+  /* typedef_decl  */
+  struct psi_decl_arg * PSI_T_typedef_decl;
+  /* typedef_anon_decl  */
+  struct psi_decl_arg * PSI_T_typedef_anon_decl;
   /* decl_functor  */
   struct psi_decl_arg * PSI_T_decl_functor;
   /* decl_func  */
@@ -244,8 +253,8 @@ union YYSTYPE
   struct psi_decl_enum_item * PSI_T_decl_enum_item;
   /* decl_struct  */
   struct psi_decl_struct * PSI_T_decl_struct;
-  /* const_decl_type  */
-  struct psi_decl_type * PSI_T_const_decl_type;
+  /* qualified_decl_type  */
+  struct psi_decl_type * PSI_T_qualified_decl_type;
   /* decl_type  */
   struct psi_decl_type * PSI_T_decl_type;
   /* decl_type_complex  */
@@ -294,6 +303,12 @@ union YYSTYPE
   struct psi_num_exp * PSI_T_num_exp;
   /* number  */
   struct psi_number * PSI_T_number;
+  /* sizeof  */
+  struct psi_number * PSI_T_sizeof;
+  /* sizeof_body  */
+  struct psi_number * PSI_T_sizeof_body;
+  /* sizeof_body_notypes  */
+  struct psi_number * PSI_T_sizeof_body_notypes;
   /* cpp_macro_sig  */
   struct psi_plist * PSI_T_cpp_macro_sig;
   /* cpp_macro_sig_args  */
@@ -416,6 +431,10 @@ union YYSTYPE
   struct psi_token * PSI_T_QUOTED_STRING;
   /* QUOTED_CHAR  */
   struct psi_token * PSI_T_QUOTED_CHAR;
+  /* SIZEOF  */
+  struct psi_token * PSI_T_SIZEOF;
+  /* VOLATILE  */
+  struct psi_token * PSI_T_VOLATILE;
   /* "end of line"  */
   struct psi_token * PSI_T_EOL;
   /* ";"  */
@@ -600,6 +619,8 @@ union YYSTYPE
   struct psi_token * PSI_T_CPP_EXTENSION;
   /* CPP_PASTE  */
   struct psi_token * PSI_T_CPP_PASTE;
+  /* CPP_INLINE  */
+  struct psi_token * PSI_T_CPP_INLINE;
   /* CPP_RESTRICT  */
   struct psi_token * PSI_T_CPP_RESTRICT;
   /* CPP_ASM  */
@@ -672,7 +693,7 @@ union YYSTYPE
   struct psi_token * PSI_T_assert_stmt_token;
   /* impl_stmt  */
   struct psi_token ** PSI_T_impl_stmt;
-#line 676 "src/parser_proc.h" /* glr.c:197  */
+#line 697 "src/parser_proc.h" /* glr.c:197  */
 };
 
 typedef union YYSTYPE YYSTYPE;

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index 4b099632ca04385684b975c305dc05d69378739b..7f76e4f7c1c92fe431e8ceb60a5868c5d1efd215 100644 (file)
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -9,6 +9,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);
 static void psi_parser_proc_error(struct psi_parser *P, struct psi_plist *tokens, size_t *index, const char *msg);
@@ -133,6 +134,8 @@ struct psi_parser;
 %token <struct psi_token *> NUMBER
 %token <struct psi_token *> QUOTED_STRING
 %token <struct psi_token *> QUOTED_CHAR
+%token <struct psi_token *> SIZEOF
+%token <struct psi_token *> VOLATILE
 
 %token <struct psi_token *> EOF 0              "end of file"
 %token <struct psi_token *> EOL                        "end of line"
@@ -230,6 +233,7 @@ struct psi_parser;
 %token <struct psi_token *> CPP_ATTRIBUTE
 %token <struct psi_token *> CPP_EXTENSION
 %token <struct psi_token *> CPP_PASTE
+%token <struct psi_token *> CPP_INLINE
 %token <struct psi_token *> CPP_RESTRICT
 %token <struct psi_token *> CPP_ASM
 
@@ -288,14 +292,14 @@ struct psi_parser;
 %type          <struct psi_token *>                            decl_stdint_type
 %destructor    {}                                                                      decl_stdint_type
 
-%type          <struct psi_decl_type *>                        decl_type const_decl_type decl_type_complex
-%destructor    {psi_decl_type_free(&$$);}                      decl_type const_decl_type decl_type_complex
+%type          <struct psi_decl_type *>                        decl_type qualified_decl_type decl_type_complex
+%destructor    {psi_decl_type_free(&$$);}                      decl_type qualified_decl_type decl_type_complex
 %type          <struct psi_decl *>                                     decl_stmt decl decl_body decl_func_body decl_functor_body
 %destructor    {psi_decl_free(&$$);}                           decl_stmt decl decl_body decl_func_body decl_functor_body
-%type          <struct psi_decl_arg *>                         decl_typedef decl_func decl_functor decl_arg decl_anon_arg typedef
-%destructor    {psi_decl_arg_free(&$$);}                       decl_typedef decl_func decl_functor decl_arg decl_anon_arg typedef
-%type          <struct psi_decl_var *>                         decl_var
-%destructor    {psi_decl_var_free(&$$);}                       decl_var
+%type          <struct psi_decl_arg *>                         decl_typedef decl_func decl_functor decl_arg decl_anon_arg typedef typedef_decl typedef_anon typedef_anon_decl
+%destructor    {psi_decl_arg_free(&$$);}                       decl_typedef decl_func decl_functor decl_arg decl_anon_arg typedef typedef_decl typedef_anon typedef_anon_decl  
+%type          <struct psi_decl_var *>                         decl_var anon_var
+%destructor    {psi_decl_var_free(&$$);}                       decl_var anon_var
 %type          <struct psi_decl_struct *>                      decl_struct
 %destructor    {psi_decl_struct_free(&$$);}            decl_struct
 %type          <struct psi_decl_union *>                       decl_union
@@ -312,6 +316,9 @@ struct psi_parser;
 %type          <struct psi_layout *>                           decl_layout
 %destructor    {psi_layout_free(&$$);}                         decl_layout
 
+%type          <struct psi_number *>                           sizeof sizeof_body sizeof_body_notypes
+%destructor    {psi_number_free(&$$);}                         sizeof sizeof_body sizeof_body_notypes
+
 %type          <struct psi_impl *>                                     impl
 %destructor    {psi_impl_free(&$$);}                           impl
 %type          <struct psi_impl_func *>                        impl_func
@@ -373,7 +380,8 @@ struct psi_parser;
 binary_op_token: PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | RCHEVR | LCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE ; 
 unary_op_token: TILDE | NOT | PLUS | MINUS ;
 name_token: NAME | FUNCTION | TEMP | FREE | SET | LET | CALLOC | CALLBACK | LIB | BOOL | STRING | ERROR | WARNING | LINE | PRAGMA_ONCE | PRAGMA | let_func_token | set_func_token;
-any_noeol_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | INT8 | UINT8 | INT16 | UINT16 | INT32 | UINT32 | INT64 | UINT64 | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACE | RBRACE | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM;
+any_noeol_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | INT8 | UINT8 | INT16 | UINT16 | INT32 | UINT32 | INT64 | UINT64 | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACE | RBRACE | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE;
+any_nobrace_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | INT8 | UINT8 | INT16 | UINT16 | INT32 | UINT32 | INT64 | UINT64 | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_INLINE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM | SIZEOF | VOLATILE;
 
 
 file:
@@ -408,6 +416,7 @@ block:
 |      decl_stmt {
        psi_parser_proc_add_decl(P, $decl_stmt);
 }
+|      ignored_decl
 |      decl_ext_var_stmt
 |      decl_typedef[def] {
        psi_parser_proc_add_typedef(P, $def);
@@ -540,6 +549,7 @@ cpp_special_name_token:
 |      FALSE
 |      CPP_RESTRICT
 |      CPP_EXTENSION
+|      CPP_INLINE
 ;
 
 cpp_macro_decl[macro]:
@@ -647,6 +657,10 @@ cpp_macro_exp[exp]:
        $exp->token = psi_token_copy($QUOTED_CHAR);
        $exp->data.n->token = psi_token_copy($QUOTED_CHAR);
 }
+|      sizeof {
+       $exp = psi_num_exp_init_num($sizeof);
+       $exp->token = psi_token_copy($sizeof->token);
+}
 |      name_token {
        $name_token->type = PSI_T_NAME;
        $exp = psi_num_exp_init_num(psi_number_init(PSI_T_DEFINE, $name_token->text, 0));
@@ -765,6 +779,24 @@ decl_typedef[def]:
 ;
 
 typedef[def]:
+       typedef_decl {
+       $def = $typedef_decl;
+}
+|      CPP_EXTENSION typedef_decl {
+       $def = $typedef_decl;
+}
+;
+
+typedef_anon[def]:
+       typedef_anon_decl {
+       $def = $typedef_anon_decl;
+}
+|      CPP_EXTENSION typedef_anon_decl {
+       $def = $typedef_anon_decl;
+}
+;
+
+typedef_decl[def]:
        decl_arg
 |      decl_func_body[decl] {
        $def = psi_decl_arg_init(
@@ -803,17 +835,56 @@ typedef[def]:
        $def->type->real.unn->size = $as.len;
        psi_parser_proc_add_union(P, $def->type->real.unn);
 }
-|      const_decl_type[type] decl_stdint_type[stdint] {
+|      qualified_decl_type[type] decl_stdint_type[stdint] {
        $stdint->type = PSI_T_NAME;
        $def = psi_decl_arg_init($type, psi_decl_var_init($stdint->text, 0, 0));
        $def->var->token = psi_token_copy($stdint);
 }
 ;
 
-const_decl_type[type]:
+typedef_anon_decl[def]:
+       typedef_decl
+|      qualified_decl_type[type] {
+       $def = psi_decl_arg_init($type, psi_decl_var_init(NULL, 0, 0));
+       $def->var->token = psi_token_copy($type->token);
+}
+|      decl_enum[enum] {
+       $def = psi_decl_arg_init(
+               psi_decl_type_init(PSI_T_ENUM, $enum->name),
+               psi_decl_var_init(NULL, 0, 0)
+       );
+       $def->var->token = psi_token_copy($enum->token);
+       $def->type->token = psi_token_copy($enum->token);
+       $def->type->real.enm = $enum;
+       psi_parser_proc_add_enum(P, $enum);
+}
+|      struct_name[struct] align_and_size[as] struct_args_block[args] {
+       $def = psi_decl_arg_init(psi_decl_type_init(PSI_T_STRUCT, $struct->text), psi_decl_var_init(NULL, 0, 0));
+       $def->type->token = $struct;
+       $def->type->real.strct = psi_decl_struct_init($struct->text, $args);
+       $def->type->real.strct->token = psi_token_copy($struct);
+       $def->type->real.strct->align = $as.pos;
+       $def->type->real.strct->size = $as.len;
+       psi_parser_proc_add_struct(P, $def->type->real.strct);
+}
+|      union_name[union] align_and_size[as] struct_args_block[args] {
+       $def = psi_decl_arg_init(psi_decl_type_init(PSI_T_UNION, $union->text), psi_decl_var_init(NULL, 0, 0));
+       $def->type->token = $union;
+       $def->type->real.unn = psi_decl_union_init($union->text, $args);
+       $def->type->real.unn->token = psi_token_copy($union);
+       $def->type->real.unn->align = $as.pos;
+       $def->type->real.unn->size = $as.len;
+       psi_parser_proc_add_union(P, $def->type->real.unn);
+}
+;
+
+qualified_decl_type[type]:
        CONST decl_type[type_] {
        $type = $type_;
 }
+|      VOLATILE decl_type[type_] {
+       $type = $type_;
+}
 |      decl_type
 ;
 
@@ -958,6 +1029,7 @@ signed_long_types[type]:
 }
 |      INT
 |      LONG
+|      LONG INT
 ;
 
 int_width_types[type]:
@@ -1022,6 +1094,32 @@ decl_vars[vars]:
 }
 ;
 
+ignored_decl:
+       STATIC decl_body ignored_decl_body {
+       psi_decl_free(&$decl_body);
+}
+|      CPP_INLINE decl_body ignored_decl_body {
+       psi_decl_free(&$decl_body);
+}
+|      STATIC CPP_INLINE decl_body ignored_decl_body {
+       psi_decl_free(&$decl_body);
+}
+;
+
+ignored_decl_body:
+       LBRACE ignored_decl_body_stmts RBRACE
+;
+
+ignored_decl_body_stmts:
+       ignored_decl_body_stmt
+|      ignored_decl_body_stmts ignored_decl_body_stmt
+;
+
+ignored_decl_body_stmt:
+       any_nobrace_token
+|      ignored_decl_body
+;
+
 decl:
        decl_body
 |      NAME[abi] decl_body {
@@ -1072,7 +1170,7 @@ decl_functor_body[decl]:
 ;
 
 decl_functor[arg]:
-       const_decl_type[type] indirection[i] LPAREN indirection[unused1] name_token[NAME] RPAREN {
+       qualified_decl_type[type] indirection[i] LPAREN indirection[unused1] name_token[NAME] RPAREN {
        (void) $unused1;
        $NAME->type = PSI_T_NAME;
        $arg = psi_decl_arg_init($type, psi_decl_var_init($NAME->text, $i, 0));
@@ -1147,7 +1245,7 @@ decl_anon_arg[arg]:
        decl_arg {
        $arg = $decl_arg;
 }
-|      const_decl_type[type] indirection {
+|      qualified_decl_type[type] indirection {
        $arg = psi_decl_arg_init(
                $type, 
                psi_decl_var_init(NULL, $indirection, 0)
@@ -1182,7 +1280,7 @@ decl_arg[arg]:
        $arg->type->token = psi_token_copy($decl->func->token);
        $arg->type->real.func = $decl;
 }
-|      const_decl_type[type] decl_var[var] {
+|      qualified_decl_type[type] decl_var[var] {
        $arg = psi_decl_arg_init($type, $var);
 }
 |      CONST VOID pointers name_token[NAME] {
@@ -1220,6 +1318,15 @@ decl_var[var]:
 }
 ;
 
+anon_var[var]:
+       %empty {
+       $var = psi_decl_var_init(NULL, 0, 0);
+}
+|      decl_var {
+       $var = $decl_var;
+}
+;
+
 decl_union[union]:
        UNION name_token align_and_size[as] decl_struct_args[args] {
        $name_token->type = PSI_T_NAME;
@@ -1254,7 +1361,7 @@ struct_args_block[args]:
 ;
 
 struct_args[args]:
-       typedef[arg] decl_layout[layout] struct_arg_var_list[vars] EOS {
+       typedef_anon[arg] decl_layout[layout] struct_arg_var_list[vars] EOS {
        $arg->layout = $layout;
        $args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_decl_arg_free), &$arg);
        if ($vars) {
@@ -1268,7 +1375,7 @@ struct_args[args]:
                free($vars);
        }
 }
-|      struct_args[args_] typedef[arg] decl_layout[layout] struct_arg_var_list[vars] EOS {
+|      struct_args[args_] typedef_anon[arg] decl_layout[layout] struct_arg_var_list[vars] EOS {
        $arg->layout = $layout;
        $args = psi_plist_add($args_, &$arg);
        if ($vars) {
@@ -1344,7 +1451,7 @@ num_exp[exp]:
        $exp = psi_num_exp_init_num($number);
        $exp->token = psi_token_copy($number->token);
 }
-|      LPAREN const_decl_type[type] RPAREN num_exp[exp_] %prec UNARY {
+|      LPAREN qualified_decl_type[type] RPAREN num_exp[exp_] %prec UNARY {
        $exp = psi_num_exp_init_cast($type, $exp_);
        $exp->token = psi_token_copy($type->token);
 }
@@ -1383,6 +1490,48 @@ number[num]:
        $num = psi_number_init(PSI_T_NAME, $decl_var, 0);
        $num->token = psi_token_copy($decl_var->token);
 }
+|      sizeof {
+       $num = $sizeof;
+}
+;
+
+sizeof:
+       SIZEOF LPAREN sizeof_body[sizeof_] RPAREN {
+       $sizeof = $sizeof_;
+       $sizeof->token = psi_token_copy($SIZEOF);
+}
+|      SIZEOF sizeof_body_notypes[sizeof_] {
+       $sizeof = $sizeof_;
+       $sizeof->token = psi_token_copy($SIZEOF);
+}
+;
+
+sizeof_body[sizeof]:
+       sizeof_body_notypes[sizeof_] {
+       $sizeof = $sizeof_;
+}
+|      decl_type indirection {
+       if ($indirection) {
+               int8_t sizeof_void_p = sizeof(void *);
+               $sizeof = psi_number_init(PSI_T_INT8, &sizeof_void_p, 0);
+       } else {
+               $sizeof = psi_number_init(PSI_T_SIZEOF, $decl_type, 0);
+       }
+}
+;
+
+sizeof_body_notypes[sizeof]:
+       AMPERSAND NAME {
+       int8_t sizeof_void_p = sizeof(void *);
+       $sizeof = psi_number_init(PSI_T_INT8, &sizeof_void_p, 0);
+}
+|      QUOTED_CHAR {
+       int8_t sizeof_a = sizeof('a');
+       $sizeof = psi_number_init(PSI_T_INT8, &sizeof_a, 0);
+}
+|      QUOTED_STRING {
+       $sizeof = psi_number_init(PSI_T_INT64, &$QUOTED_STRING->size, 0);
+}
 ;
 
 enum_name[name]:
@@ -1467,8 +1616,12 @@ array_size[as]:
 |      LBRACKET RBRACKET {
        $as = 0;
 }
-|      LBRACKET NUMBER RBRACKET {
-       $as = atol($NUMBER->text);
+|      LBRACKET num_exp RBRACKET {
+       if (psi_num_exp_validate(PSI_DATA(P), $num_exp, NULL, NULL, NULL, NULL, NULL)) {
+               $as = psi_long_num_exp($num_exp, NULL, &P->preproc->defs);
+       } else {
+               $as = 0;
+       }
 }
 ;
 

diff --git a/src/types/number.c b/src/types/number.c
index 4cb1f0295153549f318f686d1822619afb9b342b..b45e00ea2fe4126890ba97ac89b07823d4c2f26f 100644 (file)
--- a/src/types/number.c
+++ b/src/types/number.c
@@ -86,6 +86,9 @@ struct psi_number *psi_number_init(token_t t, void *num, unsigned flags)
        case PSI_T_FUNCTION:
                exp->data.call = num;
                break;
+       case PSI_T_SIZEOF:
+               exp->data.dtyp = num;
+               break;
        default:
                assert(0);
        }
@@ -130,6 +133,9 @@ struct psi_number *psi_number_copy(struct psi_number *exp)
        case PSI_T_FUNCTION:
                num->data.call = psi_cpp_macro_call_copy(num->data.call);
                break;
+       case PSI_T_SIZEOF:
+               num->data.dtyp = psi_decl_type_copy(num->data.dtyp);
+               break;
        default:
                assert(0);
        }
@@ -173,6 +179,9 @@ void psi_number_free(struct psi_number **exp_ptr)
                case PSI_T_NAME:
                        psi_decl_var_free(&exp->data.dvar);
                        break;
+               case PSI_T_SIZEOF:
+                       psi_decl_type_free(&exp->data.dtyp);
+                       break;
                default:
                        assert(0);
                }
@@ -236,6 +245,9 @@ void psi_number_dump(int fd, struct psi_number *exp)
        case PSI_T_NAME:
                psi_decl_var_dump(fd, exp->data.dvar);
                break;
+       case PSI_T_SIZEOF:
+               psi_decl_type_dump(fd, exp->data.dtyp, 0);
+               break;
        default:
                assert(0);
        }
@@ -481,6 +493,16 @@ bool psi_number_validate(struct psi_data *data, struct psi_number *exp,
                                exp->data.dvar->name);
                return false;
 
+       case PSI_T_SIZEOF:
+               if (psi_decl_type_validate(data, exp->data.dtyp, 0, NULL)) {
+                       struct psi_decl_type *dtyp = exp->data.dtyp;
+
+                       exp->type = PSI_T_UINT64;
+                       exp->data.ival.u64 = psi_decl_type_get_size(dtyp, NULL);
+                       return true;
+               }
+               break;
+
        case PSI_T_NSNAME:
                while (psi_plist_get(data->consts, i++, &cnst)) {
                        if (!strcmp(cnst->name, exp->data.numb)) {
@@ -613,6 +635,10 @@ token_t psi_number_eval(struct psi_number *exp, impl_val *res, struct psi_call_f
                if (frame) PSI_DEBUG_PRINT(frame->context, " %" PRIi64, res->i64);
                return PSI_T_INT64;
 
+       case PSI_T_NUMBER:
+               res->i64 = atol(exp->data.numb);
+               return PSI_T_INT64;
+
        case PSI_T_CONST:
                return psi_number_eval_constant(exp, res, frame);
 

diff --git a/src/types/number.h b/src/types/number.h
index cc5923ee4d46132aa490a75a373de2fa7692cd2a..b691a7a331222cf36a939608d058d2fc34417137 100644 (file)
--- a/src/types/number.h
+++ b/src/types/number.h
@@ -66,6 +66,7 @@ struct psi_number {
                impl_val ival;
                struct psi_const *cnst;
                struct psi_decl_var *dvar;
+               struct psi_decl_type *dtyp;
                struct psi_decl_enum_item *enm;
                struct psi_cpp_macro_call *call;
        } data;