cpp: avoid errenous multiple expansions

diff --git a/src/cpp.c b/src/cpp.c
index 29f8541afee2f04e3657e2e98bc08cf424651dc8..8075cf6b6ea646a21eddb32ba86a321953870ab6 100644 (file)
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -97,6 +97,8 @@ static bool psi_cpp_stage1(struct psi_cpp *cpp)
 {
        bool name = false, define = false, hash = false, eol = true, esc = false, ws = false;
 
+       PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP %s\n", "stage1");
+
        psi_cpp_tokiter_reset(cpp);
        while (psi_cpp_tokiter_valid(cpp)) {
                struct psi_token *token = psi_cpp_tokiter_current(cpp);
@@ -187,133 +189,131 @@ static bool psi_cpp_stage1(struct psi_cpp *cpp)
 static bool psi_cpp_stage2(struct psi_cpp *cpp)
 {
        struct psi_plist *parser_tokens = psi_plist_init((psi_plist_dtor) psi_token_free);
+       bool is_eol = true, do_cpp = false, do_expansion = true, skip_paren = false, skip_all = false;
 
-       do {
-               bool is_eol = true, do_cpp = false, do_expansion = true, skip_paren = false, skip_all = false;
-
-               psi_cpp_tokiter_reset(cpp);
+       PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP %s\n", "stage2");
 
-               while (psi_cpp_tokiter_valid(cpp)) {
-                       struct psi_token *current = psi_cpp_tokiter_current(cpp);
+       psi_cpp_tokiter_reset(cpp);
+       while (psi_cpp_tokiter_valid(cpp)) {
+               struct psi_token *current = psi_cpp_tokiter_current(cpp);
 
-                       if (current->type == PSI_T_HASH) {
-                               if (is_eol) {
-                                       do_cpp = true;
-                                       is_eol = false;
-                               }
-                       } else if (current->type == PSI_T_EOL) {
+               if (current->type == PSI_T_HASH) {
+                       if (is_eol) {
+                               do_cpp = true;
+                               is_eol = false;
+                       }
+               } else if (current->type == PSI_T_EOL) {
 #if PSI_CPP_DEBUG
-                               fprintf(stderr, "PSI: CPP do_expansion=true, PSI_T_EOL\n");
+                       fprintf(stderr, "PSI: CPP do_expansion=true, PSI_T_EOL\n");
 #endif
-                               is_eol = true;
-                               skip_all = false;
-                               do_expansion = true;
-                               if (!do_cpp) {
-                                       psi_cpp_tokiter_del_cur(cpp, true);
-                                       continue;
-                               }
-                       } else {
-                               is_eol = false;
+                       is_eol = true;
+                       skip_all = false;
+                       do_expansion = true;
+                       if (!do_cpp) {
+                               psi_cpp_tokiter_del_cur(cpp, true);
+                               continue;
+                       }
+               } else {
+                       is_eol = false;
 
-                               if (do_cpp) {
-                                       switch (current->type) {
-                                       case PSI_T_DEFINE:
+                       if (do_cpp) {
+                               switch (current->type) {
+                               case PSI_T_DEFINE:
 #if PSI_CPP_DEBUG
-                                               fprintf(stderr, "PSI: CPP do_expansion=false, PSI_T_DEFINE, skip_all\n");
+                                       fprintf(stderr, "PSI: CPP do_expansion=false, PSI_T_DEFINE, skip_all\n");
 #endif
-                                               do_expansion = false;
-                                               skip_all = true;
-                                               break;
-                                       case PSI_T_DEFINED:
-                                               skip_paren = true;
-                                               /* no break */
-                                       case PSI_T_IFDEF:
-                                       case PSI_T_IFNDEF:
-                                       case PSI_T_UNDEF:
+                                       do_expansion = false;
+                                       skip_all = true;
+                                       break;
+                               case PSI_T_DEFINED:
+                                       skip_paren = true;
+                                       /* no break */
+                               case PSI_T_IFDEF:
+                               case PSI_T_IFNDEF:
+                               case PSI_T_UNDEF:
 #if PSI_CPP_DEBUG
-                                               fprintf(stderr, "PSI: CPP do_expansion=false, PSI_T_{IF{,N},UN}DEF\n");
+                                       fprintf(stderr, "PSI: CPP do_expansion=false, PSI_T_{IF{,N},UN}DEF\n");
 #endif
-                                               do_expansion = false;
-                                               break;
-                                       case PSI_T_LPAREN:
-
-                                               if (!skip_all) {
-                                                       if (skip_paren) {
-                                                               skip_paren = false;
-                                                       } else {
-                                                               do_expansion = true;
+                                       do_expansion = false;
+                                       break;
+                               case PSI_T_LPAREN:
+
+                                       if (!skip_all) {
+                                               if (skip_paren) {
+                                                       skip_paren = false;
+                                               } else {
+                                                       do_expansion = true;
 #if PSI_CPP_DEBUG
-                                                               fprintf(stderr, "PSI: CPP do_expansion=true, PSI_T_LPAREN, !skip_all, !skip_paren\n");
+                                                       fprintf(stderr, "PSI: CPP do_expansion=true, PSI_T_LPAREN, !skip_all, !skip_paren\n");
 #endif
-                                                       }
                                                }
-                                               break;
-                                       case PSI_T_NAME:
-                                               break;
-                                       default:
-                                               do_expansion = !skip_all;
+                                       }
+                                       break;
+                               case PSI_T_NAME:
+                                       break;
+                               default:
+                                       do_expansion = !skip_all;
 #if PSI_CPP_DEBUG
-                                               fprintf(stderr, "PSI: CPP do_expansion=%s, <- !skip_all\n", do_expansion?"true":"false");
+                                       fprintf(stderr, "PSI: CPP do_expansion=%s, <- !skip_all\n", do_expansion?"true":"false");
 #endif
-                                       }
                                }
                        }
+               }
 
-                       if (cpp->skip) {
-                               /* FIXME: del_range */
-                               if (!do_cpp) {
+               if (cpp->skip) {
+                       /* FIXME: del_range */
+                       if (!do_cpp) {
 #if PSI_CPP_DEBUG
-                                       fprintf(stderr, "PSI: CPP skip ");
-                                       psi_token_dump(2, current);
+                               fprintf(stderr, "PSI: CPP skip ");
+                               psi_token_dump(2, current);
 #endif
-                                       psi_cpp_tokiter_del_cur(cpp, true);
-                                       continue;
-                               }
+                               psi_cpp_tokiter_del_cur(cpp, true);
+                               continue;
                        }
+               }
 
-                       if (do_expansion && current->type == PSI_T_NAME && psi_cpp_tokiter_defined(cpp)) {
-                               bool expanded = false;
+               if (do_expansion && current->type == PSI_T_NAME && psi_cpp_tokiter_defined(cpp)) {
+                       bool expanded = false;
 
-                               while (psi_cpp_tokiter_expand(cpp)) {
-                                       expanded = true;
-                               }
-                               if (expanded) {
-                                       continue;
-                               }
+                       while (psi_cpp_tokiter_expand(cpp)) {
+                               expanded = true;
+                       }
+                       if (expanded) {
+                               continue;
                        }
+               }
 
-                       if (do_cpp) {
-                               parser_tokens = psi_plist_add(parser_tokens, &current);
+               if (do_cpp) {
+                       parser_tokens = psi_plist_add(parser_tokens, &current);
 
-                               if (is_eol) {
-                                       size_t processed = 0;
-                                       bool parsed = psi_parser_process(cpp->parser, parser_tokens, &processed);
+                       if (is_eol) {
+                               size_t processed = 0;
+                               bool parsed = psi_parser_process(cpp->parser, parser_tokens, &processed);
 
-                                       /* EOL */
-                                       psi_plist_pop(parser_tokens, NULL);
-                                       psi_plist_clean(parser_tokens);
-                                       do_cpp = false;
+                               /* EOL */
+                               psi_plist_pop(parser_tokens, NULL);
+                               psi_plist_clean(parser_tokens);
+                               do_cpp = false;
 
-                                       if (!parsed) {
-                                               psi_plist_free(parser_tokens);
-                                               return false;
-                                       }
-                               } else {
-                                       /* leave EOLs in the input stream, else we might end up
-                                        * with a hash not preceded with a new line after include */
-                                       psi_cpp_tokiter_del_cur(cpp, false);
+                               if (!parsed) {
+                                       psi_plist_free(parser_tokens);
+                                       return false;
                                }
+                       } else {
+                               /* leave EOLs in the input stream, else we might end up
+                                * with a hash not preceded with a new line after include */
+                               psi_cpp_tokiter_del_cur(cpp, false);
+                       }
 
 #if PSI_CPP_DEBUG > 1
-                               psi_cpp_tokiter_dump(2, cpp);
+                       psi_cpp_tokiter_dump(2, cpp);
 #endif
 
-                               continue;
-                       }
-
-                       psi_cpp_tokiter_next(cpp);
+                       continue;
                }
-       } while (cpp->expanded);
+
+               psi_cpp_tokiter_next(cpp);
+       }
 
        psi_plist_free(parser_tokens);
 
@@ -351,6 +351,10 @@ bool psi_cpp_defined(struct psi_cpp *cpp, struct psi_token *tok)
 
 #if PSI_CPP_DEBUG
        fprintf(stderr, "PSI: CPP defined -> %s ", defined ? "true" : "false");
+       if (defined) {
+               struct psi_cpp_macro_decl *macro = zend_hash_str_find_ptr(&cpp->defs, tok->text, tok->size);
+               fprintf(stderr, " @ %s:%u ", macro->token->file, macro->token->line);
+       }
        psi_token_dump(2, tok);
 #endif
 
@@ -403,9 +407,13 @@ static inline bool try_include(struct psi_cpp *cpp, const char *path, bool *pars
                        *parsed = psi_cpp_process(cpp, &tokens);
 
                        if (*parsed) {
+                               size_t num_tokens = psi_plist_count(tokens);
+
                                ++cpp->expanded;
                                psi_cpp_tokiter_ins_range(cpp, cpp->index,
-                                               psi_plist_count(tokens), psi_plist_eles(tokens));
+                                               num_tokens, psi_plist_eles(tokens));
+                               /* skip already processed tokens */
+                               cpp->index += num_tokens;
                                free(tokens);
                        } else {
                                psi_plist_free(tokens);

diff --git a/src/cpp_tokiter.c b/src/cpp_tokiter.c
index 2fa1763dceb05b1b5dec1a204b6656b1ee6ad532..b62b351c21cc01ce8f458e754f489e6baa2d1a90 100644 (file)
--- a/src/cpp_tokiter.c
+++ b/src/cpp_tokiter.c
@@ -233,8 +233,8 @@ bool psi_cpp_tokiter_defined(struct psi_cpp *cpp)
        return false;
 }
 
-void psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp, struct psi_token *target,
-               struct psi_plist *tokens)
+static size_t psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp,
+               struct psi_token *target, struct psi_plist *tokens)
 {
        if (tokens && psi_plist_count(tokens)) {
                size_t i = 0, n = 0;
@@ -260,7 +260,7 @@ void psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp, struct psi_token *target
                                struct psi_token *old_tok = exp_tokens[n - 1];
 
                                new_tok = psi_token_init(old_tok->type, "", 0,
-                                               target->col, target->line, target->file);
+                                               target->col, target->line, target->file?:"");
 
                                new_tok = psi_token_cat(NULL, 2, new_tok, old_tok, tok);
                                free(old_tok);
@@ -268,7 +268,7 @@ void psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp, struct psi_token *target
                                exp_tokens[n - 1] = new_tok;
                        } else {
                                new_tok = psi_token_init(stringify ? PSI_T_QUOTED_STRING : tok->type,
-                                               tok->text, tok->size, target->col, target->line, target->file);
+                                               tok->text, tok->size, target->col, target->line, target->file?:"");
 
                                exp_tokens[n++] = new_tok;
                        }
@@ -283,6 +283,10 @@ void psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp, struct psi_token *target
                }
                psi_cpp_tokiter_ins_range(cpp, psi_cpp_tokiter_index(cpp), n, (void *) exp_tokens);
                free(exp_tokens);
+
+               return n;
+       } else {
+               return 0;
        }
 }
 
@@ -445,6 +449,39 @@ static bool psi_cpp_tokiter_expand_call(struct psi_cpp *cpp,
        return true;
 }
 
+static bool psi_cpp_tokiter_expand_def(struct psi_cpp *cpp,
+               struct psi_token *target, struct psi_cpp_macro_decl *macro)
+{
+       size_t index = psi_cpp_tokiter_index(cpp);
+
+       /* delete current token from stream */
+       psi_cpp_tokiter_del_cur(cpp, false);
+
+       if (index != psi_cpp_tokiter_index(cpp)) {
+               /* might have been last token */
+               psi_cpp_tokiter_next(cpp);
+       }
+       /* replace with tokens from macro */
+       psi_cpp_tokiter_expand_tokens(cpp, target, macro->tokens);
+
+       free(target);
+       ++cpp->expanded;
+       return true;
+}
+
+static inline int psi_cpp_tokiter_expand_cmp(struct psi_token *t,
+               struct psi_cpp_macro_decl *m)
+{
+       if (psi_plist_count(m->tokens) == 1) {
+               struct psi_token *r;
+
+               psi_plist_get(m->tokens, 0, &r);
+
+               return strcmp(r->text, t->text);
+       }
+       return -1;
+}
+
 bool psi_cpp_tokiter_expand(struct psi_cpp *cpp)
 {
        if (psi_cpp_tokiter_valid(cpp)) {
@@ -462,22 +499,8 @@ bool psi_cpp_tokiter_expand(struct psi_cpp *cpp)
 #endif
                                if (macro->sig) {
                                        return psi_cpp_tokiter_expand_call(cpp, current, macro);
-                               } else {
-                                       size_t index = psi_cpp_tokiter_index(cpp);
-
-                                       /* delete current token from stream */
-                                       psi_cpp_tokiter_del_cur(cpp, false);
-
-                                       if (index != psi_cpp_tokiter_index(cpp)) {
-                                               /* might have been last token */
-                                               psi_cpp_tokiter_next(cpp);
-                                       }
-                                       /* replace with tokens from macro */
-                                       psi_cpp_tokiter_expand_tokens(cpp, current, macro->tokens);
-
-                                       free(current);
-                                       ++cpp->expanded;
-                                       return true;
+                               } else if (psi_cpp_tokiter_expand_cmp(current, macro)) {
+                                       return psi_cpp_tokiter_expand_def(cpp, current, macro);
                                }
                        }
                }

diff --git a/src/parser.c b/src/parser.c
index 2b62a49f31fbef3466ddc8bd2c3ed55ce5e04ffa..f2d2473c53b42a6c74be4b37b49bd122fa91d104 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 on Tue Jul 25 12:21:22 2017 */
+/* Generated by re2c 0.16 on Thu Jul 27 10:44:33 2017 */
 #line 1 "src/parser.re"
 /*******************************************************************************
  Copyright (c) 2016, Michael Wallner <mike@php.net>.
@@ -265,6 +265,8 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
        bool escaped;
        token_t char_width;
 
+       PSI_DEBUG_PRINT(P, "PSI: scanning %s\n", I->file);
+
        tok = mrk = eol = cur = I->buffer;
        lim = I->buffer + I->length;
        I->lines = 1;
@@ -276,7 +278,7 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                tok = cur;
 
                
-#line 280 "src/parser.c"
+#line 282 "src/parser.c"
                {
                        unsigned char yych;
                        unsigned int yyaccept = 0;
@@ -402,9 +404,9 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
 yy2:
                        ++cur;
 yy3:
-#line 450 "src/parser.re"
+#line 452 "src/parser.re"
                        { NEWTOKEN(-2); goto error; }
-#line 408 "src/parser.c"
+#line 410 "src/parser.c"
 yy4:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -416,14 +418,14 @@ yy4:
                        default:        goto yy6;
                        }
 yy6:
-#line 449 "src/parser.re"
+#line 451 "src/parser.re"
                        { NEWTOKEN(PSI_T_WHITESPACE); goto start; }
-#line 422 "src/parser.c"
+#line 424 "src/parser.c"
 yy7:
                        ++cur;
-#line 448 "src/parser.re"
+#line 450 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
-#line 427 "src/parser.c"
+#line 429 "src/parser.c"
 yy9:
                        ++cur;
                        switch ((yych = *cur)) {
@@ -431,14 +433,14 @@ yy9:
                        default:        goto yy10;
                        }
 yy10:
-#line 347 "src/parser.re"
+#line 349 "src/parser.re"
                        { NEWTOKEN(PSI_T_NOT); goto start; }
-#line 437 "src/parser.c"
+#line 439 "src/parser.c"
 yy11:
                        ++cur;
-#line 320 "src/parser.re"
+#line 322 "src/parser.re"
                        { escaped = false; tok += 1; goto string; }
-#line 442 "src/parser.c"
+#line 444 "src/parser.c"
 yy13:
                        ++cur;
                        switch ((yych = *cur)) {
@@ -446,9 +448,9 @@ yy13:
                        default:        goto yy14;
                        }
 yy14:
-#line 330 "src/parser.re"
+#line 332 "src/parser.re"
                        { NEWTOKEN(PSI_T_HASH); goto start; }
-#line 452 "src/parser.c"
+#line 454 "src/parser.c"
 yy15:
                        yych = *++cur;
                        switch (yych) {
@@ -521,9 +523,9 @@ yy15:
                        }
 yy16:
                        ++cur;
-#line 348 "src/parser.re"
+#line 350 "src/parser.re"
                        { NEWTOKEN(PSI_T_MODULO); goto start; }
-#line 527 "src/parser.c"
+#line 529 "src/parser.c"
 yy18:
                        ++cur;
                        switch ((yych = *cur)) {
@@ -531,29 +533,29 @@ yy18:
                        default:        goto yy19;
                        }
 yy19:
-#line 349 "src/parser.re"
+#line 351 "src/parser.re"
                        { NEWTOKEN(PSI_T_AMPERSAND); goto start; }
-#line 537 "src/parser.c"
+#line 539 "src/parser.c"
 yy20:
                        ++cur;
-#line 319 "src/parser.re"
+#line 321 "src/parser.re"
                        { escaped = false; tok += 1; goto character; }
-#line 542 "src/parser.c"
+#line 544 "src/parser.c"
 yy22:
                        ++cur;
-#line 331 "src/parser.re"
+#line 333 "src/parser.re"
                        { NEWTOKEN(PSI_T_LPAREN); goto start; }
-#line 547 "src/parser.c"
+#line 549 "src/parser.c"
 yy24:
                        ++cur;
-#line 332 "src/parser.re"
+#line 334 "src/parser.re"
                        { NEWTOKEN(PSI_T_RPAREN); goto start; }
-#line 552 "src/parser.c"
+#line 554 "src/parser.c"
 yy26:
                        ++cur;
-#line 345 "src/parser.re"
+#line 347 "src/parser.re"
                        { NEWTOKEN(PSI_T_ASTERISK); goto start; }
-#line 557 "src/parser.c"
+#line 559 "src/parser.c"
 yy28:
                        yyaccept = 0;
                        yych = *(mrk = ++cur);
@@ -572,14 +574,14 @@ yy28:
                        default:        goto yy29;
                        }
 yy29:
-#line 350 "src/parser.re"
+#line 352 "src/parser.re"
                        { NEWTOKEN(PSI_T_PLUS); goto start; }
-#line 578 "src/parser.c"
+#line 580 "src/parser.c"
 yy30:
                        ++cur;
-#line 334 "src/parser.re"
+#line 336 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMA); goto start; }
-#line 583 "src/parser.c"
+#line 585 "src/parser.c"
 yy32:
                        yyaccept = 1;
                        yych = *(mrk = ++cur);
@@ -598,9 +600,9 @@ yy32:
                        default:        goto yy33;
                        }
 yy33:
-#line 351 "src/parser.re"
+#line 353 "src/parser.re"
                        { NEWTOKEN(PSI_T_MINUS); goto start; }
-#line 604 "src/parser.c"
+#line 606 "src/parser.c"
 yy34:
                        yyaccept = 2;
                        yych = *(mrk = ++cur);
@@ -619,9 +621,9 @@ yy34:
                        default:        goto yy35;
                        }
 yy35:
-#line 362 "src/parser.re"
+#line 364 "src/parser.re"
                        { NEWTOKEN(PSI_T_PERIOD); goto start; }
-#line 625 "src/parser.c"
+#line 627 "src/parser.c"
 yy36:
                        ++cur;
                        switch ((yych = *cur)) {
@@ -630,9 +632,9 @@ yy36:
                        default:        goto yy37;
                        }
 yy37:
-#line 352 "src/parser.re"
+#line 354 "src/parser.re"
                        { NEWTOKEN(PSI_T_SLASH); goto start; }
-#line 636 "src/parser.c"
+#line 638 "src/parser.c"
 yy38:
                        yyaccept = 3;
                        yych = *(mrk = ++cur);
@@ -658,9 +660,9 @@ yy38:
                        default:        goto yy39;
                        }
 yy39:
-#line 306 "src/parser.re"
+#line 308 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT; goto start; }
-#line 664 "src/parser.c"
+#line 666 "src/parser.c"
 yy40:
                        yyaccept = 3;
                        mrk = ++cur;
@@ -689,14 +691,14 @@ yy40:
                        }
 yy42:
                        ++cur;
-#line 335 "src/parser.re"
+#line 337 "src/parser.re"
                        { NEWTOKEN(PSI_T_COLON); goto start; }
-#line 695 "src/parser.c"
+#line 697 "src/parser.c"
 yy44:
                        ++cur;
-#line 333 "src/parser.re"
+#line 335 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOS); goto start; }
-#line 700 "src/parser.c"
+#line 702 "src/parser.c"
 yy46:
                        yyaccept = 4;
                        yych = *(mrk = ++cur);
@@ -772,9 +774,9 @@ yy46:
                        default:        goto yy47;
                        }
 yy47:
-#line 360 "src/parser.re"
+#line 362 "src/parser.re"
                        { NEWTOKEN(PSI_T_LCHEVR); goto start; }
-#line 778 "src/parser.c"
+#line 780 "src/parser.c"
 yy48:
                        ++cur;
                        switch ((yych = *cur)) {
@@ -782,9 +784,9 @@ yy48:
                        default:        goto yy49;
                        }
 yy49:
-#line 344 "src/parser.re"
+#line 346 "src/parser.re"
                        { NEWTOKEN(PSI_T_EQUALS); goto start; }
-#line 788 "src/parser.c"
+#line 790 "src/parser.c"
 yy50:
                        ++cur;
                        switch ((yych = *cur)) {
@@ -793,14 +795,14 @@ yy50:
                        default:        goto yy51;
                        }
 yy51:
-#line 361 "src/parser.re"
+#line 363 "src/parser.re"
                        { NEWTOKEN(PSI_T_RCHEVR); goto start; }
-#line 799 "src/parser.c"
+#line 801 "src/parser.c"
 yy52:
                        ++cur;
-#line 364 "src/parser.re"
+#line 366 "src/parser.re"
                        { NEWTOKEN(PSI_T_IIF); goto start; }
-#line 804 "src/parser.c"
+#line 806 "src/parser.c"
 yy54:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -810,9 +812,9 @@ yy54:
                        default:        goto yy62;
                        }
 yy55:
-#line 443 "src/parser.re"
+#line 445 "src/parser.re"
                        { NEWTOKEN(PSI_T_NAME); goto start; }
-#line 816 "src/parser.c"
+#line 818 "src/parser.c"
 yy56:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -1079,9 +1081,9 @@ yy75:
                        }
 yy76:
                        ++cur;
-#line 338 "src/parser.re"
+#line 340 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACKET); goto start; }
-#line 1085 "src/parser.c"
+#line 1087 "src/parser.c"
 yy78:
                        ++cur;
                        switch ((yych = *cur)) {
@@ -1163,19 +1165,19 @@ yy78:
                        default:        goto yy182;
                        }
 yy79:
-#line 353 "src/parser.re"
+#line 355 "src/parser.re"
                        { NEWTOKEN(PSI_T_BSLASH); goto start; }
-#line 1169 "src/parser.c"
+#line 1171 "src/parser.c"
 yy80:
                        ++cur;
-#line 339 "src/parser.re"
+#line 341 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACKET); goto start; }
-#line 1174 "src/parser.c"
+#line 1176 "src/parser.c"
 yy82:
                        ++cur;
-#line 355 "src/parser.re"
+#line 357 "src/parser.re"
                        { NEWTOKEN(PSI_T_CARET); goto start; }
-#line 1179 "src/parser.c"
+#line 1181 "src/parser.c"
 yy84:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -1223,9 +1225,9 @@ yy87:
                        }
 yy88:
                        ++cur;
-#line 336 "src/parser.re"
+#line 338 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACE); goto start; }
-#line 1229 "src/parser.c"
+#line 1231 "src/parser.c"
 yy90:
                        ++cur;
                        switch ((yych = *cur)) {
@@ -1233,29 +1235,29 @@ yy90:
                        default:        goto yy91;
                        }
 yy91:
-#line 354 "src/parser.re"
+#line 356 "src/parser.re"
                        { NEWTOKEN(PSI_T_PIPE); goto start; }
-#line 1239 "src/parser.c"
+#line 1241 "src/parser.c"
 yy92:
                        ++cur;
-#line 337 "src/parser.re"
+#line 339 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACE); goto start; }
-#line 1244 "src/parser.c"
+#line 1246 "src/parser.c"
 yy94:
                        ++cur;
-#line 346 "src/parser.re"
+#line 348 "src/parser.re"
                        { NEWTOKEN(PSI_T_TILDE); goto start; }
-#line 1249 "src/parser.c"
+#line 1251 "src/parser.c"
 yy96:
                        ++cur;
-#line 340 "src/parser.re"
+#line 342 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_NE); goto start; }
-#line 1254 "src/parser.c"
+#line 1256 "src/parser.c"
 yy98:
                        ++cur;
-#line 329 "src/parser.re"
+#line 331 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_PASTE); goto start; }
-#line 1259 "src/parser.c"
+#line 1261 "src/parser.c"
 yy100:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -1329,14 +1331,14 @@ yy100:
                        default:        goto yy100;
                        }
 yy102:
-#line 445 "src/parser.re"
+#line 447 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; }
-#line 1335 "src/parser.c"
+#line 1337 "src/parser.c"
 yy103:
                        ++cur;
-#line 342 "src/parser.re"
+#line 344 "src/parser.re"
                        { NEWTOKEN(PSI_T_AND); goto start; }
-#line 1340 "src/parser.c"
+#line 1342 "src/parser.c"
 yy105:
                        yych = *++cur;
                        switch (yych) {
@@ -1475,19 +1477,19 @@ yy108:
                        default:        goto yy110;
                        }
 yy110:
-#line 312 "src/parser.re"
+#line 314 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT; goto start; }
-#line 1481 "src/parser.c"
+#line 1483 "src/parser.c"
 yy111:
                        ++cur;
-#line 326 "src/parser.re"
+#line 328 "src/parser.re"
                        { goto comment; }
-#line 1486 "src/parser.c"
+#line 1488 "src/parser.c"
 yy113:
                        ++cur;
-#line 327 "src/parser.re"
+#line 329 "src/parser.re"
                        { goto comment_sl; }
-#line 1491 "src/parser.c"
+#line 1493 "src/parser.c"
 yy115:
                        yyaccept = 6;
                        mrk = ++cur;
@@ -1564,9 +1566,9 @@ yy120:
                        }
 yy121:
                        cur = ctxmrk;
-#line 308 "src/parser.re"
+#line 310 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 1570 "src/parser.c"
+#line 1572 "src/parser.c"
 yy122:
                        ++cur;
                        switch ((yych = *cur)) {
@@ -1576,9 +1578,9 @@ yy122:
                        }
 yy123:
                        cur = ctxmrk;
-#line 307 "src/parser.re"
+#line 309 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_U; cur += 1; goto start; }
-#line 1582 "src/parser.c"
+#line 1584 "src/parser.c"
 yy124:
                        yych = *++cur;
                        switch (yych) {
@@ -1682,29 +1684,29 @@ yy125:
                        }
 yy127:
                        ++cur;
-#line 356 "src/parser.re"
+#line 358 "src/parser.re"
                        { NEWTOKEN(PSI_T_LSHIFT); goto start; }
-#line 1688 "src/parser.c"
+#line 1690 "src/parser.c"
 yy129:
                        ++cur;
-#line 358 "src/parser.re"
+#line 360 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_LE); goto start; }
-#line 1693 "src/parser.c"
+#line 1695 "src/parser.c"
 yy131:
                        ++cur;
-#line 341 "src/parser.re"
+#line 343 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_EQ); goto start; }
-#line 1698 "src/parser.c"
+#line 1700 "src/parser.c"
 yy133:
                        ++cur;
-#line 359 "src/parser.re"
+#line 361 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_GE); goto start; }
-#line 1703 "src/parser.c"
+#line 1705 "src/parser.c"
 yy135:
                        ++cur;
-#line 357 "src/parser.re"
+#line 359 "src/parser.re"
                        { NEWTOKEN(PSI_T_RSHIFT); goto start; }
-#line 1708 "src/parser.c"
+#line 1710 "src/parser.c"
 yy137:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -1981,9 +1983,9 @@ yy152:
                        default:        goto yy61;
                        }
 yy153:
-#line 371 "src/parser.re"
+#line 373 "src/parser.re"
                        { NEWTOKEN(PSI_T_IF); goto start; }
-#line 1987 "src/parser.c"
+#line 1989 "src/parser.c"
 yy154:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -1997,9 +1999,9 @@ yy154:
 yy155:
                        ++cur;
                        cur = ctxmrk;
-#line 324 "src/parser.re"
+#line 326 "src/parser.re"
                        { char_width = SIZEOF_WCHAR_T/8; }
-#line 2003 "src/parser.c"
+#line 2005 "src/parser.c"
 yy157:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2148,9 +2150,9 @@ yy174:
 yy175:
                        ++cur;
                        cur = ctxmrk;
-#line 323 "src/parser.re"
+#line 325 "src/parser.re"
                        { char_width = 4; }
-#line 2154 "src/parser.c"
+#line 2156 "src/parser.c"
 yy177:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2269,9 +2271,9 @@ yy182:
                        default:        goto yy182;
                        }
 yy184:
-#line 444 "src/parser.re"
+#line 446 "src/parser.re"
                        { NEWTOKEN(PSI_T_NSNAME); goto start; }
-#line 2275 "src/parser.c"
+#line 2277 "src/parser.c"
 yy185:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2302,9 +2304,9 @@ yy187:
 yy188:
                        ++cur;
                        cur = ctxmrk;
-#line 322 "src/parser.re"
+#line 324 "src/parser.re"
                        { char_width = 2; }
-#line 2308 "src/parser.c"
+#line 2310 "src/parser.c"
 yy190:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2315,14 +2317,14 @@ yy190:
                        }
 yy191:
                        ++cur;
-#line 343 "src/parser.re"
+#line 345 "src/parser.re"
                        { NEWTOKEN(PSI_T_OR); goto start; }
-#line 2321 "src/parser.c"
+#line 2323 "src/parser.c"
 yy193:
                        ++cur;
-#line 363 "src/parser.re"
+#line 365 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELLIPSIS); goto start; }
-#line 2326 "src/parser.c"
+#line 2328 "src/parser.c"
 yy195:
                        yych = *++cur;
                        switch (yych) {
@@ -2337,15 +2339,15 @@ yy195:
 yy196:
                        ++cur;
                        cur = ctxmrk;
-#line 313 "src/parser.re"
+#line 315 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_F; cur += 1; goto start; }
-#line 2343 "src/parser.c"
+#line 2345 "src/parser.c"
 yy198:
                        ++cur;
                        cur = ctxmrk;
-#line 314 "src/parser.re"
+#line 316 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 2349 "src/parser.c"
+#line 2351 "src/parser.c"
 yy200:
                        yych = *++cur;
                        switch (yych) {
@@ -2357,9 +2359,9 @@ yy201:
                        ++cur;
 yy202:
                        cur = ctxmrk;
-#line 309 "src/parser.re"
+#line 311 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_UL; cur += 2; goto start; }
-#line 2363 "src/parser.c"
+#line 2365 "src/parser.c"
 yy203:
                        yych = *++cur;
                        switch (yych) {
@@ -2407,9 +2409,9 @@ yy204:
                        }
 yy206:
                        ++cur;
-#line 446 "src/parser.re"
+#line 448 "src/parser.re"
                        { tok += 1; cur -= 1; NEWTOKEN(PSI_T_CPP_HEADER); cur += 1; goto start; }
-#line 2413 "src/parser.c"
+#line 2415 "src/parser.c"
 yy208:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2650,9 +2652,9 @@ yy228:
                        default:        goto yy61;
                        }
 yy229:
-#line 393 "src/parser.re"
+#line 395 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT); goto start; }
-#line 2656 "src/parser.c"
+#line 2658 "src/parser.c"
 yy230:
                        yyaccept = 11;
                        yych = *(mrk = ++cur);
@@ -2725,9 +2727,9 @@ yy230:
                        default:        goto yy61;
                        }
 yy231:
-#line 419 "src/parser.re"
+#line 421 "src/parser.re"
                        { NEWTOKEN(PSI_T_LET); goto start; }
-#line 2731 "src/parser.c"
+#line 2733 "src/parser.c"
 yy232:
                        yyaccept = 12;
                        yych = *(mrk = ++cur);
@@ -2800,9 +2802,9 @@ yy232:
                        default:        goto yy61;
                        }
 yy233:
-#line 418 "src/parser.re"
+#line 420 "src/parser.re"
                        { NEWTOKEN(PSI_T_LIB); goto start; }
-#line 2806 "src/parser.c"
+#line 2808 "src/parser.c"
 yy234:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -2940,9 +2942,9 @@ yy242:
                        default:        goto yy61;
                        }
 yy243:
-#line 420 "src/parser.re"
+#line 422 "src/parser.re"
                        { NEWTOKEN(PSI_T_SET); goto start; }
-#line 2946 "src/parser.c"
+#line 2948 "src/parser.c"
 yy244:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -3118,33 +3120,33 @@ yy263:
 yy264:
                        ++cur;
                        cur = ctxmrk;
-#line 321 "src/parser.re"
+#line 323 "src/parser.re"
                        { char_width = 1; }
-#line 3124 "src/parser.c"
+#line 3126 "src/parser.c"
 yy266:
                        ++cur;
                        cur = ctxmrk;
-#line 316 "src/parser.re"
+#line 318 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DD; cur += 2; goto start; }
-#line 3130 "src/parser.c"
+#line 3132 "src/parser.c"
 yy268:
                        ++cur;
                        cur = ctxmrk;
-#line 315 "src/parser.re"
+#line 317 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DF; cur += 2; goto start; }
-#line 3136 "src/parser.c"
+#line 3138 "src/parser.c"
 yy270:
                        ++cur;
                        cur = ctxmrk;
-#line 317 "src/parser.re"
+#line 319 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DL; cur += 2; goto start; }
-#line 3142 "src/parser.c"
+#line 3144 "src/parser.c"
 yy272:
                        ++cur;
                        cur = ctxmrk;
-#line 310 "src/parser.re"
+#line 312 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_ULL; cur += 3; goto start; }
-#line 3148 "src/parser.c"
+#line 3150 "src/parser.c"
 yy274:
                        ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
@@ -3266,9 +3268,9 @@ yy278:
                        default:        goto yy61;
                        }
 yy279:
-#line 390 "src/parser.re"
+#line 392 "src/parser.re"
                        { NEWTOKEN(PSI_T_BOOL); goto start; }
-#line 3272 "src/parser.c"
+#line 3274 "src/parser.c"
 yy280:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -3353,9 +3355,9 @@ yy281:
                        default:        goto yy61;
                        }
 yy282:
-#line 391 "src/parser.re"
+#line 393 "src/parser.re"
                        { NEWTOKEN(PSI_T_CHAR); goto start; }
-#line 3359 "src/parser.c"
+#line 3361 "src/parser.c"
 yy283:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -3460,9 +3462,9 @@ yy287:
                        default:        goto yy61;
                        }
 yy288:
-#line 375 "src/parser.re"
+#line 377 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELIF); goto start; }
-#line 3466 "src/parser.c"
+#line 3468 "src/parser.c"
 yy289:
                        yyaccept = 17;
                        yych = *(mrk = ++cur);
@@ -3535,9 +3537,9 @@ yy289:
                        default:        goto yy61;
                        }
 yy290:
-#line 374 "src/parser.re"
+#line 376 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELSE); goto start; }
-#line 3541 "src/parser.c"
+#line 3543 "src/parser.c"
 yy291:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -3618,9 +3620,9 @@ yy292:
                        default:        goto yy61;
                        }
 yy293:
-#line 416 "src/parser.re"
+#line 418 "src/parser.re"
                        { NEWTOKEN(PSI_T_ENUM); goto start; }
-#line 3624 "src/parser.c"
+#line 3626 "src/parser.c"
 yy294:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -3717,9 +3719,9 @@ yy297:
                        default:        goto yy61;
                        }
 yy298:
-#line 424 "src/parser.re"
+#line 426 "src/parser.re"
                        { NEWTOKEN(PSI_T_FREE); goto start; }
-#line 3723 "src/parser.c"
+#line 3725 "src/parser.c"
 yy299:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -3860,9 +3862,9 @@ yy308:
                        default:        goto yy61;
                        }
 yy309:
-#line 394 "src/parser.re"
+#line 396 "src/parser.re"
                        { NEWTOKEN(PSI_T_LONG); goto start; }
-#line 3866 "src/parser.c"
+#line 3868 "src/parser.c"
 yy310:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -3943,9 +3945,9 @@ yy311:
                        default:        goto yy61;
                        }
 yy312:
-#line 386 "src/parser.re"
+#line 388 "src/parser.re"
                        { NEWTOKEN(PSI_T_NULL); goto start; }
-#line 3949 "src/parser.c"
+#line 3951 "src/parser.c"
 yy313:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -4121,9 +4123,9 @@ yy326:
                        default:        goto yy61;
                        }
 yy327:
-#line 425 "src/parser.re"
+#line 427 "src/parser.re"
                        { NEWTOKEN(PSI_T_TEMP); goto start; }
-#line 4127 "src/parser.c"
+#line 4129 "src/parser.c"
 yy328:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -4244,9 +4246,9 @@ yy334:
                        default:        goto yy61;
                        }
 yy335:
-#line 384 "src/parser.re"
+#line 386 "src/parser.re"
                        { NEWTOKEN(PSI_T_TRUE); goto start; }
-#line 4250 "src/parser.c"
+#line 4252 "src/parser.c"
 yy336:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -4361,9 +4363,9 @@ yy341:
                        default:        goto yy61;
                        }
 yy342:
-#line 389 "src/parser.re"
+#line 391 "src/parser.re"
                        { NEWTOKEN(PSI_T_VOID); goto start; }
-#line 4367 "src/parser.c"
+#line 4369 "src/parser.c"
 yy343:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -4444,9 +4446,9 @@ yy344:
                        default:        goto yy61;
                        }
 yy345:
-#line 434 "src/parser.re"
+#line 436 "src/parser.re"
                        { NEWTOKEN(PSI_T_ZVAL); goto start; }
-#line 4450 "src/parser.c"
+#line 4452 "src/parser.c"
 yy346:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -4547,9 +4549,9 @@ yy350:
                        default:        goto yy61;
                        }
 yy351:
-#line 370 "src/parser.re"
+#line 372 "src/parser.re"
                        { NEWTOKEN(PSI_T_LINE); goto start; }
-#line 4553 "src/parser.c"
+#line 4555 "src/parser.c"
 yy352:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -4629,9 +4631,9 @@ yy353:
                        default:        goto yy61;
                        }
 yy354:
-#line 408 "src/parser.re"
+#line 410 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRAY); goto start; }
-#line 4635 "src/parser.c"
+#line 4637 "src/parser.c"
 yy355:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -4744,9 +4746,9 @@ yy360:
                        default:        goto yy61;
                        }
 yy361:
-#line 417 "src/parser.re"
+#line 419 "src/parser.re"
                        { NEWTOKEN(PSI_T_CONST); goto start; }
-#line 4750 "src/parser.c"
+#line 4752 "src/parser.c"
 yy362:
                        yyaccept = 29;
                        yych = *(mrk = ++cur);
@@ -4819,9 +4821,9 @@ yy362:
                        default:        goto yy61;
                        }
 yy363:
-#line 435 "src/parser.re"
+#line 437 "src/parser.re"
                        { NEWTOKEN(PSI_T_COUNT); goto start; }
-#line 4825 "src/parser.c"
+#line 4827 "src/parser.c"
 yy364:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -4910,9 +4912,9 @@ yy366:
                        default:        goto yy61;
                        }
 yy367:
-#line 376 "src/parser.re"
+#line 378 "src/parser.re"
                        { NEWTOKEN(PSI_T_ENDIF); goto start; }
-#line 4916 "src/parser.c"
+#line 4918 "src/parser.c"
 yy368:
                        yyaccept = 31;
                        yych = *(mrk = ++cur);
@@ -4985,9 +4987,9 @@ yy368:
                        default:        goto yy61;
                        }
 yy369:
-#line 381 "src/parser.re"
+#line 383 "src/parser.re"
                        { NEWTOKEN(PSI_T_ERROR); goto start; }
-#line 4991 "src/parser.c"
+#line 4993 "src/parser.c"
 yy370:
                        yyaccept = 32;
                        yych = *(mrk = ++cur);
@@ -5060,9 +5062,9 @@ yy370:
                        default:        goto yy61;
                        }
 yy371:
-#line 385 "src/parser.re"
+#line 387 "src/parser.re"
                        { NEWTOKEN(PSI_T_FALSE); goto start; }
-#line 5066 "src/parser.c"
+#line 5068 "src/parser.c"
 yy372:
                        yyaccept = 33;
                        yych = *(mrk = ++cur);
@@ -5137,9 +5139,9 @@ yy372:
                        default:        goto yy61;
                        }
 yy373:
-#line 395 "src/parser.re"
+#line 397 "src/parser.re"
                        { NEWTOKEN(PSI_T_FLOAT); goto start; }
-#line 5143 "src/parser.c"
+#line 5145 "src/parser.c"
 yy374:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -5220,9 +5222,9 @@ yy375:
                        default:        goto yy61;
                        }
 yy376:
-#line 372 "src/parser.re"
+#line 374 "src/parser.re"
                        { NEWTOKEN(PSI_T_IFDEF); goto start; }
-#line 5226 "src/parser.c"
+#line 5228 "src/parser.c"
 yy377:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -5348,9 +5350,9 @@ yy384:
                        default:        goto yy61;
                        }
 yy385:
-#line 387 "src/parser.re"
+#line 389 "src/parser.re"
                        { NEWTOKEN(PSI_T_MIXED); goto start; }
-#line 5354 "src/parser.c"
+#line 5356 "src/parser.c"
 yy386:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -5471,9 +5473,9 @@ yy392:
                        default:        goto yy61;
                        }
 yy393:
-#line 392 "src/parser.re"
+#line 394 "src/parser.re"
                        { NEWTOKEN(PSI_T_SHORT); goto start; }
-#line 5477 "src/parser.c"
+#line 5479 "src/parser.c"
 yy394:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -5678,9 +5680,9 @@ yy411:
                        default:        goto yy61;
                        }
 yy412:
-#line 379 "src/parser.re"
+#line 381 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNDEF); goto start; }
-#line 5684 "src/parser.c"
+#line 5686 "src/parser.c"
 yy413:
                        yyaccept = 38;
                        yych = *(mrk = ++cur);
@@ -5753,9 +5755,9 @@ yy413:
                        default:        goto yy61;
                        }
 yy414:
-#line 415 "src/parser.re"
+#line 417 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNION); goto start; }
-#line 5759 "src/parser.c"
+#line 5761 "src/parser.c"
 yy415:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -5879,9 +5881,9 @@ yy422:
                        default:        goto yy61;
                        }
 yy423:
-#line 432 "src/parser.re"
+#line 434 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRVAL); goto start; }
-#line 5885 "src/parser.c"
+#line 5887 "src/parser.c"
 yy424:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -5978,9 +5980,9 @@ yy427:
                        default:        goto yy61;
                        }
 yy428:
-#line 436 "src/parser.re"
+#line 438 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLOC); goto start; }
-#line 5984 "src/parser.c"
+#line 5986 "src/parser.c"
 yy429:
                        yyaccept = 41;
                        yych = *(mrk = ++cur);
@@ -6055,9 +6057,9 @@ yy429:
                        default:        goto yy61;
                        }
 yy430:
-#line 377 "src/parser.re"
+#line 379 "src/parser.re"
                        { NEWTOKEN(PSI_T_DEFINE); goto start; }
-#line 6061 "src/parser.c"
+#line 6063 "src/parser.c"
 yy431:
                        yyaccept = 42;
                        yych = *(mrk = ++cur);
@@ -6130,9 +6132,9 @@ yy431:
                        default:        goto yy61;
                        }
 yy432:
-#line 396 "src/parser.re"
+#line 398 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOUBLE); goto start; }
-#line 6136 "src/parser.c"
+#line 6138 "src/parser.c"
 yy433:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -6221,9 +6223,9 @@ yy435:
                        default:        goto yy61;
                        }
 yy436:
-#line 373 "src/parser.re"
+#line 375 "src/parser.re"
                        { NEWTOKEN(PSI_T_IFNDEF); goto start; }
-#line 6227 "src/parser.c"
+#line 6229 "src/parser.c"
 yy437:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -6328,9 +6330,9 @@ yy441:
                        default:        goto yy61;
                        }
 yy442:
-#line 397 "src/parser.re"
+#line 399 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT8); goto start; }
-#line 6334 "src/parser.c"
+#line 6336 "src/parser.c"
 yy443:
                        yyaccept = 45;
                        yych = *(mrk = ++cur);
@@ -6403,9 +6405,9 @@ yy443:
                        default:        goto yy61;
                        }
 yy444:
-#line 429 "src/parser.re"
+#line 431 "src/parser.re"
                        { NEWTOKEN(PSI_T_INTVAL); goto start; }
-#line 6409 "src/parser.c"
+#line 6411 "src/parser.c"
 yy445:
                        yyaccept = 46;
                        yych = *(mrk = ++cur);
@@ -6478,9 +6480,9 @@ yy445:
                        default:        goto yy61;
                        }
 yy446:
-#line 409 "src/parser.re"
+#line 411 "src/parser.re"
                        { NEWTOKEN(PSI_T_OBJECT); goto start; }
-#line 6484 "src/parser.c"
+#line 6486 "src/parser.c"
 yy447:
                        yyaccept = 47;
                        yych = *(mrk = ++cur);
@@ -6553,9 +6555,9 @@ yy447:
                        default:        goto yy61;
                        }
 yy448:
-#line 433 "src/parser.re"
+#line 435 "src/parser.re"
                        { NEWTOKEN(PSI_T_OBJVAL); goto start; }
-#line 6559 "src/parser.c"
+#line 6561 "src/parser.c"
 yy449:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -6652,9 +6654,9 @@ yy452:
                        default:        goto yy61;
                        }
 yy453:
-#line 423 "src/parser.re"
+#line 425 "src/parser.re"
                        { NEWTOKEN(PSI_T_RETURN); goto start; }
-#line 6658 "src/parser.c"
+#line 6660 "src/parser.c"
 yy454:
                        yyaccept = 49;
                        yych = *(mrk = ++cur);
@@ -6727,9 +6729,9 @@ yy454:
                        default:        goto yy61;
                        }
 yy455:
-#line 406 "src/parser.re"
+#line 408 "src/parser.re"
                        { NEWTOKEN(PSI_T_SIGNED); goto start; }
-#line 6733 "src/parser.c"
+#line 6735 "src/parser.c"
 yy456:
                        yyaccept = 50;
                        yych = *(mrk = ++cur);
@@ -6802,9 +6804,9 @@ yy456:
                        default:        goto yy61;
                        }
 yy457:
-#line 411 "src/parser.re"
+#line 413 "src/parser.re"
                        { NEWTOKEN(PSI_T_STATIC); goto start; }
-#line 6808 "src/parser.c"
+#line 6810 "src/parser.c"
 yy458:
                        yyaccept = 51;
                        yych = *(mrk = ++cur);
@@ -6877,9 +6879,9 @@ yy458:
                        default:        goto yy61;
                        }
 yy459:
-#line 407 "src/parser.re"
+#line 409 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRING); goto start; }
-#line 6883 "src/parser.c"
+#line 6885 "src/parser.c"
 yy460:
                        yyaccept = 52;
                        yych = *(mrk = ++cur);
@@ -6952,9 +6954,9 @@ yy460:
                        default:        goto yy61;
                        }
 yy461:
-#line 426 "src/parser.re"
+#line 428 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRLEN); goto start; }
-#line 6958 "src/parser.c"
+#line 6960 "src/parser.c"
 yy462:
                        yyaccept = 53;
                        yych = *(mrk = ++cur);
@@ -7027,9 +7029,9 @@ yy462:
                        default:        goto yy61;
                        }
 yy463:
-#line 414 "src/parser.re"
+#line 416 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRUCT); goto start; }
-#line 7033 "src/parser.c"
+#line 7035 "src/parser.c"
 yy464:
                        yyaccept = 54;
                        yych = *(mrk = ++cur);
@@ -7102,9 +7104,9 @@ yy464:
                        default:        goto yy61;
                        }
 yy465:
-#line 427 "src/parser.re"
+#line 429 "src/parser.re"
                        { NEWTOKEN(PSI_T_STRVAL); goto start; }
-#line 7108 "src/parser.c"
+#line 7110 "src/parser.c"
 yy466:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -7201,9 +7203,9 @@ yy469:
                        default:        goto yy61;
                        }
 yy470:
-#line 440 "src/parser.re"
+#line 442 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_INT); goto start; }
-#line 7207 "src/parser.c"
+#line 7209 "src/parser.c"
 yy471:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -7373,9 +7375,9 @@ yy484:
                        default:        goto yy527;
                        }
 yy485:
-#line 365 "src/parser.re"
+#line 367 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRAGMA); goto start; }
-#line 7379 "src/parser.c"
+#line 7381 "src/parser.c"
 yy486:
                        yyaccept = 57;
                        yych = *(mrk = ++cur);
@@ -7448,9 +7450,9 @@ yy486:
                        default:        goto yy61;
                        }
 yy487:
-#line 431 "src/parser.re"
+#line 433 "src/parser.re"
                        { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
-#line 7454 "src/parser.c"
+#line 7456 "src/parser.c"
 yy488:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -7539,9 +7541,9 @@ yy490:
                        default:        goto yy61;
                        }
 yy491:
-#line 378 "src/parser.re"
+#line 380 "src/parser.re"
                        { NEWTOKEN(PSI_T_DEFINED); goto start; }
-#line 7545 "src/parser.c"
+#line 7547 "src/parser.c"
 yy492:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -7631,9 +7633,9 @@ yy494:
                        default:        goto yy61;
                        }
 yy495:
-#line 382 "src/parser.re"
+#line 384 "src/parser.re"
                        { NEWTOKEN(PSI_T_INCLUDE); goto start; }
-#line 7637 "src/parser.c"
+#line 7639 "src/parser.c"
 yy496:
                        yyaccept = 60;
                        yych = *(mrk = ++cur);
@@ -7706,9 +7708,9 @@ yy496:
                        default:        goto yy61;
                        }
 yy497:
-#line 399 "src/parser.re"
+#line 401 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT16); goto start; }
-#line 7712 "src/parser.c"
+#line 7714 "src/parser.c"
 yy498:
                        yyaccept = 61;
                        yych = *(mrk = ++cur);
@@ -7781,9 +7783,9 @@ yy498:
                        default:        goto yy61;
                        }
 yy499:
-#line 401 "src/parser.re"
+#line 403 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT32); goto start; }
-#line 7787 "src/parser.c"
+#line 7789 "src/parser.c"
 yy500:
                        yyaccept = 62;
                        yych = *(mrk = ++cur);
@@ -7856,9 +7858,9 @@ yy500:
                        default:        goto yy61;
                        }
 yy501:
-#line 403 "src/parser.re"
+#line 405 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT64); goto start; }
-#line 7862 "src/parser.c"
+#line 7864 "src/parser.c"
 yy502:
                        yyaccept = 63;
                        yych = *(mrk = ++cur);
@@ -7931,9 +7933,9 @@ yy502:
                        default:        goto yy61;
                        }
 yy503:
-#line 428 "src/parser.re"
+#line 430 "src/parser.re"
                        { NEWTOKEN(PSI_T_PATHVAL); goto start; }
-#line 7937 "src/parser.c"
+#line 7939 "src/parser.c"
 yy504:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -8030,9 +8032,9 @@ yy507:
                        default:        goto yy61;
                        }
 yy508:
-#line 442 "src/parser.re"
+#line 444 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_BOOL); goto start; }
-#line 8036 "src/parser.c"
+#line 8038 "src/parser.c"
 yy509:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -8129,9 +8131,9 @@ yy512:
                        default:        goto yy61;
                        }
 yy513:
-#line 413 "src/parser.re"
+#line 415 "src/parser.re"
                        { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
-#line 8135 "src/parser.c"
+#line 8137 "src/parser.c"
 yy514:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -8228,9 +8230,9 @@ yy517:
                        default:        goto yy61;
                        }
 yy518:
-#line 398 "src/parser.re"
+#line 400 "src/parser.re"
                        { NEWTOKEN(PSI_T_UINT8); goto start; }
-#line 8234 "src/parser.c"
+#line 8236 "src/parser.c"
 yy519:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -8311,9 +8313,9 @@ yy520:
                        default:        goto yy61;
                        }
 yy521:
-#line 380 "src/parser.re"
+#line 382 "src/parser.re"
                        { NEWTOKEN(PSI_T_WARNING); goto start; }
-#line 8317 "src/parser.c"
+#line 8319 "src/parser.c"
 yy522:
                        yyaccept = 68;
                        yych = *(mrk = ++cur);
@@ -8386,9 +8388,9 @@ yy522:
                        default:        goto yy61;
                        }
 yy523:
-#line 369 "src/parser.re"
+#line 371 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_ASM); goto start; }
-#line 8392 "src/parser.c"
+#line 8394 "src/parser.c"
 yy524:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -8556,9 +8558,9 @@ yy529:
                        default:        goto yy61;
                        }
 yy530:
-#line 388 "src/parser.re"
+#line 390 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLABLE); goto start; }
-#line 8562 "src/parser.c"
+#line 8564 "src/parser.c"
 yy531:
                        yyaccept = 70;
                        yych = *(mrk = ++cur);
@@ -8631,9 +8633,9 @@ yy531:
                        default:        goto yy61;
                        }
 yy532:
-#line 410 "src/parser.re"
+#line 412 "src/parser.re"
                        { NEWTOKEN(PSI_T_CALLBACK); goto start; }
-#line 8637 "src/parser.c"
+#line 8639 "src/parser.c"
 yy533:
                        yyaccept = 71;
                        yych = *(mrk = ++cur);
@@ -8706,9 +8708,9 @@ yy533:
                        default:        goto yy61;
                        }
 yy534:
-#line 430 "src/parser.re"
+#line 432 "src/parser.re"
                        { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
-#line 8712 "src/parser.c"
+#line 8714 "src/parser.c"
 yy535:
                        yyaccept = 72;
                        yych = *(mrk = ++cur);
@@ -8781,9 +8783,9 @@ yy535:
                        default:        goto yy61;
                        }
 yy536:
-#line 412 "src/parser.re"
+#line 414 "src/parser.re"
                        { NEWTOKEN(PSI_T_FUNCTION); goto start; }
-#line 8787 "src/parser.c"
+#line 8789 "src/parser.c"
 yy537:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -8880,9 +8882,9 @@ yy540:
                        default:        goto yy61;
                        }
 yy541:
-#line 438 "src/parser.re"
+#line 440 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
-#line 8886 "src/parser.c"
+#line 8888 "src/parser.c"
 yy542:
                        yyaccept = 74;
                        yych = *(mrk = ++cur);
@@ -8955,9 +8957,9 @@ yy542:
                        default:        goto yy61;
                        }
 yy543:
-#line 441 "src/parser.re"
+#line 443 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
-#line 8961 "src/parser.c"
+#line 8963 "src/parser.c"
 yy544:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -9046,9 +9048,9 @@ yy546:
                        default:        goto yy61;
                        }
 yy547:
-#line 400 "src/parser.re"
+#line 402 "src/parser.re"
                        { NEWTOKEN(PSI_T_UINT16); goto start; }
-#line 9052 "src/parser.c"
+#line 9054 "src/parser.c"
 yy548:
                        yyaccept = 76;
                        yych = *(mrk = ++cur);
@@ -9121,9 +9123,9 @@ yy548:
                        default:        goto yy61;
                        }
 yy549:
-#line 402 "src/parser.re"
+#line 404 "src/parser.re"
                        { NEWTOKEN(PSI_T_UINT32); goto start; }
-#line 9127 "src/parser.c"
+#line 9129 "src/parser.c"
 yy550:
                        yyaccept = 77;
                        yych = *(mrk = ++cur);
@@ -9196,9 +9198,9 @@ yy550:
                        default:        goto yy61;
                        }
 yy551:
-#line 404 "src/parser.re"
+#line 406 "src/parser.re"
                        { NEWTOKEN(PSI_T_UINT64); goto start; }
-#line 9202 "src/parser.c"
+#line 9204 "src/parser.c"
 yy552:
                        yyaccept = 78;
                        yych = *(mrk = ++cur);
@@ -9271,9 +9273,9 @@ yy552:
                        default:        goto yy61;
                        }
 yy553:
-#line 405 "src/parser.re"
+#line 407 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
-#line 9277 "src/parser.c"
+#line 9279 "src/parser.c"
 yy554:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -9466,9 +9468,9 @@ yy562:
                        default:        goto yy61;
                        }
 yy563:
-#line 437 "src/parser.re"
+#line 439 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_OBJECT); goto start; }
-#line 9472 "src/parser.c"
+#line 9474 "src/parser.c"
 yy564:
                        yyaccept = 80;
                        yych = *(mrk = ++cur);
@@ -9541,9 +9543,9 @@ yy564:
                        default:        goto yy61;
                        }
 yy565:
-#line 439 "src/parser.re"
+#line 441 "src/parser.re"
                        { NEWTOKEN(PSI_T_TO_STRING); goto start; }
-#line 9547 "src/parser.c"
+#line 9549 "src/parser.c"
 yy566:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -9728,9 +9730,9 @@ yy572:
                        default:        goto yy61;
                        }
 yy573:
-#line 421 "src/parser.re"
+#line 423 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
-#line 9734 "src/parser.c"
+#line 9736 "src/parser.c"
 yy574:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -9817,9 +9819,9 @@ yy576:
                        default:        goto yy61;
                        }
 yy577:
-#line 367 "src/parser.re"
+#line 369 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_RESTRICT); goto start; }
-#line 9823 "src/parser.c"
+#line 9825 "src/parser.c"
 yy578:
                        yyaccept = 5;
                        mrk = ++cur;
@@ -9975,9 +9977,9 @@ yy580:
                        default:        goto yy61;
                        }
 yy581:
-#line 422 "src/parser.re"
+#line 424 "src/parser.re"
                        { NEWTOKEN(PSI_T_POST_ASSERT); goto start; }
-#line 9981 "src/parser.c"
+#line 9983 "src/parser.c"
 yy582:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -10067,9 +10069,9 @@ yy584:
                        default:        goto yy527;
                        }
 yy585:
-#line 366 "src/parser.re"
+#line 368 "src/parser.re"
                        { NEWTOKEN(PSI_T_PRAGMA_ONCE); goto start; }
-#line 10073 "src/parser.c"
+#line 10075 "src/parser.c"
 yy586:
                        yyaccept = 85;
                        yych = *(mrk = ++cur);
@@ -10142,9 +10144,9 @@ yy586:
                        default:        goto yy61;
                        }
 yy587:
-#line 383 "src/parser.re"
+#line 385 "src/parser.re"
                        { NEWTOKEN(PSI_T_INCLUDE_NEXT); goto start; }
-#line 10148 "src/parser.c"
+#line 10150 "src/parser.c"
 yy588:
                        yyaccept = 5;
                        yych = *(mrk = ++cur);
@@ -10302,9 +10304,9 @@ yy591:
                        default:        goto yy61;
                        }
 yy592:
-#line 368 "src/parser.re"
+#line 370 "src/parser.re"
                        { NEWTOKEN(PSI_T_CPP_EXTENSION); goto start; }
-#line 10308 "src/parser.c"
+#line 10310 "src/parser.c"
 yy593:
                        ++cur;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
@@ -10324,16 +10326,16 @@ yy595:
                        }
 yy596:
                        ++cur;
-#line 447 "src/parser.re"
+#line 449 "src/parser.re"
                        { parens = 2; goto cpp_attribute; }
-#line 10330 "src/parser.c"
+#line 10332 "src/parser.c"
                }
-#line 453 "src/parser.re"
+#line 455 "src/parser.re"
 
 
        character: ;
                
-#line 10337 "src/parser.c"
+#line 10339 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10347,17 +10349,17 @@ yy596:
                        }
 yy600:
                        ++cur;
-#line 471 "src/parser.re"
+#line 473 "src/parser.re"
                        { escaped = false; goto character; }
-#line 10353 "src/parser.c"
+#line 10355 "src/parser.c"
 yy602:
                        ++cur;
-#line 458 "src/parser.re"
+#line 460 "src/parser.re"
                        { NEWLINE(); goto character; }
-#line 10358 "src/parser.c"
+#line 10360 "src/parser.c"
 yy604:
                        ++cur;
-#line 460 "src/parser.re"
+#line 462 "src/parser.re"
                        {
                        if (escaped) {
                                escaped = false;
@@ -10369,19 +10371,19 @@ yy604:
                        token->flags = char_width;
                        goto start;
                }
-#line 10373 "src/parser.c"
+#line 10375 "src/parser.c"
 yy606:
                        ++cur;
-#line 459 "src/parser.re"
+#line 461 "src/parser.re"
                        { escaped = !escaped;  goto character; }
-#line 10378 "src/parser.c"
+#line 10380 "src/parser.c"
                }
-#line 473 "src/parser.re"
+#line 475 "src/parser.re"
 
 
        string: ;
                
-#line 10385 "src/parser.c"
+#line 10387 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10395,17 +10397,17 @@ yy606:
                        }
 yy610:
                        ++cur;
-#line 491 "src/parser.re"
+#line 493 "src/parser.re"
                        { escaped = false; goto string; }
-#line 10401 "src/parser.c"
+#line 10403 "src/parser.c"
 yy612:
                        ++cur;
-#line 478 "src/parser.re"
+#line 480 "src/parser.re"
                        { NEWLINE(); goto string; }
-#line 10406 "src/parser.c"
+#line 10408 "src/parser.c"
 yy614:
                        ++cur;
-#line 480 "src/parser.re"
+#line 482 "src/parser.re"
                        {
                        if (escaped) {
                                escaped = false;
@@ -10417,19 +10419,19 @@ yy614:
                        token->flags = char_width;
                        goto start;
                }
-#line 10421 "src/parser.c"
+#line 10423 "src/parser.c"
 yy616:
                        ++cur;
-#line 479 "src/parser.re"
+#line 481 "src/parser.re"
                        { escaped = !escaped; goto string; }
-#line 10426 "src/parser.c"
+#line 10428 "src/parser.c"
                }
-#line 493 "src/parser.re"
+#line 495 "src/parser.re"
 
 
        comment: ;
                
-#line 10433 "src/parser.c"
+#line 10435 "src/parser.c"
                {
                        unsigned char yych;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
@@ -10443,14 +10445,14 @@ yy616:
 yy620:
                        ++cur;
 yy621:
-#line 500 "src/parser.re"
+#line 502 "src/parser.re"
                        { goto comment; }
-#line 10449 "src/parser.c"
+#line 10451 "src/parser.c"
 yy622:
                        ++cur;
-#line 498 "src/parser.re"
+#line 500 "src/parser.re"
                        { NEWLINE(); goto comment; }
-#line 10454 "src/parser.c"
+#line 10456 "src/parser.c"
 yy624:
                        yych = *++cur;
                        switch (yych) {
@@ -10459,16 +10461,16 @@ yy624:
                        }
 yy625:
                        ++cur;
-#line 499 "src/parser.re"
+#line 501 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); goto start; }
-#line 10465 "src/parser.c"
+#line 10467 "src/parser.c"
                }
-#line 502 "src/parser.re"
+#line 504 "src/parser.re"
 
 
        comment_sl: ;
                
-#line 10472 "src/parser.c"
+#line 10474 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10480,22 +10482,22 @@ yy625:
                        }
 yy629:
                        ++cur;
-#line 508 "src/parser.re"
+#line 510 "src/parser.re"
                        { goto comment_sl; }
-#line 10486 "src/parser.c"
+#line 10488 "src/parser.c"
 yy631:
                        ++cur;
-#line 507 "src/parser.re"
+#line 509 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); NEWLINE(); goto start; }
-#line 10491 "src/parser.c"
+#line 10493 "src/parser.c"
                }
-#line 510 "src/parser.re"
+#line 512 "src/parser.re"
 
 
        cpp_attribute: ;
 
                
-#line 10499 "src/parser.c"
+#line 10501 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
@@ -10509,26 +10511,26 @@ yy631:
                        }
 yy635:
                        ++cur;
-#line 519 "src/parser.re"
+#line 521 "src/parser.re"
                        { goto cpp_attribute; }
-#line 10515 "src/parser.c"
+#line 10517 "src/parser.c"
 yy637:
                        ++cur;
-#line 518 "src/parser.re"
+#line 520 "src/parser.re"
                        { NEWLINE(); goto cpp_attribute; }
-#line 10520 "src/parser.c"
+#line 10522 "src/parser.c"
 yy639:
                        ++cur;
-#line 516 "src/parser.re"
+#line 518 "src/parser.re"
                        { ++parens; goto cpp_attribute; }
-#line 10525 "src/parser.c"
+#line 10527 "src/parser.c"
 yy641:
                        ++cur;
-#line 517 "src/parser.re"
+#line 519 "src/parser.re"
                        { if (parens == 1) { NEWTOKEN(PSI_T_CPP_ATTRIBUTE); goto start; } else { --parens; goto cpp_attribute; } }
-#line 10530 "src/parser.c"
+#line 10532 "src/parser.c"
                }
-#line 521 "src/parser.re"
+#line 523 "src/parser.re"
 
 error: ;
 

diff --git a/src/parser.re b/src/parser.re
index e57353662c59fef7bef95e4adffeeba710074900..22be7566fca45835abdbd58c695fee306525a762 100644 (file)
--- a/src/parser.re
+++ b/src/parser.re
@@ -263,6 +263,8 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
        bool escaped;
        token_t char_width;
 
+       PSI_DEBUG_PRINT(P, "PSI: scanning %s\n", I->file);
+
        tok = mrk = eol = cur = I->buffer;
        lim = I->buffer + I->length;
        I->lines = 1;

diff --git a/src/parser_proc.c b/src/parser_proc.c
index 79bc9dc75b3157588ae803e7800ccfe71e8bdca6..eced6ef4485f0a1822feb9deb61e6b4eef9f0e1a 100644 (file)
--- a/src/parser_proc.c
+++ b/src/parser_proc.c
@@ -128,24 +128,6 @@ static inline void psi_parser_proc_add_enum(struct psi_parser *P, struct psi_dec
        }
        P->enums = psi_plist_add(P->enums, &e);
 }
-static inline void psi_parser_proc_add_from_typedef(struct psi_parser *P, struct psi_decl_arg *def)
-{
-       if (def->type->real.def) {
-               switch (def->type->type) {
-               case PSI_T_STRUCT:
-                       psi_parser_proc_add_struct(P, def->type->real.strct);
-                       break;
-               case PSI_T_UNION:
-                       psi_parser_proc_add_union(P, def->type->real.unn);
-                       break;
-               case PSI_T_ENUM:
-                       psi_parser_proc_add_enum(P, def->type->real.enm);
-                       break;
-               default:
-                       break;
-               }
-       }
-}
 static inline void psi_parser_proc_add_typedef(struct psi_parser *P, struct psi_decl_arg *def)
 {
        assert(def);
@@ -179,7 +161,7 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp
 
 /* end code */
 
-#line 183 "src/parser_proc.c" /* glr.c:264  */
+#line 165 "src/parser_proc.c" /* glr.c:264  */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -284,18 +266,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  167
+#define YYFINAL  168
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   3089
+#define YYLAST   3366
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  132
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  122
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  479
+#define YYNRULES  480
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  710
+#define YYNSTATES  713
 /* 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
@@ -357,54 +339,55 @@ static const unsigned char yytranslate[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   391,   391,   391,   391,   391,   391,   391,   391,   391,
-     391,   391,   391,   391,   391,   391,   391,   391,   391,   391,
-     392,   392,   392,   392,   393,   393,   393,   393,   393,   393,
-     393,   393,   393,   393,   393,   393,   393,   393,   393,   393,
-     393,   393,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
-     394,   394,   394,   394,   398,   399,   402,   403,   406,   407,
-     408,   409,   415,   423,   426,   429,   430,   433,   436,   439,
-     442,   448,   454,   457,   463,   486,   490,   494,   499,   503,
-     507,   511,   518,   519,   523,   524,   528,   529,   530,   534,
-     535,   539,   540,   544,   545,   546,   550,   551,   555,   556,
-     557,   558,   559,   560,   564,   569,   577,   580,   584,   589,
-     597,   600,   604,   608,   615,   619,   623,   627,   632,   642,
-     652,   657,   662,   668,   677,   680,   684,   688,   694,   701,
-     707,   708,   709,   710,   714,   717,   748,   755,   756,   757,
-     758,   762,   765,   771,   772,   780,   791,   800,   809,   817,
-     820,   824,   828,   832,   837,   842,   850,   851,   852,   855,
-     861,   864,   867,   873,   874,   875,   876,   877,   878,   879,
-     880,   884,   885,   889,   892,   895,   901,   904,   907,   915,
-     927,   930,   933,   940,   943,   953,   956,   959,   962,   963,
-     967,   970,   973,   984,   987,   993,   994,   998,   999,  1003,
-    1007,  1013,  1014,  1020,  1023,  1029,  1030,  1037,  1038,  1042,
-    1049,  1060,  1067,  1078,  1085,  1096,  1107,  1121,  1122,  1134,
-    1137,  1140,  1143,  1150,  1153,  1159,  1168,  1180,  1188,  1191,
-    1201,  1214,  1219,  1227,  1237,  1247,  1250,  1254,  1260,  1274,
-    1291,  1294,  1300,  1307,  1317,  1324,  1327,  1333,  1338,  1346,
-    1350,  1354,  1358,  1362,  1366,  1373,  1377,  1381,  1385,  1392,
-    1405,  1418,  1431,  1434,  1441,  1444,  1447,  1450,  1456,  1460,
-    1467,  1470,  1476,  1479,  1485,  1486,  1492,  1495,  1507,  1510,
-    1517,  1522,  1527,  1537,  1540,  1546,  1549,  1555,  1562,  1569,
-    1570,  1571,  1572,  1573,  1574,  1575,  1576,  1577,  1581,  1584,
-    1590,  1593,  1596,  1599,  1602,  1608,  1612,  1620,  1621,  1625,
-    1632,  1635,  1638,  1642,  1645,  1648,  1654,  1658,  1666,  1673,
-    1681,  1689,  1690,  1691,  1692,  1693,  1694,  1695,  1696,  1697,
-    1698,  1702,  1705,  1711,  1714,  1720,  1721,  1725,  1728,  1734,
-    1737,  1743,  1750,  1757,  1760,  1763,  1770,  1775,  1783,  1784,
-    1785,  1786,  1787,  1788,  1789,  1790,  1794,  1797,  1803,  1806,
-    1812,  1819,  1820,  1824,  1831,  1834,  1840,  1848,  1851,  1857
+       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,   566,   571,
+     579,   582,   586,   590,   597,   601,   605,   609,   614,   624,
+     634,   639,   644,   650,   659,   662,   666,   670,   676,   683,
+     689,   690,   691,   692,   696,   699,   730,   737,   738,   739,
+     740,   744,   747,   756,   762,   763,   771,   782,   791,   800,
+     808,   811,   815,   819,   823,   828,   833,   841,   842,   843,
+     846,   852,   855,   858,   864,   865,   866,   867,   868,   869,
+     870,   871,   875,   876,   880,   883,   886,   892,   895,   898,
+     906,   918,   921,   924,   931,   934,   944,   947,   950,   953,
+     954,   958,   961,   964,   975,   978,   984,   985,   989,   990,
+     994,   998,  1004,  1005,  1011,  1014,  1020,  1021,  1028,  1029,
+    1033,  1040,  1051,  1058,  1069,  1076,  1087,  1098,  1112,  1113,
+    1125,  1128,  1131,  1134,  1141,  1144,  1150,  1159,  1171,  1179,
+    1182,  1192,  1205,  1210,  1218,  1228,  1238,  1241,  1245,  1251,
+    1265,  1282,  1285,  1291,  1298,  1308,  1315,  1318,  1324,  1329,
+    1337,  1341,  1345,  1349,  1353,  1357,  1364,  1368,  1372,  1376,
+    1383,  1396,  1409,  1422,  1425,  1432,  1435,  1438,  1441,  1447,
+    1451,  1458,  1461,  1467,  1470,  1476,  1477,  1483,  1486,  1498,
+    1501,  1508,  1513,  1518,  1528,  1531,  1537,  1540,  1546,  1553,
+    1560,  1561,  1562,  1563,  1564,  1565,  1566,  1567,  1568,  1572,
+    1575,  1581,  1584,  1587,  1590,  1593,  1599,  1603,  1611,  1612,
+    1616,  1623,  1626,  1629,  1633,  1636,  1639,  1645,  1649,  1657,
+    1664,  1672,  1680,  1681,  1682,  1683,  1684,  1685,  1686,  1687,
+    1688,  1689,  1693,  1696,  1702,  1705,  1711,  1712,  1716,  1719,
+    1725,  1728,  1734,  1741,  1748,  1751,  1754,  1761,  1766,  1774,
+    1775,  1776,  1777,  1778,  1779,  1780,  1781,  1785,  1788,  1794,
+    1797,  1803,  1810,  1811,  1815,  1822,  1825,  1831,  1839,  1842,
+    1848
 };
 #endif
 
@@ -468,34 +451,33 @@ static const char *const yytname[] =
 #endif
 
 #define YYPACT_NINF -550
-#define YYTABLE_NINF -478
+#define YYTABLE_NINF -479
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const short int yypact[] =
 {
-     946,  -550,  -550,  -550,  -550,  -550,    64,  -550,  -550,   505,
-    -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  2646,  -550,
-    -550,   510,  2690,  2496,  2496,  2496,   308,    10,   -49,    32,
-    -550,  1040,    94,   946,  -550,  -550,  -550,  -550,  -550,  2206,
-    -550,  -550,  -550,  -550,  -550,    61,    82,  -550,  -550,  -550,
-     102,    -2,  -550,  -550,    43,   103,   105,  -550,  -550,  -550,
-    -550,    89,  -550,   111,  -550,  -550,  -550,  -550,  -550,   656,
-    -550,   104,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
-    -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
+     949,  -550,  -550,  -550,  -550,  -550,   116,  -550,  -550,  2253,
+    -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  2807,  -550,
+    -550,   471,  2857,  2636,  2636,  2636,   311,     9,   -50,    12,
+    -550,  1043,    66,   949,  -550,  -550,  -550,  -550,  -550,  2302,
+    -550,  -550,  -550,  -550,  -550,    77,    48,  -550,  -550,  -550,
+      53,   -34,  -550,  -550,    40,    62,    86,  -550,  -550,  -550,
+    -550,    93,  -550,   102,  -550,  -550,  -550,  -550,  -550,   659,
+    -550,    96,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
     -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
-    -550,  -550,  2255,   -22,  -550,  -550,  -550,  2496,  2496,  2496,
-     245,  -550,    84,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
-    -550,  -550,  -550,  -550,  -550,   905,  -550,  -550,  -550,  -550,
-     131,   786,   786,    -3,  -550,   905,  2132,  2496,  2496,   150,
-    1896,  -550,  -550,   169,  2496,   172,   172,    63,    63,   173,
-    -550,  -550,   183,   185,  -550,   104,   186,  -550,  -550,   182,
-     178,  -550,   197,  -550,  2723,  2690,    -2,  -550,  -550,   187,
-    -550,   191,  2496,  -550,   224,  -550,    90,  -550,  -550,    61,
-    -550,  -550,   194,   198,  2767,  2767,  2496,   279,  2496,  -550,
-     104,  -550,  -550,  -550,  -550,  -550,  -550,  2206,  -550,  -550,
-    -550,  -550,  -550,  -550,   113,   786,  -550,  -550,  -550,  -550,
     -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
+    -550,  -550,  2420,   -21,  -550,  -550,  -550,  2636,  2636,  2636,
+    2988,  -550,   105,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
+    -550,  -550,  -550,  -550,  -550,   908,  -550,  -550,  -550,  -550,
+     118,   789,   789,    -6,  -550,   908,  2135,  2253,  2636,  2636,
+     121,  1899,  -550,  -550,   131,  2636,   144,   144,    52,    52,
+     149,  -550,  -550,   162,   181,  -550,    96,   187,  -550,  -550,
+     183,   186,  -550,   198,  -550,  2884,  2911,   -34,  -550,  -550,
+     188,  -550,   192,  2636,  -550,   225,  -550,    82,  -550,  -550,
+      77,  -550,  -550,   196,   199,  2961,  2961,  2636,   103,  2636,
+    -550,    96,  -550,  -550,  -550,  -550,  -550,  -550,  2302,  -550,
+    -550,  -550,  -550,  -550,  -550,   112,   789,  -550,  -550,  -550,
     -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
     -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
     -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
@@ -507,44 +489,46 @@ static const short int yypact[] =
     -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
     -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
     -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
-    -550,  -550,   786,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
-    -550,  2132,  -550,  -550,  -550,  -550,  2373,  2132,   196,  2946,
-      21,  -550,    21,  -550,  -550,  -550,  -550,   203,   195,   195,
-       5,     5,  2422,   192,  -550,   279,   201,   206,   221,   226,
-    -550,   104,   187,  -550,  -550,  -550,  -550,  -550,  -550,   227,
-    -550,     3,  2800,  2206,    75,  -550,  -550,   107,   214,    77,
-    -550,  2206,  1778,  2206,  2496,    74,  -550,  -550,   123,  -550,
-    -550,  -550,  -550,  -550,  2014,  -550,   233,  2496,   223,  -550,
-    2496,   235,  -550,  -550,  2817,  2496,  -550,  -550,  2132,  -550,
     -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
-    -550,  -550,  -550,  -550,  -550,  -550,  -550,  2132,  2132,   236,
-    2690,  2206,  2206,  -550,  -550,  -550,  -550,   104,  -550,  1188,
-     202,    40,  -550,  -550,   231,  2496,  -550,  -550,     6,  2255,
-     104,   191,   187,  2556,   187,  2613,  2014,  2496,  -550,   232,
-     240,  -550,  -550,  -550,  1070,  2014,  -550,  2970,  -550,   237,
-     242,  -550,   244,   252,   239,   248,    86,  -550,  -550,   250,
-     244,  -550,  -550,  2790,  -550,   251,  2206,  2496,  -550,   254,
-    2946,   256,   257,  2897,  -550,   265,   280,  1937,  -550,  -550,
-    2496,  -550,  -550,  -550,  -550,   287,  -550,  2970,  -550,  -550,
-    -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,   285,   122,
-    -550,    32,  -550,  -550,   300,  -550,  -550,  2422,  -550,     3,
-     301,  -550,  -550,   303,  2970,  -550,  1306,  -550,   304,   464,
-     306,  2845,  -550,  2014,  2014,  1778,  -550,  2206,  -550,    32,
-    2206,  -550,  2496,  -550,  -550,  -550,  -550,  -550,   309,   310,
-    -550,  -550,  2132,  2132,   311,    27,   313,  -550,   280,   317,
-    -550,   355,   316,   355,   314,  -550,   187,   187,  -550,   249,
-      93,   328,  2970,  -550,  -550,  -550,  -550,   335,  1424,  2014,
-    -550,  2922,  -550,  -550,   344,  2206,   137,  -550,   786,  2496,
-    2946,  2994,   342,   346,   347,  2206,   312,   313,  -550,  -550,
-     355,  -550,    32,  1188,  -550,  -550,   328,  -550,  -550,  -550,
-    -550,   350,  2014,    32,  -550,  -550,  2014,  1542,   351,   352,
-    -550,  -550,  -550,   353,   354,   358,   280,   356,  -550,   360,
-    -550,     7,  -550,    32,   586,   361,  3018,   365,  -550,   366,
-    -550,  -550,  -550,   367,   368,  -550,  2206,  -550,   377,   373,
-    2014,  1306,   374,  -550,  1778,   379,   381,   280,   378,  1660,
-    2872,   232,  -550,  -550,  -550,   376,  1424,  -550,  -550,   380,
-     382,  -550,   384,   383,   387,  -550,  -550,  1306,  -550,   386,
-    -550,   355,   389,  1778,  -550,   391,  -550,  -550,  -550,  -550
+    -550,  -550,  -550,   789,  -550,  -550,  -550,  -550,  -550,  -550,
+    -550,  -550,  2135,  -550,  -550,  -550,  -550,  2469,  2135,   201,
+    3223,   203,    87,  -550,    87,  -550,  -550,  -550,  -550,   200,
+     202,   202,    26,    26,  2587,   197,  -550,   103,   207,   219,
+     220,   226,  -550,    96,   188,  -550,  -550,  -550,  -550,  -550,
+    -550,   227,  -550,     2,  3015,  2302,    81,  -550,  -550,   108,
+     214,    74,  -550,  2302,  1781,  2302,  2636,    80,  -550,  -550,
+     123,  -550,  -550,  -550,  -550,  -550,  2017,  -550,   223,  2636,
+     224,  -550,  2636,   236,  -550,  -550,  3060,  2636,  -550,  -550,
+    2135,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
+    -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  2135,
+    2135,  -550,   237,  2911,  2302,  2302,  -550,  -550,  -550,  -550,
+      96,  -550,  1191,   151,    36,  -550,  -550,   218,  2636,  -550,
+    -550,    31,  2420,    96,   192,   188,  2753,   188,  2780,  2017,
+    2636,  -550,   230,   240,  -550,  -550,  -550,  1073,  2017,  -550,
+    3247,  -550,   232,   242,  -550,   244,   251,   238,   247,    79,
+    -550,  -550,   250,   244,  -550,  -550,   589,  -550,   249,  2302,
+    2636,  -550,   253,  3223,   258,   259,  3174,  -550,   256,   257,
+    1940,  -550,  -550,  2636,  -550,  -550,  -550,  -550,   264,  -550,
+    3247,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
+    -550,   261,   140,  -550,    12,  -550,  -550,   265,  -550,  -550,
+    2587,  -550,     2,   266,  -550,  -550,   267,  3247,  -550,  1309,
+    -550,   269,  3051,   270,  3096,  -550,  2017,  2017,  1781,  -550,
+    2302,  -550,    12,  2302,  -550,  2636,  -550,  -550,  -550,  -550,
+    -550,   273,   263,  -550,  -550,  2135,  2135,   286,     3,   287,
+    -550,   257,   290,  -550,   357,   297,   357,   293,  -550,   188,
+     188,  -550,   176,   160,   302,  3247,  -550,  -550,  -550,  -550,
+     304,  1427,  2017,  -550,  3199,  -550,  -550,   305,  2302,   171,
+    -550,   789,  2636,  3223,  3271,   314,   303,   312,  2302,   315,
+     287,  -550,  -550,   357,  -550,    12,  1191,  -550,  -550,   302,
+    -550,  -550,  -550,  -550,   313,  2017,    12,  -550,  -550,  2017,
+    1545,   316,   320,  -550,  -550,  -550,   319,   318,   329,   257,
+     324,  -550,   331,  -550,    -3,  -550,    12,  3149,   335,  3295,
+     338,  -550,   339,  -550,  -550,  -550,   342,   341,  -550,  2302,
+    -550,   350,   345,  2017,  1309,   346,  -550,  1781,   351,   353,
+     257,   348,  1663,  3123,   230,  -550,  -550,  -550,   349,  1427,
+    -550,  -550,   352,   354,  -550,   347,   355,   356,  -550,  -550,
+    1309,  -550,   358,  -550,   357,   359,  1781,  -550,   360,  -550,
+    -550,  -550,  -550
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -552,113 +536,114 @@ static const short int yypact[] =
      means the default is an error.  */
 static const unsigned short int yydefact[] =
 {
-     164,   286,   283,   287,   281,   282,   284,   270,   271,     0,
-     273,   274,   275,   276,   277,   278,   279,   280,   269,   169,
-     168,     0,     0,     0,     0,   372,     0,     0,     0,   477,
-     170,     0,     0,   165,   166,   172,   171,   173,   176,   382,
-     260,   262,   261,   267,   268,   290,   300,   266,   174,   175,
-       0,   305,   315,   317,   318,     0,     0,   327,   178,   177,
-     179,     0,   180,     0,   285,   272,    33,    34,   465,   431,
-      24,   382,   386,    39,    38,    37,    35,    36,    32,    31,
-      25,    29,    28,    26,    27,   439,   438,   436,   434,   435,
-     437,   433,   432,   440,    30,   463,   461,   460,   462,   459,
-     458,   328,     0,   384,    40,    41,   269,     0,     0,     0,
-       0,   316,   311,   182,   193,   190,   192,   194,   195,   206,
+     164,   287,   284,   288,   282,   283,   285,   271,   272,     0,
+     274,   275,   276,   277,   278,   279,   280,   281,   270,   169,
+     168,     0,     0,     0,     0,   373,     0,     0,     0,   478,
+     170,     0,     0,   165,   166,   172,   171,   173,   176,   383,
+     261,   263,   262,   268,   269,   291,   301,   267,   174,   175,
+       0,   306,   316,   318,   319,     0,     0,   328,   178,   177,
+     179,     0,   180,     0,   286,   273,    33,    34,   466,   432,
+      24,   383,   387,    39,    38,    37,    35,    36,    32,    31,
+      25,    29,    28,    26,    27,   440,   439,   437,   435,   436,
+     438,   434,   433,   441,    30,   464,   462,   461,   463,   460,
+     459,   329,     0,   385,    40,    41,   270,     0,     0,     0,
+       0,   317,   312,   182,   193,   190,   192,   194,   195,   206,
      203,   204,   201,   207,   202,     0,   205,   196,   197,   198,
-       0,   220,   220,     0,   186,     0,     0,   372,   372,     0,
-     382,   254,   337,   253,     0,   378,   378,   263,   264,   265,
-     369,   240,   287,   270,   243,     0,     0,   239,   259,     0,
-       0,   479,     0,   478,   269,     0,   305,     1,   167,   380,
-     338,     0,   383,   291,   295,   293,   297,   288,   301,   290,
-     289,   309,     0,     0,   329,   329,     0,     0,     0,   383,
-     382,   340,   387,   385,   263,   264,   265,     0,   310,   209,
-     210,   211,   213,   212,   208,   220,   188,   183,    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,
-     222,   191,   221,   184,   199,   200,   185,   208,   187,   230,
-     231,     0,    22,    23,    20,    21,     0,     0,   232,   189,
-     263,   371,   264,   370,   251,   258,   255,     0,     0,     0,
-       0,     0,     0,     0,   181,     0,     0,     0,     0,     0,
-     342,   382,   380,   296,   292,   298,   299,   294,   302,     0,
-     303,   330,     0,   382,     0,   331,   333,     0,   357,     0,
-     355,     0,   477,     0,     0,     0,   471,   472,     0,   408,
-     411,   410,   412,   413,     0,   414,     0,     0,   312,   313,
-       0,     0,   215,   223,     0,     0,   228,   225,   234,     2,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    13,
-      12,    14,    15,    16,    17,    18,    19,     0,     0,     0,
-       0,     0,     0,   345,   344,   346,   343,   382,   339,   244,
-       0,     0,   252,   304,     0,     0,   341,   307,     0,   336,
-       0,   334,   380,     0,   380,     0,     0,     0,   354,     0,
-       0,   366,   365,   367,     0,     0,   368,   454,   359,     0,
-       0,   453,    41,     0,     0,     0,     0,   474,   464,     0,
-       0,   388,   409,     0,   326,     0,     0,   216,   224,     0,
-     236,     0,   235,     0,   226,     0,   374,     0,   257,   256,
-       0,   247,   248,   249,   250,     0,   246,   245,   389,   401,
-     402,   403,   404,   400,   405,   406,   407,   399,     0,     0,
-     393,   477,   398,   381,     0,   308,   306,   335,   321,     0,
-       0,   332,   319,     0,   358,   356,     0,   415,    24,     0,
-       0,     0,   363,     0,     0,   477,   452,     0,   397,   477,
-       0,   473,     0,   451,   470,   325,   314,   218,     0,   217,
-     229,   233,     0,     0,     0,     0,   350,   347,   374,     0,
-     238,     0,     0,     0,   395,   323,   380,   380,   420,     0,
-      31,    30,   425,   426,   421,   423,   424,    40,     0,     0,
-     361,     0,   362,   455,   466,     0,     0,   475,   220,     0,
-     237,   227,     0,   375,     0,     0,     0,   350,   324,   390,
-       0,   394,   477,   244,   322,   320,     0,   422,   445,   431,
-     446,     0,     0,   477,   427,   360,     0,   477,     0,     0,
-     476,   214,   219,     0,     0,     0,   374,   351,   348,     0,
-     391,     0,   396,   477,     0,   441,   364,     0,   468,   467,
-     456,   416,   379,     0,     0,   352,     0,   349,     0,     0,
-       0,     0,     0,   457,   477,     0,     0,   374,     0,   447,
-       0,   368,   443,   419,   417,   442,     0,   430,   469,     0,
-       0,   353,     0,     0,   448,   449,   428,     0,   418,     0,
-     376,     0,     0,   477,   444,     0,   392,   429,   450,   377
+       0,   220,   220,     0,   186,     0,     0,     0,   373,   373,
+       0,   383,   255,   338,   254,     0,   379,   379,   264,   265,
+     266,   370,   240,   288,   271,   243,     0,     0,   239,   260,
+       0,     0,   480,     0,   479,   270,     0,   306,     1,   167,
+     381,   339,     0,   384,   292,   296,   294,   298,   289,   302,
+     291,   290,   310,     0,     0,   330,   330,     0,     0,     0,
+     384,   383,   341,   388,   386,   264,   265,   266,     0,   311,
+     209,   210,   211,   213,   212,   208,   220,   188,   183,    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,   222,   191,   221,   184,   199,   200,   185,   208,   187,
+     230,   231,     0,    22,    23,    20,    21,     0,     0,   232,
+     189,   329,   264,   372,   265,   371,   251,   259,   256,     0,
+       0,     0,     0,     0,     0,     0,   181,     0,     0,     0,
+       0,     0,   343,   383,   381,   297,   293,   299,   300,   295,
+     303,     0,   304,   331,     0,   383,     0,   332,   334,     0,
+     358,     0,   356,     0,   478,     0,     0,     0,   472,   473,
+       0,   409,   412,   411,   413,   414,     0,   415,     0,     0,
+     313,   314,     0,     0,   215,   223,     0,     0,   228,   225,
+     234,     2,     3,     4,     5,     6,     7,     8,     9,    10,
+      11,    13,    12,    14,    15,    16,    17,    18,    19,     0,
+       0,   252,     0,     0,     0,     0,   346,   345,   347,   344,
+     383,   340,   244,     0,     0,   253,   305,     0,     0,   342,
+     308,     0,   337,     0,   335,   381,     0,   381,     0,     0,
+       0,   355,     0,     0,   367,   366,   368,     0,     0,   369,
+     455,   360,     0,     0,   454,    41,     0,     0,     0,     0,
+     475,   465,     0,     0,   389,   410,     0,   327,     0,     0,
+     216,   224,     0,   236,     0,   235,     0,   226,     0,   375,
+       0,   258,   257,     0,   247,   248,   249,   250,     0,   246,
+     245,   390,   402,   403,   404,   405,   401,   406,   407,   408,
+     400,     0,     0,   394,   478,   399,   382,     0,   309,   307,
+     336,   322,     0,     0,   333,   320,     0,   359,   357,     0,
+     416,    24,     0,     0,     0,   364,     0,     0,   478,   453,
+       0,   398,   478,     0,   474,     0,   452,   471,   326,   315,
+     218,     0,   217,   229,   233,     0,     0,     0,     0,   351,
+     348,   375,     0,   238,     0,     0,     0,   396,   324,   381,
+     381,   421,     0,    31,    30,   426,   427,   422,   424,   425,
+      40,     0,     0,   362,     0,   363,   456,   467,     0,     0,
+     476,   220,     0,   237,   227,     0,   376,     0,     0,     0,
+     351,   325,   391,     0,   395,   478,   244,   323,   321,     0,
+     423,   446,   432,   447,     0,     0,   478,   428,   361,     0,
+     478,     0,     0,   477,   214,   219,     0,     0,     0,   375,
+     352,   349,     0,   392,     0,   397,   478,     0,   442,   365,
+       0,   469,   468,   457,   417,   380,     0,     0,   353,     0,
+     350,     0,     0,     0,     0,     0,   458,   478,     0,     0,
+     375,     0,   448,     0,   369,   444,   420,   418,   443,     0,
+     431,   470,     0,     0,   354,     0,     0,   449,   450,   429,
+       0,   419,     0,   377,     0,     0,   478,   445,     0,   393,
+     430,   451,   378
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -550,  -319,  -129,     0,    91,  -550,  -550,   398,  -550,  -550,
-    -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,   258,  -550,
-    -550,  -550,  -127,  -550,  -325,  -550,  -550,  -550,  -550,  -550,
-    -191,  -550,  -550,  -152,   -11,   -23,  -550,  -550,  -550,   293,
-     388,  -550,  -550,   260,  -550,  -550,  -550,  -550,   269,  -550,
-    -550,  -550,  -550,  -124,   410,     1,   -16,    18,  -550,  -550,
-     261,  -331,   -14,   -39,  -550,  -550,    81,  -179,  -550,  -172,
-    -550,    38,  -550,   -20,  -390,  -550,  -550,  -550,  -550,    73,
-    -549,    49,  -346,   -61,    -7,  -550,  -550,   420,  -550,  -133,
-    -503,  -546,  -550,    95,  -364,  -550,  -241,  -526,    67,  -128,
-    -550,  -550,  -529,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
-    -534,    69,  -380,  -550,  -550,  -550,  -550,  -550,  -550,  -100,
-     -28,  -519
+    -550,  -320,  -129,     1,    67,  -550,  -550,   362,  -550,  -550,
+    -550,  -550,  -550,  -550,  -550,  -550,  -550,  -550,   272,  -550,
+    -550,  -550,  -127,  -550,  -328,  -550,  -550,  -550,  -550,  -550,
+    -222,  -550,  -550,  -157,    -4,   -23,  -550,  -550,  -550,   268,
+     365,  -550,  -550,   228,  -550,  -550,  -550,  -550,   245,  -550,
+    -550,  -550,  -550,  -149,   384,     5,   -16,    27,  -550,  -550,
+     231,  -293,   -14,   -39,  -550,  -550,    56,  -146,  -550,  -204,
+    -550,    38,  -550,   -48,  -393,  -550,  -550,  -550,  -550,    78,
+    -548,   -43,  -352,   -60,    -7,  -550,  -550,   392,  -550,  -163,
+    -503,  -549,  -550,    57,  -381,  -550,  -275,  -528,    33,  -164,
+    -550,  -550,  -532,  -550,  -550,  -550,  -550,  -550,  -550,  -550,
+    -517,    34,  -382,  -550,  -550,  -550,  -550,  -550,  -550,  -135,
+     -28,  -533
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const short int yydefgoto[] =
 {
-      -1,   554,   475,   169,   330,    32,    33,    34,    35,    36,
-     130,   131,   132,   133,   336,   134,   135,   136,   205,   206,
-     568,   569,   331,   332,   349,   501,   502,    37,   156,   157,
-     515,   516,    38,   139,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,   177,   374,   377,   180,    48,   183,   458,
-      49,    50,   198,   408,    51,    52,    53,   142,    55,    56,
-     384,   385,    57,   476,    58,    59,   444,   445,   507,   616,
-     647,   144,   389,   390,   477,   478,    61,   145,   146,   150,
-     576,   358,   370,   171,   410,   103,    62,    63,   529,   530,
-     479,   531,   532,   398,   399,   400,   682,   683,   684,   594,
-     595,   596,   104,   672,   685,   631,   693,   694,   401,   402,
-     480,   481,   105,   638,   659,   403,   404,   405,   486,   487,
-     483,   163
+      -1,   557,   478,   170,   331,    32,    33,    34,    35,    36,
+     130,   131,   132,   133,   337,   134,   135,   136,   206,   207,
+     571,   572,   332,   333,   350,   504,   505,    37,   157,   158,
+     518,   519,    38,   140,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,   178,   376,   379,   181,    48,   184,   461,
+      49,    50,   199,   410,    51,    52,    53,   143,    55,    56,
+     386,   387,    57,   479,    58,    59,   447,   448,   510,   619,
+     650,   145,   391,   392,   480,   481,    61,   146,   147,   151,
+     579,   360,   372,   172,   412,   103,    62,    63,   532,   533,
+     482,   534,   535,   400,   401,   402,   685,   686,   687,   597,
+     598,   599,   104,   675,   688,   634,   696,   697,   403,   404,
+     483,   484,   105,   641,   662,   405,   406,   407,   489,   490,
+     486,   164
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -666,168 +651,244 @@ static const short int yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const short int yytable[] =
 {
-     170,   162,   102,   158,   112,   333,   141,   347,   143,   101,
-     188,   140,   482,   367,   493,   490,   414,   597,    54,   111,
-     593,   603,   417,   147,   148,   149,   456,   598,   584,   617,
-     438,   334,   172,   192,   492,   619,    54,   622,    60,   558,
-     535,    71,   443,   519,   159,   536,   520,   440,    29,    54,
-     521,    54,   522,   523,   524,   525,   526,   527,    72,   517,
-     613,   630,  -373,  -373,   189,   173,   174,   175,   614,   597,
-     176,    60,   634,    64,   650,    65,   544,   668,   412,   528,
-    -318,  -337,   161,  -337,   551,   552,   492,   158,   178,     4,
-       5,    68,   488,   500,   167,   438,   375,   665,   438,   376,
-    -378,   170,   191,   658,   357,  -378,   193,   194,   195,   196,
-     628,   629,   503,   504,   462,   463,   538,   467,   542,   584,
-     468,   335,  -327,   561,   197,   204,   562,   182,   691,   407,
-     655,   186,   541,   172,   541,   337,   348,   350,   352,   181,
-     688,   184,   597,   185,   356,   695,   464,   465,   362,   141,
-     669,   143,   686,   187,   140,   706,   592,   597,   409,    72,
-     698,   582,   583,   601,   602,   111,   491,   207,   597,   708,
-     386,   386,   372,   383,   383,   482,   640,   496,   686,   441,
-     442,   438,    54,   189,   438,   438,   388,   354,   406,    95,
-      96,    97,    98,    99,   100,   359,   360,   361,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,  -327,   592,   635,
-     351,   353,   347,   357,  -241,  -373,  -242,   363,   347,   364,
-     365,   391,   392,   393,   394,   395,   396,   397,   366,   371,
-     373,   369,   379,   517,   418,   380,   411,   440,   449,   451,
-     624,   625,   654,   452,   439,   518,   656,   610,   611,     1,
-       2,     3,     4,     5,     6,     7,     8,   482,   453,   454,
-     466,   457,   155,   496,    10,    11,    12,    13,    14,    15,
-      16,    17,   494,   497,   505,   106,   533,   547,   546,   556,
-     680,   592,   557,   555,   558,   559,   560,   563,   506,   347,
-     565,   438,   438,   570,   482,   571,   592,   572,   574,   482,
-     391,   392,   393,   394,   395,   396,   397,   592,   347,   347,
-     455,   151,     1,     2,   152,     4,     5,     6,   153,     8,
-     154,   575,   461,   482,   580,   155,   581,    10,    11,    12,
-      13,    14,    15,    16,    17,   107,   108,   109,   106,   585,
-     586,   348,   587,   -24,   170,   599,   416,   348,   608,   648,
-     609,   612,   469,   615,   484,   578,   618,   620,   519,   158,
-     623,   520,   448,   626,   189,   521,   632,   522,   523,   524,
-     525,   526,   527,   633,   459,   643,   172,   391,   392,   393,
-     394,   395,   396,   397,   637,   645,   510,   644,   653,   661,
-     660,   664,   662,   338,   485,   663,   666,   667,   107,   108,
-     109,   671,   508,   509,   673,   675,   674,   495,   676,   678,
-     372,   679,   689,   687,   690,   499,   697,   692,   348,   705,
-     699,   700,   702,   413,   141,   701,   143,   703,   707,   140,
-     709,   168,   652,   355,   179,   368,   606,   348,   348,   378,
-     189,   166,   446,   347,   347,   649,   387,   545,   160,   386,
-     621,   386,   383,   537,   383,   534,   704,   566,   470,   191,
-     450,   627,   607,   550,   489,     0,     0,   388,     1,     2,
-       3,     4,     5,     6,     7,     8,     0,     0,     0,     0,
-       0,   641,     0,    10,    11,    12,    13,    14,    15,    16,
-      17,   141,     0,   143,   106,     0,   140,   567,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    66,     0,
-     579,     0,     0,     0,     0,     0,     0,    67,   604,     0,
-       0,   409,    68,    69,     0,     0,   158,     0,     0,     0,
-       0,   605,   459,     0,     0,    70,     0,   448,     0,     0,
-       0,     0,     0,    71,     0,     0,   113,     0,     0,     0,
-       0,     0,     0,     0,   107,   108,   109,     0,     0,     0,
-      72,     0,   485,     0,     0,     0,   639,     0,     0,     0,
-       0,     0,   348,   348,     0,     0,   646,    73,    74,    75,
-      76,    77,   114,   115,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,   651,   126,   127,   128,   129,    78,
-       0,    79,    80,    81,    82,    83,    84,     0,     0,   642,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   670,   677,     0,     0,
-       0,     0,   681,     0,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,     0,     0,     0,     0,  -431,   553,   681,  -431,
-    -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,
-    -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,
-    -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,
-    -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,
-    -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,
-    -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,
-    -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,
-    -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,
-    -431,  -431,     0,  -431,     0,  -431,  -431,  -431,  -431,  -431,
-    -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,
-    -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,
-    -431,  -431,  -431,  -431,  -431,  -431,  -431,  -431,     0,  -431,
-    -431,     0,  -431,  -431,  -431,  -431,   208,     0,     0,   209,
-     210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
-     220,   221,   222,   223,   224,   225,   226,   227,   228,   229,
-     230,   231,   232,   233,   234,   235,   236,   237,   238,   239,
-     240,   241,     0,   242,   243,   244,   245,   246,   247,   248,
-     249,   250,   251,   252,   253,   254,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
-     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   290,     0,   291,     0,   292,   293,   294,   295,   296,
-     297,   298,   299,   300,   301,   302,   303,   304,   305,   306,
-     307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-     317,   318,   319,   320,   321,   322,   323,   324,    66,     0,
-     325,     0,   326,   327,   328,   329,     0,    67,     0,     0,
-       0,     0,    68,    69,     0,     0,     0,     0,     0,     0,
-       0,     0,   199,   200,   201,    70,     0,     0,     0,     0,
+     171,   163,   102,   159,   112,   334,   142,   348,   144,   369,
+     101,   189,   485,   496,   416,   493,   601,   600,   141,   495,
+     419,   596,   459,   111,   148,   149,   150,    54,   335,   561,
+     440,   587,   173,   620,   193,   622,   616,   625,    60,   522,
+      71,   606,   523,   160,   617,    54,   524,    29,   525,   526,
+     527,   528,   529,   530,   179,     4,     5,    72,    54,   520,
+      54,   633,   162,   446,   190,   538,   168,   671,   443,   600,
+     539,    60,   495,   637,   653,   531,   547,  -319,  -338,   414,
+    -338,   174,   175,   176,   554,   555,   177,   159,   377,  -379,
+     182,   378,   503,   359,  -379,   183,   440,    68,   491,   440,
+     185,   668,   171,   192,   361,   362,   363,   194,   195,   196,
+     197,   506,   507,   541,   470,   545,   564,   471,   336,   565,
+     465,   466,   587,   661,   186,    64,   205,    65,  -374,  -374,
+     102,   409,   694,   658,   173,   187,   338,   349,   351,   352,
+     354,   689,   600,  -328,   188,   198,   358,   467,   468,   364,
+     142,    72,   144,   672,   208,   709,   595,   600,   356,   411,
+     691,   701,   141,   604,   605,   698,   494,   689,   600,  -328,
+     111,   388,   388,   544,   374,   544,   485,   631,   632,   585,
+     586,   385,   385,   440,   190,   359,   440,   440,   390,   711,
+     408,  -374,    54,  -241,   521,    95,    96,    97,    98,    99,
+     100,   393,   394,   395,   396,   397,   398,   399,   595,   638,
+     643,   499,  -242,   348,   444,   445,   353,   355,   365,   348,
+     366,   393,   394,   395,   396,   397,   398,   399,   367,   368,
+     373,   375,   371,   520,   381,   413,   382,   627,   628,   420,
+     441,   442,   657,   452,   443,   454,   659,   613,   614,   393,
+     394,   395,   396,   397,   398,   399,   455,   456,   485,   457,
+     469,   460,   497,   536,   499,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,   500,   508,   549,   550,   558,   559,
+     683,   595,   560,   561,   562,   563,   509,   566,   568,   577,
+     629,   348,   573,   440,   440,   485,   595,   574,   578,   575,
+     485,   583,   584,   612,   588,   589,   590,   595,   -24,   602,
+     348,   348,   611,   458,   152,     1,     2,   153,     4,     5,
+       6,   154,     8,   155,   485,   464,   615,   618,   156,   621,
+      10,    11,    12,    13,    14,    15,    16,    17,   623,   626,
+     635,   106,   636,   349,   647,   640,   171,   646,   418,   349,
+     648,   656,   651,   581,   472,   663,   487,   664,   665,   666,
+     522,   159,   667,   523,   669,   451,   190,   524,   670,   525,
+     526,   527,   528,   529,   530,   674,   462,   676,   173,   677,
+     678,   679,   681,   682,   692,   690,   693,   695,   704,   700,
+     513,   708,   702,   703,   705,   169,   706,   488,   710,   712,
+     415,   107,   108,   109,   655,   511,   512,   339,   380,   357,
+     498,   180,   370,   374,   609,   167,   652,   389,   502,   449,
+     161,   349,   548,   624,   453,   707,   473,   142,   630,   144,
+     610,   492,     0,     0,     0,     0,     0,     0,     0,   141,
+     349,   349,     0,   190,     0,     0,   348,   348,     0,     0,
+       0,     0,   388,     0,   388,     0,   540,     0,     0,   537,
+     569,     0,   385,   192,   385,     0,     0,     0,     0,     0,
+       0,   390,     0,   553,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   644,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   142,     0,   144,     0,     0,     0,
+       0,   570,     0,     0,     0,     0,   141,   113,     0,     0,
+       0,     0,     0,     0,   582,     0,     0,     0,     0,     0,
+       0,   607,     0,     0,   411,     0,     0,     0,     0,   159,
+       0,     0,     0,     0,   608,   462,     0,     0,     0,     0,
+       0,   451,     0,   114,   115,   116,   117,   118,   119,   120,
+     121,   122,   123,   124,   125,     0,   126,   127,   128,   129,
+       0,     0,     0,     0,     0,     0,   488,     0,     0,   642,
+       0,     0,     0,     0,     0,     0,   349,   349,     0,   649,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   654,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   645,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   567,     0,     0,     0,
+     680,     0,     0,     0,     0,   684,     0,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
+     434,   435,   436,   437,   438,     0,     0,     0,     0,  -432,
+     556,   684,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,
+    -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,
+    -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,
+    -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,
+    -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,
+    -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,
+    -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,
+    -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,
+    -432,  -432,  -432,  -432,  -432,     0,  -432,     0,  -432,  -432,
+    -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,
+    -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,
+    -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,  -432,
+    -432,     0,  -432,  -432,     0,  -432,  -432,  -432,  -432,   209,
+       0,     0,   210,   211,   212,   213,   214,   215,   216,   217,
+     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
+     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
+     238,   239,   240,   241,   242,     0,   243,   244,   245,   246,
+     247,   248,   249,   250,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   266,
+     267,   268,   269,   270,   271,   272,   273,   274,   275,   276,
+     277,   278,   279,   280,   281,   282,   283,   284,   285,   286,
+     287,   288,   289,   290,   291,     0,   292,     0,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,    66,     0,   326,     0,   327,   328,   329,   330,     0,
+      67,     0,     0,     0,     0,    68,    69,     0,     0,     0,
+       0,     0,     0,     0,     0,   200,   201,   202,    70,     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,     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,   203,     0,   204,     0,    22,    23,
+      24,    25,    26,    27,    28,     0,    29,     1,     2,     3,
+       4,     5,     6,     7,     8,     0,     0,     0,     0,     0,
+       9,     0,    10,    11,    12,    13,    14,    15,    16,    17,
+      30,     0,     0,   165,     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,   551,   474,     0,   475,     0,   476,     0,
+       0,   477,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   343,   344,    72,     0,
+       0,     0,   166,   107,   108,   109,   110,     0,     0,   345,
+     346,     0,     0,     0,     0,    73,    74,    75,    76,    77,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   107,   108,   109,   552,    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,   514,   515,
+     516,    70,   474,     0,   475,   517,   476,     0,     0,   477,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   343,   344,    72,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   345,   346,     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,   591,     0,     0,    70,
+     474,     0,   475,     0,   476,     0,     0,   477,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   162,
+       0,     0,   343,   344,    72,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   345,   346,     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,   592,   593,    80,    81,    82,    83,
+      84,     0,     0,     0,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,   594,    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,   591,     0,     0,    70,   474,     0,
+     475,     0,   476,     0,     0,   477,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     343,   344,    72,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   345,   346,     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,   592,   593,    80,    81,    82,    83,    84,     0,
+       0,     0,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,   594,    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,   474,     0,   475,     0,
+     476,     0,     0,   477,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   162,     0,     0,   343,   344,
+      72,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   345,   346,     0,     0,   660,     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,     0,     0,     0,     0,
-       0,   202,     0,   203,     0,    22,    23,    24,    25,    26,
-      27,    28,     0,    29,     1,     2,     3,     4,     5,     6,
-       7,     8,     0,     0,     0,     0,     0,     9,     0,    10,
-      11,    12,    13,    14,    15,    16,    17,    30,     0,     0,
-     164,     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,
-     548,   471,     0,   472,     0,   473,     0,     0,   474,     0,
+      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,   474,  -478,   475,     0,   476,     0,
+       0,   477,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   162,     0,     0,   343,   344,    72,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   345,
+     346,     0,     0,     0,     0,    73,    74,    75,    76,    77,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   342,   343,    72,     0,     0,     0,   165,
-     107,   108,   109,   110,     0,     0,   344,   345,     0,     0,
-       0,     0,    73,    74,    75,    76,    77,     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,
-     107,   108,   109,   549,    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,   511,   512,   513,    70,   471,
-       0,   472,   514,   473,     0,     0,   474,     0,     0,     0,
+       0,    70,   474,     0,   475,     0,   476,     0,     0,   477,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   342,   343,    72,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   344,   345,     0,     0,     0,     0,
-      73,    74,    75,    76,    77,     0,     0,     0,     0,     0,
+       0,   162,     0,     0,   343,   344,    72,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   345,   346,     0,
+       0,     0,     0,    73,    74,    75,    76,    77,     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,   588,     0,     0,    70,   471,     0,   472,
-       0,   473,     0,     0,   474,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   161,     0,     0,   342,
-     343,    72,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   344,   345,     0,     0,     0,     0,    73,    74,
-      75,    76,    77,     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,
-      78,   589,   590,    80,    81,    82,    83,    84,     0,     0,
-       0,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-     591,    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,   588,     0,     0,    70,   471,     0,   472,     0,   473,
-       0,     0,   474,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   342,   343,    72,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     344,   345,     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,   589,
-     590,    80,    81,    82,    83,    84,     0,     0,     0,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,   591,    95,
-      96,    97,    98,    99,   100,    66,     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,
+     106,    73,    74,    75,    76,    77,     0,     0,     0,     0,
+       0,     0,     0,   580,     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,
+     138,   139,    25,   110,    68,    69,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    70,   474,     0,
+     475,     0,   476,     0,     0,   477,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     343,   344,    72,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   345,   346,     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,   340,     0,
+     341,     0,     0,   342,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   343,   344,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   345,   346,     0,     0,     0,     0,    73,    74,    75,
+      76,    77,     0,     0,     0,     0,     0,     0,     0,   347,
+       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,     0,     0,     0,     0,     0,
-       0,     0,    70,   471,     0,   472,     0,   473,     0,     0,
-     474,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   161,     0,     0,   342,   343,    72,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   344,   345,
-       0,     0,   657,     0,    73,    74,    75,    76,    77,     0,
+      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,
@@ -835,384 +896,324 @@ static const short int yytable[] =
       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,   471,  -477,   472,     0,   473,     0,     0,   474,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     161,     0,     0,   342,   343,    72,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   344,   345,     0,     0,
-       0,     0,    73,    74,    75,    76,    77,     0,     0,     0,
+      70,     0,     0,     0,     0,     0,     0,     0,   191,     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,   417,     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,   471,
-       0,   472,     0,   473,     0,     0,   474,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   161,     0,
-       0,   342,   343,    72,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   344,   345,     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,
+     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,   450,     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,    10,    11,    12,    13,    14,
-      15,    16,    17,     0,     0,     0,    70,     0,     0,     0,
+       0,     0,     0,    68,    69,     0,     0,     0,     0,    73,
+      74,    75,    76,    77,     0,     0,    70,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     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,   106,    73,    74,
+       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,
-     577,     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,   137,   138,    25,
-     110,    68,    69,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    70,   471,     0,   472,     0,   473,
-       0,     0,   474,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   342,   343,    72,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     344,   345,     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,   339,     0,   340,     0,     0,
-     341,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   342,   343,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   344,   345,
-       0,     0,     0,     0,    73,    74,    75,    76,    77,    66,
-       0,     0,     0,     0,     0,     0,   346,     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,    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,   190,     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,   415,     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,
-     447,     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,    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,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       1,     2,     3,     4,     5,     6,     7,     8,    73,    74,
-      75,    76,    77,   539,     0,    10,    11,    12,    13,    14,
-      15,    16,    17,     0,     0,     0,   106,     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,   540,     0,     0,     0,
-     539,     0,    10,    11,    12,    13,    14,    15,    16,    17,
-       0,     0,     0,   106,     0,     0,   107,   108,   109,   382,
-       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,   106,     0,     0,     0,
-       0,     0,     0,   543,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     1,     2,     3,     4,     5,     6,
-       7,     8,     0,   107,   108,   109,   382,     9,     0,    10,
+       4,     5,     6,     7,     8,     0,     0,     0,     0,     0,
+     542,     0,    10,    11,    12,    13,    14,    15,    16,    17,
+       0,     0,     0,   106,     1,     2,     3,     4,     5,     6,
+       7,     8,     0,     0,     0,     0,     0,   542,     0,    10,
       11,    12,    13,    14,    15,    16,    17,     0,     0,     0,
-     106,     0,     0,     0,     0,     0,     0,     1,     2,     3,
-       4,     5,     6,     7,     8,     0,   107,   108,   109,   110,
-       9,     0,    10,    11,    12,    13,    14,    15,    16,    17,
-       0,     0,     0,   106,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     1,     2,     3,     4,     5,     6,     7,     8,     0,
-     137,   138,    25,   110,   381,     0,    10,    11,    12,    13,
+     106,     1,     2,     3,     4,     5,     6,     7,     8,     0,
+       0,     0,     0,   543,     9,     0,    10,    11,    12,    13,
       14,    15,    16,    17,     0,     0,     0,   106,     0,     0,
-       0,     0,     0,     0,     1,     2,     3,     4,     5,     6,
-       7,     8,     0,   107,   108,   109,   110,   460,     0,    10,
-      11,    12,    13,    14,    15,    16,    17,   564,     0,     0,
-     106,     0,     0,     0,     0,     0,     0,     0,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,   498,   107,   108,   109,
-     382,   553,     0,     0,     0,   419,   420,   421,   422,   423,
+       0,     0,     0,   107,   108,   109,   384,     0,     0,     0,
+     546,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     1,     2,     3,     4,     5,     6,     7,     8,     0,
+     107,   108,   109,   384,   137,     0,    10,    11,    12,    13,
+      14,    15,    16,    17,     0,     0,     0,   106,     1,     2,
+       3,     4,     5,     6,     7,     8,     0,   107,   108,   109,
+     110,     9,     0,    10,    11,    12,    13,    14,    15,    16,
+      17,     0,     0,     0,   106,     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,   106,     0,     0,     0,     0,     0,   138,   139,    25,
+     110,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     1,     2,     3,     4,     5,
+       6,     7,     8,     0,   107,   108,   109,   110,   383,     0,
+      10,    11,    12,    13,    14,    15,    16,    17,     0,     0,
+       0,   106,     1,     2,     3,     4,     5,     6,     7,     8,
+       0,   138,   139,    25,   110,   156,     0,    10,    11,    12,
+      13,    14,    15,    16,    17,     0,     0,     0,   106,     1,
+       2,     3,     4,     5,     6,     7,     8,     0,     0,     0,
+       0,     0,   463,     0,    10,    11,    12,    13,    14,    15,
+      16,    17,     0,     0,     0,   106,     0,     0,     0,     0,
+       0,   107,   108,   109,   384,     1,     2,     3,     4,     5,
+       6,     7,     8,     0,     0,     0,     0,     0,     0,     0,
+      10,    11,    12,    13,    14,    15,    16,    17,   107,   108,
+     109,   106,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   501,
+       0,     0,     0,     0,     0,   107,   108,   109,   421,   422,
+     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
+     433,   434,   435,   436,   437,   438,     0,     0,     0,     0,
+       0,   439,     0,     0,     0,   603,     0,     0,     0,     0,
+       0,   107,   108,   109,   421,   422,   423,   424,   425,   426,
+     427,   428,   429,   430,   431,   432,   433,   434,   435,   436,
+     437,   438,   699,     0,     0,     0,     0,   556,     0,     0,
+       0,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,   673,
+       0,     0,     0,     0,   556,     0,     0,   421,   422,   423,
      424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-     434,   435,   436,     0,   600,     0,     0,     0,   437,     0,
-     107,   108,   109,   419,   420,   421,   422,   423,   424,   425,
-     426,   427,   428,   429,   430,   431,   432,   433,   434,   435,
-     436,   696,     0,     0,     0,     0,   553,     0,     0,     0,
-     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,   435,   436,   573,     0,
-       0,     0,     0,   553,     0,   419,   420,   421,   422,   423,
+     434,   435,   436,   437,   438,   576,     0,     0,     0,     0,
+     556,     0,   421,   422,   423,   424,   425,   426,   427,   428,
+     429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
+     639,     0,     0,     0,     0,   439,     0,   421,   422,   423,
      424,   425,   426,   427,   428,   429,   430,   431,   432,   433,
-     434,   435,   436,   636,     0,     0,     0,     0,   437,     0,
-     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,   435,   436,     0,     0,
-       0,     0,     0,   553,   419,   420,   421,   422,   423,   424,
-     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-     435,   436,     0,     0,     0,     0,     0,   437,   419,   420,
-     421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,   435,   436,     0,     0,     0,     0,
-       0,   553,   419,   420,   421,   422,   423,   424,   425,   426,
-     427,   428,   429,   430,   431,   432,   433,   434,   435,   436,
-       0,     0,     0,     0,     0,   437,   419,   420,   421,   422,
-     423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,   435,   436,     0,     0,     0,     0,     0,   553
+     434,   435,   436,   437,   438,     0,     0,     0,     0,     0,
+     556,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     430,   431,   432,   433,   434,   435,   436,   437,   438,     0,
+       0,     0,     0,     0,   439,   421,   422,   423,   424,   425,
+     426,   427,   428,   429,   430,   431,   432,   433,   434,   435,
+     436,   437,   438,     0,     0,     0,     0,     0,   556,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
+     432,   433,   434,   435,   436,   437,   438,     0,     0,     0,
+       0,     0,   439,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,   435,   436,   437,
+     438,     0,     0,     0,     0,     0,   556
 };
 
 static const short int yycheck[] =
 {
-      39,    29,     9,    26,    18,   132,    22,   136,    22,     9,
-      71,    22,   392,   165,   404,   395,   341,   546,     0,    18,
-     546,   555,   347,    23,    24,    25,   372,   546,   531,   578,
-     349,    34,    39,    55,   398,   581,    18,   583,     0,    32,
-      34,    38,    37,     3,    34,    39,     6,    42,    97,    31,
-      10,    33,    12,    13,    14,    15,    16,    17,    55,   449,
-      33,   590,    41,    42,    71,     4,     5,     6,    41,   598,
-       9,    33,   598,     9,   620,    11,   466,    70,   205,    39,
-      37,    38,    50,    40,   474,   475,   450,   110,     6,     7,
-       8,    17,    18,   418,     0,   414,     6,   646,   417,     9,
-      37,   140,   102,   637,    41,    42,   128,   107,   108,   109,
-      17,    18,   437,   438,    39,    40,   462,    40,   464,   622,
-      43,   124,    38,    37,    40,   125,    40,   129,   677,   190,
-     633,    42,   463,   140,   465,   135,   136,   137,   138,    37,
-     674,    38,   671,    38,   144,   679,    39,    40,   155,   165,
-     653,   165,   671,    42,   165,   701,   546,   686,   197,    55,
-     686,    39,    40,   553,   554,   164,    43,    36,   697,   703,
-     184,   185,   172,   184,   185,   555,    39,    40,   697,   358,
-     359,   500,   164,   190,   503,   504,   186,    37,   188,   115,
-     116,   117,   118,   119,   120,   146,   147,   148,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,    38,   598,   599,
-     137,   138,   341,    41,    31,    42,    31,    31,   347,    37,
-      42,    98,    99,   100,   101,   102,   103,   104,    31,    38,
-       6,    44,    38,   623,    38,    37,   123,    42,    46,    38,
-     586,   587,   632,    37,    41,    43,   636,   572,   573,     4,
-       5,     6,     7,     8,     9,    10,    11,   637,    37,    33,
-      46,    34,    17,    40,    19,    20,    21,    22,    23,    24,
-      25,    26,    39,    38,    38,    30,    45,    37,    46,    37,
-     670,   671,    38,    46,    32,    46,    38,    37,   440,   418,
-      39,   610,   611,    39,   674,    39,   686,    40,    33,   679,
-      98,    99,   100,   101,   102,   103,   104,   697,   437,   438,
-     371,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    41,   383,   703,    37,    17,    41,    19,    20,    21,
-      22,    23,    24,    25,    26,    90,    91,    92,    30,    39,
-      39,   341,    39,    39,   383,    39,   346,   347,    39,    37,
-      40,    40,   391,    40,   393,   507,    39,    41,     3,   382,
-      46,     6,   362,   114,   371,    10,    38,    12,    13,    14,
-      15,    16,    17,    38,   381,    33,   383,    98,    99,   100,
-     101,   102,   103,   104,    40,    38,   447,    41,    38,    37,
-      39,    33,    39,   135,   394,    41,    40,    37,    90,    91,
-      92,    40,   441,   442,    39,    38,    40,   407,    40,    32,
-     410,    38,    33,    39,    33,   415,    40,    39,   418,    33,
-      40,    39,    39,   332,   440,    41,   440,    40,    39,   440,
-      39,    33,   623,   140,    46,   166,   560,   437,   438,   179,
-     447,    31,   361,   572,   573,   617,   185,   467,    28,   463,
-     583,   465,   463,   460,   465,   455,   697,   496,   391,   459,
-     365,   589,   562,   474,   395,    -1,    -1,   467,     4,     5,
-       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
-      -1,   608,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,   507,    -1,   507,    30,    -1,   507,   497,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,    -1,
-     510,    -1,    -1,    -1,    -1,    -1,    -1,    12,   557,    -1,
-      -1,   560,    17,    18,    -1,    -1,   549,    -1,    -1,    -1,
-      -1,   559,   539,    -1,    -1,    30,    -1,   537,    -1,    -1,
-      -1,    -1,    -1,    38,    -1,    -1,    36,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    90,    91,    92,    -1,    -1,    -1,
-      55,    -1,   562,    -1,    -1,    -1,   605,    -1,    -1,    -1,
-      -1,    -1,   572,   573,    -1,    -1,   615,    72,    73,    74,
-      75,    76,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,   622,    85,    86,    87,    88,    94,
-      -1,    96,    97,    98,    99,   100,   101,    -1,    -1,   609,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,    40,   666,    -1,    -1,
-      -1,    -1,   671,    -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,   697,     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,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   116,   117,   118,   119,   120,    -1,    -1,    -1,    -1,
-      -1,   126,    -1,   128,    -1,    89,    90,    91,    92,    93,
-      94,    95,    -1,    97,     4,     5,     6,     7,     8,     9,
-      10,    11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    19,
-      20,    21,    22,    23,    24,    25,    26,   121,    -1,    -1,
-      30,    -1,   126,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    -1,    -1,    -1,    -1,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    -1,    -1,    -1,
-      30,    31,    -1,    33,    -1,    35,    -1,    -1,    38,    -1,
+      39,    29,     9,    26,    18,   132,    22,   136,    22,   166,
+       9,    71,   394,   406,   342,   397,   549,   549,    22,   400,
+     348,   549,   374,    18,    23,    24,    25,     0,    34,    32,
+     350,   534,    39,   581,    55,   584,    33,   586,     0,     3,
+      38,   558,     6,    34,    41,    18,    10,    97,    12,    13,
+      14,    15,    16,    17,     6,     7,     8,    55,    31,   452,
+      33,   593,    50,    37,    71,    34,     0,    70,    42,   601,
+      39,    33,   453,   601,   623,    39,   469,    37,    38,   206,
+      40,     4,     5,     6,   477,   478,     9,   110,     6,    37,
+      37,     9,   420,    41,    42,   129,   416,    17,    18,   419,
+      38,   649,   141,   102,   147,   148,   149,   128,   107,   108,
+     109,   439,   440,   465,    40,   467,    37,    43,   124,    40,
+      39,    40,   625,   640,    38,     9,   125,    11,    41,    42,
+     137,   191,   680,   636,   141,    42,   135,   136,   137,   138,
+     139,   674,   674,    38,    42,    40,   145,    39,    40,   156,
+     166,    55,   166,   656,    36,   704,   549,   689,    37,   198,
+     677,   689,   166,   556,   557,   682,    43,   700,   700,    38,
+     165,   185,   186,   466,   173,   468,   558,    17,    18,    39,
+      40,   185,   186,   503,   191,    41,   506,   507,   187,   706,
+     189,    42,   165,    31,    43,   115,   116,   117,   118,   119,
+     120,    98,    99,   100,   101,   102,   103,   104,   601,   602,
+      39,    40,    31,   342,   360,   361,   138,   139,    31,   348,
+      37,    98,    99,   100,   101,   102,   103,   104,    42,    31,
+      38,     6,    44,   626,    38,   123,    37,   589,   590,    38,
+      37,    41,   635,    46,    42,    38,   639,   575,   576,    98,
+      99,   100,   101,   102,   103,   104,    37,    37,   640,    33,
+      46,    34,    39,    45,    40,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,    38,    38,    46,    37,    46,    37,
+     673,   674,    38,    32,    46,    38,   443,    37,    39,    33,
+     114,   420,    39,   613,   614,   677,   689,    39,    41,    40,
+     682,    37,    41,    40,    39,    39,    39,   700,    39,    39,
+     439,   440,    39,   373,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,   706,   385,    40,    40,    17,    39,
+      19,    20,    21,    22,    23,    24,    25,    26,    41,    46,
+      38,    30,    38,   342,    41,    40,   385,    33,   347,   348,
+      38,    38,    37,   510,   393,    39,   395,    37,    39,    41,
+       3,   384,    33,     6,    40,   364,   373,    10,    37,    12,
+      13,    14,    15,    16,    17,    40,   383,    39,   385,    40,
+      38,    40,    32,    38,    33,    39,    33,    39,    41,    40,
+     450,    33,    40,    39,    39,    33,    40,   396,    39,    39,
+     333,    90,    91,    92,   626,   444,   445,   135,   180,   141,
+     409,    46,   167,   412,   563,    31,   620,   186,   417,   363,
+      28,   420,   470,   586,   367,   700,   393,   443,   592,   443,
+     565,   397,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   443,
+     439,   440,    -1,   450,    -1,    -1,   575,   576,    -1,    -1,
+      -1,    -1,   466,    -1,   468,    -1,   463,    -1,    -1,   458,
+     499,    -1,   466,   462,   468,    -1,    -1,    -1,    -1,    -1,
+      -1,   470,    -1,   477,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   611,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   510,    -1,   510,    -1,    -1,    -1,
+      -1,   500,    -1,    -1,    -1,    -1,   510,    36,    -1,    -1,
+      -1,    -1,    -1,    -1,   513,    -1,    -1,    -1,    -1,    -1,
+      -1,   560,    -1,    -1,   563,    -1,    -1,    -1,    -1,   552,
+      -1,    -1,    -1,    -1,   562,   542,    -1,    -1,    -1,    -1,
+      -1,   540,    -1,    72,    73,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    -1,    85,    86,    87,    88,
+      -1,    -1,    -1,    -1,    -1,    -1,   565,    -1,    -1,   608,
+      -1,    -1,    -1,    -1,    -1,    -1,   575,   576,    -1,   618,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    53,    54,    55,    -1,    -1,    -1,    89,
-      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,   625,    -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,
+      -1,    -1,    -1,   612,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,
+     669,    -1,    -1,    -1,    -1,   674,    -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,   700,     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,    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,    -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,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,     3,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
-      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    27,    -1,    -1,    30,    31,    -1,    33,
-      -1,    35,    -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,    53,
-      54,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    66,    67,    -1,    -1,    -1,    -1,    72,    73,
-      74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,    -1,
+      -1,    -1,    -1,    -1,   126,    -1,   128,    -1,    89,    90,
+      91,    92,    93,    94,    95,    -1,    97,     4,     5,     6,
+       7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
+      17,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
+     121,    -1,    -1,    30,    -1,   126,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    -1,    -1,    -1,    -1,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,    -1,
+      -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    53,    54,    55,    -1,
+      -1,    -1,    89,    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,
-      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,    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,
-      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,    -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,    70,    -1,    72,    73,    74,    75,    76,    -1,
+      -1,    -1,    -1,    -1,    53,    54,    55,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    -1,
+      -1,    -1,    -1,    72,    73,    74,    75,    76,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    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,    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,    -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,
-      30,    31,    32,    33,    -1,    35,    -1,    -1,    38,    -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,
-      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,
+      53,    54,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    66,    67,    -1,    -1,    -1,    -1,    72,
+      73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    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,    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,    -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,    70,    -1,    72,    73,    74,
+      75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
+      -1,    96,    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,    -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,    19,    20,    21,    22,    23,
-      24,    25,    26,    -1,    -1,    -1,    30,    -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,     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,    30,    31,    -1,    33,    -1,    35,    -1,    -1,    38,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      66,    67,    -1,    -1,    -1,    -1,    72,    73,    74,    75,
-      76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,
-      96,    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,    33,    -1,    35,    -1,    -1,
-      38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    53,    54,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,
-      -1,    -1,    -1,    -1,    72,    73,    74,    75,    76,     3,
-      -1,    -1,    -1,    -1,    -1,    -1,    84,    -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,    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,    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,    50,    -1,    -1,    53,    54,    55,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    -1,
+      -1,    -1,    -1,    72,    73,    74,    75,    76,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    94,    -1,    96,    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,    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,    -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,    33,    -1,
+      35,    -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    54,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    66,    67,    -1,    -1,    -1,    -1,    72,    73,    74,
+      75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
       -1,    96,    97,    98,    99,   100,   101,    -1,    -1,    -1,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
@@ -1221,73 +1222,113 @@ static const short int yycheck[] =
       17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     3,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -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,
-      38,    -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,
-      97,    98,    99,   100,   101,    -1,    -1,    -1,   105,   106,
+      -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,     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,
+     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,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     118,   119,   120,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,
+      -1,    -1,    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,     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,    -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,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       4,     5,     6,     7,     8,     9,    10,    11,    72,    73,
-      74,    75,    76,    17,    -1,    19,    20,    21,    22,    23,
-      24,    25,    26,    -1,    -1,    -1,    30,    -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,
-       7,     8,     9,    10,    11,    -1,    70,    -1,    -1,    -1,
+       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,    90,    91,    92,    93,
-       4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
-      -1,    -1,    -1,    17,    -1,    19,    20,    21,    22,    23,
-      24,    25,    26,    -1,    -1,    -1,    30,    -1,    -1,    -1,
-      -1,    -1,    -1,    70,    -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,
+      -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,    -1,     4,     5,     6,
-       7,     8,     9,    10,    11,    -1,    90,    91,    92,    93,
-      17,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
-      -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      30,     4,     5,     6,     7,     8,     9,    10,    11,    -1,
+      -1,    -1,    -1,    70,    17,    -1,    19,    20,    21,    22,
+      23,    24,    25,    26,    -1,    -1,    -1,    30,    -1,    -1,
+      -1,    -1,    -1,    90,    91,    92,    93,    -1,    -1,    -1,
+      70,    -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,    -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,    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,    39,    90,    91,    92,
-      93,    71,    -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,    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,
+      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,    -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,     4,     5,     6,     7,     8,
+       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      19,    20,    21,    22,    23,    24,    25,    26,    90,    91,
+      92,    30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    39,
+      -1,    -1,    -1,    -1,    -1,    90,    91,    92,    48,    49,
       50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
       60,    61,    62,    63,    64,    65,    -1,    -1,    -1,    -1,
-      -1,    71,    48,    49,    50,    51,    52,    53,    54,    55,
+      -1,    71,    -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,
+      -1,    90,    91,    92,    48,    49,    50,    51,    52,    53,
+      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
+      64,    65,    39,    -1,    -1,    -1,    -1,    71,    -1,    -1,
+      -1,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    40,
+      -1,    -1,    -1,    -1,    71,    -1,    -1,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    41,    -1,    -1,    -1,    -1,
+      71,    -1,    48,    49,    50,    51,    52,    53,    54,    55,
       56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      -1,    -1,    -1,    -1,    -1,    71,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    -1,    -1,    -1,    -1,    -1,    71
+      41,    -1,    -1,    -1,    -1,    71,    -1,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    -1,    -1,    -1,    -1,    -1,
+      71,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    -1,
+      -1,    -1,    -1,    -1,    71,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    -1,    -1,    -1,    -1,    -1,    71,    48,
+      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,    63,    64,    65,    -1,    -1,    -1,
+      -1,    -1,    71,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    -1,    -1,    -1,    -1,    -1,    71
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1307,64 +1348,65 @@ static const unsigned char yystos[] =
      120,   135,   216,   217,   234,   244,    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,    90,    91,   165,
-     166,   188,   189,   194,   203,   209,   210,   135,   135,   135,
-     211,     3,     6,    10,    12,    17,   160,   161,   167,    34,
-     219,    50,   252,   253,    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,
-      38,   135,    55,   128,   135,   135,   135,    40,   184,    27,
-      28,    29,   126,   128,   135,   150,   151,    36,     0,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    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,    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,    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,   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,   225,   226,
-     227,   240,   241,   247,   248,   249,   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,    41,
-      42,   199,   199,    37,   198,   199,   198,    38,   135,    46,
-     225,    38,    37,    37,    33,   215,   214,    34,   181,   216,
-      17,   215,    39,    40,    39,    40,    46,    40,    43,   195,
-     230,    31,    33,    35,    38,   134,   195,   206,   207,   222,
-     242,   243,   244,   252,   195,   135,   250,   251,    18,   243,
-     244,    43,   226,   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,   220,
-     221,   223,   224,    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,   135,   152,   153,
-      39,    39,    40,    41,    33,    41,   212,    43,   165,   135,
-      37,    41,    39,    40,   222,    39,    39,    39,    27,    95,
-      96,   114,   206,   229,   231,   232,   233,   234,   253,    39,
-      39,   206,   206,   242,   195,   252,   185,   251,    39,    40,
-     156,   156,    40,    33,    41,    40,   201,   212,    39,   223,
-      41,   221,   223,    46,   214,   214,   114,   231,    17,    18,
-     234,   237,    38,    38,   229,   206,    41,    40,   245,   195,
-      39,   154,   135,    33,    41,    38,   195,   202,    37,   201,
-     223,   252,   162,    38,   206,   222,   206,    70,   242,   246,
-      39,    37,    39,    41,    33,   212,    40,    37,    70,   222,
-      40,    40,   235,    39,    40,    38,    40,   195,    32,    38,
-     206,   195,   228,   229,   230,   236,   253,    39,   242,    33,
-      33,   212,    39,   238,   239,   242,    39,    40,   229,    40,
-      39,    41,    39,    40,   228,    33,   223,    39,   242,    39
+     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,   219,    50,   252,   253,    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,    38,   135,    55,   128,   135,   135,   135,    40,   184,
+      27,    28,    29,   126,   128,   135,   150,   151,    36,     0,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    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,    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,    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,
+     225,   226,   227,   240,   241,   247,   248,   249,   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,   225,    38,    37,    37,    33,   215,   214,
+      34,   181,   216,    17,   215,    39,    40,    39,    40,    46,
+      40,    43,   195,   230,    31,    33,    35,    38,   134,   195,
+     206,   207,   222,   242,   243,   244,   252,   195,   135,   250,
+     251,    18,   243,   244,    43,   226,   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,   220,   221,   223,   224,    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,
+     135,   152,   153,    39,    39,    40,    41,    33,    41,   212,
+      43,   165,   135,    37,    41,    39,    40,   222,    39,    39,
+      39,    27,    95,    96,   114,   206,   229,   231,   232,   233,
+     234,   253,    39,    39,   206,   206,   242,   195,   252,   185,
+     251,    39,    40,   156,   156,    40,    33,    41,    40,   201,
+     212,    39,   223,    41,   221,   223,    46,   214,   214,   114,
+     231,    17,    18,   234,   237,    38,    38,   229,   206,    41,
+      40,   245,   195,    39,   154,   135,    33,    41,    38,   195,
+     202,    37,   201,   223,   252,   162,    38,   206,   222,   206,
+      70,   242,   246,    39,    37,    39,    41,    33,   212,    40,
+      37,    70,   222,    40,    40,   235,    39,    40,    38,    40,
+     195,    32,    38,   206,   195,   228,   229,   230,   236,   253,
+      39,   242,    33,    33,   212,    39,   238,   239,   242,    39,
+      40,   229,    40,    39,    41,    39,    40,   228,    33,   223,
+      39,   242,    39
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
@@ -1395,29 +1437,30 @@ static const unsigned char yyr1[] =
      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,   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,   215,   215,   216,   216,   217,   217,   218,   218,
-     219,   219,   219,   220,   220,   221,   221,   222,   223,   224,
-     224,   224,   224,   224,   224,   224,   224,   224,   225,   225,
-     226,   226,   226,   226,   226,   227,   227,   228,   228,   228,
-     229,   229,   229,   229,   229,   229,   230,   230,   231,   232,
-     233,   234,   234,   234,   234,   234,   234,   234,   234,   234,
-     234,   235,   235,   236,   236,   237,   237,   238,   238,   239,
-     239,   240,   241,   242,   242,   242,   243,   243,   244,   244,
-     244,   244,   244,   244,   244,   244,   245,   245,   246,   246,
-     247,   248,   248,   249,   250,   250,   251,   252,   252,   253
+     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,   215,   215,   216,   216,   217,   217,   218,
+     218,   219,   219,   219,   220,   220,   221,   221,   222,   223,
+     224,   224,   224,   224,   224,   224,   224,   224,   224,   225,
+     225,   226,   226,   226,   226,   226,   227,   227,   228,   228,
+     228,   229,   229,   229,   229,   229,   229,   230,   230,   231,
+     232,   233,   234,   234,   234,   234,   234,   234,   234,   234,
+     234,   234,   235,   235,   236,   236,   237,   237,   238,   238,
+     239,   239,   240,   241,   242,   242,   242,   243,   243,   244,
+     244,   244,   244,   244,   244,   244,   244,   245,   245,   246,
+     246,   247,   248,   248,   249,   250,   250,   251,   252,   252,
+     253
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1448,29 +1491,30 @@ static const unsigned char yyr2[] =
        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,     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,     3,     0,     1,     1,     2,     1,     2,     4,     5,
-       7,     8,    13,     1,     3,     2,     4,     2,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
-       1,     1,     1,     1,     1,     3,     6,     1,     2,     1,
-       1,     1,     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,     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,     3,     0,     1,     1,     2,     1,     2,     4,
+       5,     7,     8,    13,     1,     3,     2,     4,     2,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       2,     1,     1,     1,     1,     1,     3,     6,     1,     2,
+       1,     1,     1,     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
 };
 
 
@@ -1524,7 +1568,8 @@ static const unsigned char yydprec[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0
 };
 
 /* YYMERGER[RULE-NUM] -- Index of merging function for rule #RULE-NUM.  */
@@ -1577,7 +1622,8 @@ static const unsigned char yymerger[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0
 };
 
 /* YYIMMEDIATE[RULE-NUM] -- True iff rule #RULE-NUM is not to be deferred, as
@@ -1631,7 +1677,8 @@ static const yybool yyimmediate[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0
 };
 
 /* YYCONFLP[YYPACT[STATE-NUM]] -- Pointer into YYCONFL of start of
@@ -1640,6 +1687,26 @@ 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,     5,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1648,9 +1715,9 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       5,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   259,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1674,7 +1741,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,   259,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1686,6 +1752,20 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     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,
@@ -1705,20 +1785,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,     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,
@@ -1903,19 +1969,19 @@ 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,     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,     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,   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,     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,     0,     0,     0,     0,
@@ -1946,42 +2012,51 @@ static const unsigned short int yyconflp[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   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,   261,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   263
 };
 
 /* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by
    0, pointed into by YYCONFLP.  */
 static const short int yyconfl[] =
 {
-       0,   269,     0,   269,     0,   337,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   464,     0,   464,     0,   464,
-       0,   464,     0,   464,     0,   269,     0,   269,     0,   269,
-       0,   227,     0,   364,     0
+       0,   270,     0,   270,     0,   338,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   465,     0,   465,     0,   465,
+       0,   465,     0,   465,     0,   270,     0,   270,     0,   270,
+       0,   227,     0,   365,     0
 };
 
 /* Error token number */
@@ -2411,18 +2486,18 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
   switch (yyn)
     {
         case 171:
-#line 409 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 391 "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 2422 "src/parser_proc.c" /* glr.c:816  */
+#line 2497 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 172:
-#line 415 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 397 "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,
@@ -2431,91 +2506,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 2435 "src/parser_proc.c" /* glr.c:816  */
+#line 2510 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 173:
-#line 423 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 405 "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 2443 "src/parser_proc.c" /* glr.c:816  */
+#line 2518 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 174:
-#line 426 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 408 "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 2451 "src/parser_proc.c" /* glr.c:816  */
+#line 2526 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 176:
-#line 430 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 412 "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 2459 "src/parser_proc.c" /* glr.c:816  */
+#line 2534 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 177:
-#line 433 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 415 "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 2467 "src/parser_proc.c" /* glr.c:816  */
+#line 2542 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 178:
-#line 436 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 418 "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 2475 "src/parser_proc.c" /* glr.c:816  */
+#line 2550 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 179:
-#line 439 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 421 "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 2483 "src/parser_proc.c" /* glr.c:816  */
+#line 2558 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 180:
-#line 442 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 424 "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 2491 "src/parser_proc.c" /* glr.c:816  */
+#line 2566 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 181:
-#line 448 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 430 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 2499 "src/parser_proc.c" /* glr.c:816  */
+#line 2574 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 182:
-#line 454 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 436 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_cpp_exp **)(&(*yyvalp))) = NULL;
 }
-#line 2507 "src/parser_proc.c" /* glr.c:816  */
+#line 2582 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 183:
-#line 457 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 439 "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 2515 "src/parser_proc.c" /* glr.c:816  */
+#line 2590 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 184:
-#line 463 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 445 "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;
@@ -2539,185 +2614,185 @@ 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 2543 "src/parser_proc.c" /* glr.c:816  */
+#line 2618 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 185:
-#line 486 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 468 "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 2552 "src/parser_proc.c" /* glr.c:816  */
+#line 2627 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 186:
-#line 490 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 472 "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 2561 "src/parser_proc.c" /* glr.c:816  */
+#line 2636 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 187:
-#line 494 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 476 "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 2571 "src/parser_proc.c" /* glr.c:816  */
+#line 2646 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 188:
-#line 499 "src/parser_proc_grammar.y" /* glr.c:816  */
+#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 (-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 2580 "src/parser_proc.c" /* glr.c:816  */
+#line 2655 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 189:
-#line 503 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 485 "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 2589 "src/parser_proc.c" /* glr.c:816  */
+#line 2664 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 190:
-#line 507 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 489 "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 2598 "src/parser_proc.c" /* glr.c:816  */
+#line 2673 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 191:
-#line 511 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 493 "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 2607 "src/parser_proc.c" /* glr.c:816  */
+#line 2682 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 214:
-#line 564 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 546 "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 2617 "src/parser_proc.c" /* glr.c:816  */
+#line 2692 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 215:
-#line 569 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 551 "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 2627 "src/parser_proc.c" /* glr.c:816  */
+#line 2702 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 216:
-#line 577 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 559 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL);
 }
-#line 2635 "src/parser_proc.c" /* glr.c:816  */
+#line 2710 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 218:
-#line 584 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 566 "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 2645 "src/parser_proc.c" /* glr.c:816  */
+#line 2720 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 219:
-#line 589 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 571 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (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 2655 "src/parser_proc.c" /* glr.c:816  */
+#line 2730 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 220:
-#line 597 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 579 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 2663 "src/parser_proc.c" /* glr.c:816  */
+#line 2738 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 222:
-#line 604 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 586 "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 2672 "src/parser_proc.c" /* glr.c:816  */
+#line 2747 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 223:
-#line 608 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 590 "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 2681 "src/parser_proc.c" /* glr.c:816  */
+#line 2756 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 224:
-#line 615 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 597 "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 2690 "src/parser_proc.c" /* glr.c:816  */
+#line 2765 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 225:
-#line 619 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 601 "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 2699 "src/parser_proc.c" /* glr.c:816  */
+#line 2774 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 226:
-#line 623 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 605 "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 2708 "src/parser_proc.c" /* glr.c:816  */
+#line 2783 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 227:
-#line 627 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 609 "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 2717 "src/parser_proc.c" /* glr.c:816  */
+#line 2792 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 228:
-#line 632 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 614 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                uint8_t exists;
@@ -2728,11 +2803,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 2732 "src/parser_proc.c" /* glr.c:816  */
+#line 2807 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 229:
-#line 642 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 624 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                uint8_t exists;
@@ -2743,103 +2818,103 @@ 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 2747 "src/parser_proc.c" /* glr.c:816  */
+#line 2822 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 230:
-#line 652 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 634 "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 2757 "src/parser_proc.c" /* glr.c:816  */
+#line 2832 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 231:
-#line 657 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 639 "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 2767 "src/parser_proc.c" /* glr.c:816  */
+#line 2842 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 232:
-#line 662 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 644 "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 2778 "src/parser_proc.c" /* glr.c:816  */
+#line 2853 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 233:
-#line 668 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 650 "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 2789 "src/parser_proc.c" /* glr.c:816  */
+#line 2864 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 234:
-#line 677 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 659 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 2797 "src/parser_proc.c" /* glr.c:816  */
+#line 2872 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 236:
-#line 684 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 666 "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 2806 "src/parser_proc.c" /* glr.c:816  */
+#line 2881 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 237:
-#line 688 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 670 "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 2814 "src/parser_proc.c" /* glr.c:816  */
+#line 2889 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 238:
-#line 694 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 676 "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 2823 "src/parser_proc.c" /* glr.c:816  */
+#line 2898 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 239:
-#line 701 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 683 "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 2831 "src/parser_proc.c" /* glr.c:816  */
+#line 2906 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 244:
-#line 714 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 696 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_def_val **)(&(*yyvalp))) = NULL;
 }
-#line 2839 "src/parser_proc.c" /* glr.c:816  */
+#line 2914 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 245:
-#line 717 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 699 "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};
@@ -2871,36 +2946,50 @@ 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 2875 "src/parser_proc.c" /* glr.c:816  */
+#line 2950 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 246:
-#line 748 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 730 "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 2884 "src/parser_proc.c" /* glr.c:816  */
+#line 2959 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 251:
-#line 762 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 744 "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 2892 "src/parser_proc.c" /* glr.c:816  */
+#line 2967 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 252:
-#line 765 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 747 "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));
+       (*(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),
+               psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text, 0, 0)
+       );
+       (*(struct psi_decl_arg **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)));
+       (*(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 2900 "src/parser_proc.c" /* glr.c:816  */
+#line 2981 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 254:
-#line 772 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 253:
+#line 756 "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 2989 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 255:
+#line 763 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_init(PSI_T_FUNCTION, (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->func->var->name),
@@ -2909,11 +2998,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 2913 "src/parser_proc.c" /* glr.c:816  */
+#line 3002 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 255:
-#line 780 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 256:
+#line 771 "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(
@@ -2925,11 +3014,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 2929 "src/parser_proc.c" /* glr.c:816  */
+#line 3018 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 256:
-#line 791 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 257:
+#line 782 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(psi_decl_type_init(PSI_T_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));
@@ -2939,11 +3028,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 2943 "src/parser_proc.c" /* glr.c:816  */
+#line 3032 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 257:
-#line 800 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 258:
+#line 791 "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));
@@ -2953,148 +3042,148 @@ 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 2957 "src/parser_proc.c" /* glr.c:816  */
+#line 3046 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 258:
-#line 809 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 259:
+#line 800 "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 2967 "src/parser_proc.c" /* glr.c:816  */
+#line 3056 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 259:
-#line 817 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 260:
+#line 808 "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 2975 "src/parser_proc.c" /* glr.c:816  */
+#line 3064 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 261:
-#line 824 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 262:
+#line 815 "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 2984 "src/parser_proc.c" /* glr.c:816  */
+#line 3073 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 263:
-#line 832 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 264:
+#line 823 "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 2994 "src/parser_proc.c" /* glr.c:816  */
+#line 3083 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 264:
-#line 837 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 265:
+#line 828 "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 3004 "src/parser_proc.c" /* glr.c:816  */
+#line 3093 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 265:
-#line 842 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 266:
+#line 833 "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 3014 "src/parser_proc.c" /* glr.c:816  */
-    break;
-
-  case 268:
-#line 852 "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 3022 "src/parser_proc.c" /* glr.c:816  */
+#line 3103 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 269:
-#line 855 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 843 "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 3030 "src/parser_proc.c" /* glr.c:816  */
+#line 3111 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 270:
-#line 861 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 846 "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 3038 "src/parser_proc.c" /* glr.c:816  */
+#line 3119 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 271:
-#line 864 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 852 "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 3046 "src/parser_proc.c" /* glr.c:816  */
+#line 3127 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 272:
-#line 867 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 855 "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)));
+       (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3054 "src/parser_proc.c" /* glr.c:816  */
+#line 3135 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 283:
-#line 889 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 273:
+#line 858 "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)));
+       (*(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 3062 "src/parser_proc.c" /* glr.c:816  */
+#line 3143 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 284:
-#line 892 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 880 "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 3070 "src/parser_proc.c" /* glr.c:816  */
+#line 3151 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 285:
-#line 895 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 883 "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)));
+       (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3078 "src/parser_proc.c" /* glr.c:816  */
+#line 3159 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 286:
-#line 901 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 886 "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)));
+       (*(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 3086 "src/parser_proc.c" /* glr.c:816  */
+#line 3167 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 287:
-#line 904 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 892 "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 3094 "src/parser_proc.c" /* glr.c:816  */
+#line 3175 "src/parser_proc.c" /* glr.c:816  */
     break;
 
   case 288:
-#line 907 "src/parser_proc_grammar.y" /* glr.c:816  */
+#line 895 "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 3183 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 289:
+#line 898 "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)));
@@ -3103,11 +3192,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 3107 "src/parser_proc.c" /* glr.c:816  */
+#line 3196 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 289:
-#line 915 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 290:
+#line 906 "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)));
@@ -3117,27 +3206,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 3121 "src/parser_proc.c" /* glr.c:816  */
+#line 3210 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 290:
-#line 927 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 291:
+#line 918 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3129 "src/parser_proc.c" /* glr.c:816  */
+#line 3218 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 291:
-#line 930 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 292:
+#line 921 "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 3137 "src/parser_proc.c" /* glr.c:816  */
+#line 3226 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 292:
-#line 933 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 293:
+#line 924 "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)));
@@ -3145,19 +3234,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 3149 "src/parser_proc.c" /* glr.c:816  */
+#line 3238 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 293:
-#line 940 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 294:
+#line 931 "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 3157 "src/parser_proc.c" /* glr.c:816  */
+#line 3246 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 294:
-#line 943 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 295:
+#line 934 "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)));
@@ -3165,43 +3254,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 3169 "src/parser_proc.c" /* glr.c:816  */
+#line 3258 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 295:
-#line 953 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 296:
+#line 944 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3177 "src/parser_proc.c" /* glr.c:816  */
+#line 3266 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 297:
-#line 959 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 298:
+#line 950 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3185 "src/parser_proc.c" /* glr.c:816  */
+#line 3274 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 300:
-#line 967 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 301:
+#line 958 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3193 "src/parser_proc.c" /* glr.c:816  */
+#line 3282 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 301:
-#line 970 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 302:
+#line 961 "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 3201 "src/parser_proc.c" /* glr.c:816  */
+#line 3290 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 302:
-#line 973 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 303:
+#line 964 "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)));
@@ -3210,68 +3299,68 @@ 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 3214 "src/parser_proc.c" /* glr.c:816  */
+#line 3303 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 303:
-#line 984 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 304:
+#line 975 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3222 "src/parser_proc.c" /* glr.c:816  */
+#line 3311 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 304:
-#line 987 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 305:
+#line 978 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 3230 "src/parser_proc.c" /* glr.c:816  */
+#line 3319 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 310:
-#line 1007 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 311:
+#line 998 "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 3238 "src/parser_proc.c" /* glr.c:816  */
+#line 3327 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 312:
-#line 1014 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 313:
+#line 1005 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3246 "src/parser_proc.c" /* glr.c:816  */
+#line 3335 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 313:
-#line 1020 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 314:
+#line 1011 "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 3254 "src/parser_proc.c" /* glr.c:816  */
+#line 3343 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 314:
-#line 1023 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 315:
+#line 1014 "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 3262 "src/parser_proc.c" /* glr.c:816  */
+#line 3351 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 316:
-#line 1030 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 317:
+#line 1021 "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 3271 "src/parser_proc.c" /* glr.c:816  */
+#line 3360 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 319:
-#line 1042 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 320:
+#line 1033 "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))) {
@@ -3279,11 +3368,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 3283 "src/parser_proc.c" /* glr.c:816  */
+#line 3372 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 320:
-#line 1049 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 321:
+#line 1040 "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;
@@ -3292,11 +3381,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 3296 "src/parser_proc.c" /* glr.c:816  */
+#line 3385 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 321:
-#line 1060 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 322:
+#line 1051 "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))) {
@@ -3304,11 +3393,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 3308 "src/parser_proc.c" /* glr.c:816  */
+#line 3397 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 322:
-#line 1067 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 323:
+#line 1058 "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;
@@ -3317,11 +3406,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 3321 "src/parser_proc.c" /* glr.c:816  */
+#line 3410 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 323:
-#line 1078 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 324:
+#line 1069 "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;
@@ -3329,11 +3418,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 3333 "src/parser_proc.c" /* glr.c:816  */
+#line 3422 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 324:
-#line 1085 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 325:
+#line 1076 "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;
@@ -3345,11 +3434,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 3349 "src/parser_proc.c" /* glr.c:816  */
+#line 3438 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 325:
-#line 1096 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 326:
+#line 1087 "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;
@@ -3361,11 +3450,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 3365 "src/parser_proc.c" /* glr.c:816  */
+#line 3454 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 326:
-#line 1107 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 327:
+#line 1098 "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;
@@ -3377,11 +3466,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 3381 "src/parser_proc.c" /* glr.c:816  */
+#line 3470 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 328:
-#line 1122 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 329:
+#line 1113 "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),
@@ -3391,62 +3480,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 3395 "src/parser_proc.c" /* glr.c:816  */
+#line 3484 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 329:
-#line 1134 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 330:
+#line 1125 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3403 "src/parser_proc.c" /* glr.c:816  */
+#line 3492 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 330:
-#line 1137 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 331:
+#line 1128 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3411 "src/parser_proc.c" /* glr.c:816  */
+#line 3500 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 331:
-#line 1140 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 332:
+#line 1131 "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 3419 "src/parser_proc.c" /* glr.c:816  */
+#line 3508 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 332:
-#line 1143 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 333:
+#line 1134 "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 3427 "src/parser_proc.c" /* glr.c:816  */
+#line 3516 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 333:
-#line 1150 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 334:
+#line 1141 "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 3435 "src/parser_proc.c" /* glr.c:816  */
+#line 3524 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 334:
-#line 1153 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 335:
+#line 1144 "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 3446 "src/parser_proc.c" /* glr.c:816  */
+#line 3535 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 335:
-#line 1159 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 336:
+#line 1150 "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),
@@ -3456,11 +3545,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 3460 "src/parser_proc.c" /* glr.c:816  */
+#line 3549 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 336:
-#line 1168 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 337:
+#line 1159 "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),
@@ -3470,11 +3559,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 3474 "src/parser_proc.c" /* glr.c:816  */
+#line 3563 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 337:
-#line 1180 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 338:
+#line 1171 "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),
@@ -3483,19 +3572,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 3487 "src/parser_proc.c" /* glr.c:816  */
+#line 3576 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 338:
-#line 1188 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 339:
+#line 1179 "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 3495 "src/parser_proc.c" /* glr.c:816  */
+#line 3584 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 339:
-#line 1191 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 340:
+#line 1182 "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(
@@ -3506,11 +3595,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 3510 "src/parser_proc.c" /* glr.c:816  */
+#line 3599 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 340:
-#line 1201 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 341:
+#line 1192 "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(
@@ -3521,31 +3610,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 3525 "src/parser_proc.c" /* glr.c:816  */
+#line 3614 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 341:
-#line 1214 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 342:
+#line 1205 "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 3535 "src/parser_proc.c" /* glr.c:816  */
+#line 3624 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 342:
-#line 1219 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 343:
+#line 1210 "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 3545 "src/parser_proc.c" /* glr.c:816  */
+#line 3634 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 343:
-#line 1227 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 344:
+#line 1218 "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)));
@@ -3553,11 +3642,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 3557 "src/parser_proc.c" /* glr.c:816  */
+#line 3646 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 344:
-#line 1237 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 345:
+#line 1228 "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)));
@@ -3565,27 +3654,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 3569 "src/parser_proc.c" /* glr.c:816  */
+#line 3658 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 345:
-#line 1247 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 346:
+#line 1238 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3577 "src/parser_proc.c" /* glr.c:816  */
+#line 3666 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 347:
-#line 1254 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 348:
+#line 1245 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3585 "src/parser_proc.c" /* glr.c:816  */
+#line 3674 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 348:
-#line 1260 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 349:
+#line 1251 "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)));
@@ -3600,11 +3689,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3604 "src/parser_proc.c" /* glr.c:816  */
+#line 3693 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 349:
-#line 1274 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 350:
+#line 1265 "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)));
@@ -3619,27 +3708,27 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 3623 "src/parser_proc.c" /* glr.c:816  */
+#line 3712 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 350:
-#line 1291 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 351:
+#line 1282 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3631 "src/parser_proc.c" /* glr.c:816  */
+#line 3720 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 351:
-#line 1294 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 352:
+#line 1285 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3639 "src/parser_proc.c" /* glr.c:816  */
+#line 3728 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 352:
-#line 1300 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 353:
+#line 1291 "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)));
@@ -3647,11 +3736,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 3651 "src/parser_proc.c" /* glr.c:816  */
+#line 3740 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 353:
-#line 1307 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 354:
+#line 1298 "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)));
@@ -3659,146 +3748,146 @@ 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 3663 "src/parser_proc.c" /* glr.c:816  */
+#line 3752 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 354:
-#line 1317 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 355:
+#line 1308 "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 3672 "src/parser_proc.c" /* glr.c:816  */
+#line 3761 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 355:
-#line 1324 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 356:
+#line 1315 "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 3680 "src/parser_proc.c" /* glr.c:816  */
+#line 3769 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 356:
-#line 1327 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 357:
+#line 1318 "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 3688 "src/parser_proc.c" /* glr.c:816  */
+#line 3777 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 357:
-#line 1333 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 358:
+#line 1324 "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 3698 "src/parser_proc.c" /* glr.c:816  */
+#line 3787 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 358:
-#line 1338 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 359:
+#line 1329 "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 3708 "src/parser_proc.c" /* glr.c:816  */
+#line 3797 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 359:
-#line 1346 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 360:
+#line 1337 "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 3717 "src/parser_proc.c" /* glr.c:816  */
+#line 3806 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 360:
-#line 1350 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 361:
+#line 1341 "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 3726 "src/parser_proc.c" /* glr.c:816  */
+#line 3815 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 361:
-#line 1354 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 362:
+#line 1345 "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 3735 "src/parser_proc.c" /* glr.c:816  */
+#line 3824 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 362:
-#line 1358 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 363:
+#line 1349 "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 3744 "src/parser_proc.c" /* glr.c:816  */
+#line 3833 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 363:
-#line 1362 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 364:
+#line 1353 "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 3753 "src/parser_proc.c" /* glr.c:816  */
+#line 3842 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 364:
-#line 1366 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 365:
+#line 1357 "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 3762 "src/parser_proc.c" /* glr.c:816  */
+#line 3851 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 365:
-#line 1373 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 366:
+#line 1364 "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 3771 "src/parser_proc.c" /* glr.c:816  */
+#line 3860 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 366:
-#line 1377 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 367:
+#line 1368 "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 3780 "src/parser_proc.c" /* glr.c:816  */
+#line 3869 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 367:
-#line 1381 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 368:
+#line 1372 "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 3789 "src/parser_proc.c" /* glr.c:816  */
+#line 3878 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 368:
-#line 1385 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 369:
+#line 1376 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_NAME, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), 0);
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
 }
-#line 3798 "src/parser_proc.c" /* glr.c:816  */
+#line 3887 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 369:
-#line 1392 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 370:
+#line 1383 "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)));
@@ -3809,11 +3898,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 3813 "src/parser_proc.c" /* glr.c:816  */
+#line 3902 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 370:
-#line 1405 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 371:
+#line 1396 "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)));
@@ -3824,11 +3913,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 3828 "src/parser_proc.c" /* glr.c:816  */
+#line 3917 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 371:
-#line 1418 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 372:
+#line 1409 "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)));
@@ -3839,171 +3928,171 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_append("@", psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 1, digest);
        }
 }
-#line 3843 "src/parser_proc.c" /* glr.c:816  */
+#line 3932 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 372:
-#line 1431 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 373:
+#line 1422 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3851 "src/parser_proc.c" /* glr.c:816  */
+#line 3940 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 373:
-#line 1434 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 374:
+#line 1425 "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 3860 "src/parser_proc.c" /* glr.c:816  */
+#line 3949 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 374:
-#line 1441 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 375:
+#line 1432 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = NULL;
 }
-#line 3868 "src/parser_proc.c" /* glr.c:816  */
+#line 3957 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 375:
-#line 1444 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 376:
+#line 1435 "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 3876 "src/parser_proc.c" /* glr.c:816  */
+#line 3965 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 376:
-#line 1447 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 377:
+#line 1438 "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 3884 "src/parser_proc.c" /* glr.c:816  */
+#line 3973 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 377:
-#line 1450 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 378:
+#line 1441 "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 3892 "src/parser_proc.c" /* glr.c:816  */
+#line 3981 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 378:
-#line 1456 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 379:
+#line 1447 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout*)(&(*yyvalp))).pos = 0;
        (*(struct psi_layout*)(&(*yyvalp))).len = 0;
 }
-#line 3901 "src/parser_proc.c" /* glr.c:816  */
+#line 3990 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 379:
-#line 1460 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 380:
+#line 1451 "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 3910 "src/parser_proc.c" /* glr.c:816  */
+#line 3999 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 380:
-#line 1467 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 381:
+#line 1458 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 3918 "src/parser_proc.c" /* glr.c:816  */
+#line 4007 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 381:
-#line 1470 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 382:
+#line 1461 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = atol((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text);
 }
-#line 3926 "src/parser_proc.c" /* glr.c:816  */
+#line 4015 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 382:
-#line 1476 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 383:
+#line 1467 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 3934 "src/parser_proc.c" /* glr.c:816  */
+#line 4023 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 383:
-#line 1479 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 384:
+#line 1470 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3942 "src/parser_proc.c" /* glr.c:816  */
+#line 4031 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 385:
-#line 1486 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 386:
+#line 1477 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3950 "src/parser_proc.c" /* glr.c:816  */
+#line 4039 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 386:
-#line 1492 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 387:
+#line 1483 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 1;
 }
-#line 3958 "src/parser_proc.c" /* glr.c:816  */
+#line 4047 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 387:
-#line 1495 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 388:
+#line 1486 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)) + 1;
 }
-#line 3966 "src/parser_proc.c" /* glr.c:816  */
+#line 4055 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 388:
-#line 1507 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 389:
+#line 1498 "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 3974 "src/parser_proc.c" /* glr.c:816  */
+#line 4063 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 389:
-#line 1510 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 390:
+#line 1501 "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 3983 "src/parser_proc.c" /* glr.c:816  */
+#line 4072 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 390:
-#line 1517 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 391:
+#line 1508 "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 3993 "src/parser_proc.c" /* glr.c:816  */
+#line 4082 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 391:
-#line 1522 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 392:
+#line 1513 "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 4003 "src/parser_proc.c" /* glr.c:816  */
+#line 4092 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 392:
-#line 1527 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 393:
+#line 1518 "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)));
@@ -4011,470 +4100,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 4015 "src/parser_proc.c" /* glr.c:816  */
+#line 4104 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 393:
-#line 1537 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 394:
+#line 1528 "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 4023 "src/parser_proc.c" /* glr.c:816  */
+#line 4112 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 394:
-#line 1540 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 395:
+#line 1531 "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 4031 "src/parser_proc.c" /* glr.c:816  */
+#line 4120 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 395:
-#line 1546 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 396:
+#line 1537 "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 4039 "src/parser_proc.c" /* glr.c:816  */
+#line 4128 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 396:
-#line 1549 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 397:
+#line 1540 "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 4047 "src/parser_proc.c" /* glr.c:816  */
+#line 4136 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 397:
-#line 1555 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 398:
+#line 1546 "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 4056 "src/parser_proc.c" /* glr.c:816  */
+#line 4145 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 398:
-#line 1562 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 399:
+#line 1553 "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 4065 "src/parser_proc.c" /* glr.c:816  */
+#line 4154 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 408:
-#line 1581 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 409:
+#line 1572 "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 4073 "src/parser_proc.c" /* glr.c:816  */
+#line 4162 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 409:
-#line 1584 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 410:
+#line 1575 "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 4081 "src/parser_proc.c" /* glr.c:816  */
+#line 4170 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 410:
-#line 1590 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 411:
+#line 1581 "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 4089 "src/parser_proc.c" /* glr.c:816  */
+#line 4178 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 411:
-#line 1593 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 412:
+#line 1584 "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 4097 "src/parser_proc.c" /* glr.c:816  */
+#line 4186 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 412:
-#line 1596 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 413:
+#line 1587 "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 4105 "src/parser_proc.c" /* glr.c:816  */
+#line 4194 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 413:
-#line 1599 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 414:
+#line 1590 "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 4113 "src/parser_proc.c" /* glr.c:816  */
+#line 4202 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 414:
-#line 1602 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 415:
+#line 1593 "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 4121 "src/parser_proc.c" /* glr.c:816  */
+#line 4210 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 415:
-#line 1608 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 416:
+#line 1599 "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 4130 "src/parser_proc.c" /* glr.c:816  */
+#line 4219 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 416:
-#line 1612 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 417:
+#line 1603 "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 4140 "src/parser_proc.c" /* glr.c:816  */
+#line 4229 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 418:
-#line 1621 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 419:
+#line 1612 "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 4149 "src/parser_proc.c" /* glr.c:816  */
+#line 4238 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 419:
-#line 1625 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 420:
+#line 1616 "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 4158 "src/parser_proc.c" /* glr.c:816  */
+#line 4247 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 420:
-#line 1632 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 421:
+#line 1623 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_NULL, NULL);
 }
-#line 4166 "src/parser_proc.c" /* glr.c:816  */
+#line 4255 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 421:
-#line 1635 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 422:
+#line 1626 "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 4174 "src/parser_proc.c" /* glr.c:816  */
+#line 4263 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 422:
-#line 1638 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 423:
+#line 1629 "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 4183 "src/parser_proc.c" /* glr.c:816  */
+#line 4272 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 423:
-#line 1642 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 424:
+#line 1633 "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 4191 "src/parser_proc.c" /* glr.c:816  */
+#line 4280 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 424:
-#line 1645 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 425:
+#line 1636 "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 4199 "src/parser_proc.c" /* glr.c:816  */
+#line 4288 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 425:
-#line 1648 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 426:
+#line 1639 "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 4207 "src/parser_proc.c" /* glr.c:816  */
+#line 4296 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 426:
-#line 1654 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 427:
+#line 1645 "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 4216 "src/parser_proc.c" /* glr.c:816  */
+#line 4305 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 427:
-#line 1658 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 428:
+#line 1649 "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 4226 "src/parser_proc.c" /* glr.c:816  */
+#line 4315 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 428:
-#line 1666 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 429:
+#line 1657 "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 4235 "src/parser_proc.c" /* glr.c:816  */
+#line 4324 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 429:
-#line 1673 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 430:
+#line 1664 "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 4245 "src/parser_proc.c" /* glr.c:816  */
+#line 4334 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 430:
-#line 1681 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 431:
+#line 1672 "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 4255 "src/parser_proc.c" /* glr.c:816  */
+#line 4344 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 441:
-#line 1702 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 442:
+#line 1693 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4263 "src/parser_proc.c" /* glr.c:816  */
+#line 4352 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 442:
-#line 1705 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 443:
+#line 1696 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4271 "src/parser_proc.c" /* glr.c:816  */
+#line 4360 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 443:
-#line 1711 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 444:
+#line 1702 "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 4279 "src/parser_proc.c" /* glr.c:816  */
+#line 4368 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 444:
-#line 1714 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 445:
+#line 1705 "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 4287 "src/parser_proc.c" /* glr.c:816  */
+#line 4376 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 447:
-#line 1725 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 448:
+#line 1716 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4295 "src/parser_proc.c" /* glr.c:816  */
+#line 4384 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 448:
-#line 1728 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 449:
+#line 1719 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4303 "src/parser_proc.c" /* glr.c:816  */
+#line 4392 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 449:
-#line 1734 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 450:
+#line 1725 "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 4311 "src/parser_proc.c" /* glr.c:816  */
+#line 4400 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 450:
-#line 1737 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 451:
+#line 1728 "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 4319 "src/parser_proc.c" /* glr.c:816  */
+#line 4408 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 451:
-#line 1743 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 452:
+#line 1734 "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 4328 "src/parser_proc.c" /* glr.c:816  */
+#line 4417 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 452:
-#line 1750 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 453:
+#line 1741 "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 4337 "src/parser_proc.c" /* glr.c:816  */
+#line 4426 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 453:
-#line 1757 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 454:
+#line 1748 "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 4345 "src/parser_proc.c" /* glr.c:816  */
+#line 4434 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 454:
-#line 1760 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 455:
+#line 1751 "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 4353 "src/parser_proc.c" /* glr.c:816  */
+#line 4442 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 455:
-#line 1763 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 456:
+#line 1754 "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 4362 "src/parser_proc.c" /* glr.c:816  */
+#line 4451 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 456:
-#line 1770 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 457:
+#line 1761 "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 4372 "src/parser_proc.c" /* glr.c:816  */
+#line 4461 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 457:
-#line 1775 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 458:
+#line 1766 "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 4382 "src/parser_proc.c" /* glr.c:816  */
+#line 4471 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 466:
-#line 1794 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 467:
+#line 1785 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 4390 "src/parser_proc.c" /* glr.c:816  */
+#line 4479 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 467:
-#line 1797 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 468:
+#line 1788 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 4398 "src/parser_proc.c" /* glr.c:816  */
+#line 4487 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 468:
-#line 1803 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 469:
+#line 1794 "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 4406 "src/parser_proc.c" /* glr.c:816  */
+#line 4495 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 469:
-#line 1806 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 470:
+#line 1797 "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 4414 "src/parser_proc.c" /* glr.c:816  */
+#line 4503 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 470:
-#line 1812 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 471:
+#line 1803 "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 4423 "src/parser_proc.c" /* glr.c:816  */
+#line 4512 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 473:
-#line 1824 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 474:
+#line 1815 "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 4432 "src/parser_proc.c" /* glr.c:816  */
+#line 4521 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 474:
-#line 1831 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 475:
+#line 1822 "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 4440 "src/parser_proc.c" /* glr.c:816  */
+#line 4529 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 475:
-#line 1834 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 476:
+#line 1825 "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 4448 "src/parser_proc.c" /* glr.c:816  */
+#line 4537 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 476:
-#line 1840 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 477:
+#line 1831 "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 4458 "src/parser_proc.c" /* glr.c:816  */
+#line 4547 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 477:
-#line 1848 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 478:
+#line 1839 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = false;
 }
-#line 4466 "src/parser_proc.c" /* glr.c:816  */
+#line 4555 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 478:
-#line 1851 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 479:
+#line 1842 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = true;
 }
-#line 4474 "src/parser_proc.c" /* glr.c:816  */
+#line 4563 "src/parser_proc.c" /* glr.c:816  */
     break;
 
 
-#line 4478 "src/parser_proc.c" /* glr.c:816  */
+#line 4567 "src/parser_proc.c" /* glr.c:816  */
       default: break;
     }
 
@@ -4523,669 +4612,669 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct psi_parser
   switch (yytype)
     {
           case 133: /* binary_op_token  */
-#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4529 "src/parser_proc.c" /* glr.c:846  */
+#line 4618 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 134: /* unary_op_token  */
-#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4535 "src/parser_proc.c" /* glr.c:846  */
+#line 4624 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 135: /* name_token  */
-#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4541 "src/parser_proc.c" /* glr.c:846  */
+#line 4630 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 136: /* any_noeol_token  */
-#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 258 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4547 "src/parser_proc.c" /* glr.c:846  */
+#line 4636 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 140: /* lib  */
-#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 252 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4553 "src/parser_proc.c" /* glr.c:846  */
+#line 4642 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 141: /* cpp  */
-#line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 267 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 4559 "src/parser_proc.c" /* glr.c:846  */
+#line 4648 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 142: /* cpp_exp  */
-#line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 267 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 4565 "src/parser_proc.c" /* glr.c:846  */
+#line 4654 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 144: /* cpp_message_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4571 "src/parser_proc.c" /* glr.c:846  */
+#line 4660 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 145: /* cpp_include_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4577 "src/parser_proc.c" /* glr.c:846  */
+#line 4666 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 146: /* cpp_header_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4583 "src/parser_proc.c" /* glr.c:846  */
+#line 4672 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 147: /* cpp_no_arg_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4589 "src/parser_proc.c" /* glr.c:846  */
+#line 4678 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 148: /* cpp_name_arg_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4595 "src/parser_proc.c" /* glr.c:846  */
+#line 4684 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 149: /* cpp_exp_arg_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4601 "src/parser_proc.c" /* glr.c:846  */
+#line 4690 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 150: /* cpp_special_name_token  */
-#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 255 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4607 "src/parser_proc.c" /* glr.c:846  */
+#line 4696 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 151: /* cpp_macro_decl  */
-#line 287 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 269 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_macro_decl_free(&(*(struct psi_cpp_macro_decl **)(&(*yyvaluep))));}
-#line 4613 "src/parser_proc.c" /* glr.c:846  */
+#line 4702 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 152: /* cpp_macro_sig  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4619 "src/parser_proc.c" /* glr.c:846  */
+#line 4708 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 153: /* cpp_macro_sig_args  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4625 "src/parser_proc.c" /* glr.c:846  */
+#line 4714 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 154: /* cpp_macro_decl_tokens  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4631 "src/parser_proc.c" /* glr.c:846  */
+#line 4720 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 155: /* cpp_macro_decl_token_list  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4637 "src/parser_proc.c" /* glr.c:846  */
+#line 4726 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 156: /* cpp_macro_exp  */
-#line 291 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 273 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 4643 "src/parser_proc.c" /* glr.c:846  */
+#line 4732 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 157: /* cpp_macro_call_args  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4649 "src/parser_proc.c" /* glr.c:846  */
+#line 4738 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 158: /* cpp_macro_call_arg_list  */
-#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4655 "src/parser_proc.c" /* glr.c:846  */
+#line 4744 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 159: /* constant  */
-#line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 279 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_free(&(*(struct psi_const **)(&(*yyvaluep))));}
-#line 4661 "src/parser_proc.c" /* glr.c:846  */
+#line 4750 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 160: /* constant_type  */
-#line 299 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 281 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_type_free(&(*(struct psi_const_type **)(&(*yyvaluep))));}
-#line 4667 "src/parser_proc.c" /* glr.c:846  */
+#line 4756 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 161: /* constant_type_token  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4673 "src/parser_proc.c" /* glr.c:846  */
+#line 4762 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 162: /* impl_def_val  */
-#line 301 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_def_val_free(&(*(struct psi_impl_def_val **)(&(*yyvaluep))));}
-#line 4679 "src/parser_proc.c" /* glr.c:846  */
+#line 4768 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 163: /* impl_def_val_token  */
-#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 276 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4685 "src/parser_proc.c" /* glr.c:846  */
+#line 4774 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 164: /* decl_typedef  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4691 "src/parser_proc.c" /* glr.c:846  */
+#line 4780 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 165: /* typedef  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4697 "src/parser_proc.c" /* glr.c:846  */
+#line 4786 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 166: /* const_decl_type  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 4703 "src/parser_proc.c" /* glr.c:846  */
+#line 4792 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 167: /* decl_type  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 4709 "src/parser_proc.c" /* glr.c:846  */
+#line 4798 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 168: /* decl_type_complex  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 4715 "src/parser_proc.c" /* glr.c:846  */
+#line 4804 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 169: /* decl_type_simple  */
-#line 304 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4721 "src/parser_proc.c" /* glr.c:846  */
+#line 4810 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 170: /* decl_real_type  */
-#line 304 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4727 "src/parser_proc.c" /* glr.c:846  */
+#line 4816 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 171: /* decl_stdint_type  */
-#line 307 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 289 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4733 "src/parser_proc.c" /* glr.c:846  */
+#line 4822 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 172: /* int_signed  */
-#line 282 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 264 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4739 "src/parser_proc.c" /* glr.c:846  */
+#line 4828 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 173: /* int_width  */
-#line 279 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4745 "src/parser_proc.c" /* glr.c:846  */
+#line 4834 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 174: /* decl_int_type  */
-#line 304 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4751 "src/parser_proc.c" /* glr.c:846  */
+#line 4840 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 175: /* int_signed_types  */
-#line 279 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4757 "src/parser_proc.c" /* glr.c:846  */
+#line 4846 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 176: /* signed_short_types  */
-#line 282 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 264 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4763 "src/parser_proc.c" /* glr.c:846  */
+#line 4852 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 177: /* signed_long_types  */
-#line 282 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 264 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4769 "src/parser_proc.c" /* glr.c:846  */
+#line 4858 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 178: /* int_width_types  */
-#line 279 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 261 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4775 "src/parser_proc.c" /* glr.c:846  */
+#line 4864 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 179: /* decl_stmt  */
-#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4781 "src/parser_proc.c" /* glr.c:846  */
+#line 4870 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 185: /* decl_vars  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4787 "src/parser_proc.c" /* glr.c:846  */
+#line 4876 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 186: /* decl  */
-#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4793 "src/parser_proc.c" /* glr.c:846  */
+#line 4882 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 187: /* decl_body  */
-#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4799 "src/parser_proc.c" /* glr.c:846  */
+#line 4888 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 188: /* decl_func_body  */
-#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4805 "src/parser_proc.c" /* glr.c:846  */
+#line 4894 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 189: /* decl_functor_body  */
-#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 294 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4811 "src/parser_proc.c" /* glr.c:846  */
+#line 4900 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 190: /* decl_functor  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4817 "src/parser_proc.c" /* glr.c:846  */
+#line 4906 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 191: /* decl_func  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4823 "src/parser_proc.c" /* glr.c:846  */
+#line 4912 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 192: /* decl_args  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4829 "src/parser_proc.c" /* glr.c:846  */
+#line 4918 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 193: /* decl_anon_arg  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4835 "src/parser_proc.c" /* glr.c:846  */
+#line 4924 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 194: /* decl_arg  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 296 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4841 "src/parser_proc.c" /* glr.c:846  */
+#line 4930 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 195: /* decl_var  */
-#line 316 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_var_free(&(*(struct psi_decl_var **)(&(*yyvaluep))));}
-#line 4847 "src/parser_proc.c" /* glr.c:846  */
+#line 4936 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 196: /* decl_union  */
-#line 320 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 302 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_union_free(&(*(struct psi_decl_union **)(&(*yyvaluep))));}
-#line 4853 "src/parser_proc.c" /* glr.c:846  */
+#line 4942 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 197: /* decl_struct  */
-#line 318 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_struct_free(&(*(struct psi_decl_struct **)(&(*yyvaluep))));}
-#line 4859 "src/parser_proc.c" /* glr.c:846  */
+#line 4948 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 198: /* decl_struct_args  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4865 "src/parser_proc.c" /* glr.c:846  */
+#line 4954 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 199: /* struct_args_block  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4871 "src/parser_proc.c" /* glr.c:846  */
+#line 4960 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 200: /* struct_args  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4877 "src/parser_proc.c" /* glr.c:846  */
+#line 4966 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 201: /* struct_arg_var_list  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4883 "src/parser_proc.c" /* glr.c:846  */
+#line 4972 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 202: /* decl_vars_with_layout  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4889 "src/parser_proc.c" /* glr.c:846  */
+#line 4978 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 203: /* decl_enum  */
-#line 322 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 304 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_free(&(*(struct psi_decl_enum **)(&(*yyvaluep))));}
-#line 4895 "src/parser_proc.c" /* glr.c:846  */
+#line 4984 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 204: /* decl_enum_items  */
-#line 326 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4901 "src/parser_proc.c" /* glr.c:846  */
+#line 4990 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 205: /* decl_enum_item  */
-#line 324 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 306 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_item_free(&(*(struct psi_decl_enum_item **)(&(*yyvaluep))));}
-#line 4907 "src/parser_proc.c" /* glr.c:846  */
+#line 4996 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 206: /* num_exp  */
-#line 377 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 4913 "src/parser_proc.c" /* glr.c:846  */
+#line 5002 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 207: /* number  */
-#line 379 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 361 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 4919 "src/parser_proc.c" /* glr.c:846  */
+#line 5008 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 208: /* enum_name  */
-#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 252 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4925 "src/parser_proc.c" /* glr.c:846  */
+#line 5014 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 209: /* union_name  */
-#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 252 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4931 "src/parser_proc.c" /* glr.c:846  */
+#line 5020 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 210: /* struct_name  */
-#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 252 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4937 "src/parser_proc.c" /* glr.c:846  */
+#line 5026 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 211: /* optional_name  */
-#line 270 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 252 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4943 "src/parser_proc.c" /* glr.c:846  */
+#line 5032 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 212: /* decl_layout  */
-#line 331 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_layout_free(&(*(struct psi_layout **)(&(*yyvaluep))));}
-#line 4949 "src/parser_proc.c" /* glr.c:846  */
+#line 5038 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 213: /* align_and_size  */
-#line 329 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4955 "src/parser_proc.c" /* glr.c:846  */
+#line 5044 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 214: /* array_size  */
-#line 382 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4961 "src/parser_proc.c" /* glr.c:846  */
+#line 5050 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 215: /* indirection  */
-#line 382 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4967 "src/parser_proc.c" /* glr.c:846  */
+#line 5056 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 216: /* pointers  */
-#line 382 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4973 "src/parser_proc.c" /* glr.c:846  */
+#line 5062 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 217: /* asterisks  */
-#line 382 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4979 "src/parser_proc.c" /* glr.c:846  */
+#line 5068 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 218: /* impl  */
-#line 334 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 316 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_free(&(*(struct psi_impl **)(&(*yyvaluep))));}
-#line 4985 "src/parser_proc.c" /* glr.c:846  */
+#line 5074 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 219: /* impl_func  */
-#line 336 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 318 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_func_free(&(*(struct psi_impl_func **)(&(*yyvaluep))));}
-#line 4991 "src/parser_proc.c" /* glr.c:846  */
+#line 5080 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 220: /* impl_args  */
-#line 374 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4997 "src/parser_proc.c" /* glr.c:846  */
+#line 5086 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 221: /* impl_arg  */
-#line 338 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 320 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_arg_free(&(*(struct psi_impl_arg **)(&(*yyvaluep))));}
-#line 5003 "src/parser_proc.c" /* glr.c:846  */
+#line 5092 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 222: /* impl_var  */
-#line 342 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 324 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_var_free(&(*(struct psi_impl_var **)(&(*yyvaluep))));}
-#line 5009 "src/parser_proc.c" /* glr.c:846  */
+#line 5098 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 223: /* impl_type  */
-#line 340 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 322 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_type_free(&(*(struct psi_impl_type **)(&(*yyvaluep))));}
-#line 5015 "src/parser_proc.c" /* glr.c:846  */
+#line 5104 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 224: /* impl_type_token  */
-#line 372 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5021 "src/parser_proc.c" /* glr.c:846  */
+#line 5110 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 225: /* impl_stmts  */
-#line 374 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5027 "src/parser_proc.c" /* glr.c:846  */
+#line 5116 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 226: /* impl_stmt  */
-#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 352 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_stmt_free(&(*(struct psi_token ***)(&(*yyvaluep))));}
-#line 5033 "src/parser_proc.c" /* glr.c:846  */
+#line 5122 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 227: /* let_stmt  */
-#line 345 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_stmt_free(&(*(struct psi_let_stmt **)(&(*yyvaluep))));}
-#line 5039 "src/parser_proc.c" /* glr.c:846  */
+#line 5128 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 228: /* let_exp  */
-#line 347 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 329 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5045 "src/parser_proc.c" /* glr.c:846  */
+#line 5134 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 229: /* let_exp_byref  */
-#line 347 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 329 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5051 "src/parser_proc.c" /* glr.c:846  */
+#line 5140 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 230: /* let_exp_assign  */
-#line 347 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 329 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 5057 "src/parser_proc.c" /* glr.c:846  */
+#line 5146 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 231: /* let_calloc  */
-#line 349 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 331 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_calloc_free(&(*(struct psi_let_calloc **)(&(*yyvaluep))));}
-#line 5063 "src/parser_proc.c" /* glr.c:846  */
+#line 5152 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 232: /* let_callback  */
-#line 351 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 333 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_callback_free(&(*(struct psi_let_callback **)(&(*yyvaluep))));}
-#line 5069 "src/parser_proc.c" /* glr.c:846  */
+#line 5158 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 233: /* let_func  */
-#line 353 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 335 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_func_free(&(*(struct psi_let_func **)(&(*yyvaluep))));}
-#line 5075 "src/parser_proc.c" /* glr.c:846  */
+#line 5164 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 234: /* let_func_token  */
-#line 372 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5081 "src/parser_proc.c" /* glr.c:846  */
+#line 5170 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 235: /* let_func_exps  */
-#line 374 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5087 "src/parser_proc.c" /* glr.c:846  */
+#line 5176 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 236: /* let_exps  */
-#line 374 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5093 "src/parser_proc.c" /* glr.c:846  */
+#line 5182 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 237: /* callback_rval  */
-#line 372 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5099 "src/parser_proc.c" /* glr.c:846  */
+#line 5188 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 238: /* callback_arg_list  */
-#line 374 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5105 "src/parser_proc.c" /* glr.c:846  */
+#line 5194 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 239: /* callback_args  */
-#line 374 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5111 "src/parser_proc.c" /* glr.c:846  */
+#line 5200 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 240: /* return_stmt  */
-#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 345 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_return_stmt_free(&(*(struct psi_return_stmt **)(&(*yyvaluep))));}
-#line 5117 "src/parser_proc.c" /* glr.c:846  */
+#line 5206 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 241: /* set_stmt  */
-#line 355 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 337 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_stmt_free(&(*(struct psi_set_stmt **)(&(*yyvaluep))));}
-#line 5123 "src/parser_proc.c" /* glr.c:846  */
+#line 5212 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 242: /* set_exp  */
-#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 339 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_exp_free(&(*(struct psi_set_exp **)(&(*yyvaluep))));}
-#line 5129 "src/parser_proc.c" /* glr.c:846  */
+#line 5218 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 243: /* set_func  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 341 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_func_free(&(*(struct psi_set_func **)(&(*yyvaluep))));}
-#line 5135 "src/parser_proc.c" /* glr.c:846  */
+#line 5224 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 244: /* set_func_token  */
-#line 372 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5141 "src/parser_proc.c" /* glr.c:846  */
+#line 5230 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 245: /* set_func_exps  */
-#line 374 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5147 "src/parser_proc.c" /* glr.c:846  */
+#line 5236 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 246: /* set_exps  */
-#line 374 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5153 "src/parser_proc.c" /* glr.c:846  */
+#line 5242 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 247: /* assert_stmt  */
-#line 361 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 343 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_assert_stmt_free(&(*(struct psi_assert_stmt **)(&(*yyvaluep))));}
-#line 5159 "src/parser_proc.c" /* glr.c:846  */
+#line 5248 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 248: /* assert_stmt_token  */
-#line 372 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 5165 "src/parser_proc.c" /* glr.c:846  */
+#line 5254 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 249: /* free_stmt  */
-#line 365 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 347 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_stmt_free(&(*(struct psi_free_stmt **)(&(*yyvaluep))));}
-#line 5171 "src/parser_proc.c" /* glr.c:846  */
+#line 5260 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 250: /* free_exps  */
-#line 374 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 5177 "src/parser_proc.c" /* glr.c:846  */
+#line 5266 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 251: /* free_exp  */
-#line 367 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 349 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_exp_free(&(*(struct psi_free_exp **)(&(*yyvaluep))));}
-#line 5183 "src/parser_proc.c" /* glr.c:846  */
+#line 5272 "src/parser_proc.c" /* glr.c:846  */
         break;
 
     case 252: /* reference  */
-#line 384 "src/parser_proc_grammar.y" /* glr.c:846  */
+#line 366 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 5189 "src/parser_proc.c" /* glr.c:846  */
+#line 5278 "src/parser_proc.c" /* glr.c:846  */
         break;
 
 
@@ -6534,11 +6623,11 @@ yyparse (struct psi_parser *P, struct psi_plist *tokens, size_t *index)
   yylval = yyval_default;
 
   /* User initialization code.  */
-  #line 116 "src/parser_proc_grammar.y" /* glr.c:2270  */
+  #line 98 "src/parser_proc_grammar.y" /* glr.c:2270  */
 {
 }
 
-#line 6542 "src/parser_proc.c" /* glr.c:2270  */
+#line 6631 "src/parser_proc.c" /* glr.c:2270  */
 
   if (! yyinitGLRStack (yystackp, YYINITDEPTH))
     goto yyexhaustedlab;
@@ -6844,7 +6933,7 @@ yypdumpstack (yyGLRStack* yystackp)
 #define yydebug psi_parser_proc_debug
 #define yynerrs psi_parser_proc_nerrs
 
-#line 1860 "src/parser_proc_grammar.y" /* glr.c:2584  */
+#line 1851 "src/parser_proc_grammar.y" /* glr.c:2584  */
 
 
 /* epilogue */

diff --git a/src/parser_proc.h b/src/parser_proc.h
index a1e2ddf4b1074b22f5806fdda169fb7b2a7702bc..7a0525b66eb14cfee9b286f2c590f05c7f3829f6 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 92 "src/parser_proc_grammar.y" /* glr.c:197  */
+#line 74 "src/parser_proc_grammar.y" /* glr.c:197  */
 
 #include "plist.h"
 #include "types/layout.h"

diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y
index af5216514061644518283d7f23593199f7dde66e..a4736937ac631c92f4aab9fcec775501e02e7b19 100644 (file)
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -37,24 +37,6 @@ static inline void psi_parser_proc_add_enum(struct psi_parser *P, struct psi_dec
        }
        P->enums = psi_plist_add(P->enums, &e);
 }
-static inline void psi_parser_proc_add_from_typedef(struct psi_parser *P, struct psi_decl_arg *def)
-{
-       if (def->type->real.def) {
-               switch (def->type->type) {
-               case PSI_T_STRUCT:
-                       psi_parser_proc_add_struct(P, def->type->real.strct);
-                       break;
-               case PSI_T_UNION:
-                       psi_parser_proc_add_union(P, def->type->real.unn);
-                       break;
-               case PSI_T_ENUM:
-                       psi_parser_proc_add_enum(P, def->type->real.enm);
-                       break;
-               default:
-                       break;
-               }
-       }
-}
 static inline void psi_parser_proc_add_typedef(struct psi_parser *P, struct psi_decl_arg *def)
 {
        assert(def);
@@ -762,6 +744,15 @@ decl_typedef[def]:
        TYPEDEF typedef[def_] EOS {
        $def = $def_;
 }
+|      TYPEDEF VOID name_token EOS {
+       $def = psi_decl_arg_init(
+               psi_decl_type_init(PSI_T_VOID, $VOID->text),
+               psi_decl_var_init($name_token->text, 0, 0)
+       );
+       $def->token = psi_token_copy($VOID);
+       $def->type->token = psi_token_copy($VOID);
+       $def->var->token = psi_token_copy($name_token);
+}
 |      CPP_EXTENSION TYPEDEF typedef[def_] EOS {
        $def = $def_;
 }

diff --git a/src/types/cpp_macro_call.c b/src/types/cpp_macro_call.c
index 0df9adbbbca8037add029de607dd616d88473215..4bd39323530728a246677cb38580f0b6b282f201 100644 (file)
--- a/src/types/cpp_macro_call.c
+++ b/src/types/cpp_macro_call.c
@@ -70,3 +70,17 @@ void psi_cpp_macro_call_free(struct psi_cpp_macro_call **call_ptr)
        }
 }
 
+void psi_cpp_macro_call_dump(int fd, struct psi_cpp_macro_call *call)
+{
+       size_t i = 0;
+       struct psi_num_exp *num;
+
+       dprintf(fd, "%s(", call->name);
+       while (psi_plist_get(call->args, i++, &num)) {
+               if (i > 1) {
+                       dprintf(fd, ", ");
+               }
+               psi_num_exp_dump(fd, num);
+       }
+       dprintf(fd, ")");
+}

diff --git a/src/types/cpp_macro_call.h b/src/types/cpp_macro_call.h
index 5c8d9a8cc75d227e861afd070389ae6a21c06174..7ca283d24490d9632aac3d66be4fa6bc53761fa6 100644 (file)
--- a/src/types/cpp_macro_call.h
+++ b/src/types/cpp_macro_call.h
@@ -40,5 +40,6 @@ struct psi_cpp_macro_call *psi_cpp_macro_call_init(const char *name,
 struct psi_cpp_macro_call *psi_cpp_macro_call_copy(
                struct psi_cpp_macro_call *call);
 void psi_cpp_macro_call_free(struct psi_cpp_macro_call **call_ptr);
+void psi_cpp_macro_call_dump(int fd, struct psi_cpp_macro_call *call);
 
 #endif

diff --git a/src/types/number.c b/src/types/number.c
index 057bd9fb8d3d2a2629c9d95185378235cb6a5600..4cb1f0295153549f318f686d1822619afb9b342b 100644 (file)
--- a/src/types/number.c
+++ b/src/types/number.c
@@ -224,6 +224,9 @@ void psi_number_dump(int fd, struct psi_number *exp)
        case PSI_T_QUOTED_CHAR:
                dprintf(fd, "%s", exp->data.numb);
                break;
+       case PSI_T_FUNCTION:
+               psi_cpp_macro_call_dump(fd, exp->data.call);
+               break;
        case PSI_T_CONST:
                dprintf(fd, "%s", exp->data.cnst->name);
                break;