From ba906e039ffe9e57842ce5135aa43efa00b8a4c6 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 28 Mar 2017 14:00:54 +0200 Subject: [PATCH] cpp --- m4/psi/psi.m4 | 4 +- src/cpp.c | 79 +- src/cpp.h | 8 +- src/cpp_tokiter.c | 30 +- src/module.c | 8 +- src/parser.c | 4767 ++++++++++++++++++++---------------- src/parser.re | 55 +- src/parser_proc.c | 3413 ++++++++++++++------------ src/parser_proc.h | 120 +- src/parser_proc_grammar.y | 57 +- src/plist.c | 6 +- src/token.h | 2 +- src/types/cpp_exp.c | 14 + src/types/decl_enum_item.c | 4 +- src/types/num_exp.c | 57 + src/types/num_exp.h | 8 + src/types/number.c | 286 ++- src/types/number.h | 23 +- 18 files changed, 4948 insertions(+), 3993 deletions(-) diff --git a/m4/psi/psi.m4 b/m4/psi/psi.m4 index d7918f2..92d8bab 100644 --- a/m4/psi/psi.m4 +++ b/m4/psi/psi.m4 @@ -20,8 +20,8 @@ AC_DEFUN(PSI_CONFIG_INIT, [ ]) AC_MSG_CHECKING(for preprocessor defaults) - psi_cpp_predef=`$CPP -Wp,-dM - &1 >/dev/null \ + psi_cpp_predef=`$CPP -Wp,-dM $CPPFLAGS -D_GNU_SOURCE - &1 >/dev/null \ | $AWK ' /include.*search.*start/ { capture = 1 diff --git a/src/cpp.c b/src/cpp.c index 0c64246..e79a563 100644 --- a/src/cpp.c +++ b/src/cpp.c @@ -44,8 +44,8 @@ struct psi_cpp *psi_cpp_init(struct psi_parser *P) struct psi_cpp *cpp = calloc(1, sizeof(*cpp)); cpp->parser = P; - ALLOC_HASHTABLE(cpp->defs); - zend_hash_init(cpp->defs, 0, NULL, free_cpp_def, 1); + zend_hash_init(&cpp->defs, 0, NULL, free_cpp_def, 1); + zend_hash_init(&cpp->once, 0, NULL, NULL, 1); return cpp; } @@ -83,10 +83,10 @@ void psi_cpp_free(struct psi_cpp **cpp_ptr) *cpp_ptr = NULL; if (cpp->parser->flags & PSI_DEBUG) { fprintf(stderr, "PSI: CPP decls:\n"); - zend_hash_apply(cpp->defs, dump_def); + zend_hash_apply(&cpp->defs, dump_def); } - zend_hash_destroy(cpp->defs); - FREE_HASHTABLE(cpp->defs); + zend_hash_destroy(&cpp->defs); + zend_hash_destroy(&cpp->once); free(cpp); } } @@ -99,8 +99,8 @@ static bool psi_cpp_stage1(struct psi_cpp *cpp) while (psi_cpp_tokiter_valid(cpp)) { struct psi_token *token = psi_cpp_tokiter_current(cpp); - /* strip comments */ - if (token->type == PSI_T_COMMENT) { + /* strip comments and attributes */ + if (token->type == PSI_T_COMMENT || token->type == PSI_T_CPP_ATTRIBUTE) { psi_cpp_tokiter_del_cur(cpp, true); continue; } @@ -278,7 +278,6 @@ static bool psi_cpp_stage2(struct psi_cpp *cpp) if (do_cpp) { parser_tokens = psi_plist_add(parser_tokens, ¤t); - psi_cpp_tokiter_del_cur(cpp, false); if (is_eol) { size_t processed = 0; @@ -287,8 +286,13 @@ static bool psi_cpp_stage2(struct psi_cpp *cpp) psi_plist_free(parser_tokens); return false; } + psi_plist_pop(parser_tokens, NULL); psi_plist_clean(parser_tokens); do_cpp = false; + } else { + /* leave EOLs in the input stream, else we might end up + * with a hash not preceeded with a new line after include */ + psi_cpp_tokiter_del_cur(cpp, false); } #if PSI_CPP_DEBUG > 1 @@ -309,17 +313,21 @@ static bool psi_cpp_stage2(struct psi_cpp *cpp) bool psi_cpp_process(struct psi_cpp *cpp, struct psi_plist **tokens) { + bool parsed = false; struct psi_cpp temp = *cpp; - temp.tokens = *tokens; + cpp->tokens = *tokens; + if (psi_cpp_stage1(cpp) && psi_cpp_stage2(cpp)) { + parsed = true; + } + *tokens = cpp->tokens; - if (psi_cpp_stage1(&temp) && psi_cpp_stage2(&temp)) { - *tokens = temp.tokens; - return true; + if (temp.tokens) { + cpp->tokens = temp.tokens; + cpp->index = temp.index; } - *tokens = temp.tokens; - return false; + return parsed; } bool psi_cpp_defined(struct psi_cpp *cpp, struct psi_token *tok) @@ -327,7 +335,7 @@ bool psi_cpp_defined(struct psi_cpp *cpp, struct psi_token *tok) bool defined; if (tok->type == PSI_T_NAME) { - defined = zend_hash_str_exists(cpp->defs, tok->text, tok->size); + defined = zend_hash_str_exists(&cpp->defs, tok->text, tok->size); } else { defined = false; } @@ -342,7 +350,7 @@ bool psi_cpp_defined(struct psi_cpp *cpp, struct psi_token *tok) void psi_cpp_define(struct psi_cpp *cpp, struct psi_cpp_macro_decl *decl) { - struct psi_cpp_macro_decl *old = zend_hash_str_find_ptr(cpp->defs, decl->token->text, decl->token->size); + struct psi_cpp_macro_decl *old = zend_hash_str_find_ptr(&cpp->defs, decl->token->text, decl->token->size); if (old && !psi_cpp_macro_decl_equal(old, decl)) { cpp->parser->error(PSI_DATA(cpp->parser), decl->token, PSI_WARNING, @@ -350,12 +358,12 @@ void psi_cpp_define(struct psi_cpp *cpp, struct psi_cpp_macro_decl *decl) cpp->parser->error(PSI_DATA(cpp->parser), old->token, PSI_WARNING, "'%s' previously defined", old->token->text); } - zend_hash_str_update_ptr(cpp->defs, decl->token->text, decl->token->size, decl); + zend_hash_str_update_ptr(&cpp->defs, decl->token->text, decl->token->size, decl); } bool psi_cpp_undef(struct psi_cpp *cpp, struct psi_token *tok) { - return SUCCESS == zend_hash_str_del(cpp->defs, tok->text, tok->size); + return SUCCESS == zend_hash_str_del(&cpp->defs, tok->text, tok->size); } bool psi_cpp_if(struct psi_cpp *cpp, struct psi_cpp_exp *exp) @@ -363,7 +371,7 @@ bool psi_cpp_if(struct psi_cpp *cpp, struct psi_cpp_exp *exp) if (!psi_num_exp_validate(PSI_DATA(cpp->parser), exp->data.num, NULL, NULL, NULL, NULL, NULL)) { return false; } - if (!psi_long_num_exp(exp->data.num, NULL, cpp->defs)) { + if (!psi_long_num_exp(exp->data.num, NULL, &cpp->defs)) { return false; } return true; @@ -383,13 +391,20 @@ static inline bool try_include(struct psi_cpp *cpp, const char *path, bool *pars tokens = psi_parser_scan(cpp->parser, include); if (tokens) { - if ((*parsed = psi_cpp_process(cpp, &tokens))) { - psi_cpp_tokiter_ins_range(cpp, psi_cpp_tokiter_index(cpp), + *parsed = psi_cpp_process(cpp, &tokens); + + if (*parsed) { + ++cpp->expanded; + psi_cpp_tokiter_ins_range(cpp, cpp->index, psi_plist_count(tokens), psi_plist_eles(tokens)); + free(tokens); + } else { + psi_plist_free(tokens); } - psi_plist_free(tokens); } free(include); + + zend_hash_str_add_empty_element(&cpp->once, path, strlen(path)); return true; } return false; @@ -399,10 +414,15 @@ bool psi_cpp_include(struct psi_cpp *cpp, const char *file, unsigned flags) { char path[PATH_MAX]; bool parsed = false; - int f_len = strlen(file) - 2; + int p_len, f_len = strlen(file) - 2; - if (file[1] == '/' && PATH_MAX > snprintf(path, PATH_MAX, "%.*s", f_len, file + 1)) { - return try_include(cpp, path, &parsed) && parsed; + if (file[1] == '/') { + if (PATH_MAX > (p_len = snprintf(path, PATH_MAX, "%.*s", f_len, file + 1))) { + if ((flags & PSI_CPP_INCLUDE_ONCE) && zend_hash_str_exists(&cpp->once, path, p_len)) { + return true; + } + return try_include(cpp, path, &parsed) && parsed; + } } else { const char *sep; @@ -410,9 +430,11 @@ bool psi_cpp_include(struct psi_cpp *cpp, const char *file, unsigned flags) if ((sep = strchr(cpp->search, ':'))) { cpp->search = sep + 1; } else { - cpp->search += strlen(cpp->search); /* point to end of string */ + /* point to end of string */ + cpp->search += strlen(cpp->search); } } + if (!(flags & PSI_CPP_INCLUDE_NEXT) || !cpp->search) { cpp->search = &psi_cpp_search[0]; } @@ -423,7 +445,10 @@ bool psi_cpp_include(struct psi_cpp *cpp, const char *file, unsigned flags) sep = strchr(cpp->search, ':'); d_len = sep ? sep - cpp->search : strlen(cpp->search); - if (PATH_MAX > snprintf(path, PATH_MAX, "%.*s/%.*s", d_len, cpp->search, f_len, file + 1)) { + if (PATH_MAX > (p_len = snprintf(path, PATH_MAX, "%.*s/%.*s", d_len, cpp->search, f_len, file + 1))) { + if ((flags & PSI_CPP_INCLUDE_ONCE) && zend_hash_str_exists(&cpp->once, path, p_len)) { + return true; + } if (try_include(cpp, path, &parsed)) { break; } diff --git a/src/cpp.h b/src/cpp.h index b778b14..9c74588 100644 --- a/src/cpp.h +++ b/src/cpp.h @@ -32,11 +32,9 @@ # define PSI_CPP_DEBUG 0 #endif -struct psi_cpp_tokiter { -}; - struct psi_cpp { - HashTable *defs; + HashTable defs; + HashTable once; struct psi_parser *parser; struct psi_plist *tokens; const char *search; @@ -65,7 +63,9 @@ bool psi_cpp_include(struct psi_cpp *cpp, const char *file, unsigned flags); void psi_cpp_tokiter_reset(struct psi_cpp *cpp); bool psi_cpp_tokiter_seek(struct psi_cpp *cpp, size_t index); +#if PSI_CPP_DEBUG > 1 void psi_cpp_tokiter_dump(int fd, struct psi_cpp *cpp); +#endif struct psi_token *psi_cpp_tokiter_current(struct psi_cpp *cpp); size_t psi_cpp_tokiter_index(struct psi_cpp *cpp); void psi_cpp_tokiter_next(struct psi_cpp *cpp); diff --git a/src/cpp_tokiter.c b/src/cpp_tokiter.c index d980e61..2ea9adc 100644 --- a/src/cpp_tokiter.c +++ b/src/cpp_tokiter.c @@ -28,17 +28,28 @@ #include "cpp.h" #include "parser.h" - +#if PSI_CPP_DEBUG > 1 void psi_cpp_tokiter_dump(int fd, struct psi_cpp *cpp) { - size_t i; + size_t i = cpp->index; struct psi_token *T; - for (i = 0; psi_plist_get(cpp->tokens, i, &T); ++i) { + if (i > 20) { + i -= 20; + } else { + i = 0; + } + while (psi_plist_get(cpp->tokens, i, &T)) { dprintf(fd, "PSI: CPP tokens %5zu %c ", i, cpp->index == i ? '*' : ' '); psi_token_dump(fd, T); + if (i >= cpp->index + 10) { + dprintf(fd, "PSI: CPP tokens .....\n"); + break; + } + ++i; } } +#endif void psi_cpp_tokiter_reset(struct psi_cpp *cpp) { @@ -150,9 +161,16 @@ bool psi_cpp_tokiter_del_range(struct psi_cpp *cpp, size_t offset, size_t num_el deleted = psi_plist_del_r(cpp->tokens, offset, num_eles, (void *) ptr); if (deleted) { - if (cpp->index >= psi_plist_count(cpp->tokens)) { - cpp->index = MAX(0, psi_plist_count(cpp->tokens)-1); + size_t count = psi_plist_count(cpp->tokens); + + if (cpp->index >= count) { + if (count > 0) { + cpp->index = count - 1; + } else { + cpp->index = 0; + } } + if (free_tokens) { while (num_eles--) { if (ptr[num_eles]) { @@ -427,7 +445,7 @@ bool psi_cpp_tokiter_expand(struct psi_cpp *cpp) if (current) { struct psi_cpp_macro_decl *macro = zend_hash_str_find_ptr( - cpp->defs, current->text, current->size); + &cpp->defs, current->text, current->size); /* don't expand itself */ if (macro && macro->token != current) { diff --git a/src/module.c b/src/module.c index 778f396..e7948d8 100644 --- a/src/module.c +++ b/src/module.c @@ -239,15 +239,15 @@ static PHP_MINIT_FUNCTION(psi) PSI_G(context) = psi_context_init(NULL, ops, psi_error_wrapper, flags); psi_context_build(PSI_G(context), PSI_G(directory)); - if (psi_check_env("PSI_DUMP")) { - psi_context_dump(PSI_G(context), STDOUT_FILENO); - } - return SUCCESS; } static PHP_MSHUTDOWN_FUNCTION(psi) { + if (psi_check_env("PSI_DUMP")) { + psi_context_dump(PSI_G(context), STDOUT_FILENO); + } + psi_context_free(&PSI_G(context)); UNREGISTER_INI_ENTRIES(); diff --git a/src/parser.c b/src/parser.c index 12ea648..947eea7 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.16 on Fri Mar 24 12:21:07 2017 */ +/* Generated by re2c 0.16 on Tue Mar 28 16:36:22 2017 */ #line 1 "src/parser.re" /******************************************************************************* Copyright (c) 2016, Michael Wallner . @@ -194,16 +194,7 @@ struct psi_plist *psi_parser_preprocess(struct psi_parser *P, struct psi_plist * bool psi_parser_process(struct psi_parser *P, struct psi_plist *tokens, size_t *processed) { if (psi_plist_count(tokens)) { - int rc; - - if (P->flags & PSI_DEBUG) { - psi_parser_proc_debug = 1; - } - rc = psi_parser_proc_parse(P, tokens, processed); - if (P->flags & PSI_DEBUG) { - psi_parser_proc_debug = 0; - } - return rc == 0; + return 0 == psi_parser_proc_parse(P, tokens, processed); } return true; } @@ -260,12 +251,17 @@ void psi_parser_free(struct psi_parser **P) psi_token_dump(2, token); \ } +union int_suffix { + char s[SIZEOF_UINT32_T]; + uint32_t i; +}; struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input *I) { struct psi_plist *tokens; struct psi_token *token; - const char *tok, *cur, *lim, *mrk, *eol; + const char *tok, *cur, *lim, *mrk, *eol, *ctxmrk; + unsigned parens; tok = mrk = eol = cur = I->buffer; lim = I->buffer + I->length; @@ -273,10 +269,11 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input tokens = psi_plist_init((void (*)(void *)) psi_token_free); start: ; + ctxmrk = NULL; tok = cur; -#line 280 "src/parser.c" +#line 277 "src/parser.c" { unsigned char yych; unsigned int yyaccept = 0; @@ -312,7 +309,6 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input case 0x1D: case 0x1E: case 0x1F: - case '?': case '@': case '`': case 0x7F: goto yy2; @@ -350,60 +346,62 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input case '<': goto yy44; case '=': goto yy46; case '>': goto yy48; + case '?': goto yy50; case 'A': - case 'a': goto yy50; + case 'a': goto yy52; case 'B': - case 'b': goto yy52; + case 'b': goto yy54; case 'C': - case 'c': goto yy53; + case 'c': goto yy55; case 'D': - case 'd': goto yy54; + case 'd': goto yy56; case 'E': - case 'e': goto yy55; + case 'e': goto yy57; case 'F': - case 'f': goto yy56; + case 'f': goto yy58; case 'I': - case 'i': goto yy59; - case 'L': goto yy60; + case 'i': goto yy61; + case 'L': goto yy62; case 'M': - case 'm': goto yy61; + case 'm': goto yy63; case 'N': - case 'n': goto yy62; - case 'O': - case 'o': goto yy63; - case 'P': - case 'p': goto yy64; + case 'n': goto yy64; + case 'O': goto yy65; + case 'P': goto yy66; case 'R': - case 'r': goto yy65; + case 'r': goto yy67; case 'S': - case 's': goto yy66; + case 's': goto yy68; case 'T': - case 't': goto yy67; + case 't': goto yy69; case 'U': - case 'u': goto yy68; + case 'u': goto yy70; case 'V': - case 'v': goto yy69; + case 'v': goto yy71; case 'W': - case 'w': goto yy70; + case 'w': goto yy72; case 'Z': - case 'z': goto yy71; - case '[': goto yy72; - case '\\': goto yy74; - case ']': goto yy76; - case '^': goto yy78; - case 'l': goto yy80; - case '{': goto yy81; - case '|': goto yy83; - case '}': goto yy85; - case '~': goto yy87; - default: goto yy57; + case 'z': goto yy73; + case '[': goto yy74; + case '\\': goto yy76; + case ']': goto yy78; + case '^': goto yy80; + case '_': goto yy82; + case 'l': goto yy83; + case 'o': goto yy84; + case 'p': goto yy85; + case '{': goto yy86; + case '|': goto yy88; + case '}': goto yy90; + case '~': goto yy92; + default: goto yy59; } yy2: ++cur; yy3: -#line 433 "src/parser.re" +#line 449 "src/parser.re" { NEWTOKEN(-2); goto error; } -#line 407 "src/parser.c" +#line 405 "src/parser.c" yy4: ++cur; if (lim <= cur) if (cur >= lim) goto done;; @@ -414,36 +412,36 @@ yy4: default: goto yy6; } yy6: -#line 432 "src/parser.re" +#line 448 "src/parser.re" { NEWTOKEN(PSI_T_WHITESPACE); goto start; } -#line 420 "src/parser.c" +#line 418 "src/parser.c" yy7: ++cur; -#line 431 "src/parser.re" +#line 447 "src/parser.re" { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; } -#line 425 "src/parser.c" +#line 423 "src/parser.c" yy9: ++cur; switch ((yych = *cur)) { - case '=': goto yy89; + case '=': goto yy94; default: goto yy10; } yy10: -#line 335 "src/parser.re" +#line 348 "src/parser.re" { NEWTOKEN(PSI_T_NOT); goto start; } -#line 435 "src/parser.c" +#line 433 "src/parser.c" yy11: yyaccept = 0; yych = *(mrk = ++cur); switch (yych) { case '"': goto yy3; - default: goto yy91; + default: goto yy96; } yy12: ++cur; -#line 318 "src/parser.re" +#line 331 "src/parser.re" { NEWTOKEN(PSI_T_HASH); goto start; } -#line 447 "src/parser.c" +#line 445 "src/parser.c" yy14: yych = *++cur; switch (yych) { @@ -512,49 +510,50 @@ yy14: case '}': case '~': case 0x7F: goto yy3; - default: goto yy93; + default: goto yy98; } yy15: ++cur; -#line 336 "src/parser.re" +#line 349 "src/parser.re" { NEWTOKEN(PSI_T_MODULO); goto start; } -#line 522 "src/parser.c" +#line 520 "src/parser.c" yy17: ++cur; switch ((yych = *cur)) { - case '&': goto yy96; + case '&': goto yy101; default: goto yy18; } yy18: -#line 337 "src/parser.re" +#line 350 "src/parser.re" { NEWTOKEN(PSI_T_AMPERSAND); goto start; } -#line 532 "src/parser.c" +#line 530 "src/parser.c" yy19: yyaccept = 0; yych = *(mrk = ++cur); switch (yych) { case '\'': goto yy3; - default: goto yy98; + default: goto yy103; } yy20: ++cur; -#line 319 "src/parser.re" +#line 332 "src/parser.re" { NEWTOKEN(PSI_T_LPAREN); goto start; } -#line 544 "src/parser.c" +#line 542 "src/parser.c" yy22: ++cur; -#line 320 "src/parser.re" +#line 333 "src/parser.re" { NEWTOKEN(PSI_T_RPAREN); goto start; } -#line 549 "src/parser.c" +#line 547 "src/parser.c" yy24: ++cur; -#line 333 "src/parser.re" +#line 346 "src/parser.re" { NEWTOKEN(PSI_T_ASTERISK); goto start; } -#line 554 "src/parser.c" +#line 552 "src/parser.c" yy26: - ++cur; - switch ((yych = *cur)) { - case '.': goto yy100; + yyaccept = 1; + yych = *(mrk = ++cur); + switch (yych) { + case '.': goto yy105; case '0': goto yy36; case '1': case '2': @@ -568,18 +567,19 @@ yy26: default: goto yy27; } yy27: -#line 338 "src/parser.re" +#line 351 "src/parser.re" { NEWTOKEN(PSI_T_PLUS); goto start; } -#line 574 "src/parser.c" +#line 573 "src/parser.c" yy28: ++cur; -#line 322 "src/parser.re" +#line 335 "src/parser.re" { NEWTOKEN(PSI_T_COMMA); goto start; } -#line 579 "src/parser.c" +#line 578 "src/parser.c" yy30: - ++cur; - switch ((yych = *cur)) { - case '.': goto yy100; + yyaccept = 2; + yych = *(mrk = ++cur); + switch (yych) { + case '.': goto yy105; case '0': goto yy36; case '1': case '2': @@ -593,14 +593,14 @@ yy30: default: goto yy31; } yy31: -#line 339 "src/parser.re" +#line 352 "src/parser.re" { NEWTOKEN(PSI_T_MINUS); goto start; } #line 599 "src/parser.c" yy32: - yyaccept = 1; + yyaccept = 3; yych = *(mrk = ++cur); switch (yych) { - case '.': goto yy102; + case '.': goto yy107; case '0': case '1': case '2': @@ -610,35 +610,30 @@ yy32: case '6': case '7': case '8': - case '9': goto yy100; - case 'D': - case 'd': goto yy104; - case 'F': - case 'L': - case 'f': - case 'l': goto yy105; + case '9': goto yy108; default: goto yy33; } yy33: -#line 350 "src/parser.re" +#line 363 "src/parser.re" { NEWTOKEN(PSI_T_PERIOD); goto start; } -#line 626 "src/parser.c" +#line 620 "src/parser.c" yy34: ++cur; switch ((yych = *cur)) { - case '*': goto yy106; - case '/': goto yy108; + case '*': goto yy111; + case '/': goto yy113; default: goto yy35; } yy35: -#line 340 "src/parser.re" +#line 353 "src/parser.re" { NEWTOKEN(PSI_T_SLASH); goto start; } -#line 637 "src/parser.c" +#line 631 "src/parser.c" yy36: - yyaccept = 2; + yyaccept = 4; yych = *(mrk = ++cur); + ctxmrk = cur; switch (yych) { - case '.': goto yy110; + case '.': goto yy115; case '0': case '1': case '2': @@ -646,28 +641,29 @@ yy36: case '4': case '5': case '6': - case '7': goto yy112; + case '7': goto yy117; case 'E': - case 'e': goto yy114; + case 'e': goto yy119; case 'L': - case 'l': goto yy115; + case 'l': goto yy120; case 'U': - case 'u': goto yy116; + case 'u': goto yy122; case 'X': - case 'x': goto yy117; + case 'x': goto yy124; default: goto yy37; } yy37: -#line 424 "src/parser.re" - { NEWTOKEN(PSI_T_NUMBER); goto start; } -#line 664 "src/parser.c" +#line 316 "src/parser.re" + { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT; goto start; } +#line 659 "src/parser.c" yy38: - yyaccept = 2; + yyaccept = 4; mrk = ++cur; if ((lim - cur) < 3) if (cur >= lim) goto done;; yych = *cur; + ctxmrk = cur; switch (yych) { - case '.': goto yy110; + case '.': goto yy115; case '0': case '1': case '2': @@ -679,25 +675,25 @@ yy38: case '8': case '9': goto yy38; case 'E': - case 'e': goto yy114; + case 'e': goto yy119; case 'L': - case 'l': goto yy115; + case 'l': goto yy120; case 'U': - case 'u': goto yy116; + case 'u': goto yy122; default: goto yy37; } yy40: ++cur; -#line 323 "src/parser.re" +#line 336 "src/parser.re" { NEWTOKEN(PSI_T_COLON); goto start; } -#line 694 "src/parser.c" +#line 690 "src/parser.c" yy42: ++cur; -#line 321 "src/parser.re" +#line 334 "src/parser.re" { NEWTOKEN(PSI_T_EOS); goto start; } -#line 699 "src/parser.c" +#line 695 "src/parser.c" yy44: - yyaccept = 3; + yyaccept = 5; yych = *(mrk = ++cur); switch (yych) { case '-': @@ -765,110 +761,115 @@ yy44: case 'w': case 'x': case 'y': - case 'z': goto yy118; - case '<': goto yy120; - case '=': goto yy122; + case 'z': goto yy125; + case '<': goto yy127; + case '=': goto yy129; default: goto yy45; } yy45: -#line 348 "src/parser.re" +#line 361 "src/parser.re" { NEWTOKEN(PSI_T_LCHEVR); goto start; } -#line 777 "src/parser.c" +#line 773 "src/parser.c" yy46: ++cur; switch ((yych = *cur)) { - case '=': goto yy124; + case '=': goto yy131; default: goto yy47; } yy47: -#line 332 "src/parser.re" +#line 345 "src/parser.re" { NEWTOKEN(PSI_T_EQUALS); goto start; } -#line 787 "src/parser.c" +#line 783 "src/parser.c" yy48: ++cur; switch ((yych = *cur)) { - case '=': goto yy126; - case '>': goto yy128; + case '=': goto yy133; + case '>': goto yy135; default: goto yy49; } yy49: -#line 349 "src/parser.re" +#line 362 "src/parser.re" { NEWTOKEN(PSI_T_RCHEVR); goto start; } -#line 798 "src/parser.c" +#line 794 "src/parser.c" yy50: - yyaccept = 4; + ++cur; +#line 365 "src/parser.re" + { NEWTOKEN(PSI_T_IIF); goto start; } +#line 799 "src/parser.c" +yy52: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'R': - case 'r': goto yy130; - default: goto yy58; + case 'r': goto yy137; + default: goto yy60; } -yy51: -#line 425 "src/parser.re" +yy53: +#line 440 "src/parser.re" { NEWTOKEN(PSI_T_NAME); goto start; } -#line 810 "src/parser.c" -yy52: - yyaccept = 4; +#line 811 "src/parser.c" +yy54: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'O': - case 'o': goto yy132; - default: goto yy58; + case 'o': goto yy139; + default: goto yy60; } -yy53: - yyaccept = 4; +yy55: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy133; + case 'a': goto yy140; case 'H': - case 'h': goto yy134; + case 'h': goto yy141; case 'O': - case 'o': goto yy135; - default: goto yy58; + case 'o': goto yy142; + default: goto yy60; } -yy54: - yyaccept = 4; +yy56: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy136; + case 'e': goto yy143; case 'O': - case 'o': goto yy137; - default: goto yy58; + case 'o': goto yy144; + default: goto yy60; } -yy55: - yyaccept = 4; +yy57: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy138; + case 'l': goto yy145; case 'N': - case 'n': goto yy139; + case 'n': goto yy146; case 'R': - case 'r': goto yy140; - default: goto yy58; + case 'r': goto yy147; + default: goto yy60; } -yy56: - yyaccept = 4; +yy58: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy141; + case 'a': goto yy148; case 'L': - case 'l': goto yy142; + case 'l': goto yy149; case 'R': - case 'r': goto yy143; + case 'r': goto yy150; case 'U': - case 'u': goto yy144; - default: goto yy58; + case 'u': goto yy151; + default: goto yy60; } -yy57: - yyaccept = 4; +yy59: + yyaccept = 6; mrk = ++cur; if (lim <= cur) if (cur >= lim) goto done;; yych = *cur; -yy58: +yy60: switch (yych) { case 0x00: case 0x01: @@ -933,146 +934,146 @@ yy58: case '|': case '}': case '~': - case 0x7F: goto yy51; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy53; + case '\\': goto yy138; + default: goto yy59; } -yy59: - yyaccept = 4; +yy61: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'F': - case 'f': goto yy145; + case 'f': goto yy152; case 'N': - case 'n': goto yy147; - default: goto yy58; + case 'n': goto yy154; + default: goto yy60; } -yy60: - yyaccept = 4; +yy62: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '"': goto yy148; - case '\'': goto yy149; + case '"': goto yy155; + case '\'': goto yy156; case 'E': - case 'e': goto yy150; + case 'e': goto yy157; case 'I': - case 'i': goto yy151; + case 'i': goto yy158; case 'O': - case 'o': goto yy152; - default: goto yy58; + case 'o': goto yy159; + default: goto yy60; } -yy61: - yyaccept = 4; +yy63: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'I': - case 'i': goto yy153; - default: goto yy58; + case 'i': goto yy160; + default: goto yy60; } -yy62: - yyaccept = 4; +yy64: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'U': - case 'u': goto yy154; - default: goto yy58; + case 'u': goto yy161; + default: goto yy60; } -yy63: - yyaccept = 4; +yy65: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'B': - case 'b': goto yy155; - default: goto yy58; + case 'b': goto yy162; + default: goto yy60; } -yy64: - yyaccept = 4; +yy66: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy156; + case 'a': goto yy163; case 'O': - case 'o': goto yy157; + case 'o': goto yy164; case 'R': - case 'r': goto yy158; - default: goto yy58; + case 'r': goto yy165; + default: goto yy60; } -yy65: - yyaccept = 4; +yy67: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy159; - default: goto yy58; + case 'e': goto yy166; + default: goto yy60; } -yy66: - yyaccept = 4; +yy68: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy160; + case 'e': goto yy167; case 'H': - case 'h': goto yy161; + case 'h': goto yy168; case 'I': - case 'i': goto yy162; + case 'i': goto yy169; case 'T': - case 't': goto yy163; - default: goto yy58; + case 't': goto yy170; + default: goto yy60; } -yy67: - yyaccept = 4; +yy69: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy164; + case 'e': goto yy171; case 'O': - case 'o': goto yy165; + case 'o': goto yy172; case 'R': - case 'r': goto yy166; + case 'r': goto yy173; case 'Y': - case 'y': goto yy167; - default: goto yy58; + case 'y': goto yy174; + default: goto yy60; } -yy68: - yyaccept = 4; +yy70: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'I': - case 'i': goto yy168; + case 'i': goto yy175; case 'N': - case 'n': goto yy169; - default: goto yy58; + case 'n': goto yy176; + default: goto yy60; } -yy69: - yyaccept = 4; +yy71: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'O': - case 'o': goto yy170; - default: goto yy58; + case 'o': goto yy177; + default: goto yy60; } -yy70: - yyaccept = 4; +yy72: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy171; - default: goto yy58; + case 'a': goto yy178; + default: goto yy60; } -yy71: - yyaccept = 4; +yy73: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'V': - case 'v': goto yy172; - default: goto yy58; + case 'v': goto yy179; + default: goto yy60; } -yy72: +yy74: ++cur; -#line 326 "src/parser.re" +#line 339 "src/parser.re" { NEWTOKEN(PSI_T_LBRACKET); goto start; } -#line 1075 "src/parser.c" -yy74: +#line 1076 "src/parser.c" +yy76: ++cur; switch ((yych = *cur)) { case 0x00: @@ -1149,74 +1150,102 @@ yy74: case '|': case '}': case '~': - case 0x7F: goto yy75; - default: goto yy173; + case 0x7F: goto yy77; + default: goto yy180; } -yy75: -#line 341 "src/parser.re" +yy77: +#line 354 "src/parser.re" { NEWTOKEN(PSI_T_BSLASH); goto start; } -#line 1159 "src/parser.c" -yy76: +#line 1160 "src/parser.c" +yy78: ++cur; -#line 327 "src/parser.re" +#line 340 "src/parser.re" { NEWTOKEN(PSI_T_RBRACKET); goto start; } -#line 1164 "src/parser.c" -yy78: +#line 1165 "src/parser.c" +yy80: ++cur; -#line 343 "src/parser.re" +#line 356 "src/parser.re" { NEWTOKEN(PSI_T_CARET); goto start; } -#line 1169 "src/parser.c" -yy80: - yyaccept = 4; +#line 1170 "src/parser.c" +yy82: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case '_': goto yy183; + default: goto yy60; + } +yy83: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy150; + case 'e': goto yy157; case 'I': - case 'i': goto yy151; + case 'i': goto yy158; + case 'O': + case 'o': goto yy159; + default: goto yy60; + } +yy84: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'B': + case 'b': goto yy162; + case 'n': goto yy184; + default: goto yy60; + } +yy85: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'A': + case 'a': goto yy163; case 'O': - case 'o': goto yy152; - default: goto yy58; + case 'o': goto yy164; + case 'R': goto yy165; + case 'r': goto yy185; + default: goto yy60; } -yy81: +yy86: ++cur; -#line 324 "src/parser.re" +#line 337 "src/parser.re" { NEWTOKEN(PSI_T_LBRACE); goto start; } -#line 1186 "src/parser.c" -yy83: +#line 1215 "src/parser.c" +yy88: ++cur; switch ((yych = *cur)) { - case '|': goto yy176; - default: goto yy84; + case '|': goto yy186; + default: goto yy89; } -yy84: -#line 342 "src/parser.re" +yy89: +#line 355 "src/parser.re" { NEWTOKEN(PSI_T_PIPE); goto start; } -#line 1196 "src/parser.c" -yy85: +#line 1225 "src/parser.c" +yy90: ++cur; -#line 325 "src/parser.re" +#line 338 "src/parser.re" { NEWTOKEN(PSI_T_RBRACE); goto start; } -#line 1201 "src/parser.c" -yy87: +#line 1230 "src/parser.c" +yy92: ++cur; -#line 334 "src/parser.re" +#line 347 "src/parser.re" { NEWTOKEN(PSI_T_TILDE); goto start; } -#line 1206 "src/parser.c" -yy89: +#line 1235 "src/parser.c" +yy94: ++cur; -#line 328 "src/parser.re" +#line 341 "src/parser.re" { NEWTOKEN(PSI_T_CMP_NE); goto start; } -#line 1211 "src/parser.c" -yy91: +#line 1240 "src/parser.c" +yy96: ++cur; if (lim <= cur) if (cur >= lim) goto done;; yych = *cur; switch (yych) { - case '"': goto yy178; - default: goto yy91; + case '"': goto yy188; + default: goto yy96; } -yy93: +yy98: ++cur; if (lim <= cur) if (cur >= lim) goto done;; yych = *cur; @@ -1285,32 +1314,29 @@ yy93: case '|': case '}': case '~': - case 0x7F: goto yy95; - default: goto yy93; + case 0x7F: goto yy100; + default: goto yy98; } -yy95: -#line 427 "src/parser.re" +yy100: +#line 442 "src/parser.re" { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; } -#line 1295 "src/parser.c" -yy96: +#line 1324 "src/parser.c" +yy101: ++cur; -#line 330 "src/parser.re" +#line 343 "src/parser.re" { NEWTOKEN(PSI_T_AND); goto start; } -#line 1300 "src/parser.c" -yy98: +#line 1329 "src/parser.c" +yy103: ++cur; if (lim <= cur) if (cur >= lim) goto done;; yych = *cur; switch (yych) { - case '\'': goto yy180; - case '\\': goto yy182; - default: goto yy98; + case '\'': goto yy190; + case '\\': goto yy192; + default: goto yy103; } -yy100: - yyaccept = 2; - mrk = ++cur; - if ((lim - cur) < 2) if (cur >= lim) goto done;; - yych = *cur; +yy105: + yych = *++cur; switch (yych) { case '0': case '1': @@ -1321,133 +1347,110 @@ yy100: case '6': case '7': case '8': - case '9': goto yy100; - case 'D': - case 'd': goto yy104; - case 'F': - case 'L': - case 'f': - case 'l': goto yy105; - default: goto yy37; - } -yy102: - yych = *++cur; - switch (yych) { - case '.': goto yy184; - default: goto yy103; + case '9': goto yy108; + default: goto yy106; } -yy103: +yy106: cur = mrk; switch (yyaccept) { case 0: goto yy3; - case 1: goto yy33; - case 2: goto yy37; - case 3: goto yy45; - case 4: goto yy51; - case 5: goto yy146; - case 6: goto yy175; - case 7: goto yy214; - case 8: goto yy216; - case 9: goto yy218; - case 10: goto yy228; - case 11: goto yy181; - case 12: goto yy250; - case 13: goto yy253; - case 14: goto yy259; - case 15: goto yy261; - case 16: goto yy264; - case 17: goto yy269; - case 18: goto yy280; - case 19: goto yy283; - case 20: goto yy298; - case 21: goto yy306; - case 22: goto yy313; - case 23: goto yy316; - case 24: goto yy318; - case 25: goto yy325; - case 26: goto yy327; - case 27: goto yy331; - case 28: goto yy333; - case 29: goto yy335; - case 30: goto yy337; - case 31: goto yy340; - case 32: goto yy349; - case 33: goto yy357; - case 34: goto yy376; - case 35: goto yy378; - case 36: goto yy382; - case 37: goto yy387; - case 38: goto yy389; - case 39: goto yy391; - case 40: goto yy395; - case 41: goto yy401; - case 42: goto yy403; - case 43: goto yy405; - case 44: goto yy407; - case 45: goto yy412; - case 46: goto yy414; - case 47: goto yy416; - case 48: goto yy418; - case 49: goto yy420; - case 50: goto yy422; - case 51: goto yy424; - case 52: goto yy429; - case 53: goto yy440; - case 54: goto yy444; - case 55: goto yy448; - case 56: goto yy450; - case 57: goto yy452; - case 58: goto yy454; - case 59: goto yy456; - case 60: goto yy461; - case 61: goto yy466; - case 62: goto yy471; - case 63: goto yy474; - case 64: goto yy476; - case 65: goto yy478; - case 66: goto yy480; - case 67: goto yy482; - case 68: goto yy487; - case 69: goto yy489; - case 70: goto yy493; - case 71: goto yy495; - case 72: goto yy497; - case 73: goto yy499; - case 74: goto yy504; - case 75: goto yy506; - case 76: goto yy510; - case 77: goto yy513; - default: goto yy515; - } -yy104: + case 1: goto yy27; + case 2: goto yy31; + case 3: goto yy33; + case 4: goto yy37; + case 5: goto yy45; + case 6: goto yy53; + case 7: goto yy110; + case 8: goto yy121; + case 9: goto yy153; + case 10: goto yy182; + case 11: goto yy230; + case 12: goto yy232; + case 13: goto yy234; + case 14: goto yy244; + case 15: goto yy191; + case 16: goto yy277; + case 17: goto yy280; + case 18: goto yy286; + case 19: goto yy288; + case 20: goto yy291; + case 21: goto yy296; + case 22: goto yy307; + case 23: goto yy310; + case 24: goto yy325; + case 25: goto yy333; + case 26: goto yy340; + case 27: goto yy343; + case 28: goto yy346; + case 29: goto yy349; + case 30: goto yy356; + case 31: goto yy358; + case 32: goto yy362; + case 33: goto yy364; + case 34: goto yy366; + case 35: goto yy368; + case 36: goto yy371; + case 37: goto yy380; + case 38: goto yy388; + case 39: goto yy407; + case 40: goto yy409; + case 41: goto yy415; + case 42: goto yy420; + case 43: goto yy422; + case 44: goto yy424; + case 45: goto yy428; + case 46: goto yy434; + case 47: goto yy436; + case 48: goto yy438; + case 49: goto yy440; + case 50: goto yy445; + case 51: goto yy447; + case 52: goto yy449; + case 53: goto yy451; + case 54: goto yy453; + case 55: goto yy455; + case 56: goto yy457; + case 57: goto yy462; + case 58: goto yy474; + case 59: goto yy476; + case 60: goto yy480; + case 61: goto yy484; + case 62: goto yy486; + case 63: goto yy488; + case 64: goto yy490; + case 65: goto yy492; + case 66: goto yy497; + case 67: goto yy502; + case 68: goto yy507; + case 69: goto yy510; + case 70: goto yy513; + case 71: goto yy515; + case 72: goto yy517; + case 73: goto yy519; + case 74: goto yy524; + case 75: goto yy526; + case 76: goto yy530; + case 77: goto yy532; + case 78: goto yy534; + case 79: goto yy536; + case 80: goto yy542; + case 81: goto yy544; + case 82: goto yy549; + case 83: goto yy553; + default: goto yy556; + } +yy107: yych = *++cur; switch (yych) { - case 'D': - case 'F': - case 'L': - case 'd': - case 'f': - case 'l': goto yy105; - default: goto yy103; + case '.': goto yy194; + default: goto yy106; } -yy105: - yych = *++cur; - goto yy37; -yy106: - ++cur; -#line 316 "src/parser.re" - { goto comment; } -#line 1441 "src/parser.c" yy108: - ++cur; -#line 317 "src/parser.re" - { goto comment_sl; } -#line 1446 "src/parser.c" -yy110: - yyaccept = 2; + yyaccept = 7; mrk = ++cur; - if ((lim - cur) < 3) if (cur >= lim) goto done;; + if ((lim - cur) < 2) if (cur >= lim) goto done;; yych = *cur; + ctxmrk = cur; switch (yych) { case '0': case '1': @@ -1458,21 +1461,61 @@ yy110: case '6': case '7': case '8': - case '9': goto yy110; + case '9': goto yy108; case 'D': - case 'd': goto yy104; - case 'E': - case 'e': goto yy114; + case 'd': goto yy196; case 'F': + case 'f': goto yy197; case 'L': - case 'f': - case 'l': goto yy105; - default: goto yy37; + case 'l': goto yy199; + default: goto yy110; + } +yy110: +#line 322 "src/parser.re" + { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT; goto start; } +#line 1477 "src/parser.c" +yy111: + ++cur; +#line 329 "src/parser.re" + { goto comment; } +#line 1482 "src/parser.c" +yy113: + ++cur; +#line 330 "src/parser.re" + { goto comment_sl; } +#line 1487 "src/parser.c" +yy115: + yyaccept = 7; + mrk = ++cur; + if ((lim - cur) < 3) if (cur >= lim) goto done;; + yych = *cur; + ctxmrk = cur; + switch (yych) { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': goto yy115; + case 'D': + case 'd': goto yy196; + case 'E': + case 'e': goto yy119; + case 'F': + case 'f': goto yy197; + case 'L': + case 'l': goto yy199; + default: goto yy110; } -yy112: +yy117: ++cur; if ((lim - cur) < 3) if (cur >= lim) goto done;; yych = *cur; + ctxmrk = cur; switch (yych) { case '0': case '1': @@ -1481,18 +1524,18 @@ yy112: case '4': case '5': case '6': - case '7': goto yy112; + case '7': goto yy117; case 'L': - case 'l': goto yy115; + case 'l': goto yy120; case 'U': - case 'u': goto yy116; + case 'u': goto yy122; default: goto yy37; } -yy114: +yy119: yych = *++cur; switch (yych) { case '+': - case '-': goto yy186; + case '-': goto yy105; case '0': case '1': case '2': @@ -1502,27 +1545,37 @@ yy114: case '6': case '7': case '8': - case '9': goto yy100; - default: goto yy103; + case '9': goto yy108; + default: goto yy106; } -yy115: - yyaccept = 2; +yy120: + yyaccept = 8; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy187; + case 'l': goto yy201; case 'U': - case 'u': goto yy105; - default: goto yy37; + case 'u': goto yy202; + default: goto yy121; } -yy116: - yych = *++cur; - switch (yych) { +yy121: + cur = ctxmrk; +#line 318 "src/parser.re" + { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_L; cur += 1; goto start; } +#line 1566 "src/parser.c" +yy122: + ++cur; + switch ((yych = *cur)) { case 'L': - case 'l': goto yy188; - default: goto yy37; + case 'l': goto yy204; + default: goto yy123; } -yy117: +yy123: + cur = ctxmrk; +#line 317 "src/parser.re" + { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_U; cur += 1; goto start; } +#line 1578 "src/parser.c" +yy124: yych = *++cur; switch (yych) { case '0': @@ -1546,10 +1599,10 @@ yy117: case 'c': case 'd': case 'e': - case 'f': goto yy189; - default: goto yy103; + case 'f': goto yy205; + default: goto yy106; } -yy118: +yy125: ++cur; if (lim <= cur) if (cur >= lim) goto done;; yych = *cur; @@ -1619,44 +1672,44 @@ yy118: case 'w': case 'x': case 'y': - case 'z': goto yy118; - case '>': goto yy191; - default: goto yy103; + case 'z': goto yy125; + case '>': goto yy207; + default: goto yy106; } -yy120: +yy127: ++cur; -#line 344 "src/parser.re" +#line 357 "src/parser.re" { NEWTOKEN(PSI_T_LSHIFT); goto start; } -#line 1631 "src/parser.c" -yy122: +#line 1684 "src/parser.c" +yy129: ++cur; -#line 346 "src/parser.re" +#line 359 "src/parser.re" { NEWTOKEN(PSI_T_CMP_LE); goto start; } -#line 1636 "src/parser.c" -yy124: +#line 1689 "src/parser.c" +yy131: ++cur; -#line 329 "src/parser.re" +#line 342 "src/parser.re" { NEWTOKEN(PSI_T_CMP_EQ); goto start; } -#line 1641 "src/parser.c" -yy126: +#line 1694 "src/parser.c" +yy133: ++cur; -#line 347 "src/parser.re" +#line 360 "src/parser.re" { NEWTOKEN(PSI_T_CMP_GE); goto start; } -#line 1646 "src/parser.c" -yy128: +#line 1699 "src/parser.c" +yy135: ++cur; -#line 345 "src/parser.re" +#line 358 "src/parser.re" { NEWTOKEN(PSI_T_RSHIFT); goto start; } -#line 1651 "src/parser.c" -yy130: - yyaccept = 4; +#line 1704 "src/parser.c" +yy137: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'R': - case 'r': goto yy193; - default: goto yy58; + case 'r': goto yy209; + default: goto yy60; } -yy131: +yy138: ++cur; if (lim <= cur) if (cur >= lim) goto done;; yych = *cur; @@ -1735,121 +1788,121 @@ yy131: case '|': case '}': case '~': - case 0x7F: goto yy103; - default: goto yy173; + case 0x7F: goto yy106; + default: goto yy180; } -yy132: - yyaccept = 4; +yy139: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'O': - case 'o': goto yy194; - default: goto yy58; + case 'o': goto yy210; + default: goto yy60; } -yy133: - yyaccept = 4; +yy140: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy195; - default: goto yy58; + case 'l': goto yy211; + default: goto yy60; } -yy134: - yyaccept = 4; +yy141: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy196; - default: goto yy58; + case 'a': goto yy212; + default: goto yy60; } -yy135: - yyaccept = 4; +yy142: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy197; + case 'n': goto yy213; case 'U': - case 'u': goto yy198; - default: goto yy58; + case 'u': goto yy214; + default: goto yy60; } -yy136: - yyaccept = 4; +yy143: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'F': - case 'f': goto yy199; - default: goto yy58; + case 'f': goto yy215; + default: goto yy60; } -yy137: - yyaccept = 4; +yy144: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'U': - case 'u': goto yy200; - default: goto yy58; + case 'u': goto yy216; + default: goto yy60; } -yy138: - yyaccept = 4; +yy145: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'I': - case 'i': goto yy201; + case 'i': goto yy217; case 'S': - case 's': goto yy202; - default: goto yy58; + case 's': goto yy218; + default: goto yy60; } -yy139: - yyaccept = 4; +yy146: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'D': - case 'd': goto yy203; + case 'd': goto yy219; case 'U': - case 'u': goto yy204; - default: goto yy58; + case 'u': goto yy220; + default: goto yy60; } -yy140: - yyaccept = 4; +yy147: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'R': - case 'r': goto yy205; - default: goto yy58; + case 'r': goto yy221; + default: goto yy60; } -yy141: - yyaccept = 4; +yy148: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy206; - default: goto yy58; + case 'l': goto yy222; + default: goto yy60; } -yy142: - yyaccept = 4; +yy149: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'O': - case 'o': goto yy207; - default: goto yy58; + case 'o': goto yy223; + default: goto yy60; } -yy143: - yyaccept = 4; +yy150: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy208; - default: goto yy58; + case 'e': goto yy224; + default: goto yy60; } -yy144: - yyaccept = 4; +yy151: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy209; - default: goto yy58; + case 'n': goto yy225; + default: goto yy60; } -yy145: - yyaccept = 5; +yy152: + yyaccept = 9; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -1915,231 +1968,231 @@ yy145: case '|': case '}': case '~': - case 0x7F: goto yy146; + case 0x7F: goto yy153; case 'D': - case 'd': goto yy210; + case 'd': goto yy226; case 'N': - case 'n': goto yy211; - case '\\': goto yy131; - default: goto yy57; + case 'n': goto yy227; + case '\\': goto yy138; + default: goto yy59; } -yy146: -#line 352 "src/parser.re" +yy153: +#line 368 "src/parser.re" { NEWTOKEN(PSI_T_IF); goto start; } -#line 1930 "src/parser.c" -yy147: - yyaccept = 4; +#line 1983 "src/parser.c" +yy154: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'C': - case 'c': goto yy212; + case 'c': goto yy228; case 'T': - case 't': goto yy213; - default: goto yy58; + case 't': goto yy229; + default: goto yy60; } -yy148: +yy155: yych = *++cur; switch (yych) { - case '"': goto yy103; - default: goto yy91; + case '"': goto yy106; + default: goto yy96; } -yy149: +yy156: yych = *++cur; switch (yych) { - case '\'': goto yy103; - default: goto yy98; + case '\'': goto yy106; + default: goto yy103; } -yy150: - yyaccept = 4; +yy157: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy215; - default: goto yy58; + case 't': goto yy231; + default: goto yy60; } -yy151: - yyaccept = 4; +yy158: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'B': - case 'b': goto yy217; - default: goto yy58; + case 'b': goto yy233; + default: goto yy60; } -yy152: - yyaccept = 4; +yy159: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy219; - default: goto yy58; + case 'n': goto yy235; + default: goto yy60; } -yy153: - yyaccept = 4; +yy160: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'X': - case 'x': goto yy220; - default: goto yy58; + case 'x': goto yy236; + default: goto yy60; } -yy154: - yyaccept = 4; +yy161: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy221; - default: goto yy58; + case 'l': goto yy237; + default: goto yy60; } -yy155: - yyaccept = 4; +yy162: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'J': - case 'j': goto yy222; - default: goto yy58; + case 'j': goto yy238; + default: goto yy60; } -yy156: - yyaccept = 4; +yy163: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy223; - default: goto yy58; + case 't': goto yy239; + default: goto yy60; } -yy157: - yyaccept = 4; +yy164: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'S': - case 's': goto yy224; - default: goto yy58; + case 's': goto yy240; + default: goto yy60; } -yy158: - yyaccept = 4; +yy165: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy225; - default: goto yy58; + case 'e': goto yy241; + default: goto yy60; } -yy159: - yyaccept = 4; +yy166: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy226; - default: goto yy58; + case 't': goto yy242; + default: goto yy60; } -yy160: - yyaccept = 4; +yy167: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy227; - default: goto yy58; + case 't': goto yy243; + default: goto yy60; } -yy161: - yyaccept = 4; +yy168: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'O': - case 'o': goto yy229; - default: goto yy58; + case 'o': goto yy245; + default: goto yy60; } -yy162: - yyaccept = 4; +yy169: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'G': - case 'g': goto yy230; - default: goto yy58; + case 'g': goto yy246; + default: goto yy60; } -yy163: - yyaccept = 4; +yy170: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy231; + case 'a': goto yy247; case 'R': - case 'r': goto yy232; - default: goto yy58; + case 'r': goto yy248; + default: goto yy60; } -yy164: - yyaccept = 4; +yy171: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'M': - case 'm': goto yy233; - default: goto yy58; + case 'm': goto yy249; + default: goto yy60; } -yy165: - yyaccept = 4; +yy172: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '_': goto yy234; - default: goto yy58; + case '_': goto yy250; + default: goto yy60; } -yy166: - yyaccept = 4; +yy173: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'U': - case 'u': goto yy235; - default: goto yy58; + case 'u': goto yy251; + default: goto yy60; } -yy167: - yyaccept = 4; +yy174: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'P': - case 'p': goto yy236; - default: goto yy58; + case 'p': goto yy252; + default: goto yy60; } -yy168: - yyaccept = 4; +yy175: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy237; - default: goto yy58; + case 'n': goto yy253; + default: goto yy60; } -yy169: - yyaccept = 4; +yy176: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'D': - case 'd': goto yy238; + case 'd': goto yy254; case 'I': - case 'i': goto yy239; + case 'i': goto yy255; case 'S': - case 's': goto yy240; - default: goto yy58; + case 's': goto yy256; + default: goto yy60; } -yy170: - yyaccept = 4; +yy177: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'I': - case 'i': goto yy241; - default: goto yy58; + case 'i': goto yy257; + default: goto yy60; } -yy171: - yyaccept = 4; +yy178: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'R': - case 'r': goto yy242; - default: goto yy58; + case 'r': goto yy258; + default: goto yy60; } -yy172: - yyaccept = 4; +yy179: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy243; - default: goto yy58; + case 'a': goto yy259; + default: goto yy60; } -yy173: - yyaccept = 6; +yy180: + yyaccept = 10; mrk = ++cur; if (lim <= cur) if (cur >= lim) goto done;; yych = *cur; @@ -2207,80 +2260,119 @@ yy173: case '|': case '}': case '~': - case 0x7F: goto yy175; - case '\\': goto yy131; - default: goto yy173; + case 0x7F: goto yy182; + case '\\': goto yy138; + default: goto yy180; } -yy175: -#line 426 "src/parser.re" - { NEWTOKEN(PSI_T_NSNAME); goto start; } -#line 2218 "src/parser.c" -yy176: - ++cur; -#line 331 "src/parser.re" - { NEWTOKEN(PSI_T_OR); goto start; } -#line 2223 "src/parser.c" -yy178: - ++cur; -#line 428 "src/parser.re" - { NEWTOKEN(PSI_T_QUOTED_STRING); goto start; } -#line 2228 "src/parser.c" -yy180: - ++cur; -yy181: -#line 429 "src/parser.re" - { NEWTOKEN(PSI_T_QUOTED_CHAR); goto start; } -#line 2234 "src/parser.c" yy182: - ++cur; - if (lim <= cur) if (cur >= lim) goto done;; - yych = *cur; +#line 441 "src/parser.re" + { NEWTOKEN(PSI_T_NSNAME); goto start; } +#line 2271 "src/parser.c" +yy183: + yyaccept = 6; + yych = *(mrk = ++cur); switch (yych) { - case '\'': goto yy244; - case '\\': goto yy182; - default: goto yy98; + case 'a': goto yy260; + default: goto yy60; } yy184: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'c': goto yy261; + default: goto yy60; + } +yy185: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'E': + case 'e': goto yy241; + case 'a': goto yy262; + default: goto yy60; + } +yy186: ++cur; -#line 351 "src/parser.re" +#line 344 "src/parser.re" + { NEWTOKEN(PSI_T_OR); goto start; } +#line 2299 "src/parser.c" +yy188: + ++cur; +#line 443 "src/parser.re" + { NEWTOKEN(PSI_T_QUOTED_STRING); goto start; } +#line 2304 "src/parser.c" +yy190: + ++cur; +yy191: +#line 444 "src/parser.re" + { NEWTOKEN(PSI_T_QUOTED_CHAR); goto start; } +#line 2310 "src/parser.c" +yy192: + ++cur; + if (lim <= cur) if (cur >= lim) goto done;; + yych = *cur; + switch (yych) { + case '\'': goto yy263; + case '\\': goto yy192; + default: goto yy103; + } +yy194: + ++cur; +#line 364 "src/parser.re" { NEWTOKEN(PSI_T_ELLIPSIS); goto start; } -#line 2248 "src/parser.c" -yy186: +#line 2324 "src/parser.c" +yy196: yych = *++cur; switch (yych) { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': goto yy100; - default: goto yy103; + case 'D': + case 'd': goto yy264; + case 'F': + case 'f': goto yy266; + case 'L': + case 'l': goto yy268; + default: goto yy106; } -yy187: +yy197: + ++cur; + cur = ctxmrk; +#line 323 "src/parser.re" + { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_F; cur += 1; goto start; } +#line 2341 "src/parser.c" +yy199: + ++cur; + cur = ctxmrk; +#line 324 "src/parser.re" + { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_L; cur += 1; goto start; } +#line 2347 "src/parser.c" +yy201: yych = *++cur; switch (yych) { case 'U': - case 'u': goto yy105; - default: goto yy103; + case 'u': goto yy270; + default: goto yy106; } -yy188: +yy202: + ++cur; +yy203: + cur = ctxmrk; +#line 319 "src/parser.re" + { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_UL; cur += 2; goto start; } +#line 2361 "src/parser.c" +yy204: yych = *++cur; switch (yych) { case 'L': - case 'l': goto yy105; - default: goto yy37; + case 'l': goto yy270; + default: goto yy203; } -yy189: - yyaccept = 2; +yy205: + yyaccept = 4; mrk = ++cur; if ((lim - cur) < 3) if (cur >= lim) goto done;; yych = *cur; + ctxmrk = cur; switch (yych) { - case '.': goto yy245; + case '.': goto yy272; case '0': case '1': case '2': @@ -2302,184 +2394,184 @@ yy189: case 'c': case 'd': case 'e': - case 'f': goto yy189; + case 'f': goto yy205; case 'L': - case 'l': goto yy115; + case 'l': goto yy120; case 'P': - case 'p': goto yy114; + case 'p': goto yy119; case 'U': - case 'u': goto yy116; + case 'u': goto yy122; default: goto yy37; } -yy191: +yy207: ++cur; -#line 430 "src/parser.re" +#line 445 "src/parser.re" { NEWTOKEN(PSI_T_CPP_HEADER); goto start; } -#line 2319 "src/parser.c" -yy193: - yyaccept = 4; +#line 2411 "src/parser.c" +yy209: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy247; + case 'a': goto yy274; case 'V': - case 'v': goto yy248; - default: goto yy58; + case 'v': goto yy275; + default: goto yy60; } -yy194: - yyaccept = 4; +yy210: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy249; - default: goto yy58; + case 'l': goto yy276; + default: goto yy60; } -yy195: - yyaccept = 4; +yy211: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy251; - default: goto yy58; + case 'l': goto yy278; + default: goto yy60; } -yy196: - yyaccept = 4; +yy212: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'R': - case 'r': goto yy252; - default: goto yy58; + case 'r': goto yy279; + default: goto yy60; } -yy197: - yyaccept = 4; +yy213: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'S': - case 's': goto yy254; - default: goto yy58; + case 's': goto yy281; + default: goto yy60; } -yy198: - yyaccept = 4; +yy214: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy255; - default: goto yy58; + case 'n': goto yy282; + default: goto yy60; } -yy199: - yyaccept = 4; +yy215: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'I': - case 'i': goto yy256; - default: goto yy58; + case 'i': goto yy283; + default: goto yy60; } -yy200: - yyaccept = 4; +yy216: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'B': - case 'b': goto yy257; - default: goto yy58; + case 'b': goto yy284; + default: goto yy60; } -yy201: - yyaccept = 4; +yy217: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'F': - case 'f': goto yy258; - default: goto yy58; + case 'f': goto yy285; + default: goto yy60; } -yy202: - yyaccept = 4; +yy218: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy260; - default: goto yy58; + case 'e': goto yy287; + default: goto yy60; } -yy203: - yyaccept = 4; +yy219: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'I': - case 'i': goto yy262; - default: goto yy58; + case 'i': goto yy289; + default: goto yy60; } -yy204: - yyaccept = 4; +yy220: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'M': - case 'm': goto yy263; - default: goto yy58; + case 'm': goto yy290; + default: goto yy60; } -yy205: - yyaccept = 4; +yy221: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'O': - case 'o': goto yy265; - default: goto yy58; + case 'o': goto yy292; + default: goto yy60; } -yy206: - yyaccept = 4; +yy222: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'S': - case 's': goto yy266; - default: goto yy58; + case 's': goto yy293; + default: goto yy60; } -yy207: - yyaccept = 4; +yy223: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy267; - default: goto yy58; + case 'a': goto yy294; + default: goto yy60; } -yy208: - yyaccept = 4; +yy224: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy268; - default: goto yy58; + case 'e': goto yy295; + default: goto yy60; } -yy209: - yyaccept = 4; +yy225: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'C': - case 'c': goto yy270; - default: goto yy58; + case 'c': goto yy297; + default: goto yy60; } -yy210: - yyaccept = 4; +yy226: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy271; - default: goto yy58; + case 'e': goto yy298; + default: goto yy60; } -yy211: - yyaccept = 4; +yy227: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'D': - case 'd': goto yy272; - default: goto yy58; + case 'd': goto yy299; + default: goto yy60; } -yy212: - yyaccept = 4; +yy228: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy273; - default: goto yy58; + case 'l': goto yy300; + default: goto yy60; } -yy213: - yyaccept = 7; +yy229: + yyaccept = 11; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -2545,22 +2637,22 @@ yy213: case '|': case '}': case '~': - case 0x7F: goto yy214; - case '1': goto yy274; - case '3': goto yy275; - case '6': goto yy276; - case '8': goto yy277; + case 0x7F: goto yy230; + case '1': goto yy301; + case '3': goto yy302; + case '6': goto yy303; + case '8': goto yy304; case 'V': - case 'v': goto yy278; - case '\\': goto yy131; - default: goto yy57; + case 'v': goto yy305; + case '\\': goto yy138; + default: goto yy59; } -yy214: -#line 374 "src/parser.re" +yy230: +#line 390 "src/parser.re" { NEWTOKEN(PSI_T_INT); goto start; } -#line 2562 "src/parser.c" -yy215: - yyaccept = 8; +#line 2654 "src/parser.c" +yy231: + yyaccept = 12; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -2626,16 +2718,16 @@ yy215: case '|': case '}': case '~': - case 0x7F: goto yy216; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy232; + case '\\': goto yy138; + default: goto yy59; } -yy216: -#line 400 "src/parser.re" +yy232: +#line 416 "src/parser.re" { NEWTOKEN(PSI_T_LET); goto start; } -#line 2637 "src/parser.c" -yy217: - yyaccept = 9; +#line 2729 "src/parser.c" +yy233: + yyaccept = 13; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -2701,81 +2793,81 @@ yy217: case '|': case '}': case '~': - case 0x7F: goto yy218; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy234; + case '\\': goto yy138; + default: goto yy59; } -yy218: -#line 399 "src/parser.re" +yy234: +#line 415 "src/parser.re" { NEWTOKEN(PSI_T_LIB); goto start; } -#line 2712 "src/parser.c" -yy219: - yyaccept = 4; +#line 2804 "src/parser.c" +yy235: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'G': - case 'g': goto yy279; - default: goto yy58; + case 'g': goto yy306; + default: goto yy60; } -yy220: - yyaccept = 4; +yy236: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy281; - default: goto yy58; + case 'e': goto yy308; + default: goto yy60; } -yy221: - yyaccept = 4; +yy237: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy282; - default: goto yy58; + case 'l': goto yy309; + default: goto yy60; } -yy222: - yyaccept = 4; +yy238: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy284; + case 'e': goto yy311; case 'V': - case 'v': goto yy285; - default: goto yy58; + case 'v': goto yy312; + default: goto yy60; } -yy223: - yyaccept = 4; +yy239: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'H': - case 'h': goto yy286; - default: goto yy58; + case 'h': goto yy313; + default: goto yy60; } -yy224: - yyaccept = 4; +yy240: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy287; - default: goto yy58; + case 't': goto yy314; + default: goto yy60; } -yy225: - yyaccept = 4; +yy241: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '_': goto yy288; - default: goto yy58; + case '_': goto yy315; + default: goto yy60; } -yy226: - yyaccept = 4; +yy242: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'U': - case 'u': goto yy289; - default: goto yy58; + case 'u': goto yy316; + default: goto yy60; } -yy227: - yyaccept = 10; +yy243: + yyaccept = 14; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -2841,160 +2933,205 @@ yy227: case '|': case '}': case '~': - case 0x7F: goto yy228; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy244; + case '\\': goto yy138; + default: goto yy59; } -yy228: -#line 401 "src/parser.re" +yy244: +#line 417 "src/parser.re" { NEWTOKEN(PSI_T_SET); goto start; } -#line 2852 "src/parser.c" -yy229: - yyaccept = 4; +#line 2944 "src/parser.c" +yy245: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'R': - case 'r': goto yy290; - default: goto yy58; + case 'r': goto yy317; + default: goto yy60; } -yy230: - yyaccept = 4; +yy246: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy291; - default: goto yy58; + case 'n': goto yy318; + default: goto yy60; } -yy231: - yyaccept = 4; +yy247: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy292; - default: goto yy58; + case 't': goto yy319; + default: goto yy60; } -yy232: - yyaccept = 4; +yy248: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'I': - case 'i': goto yy293; + case 'i': goto yy320; case 'L': - case 'l': goto yy294; + case 'l': goto yy321; case 'U': - case 'u': goto yy295; + case 'u': goto yy322; case 'V': - case 'v': goto yy296; - default: goto yy58; + case 'v': goto yy323; + default: goto yy60; } -yy233: - yyaccept = 4; +yy249: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'P': - case 'p': goto yy297; - default: goto yy58; + case 'p': goto yy324; + default: goto yy60; } -yy234: - yyaccept = 4; +yy250: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy299; + case 'a': goto yy326; case 'B': - case 'b': goto yy300; + case 'b': goto yy327; case 'F': - case 'f': goto yy301; + case 'f': goto yy328; case 'I': - case 'i': goto yy302; + case 'i': goto yy329; case 'O': - case 'o': goto yy303; + case 'o': goto yy330; case 'S': - case 's': goto yy304; - default: goto yy58; + case 's': goto yy331; + default: goto yy60; } -yy235: - yyaccept = 4; +yy251: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy305; - default: goto yy58; + case 'e': goto yy332; + default: goto yy60; } -yy236: - yyaccept = 4; +yy252: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy307; - default: goto yy58; + case 'e': goto yy334; + default: goto yy60; } -yy237: - yyaccept = 4; +yy253: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy308; - default: goto yy58; + case 't': goto yy335; + default: goto yy60; } -yy238: - yyaccept = 4; +yy254: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy309; - default: goto yy58; + case 'e': goto yy336; + default: goto yy60; } -yy239: - yyaccept = 4; +yy255: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'O': - case 'o': goto yy310; - default: goto yy58; + case 'o': goto yy337; + default: goto yy60; } -yy240: - yyaccept = 4; +yy256: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'I': - case 'i': goto yy311; - default: goto yy58; + case 'i': goto yy338; + default: goto yy60; } -yy241: - yyaccept = 4; - yych = *(mrk = ++cur); +yy257: + yyaccept = 6; + yych = *(mrk = ++cur); switch (yych) { case 'D': - case 'd': goto yy312; - default: goto yy58; + case 'd': goto yy339; + default: goto yy60; } -yy242: - yyaccept = 4; +yy258: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy314; - default: goto yy58; + case 'n': goto yy341; + default: goto yy60; } -yy243: - yyaccept = 4; +yy259: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy315; - default: goto yy58; + case 'l': goto yy342; + default: goto yy60; } -yy244: - yyaccept = 11; +yy260: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 't': goto yy344; + default: goto yy60; + } +yy261: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'e': goto yy345; + default: goto yy60; + } +yy262: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'g': goto yy347; + default: goto yy60; + } +yy263: + yyaccept = 15; mrk = ++cur; if (lim <= cur) if (cur >= lim) goto done;; yych = *cur; switch (yych) { - case '\'': goto yy180; - default: goto yy98; + case '\'': goto yy190; + default: goto yy103; } -yy245: +yy264: + ++cur; + cur = ctxmrk; +#line 326 "src/parser.re" + { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DD; cur += 2; goto start; } +#line 3116 "src/parser.c" +yy266: + ++cur; + cur = ctxmrk; +#line 325 "src/parser.re" + { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DF; cur += 2; goto start; } +#line 3122 "src/parser.c" +yy268: + ++cur; + cur = ctxmrk; +#line 327 "src/parser.re" + { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DL; cur += 2; goto start; } +#line 3128 "src/parser.c" +yy270: + ++cur; + cur = ctxmrk; +#line 320 "src/parser.re" + { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_ULL; cur += 3; goto start; } +#line 3134 "src/parser.c" +yy272: ++cur; if ((lim - cur) < 3) if (cur >= lim) goto done;; yych = *cur; @@ -3020,29 +3157,29 @@ yy245: case 'c': case 'd': case 'e': - case 'f': goto yy245; + case 'f': goto yy272; case 'P': - case 'p': goto yy114; - default: goto yy103; + case 'p': goto yy119; + default: goto yy106; } -yy247: - yyaccept = 4; +yy274: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'Y': - case 'y': goto yy317; - default: goto yy58; + case 'y': goto yy348; + default: goto yy60; } -yy248: - yyaccept = 4; +yy275: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy319; - default: goto yy58; + case 'a': goto yy350; + default: goto yy60; } -yy249: - yyaccept = 12; +yy276: + yyaccept = 16; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -3108,30 +3245,30 @@ yy249: case '|': case '}': case '~': - case 0x7F: goto yy250; + case 0x7F: goto yy277; case 'V': - case 'v': goto yy320; - case '\\': goto yy131; - default: goto yy57; + case 'v': goto yy351; + case '\\': goto yy138; + default: goto yy59; } -yy250: -#line 371 "src/parser.re" +yy277: +#line 387 "src/parser.re" { NEWTOKEN(PSI_T_BOOL); goto start; } -#line 3121 "src/parser.c" -yy251: - yyaccept = 4; +#line 3258 "src/parser.c" +yy278: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy321; + case 'a': goto yy352; case 'B': - case 'b': goto yy322; + case 'b': goto yy353; case 'O': - case 'o': goto yy323; - default: goto yy58; + case 'o': goto yy354; + default: goto yy60; } -yy252: - yyaccept = 13; +yy279: + yyaccept = 17; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -3197,48 +3334,48 @@ yy252: case '|': case '}': case '~': - case 0x7F: goto yy253; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy280; + case '\\': goto yy138; + default: goto yy59; } -yy253: -#line 372 "src/parser.re" +yy280: +#line 388 "src/parser.re" { NEWTOKEN(PSI_T_CHAR); goto start; } -#line 3208 "src/parser.c" -yy254: - yyaccept = 4; +#line 3345 "src/parser.c" +yy281: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy324; - default: goto yy58; + case 't': goto yy355; + default: goto yy60; } -yy255: - yyaccept = 4; +yy282: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy326; - default: goto yy58; + case 't': goto yy357; + default: goto yy60; } -yy256: - yyaccept = 4; +yy283: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy328; - default: goto yy58; + case 'n': goto yy359; + default: goto yy60; } -yy257: - yyaccept = 4; +yy284: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy329; - default: goto yy58; + case 'l': goto yy360; + default: goto yy60; } -yy258: - yyaccept = 14; +yy285: + yyaccept = 18; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -3304,16 +3441,16 @@ yy258: case '|': case '}': case '~': - case 0x7F: goto yy259; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy286; + case '\\': goto yy138; + default: goto yy59; } -yy259: -#line 356 "src/parser.re" +yy286: +#line 372 "src/parser.re" { NEWTOKEN(PSI_T_ELIF); goto start; } -#line 3315 "src/parser.c" -yy260: - yyaccept = 15; +#line 3452 "src/parser.c" +yy287: + yyaccept = 19; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -3379,24 +3516,24 @@ yy260: case '|': case '}': case '~': - case 0x7F: goto yy261; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy288; + case '\\': goto yy138; + default: goto yy59; } -yy261: -#line 355 "src/parser.re" +yy288: +#line 371 "src/parser.re" { NEWTOKEN(PSI_T_ELSE); goto start; } -#line 3390 "src/parser.c" -yy262: - yyaccept = 4; +#line 3527 "src/parser.c" +yy289: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'F': - case 'f': goto yy330; - default: goto yy58; + case 'f': goto yy361; + default: goto yy60; } -yy263: - yyaccept = 16; +yy290: + yyaccept = 20; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -3462,40 +3599,40 @@ yy263: case '|': case '}': case '~': - case 0x7F: goto yy264; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy291; + case '\\': goto yy138; + default: goto yy59; } -yy264: -#line 397 "src/parser.re" +yy291: +#line 413 "src/parser.re" { NEWTOKEN(PSI_T_ENUM); goto start; } -#line 3473 "src/parser.c" -yy265: - yyaccept = 4; +#line 3610 "src/parser.c" +yy292: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'R': - case 'r': goto yy332; - default: goto yy58; + case 'r': goto yy363; + default: goto yy60; } -yy266: - yyaccept = 4; +yy293: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy334; - default: goto yy58; + case 'e': goto yy365; + default: goto yy60; } -yy267: - yyaccept = 4; +yy294: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy336; - default: goto yy58; + case 't': goto yy367; + default: goto yy60; } -yy268: - yyaccept = 17; +yy295: + yyaccept = 21; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -3561,84 +3698,84 @@ yy268: case '|': case '}': case '~': - case 0x7F: goto yy269; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy296; + case '\\': goto yy138; + default: goto yy59; } -yy269: -#line 405 "src/parser.re" +yy296: +#line 421 "src/parser.re" { NEWTOKEN(PSI_T_FREE); goto start; } -#line 3572 "src/parser.c" -yy270: - yyaccept = 4; +#line 3709 "src/parser.c" +yy297: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy338; - default: goto yy58; + case 't': goto yy369; + default: goto yy60; } -yy271: - yyaccept = 4; +yy298: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'F': - case 'f': goto yy339; - default: goto yy58; + case 'f': goto yy370; + default: goto yy60; } -yy272: - yyaccept = 4; +yy299: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy341; - default: goto yy58; + case 'e': goto yy372; + default: goto yy60; } -yy273: - yyaccept = 4; +yy300: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'U': - case 'u': goto yy342; - default: goto yy58; + case 'u': goto yy373; + default: goto yy60; } -yy274: - yyaccept = 4; +yy301: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '6': goto yy343; - default: goto yy58; + case '6': goto yy374; + default: goto yy60; } -yy275: - yyaccept = 4; +yy302: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '2': goto yy344; - default: goto yy58; + case '2': goto yy375; + default: goto yy60; } -yy276: - yyaccept = 4; +yy303: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '4': goto yy345; - default: goto yy58; + case '4': goto yy376; + default: goto yy60; } -yy277: - yyaccept = 4; +yy304: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '_': goto yy346; - default: goto yy58; + case '_': goto yy377; + default: goto yy60; } -yy278: - yyaccept = 4; +yy305: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy347; - default: goto yy58; + case 'a': goto yy378; + default: goto yy60; } -yy279: - yyaccept = 18; +yy306: + yyaccept = 22; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -3704,24 +3841,202 @@ yy279: case '|': case '}': case '~': - case 0x7F: goto yy280; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy307; + case '\\': goto yy138; + default: goto yy59; } -yy280: -#line 375 "src/parser.re" +yy307: +#line 391 "src/parser.re" { NEWTOKEN(PSI_T_LONG); goto start; } -#line 3715 "src/parser.c" -yy281: - yyaccept = 4; +#line 3852 "src/parser.c" +yy308: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'D': + case 'd': goto yy379; + default: goto yy60; + } +yy309: + yyaccept = 23; + yych = *(mrk = ++cur); + switch (yych) { + case 0x00: + case 0x01: + case 0x02: + case 0x03: + case 0x04: + case 0x05: + case 0x06: + case 0x07: + case 0x08: + case '\t': + case '\n': + case '\v': + case '\f': + case '\r': + case 0x0E: + case 0x0F: + case 0x10: + case 0x11: + case 0x12: + case 0x13: + case 0x14: + case 0x15: + case 0x16: + case 0x17: + case 0x18: + case 0x19: + case 0x1A: + case 0x1B: + case 0x1C: + case 0x1D: + case 0x1E: + case 0x1F: + case ' ': + case '!': + case '"': + case '#': + case '$': + case '%': + case '&': + case '\'': + case '(': + case ')': + case '*': + case '+': + case ',': + case '-': + case '.': + case '/': + case ':': + case ';': + case '<': + case '=': + case '>': + case '?': + case '@': + case '[': + case ']': + case '^': + case '`': + case '{': + case '|': + case '}': + case '~': + case 0x7F: goto yy310; + case '\\': goto yy138; + default: goto yy59; + } +yy310: +#line 383 "src/parser.re" + { NEWTOKEN(PSI_T_NULL); goto start; } +#line 3935 "src/parser.c" +yy311: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'C': + case 'c': goto yy381; + default: goto yy60; + } +yy312: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'A': + case 'a': goto yy382; + default: goto yy60; + } +yy313: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'V': + case 'v': goto yy383; + default: goto yy60; + } +yy314: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case '_': goto yy384; + default: goto yy60; + } +yy315: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'A': + case 'a': goto yy385; + default: goto yy60; + } +yy316: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'R': + case 'r': goto yy386; + default: goto yy60; + } +yy317: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'T': + case 't': goto yy387; + default: goto yy60; + } +yy318: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'E': + case 'e': goto yy389; + default: goto yy60; + } +yy319: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'I': + case 'i': goto yy390; + default: goto yy60; + } +yy320: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'N': + case 'n': goto yy391; + default: goto yy60; + } +yy321: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'E': + case 'e': goto yy392; + default: goto yy60; + } +yy322: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'C': + case 'c': goto yy393; + default: goto yy60; + } +yy323: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'D': - case 'd': goto yy348; - default: goto yy58; + case 'A': + case 'a': goto yy394; + default: goto yy60; } -yy282: - yyaccept = 19; +yy324: + yyaccept = 24; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -3787,119 +4102,64 @@ yy282: case '|': case '}': case '~': - case 0x7F: goto yy283; - case '\\': goto yy131; - default: goto yy57; - } -yy283: -#line 367 "src/parser.re" - { NEWTOKEN(PSI_T_NULL); goto start; } -#line 3798 "src/parser.c" -yy284: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'C': - case 'c': goto yy350; - default: goto yy58; - } -yy285: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'A': - case 'a': goto yy351; - default: goto yy58; - } -yy286: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'V': - case 'v': goto yy352; - default: goto yy58; - } -yy287: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case '_': goto yy353; - default: goto yy58; - } -yy288: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'A': - case 'a': goto yy354; - default: goto yy58; + case 0x7F: goto yy325; + case '\\': goto yy138; + default: goto yy59; } -yy289: - yyaccept = 4; +yy325: +#line 422 "src/parser.re" + { NEWTOKEN(PSI_T_TEMP); goto start; } +#line 4113 "src/parser.c" +yy326: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'R': - case 'r': goto yy355; - default: goto yy58; - } -yy290: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'T': - case 't': goto yy356; - default: goto yy58; + case 'r': goto yy395; + default: goto yy60; } -yy291: - yyaccept = 4; +yy327: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'E': - case 'e': goto yy358; - default: goto yy58; + case 'O': + case 'o': goto yy396; + default: goto yy60; } -yy292: - yyaccept = 4; +yy328: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'I': - case 'i': goto yy359; - default: goto yy58; + case 'L': + case 'l': goto yy397; + default: goto yy60; } -yy293: - yyaccept = 4; +yy329: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy360; - default: goto yy58; - } -yy294: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'E': - case 'e': goto yy361; - default: goto yy58; + case 'n': goto yy398; + default: goto yy60; } -yy295: - yyaccept = 4; +yy330: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'C': - case 'c': goto yy362; - default: goto yy58; + case 'B': + case 'b': goto yy399; + default: goto yy60; } -yy296: - yyaccept = 4; +yy331: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'A': - case 'a': goto yy363; - default: goto yy58; + case 'T': + case 't': goto yy400; + default: goto yy60; } -yy297: - yyaccept = 20; +yy332: + yyaccept = 25; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -3965,64 +4225,58 @@ yy297: case '|': case '}': case '~': - case 0x7F: goto yy298; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy333; + case '\\': goto yy138; + default: goto yy59; } -yy298: -#line 406 "src/parser.re" - { NEWTOKEN(PSI_T_TEMP); goto start; } -#line 3976 "src/parser.c" -yy299: - yyaccept = 4; +yy333: +#line 381 "src/parser.re" + { NEWTOKEN(PSI_T_TRUE); goto start; } +#line 4236 "src/parser.c" +yy334: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'R': - case 'r': goto yy364; - default: goto yy58; + case 'D': + case 'd': goto yy401; + default: goto yy60; } -yy300: - yyaccept = 4; +yy335: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'O': - case 'o': goto yy365; - default: goto yy58; + case '1': goto yy402; + case '3': goto yy403; + case '6': goto yy404; + case '8': goto yy405; + default: goto yy60; } -yy301: - yyaccept = 4; +yy336: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'L': - case 'l': goto yy366; - default: goto yy58; + case 'F': + case 'f': goto yy406; + default: goto yy60; } -yy302: - yyaccept = 4; +yy337: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy367; - default: goto yy58; + case 'n': goto yy408; + default: goto yy60; } -yy303: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'B': - case 'b': goto yy368; - default: goto yy58; - } -yy304: - yyaccept = 4; +yy338: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'T': - case 't': goto yy369; - default: goto yy58; + case 'G': + case 'g': goto yy410; + default: goto yy60; } -yy305: - yyaccept = 21; +yy339: + yyaccept = 26; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -4088,58 +4342,24 @@ yy305: case '|': case '}': case '~': - case 0x7F: goto yy306; - case '\\': goto yy131; - default: goto yy57; - } -yy306: -#line 365 "src/parser.re" - { NEWTOKEN(PSI_T_TRUE); goto start; } -#line 4099 "src/parser.c" -yy307: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'D': - case 'd': goto yy370; - default: goto yy58; - } -yy308: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case '1': goto yy371; - case '3': goto yy372; - case '6': goto yy373; - case '8': goto yy374; - default: goto yy58; - } -yy309: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'F': - case 'f': goto yy375; - default: goto yy58; - } -yy310: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'N': - case 'n': goto yy377; - default: goto yy58; + case 0x7F: goto yy340; + case '\\': goto yy138; + default: goto yy59; } -yy311: - yyaccept = 4; +yy340: +#line 386 "src/parser.re" + { NEWTOKEN(PSI_T_VOID); goto start; } +#line 4353 "src/parser.c" +yy341: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'G': - case 'g': goto yy379; - default: goto yy58; + case 'I': + case 'i': goto yy411; + default: goto yy60; } -yy312: - yyaccept = 22; +yy342: + yyaccept = 27; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -4205,24 +4425,23 @@ yy312: case '|': case '}': case '~': - case 0x7F: goto yy313; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy343; + case '\\': goto yy138; + default: goto yy59; } -yy313: -#line 370 "src/parser.re" - { NEWTOKEN(PSI_T_VOID); goto start; } -#line 4216 "src/parser.c" -yy314: - yyaccept = 4; +yy343: +#line 431 "src/parser.re" + { NEWTOKEN(PSI_T_ZVAL); goto start; } +#line 4436 "src/parser.c" +yy344: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'I': - case 'i': goto yy380; - default: goto yy58; + case 't': goto yy412; + default: goto yy60; } -yy315: - yyaccept = 23; +yy345: + yyaccept = 28; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -4288,16 +4507,23 @@ yy315: case '|': case '}': case '~': - case 0x7F: goto yy316; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy346; + case '\\': goto yy138; + default: goto yy59; } -yy316: -#line 415 "src/parser.re" - { NEWTOKEN(PSI_T_ZVAL); goto start; } -#line 4299 "src/parser.c" -yy317: - yyaccept = 24; +yy346: +#line 367 "src/parser.re" + { NEWTOKEN(PSI_T_ONCE); goto start; } +#line 4518 "src/parser.c" +yy347: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'm': goto yy413; + default: goto yy60; + } +yy348: + yyaccept = 29; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -4363,56 +4589,56 @@ yy317: case '|': case '}': case '~': - case 0x7F: goto yy318; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy349; + case '\\': goto yy138; + default: goto yy59; } -yy318: -#line 389 "src/parser.re" +yy349: +#line 405 "src/parser.re" { NEWTOKEN(PSI_T_ARRAY); goto start; } -#line 4374 "src/parser.c" -yy319: - yyaccept = 4; +#line 4600 "src/parser.c" +yy350: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy381; - default: goto yy58; + case 'l': goto yy414; + default: goto yy60; } -yy320: - yyaccept = 4; +yy351: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy383; - default: goto yy58; + case 'a': goto yy416; + default: goto yy60; } -yy321: - yyaccept = 4; +yy352: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'B': - case 'b': goto yy384; - default: goto yy58; + case 'b': goto yy417; + default: goto yy60; } -yy322: - yyaccept = 4; +yy353: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy385; - default: goto yy58; + case 'a': goto yy418; + default: goto yy60; } -yy323: - yyaccept = 4; +yy354: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'C': - case 'c': goto yy386; - default: goto yy58; + case 'c': goto yy419; + default: goto yy60; } -yy324: - yyaccept = 25; +yy355: + yyaccept = 30; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -4478,16 +4704,16 @@ yy324: case '|': case '}': case '~': - case 0x7F: goto yy325; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy356; + case '\\': goto yy138; + default: goto yy59; } -yy325: -#line 398 "src/parser.re" +yy356: +#line 414 "src/parser.re" { NEWTOKEN(PSI_T_CONST); goto start; } -#line 4489 "src/parser.c" -yy326: - yyaccept = 26; +#line 4715 "src/parser.c" +yy357: + yyaccept = 31; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -4553,32 +4779,32 @@ yy326: case '|': case '}': case '~': - case 0x7F: goto yy327; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy358; + case '\\': goto yy138; + default: goto yy59; } -yy327: -#line 416 "src/parser.re" +yy358: +#line 432 "src/parser.re" { NEWTOKEN(PSI_T_COUNT); goto start; } -#line 4564 "src/parser.c" -yy328: - yyaccept = 4; +#line 4790 "src/parser.c" +yy359: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy388; - default: goto yy58; + case 'e': goto yy421; + default: goto yy60; } -yy329: - yyaccept = 4; +yy360: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy390; - default: goto yy58; + case 'e': goto yy423; + default: goto yy60; } -yy330: - yyaccept = 27; +yy361: + yyaccept = 32; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -4644,16 +4870,16 @@ yy330: case '|': case '}': case '~': - case 0x7F: goto yy331; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy362; + case '\\': goto yy138; + default: goto yy59; } -yy331: -#line 357 "src/parser.re" +yy362: +#line 373 "src/parser.re" { NEWTOKEN(PSI_T_ENDIF); goto start; } -#line 4655 "src/parser.c" -yy332: - yyaccept = 28; +#line 4881 "src/parser.c" +yy363: + yyaccept = 33; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -4719,16 +4945,16 @@ yy332: case '|': case '}': case '~': - case 0x7F: goto yy333; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy364; + case '\\': goto yy138; + default: goto yy59; } -yy333: -#line 362 "src/parser.re" +yy364: +#line 378 "src/parser.re" { NEWTOKEN(PSI_T_ERROR); goto start; } -#line 4730 "src/parser.c" -yy334: - yyaccept = 29; +#line 4956 "src/parser.c" +yy365: + yyaccept = 34; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -4794,16 +5020,16 @@ yy334: case '|': case '}': case '~': - case 0x7F: goto yy335; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy366; + case '\\': goto yy138; + default: goto yy59; } -yy335: -#line 366 "src/parser.re" +yy366: +#line 382 "src/parser.re" { NEWTOKEN(PSI_T_FALSE); goto start; } -#line 4805 "src/parser.c" -yy336: - yyaccept = 30; +#line 5031 "src/parser.c" +yy367: + yyaccept = 35; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -4869,26 +5095,26 @@ yy336: case '|': case '}': case '~': - case 0x7F: goto yy337; + case 0x7F: goto yy368; case 'V': - case 'v': goto yy392; - case '\\': goto yy131; - default: goto yy57; + case 'v': goto yy425; + case '\\': goto yy138; + default: goto yy59; } -yy337: -#line 376 "src/parser.re" +yy368: +#line 392 "src/parser.re" { NEWTOKEN(PSI_T_FLOAT); goto start; } -#line 4882 "src/parser.c" -yy338: - yyaccept = 4; +#line 5108 "src/parser.c" +yy369: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'I': - case 'i': goto yy393; - default: goto yy58; + case 'i': goto yy426; + default: goto yy60; } -yy339: - yyaccept = 31; +yy370: + yyaccept = 36; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -4954,69 +5180,69 @@ yy339: case '|': case '}': case '~': - case 0x7F: goto yy340; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy371; + case '\\': goto yy138; + default: goto yy59; } -yy340: -#line 353 "src/parser.re" +yy371: +#line 369 "src/parser.re" { NEWTOKEN(PSI_T_IFDEF); goto start; } -#line 4965 "src/parser.c" -yy341: - yyaccept = 4; +#line 5191 "src/parser.c" +yy372: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'F': - case 'f': goto yy394; - default: goto yy58; + case 'f': goto yy427; + default: goto yy60; } -yy342: - yyaccept = 4; +yy373: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'D': - case 'd': goto yy396; - default: goto yy58; + case 'd': goto yy429; + default: goto yy60; } -yy343: - yyaccept = 4; +yy374: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '_': goto yy397; - default: goto yy58; + case '_': goto yy430; + default: goto yy60; } -yy344: - yyaccept = 4; +yy375: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '_': goto yy398; - default: goto yy58; + case '_': goto yy431; + default: goto yy60; } -yy345: - yyaccept = 4; +yy376: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '_': goto yy399; - default: goto yy58; + case '_': goto yy432; + default: goto yy60; } -yy346: - yyaccept = 4; +yy377: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy400; - default: goto yy58; + case 't': goto yy433; + default: goto yy60; } -yy347: - yyaccept = 4; +yy378: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy402; - default: goto yy58; + case 'l': goto yy435; + default: goto yy60; } -yy348: - yyaccept = 32; +yy379: + yyaccept = 37; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -5082,64 +5308,64 @@ yy348: case '|': case '}': case '~': - case 0x7F: goto yy349; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy380; + case '\\': goto yy138; + default: goto yy59; } -yy349: -#line 368 "src/parser.re" +yy380: +#line 384 "src/parser.re" { NEWTOKEN(PSI_T_MIXED); goto start; } -#line 5093 "src/parser.c" -yy350: - yyaccept = 4; +#line 5319 "src/parser.c" +yy381: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy404; - default: goto yy58; + case 't': goto yy437; + default: goto yy60; } -yy351: - yyaccept = 4; +yy382: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy406; - default: goto yy58; + case 'l': goto yy439; + default: goto yy60; } -yy352: - yyaccept = 4; +yy383: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy408; - default: goto yy58; + case 'a': goto yy441; + default: goto yy60; } -yy353: - yyaccept = 4; +yy384: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy409; - default: goto yy58; + case 'a': goto yy442; + default: goto yy60; } -yy354: - yyaccept = 4; +yy385: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'S': - case 's': goto yy410; - default: goto yy58; + case 's': goto yy443; + default: goto yy60; } -yy355: - yyaccept = 4; +yy386: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy411; - default: goto yy58; + case 'n': goto yy444; + default: goto yy60; } -yy356: - yyaccept = 33; +yy387: + yyaccept = 38; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -5205,148 +5431,148 @@ yy356: case '|': case '}': case '~': - case 0x7F: goto yy357; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy388; + case '\\': goto yy138; + default: goto yy59; } -yy357: -#line 373 "src/parser.re" +yy388: +#line 389 "src/parser.re" { NEWTOKEN(PSI_T_SHORT); goto start; } -#line 5216 "src/parser.c" -yy358: - yyaccept = 4; +#line 5442 "src/parser.c" +yy389: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'D': - case 'd': goto yy413; - default: goto yy58; + case 'd': goto yy446; + default: goto yy60; } -yy359: - yyaccept = 4; +yy390: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'C': - case 'c': goto yy415; - default: goto yy58; + case 'c': goto yy448; + default: goto yy60; } -yy360: - yyaccept = 4; +yy391: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'G': - case 'g': goto yy417; - default: goto yy58; + case 'g': goto yy450; + default: goto yy60; } -yy361: - yyaccept = 4; +yy392: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy419; - default: goto yy58; + case 'n': goto yy452; + default: goto yy60; } -yy362: - yyaccept = 4; +yy393: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy421; - default: goto yy58; + case 't': goto yy454; + default: goto yy60; } -yy363: - yyaccept = 4; +yy394: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy423; - default: goto yy58; + case 'l': goto yy456; + default: goto yy60; } -yy364: - yyaccept = 4; +yy395: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'R': - case 'r': goto yy425; - default: goto yy58; + case 'r': goto yy458; + default: goto yy60; } -yy365: - yyaccept = 4; +yy396: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'O': - case 'o': goto yy426; - default: goto yy58; + case 'o': goto yy459; + default: goto yy60; } -yy366: - yyaccept = 4; +yy397: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'O': - case 'o': goto yy427; - default: goto yy58; + case 'o': goto yy460; + default: goto yy60; } -yy367: - yyaccept = 4; +yy398: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy428; - default: goto yy58; + case 't': goto yy461; + default: goto yy60; } -yy368: - yyaccept = 4; +yy399: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'J': - case 'j': goto yy430; - default: goto yy58; + case 'j': goto yy463; + default: goto yy60; } -yy369: - yyaccept = 4; +yy400: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'R': - case 'r': goto yy431; - default: goto yy58; + case 'r': goto yy464; + default: goto yy60; } -yy370: - yyaccept = 4; +yy401: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy432; - default: goto yy58; + case 'e': goto yy465; + default: goto yy60; } -yy371: - yyaccept = 4; +yy402: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '6': goto yy433; - default: goto yy58; + case '6': goto yy466; + default: goto yy60; } -yy372: - yyaccept = 4; +yy403: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '2': goto yy434; - default: goto yy58; + case '2': goto yy467; + default: goto yy60; } -yy373: - yyaccept = 4; +yy404: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '4': goto yy435; - default: goto yy58; + case '4': goto yy468; + default: goto yy60; } -yy374: - yyaccept = 4; +yy405: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case '_': goto yy436; - default: goto yy58; + case '_': goto yy469; + default: goto yy60; } -yy375: - yyaccept = 34; +yy406: + yyaccept = 39; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -5412,16 +5638,16 @@ yy375: case '|': case '}': case '~': - case 0x7F: goto yy376; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy407; + case '\\': goto yy138; + default: goto yy59; } -yy376: -#line 360 "src/parser.re" +yy407: +#line 376 "src/parser.re" { NEWTOKEN(PSI_T_UNDEF); goto start; } -#line 5423 "src/parser.c" -yy377: - yyaccept = 35; +#line 5649 "src/parser.c" +yy408: + yyaccept = 40; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -5487,32 +5713,46 @@ yy377: case '|': case '}': case '~': - case 0x7F: goto yy378; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy409; + case '\\': goto yy138; + default: goto yy59; } -yy378: -#line 396 "src/parser.re" +yy409: +#line 412 "src/parser.re" { NEWTOKEN(PSI_T_UNION); goto start; } -#line 5498 "src/parser.c" -yy379: - yyaccept = 4; +#line 5724 "src/parser.c" +yy410: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy437; - default: goto yy58; + case 'n': goto yy470; + default: goto yy60; } -yy380: - yyaccept = 4; +yy411: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy438; - default: goto yy58; + case 'n': goto yy471; + default: goto yy60; } -yy381: - yyaccept = 36; +yy412: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'r': goto yy472; + default: goto yy60; + } +yy413: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'a': goto yy473; + default: goto yy60; + } +yy414: + yyaccept = 41; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -5578,40 +5818,40 @@ yy381: case '|': case '}': case '~': - case 0x7F: goto yy382; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy415; + case '\\': goto yy138; + default: goto yy59; } -yy382: -#line 413 "src/parser.re" +yy415: +#line 429 "src/parser.re" { NEWTOKEN(PSI_T_ARRVAL); goto start; } -#line 5589 "src/parser.c" -yy383: - yyaccept = 4; +#line 5829 "src/parser.c" +yy416: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy439; - default: goto yy58; + case 'l': goto yy475; + default: goto yy60; } -yy384: - yyaccept = 4; +yy417: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy441; - default: goto yy58; + case 'l': goto yy477; + default: goto yy60; } -yy385: - yyaccept = 4; +yy418: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'C': - case 'c': goto yy442; - default: goto yy58; + case 'c': goto yy478; + default: goto yy60; } -yy386: - yyaccept = 37; +yy419: + yyaccept = 42; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -5677,16 +5917,16 @@ yy386: case '|': case '}': case '~': - case 0x7F: goto yy387; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy420; + case '\\': goto yy138; + default: goto yy59; } -yy387: -#line 417 "src/parser.re" +yy420: +#line 433 "src/parser.re" { NEWTOKEN(PSI_T_CALLOC); goto start; } -#line 5688 "src/parser.c" -yy388: - yyaccept = 38; +#line 5928 "src/parser.c" +yy421: + yyaccept = 43; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -5752,18 +5992,18 @@ yy388: case '|': case '}': case '~': - case 0x7F: goto yy389; + case 0x7F: goto yy422; case 'D': - case 'd': goto yy443; - case '\\': goto yy131; - default: goto yy57; + case 'd': goto yy479; + case '\\': goto yy138; + default: goto yy59; } -yy389: -#line 358 "src/parser.re" +yy422: +#line 374 "src/parser.re" { NEWTOKEN(PSI_T_DEFINE); goto start; } -#line 5765 "src/parser.c" -yy390: - yyaccept = 39; +#line 6005 "src/parser.c" +yy423: + yyaccept = 44; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -5829,32 +6069,32 @@ yy390: case '|': case '}': case '~': - case 0x7F: goto yy391; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy424; + case '\\': goto yy138; + default: goto yy59; } -yy391: -#line 377 "src/parser.re" +yy424: +#line 393 "src/parser.re" { NEWTOKEN(PSI_T_DOUBLE); goto start; } -#line 5840 "src/parser.c" -yy392: - yyaccept = 4; +#line 6080 "src/parser.c" +yy425: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'A': - case 'a': goto yy445; - default: goto yy58; + case 'a': goto yy481; + default: goto yy60; } -yy393: - yyaccept = 4; +yy426: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'O': - case 'o': goto yy446; - default: goto yy58; + case 'o': goto yy482; + default: goto yy60; } -yy394: - yyaccept = 40; +yy427: + yyaccept = 45; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -5920,48 +6160,48 @@ yy394: case '|': case '}': case '~': - case 0x7F: goto yy395; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy428; + case '\\': goto yy138; + default: goto yy59; } -yy395: -#line 354 "src/parser.re" +yy428: +#line 370 "src/parser.re" { NEWTOKEN(PSI_T_IFNDEF); goto start; } -#line 5931 "src/parser.c" -yy396: - yyaccept = 4; +#line 6171 "src/parser.c" +yy429: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy447; - default: goto yy58; + case 'e': goto yy483; + default: goto yy60; } -yy397: - yyaccept = 4; +yy430: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy449; - default: goto yy58; + case 't': goto yy485; + default: goto yy60; } -yy398: - yyaccept = 4; +yy431: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy451; - default: goto yy58; + case 't': goto yy487; + default: goto yy60; } -yy399: - yyaccept = 4; +yy432: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy453; - default: goto yy58; + case 't': goto yy489; + default: goto yy60; } -yy400: - yyaccept = 41; +yy433: + yyaccept = 46; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -6027,16 +6267,16 @@ yy400: case '|': case '}': case '~': - case 0x7F: goto yy401; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy434; + case '\\': goto yy138; + default: goto yy59; } -yy401: -#line 378 "src/parser.re" +yy434: +#line 394 "src/parser.re" { NEWTOKEN(PSI_T_INT8); goto start; } -#line 6038 "src/parser.c" -yy402: - yyaccept = 42; +#line 6278 "src/parser.c" +yy435: + yyaccept = 47; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -6102,16 +6342,16 @@ yy402: case '|': case '}': case '~': - case 0x7F: goto yy403; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy436; + case '\\': goto yy138; + default: goto yy59; } -yy403: -#line 410 "src/parser.re" +yy436: +#line 426 "src/parser.re" { NEWTOKEN(PSI_T_INTVAL); goto start; } -#line 6113 "src/parser.c" -yy404: - yyaccept = 43; +#line 6353 "src/parser.c" +yy437: + yyaccept = 48; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -6177,16 +6417,16 @@ yy404: case '|': case '}': case '~': - case 0x7F: goto yy405; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy438; + case '\\': goto yy138; + default: goto yy59; } -yy405: -#line 390 "src/parser.re" +yy438: +#line 406 "src/parser.re" { NEWTOKEN(PSI_T_OBJECT); goto start; } -#line 6188 "src/parser.c" -yy406: - yyaccept = 44; +#line 6428 "src/parser.c" +yy439: + yyaccept = 49; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -6252,40 +6492,40 @@ yy406: case '|': case '}': case '~': - case 0x7F: goto yy407; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy440; + case '\\': goto yy138; + default: goto yy59; } -yy407: -#line 414 "src/parser.re" +yy440: +#line 430 "src/parser.re" { NEWTOKEN(PSI_T_OBJVAL); goto start; } -#line 6263 "src/parser.c" -yy408: - yyaccept = 4; +#line 6503 "src/parser.c" +yy441: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy455; - default: goto yy58; + case 'l': goto yy491; + default: goto yy60; } -yy409: - yyaccept = 4; +yy442: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'S': - case 's': goto yy457; - default: goto yy58; + case 's': goto yy493; + default: goto yy60; } -yy410: - yyaccept = 4; +yy443: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'S': - case 's': goto yy458; - default: goto yy58; + case 's': goto yy494; + default: goto yy60; } -yy411: - yyaccept = 45; +yy444: + yyaccept = 50; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -6351,16 +6591,16 @@ yy411: case '|': case '}': case '~': - case 0x7F: goto yy412; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy445; + case '\\': goto yy138; + default: goto yy59; } -yy412: -#line 404 "src/parser.re" +yy445: +#line 420 "src/parser.re" { NEWTOKEN(PSI_T_RETURN); goto start; } -#line 6362 "src/parser.c" -yy413: - yyaccept = 46; +#line 6602 "src/parser.c" +yy446: + yyaccept = 51; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -6426,16 +6666,16 @@ yy413: case '|': case '}': case '~': - case 0x7F: goto yy414; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy447; + case '\\': goto yy138; + default: goto yy59; } -yy414: -#line 387 "src/parser.re" +yy447: +#line 403 "src/parser.re" { NEWTOKEN(PSI_T_SIGNED); goto start; } -#line 6437 "src/parser.c" -yy415: - yyaccept = 47; +#line 6677 "src/parser.c" +yy448: + yyaccept = 52; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -6501,16 +6741,16 @@ yy415: case '|': case '}': case '~': - case 0x7F: goto yy416; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy449; + case '\\': goto yy138; + default: goto yy59; } -yy416: -#line 392 "src/parser.re" +yy449: +#line 408 "src/parser.re" { NEWTOKEN(PSI_T_STATIC); goto start; } -#line 6512 "src/parser.c" -yy417: - yyaccept = 48; +#line 6752 "src/parser.c" +yy450: + yyaccept = 53; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -6576,16 +6816,16 @@ yy417: case '|': case '}': case '~': - case 0x7F: goto yy418; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy451; + case '\\': goto yy138; + default: goto yy59; } -yy418: -#line 388 "src/parser.re" +yy451: +#line 404 "src/parser.re" { NEWTOKEN(PSI_T_STRING); goto start; } -#line 6587 "src/parser.c" -yy419: - yyaccept = 49; +#line 6827 "src/parser.c" +yy452: + yyaccept = 54; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -6651,16 +6891,16 @@ yy419: case '|': case '}': case '~': - case 0x7F: goto yy420; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy453; + case '\\': goto yy138; + default: goto yy59; } -yy420: -#line 407 "src/parser.re" +yy453: +#line 423 "src/parser.re" { NEWTOKEN(PSI_T_STRLEN); goto start; } -#line 6662 "src/parser.c" -yy421: - yyaccept = 50; +#line 6902 "src/parser.c" +yy454: + yyaccept = 55; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -6726,16 +6966,16 @@ yy421: case '|': case '}': case '~': - case 0x7F: goto yy422; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy455; + case '\\': goto yy138; + default: goto yy59; } -yy422: -#line 395 "src/parser.re" +yy455: +#line 411 "src/parser.re" { NEWTOKEN(PSI_T_STRUCT); goto start; } -#line 6737 "src/parser.c" -yy423: - yyaccept = 51; +#line 6977 "src/parser.c" +yy456: + yyaccept = 56; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -6801,40 +7041,191 @@ yy423: case '|': case '}': case '~': - case 0x7F: goto yy424; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy457; + case '\\': goto yy138; + default: goto yy59; + } +yy457: +#line 424 "src/parser.re" + { NEWTOKEN(PSI_T_STRVAL); goto start; } +#line 7052 "src/parser.c" +yy458: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'A': + case 'a': goto yy495; + default: goto yy60; + } +yy459: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'L': + case 'l': goto yy496; + default: goto yy60; + } +yy460: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'A': + case 'a': goto yy498; + default: goto yy60; + } +yy461: + yyaccept = 57; + yych = *(mrk = ++cur); + switch (yych) { + case 0x00: + case 0x01: + case 0x02: + case 0x03: + case 0x04: + case 0x05: + case 0x06: + case 0x07: + case 0x08: + case '\t': + case '\n': + case '\v': + case '\f': + case '\r': + case 0x0E: + case 0x0F: + case 0x10: + case 0x11: + case 0x12: + case 0x13: + case 0x14: + case 0x15: + case 0x16: + case 0x17: + case 0x18: + case 0x19: + case 0x1A: + case 0x1B: + case 0x1C: + case 0x1D: + case 0x1E: + case 0x1F: + case ' ': + case '!': + case '"': + case '#': + case '$': + case '%': + case '&': + case '\'': + case '(': + case ')': + case '*': + case '+': + case ',': + case '-': + case '.': + case '/': + case ':': + case ';': + case '<': + case '=': + case '>': + case '?': + case '@': + case '[': + case ']': + case '^': + case '`': + case '{': + case '|': + case '}': + case '~': + case 0x7F: goto yy462; + case '\\': goto yy138; + default: goto yy59; + } +yy462: +#line 437 "src/parser.re" + { NEWTOKEN(PSI_T_TO_INT); goto start; } +#line 7151 "src/parser.c" +yy463: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'E': + case 'e': goto yy499; + default: goto yy60; + } +yy464: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'I': + case 'i': goto yy500; + default: goto yy60; + } +yy465: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'F': + case 'f': goto yy501; + default: goto yy60; } -yy424: -#line 408 "src/parser.re" - { NEWTOKEN(PSI_T_STRVAL); goto start; } -#line 6812 "src/parser.c" -yy425: - yyaccept = 4; +yy466: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'A': - case 'a': goto yy459; - default: goto yy58; + case '_': goto yy503; + default: goto yy60; } -yy426: - yyaccept = 4; +yy467: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'L': - case 'l': goto yy460; - default: goto yy58; + case '_': goto yy504; + default: goto yy60; } -yy427: - yyaccept = 4; +yy468: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { - case 'A': - case 'a': goto yy462; - default: goto yy58; + case '_': goto yy505; + default: goto yy60; } -yy428: - yyaccept = 52; +yy469: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'T': + case 't': goto yy506; + default: goto yy60; + } +yy470: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'E': + case 'e': goto yy508; + default: goto yy60; + } +yy471: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'G': + case 'g': goto yy509; + default: goto yy60; + } +yy472: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'i': goto yy511; + default: goto yy60; + } +yy473: + yyaccept = 58; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -6900,85 +7291,16 @@ yy428: case '|': case '}': case '~': - case 0x7F: goto yy429; - case '\\': goto yy131; - default: goto yy57; - } -yy429: -#line 421 "src/parser.re" - { NEWTOKEN(PSI_T_TO_INT); goto start; } -#line 6911 "src/parser.c" -yy430: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'E': - case 'e': goto yy463; - default: goto yy58; - } -yy431: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'I': - case 'i': goto yy464; - default: goto yy58; - } -yy432: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'F': - case 'f': goto yy465; - default: goto yy58; - } -yy433: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case '_': goto yy467; - default: goto yy58; - } -yy434: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case '_': goto yy468; - default: goto yy58; - } -yy435: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case '_': goto yy469; - default: goto yy58; - } -yy436: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'T': - case 't': goto yy470; - default: goto yy58; - } -yy437: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'E': - case 'e': goto yy472; - default: goto yy58; - } -yy438: - yyaccept = 4; - yych = *(mrk = ++cur); - switch (yych) { - case 'G': - case 'g': goto yy473; - default: goto yy58; + case 0x7F: goto yy474; + case '\\': goto yy138; + default: goto yy59; } -yy439: - yyaccept = 53; +yy474: +#line 366 "src/parser.re" + { NEWTOKEN(PSI_T_PRAGMA); goto start; } +#line 7302 "src/parser.c" +yy475: + yyaccept = 59; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -7044,32 +7366,32 @@ yy439: case '|': case '}': case '~': - case 0x7F: goto yy440; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy476; + case '\\': goto yy138; + default: goto yy59; } -yy440: -#line 412 "src/parser.re" +yy476: +#line 428 "src/parser.re" { NEWTOKEN(PSI_T_BOOLVAL); goto start; } -#line 7055 "src/parser.c" -yy441: - yyaccept = 4; +#line 7377 "src/parser.c" +yy477: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy475; - default: goto yy58; + case 'e': goto yy512; + default: goto yy60; } -yy442: - yyaccept = 4; +yy478: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'K': - case 'k': goto yy477; - default: goto yy58; + case 'k': goto yy514; + default: goto yy60; } -yy443: - yyaccept = 54; +yy479: + yyaccept = 60; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -7135,32 +7457,32 @@ yy443: case '|': case '}': case '~': - case 0x7F: goto yy444; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy480; + case '\\': goto yy138; + default: goto yy59; } -yy444: -#line 359 "src/parser.re" +yy480: +#line 375 "src/parser.re" { NEWTOKEN(PSI_T_DEFINED); goto start; } -#line 7146 "src/parser.c" -yy445: - yyaccept = 4; +#line 7468 "src/parser.c" +yy481: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'L': - case 'l': goto yy479; - default: goto yy58; + case 'l': goto yy516; + default: goto yy60; } -yy446: - yyaccept = 4; +yy482: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy481; - default: goto yy58; + case 'n': goto yy518; + default: goto yy60; } -yy447: - yyaccept = 55; +yy483: + yyaccept = 61; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -7226,17 +7548,17 @@ yy447: case '|': case '}': case '~': - case 0x7F: goto yy448; - case '\\': goto yy131; - case '_': goto yy483; - default: goto yy57; + case 0x7F: goto yy484; + case '\\': goto yy138; + case '_': goto yy520; + default: goto yy59; } -yy448: -#line 363 "src/parser.re" +yy484: +#line 379 "src/parser.re" { NEWTOKEN(PSI_T_INCLUDE); goto start; } -#line 7238 "src/parser.c" -yy449: - yyaccept = 56; +#line 7560 "src/parser.c" +yy485: + yyaccept = 62; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -7302,16 +7624,16 @@ yy449: case '|': case '}': case '~': - case 0x7F: goto yy450; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy486; + case '\\': goto yy138; + default: goto yy59; } -yy450: -#line 380 "src/parser.re" +yy486: +#line 396 "src/parser.re" { NEWTOKEN(PSI_T_INT16); goto start; } -#line 7313 "src/parser.c" -yy451: - yyaccept = 57; +#line 7635 "src/parser.c" +yy487: + yyaccept = 63; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -7377,16 +7699,16 @@ yy451: case '|': case '}': case '~': - case 0x7F: goto yy452; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy488; + case '\\': goto yy138; + default: goto yy59; } -yy452: -#line 382 "src/parser.re" +yy488: +#line 398 "src/parser.re" { NEWTOKEN(PSI_T_INT32); goto start; } -#line 7388 "src/parser.c" -yy453: - yyaccept = 58; +#line 7710 "src/parser.c" +yy489: + yyaccept = 64; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -7452,16 +7774,16 @@ yy453: case '|': case '}': case '~': - case 0x7F: goto yy454; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy490; + case '\\': goto yy138; + default: goto yy59; } -yy454: -#line 384 "src/parser.re" +yy490: +#line 400 "src/parser.re" { NEWTOKEN(PSI_T_INT64); goto start; } -#line 7463 "src/parser.c" -yy455: - yyaccept = 59; +#line 7785 "src/parser.c" +yy491: + yyaccept = 65; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -7527,40 +7849,40 @@ yy455: case '|': case '}': case '~': - case 0x7F: goto yy456; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy492; + case '\\': goto yy138; + default: goto yy59; } -yy456: -#line 409 "src/parser.re" +yy492: +#line 425 "src/parser.re" { NEWTOKEN(PSI_T_PATHVAL); goto start; } -#line 7538 "src/parser.c" -yy457: - yyaccept = 4; +#line 7860 "src/parser.c" +yy493: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'S': - case 's': goto yy484; - default: goto yy58; + case 's': goto yy521; + default: goto yy60; } -yy458: - yyaccept = 4; +yy494: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy485; - default: goto yy58; + case 'e': goto yy522; + default: goto yy60; } -yy459: - yyaccept = 4; +yy495: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'Y': - case 'y': goto yy486; - default: goto yy58; + case 'y': goto yy523; + default: goto yy60; } -yy460: - yyaccept = 60; +yy496: + yyaccept = 66; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -7626,40 +7948,40 @@ yy460: case '|': case '}': case '~': - case 0x7F: goto yy461; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy497; + case '\\': goto yy138; + default: goto yy59; } -yy461: -#line 423 "src/parser.re" +yy497: +#line 439 "src/parser.re" { NEWTOKEN(PSI_T_TO_BOOL); goto start; } -#line 7637 "src/parser.c" -yy462: - yyaccept = 4; +#line 7959 "src/parser.c" +yy498: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy488; - default: goto yy58; + case 't': goto yy525; + default: goto yy60; } -yy463: - yyaccept = 4; +yy499: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'C': - case 'c': goto yy490; - default: goto yy58; + case 'c': goto yy527; + default: goto yy60; } -yy464: - yyaccept = 4; +yy500: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy491; - default: goto yy58; + case 'n': goto yy528; + default: goto yy60; } -yy465: - yyaccept = 61; +yy501: + yyaccept = 67; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -7725,40 +8047,40 @@ yy465: case '|': case '}': case '~': - case 0x7F: goto yy466; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy502; + case '\\': goto yy138; + default: goto yy59; } -yy466: -#line 394 "src/parser.re" +yy502: +#line 410 "src/parser.re" { NEWTOKEN(PSI_T_TYPEDEF); goto start; } -#line 7736 "src/parser.c" -yy467: - yyaccept = 4; +#line 8058 "src/parser.c" +yy503: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy492; - default: goto yy58; + case 't': goto yy529; + default: goto yy60; } -yy468: - yyaccept = 4; +yy504: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy494; - default: goto yy58; + case 't': goto yy531; + default: goto yy60; } -yy469: - yyaccept = 4; +yy505: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy496; - default: goto yy58; + case 't': goto yy533; + default: goto yy60; } -yy470: - yyaccept = 62; +yy506: + yyaccept = 68; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -7824,24 +8146,24 @@ yy470: case '|': case '}': case '~': - case 0x7F: goto yy471; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy507; + case '\\': goto yy138; + default: goto yy59; } -yy471: -#line 379 "src/parser.re" +yy507: +#line 395 "src/parser.re" { NEWTOKEN(PSI_T_UINT8); goto start; } -#line 7835 "src/parser.c" -yy472: - yyaccept = 4; +#line 8157 "src/parser.c" +yy508: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'D': - case 'd': goto yy498; - default: goto yy58; + case 'd': goto yy535; + default: goto yy60; } -yy473: - yyaccept = 63; +yy509: + yyaccept = 69; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -7907,16 +8229,23 @@ yy473: case '|': case '}': case '~': - case 0x7F: goto yy474; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy510; + case '\\': goto yy138; + default: goto yy59; + } +yy510: +#line 377 "src/parser.re" + { NEWTOKEN(PSI_T_WARNING); goto start; } +#line 8240 "src/parser.c" +yy511: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'b': goto yy537; + default: goto yy60; } -yy474: -#line 361 "src/parser.re" - { NEWTOKEN(PSI_T_WARNING); goto start; } -#line 7918 "src/parser.c" -yy475: - yyaccept = 64; +yy512: + yyaccept = 70; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -7982,16 +8311,16 @@ yy475: case '|': case '}': case '~': - case 0x7F: goto yy476; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy513; + case '\\': goto yy138; + default: goto yy59; } -yy476: -#line 369 "src/parser.re" +yy513: +#line 385 "src/parser.re" { NEWTOKEN(PSI_T_CALLABLE); goto start; } -#line 7993 "src/parser.c" -yy477: - yyaccept = 65; +#line 8322 "src/parser.c" +yy514: + yyaccept = 71; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -8057,16 +8386,16 @@ yy477: case '|': case '}': case '~': - case 0x7F: goto yy478; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy515; + case '\\': goto yy138; + default: goto yy59; } -yy478: -#line 391 "src/parser.re" +yy515: +#line 407 "src/parser.re" { NEWTOKEN(PSI_T_CALLBACK); goto start; } -#line 8068 "src/parser.c" -yy479: - yyaccept = 66; +#line 8397 "src/parser.c" +yy516: + yyaccept = 72; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -8132,16 +8461,16 @@ yy479: case '|': case '}': case '~': - case 0x7F: goto yy480; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy517; + case '\\': goto yy138; + default: goto yy59; } -yy480: -#line 411 "src/parser.re" +yy517: +#line 427 "src/parser.re" { NEWTOKEN(PSI_T_FLOATVAL); goto start; } -#line 8143 "src/parser.c" -yy481: - yyaccept = 67; +#line 8472 "src/parser.c" +yy518: + yyaccept = 73; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -8207,40 +8536,40 @@ yy481: case '|': case '}': case '~': - case 0x7F: goto yy482; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy519; + case '\\': goto yy138; + default: goto yy59; } -yy482: -#line 393 "src/parser.re" +yy519: +#line 409 "src/parser.re" { NEWTOKEN(PSI_T_FUNCTION); goto start; } -#line 8218 "src/parser.c" -yy483: - yyaccept = 4; +#line 8547 "src/parser.c" +yy520: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'N': - case 'n': goto yy500; - default: goto yy58; + case 'n': goto yy538; + default: goto yy60; } -yy484: - yyaccept = 4; +yy521: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy501; - default: goto yy58; + case 'e': goto yy539; + default: goto yy60; } -yy485: - yyaccept = 4; +yy522: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'R': - case 'r': goto yy502; - default: goto yy58; + case 'r': goto yy540; + default: goto yy60; } -yy486: - yyaccept = 68; +yy523: + yyaccept = 74; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -8306,16 +8635,16 @@ yy486: case '|': case '}': case '~': - case 0x7F: goto yy487; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy524; + case '\\': goto yy138; + default: goto yy59; } -yy487: -#line 419 "src/parser.re" +yy524: +#line 435 "src/parser.re" { NEWTOKEN(PSI_T_TO_ARRAY); goto start; } -#line 8317 "src/parser.c" -yy488: - yyaccept = 69; +#line 8646 "src/parser.c" +yy525: + yyaccept = 75; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -8381,32 +8710,32 @@ yy488: case '|': case '}': case '~': - case 0x7F: goto yy489; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy526; + case '\\': goto yy138; + default: goto yy59; } -yy489: -#line 422 "src/parser.re" +yy526: +#line 438 "src/parser.re" { NEWTOKEN(PSI_T_TO_FLOAT); goto start; } -#line 8392 "src/parser.c" -yy490: - yyaccept = 4; +#line 8721 "src/parser.c" +yy527: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy503; - default: goto yy58; + case 't': goto yy541; + default: goto yy60; } -yy491: - yyaccept = 4; +yy528: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'G': - case 'g': goto yy505; - default: goto yy58; + case 'g': goto yy543; + default: goto yy60; } -yy492: - yyaccept = 70; +yy529: + yyaccept = 76; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -8472,16 +8801,16 @@ yy492: case '|': case '}': case '~': - case 0x7F: goto yy493; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy530; + case '\\': goto yy138; + default: goto yy59; } -yy493: -#line 381 "src/parser.re" +yy530: +#line 397 "src/parser.re" { NEWTOKEN(PSI_T_UINT16); goto start; } -#line 8483 "src/parser.c" -yy494: - yyaccept = 71; +#line 8812 "src/parser.c" +yy531: + yyaccept = 77; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -8547,16 +8876,16 @@ yy494: case '|': case '}': case '~': - case 0x7F: goto yy495; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy532; + case '\\': goto yy138; + default: goto yy59; } -yy495: -#line 383 "src/parser.re" +yy532: +#line 399 "src/parser.re" { NEWTOKEN(PSI_T_UINT32); goto start; } -#line 8558 "src/parser.c" -yy496: - yyaccept = 72; +#line 8887 "src/parser.c" +yy533: + yyaccept = 78; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -8622,16 +8951,16 @@ yy496: case '|': case '}': case '~': - case 0x7F: goto yy497; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy534; + case '\\': goto yy138; + default: goto yy59; } -yy497: -#line 385 "src/parser.re" +yy534: +#line 401 "src/parser.re" { NEWTOKEN(PSI_T_UINT64); goto start; } -#line 8633 "src/parser.c" -yy498: - yyaccept = 73; +#line 8962 "src/parser.c" +yy535: + yyaccept = 79; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -8697,40 +9026,47 @@ yy498: case '|': case '}': case '~': - case 0x7F: goto yy499; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy536; + case '\\': goto yy138; + default: goto yy59; } -yy499: -#line 386 "src/parser.re" +yy536: +#line 402 "src/parser.re" { NEWTOKEN(PSI_T_UNSIGNED); goto start; } -#line 8708 "src/parser.c" -yy500: - yyaccept = 4; +#line 9037 "src/parser.c" +yy537: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'u': goto yy545; + default: goto yy60; + } +yy538: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'E': - case 'e': goto yy507; - default: goto yy58; + case 'e': goto yy546; + default: goto yy60; } -yy501: - yyaccept = 4; +yy539: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'R': - case 'r': goto yy508; - default: goto yy58; + case 'r': goto yy547; + default: goto yy60; } -yy502: - yyaccept = 4; +yy540: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy509; - default: goto yy58; + case 't': goto yy548; + default: goto yy60; } -yy503: - yyaccept = 74; +yy541: + yyaccept = 80; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -8796,16 +9132,16 @@ yy503: case '|': case '}': case '~': - case 0x7F: goto yy504; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy542; + case '\\': goto yy138; + default: goto yy59; } -yy504: -#line 418 "src/parser.re" +yy542: +#line 434 "src/parser.re" { NEWTOKEN(PSI_T_TO_OBJECT); goto start; } -#line 8807 "src/parser.c" -yy505: - yyaccept = 75; +#line 9143 "src/parser.c" +yy543: + yyaccept = 81; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -8871,32 +9207,39 @@ yy505: case '|': case '}': case '~': - case 0x7F: goto yy506; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy544; + case '\\': goto yy138; + default: goto yy59; } -yy506: -#line 420 "src/parser.re" +yy544: +#line 436 "src/parser.re" { NEWTOKEN(PSI_T_TO_STRING); goto start; } -#line 8882 "src/parser.c" -yy507: - yyaccept = 4; +#line 9218 "src/parser.c" +yy545: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 't': goto yy550; + default: goto yy60; + } +yy546: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'X': - case 'x': goto yy511; - default: goto yy58; + case 'x': goto yy551; + default: goto yy60; } -yy508: - yyaccept = 4; +yy547: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy512; - default: goto yy58; + case 't': goto yy552; + default: goto yy60; } -yy509: - yyaccept = 76; +yy548: + yyaccept = 82; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -8962,24 +9305,31 @@ yy509: case '|': case '}': case '~': - case 0x7F: goto yy510; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy549; + case '\\': goto yy138; + default: goto yy59; } -yy510: -#line 402 "src/parser.re" +yy549: +#line 418 "src/parser.re" { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; } -#line 8973 "src/parser.c" -yy511: - yyaccept = 4; +#line 9316 "src/parser.c" +yy550: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case 'e': goto yy554; + default: goto yy60; + } +yy551: + yyaccept = 6; yych = *(mrk = ++cur); switch (yych) { case 'T': - case 't': goto yy514; - default: goto yy58; + case 't': goto yy555; + default: goto yy60; } -yy512: - yyaccept = 77; +yy552: + yyaccept = 83; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -9045,16 +9395,23 @@ yy512: case '|': case '}': case '~': - case 0x7F: goto yy513; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy553; + case '\\': goto yy138; + default: goto yy59; } -yy513: -#line 403 "src/parser.re" +yy553: +#line 419 "src/parser.re" { NEWTOKEN(PSI_T_POST_ASSERT); goto start; } -#line 9056 "src/parser.c" -yy514: - yyaccept = 78; +#line 9406 "src/parser.c" +yy554: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case '_': goto yy557; + default: goto yy60; + } +yy555: + yyaccept = 84; yych = *(mrk = ++cur); switch (yych) { case 0x00: @@ -9120,81 +9477,211 @@ yy514: case '|': case '}': case '~': - case 0x7F: goto yy515; - case '\\': goto yy131; - default: goto yy57; + case 0x7F: goto yy556; + case '\\': goto yy138; + default: goto yy59; } -yy515: -#line 364 "src/parser.re" +yy556: +#line 380 "src/parser.re" { NEWTOKEN(PSI_T_INCLUDE_NEXT); goto start; } -#line 9131 "src/parser.c" +#line 9488 "src/parser.c" +yy557: + yyaccept = 6; + yych = *(mrk = ++cur); + switch (yych) { + case '_': goto yy558; + default: goto yy60; + } +yy558: + yyaccept = 6; + mrk = ++cur; + if ((lim - cur) < 2) if (cur >= lim) goto done;; + yych = *cur; + switch (yych) { + case 0x00: + case 0x01: + case 0x02: + case 0x03: + case 0x04: + case 0x05: + case 0x06: + case 0x07: + case 0x08: + case '\t': + case '\n': + case '\v': + case '\f': + case '\r': + case 0x0E: + case 0x0F: + case 0x10: + case 0x11: + case 0x12: + case 0x13: + case 0x14: + case 0x15: + case 0x16: + case 0x17: + case 0x18: + case 0x19: + case 0x1A: + case 0x1B: + case 0x1C: + case 0x1D: + case 0x1E: + case 0x1F: + case ' ': + case '!': + case '"': + case '#': + case '$': + case '%': + case '&': + case '\'': + case ')': + case '*': + case '+': + case ',': + case '-': + case '.': + case '/': + case ':': + case ';': + case '<': + case '=': + case '>': + case '?': + case '@': + case '[': + case ']': + case '^': + case '`': + case '{': + case '|': + case '}': + case '~': + case 0x7F: goto yy53; + case '(': goto yy560; + case '\\': goto yy138; + default: goto yy558; + } +yy560: + yych = *++cur; + switch (yych) { + case '(': goto yy561; + default: goto yy106; + } +yy561: + ++cur; +#line 446 "src/parser.re" + { parens = 2; goto cpp_attribute; } +#line 9579 "src/parser.c" } -#line 436 "src/parser.re" +#line 452 "src/parser.re" comment: ; -#line 9138 "src/parser.c" +#line 9586 "src/parser.c" { unsigned char yych; if ((lim - cur) < 2) if (cur >= lim) goto done;; yych = *cur; switch (yych) { case '\n': - case '\r': goto yy520; - case '*': goto yy522; - default: goto yy518; + case '\r': goto yy567; + case '*': goto yy569; + default: goto yy565; } -yy518: +yy565: ++cur; -yy519: -#line 443 "src/parser.re" +yy566: +#line 459 "src/parser.re" { goto comment; } -#line 9154 "src/parser.c" -yy520: +#line 9602 "src/parser.c" +yy567: ++cur; -#line 441 "src/parser.re" +#line 457 "src/parser.re" { NEWLINE(); goto comment; } -#line 9159 "src/parser.c" -yy522: +#line 9607 "src/parser.c" +yy569: yych = *++cur; switch (yych) { - case '/': goto yy523; - default: goto yy519; + case '/': goto yy570; + default: goto yy566; } -yy523: +yy570: ++cur; -#line 442 "src/parser.re" +#line 458 "src/parser.re" { NEWTOKEN(PSI_T_COMMENT); goto start; } -#line 9170 "src/parser.c" +#line 9618 "src/parser.c" } -#line 445 "src/parser.re" +#line 461 "src/parser.re" comment_sl: ; -#line 9177 "src/parser.c" +#line 9625 "src/parser.c" { unsigned char yych; if (lim <= cur) if (cur >= lim) goto done;; yych = *cur; switch (yych) { case '\n': - case '\r': goto yy529; - default: goto yy527; + case '\r': goto yy576; + default: goto yy574; } -yy527: +yy574: ++cur; -#line 451 "src/parser.re" +#line 467 "src/parser.re" { goto comment_sl; } -#line 9191 "src/parser.c" -yy529: +#line 9639 "src/parser.c" +yy576: ++cur; -#line 450 "src/parser.re" +#line 466 "src/parser.re" { NEWTOKEN(PSI_T_COMMENT); NEWLINE(); goto start; } -#line 9196 "src/parser.c" +#line 9644 "src/parser.c" + } +#line 469 "src/parser.re" + + + cpp_attribute: ; + + +#line 9652 "src/parser.c" + { + unsigned char yych; + if (lim <= cur) if (cur >= lim) goto done;; + yych = *cur; + switch (yych) { + case '\n': + case '\r': goto yy582; + case '(': goto yy584; + case ')': goto yy586; + default: goto yy580; + } +yy580: + ++cur; +#line 478 "src/parser.re" + { goto cpp_attribute; } +#line 9668 "src/parser.c" +yy582: + ++cur; +#line 477 "src/parser.re" + { NEWLINE(); goto cpp_attribute; } +#line 9673 "src/parser.c" +yy584: + ++cur; +#line 475 "src/parser.re" + { ++parens; goto cpp_attribute; } +#line 9678 "src/parser.c" +yy586: + ++cur; +#line 476 "src/parser.re" + { if (parens == 1) { NEWTOKEN(PSI_T_CPP_ATTRIBUTE); goto start; } else { --parens; goto cpp_attribute; } } +#line 9683 "src/parser.c" } -#line 453 "src/parser.re" +#line 480 "src/parser.re" error: ; diff --git a/src/parser.re b/src/parser.re index cb17b6e..59c8bda 100644 --- a/src/parser.re +++ b/src/parser.re @@ -192,16 +192,7 @@ struct psi_plist *psi_parser_preprocess(struct psi_parser *P, struct psi_plist * bool psi_parser_process(struct psi_parser *P, struct psi_plist *tokens, size_t *processed) { if (psi_plist_count(tokens)) { - int rc; - - if (P->flags & PSI_DEBUG) { - psi_parser_proc_debug = 1; - } - rc = psi_parser_proc_parse(P, tokens, processed); - if (P->flags & PSI_DEBUG) { - psi_parser_proc_debug = 0; - } - return rc == 0; + return 0 == psi_parser_proc_parse(P, tokens, processed); } return true; } @@ -258,12 +249,17 @@ void psi_parser_free(struct psi_parser **P) psi_token_dump(2, token); \ } +union int_suffix { + char s[SIZEOF_UINT32_T]; + uint32_t i; +}; struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input *I) { struct psi_plist *tokens; struct psi_token *token; - const char *tok, *cur, *lim, *mrk, *eol; + const char *tok, *cur, *lim, *mrk, *eol, *ctxmrk; + unsigned parens; tok = mrk = eol = cur = I->buffer; lim = I->buffer + I->length; @@ -271,6 +267,7 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input tokens = psi_plist_init((void (*)(void *)) psi_token_free); start: ; + ctxmrk = NULL; tok = cur; /*!re2c @@ -280,6 +277,7 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input re2c:define:YYCURSOR = cur; re2c:define:YYLIMIT = lim; re2c:define:YYMARKER = mrk; + re2c:define:YYCTXMARKER = ctxmrk; re2c:define:YYFILL = "if (cur >= lim) goto done;"; re2c:yyfill:parameter = 0; @@ -292,10 +290,13 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input QUOTED_STRING = "L"? "\"" ([^"])+ "\""; QUOTED_CHAR = "L"? "'" ([^']+ "\\'"?)+ "'"; CPP_HEADER = "<" [-._/a-zA-Z0-9]+ ">"; + CPP_ATTRIBUTE = "__attribute__" W* "(("; + CPP_PRAGMA_ONCE = "pragma" W+ "once"; DEC_CONST = [1-9] [0-9]*; OCT_CONST = "0" [0-7]*; HEX_CONST = '0x' [0-9a-fA-F]+; + INT_CONST = (DEC_CONST | OCT_CONST | HEX_CONST); INT_SUFFIX = 'u'('l' 'l'? )? | 'l'('l'? 'u')?; INT_NUMBER = (DEC_CONST | OCT_CONST | HEX_CONST) INT_SUFFIX?; @@ -307,11 +308,23 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input FLT_DEC_FRAC = [0-9]*; FLT_DEC_SIG = FLT_DEC_NUM ("." FLT_DEC_FRAC)?; FLT_DEC_EXPO = 'e' [+-]? [0-9]+; - FLT_DEC_CONST = (FLT_DEC_SIG FLT_DEC_EXPO) | (FLT_DEC_NUM? "." FLT_DEC_FRAC); + FLT_DEC_CONST = (FLT_DEC_SIG FLT_DEC_EXPO) | (FLT_DEC_NUM "." FLT_DEC_FRAC) | ("." [0-9]+); + FLT_CONST = (FLT_DEC_CONST | FLT_HEX_CONST); FLT_SUFFIX = 'f' | 'l' | ('d' ('f' | 'd' | 'l')); FLT_NUMBER = (FLT_DEC_CONST | FLT_HEX_CONST) FLT_SUFFIX?; - NUMBER = [+-]? (INT_NUMBER | FLT_NUMBER); + [+-]? INT_CONST { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT; goto start; } + [+-]? INT_CONST / 'u' { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_U; cur += 1; goto start; } + [+-]? INT_CONST / 'l' { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_L; cur += 1; goto start; } + [+-]? INT_CONST / ('lu' | 'ul') { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_UL; cur += 2; goto start; } + [+-]? INT_CONST / ('llu' | 'ull') { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_ULL; cur += 3; goto start; } + + [+-]? FLT_CONST { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT; goto start; } + [+-]? FLT_CONST / 'f' { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_F; cur += 1; goto start; } + [+-]? FLT_CONST / 'l' { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_L; cur += 1; goto start; } + [+-]? FLT_CONST / 'df' { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DF; cur += 2; goto start; } + [+-]? FLT_CONST / 'dd' { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DD; cur += 2; goto start; } + [+-]? FLT_CONST / 'dl' { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DL; cur += 2; goto start; } "/*" { goto comment; } "//" { goto comment_sl; } @@ -349,6 +362,9 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input ">" { NEWTOKEN(PSI_T_RCHEVR); goto start; } "." { NEWTOKEN(PSI_T_PERIOD); goto start; } "..." { NEWTOKEN(PSI_T_ELLIPSIS); goto start; } + "?" { NEWTOKEN(PSI_T_IIF); goto start; } + "pragma" { NEWTOKEN(PSI_T_PRAGMA); goto start; } + "once" { NEWTOKEN(PSI_T_ONCE); goto start; } 'IF' { NEWTOKEN(PSI_T_IF); goto start; } 'IFDEF' { NEWTOKEN(PSI_T_IFDEF); goto start; } 'IFNDEF' { NEWTOKEN(PSI_T_IFNDEF); goto start; } @@ -421,13 +437,13 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input 'TO_INT' { NEWTOKEN(PSI_T_TO_INT); goto start; } 'TO_FLOAT' { NEWTOKEN(PSI_T_TO_FLOAT); goto start; } 'TO_BOOL' { NEWTOKEN(PSI_T_TO_BOOL); goto start; } - NUMBER { NEWTOKEN(PSI_T_NUMBER); goto start; } NAME { NEWTOKEN(PSI_T_NAME); goto start; } NSNAME { NEWTOKEN(PSI_T_NSNAME); goto start; } DOLLAR_NAME { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; } QUOTED_STRING { NEWTOKEN(PSI_T_QUOTED_STRING); goto start; } QUOTED_CHAR { NEWTOKEN(PSI_T_QUOTED_CHAR); goto start; } CPP_HEADER { NEWTOKEN(PSI_T_CPP_HEADER); goto start; } + CPP_ATTRIBUTE { parens = 2; goto cpp_attribute; } EOL { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; } SP+ { NEWTOKEN(PSI_T_WHITESPACE); goto start; } [^] { NEWTOKEN(-2); goto error; } @@ -451,6 +467,17 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input * { goto comment_sl; } */ + + cpp_attribute: ; + + /*!re2c + + "(" { ++parens; goto cpp_attribute; } + ")" { if (parens == 1) { NEWTOKEN(PSI_T_CPP_ATTRIBUTE); goto start; } else { --parens; goto cpp_attribute; } } + EOL { NEWLINE(); goto cpp_attribute; } + * { goto cpp_attribute; } + + */ error: ; P->error(PSI_DATA(P), token, PSI_WARNING, "PSI syntax error: unexpected input (%d) '%.*s' at col %tu", diff --git a/src/parser_proc.c b/src/parser_proc.c index 7d785a1..30a7e38 100644 --- a/src/parser_proc.c +++ b/src/parser_proc.c @@ -153,7 +153,6 @@ static inline void psi_parser_proc_add_typedef(struct psi_parser *P, struct psi_ P->types = psi_plist_init((psi_plist_dtor) psi_decl_arg_free); } P->types = psi_plist_add(P->types, &def); - psi_parser_proc_add_from_typedef(P, def); } static inline void psi_parser_proc_add_const(struct psi_parser *P, struct psi_const *cnst) { @@ -181,7 +180,7 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp /* end code */ -#line 185 "src/parser_proc.c" /* glr.c:264 */ +#line 184 "src/parser_proc.c" /* glr.c:264 */ #include #include @@ -286,18 +285,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 129 +#define YYFINAL 133 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2029 +#define YYLAST 2352 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 123 +#define YYNTOKENS 127 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 110 /* YYNRULES -- Number of rules. */ -#define YYNRULES 429 +#define YYNRULES 437 /* YYNRULES -- Number of states. */ -#define YYNSTATES 629 +#define YYNSTATES 645 /* 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 @@ -306,7 +305,7 @@ static inline void psi_parser_proc_add_impl(struct psi_parser *P, struct psi_imp /* YYTRANSLATE(X) -- Bison symbol number corresponding to X. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 377 +#define YYMAXUTOK 381 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -351,56 +350,58 @@ static const unsigned char yytranslate[] = 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 118, 119, 120, 121, 122 + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126 }; #if YYDEBUG /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 386, 386, 386, 386, 386, 386, 386, 386, 386, - 386, 386, 386, 386, 386, 386, 386, 386, 386, 386, - 387, 387, 387, 387, 388, 388, 388, 388, 388, 388, - 388, 388, 388, 388, 388, 388, 388, 388, 389, 389, - 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, + 0, 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 389, 393, 394, 397, 398, 401, 402, 403, 404, - 410, 418, 421, 424, 427, 430, 433, 436, 442, 448, - 454, 477, 481, 485, 490, 495, 499, 506, 507, 511, - 512, 513, 517, 518, 522, 523, 527, 528, 529, 533, - 534, 538, 543, 548, 556, 559, 563, 568, 576, 579, - 583, 587, 594, 598, 602, 606, 616, 626, 631, 636, - 642, 651, 654, 658, 662, 668, 675, 681, 682, 683, - 684, 688, 691, 698, 699, 700, 701, 702, 706, 712, - 713, 721, 731, 739, 750, 753, 757, 761, 765, 770, - 775, 783, 784, 785, 788, 794, 797, 800, 806, 807, - 808, 809, 810, 811, 812, 813, 817, 818, 822, 825, - 828, 834, 837, 840, 848, 860, 863, 866, 873, 876, - 886, 889, 892, 895, 896, 900, 903, 906, 917, 923, - 930, 938, 945, 956, 957, 961, 967, 977, 987, 1000, - 1001, 1013, 1016, 1019, 1022, 1028, 1031, 1041, 1054, 1059, - 1067, 1077, 1087, 1090, 1094, 1100, 1103, 1109, 1117, 1124, - 1127, 1133, 1138, 1146, 1150, 1154, 1158, 1162, 1169, 1173, - 1177, 1181, 1188, 1201, 1214, 1227, 1230, 1237, 1240, 1246, - 1250, 1257, 1260, 1266, 1269, 1275, 1278, 1290, 1293, 1300, - 1305, 1310, 1320, 1323, 1329, 1332, 1338, 1345, 1352, 1353, - 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1364, 1367, 1373, - 1376, 1379, 1382, 1385, 1391, 1395, 1403, 1404, 1408, 1415, - 1418, 1421, 1424, 1427, 1433, 1437, 1445, 1452, 1460, 1468, - 1469, 1470, 1471, 1472, 1473, 1474, 1475, 1476, 1477, 1481, - 1484, 1490, 1493, 1499, 1500, 1504, 1507, 1513, 1516, 1522, - 1529, 1536, 1539, 1542, 1549, 1554, 1562, 1563, 1564, 1565, - 1566, 1567, 1568, 1569, 1573, 1576, 1582, 1585, 1591, 1598, - 1599, 1603, 1610, 1613, 1619, 1627, 1630, 1636, 1639, 1645 + 390, 390, 390, 390, 391, 391, 391, 391, 391, 391, + 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 392, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 396, 397, 400, 401, 404, + 405, 406, 407, 413, 421, 424, 427, 430, 433, 436, + 439, 445, 451, 457, 480, 484, 488, 493, 498, 502, + 506, 510, 517, 518, 522, 523, 524, 528, 529, 533, + 534, 538, 539, 540, 544, 545, 549, 554, 559, 567, + 570, 574, 579, 587, 590, 594, 598, 605, 609, 613, + 617, 622, 632, 642, 647, 652, 658, 667, 670, 674, + 678, 684, 691, 697, 698, 699, 700, 704, 707, 714, + 715, 716, 717, 718, 722, 728, 729, 737, 747, 755, + 763, 771, 774, 778, 782, 786, 791, 796, 804, 805, + 806, 809, 815, 818, 821, 827, 828, 829, 830, 831, + 832, 833, 834, 838, 839, 843, 846, 849, 855, 858, + 861, 869, 881, 884, 887, 894, 897, 907, 910, 913, + 916, 917, 921, 924, 927, 938, 944, 951, 959, 966, + 977, 978, 982, 988, 998, 1008, 1021, 1022, 1034, 1037, + 1040, 1043, 1049, 1052, 1062, 1075, 1080, 1088, 1098, 1108, + 1111, 1115, 1121, 1124, 1130, 1138, 1145, 1148, 1154, 1159, + 1167, 1171, 1175, 1179, 1183, 1187, 1194, 1198, 1202, 1206, + 1213, 1226, 1239, 1252, 1255, 1262, 1265, 1271, 1275, 1282, + 1285, 1291, 1294, 1300, 1303, 1315, 1318, 1325, 1330, 1335, + 1345, 1348, 1354, 1357, 1363, 1370, 1377, 1378, 1379, 1380, + 1381, 1382, 1383, 1384, 1385, 1389, 1392, 1398, 1401, 1404, + 1407, 1410, 1416, 1420, 1428, 1429, 1433, 1440, 1443, 1446, + 1449, 1452, 1458, 1462, 1470, 1477, 1485, 1493, 1494, 1495, + 1496, 1497, 1498, 1499, 1500, 1501, 1502, 1506, 1509, 1515, + 1518, 1524, 1525, 1529, 1532, 1538, 1541, 1547, 1554, 1561, + 1564, 1567, 1574, 1579, 1587, 1588, 1589, 1590, 1591, 1592, + 1593, 1594, 1598, 1601, 1607, 1610, 1616, 1623, 1624, 1628, + 1635, 1638, 1644, 1652, 1655, 1661, 1664, 1670 }; #endif @@ -419,17 +420,17 @@ static const char *const yytname[] = "\"^\"", "\"&\"", "\"<<\"", "\">>\"", "\"+\"", "\"-\"", "\"*\"", "\"/\"", "\"%\"", "\"<\"", "\">\"", "\">=\"", "\"<=\"", "\"||\"", "\"&&\"", "\"==\"", "\"!=\"", "\"~\"", "\"!\"", "\".\"", "\"\\\\\"", "\"...\"", - "ERROR", "WARNING", "IF", "IFDEF", "IFNDEF", "ELSE", "ELIF", "ENDIF", - "DEFINE", "DEFINED", "UNDEF", "IMPORT", "INCLUDE", "INCLUDE_NEXT", - "TYPEDEF", "STRUCT", "UNION", "ENUM", "CONST", "LIB", "STATIC", - "CALLBACK", "FUNCTION", "LET", "SET", "TEMP", "FREE", "RETURN", - "PRE_ASSERT", "POST_ASSERT", "BOOLVAL", "INTVAL", "STRVAL", "PATHVAL", - "STRLEN", "FLOATVAL", "ARRVAL", "OBJVAL", "COUNT", "CALLOC", "TO_BOOL", - "TO_INT", "TO_STRING", "TO_FLOAT", "TO_ARRAY", "TO_OBJECT", "COMMENT", - "WHITESPACE", "NO_WHITESPACE", "CPP_HEADER", "BINARY", "UNARY", - "$accept", "binary_op_token", "unary_op_token", "name_token", - "any_noeol_token", "file", "blocks", "block", "lib", "cpp", "cpp_exp", - "cpp_message_token", "cpp_include_token", "cpp_header_token", + "\"?\"", "PRAGMA", "ONCE", "ERROR", "WARNING", "IF", "IFDEF", "IFNDEF", + "ELSE", "ELIF", "ENDIF", "DEFINE", "DEFINED", "UNDEF", "IMPORT", + "INCLUDE", "INCLUDE_NEXT", "TYPEDEF", "STRUCT", "UNION", "ENUM", "CONST", + "LIB", "STATIC", "CALLBACK", "FUNCTION", "LET", "SET", "TEMP", "FREE", + "RETURN", "PRE_ASSERT", "POST_ASSERT", "BOOLVAL", "INTVAL", "STRVAL", + "PATHVAL", "STRLEN", "FLOATVAL", "ARRVAL", "OBJVAL", "COUNT", "CALLOC", + "TO_BOOL", "TO_INT", "TO_STRING", "TO_FLOAT", "TO_ARRAY", "TO_OBJECT", + "COMMENT", "WHITESPACE", "NO_WHITESPACE", "CPP_HEADER", "CPP_ATTRIBUTE", + "BINARY", "UNARY", "$accept", "binary_op_token", "unary_op_token", + "name_token", "any_noeol_token", "file", "blocks", "block", "lib", "cpp", + "cpp_exp", "cpp_message_token", "cpp_include_token", "cpp_header_token", "cpp_no_arg_token", "cpp_name_arg_token", "cpp_exp_arg_token", "cpp_macro_decl", "cpp_macro_sig", "cpp_macro_sig_args", "cpp_macro_decl_tokens", "cpp_macro_decl_token_list", "cpp_macro_exp", @@ -456,76 +457,78 @@ static const char *const yytname[] = }; #endif -#define YYPACT_NINF -490 -#define YYTABLE_NINF -428 +#define YYPACT_NINF -505 +#define YYTABLE_NINF -436 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ static const short int yypact[] = { - 925, -490, -490, -490, -490, -490, 54, -490, -490, 1321, - -490, -490, -490, -490, -490, -490, -490, -490, 1695, -490, - -490, 1423, 1722, 1473, 1473, 1473, 1568, 0, -50, -3, - -490, 45, 925, -490, -490, -490, -490, -490, 347, -490, - -490, -490, -490, -490, 82, 97, -490, -490, 19, 28, - -490, -490, -490, -490, -490, -490, 40, -490, 42, -490, - -490, -490, -490, -490, -490, 55, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, 1332, -490, - 1473, 1473, 1473, 1795, 31, -490, -490, -490, -490, -490, - -490, -490, -490, 885, -490, -490, -490, -490, 87, 697, - -12, -490, 1155, 1251, 1473, 1473, 88, -490, 89, 1473, - 99, 99, 75, 75, 108, -490, -490, 122, 126, -490, - 55, 128, -490, -490, 114, 118, -490, 134, -490, -490, - -490, 123, -490, 130, 1378, -490, 171, -490, 35, -490, - -490, 82, -490, -490, 1749, 1473, 384, 1473, 124, 55, - -490, -490, -490, -490, -490, 1749, 697, 579, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, 697, -490, -490, -490, - -490, -490, -490, -490, 1251, -490, -490, -490, -490, 1441, - 1251, 140, 1964, 38, -490, 38, -490, -490, -490, 139, - 146, 146, -2, -2, 1368, 136, -490, 384, 151, 157, - -490, 55, 123, -490, -490, -490, -490, -490, -490, 55, - 1822, 347, 50, -490, 145, 14, -490, 347, 812, 347, - 1473, 59, -490, -490, 120, -490, -490, -490, -490, -490, - 337, -490, 153, 1473, 67, -490, 156, -490, -490, 1866, - 1473, -490, -490, 1251, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -490, -490, 1251, 158, 1722, 347, 347, -490, -490, -490, - -490, 55, -490, 3, 234, 36, 150, 1473, -490, 1378, - 55, 1378, 123, 1595, 337, 1473, -490, 154, 162, -490, - 166, -490, -490, -490, 1025, -490, -490, -490, -490, -490, - -490, 337, -490, 1964, -490, 176, 192, -490, 193, 198, - 187, 196, 18, -490, -490, 200, -490, -490, 1839, -490, - 199, 123, 1622, 1473, -490, 209, 1964, 210, 211, -490, - 206, 212, 979, -490, -490, -490, 1473, -490, -490, -490, - -490, -490, 213, -490, -490, -490, -490, -490, -490, -490, - -490, -490, -490, -490, 216, 74, -490, -3, -490, -490, - 219, 1378, -490, 55, 221, -490, 1964, -490, 1098, -490, - 222, 1849, 223, 1893, -490, 337, 812, -490, 347, -490, - -3, 347, -490, 1473, -490, -490, -490, -490, 224, -490, - 226, 227, -490, -490, 1251, 228, 225, 215, -490, -490, - 232, -490, 505, 231, 505, 233, -490, 123, 235, -490, - 104, -490, -490, -490, -490, -490, -490, -490, -490, 236, - 240, 1964, -490, -490, -490, -490, 242, 1206, 337, -490, - -490, -490, 244, 347, -490, 79, -490, 123, 697, 1473, - 1964, 252, 248, -490, -490, -490, 505, -490, -3, 3, - -490, -490, -490, -490, -490, 249, 337, -3, -490, -490, - 131, 251, 255, -490, 347, -490, -490, -490, 254, 264, - -490, -6, -490, -3, 1946, 260, 262, -490, 263, -490, - -490, -490, -490, 265, 256, 266, 337, 1098, 268, -490, - 812, 269, 270, 459, 1920, 154, -490, -490, -490, 271, - 1206, -490, -490, 273, 272, 276, 278, -490, -490, 1098, - -490, -490, 505, 277, 812, -490, -490, -490, -490 + 1189, -505, -505, -505, -505, -505, 21, -505, -505, 115, + -505, -505, -505, -505, -505, -505, -505, -505, 1880, -505, + -505, 506, 1908, 1680, 1680, 1680, 1353, 23, -41, 11, + -505, 81, 1189, -505, -505, -505, -505, -505, 1558, -505, + -505, -505, -505, -505, 45, 101, -505, -505, 49, 27, + -505, -505, -505, -505, -505, -505, 71, -505, 73, -505, + -505, -505, -505, -505, -505, 62, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + 1482, -505, 1680, 1680, 1680, 1984, 88, 595, -505, -505, + -505, -505, -505, -505, -505, -505, 428, -505, -505, -505, + -505, 92, 837, -11, -505, 1587, 1451, 1680, 1680, 93, + 464, -505, 97, 1680, 100, 100, 41, 41, 104, -505, + -505, 108, 118, -505, 62, 121, -505, -505, 117, 119, + -505, 126, -505, -505, -505, 120, -505, 131, 1622, -505, + 168, -505, 50, -505, -505, 45, -505, -505, 1935, 1680, + 122, 1680, 123, 62, -505, -505, -505, -505, -505, 1935, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, 837, 837, + 716, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -505, 1451, -505, -505, -505, -505, 1651, 1451, 138, 2209, + -6, -505, -6, -505, -505, -505, -505, 136, 137, 137, + 42, 42, 1529, 140, -505, 122, 145, 151, -505, 62, + 120, -505, -505, -505, -505, -505, -505, 62, 2011, 1558, + 54, -505, 146, 52, -505, 1558, 1073, 1558, 1680, 86, + -505, -505, 132, -505, -505, -505, -505, -505, 1398, -505, + 152, 1680, 57, -505, -505, 147, -505, 2055, 1680, -505, + -505, 1451, -505, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + 1451, 1451, 156, 1908, 1558, 1558, -505, -505, -505, -505, + 62, -505, 19, 139, 28, 150, 1680, -505, 1622, 62, + 1622, 120, 1777, 1398, 1680, -505, 160, 159, -505, 169, + -505, -505, -505, 1238, -505, -505, -505, -505, -505, -505, + 1398, -505, 2233, -505, 163, 161, -505, 173, 165, 180, + 205, 48, -505, -505, 207, -505, -505, 2028, -505, 209, + 120, 1804, 1680, -505, 211, 2209, 222, 224, 2160, -505, + 229, 225, 1832, -505, -505, -505, 1680, -505, -505, -505, + -505, -505, 228, -505, -505, -505, -505, -505, -505, -505, + -505, -505, -505, -505, 226, 85, -505, 11, -505, -505, + 230, 1622, -505, 62, 231, -505, 2233, -505, 303, -505, + 232, 2038, 233, 2082, -505, 1398, 1398, 1073, -505, 1558, + -505, 11, 1558, -505, 1680, -505, -505, -505, -505, 234, + -505, 237, 238, -505, -505, 1451, 1451, 241, 236, 248, + -505, -505, 247, -505, 349, 246, 349, 242, -505, 120, + 254, -505, 148, -505, -505, -505, -505, -505, -505, -505, + -505, 256, 257, 2233, -505, -505, -505, -505, 258, 1314, + 1398, -505, 2185, -505, -505, 260, 1558, -505, 98, -505, + 120, 837, 1680, 2209, 2257, 265, 263, -505, -505, -505, + 349, -505, 11, 19, -505, -505, -505, -505, -505, 266, + 1398, 11, -505, -505, 1398, 955, 264, 271, -505, 1558, + -505, -505, -505, 270, 277, -505, -8, -505, 11, 2135, + 272, 2281, 274, -505, 276, -505, -505, -505, -505, 278, + 279, 281, 1398, 303, 284, -505, 1073, 287, 285, 965, + 2109, 160, -505, -505, -505, 286, 1314, -505, -505, 288, + 291, 289, 295, -505, -505, 303, -505, -505, 349, 290, + 1073, -505, -505, -505, -505 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -533,101 +536,103 @@ static const short int yypact[] = means the default is an error. */ static const unsigned short int yydefact[] = { - 152, 261, 258, 262, 256, 257, 259, 245, 246, 0, - 248, 249, 250, 251, 252, 253, 254, 255, 244, 157, - 156, 0, 0, 0, 0, 325, 0, 0, 0, 427, - 158, 0, 153, 154, 160, 159, 161, 163, 333, 235, - 237, 236, 242, 243, 265, 275, 241, 162, 0, 0, - 284, 283, 289, 165, 164, 166, 0, 167, 0, 260, - 247, 37, 33, 31, 24, 333, 335, 35, 36, 32, - 30, 28, 27, 25, 26, 34, 29, 290, 0, 244, - 0, 0, 0, 0, 0, 177, 178, 189, 186, 187, - 184, 190, 185, 0, 188, 179, 180, 181, 0, 198, - 0, 172, 0, 0, 325, 325, 0, 230, 229, 0, - 329, 329, 238, 239, 240, 322, 217, 262, 245, 220, - 0, 0, 216, 234, 0, 0, 429, 0, 428, 1, - 155, 331, 295, 0, 334, 266, 270, 268, 272, 263, - 276, 265, 264, 278, 291, 0, 0, 0, 334, 333, - 336, 297, 238, 239, 240, 291, 198, 198, 175, 169, - 71, 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, 72, 73, 74, 75, 76, 77, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, 200, 170, 199, 182, 183, 171, - 174, 173, 207, 208, 0, 22, 23, 20, 21, 0, - 0, 209, 176, 238, 324, 239, 323, 228, 231, 0, - 0, 0, 0, 0, 0, 0, 168, 0, 0, 0, - 299, 333, 331, 271, 267, 273, 274, 269, 277, 292, - 0, 0, 0, 293, 311, 0, 309, 0, 427, 0, - 0, 0, 419, 420, 0, 357, 360, 359, 361, 362, - 0, 363, 0, 0, 0, 193, 0, 192, 201, 0, - 0, 205, 203, 211, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 13, 12, 14, 15, 16, 17, - 18, 19, 0, 0, 0, 0, 0, 302, 301, 303, - 300, 333, 296, 221, 0, 0, 0, 0, 298, 0, - 0, 0, 331, 0, 0, 0, 308, 0, 0, 413, - 31, 319, 318, 320, 0, 411, 409, 408, 410, 407, - 406, 0, 321, 402, 313, 0, 0, 401, 0, 0, - 0, 0, 0, 422, 412, 0, 337, 358, 0, 288, - 0, 331, 0, 194, 202, 0, 213, 0, 212, 204, - 0, 327, 0, 305, 233, 232, 0, 223, 225, 226, - 224, 227, 0, 222, 338, 350, 351, 352, 353, 349, - 354, 355, 356, 348, 0, 0, 342, 427, 347, 332, - 0, 0, 279, 0, 0, 294, 312, 310, 0, 364, - 24, 0, 0, 0, 317, 0, 427, 400, 0, 346, - 427, 0, 421, 0, 399, 418, 287, 281, 0, 196, - 0, 195, 206, 210, 0, 0, 0, 0, 304, 306, - 0, 215, 0, 0, 0, 344, 285, 331, 31, 369, - 30, 387, 386, 384, 382, 383, 385, 381, 380, 34, - 29, 373, 374, 370, 371, 372, 0, 0, 0, 315, - 316, 403, 414, 0, 425, 0, 423, 331, 198, 0, - 214, 0, 0, 307, 286, 339, 0, 343, 427, 221, - 280, 393, 379, 388, 394, 0, 0, 427, 375, 314, - 427, 0, 0, 424, 0, 282, 191, 197, 0, 0, - 340, 0, 345, 427, 0, 389, 0, 416, 415, 404, - 365, 426, 330, 0, 0, 0, 0, 0, 0, 405, - 427, 0, 0, 395, 0, 321, 391, 368, 366, 390, - 0, 378, 417, 0, 0, 0, 396, 397, 376, 0, - 367, 328, 0, 0, 427, 392, 341, 377, 398 + 155, 268, 265, 269, 263, 264, 266, 252, 253, 0, + 255, 256, 257, 258, 259, 260, 261, 262, 251, 160, + 159, 0, 0, 0, 0, 333, 0, 0, 0, 435, + 161, 0, 156, 157, 163, 162, 164, 166, 341, 242, + 244, 243, 249, 250, 272, 282, 248, 165, 0, 0, + 291, 290, 296, 168, 167, 169, 0, 170, 0, 267, + 254, 39, 33, 31, 24, 341, 343, 38, 37, 35, + 36, 32, 30, 28, 27, 25, 26, 34, 29, 297, + 0, 251, 0, 0, 0, 0, 0, 203, 182, 183, + 194, 191, 192, 189, 195, 190, 0, 193, 184, 185, + 186, 0, 203, 0, 175, 0, 0, 333, 333, 0, + 341, 236, 235, 0, 337, 337, 245, 246, 247, 330, + 223, 269, 252, 226, 0, 0, 222, 241, 0, 0, + 437, 0, 436, 1, 158, 339, 302, 0, 342, 273, + 277, 275, 279, 270, 283, 272, 271, 285, 298, 0, + 0, 0, 342, 341, 344, 304, 245, 246, 247, 298, + 73, 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, 74, 75, 76, 77, 78, 79, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 105, 106, 107, 110, 180, + 108, 109, 111, 112, 113, 114, 115, 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, 205, 181, 204, 203, + 203, 178, 172, 173, 187, 188, 174, 177, 176, 213, + 214, 0, 22, 23, 20, 21, 0, 0, 215, 179, + 245, 332, 246, 331, 234, 240, 237, 0, 0, 0, + 0, 0, 0, 0, 171, 0, 0, 0, 306, 341, + 339, 278, 274, 280, 281, 276, 284, 299, 0, 0, + 0, 300, 318, 0, 316, 0, 435, 0, 0, 0, + 427, 428, 0, 365, 368, 367, 369, 370, 0, 371, + 0, 0, 0, 206, 198, 0, 197, 0, 0, 211, + 208, 217, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 13, 12, 14, 15, 16, 17, 18, 19, + 0, 0, 0, 0, 0, 0, 309, 308, 310, 307, + 341, 303, 227, 0, 0, 0, 0, 305, 0, 0, + 0, 339, 0, 0, 0, 315, 0, 0, 421, 31, + 327, 326, 328, 0, 419, 417, 416, 418, 415, 414, + 0, 329, 410, 320, 0, 0, 409, 0, 0, 0, + 0, 0, 430, 420, 0, 345, 366, 0, 295, 0, + 339, 0, 199, 207, 0, 219, 0, 218, 0, 209, + 0, 335, 0, 312, 239, 238, 0, 229, 231, 232, + 230, 233, 0, 228, 346, 358, 359, 360, 361, 357, + 362, 363, 364, 356, 0, 0, 350, 435, 355, 340, + 0, 0, 286, 0, 0, 301, 319, 317, 0, 372, + 24, 0, 0, 0, 324, 0, 0, 435, 408, 0, + 354, 435, 0, 429, 0, 407, 426, 294, 288, 0, + 201, 0, 200, 212, 216, 0, 0, 0, 0, 0, + 311, 313, 0, 221, 0, 0, 0, 352, 292, 339, + 31, 377, 30, 395, 394, 392, 390, 391, 393, 389, + 388, 34, 29, 381, 382, 378, 379, 380, 0, 0, + 0, 322, 0, 323, 411, 422, 0, 433, 0, 431, + 339, 203, 0, 220, 210, 0, 0, 314, 293, 347, + 0, 351, 435, 227, 287, 401, 387, 396, 402, 0, + 0, 435, 383, 321, 0, 435, 0, 0, 432, 0, + 289, 196, 202, 0, 0, 348, 0, 353, 435, 0, + 397, 325, 0, 424, 423, 412, 373, 434, 338, 0, + 0, 0, 0, 0, 0, 413, 435, 0, 0, 403, + 0, 329, 399, 376, 374, 398, 0, 386, 425, 0, + 0, 0, 404, 405, 384, 0, 375, 336, 0, 0, + 435, 400, 349, 385, 406 }; /* YYPGOTO[NTERM-NUM]. */ static const short int yypgoto[] = { - -490, -281, -97, -8, 43, -490, -490, 288, -490, -490, - -490, -490, -490, -490, -490, -490, -490, -490, -490, -490, - -149, -490, -272, -490, -490, -490, -490, -490, -249, -490, - -490, 299, -134, -21, -490, -490, -490, -490, 279, -490, - -490, 182, -490, -490, -490, -490, 27, 308, -490, -490, - 172, -20, -38, -490, -490, 33, -171, -490, -103, 29, - -490, -54, -302, -490, -490, -490, -490, 37, -490, 34, - -293, -56, -5, -490, 315, -490, -170, -447, -489, -490, - 39, -306, -490, -271, -454, 20, -490, -490, -490, -169, - -490, -490, -490, -490, -490, -490, -490, -472, 21, -490, - -490, -490, -490, -490, -490, -490, -140, -490, -26, -465 + -505, -289, -98, -7, 39, -505, -505, 293, -505, -505, + -505, -505, -505, -505, -505, -505, -505, -505, -505, -505, + -99, -505, -270, -505, -505, -505, -505, -505, -236, -505, + -505, 318, 7, -21, -505, -505, -505, 235, 297, -505, + -505, 198, -505, -505, -505, -505, 26, 330, -505, -505, + 190, -16, -38, -505, -505, 60, -141, -505, -102, 37, + -505, -44, -333, -505, -505, -505, -505, 65, -505, 5, + -311, -51, -5, -505, 340, -505, -154, -458, -504, -505, + 64, -330, -505, -255, -475, 46, -505, -505, -505, -150, + -505, -505, -505, -505, -505, -505, -505, -469, 44, -505, + -505, -505, -505, -505, -505, -505, -120, -505, -28, -477 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short int yydefgoto[] = { - -1, 485, 411, 131, 274, 31, 32, 33, 34, 35, - 98, 99, 100, 279, 101, 102, 103, 158, 500, 501, - 275, 276, 292, 437, 438, 36, 121, 122, 452, 453, - 37, 441, 38, 39, 40, 41, 42, 43, 44, 45, - 46, 139, 314, 317, 142, 47, 107, 49, 50, 51, - 322, 52, 412, 53, 54, 378, 379, 442, 443, 109, - 325, 326, 413, 414, 56, 110, 111, 115, 507, 300, - 310, 133, 391, 57, 58, 465, 466, 415, 467, 468, - 334, 335, 336, 606, 607, 608, 533, 534, 535, 536, - 598, 609, 565, 615, 616, 337, 338, 416, 417, 418, - 571, 588, 339, 340, 341, 422, 423, 545, 419, 128 + -1, 496, 420, 135, 276, 31, 32, 33, 34, 35, + 101, 102, 103, 286, 104, 105, 106, 281, 511, 512, + 277, 278, 299, 446, 447, 36, 125, 126, 462, 463, + 37, 451, 329, 39, 40, 41, 42, 43, 44, 45, + 46, 143, 322, 325, 146, 47, 111, 49, 50, 51, + 330, 52, 421, 53, 54, 387, 388, 452, 453, 113, + 333, 334, 422, 423, 56, 114, 115, 119, 519, 308, + 318, 137, 400, 57, 58, 475, 476, 424, 477, 478, + 342, 343, 344, 622, 623, 624, 545, 546, 547, 548, + 614, 625, 579, 631, 632, 345, 346, 425, 426, 427, + 586, 604, 347, 348, 349, 431, 432, 558, 428, 132 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -635,416 +640,482 @@ static const short int yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const short int yytable[] = { - 132, 77, 108, 127, 78, 123, 290, 345, 347, 147, - 321, 372, 349, 537, 541, 112, 113, 114, 352, 388, - 515, 321, 277, 555, 532, 558, 489, 48, 427, 55, - 447, 448, 449, 134, 124, 377, 450, 451, 428, 455, - 374, 315, 456, 29, 316, 129, 457, 126, 458, 459, - 460, 461, 462, 463, 395, 492, 143, 396, 493, 48, - 148, 55, 123, 59, 594, 60, 144, 580, 372, 155, - 151, 372, 152, 153, 154, 464, 399, 424, 427, -326, - -326, 436, 145, 568, 146, 157, 135, 136, 137, 392, - 393, 138, 476, 343, 281, 291, 293, 295, 587, 472, - 439, 298, 483, 140, 4, 5, 431, 432, 278, 484, - 66, 515, -329, 513, 514, 304, 299, -329, 573, 574, - 585, 561, 562, 159, 323, 297, 312, -289, 612, 375, - 376, 617, 610, 626, 61, 323, 595, 324, 497, 342, - 299, 294, 296, 62, 148, 301, 302, 303, 399, 400, - -326, 306, 628, -218, 610, 372, 620, -219, 372, 305, - 307, 64, 401, 426, 402, 308, 403, 309, 311, 404, - 405, 406, 407, 408, 409, 410, 531, 313, 353, 150, - 373, 126, 383, 540, 285, 286, 66, 290, 374, 385, - 386, 394, 429, 290, 433, 469, 440, 287, 288, 479, - 478, 586, 67, 68, -412, 521, 522, 523, 524, 525, - 526, 527, 528, 563, 327, 328, 329, 330, 331, 332, - 333, 69, 486, 70, 560, 71, 72, 73, 74, 487, - 489, 488, 550, 490, 491, 531, 569, 494, 496, 505, - 75, 76, 405, 406, 407, 408, 409, 410, 502, 503, - 511, 504, 553, 506, 575, 387, 290, 512, 516, 321, - 517, -24, 538, 547, 584, 548, 552, 549, 551, 372, - 482, 554, 556, -379, -388, 290, 291, 454, 566, 559, - 567, 351, 291, 132, 570, 578, 579, 583, 602, 397, - 589, 420, 590, 592, 604, 531, 382, 593, 321, 123, - 597, 599, 613, 600, 603, 601, 148, 611, 531, 614, - 582, 619, 621, 622, 389, 623, 627, 531, 624, 348, - 130, 106, 421, 318, 141, 446, 84, 344, 327, 328, - 329, 330, 331, 332, 333, 430, 380, 444, 445, 509, - 61, 477, 435, 125, 557, 291, 384, 398, 625, 62, - 61, 564, 425, 546, 108, 63, 0, 0, 0, 62, - 0, 0, 0, 0, 291, 63, 0, 64, 401, 0, - 402, 0, 403, 475, 0, 404, 148, 64, 0, 470, - 0, 151, 0, 312, 0, 471, 0, 324, 0, 0, - 285, 286, 66, 0, 0, 0, 0, 0, 0, 576, - 0, 0, 66, 287, 288, 0, 0, 290, 67, 68, - 0, 0, 475, 0, 0, 0, 0, 0, 67, 68, - 0, 0, 108, 0, 0, 499, 0, 69, 0, 70, - 0, 71, 72, 73, 74, 0, 0, 69, 510, 70, - 0, 71, 72, 73, 74, 0, 75, 76, 0, 0, - 542, 0, 0, 544, 0, 0, 75, 76, 0, 0, - 123, 0, 61, 382, 543, 0, 0, 0, 389, 0, - 0, 62, 0, 0, 0, 0, 399, 400, 327, 328, - 329, 330, 331, 332, 333, 421, 0, 0, 0, 64, - 401, -427, 402, 0, 403, 0, 291, 404, 0, 0, - 0, 0, 0, 0, 0, 572, 0, 0, 455, 126, - 0, 456, 285, 286, 66, 457, 0, 458, 459, 460, - 461, 462, 463, 0, 0, 287, 288, 0, 0, 0, - 67, 68, 581, 0, 0, 0, 591, 0, 0, 0, - 0, 577, 0, 0, 0, 0, 0, 0, 0, 69, - 0, 70, 0, 71, 72, 73, 74, 0, 0, 605, - 0, 0, 0, 0, 0, 0, 0, 0, 75, 76, - 405, 406, 407, 408, 409, 410, 0, 0, 0, 160, - 0, 605, 161, 162, 163, 164, 165, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, - 189, 190, 191, 192, 193, 0, 194, 195, 196, 197, - 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, - 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, - 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, - 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, - 238, 0, 239, 0, 240, 241, 242, 243, 244, 245, - 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, - 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, - 266, 267, 268, 269, 270, 271, 272, 160, 346, 273, + 136, 131, 79, 283, 80, 127, 112, 38, 297, 397, + 381, 549, 436, 544, 151, 437, 116, 117, 118, 527, + 569, 357, 572, 284, 500, 38, 48, 360, 554, 110, + 59, 465, 60, 138, 466, -334, -334, 55, 467, 38, + 468, 469, 470, 471, 472, 473, 457, 458, 459, 139, + 140, 141, 460, 461, 142, 29, 323, 128, 48, 324, + 152, 130, 610, 436, 127, 148, 595, 474, 381, 55, + 486, 381, 136, 155, 582, 156, 157, 158, -337, 386, + 493, 133, 307, -337, 383, 503, 147, 494, 504, 280, + 482, 445, 404, 401, 402, 405, 440, 441, 288, 298, + 300, 302, 351, 408, 433, 138, 306, 144, 4, 5, + 448, 449, 285, 149, 527, 150, 603, 66, 61, 312, + 309, 310, 311, 600, 525, 526, 159, 62, 282, 508, + 304, 320, 331, 63, 642, -296, 626, 588, 589, -224, + 611, 307, 332, 331, 350, 64, -334, 628, 152, -225, + 633, 636, 313, 65, 314, 543, 381, 316, 626, 381, + 381, 315, 552, 553, 317, 575, 576, 384, 385, 319, + 66, 644, 301, 303, 321, 435, 361, 382, 154, 383, + 354, 356, 464, 394, 395, 442, 392, 67, 68, 69, + 70, 438, 403, 297, 450, 479, 489, 500, 498, 297, + 414, 415, 416, 417, 418, 419, 488, -420, 71, 497, + 72, 499, 73, 74, 75, 76, 543, 583, 574, 335, + 336, 337, 338, 339, 340, 341, 501, 77, 78, 335, + 336, 337, 338, 339, 340, 341, 335, 336, 337, 338, + 339, 340, 341, 502, 505, 563, 564, 599, 507, 590, + 513, 601, 533, 534, 535, 536, 537, 538, 539, 540, + 577, 514, 517, 297, 515, 523, 518, 524, 396, 528, + 529, -24, 550, 560, 381, 381, 561, 566, 562, 620, + 543, 565, 297, 297, 298, 567, 568, 570, 573, 359, + 298, 136, -387, 543, -396, 580, 581, 406, 593, 429, + 585, 594, 543, 605, 598, 391, 61, 127, 606, 608, + 609, 618, 613, 615, 152, 62, 616, 353, 617, 619, + 629, 530, 398, 627, 630, 134, 635, 637, 639, 643, + 531, 430, 638, 64, 410, 640, 411, 597, 412, 456, + 109, 413, 145, 326, 439, 305, 454, 455, 86, 352, + 521, 444, 465, 130, 298, 466, 292, 293, 66, 467, + 487, 468, 469, 470, 471, 472, 473, 112, 129, 294, + 295, 389, 571, 298, 298, 67, 68, 69, 70, 393, + 641, 407, 578, 434, 559, 152, 485, 0, 0, 480, + 110, 155, 0, 320, 481, 0, 71, 332, 532, 0, + 73, 74, 75, 76, 0, 0, 0, 533, 534, 535, + 536, 537, 538, 539, 540, 541, 542, 297, 297, 0, + 492, 0, 0, 0, 0, 485, 0, 0, 0, 0, + 0, 61, 0, 0, 0, 510, 112, 0, 0, 0, + 62, 0, 0, 0, 0, 0, 63, 0, 0, 522, + 0, 0, 0, 0, 0, 279, 0, 0, 64, 110, + 0, 555, 591, 0, 557, 0, 0, 61, 0, 0, + 127, 0, 0, 556, 391, 0, 62, 0, 398, 0, + 0, 0, 63, 10, 11, 12, 13, 14, 15, 16, + 17, 0, 0, 0, 64, 0, 0, 430, 0, 0, + 67, 68, 69, 70, 0, 0, 0, 0, 298, 298, + 0, 0, 0, 0, 0, 0, 0, 0, 587, 66, + 0, 71, 0, 72, 0, 73, 74, 75, 76, 0, + 0, 0, 0, 0, 0, 0, 67, 68, 69, 70, + 77, 78, 0, 0, 596, 0, 0, 0, 0, 0, + 0, 607, 0, 0, 0, 592, 0, 71, 0, 72, + 0, 73, 74, 75, 76, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 621, 77, 78, 87, 0, + 88, 89, 90, 91, 92, 93, 94, 95, 96, 0, + 97, 98, 99, 100, 0, 160, 0, 621, 161, 162, + 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, + 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, + 193, 0, 194, 195, 196, 197, 198, 199, 200, 201, + 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, + 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, + 222, 223, 224, 225, 226, 227, 228, 0, 229, 230, + 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, + 0, 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, 160, 0, 275, 161, + 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, + 192, 193, 0, 194, 195, 196, 197, 198, 199, 200, + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, + 221, 222, 223, 224, 225, 226, 227, 228, 0, 0, + 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, + 240, 0, 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, 160, 355, 275, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 0, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, - 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, - 230, 231, 232, 233, 234, 235, 236, 237, 238, 0, - 239, 0, 240, 241, 242, 243, 244, 245, 246, 247, - 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, - 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, - 268, 269, 270, 271, 272, 61, 0, 273, 0, 0, - 0, 0, 0, 0, 62, 0, 0, 0, 0, 399, - 400, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 64, 401, 0, 402, 0, 403, 0, 0, - 404, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 126, 0, 0, 285, 286, 66, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 287, 288, - 0, 0, 0, 67, 68, 0, 0, 0, 61, 0, - 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, - 0, 0, 69, 63, 70, 0, 71, 72, 73, 74, - 0, 0, 156, 0, 0, 64, 0, 0, 0, 0, - 0, 75, 76, 405, 406, 407, 408, 409, 410, 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, 67, 68, 0, 0, - 0, 19, 20, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 21, 0, 0, 69, 0, 70, 0, 71, - 72, 73, 74, 1, 2, 3, 4, 5, 6, 7, - 8, 0, 0, 0, 75, 76, 9, 0, 10, 11, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 0, + 0, 230, 231, 232, 233, 234, 235, 236, 237, 238, + 239, 240, 0, 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, 61, 0, + 275, 0, 0, 0, 0, 0, 0, 62, 61, 0, + 0, 0, 408, 409, 0, 0, 0, 62, 0, 0, + 0, 0, 408, 409, 0, 64, 410, 0, 411, 0, + 412, 0, 0, 413, 0, 64, 410, -435, 411, 0, + 412, 0, 0, 413, 0, 130, 0, 0, 292, 293, + 66, 0, 0, 0, 0, 130, 0, 0, 292, 293, + 66, 294, 295, 0, 0, 602, 0, 67, 68, 69, + 70, 294, 295, 0, 0, 0, 0, 67, 68, 69, + 70, 0, 0, 0, 0, 0, 0, 0, 71, 0, + 72, 0, 73, 74, 75, 76, 0, 0, 71, 0, + 72, 0, 73, 74, 75, 76, 0, 77, 78, 414, + 415, 416, 417, 418, 419, 0, 61, 77, 78, 414, + 415, 416, 417, 418, 419, 62, 0, 0, 0, 0, + 408, 409, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 64, 410, 0, 411, 0, 412, 0, + 0, 413, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 130, 0, 0, 292, 293, 66, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 294, + 295, 0, 0, 0, 0, 67, 68, 69, 70, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 71, 0, 72, 0, + 73, 74, 75, 76, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 77, 78, 414, 415, 416, + 417, 418, 419, 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, - 22, 23, 24, 25, 26, 27, 28, 0, 29, 0, - 0, 0, 508, 0, 0, 0, 0, 0, 61, 1, - 2, 3, 4, 5, 6, 7, 8, 62, 0, 0, - 0, 0, 30, 63, 10, 11, 12, 13, 14, 15, - 16, 17, 0, 0, 0, 480, 401, 0, 402, 0, - 403, 0, 0, 404, 0, 104, 105, 25, 83, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 285, 286, - 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 287, 288, 0, 0, 0, 67, 68, 0, 0, - 0, 61, 0, 0, 0, 0, 0, 0, 0, 0, - 62, 80, 81, 82, 481, 69, 518, 70, 0, 71, - 72, 73, 74, 0, 0, 519, 0, 0, 64, 401, - 0, 402, 0, 403, 75, 76, 404, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 126, 0, - 0, 285, 286, 66, 0, 0, 0, 0, 61, 0, - 0, 0, 0, 0, 287, 288, 0, 62, 0, 67, - 68, 0, 0, 63, 0, 0, 0, 0, 0, 0, - 0, 0, 280, 0, 0, 64, 0, 0, 69, 0, - 520, 0, 71, 72, 73, 74, 0, 0, 0, 521, - 522, 523, 524, 525, 526, 527, 528, 529, 530, 61, - 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, - 0, 0, 0, 0, 518, 0, 67, 68, 0, 0, - 0, 0, 0, 519, 0, 0, 64, 401, 0, 402, - 0, 403, 0, 0, 404, 69, 0, 70, 0, 71, - 72, 73, 74, 0, 61, 0, 0, 0, 0, 285, - 286, 66, 0, 62, 75, 76, 0, 0, 0, 63, - 0, 0, 287, 288, 0, 0, 0, 67, 68, 0, - 0, 64, 0, 0, 282, 0, 283, 0, 0, 284, - 0, 0, 0, 0, 0, 0, 69, 0, 520, 0, - 71, 72, 73, 74, 285, 286, 0, 521, 522, 523, - 524, 525, 526, 527, 528, 529, 530, 287, 288, 0, - 0, 0, 67, 68, 61, 0, 0, 0, 0, 0, - 0, 289, 0, 62, 0, 61, 0, 0, 0, 63, - 0, 69, 0, 70, 62, 71, 72, 73, 74, 0, - 63, 64, 0, 0, 0, 0, 0, 0, 0, 65, - 75, 76, 64, 0, 0, 0, 0, 0, 0, 0, - 149, 61, 0, 0, 0, 0, 66, 0, 0, 0, - 62, 61, 0, 0, 0, 0, 63, 150, 0, 0, - 62, 0, 67, 68, 0, 0, 63, 0, 64, 0, - 0, 0, 0, 67, 68, 0, 381, 0, 64, 0, - 0, 69, 0, 70, 0, 71, 72, 73, 74, 0, - 0, 0, 69, 150, 70, 0, 71, 72, 73, 74, - 75, 76, 0, 150, 0, 0, 0, 0, 0, 67, - 68, 75, 76, 0, 61, 0, 0, 0, 0, 67, - 68, 0, 0, 62, 0, 0, 0, 0, 69, 63, - 70, 0, 71, 72, 73, 74, 0, 0, 69, 0, - 70, 64, 71, 72, 73, 74, 61, 75, 76, 350, - 0, 0, 0, 0, 0, 62, 0, 75, 76, 0, - 0, 63, 0, 0, 85, 86, 87, 88, 89, 90, - 91, 92, 93, 64, 94, 95, 96, 97, 0, 0, - 0, 0, 67, 68, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 69, 0, 70, 0, 71, 72, 73, 74, 0, - 0, 0, 0, 0, 67, 68, 0, 0, 0, 0, - 75, 76, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 69, 0, 70, 0, 71, 72, 73, - 74, 116, 1, 2, 117, 4, 5, 6, 118, 8, - 119, 0, 75, 76, 0, 120, 0, 10, 11, 12, - 13, 14, 15, 16, 17, 0, 0, 0, 79, 1, - 2, 3, 4, 5, 6, 7, 8, 0, 0, 0, - 0, 0, 473, 0, 10, 11, 12, 13, 14, 15, - 16, 17, 0, 0, 0, 79, 1, 2, 3, 4, - 5, 6, 7, 8, 0, 0, 0, 0, 0, 473, - 0, 10, 11, 12, 13, 14, 15, 16, 17, 0, - 0, 0, 79, 0, 80, 81, 82, 0, 0, 0, - 0, 0, 0, 0, 0, 474, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 80, 81, 82, 320, 0, 0, 0, 0, 0, - 0, 0, 498, 0, 0, 0, 0, 0, 0, 1, - 2, 3, 4, 5, 6, 7, 8, 0, 80, 81, - 82, 320, 9, 0, 10, 11, 12, 13, 14, 15, - 16, 17, 0, 0, 0, 79, 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, 1, 2, 3, 4, 5, 6, 7, - 8, 0, 0, 0, 0, 0, 319, 0, 10, 11, - 12, 13, 14, 15, 16, 17, 0, 0, 0, 79, - 0, 80, 81, 82, 83, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 2, 3, 4, 5, 6, 7, 8, 0, 104, 105, - 25, 83, 120, 0, 10, 11, 12, 13, 14, 15, - 16, 17, 0, 0, 0, 79, 1, 2, 3, 4, - 5, 6, 7, 8, 0, 80, 81, 82, 320, 390, + 0, 0, 0, 0, 0, 19, 20, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, + 0, 61, 1, 2, 3, 4, 5, 6, 7, 8, + 62, 0, 0, 0, 0, 0, 63, 10, 11, 12, + 13, 14, 15, 16, 17, 0, 0, 0, 490, 410, + 0, 411, 0, 412, 0, 0, 413, 22, 23, 24, + 25, 26, 27, 28, 0, 29, 0, 0, 0, 0, + 0, 292, 293, 66, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 294, 295, 0, 0, 0, 30, + 67, 68, 69, 70, 0, 0, 0, 61, 0, 0, + 0, 0, 0, 0, 0, 0, 62, 82, 83, 84, + 491, 71, 530, 72, 0, 73, 74, 75, 76, 0, + 0, 531, 0, 0, 64, 410, 0, 411, 0, 412, + 77, 78, 413, 0, 0, 0, 120, 1, 2, 121, + 4, 5, 6, 122, 8, 123, 0, 292, 293, 66, + 124, 0, 10, 11, 12, 13, 14, 15, 16, 17, + 294, 295, 0, 81, 0, 0, 67, 68, 69, 70, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 61, 0, 0, 0, 0, 0, 71, 0, 532, + 62, 73, 74, 75, 76, 0, 63, 0, 533, 534, + 535, 536, 537, 538, 539, 540, 541, 542, 64, 410, + 0, 411, 0, 412, 0, 0, 413, 0, 0, 0, + 0, 0, 82, 83, 84, 0, 0, 0, 0, 0, + 0, 292, 293, 66, 61, 0, 0, 0, 0, 0, + 0, 0, 0, 62, 294, 295, 0, 0, 0, 63, + 67, 68, 69, 70, 0, 0, 0, 0, 0, 0, + 0, 64, 0, 0, 289, 61, 290, 0, 0, 291, + 0, 71, 0, 72, 62, 73, 74, 75, 76, 0, + 63, 0, 0, 0, 292, 293, 0, 0, 0, 0, + 77, 78, 64, 0, 0, 0, 0, 294, 295, 0, + 153, 0, 0, 67, 68, 69, 70, 0, 0, 0, + 0, 0, 61, 0, 296, 0, 0, 154, 0, 0, + 0, 62, 0, 0, 71, 0, 72, 63, 73, 74, + 75, 76, 0, 0, 67, 68, 69, 70, 0, 64, + 0, 61, 0, 77, 78, 0, 0, 390, 0, 0, + 62, 0, 0, 0, 0, 71, 63, 72, 0, 73, + 74, 75, 76, 0, 154, 0, 0, 0, 64, 0, + 61, 0, 0, 0, 77, 78, 0, 0, 0, 62, + 0, 67, 68, 69, 70, 63, 0, 0, 0, 0, + 0, 0, 0, 66, 287, 0, 0, 64, 0, 0, + 0, 0, 71, 0, 72, 61, 73, 74, 75, 76, + 67, 68, 69, 70, 62, 0, 0, 0, 0, 0, + 63, 77, 78, 0, 0, 0, 0, 0, 0, 0, + 0, 71, 64, 72, 61, 73, 74, 75, 76, 67, + 68, 69, 70, 62, 0, 0, 0, 0, 0, 63, + 77, 78, 0, 0, 0, 0, 0, 154, 0, 0, + 71, 64, 72, 61, 73, 74, 75, 76, 0, 358, + 0, 0, 62, 0, 67, 68, 69, 70, 63, 77, + 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 64, 0, 0, 0, 0, 71, 0, 72, 0, 73, + 74, 75, 76, 67, 68, 69, 70, 0, 0, 0, + 0, 0, 0, 0, 77, 78, 0, 0, 0, 0, + 0, 0, 0, 0, 71, 0, 72, 0, 73, 74, + 75, 76, 67, 68, 69, 70, 0, 0, 0, 0, + 0, 0, 0, 77, 78, 0, 0, 0, 0, 0, + 0, 0, 0, 71, 0, 72, 0, 73, 74, 75, + 76, 1, 2, 3, 4, 5, 6, 7, 8, 0, + 0, 0, 77, 78, 483, 0, 10, 11, 12, 13, + 14, 15, 16, 17, 0, 0, 0, 81, 1, 2, + 3, 4, 5, 6, 7, 8, 0, 0, 0, 0, + 0, 483, 0, 10, 11, 12, 13, 14, 15, 16, + 17, 0, 0, 0, 81, 0, 1, 2, 3, 4, + 5, 6, 7, 8, 0, 0, 0, 484, 0, 9, 0, 10, 11, 12, 13, 14, 15, 16, 17, 0, - 0, 0, 79, 1, 2, 3, 4, 5, 6, 7, - 8, 0, 0, 0, 0, 0, 0, 0, 10, 11, - 12, 13, 14, 15, 16, 17, 495, 0, 0, 79, - 0, 80, 81, 82, 0, 0, 0, 354, 355, 356, - 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, - 367, 368, 369, 370, 371, 434, 0, 0, 80, 81, - 82, 0, 0, 0, 354, 355, 356, 357, 358, 359, - 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, - 370, 371, 539, 0, 0, 80, 81, 82, 0, 0, - 0, 354, 355, 356, 357, 358, 359, 360, 361, 362, - 363, 364, 365, 366, 367, 368, 369, 370, 371, 618, - 0, 0, 0, 0, 0, 0, 0, 0, 354, 355, - 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, - 366, 367, 368, 369, 370, 371, 596, 0, 0, 0, - 0, 0, 0, 0, 354, 355, 356, 357, 358, 359, - 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, - 370, 371, 354, 355, 356, 357, 358, 359, 360, 361, - 362, 363, 364, 365, 366, 367, 368, 369, 370, 371 + 0, 0, 18, 0, 0, 0, 82, 83, 84, 328, + 0, 0, 0, 0, 509, 520, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, + 7, 8, 0, 82, 83, 84, 328, 9, 0, 10, + 11, 12, 13, 14, 15, 16, 17, 0, 0, 0, + 81, 0, 1, 2, 3, 4, 5, 6, 7, 8, + 0, 107, 108, 25, 85, 9, 0, 10, 11, 12, + 13, 14, 15, 16, 17, 0, 0, 0, 18, 1, + 2, 3, 4, 5, 6, 7, 8, 0, 0, 0, + 0, 0, 327, 0, 10, 11, 12, 13, 14, 15, + 16, 17, 0, 0, 0, 81, 0, 0, 0, 82, + 83, 84, 85, 0, 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, 25, + 85, 124, 0, 10, 11, 12, 13, 14, 15, 16, + 17, 0, 0, 0, 81, 1, 2, 3, 4, 5, + 6, 7, 8, 0, 82, 83, 84, 328, 399, 0, + 10, 11, 12, 13, 14, 15, 16, 17, 0, 0, + 0, 81, 1, 2, 3, 4, 5, 6, 7, 8, + 0, 0, 0, 0, 0, 0, 0, 10, 11, 12, + 13, 14, 15, 16, 17, 506, 0, 0, 81, 0, + 0, 0, 0, 82, 83, 84, 362, 363, 364, 365, + 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, + 376, 377, 378, 379, 443, 0, 0, 0, 0, 495, + 82, 83, 84, 362, 363, 364, 365, 366, 367, 368, + 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, + 379, 551, 0, 0, 0, 0, 380, 82, 83, 84, + 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, + 372, 373, 374, 375, 376, 377, 378, 379, 634, 0, + 0, 0, 0, 495, 0, 0, 0, 362, 363, 364, + 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, + 375, 376, 377, 378, 379, 612, 0, 0, 0, 0, + 495, 0, 0, 362, 363, 364, 365, 366, 367, 368, + 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, + 379, 516, 0, 0, 0, 0, 495, 0, 362, 363, + 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, + 374, 375, 376, 377, 378, 379, 584, 0, 0, 0, + 0, 380, 0, 362, 363, 364, 365, 366, 367, 368, + 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, + 379, 0, 0, 0, 0, 0, 495, 362, 363, 364, + 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, + 375, 376, 377, 378, 379, 0, 0, 0, 0, 0, + 380, 362, 363, 364, 365, 366, 367, 368, 369, 370, + 371, 372, 373, 374, 375, 376, 377, 378, 379, 0, + 0, 0, 0, 0, 495, 362, 363, 364, 365, 366, + 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, + 377, 378, 379, 0, 0, 0, 0, 0, 380, 362, + 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, + 373, 374, 375, 376, 377, 378, 379, 0, 0, 0, + 0, 0, 495 }; static const short int yycheck[] = { - 38, 9, 22, 29, 9, 26, 103, 156, 157, 65, - 144, 292, 284, 478, 486, 23, 24, 25, 290, 312, - 467, 155, 34, 512, 478, 514, 32, 0, 334, 0, - 27, 28, 29, 38, 34, 37, 33, 34, 340, 3, - 42, 6, 6, 93, 9, 0, 10, 50, 12, 13, - 14, 15, 16, 17, 40, 37, 37, 43, 40, 32, - 65, 32, 83, 9, 70, 11, 38, 556, 349, 38, - 78, 352, 80, 81, 82, 39, 17, 18, 384, 41, - 42, 353, 42, 537, 42, 93, 4, 5, 6, 39, - 40, 9, 394, 149, 102, 103, 104, 105, 570, 392, - 372, 109, 404, 6, 7, 8, 39, 40, 120, 411, - 55, 558, 37, 39, 40, 120, 41, 42, 39, 40, - 567, 17, 18, 36, 144, 37, 134, 38, 600, 300, - 301, 603, 597, 622, 3, 155, 583, 145, 431, 147, - 41, 104, 105, 12, 149, 111, 112, 113, 17, 18, - 42, 37, 624, 31, 619, 436, 610, 31, 439, 31, - 42, 30, 31, 43, 33, 31, 35, 44, 38, 38, - 111, 112, 113, 114, 115, 116, 478, 6, 38, 55, - 41, 50, 46, 485, 53, 54, 55, 284, 42, 38, - 33, 46, 39, 290, 38, 45, 38, 66, 67, 37, - 46, 70, 71, 72, 38, 101, 102, 103, 104, 105, - 106, 107, 108, 109, 94, 95, 96, 97, 98, 99, - 100, 90, 46, 92, 517, 94, 95, 96, 97, 37, - 32, 38, 504, 46, 38, 537, 538, 37, 39, 33, - 109, 110, 111, 112, 113, 114, 115, 116, 39, 39, - 37, 40, 37, 41, 547, 311, 353, 41, 39, 393, - 39, 39, 39, 39, 566, 39, 41, 40, 40, 550, - 404, 39, 41, 38, 38, 372, 284, 43, 38, 46, - 38, 289, 290, 321, 40, 33, 38, 38, 32, 327, - 39, 329, 37, 39, 596, 597, 304, 33, 432, 320, - 40, 39, 33, 40, 38, 40, 311, 39, 610, 39, - 559, 40, 39, 41, 319, 39, 39, 619, 40, 276, - 32, 22, 330, 141, 45, 381, 18, 155, 94, 95, - 96, 97, 98, 99, 100, 343, 303, 375, 376, 442, - 3, 395, 350, 28, 514, 353, 307, 327, 619, 12, - 3, 520, 331, 493, 374, 18, -1, -1, -1, 12, - -1, -1, -1, -1, 372, 18, -1, 30, 31, -1, - 33, -1, 35, 393, -1, 38, 381, 30, -1, 387, - -1, 389, -1, 391, -1, 390, -1, 395, -1, -1, - 53, 54, 55, -1, -1, -1, -1, -1, -1, 548, - -1, -1, 55, 66, 67, -1, -1, 504, 71, 72, - -1, -1, 432, -1, -1, -1, -1, -1, 71, 72, - -1, -1, 442, -1, -1, 433, -1, 90, -1, 92, - -1, 94, 95, 96, 97, -1, -1, 90, 446, 92, - -1, 94, 95, 96, 97, -1, 109, 110, -1, -1, - 488, -1, -1, 491, -1, -1, 109, 110, -1, -1, - 481, -1, 3, 471, 490, -1, -1, -1, 473, -1, - -1, 12, -1, -1, -1, -1, 17, 18, 94, 95, - 96, 97, 98, 99, 100, 493, -1, -1, -1, 30, - 31, 32, 33, -1, 35, -1, 504, 38, -1, -1, - -1, -1, -1, -1, -1, 543, -1, -1, 3, 50, - -1, 6, 53, 54, 55, 10, -1, 12, 13, 14, - 15, 16, 17, -1, -1, 66, 67, -1, -1, -1, - 71, 72, 558, -1, -1, -1, 574, -1, -1, -1, - -1, 549, -1, -1, -1, -1, -1, -1, -1, 90, - -1, 92, -1, 94, 95, 96, 97, -1, -1, 597, - -1, -1, -1, -1, -1, -1, -1, -1, 109, 110, - 111, 112, 113, 114, 115, 116, -1, -1, -1, 0, - -1, 619, 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, -1, 83, -1, 85, 86, 87, 88, 89, 90, - 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, - 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 0, 119, 120, + 38, 29, 9, 102, 9, 26, 22, 0, 106, 320, + 299, 488, 342, 488, 65, 348, 23, 24, 25, 477, + 524, 291, 526, 34, 32, 18, 0, 297, 497, 22, + 9, 3, 11, 38, 6, 41, 42, 0, 10, 32, + 12, 13, 14, 15, 16, 17, 27, 28, 29, 4, + 5, 6, 33, 34, 9, 96, 6, 34, 32, 9, + 65, 50, 70, 393, 85, 38, 570, 39, 357, 32, + 403, 360, 110, 80, 549, 82, 83, 84, 37, 37, + 413, 0, 41, 42, 42, 37, 37, 420, 40, 96, + 401, 361, 40, 39, 40, 43, 39, 40, 105, 106, + 107, 108, 153, 17, 18, 110, 113, 6, 7, 8, + 380, 381, 123, 42, 572, 42, 585, 55, 3, 124, + 115, 116, 117, 581, 39, 40, 38, 12, 36, 440, + 37, 138, 148, 18, 638, 38, 613, 39, 40, 31, + 598, 41, 149, 159, 151, 30, 42, 616, 153, 31, + 619, 626, 31, 38, 37, 488, 445, 31, 635, 448, + 449, 42, 495, 496, 44, 17, 18, 308, 309, 38, + 55, 640, 107, 108, 6, 43, 38, 41, 55, 42, + 279, 280, 43, 38, 33, 38, 46, 72, 73, 74, + 75, 39, 46, 291, 38, 45, 37, 32, 37, 297, + 114, 115, 116, 117, 118, 119, 46, 38, 93, 46, + 95, 38, 97, 98, 99, 100, 549, 550, 529, 97, + 98, 99, 100, 101, 102, 103, 46, 112, 113, 97, + 98, 99, 100, 101, 102, 103, 97, 98, 99, 100, + 101, 102, 103, 38, 37, 515, 516, 580, 39, 560, + 39, 584, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 39, 33, 361, 40, 37, 41, 41, 319, 39, + 39, 39, 39, 39, 563, 564, 39, 41, 40, 612, + 613, 40, 380, 381, 291, 37, 39, 41, 46, 296, + 297, 329, 38, 626, 38, 38, 38, 335, 33, 337, + 40, 38, 635, 39, 38, 312, 3, 328, 37, 39, + 33, 32, 40, 39, 319, 12, 40, 278, 40, 38, + 33, 18, 327, 39, 39, 32, 40, 39, 39, 39, + 27, 338, 41, 30, 31, 40, 33, 573, 35, 390, + 22, 38, 45, 145, 351, 110, 384, 385, 18, 159, + 452, 358, 3, 50, 361, 6, 53, 54, 55, 10, + 404, 12, 13, 14, 15, 16, 17, 383, 28, 66, + 67, 311, 526, 380, 381, 72, 73, 74, 75, 315, + 635, 335, 532, 339, 504, 390, 402, -1, -1, 396, + 383, 398, -1, 400, 399, -1, 93, 404, 95, -1, + 97, 98, 99, 100, -1, -1, -1, 104, 105, 106, + 107, 108, 109, 110, 111, 112, 113, 515, 516, -1, + 413, -1, -1, -1, -1, 441, -1, -1, -1, -1, + -1, 3, -1, -1, -1, 442, 452, -1, -1, -1, + 12, -1, -1, -1, -1, -1, 18, -1, -1, 456, + -1, -1, -1, -1, -1, 27, -1, -1, 30, 452, + -1, 499, 561, -1, 502, -1, -1, 3, -1, -1, + 491, -1, -1, 501, 481, -1, 12, -1, 483, -1, + -1, -1, 18, 19, 20, 21, 22, 23, 24, 25, + 26, -1, -1, -1, 30, -1, -1, 504, -1, -1, + 72, 73, 74, 75, -1, -1, -1, -1, 515, 516, + -1, -1, -1, -1, -1, -1, -1, -1, 556, 55, + -1, 93, -1, 95, -1, 97, 98, 99, 100, -1, + -1, -1, -1, -1, -1, -1, 72, 73, 74, 75, + 112, 113, -1, -1, 572, -1, -1, -1, -1, -1, + -1, 589, -1, -1, -1, 562, -1, 93, -1, 95, + -1, 97, 98, 99, 100, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 613, 112, 113, 72, -1, + 74, 75, 76, 77, 78, 79, 80, 81, 82, -1, + 84, 85, 86, 87, -1, 0, -1, 635, 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, -1, 73, 74, + 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, + -1, 86, -1, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, + 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 0, -1, 123, 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, -1, -1, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, -1, 86, -1, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 0, 122, 123, 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, -1, - 83, -1, 85, 86, 87, 88, 89, 90, 91, 92, + 63, 64, 65, 66, 67, 68, 69, 70, 71, -1, + -1, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 84, -1, 86, -1, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, - 113, 114, 115, 116, 117, 3, -1, 120, -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, 71, 72, -1, -1, -1, 3, -1, - -1, -1, -1, -1, -1, -1, -1, 12, -1, -1, - -1, -1, 90, 18, 92, -1, 94, 95, 96, 97, - -1, -1, 27, -1, -1, 30, -1, -1, -1, -1, - -1, 109, 110, 111, 112, 113, 114, 115, 116, 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, 71, 72, -1, -1, - -1, 36, 37, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 47, -1, -1, 90, -1, 92, -1, 94, - 95, 96, 97, 4, 5, 6, 7, 8, 9, 10, - 11, -1, -1, -1, 109, 110, 17, -1, 19, 20, + 113, 114, 115, 116, 117, 118, 119, 120, 3, -1, + 123, -1, -1, -1, -1, -1, -1, 12, 3, -1, + -1, -1, 17, 18, -1, -1, -1, 12, -1, -1, + -1, -1, 17, 18, -1, 30, 31, -1, 33, -1, + 35, -1, -1, 38, -1, 30, 31, 32, 33, -1, + 35, -1, -1, 38, -1, 50, -1, -1, 53, 54, + 55, -1, -1, -1, -1, 50, -1, -1, 53, 54, + 55, 66, 67, -1, -1, 70, -1, 72, 73, 74, + 75, 66, 67, -1, -1, -1, -1, 72, 73, 74, + 75, -1, -1, -1, -1, -1, -1, -1, 93, -1, + 95, -1, 97, 98, 99, 100, -1, -1, 93, -1, + 95, -1, 97, 98, 99, 100, -1, 112, 113, 114, + 115, 116, 117, 118, 119, -1, 3, 112, 113, 114, + 115, 116, 117, 118, 119, 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, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 93, -1, 95, -1, + 97, 98, 99, 100, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 112, 113, 114, 115, 116, + 117, 118, 119, 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, - 85, 86, 87, 88, 89, 90, 91, -1, 93, -1, - -1, -1, 43, -1, -1, -1, -1, -1, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, -1, -1, - -1, -1, 117, 18, 19, 20, 21, 22, 23, 24, - 25, 26, -1, -1, -1, 30, 31, -1, 33, -1, - 35, -1, -1, 38, -1, 86, 87, 88, 89, -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, 71, 72, -1, -1, - -1, 3, -1, -1, -1, -1, -1, -1, -1, -1, - 12, 86, 87, 88, 89, 90, 18, 92, -1, 94, - 95, 96, 97, -1, -1, 27, -1, -1, 30, 31, - -1, 33, -1, 35, 109, 110, 38, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 50, -1, - -1, 53, 54, 55, -1, -1, -1, -1, 3, -1, - -1, -1, -1, -1, 66, 67, -1, 12, -1, 71, - 72, -1, -1, 18, -1, -1, -1, -1, -1, -1, - -1, -1, 27, -1, -1, 30, -1, -1, 90, -1, - 92, -1, 94, 95, 96, 97, -1, -1, -1, 101, - 102, 103, 104, 105, 106, 107, 108, 109, 110, 3, - -1, -1, -1, -1, -1, -1, -1, -1, 12, -1, - -1, -1, -1, -1, 18, -1, 71, 72, -1, -1, - -1, -1, -1, 27, -1, -1, 30, 31, -1, 33, - -1, 35, -1, -1, 38, 90, -1, 92, -1, 94, - 95, 96, 97, -1, 3, -1, -1, -1, -1, 53, - 54, 55, -1, 12, 109, 110, -1, -1, -1, 18, - -1, -1, 66, 67, -1, -1, -1, 71, 72, -1, - -1, 30, -1, -1, 33, -1, 35, -1, -1, 38, - -1, -1, -1, -1, -1, -1, 90, -1, 92, -1, - 94, 95, 96, 97, 53, 54, -1, 101, 102, 103, - 104, 105, 106, 107, 108, 109, 110, 66, 67, -1, - -1, -1, 71, 72, 3, -1, -1, -1, -1, -1, - -1, 80, -1, 12, -1, 3, -1, -1, -1, 18, - -1, 90, -1, 92, 12, 94, 95, 96, 97, -1, - 18, 30, -1, -1, -1, -1, -1, -1, -1, 38, - 109, 110, 30, -1, -1, -1, -1, -1, -1, -1, - 38, 3, -1, -1, -1, -1, 55, -1, -1, -1, - 12, 3, -1, -1, -1, -1, 18, 55, -1, -1, - 12, -1, 71, 72, -1, -1, 18, -1, 30, -1, - -1, -1, -1, 71, 72, -1, 38, -1, 30, -1, - -1, 90, -1, 92, -1, 94, 95, 96, 97, -1, - -1, -1, 90, 55, 92, -1, 94, 95, 96, 97, - 109, 110, -1, 55, -1, -1, -1, -1, -1, 71, - 72, 109, 110, -1, 3, -1, -1, -1, -1, 71, - 72, -1, -1, 12, -1, -1, -1, -1, 90, 18, - 92, -1, 94, 95, 96, 97, -1, -1, 90, -1, - 92, 30, 94, 95, 96, 97, 3, 109, 110, 38, - -1, -1, -1, -1, -1, 12, -1, 109, 110, -1, - -1, 18, -1, -1, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 30, 81, 82, 83, 84, -1, -1, - -1, -1, 71, 72, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 36, 37, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 47, -1, -1, -1, + -1, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, -1, -1, -1, -1, -1, 18, 19, 20, 21, + 22, 23, 24, 25, 26, -1, -1, -1, 30, 31, + -1, 33, -1, 35, -1, -1, 38, 88, 89, 90, + 91, 92, 93, 94, -1, 96, -1, -1, -1, -1, + -1, 53, 54, 55, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 66, 67, -1, -1, -1, 120, + 72, 73, 74, 75, -1, -1, -1, 3, -1, -1, + -1, -1, -1, -1, -1, -1, 12, 89, 90, 91, + 92, 93, 18, 95, -1, 97, 98, 99, 100, -1, + -1, 27, -1, -1, 30, 31, -1, 33, -1, 35, + 112, 113, 38, -1, -1, -1, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, -1, 53, 54, 55, + 17, -1, 19, 20, 21, 22, 23, 24, 25, 26, + 66, 67, -1, 30, -1, -1, 72, 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 90, -1, 92, -1, 94, 95, 96, 97, -1, - -1, -1, -1, -1, 71, 72, -1, -1, -1, -1, - 109, 110, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 90, -1, 92, -1, 94, 95, 96, - 97, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, -1, 109, 110, -1, 17, -1, 19, 20, 21, + -1, 3, -1, -1, -1, -1, -1, 93, -1, 95, + 12, 97, 98, 99, 100, -1, 18, -1, 104, 105, + 106, 107, 108, 109, 110, 111, 112, 113, 30, 31, + -1, 33, -1, 35, -1, -1, 38, -1, -1, -1, + -1, -1, 89, 90, 91, -1, -1, -1, -1, -1, + -1, 53, 54, 55, 3, -1, -1, -1, -1, -1, + -1, -1, -1, 12, 66, 67, -1, -1, -1, 18, + 72, 73, 74, 75, -1, -1, -1, -1, -1, -1, + -1, 30, -1, -1, 33, 3, 35, -1, -1, 38, + -1, 93, -1, 95, 12, 97, 98, 99, 100, -1, + 18, -1, -1, -1, 53, 54, -1, -1, -1, -1, + 112, 113, 30, -1, -1, -1, -1, 66, 67, -1, + 38, -1, -1, 72, 73, 74, 75, -1, -1, -1, + -1, -1, 3, -1, 83, -1, -1, 55, -1, -1, + -1, 12, -1, -1, 93, -1, 95, 18, 97, 98, + 99, 100, -1, -1, 72, 73, 74, 75, -1, 30, + -1, 3, -1, 112, 113, -1, -1, 38, -1, -1, + 12, -1, -1, -1, -1, 93, 18, 95, -1, 97, + 98, 99, 100, -1, 55, -1, -1, -1, 30, -1, + 3, -1, -1, -1, 112, 113, -1, -1, -1, 12, + -1, 72, 73, 74, 75, 18, -1, -1, -1, -1, + -1, -1, -1, 55, 27, -1, -1, 30, -1, -1, + -1, -1, 93, -1, 95, 3, 97, 98, 99, 100, + 72, 73, 74, 75, 12, -1, -1, -1, -1, -1, + 18, 112, 113, -1, -1, -1, -1, -1, -1, -1, + -1, 93, 30, 95, 3, 97, 98, 99, 100, 72, + 73, 74, 75, 12, -1, -1, -1, -1, -1, 18, + 112, 113, -1, -1, -1, -1, -1, 55, -1, -1, + 93, 30, 95, 3, 97, 98, 99, 100, -1, 38, + -1, -1, 12, -1, 72, 73, 74, 75, 18, 112, + 113, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 30, -1, -1, -1, -1, 93, -1, 95, -1, 97, + 98, 99, 100, 72, 73, 74, 75, -1, -1, -1, + -1, -1, -1, -1, 112, 113, -1, -1, -1, -1, + -1, -1, -1, -1, 93, -1, 95, -1, 97, 98, + 99, 100, 72, 73, 74, 75, -1, -1, -1, -1, + -1, -1, -1, 112, 113, -1, -1, -1, -1, -1, + -1, -1, -1, 93, -1, 95, -1, 97, 98, 99, + 100, 4, 5, 6, 7, 8, 9, 10, 11, -1, + -1, -1, 112, 113, 17, -1, 19, 20, 21, 22, + 23, 24, 25, 26, -1, -1, -1, 30, 4, 5, + 6, 7, 8, 9, 10, 11, -1, -1, -1, -1, + -1, 17, -1, 19, 20, 21, 22, 23, 24, 25, + 26, -1, -1, -1, 30, -1, 4, 5, 6, 7, + 8, 9, 10, 11, -1, -1, -1, 70, -1, 17, + -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, + -1, -1, 30, -1, -1, -1, 89, 90, 91, 92, + -1, -1, -1, -1, 70, 43, -1, -1, -1, -1, + -1, -1, -1, -1, 4, 5, 6, 7, 8, 9, + 10, 11, -1, 89, 90, 91, 92, 17, -1, 19, + 20, 21, 22, 23, 24, 25, 26, -1, -1, -1, + 30, -1, 4, 5, 6, 7, 8, 9, 10, 11, + -1, 89, 90, 91, 92, 17, -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, -1, -1, 30, 4, 5, 6, 7, 8, 9, 10, 11, -1, -1, -1, -1, -1, 17, -1, 19, 20, 21, 22, 23, 24, - 25, 26, -1, -1, -1, 30, 4, 5, 6, 7, - 8, 9, 10, 11, -1, -1, -1, -1, -1, 17, - -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, - -1, -1, 30, -1, 86, 87, 88, -1, -1, -1, - -1, -1, -1, -1, -1, 70, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 86, 87, 88, 89, -1, -1, -1, -1, -1, - -1, -1, 70, -1, -1, -1, -1, -1, -1, 4, - 5, 6, 7, 8, 9, 10, 11, -1, 86, 87, - 88, 89, 17, -1, 19, 20, 21, 22, 23, 24, - 25, 26, -1, -1, -1, 30, 4, 5, 6, 7, - 8, 9, 10, 11, -1, -1, -1, -1, -1, 17, - -1, 19, 20, 21, 22, 23, 24, 25, 26, -1, - -1, -1, 30, 4, 5, 6, 7, 8, 9, 10, - 11, -1, -1, -1, -1, -1, 17, -1, 19, 20, - 21, 22, 23, 24, 25, 26, -1, -1, -1, 30, - -1, 86, 87, 88, 89, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, - 5, 6, 7, 8, 9, 10, 11, -1, 86, 87, - 88, 89, 17, -1, 19, 20, 21, 22, 23, 24, - 25, 26, -1, -1, -1, 30, 4, 5, 6, 7, - 8, 9, 10, 11, -1, 86, 87, 88, 89, 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, -1, -1, 19, 20, - 21, 22, 23, 24, 25, 26, 37, -1, -1, 30, - -1, 86, 87, 88, -1, -1, -1, 48, 49, 50, + 25, 26, -1, -1, -1, 30, -1, -1, -1, 89, + 90, 91, 92, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 4, 5, + 6, 7, 8, 9, 10, 11, -1, 89, 90, 91, + 92, 17, -1, 19, 20, 21, 22, 23, 24, 25, + 26, -1, -1, -1, 30, 4, 5, 6, 7, 8, + 9, 10, 11, -1, 89, 90, 91, 92, 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, -1, -1, 19, 20, 21, + 22, 23, 24, 25, 26, 37, -1, -1, 30, -1, + -1, -1, -1, 89, 90, 91, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 65, 39, -1, -1, -1, -1, 71, + 89, 90, 91, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, 39, -1, -1, -1, -1, 71, 89, 90, 91, + 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, 39, -1, -1, 86, 87, - 88, -1, -1, -1, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 39, -1, -1, 86, 87, 88, -1, -1, - -1, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, 64, 65, 39, - -1, -1, -1, -1, -1, -1, -1, -1, 48, 49, + 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, 40, -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, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, 64, 65 + 60, 61, 62, 63, 64, 65, 41, -1, -1, -1, + -1, 71, -1, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65, -1, -1, -1, -1, -1, 71, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 63, 64, 65, -1, -1, -1, -1, -1, + 71, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, 64, 65, -1, + -1, -1, -1, -1, 71, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, + 63, 64, 65, -1, -1, -1, -1, -1, 71, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, + 59, 60, 61, 62, 63, 64, 65, -1, -1, -1, + -1, -1, 71 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1053,115 +1124,118 @@ static const unsigned char yystos[] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 17, 19, 20, 21, 22, 23, 24, 25, 26, 30, 36, - 37, 47, 85, 86, 87, 88, 89, 90, 91, 93, - 117, 128, 129, 130, 131, 132, 148, 153, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 168, 169, 170, - 171, 172, 174, 176, 177, 182, 187, 196, 197, 9, - 11, 3, 12, 18, 30, 38, 55, 71, 72, 90, - 92, 94, 95, 96, 97, 109, 110, 126, 195, 30, - 86, 87, 88, 89, 170, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 81, 82, 83, 84, 133, 134, - 135, 137, 138, 139, 86, 87, 154, 169, 174, 182, - 188, 189, 126, 126, 126, 190, 3, 6, 10, 12, - 17, 149, 150, 156, 34, 197, 50, 231, 232, 0, - 130, 126, 175, 194, 195, 4, 5, 6, 9, 164, - 6, 161, 167, 37, 38, 42, 42, 194, 195, 38, - 55, 126, 126, 126, 126, 38, 27, 126, 140, 36, + 37, 47, 88, 89, 90, 91, 92, 93, 94, 96, + 120, 132, 133, 134, 135, 136, 152, 157, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 172, 173, 174, + 175, 176, 178, 180, 181, 186, 191, 200, 201, 9, + 11, 3, 12, 18, 30, 38, 55, 72, 73, 74, + 75, 93, 95, 97, 98, 99, 100, 112, 113, 130, + 199, 30, 89, 90, 91, 92, 174, 72, 74, 75, + 76, 77, 78, 79, 80, 81, 82, 84, 85, 86, + 87, 137, 138, 139, 141, 142, 143, 89, 90, 158, + 159, 173, 178, 186, 192, 193, 130, 130, 130, 194, + 3, 6, 10, 12, 17, 153, 154, 160, 34, 201, + 50, 235, 236, 0, 134, 130, 179, 198, 199, 4, + 5, 6, 9, 168, 6, 165, 171, 37, 38, 42, + 42, 198, 199, 38, 55, 130, 130, 130, 130, 38, 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 37, 38, 39, 40, 41, 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, 83, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 120, 127, 143, 144, 34, 120, 136, - 27, 126, 33, 35, 38, 53, 54, 66, 67, 80, - 125, 126, 145, 126, 190, 126, 190, 37, 126, 41, - 192, 192, 192, 192, 195, 31, 37, 42, 31, 44, - 193, 38, 126, 6, 165, 6, 9, 166, 164, 17, - 89, 155, 173, 174, 126, 183, 184, 94, 95, 96, - 97, 98, 99, 100, 203, 204, 205, 218, 219, 225, - 226, 227, 126, 194, 173, 143, 119, 143, 127, 145, - 38, 126, 145, 38, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 124, 41, 42, 179, 179, 37, 178, 179, - 178, 38, 126, 46, 203, 38, 33, 194, 193, 195, - 17, 195, 39, 40, 46, 40, 43, 175, 208, 17, - 18, 31, 33, 35, 38, 111, 112, 113, 114, 115, - 116, 125, 175, 185, 186, 200, 220, 221, 222, 231, - 175, 126, 228, 229, 18, 221, 43, 204, 185, 39, - 126, 39, 40, 38, 39, 126, 145, 146, 147, 145, - 38, 154, 180, 181, 175, 175, 194, 27, 28, 29, - 33, 34, 151, 152, 43, 3, 6, 10, 12, 13, - 14, 15, 16, 17, 39, 198, 199, 201, 202, 45, - 126, 195, 193, 17, 70, 174, 185, 184, 46, 37, - 30, 89, 155, 185, 185, 124, 46, 37, 38, 32, - 46, 38, 37, 40, 37, 37, 39, 193, 70, 126, - 141, 142, 39, 39, 40, 33, 41, 191, 43, 181, - 126, 37, 41, 39, 40, 200, 39, 39, 18, 27, - 92, 101, 102, 103, 104, 105, 106, 107, 108, 109, - 110, 185, 207, 209, 210, 211, 212, 232, 39, 39, - 185, 220, 175, 231, 175, 230, 229, 39, 39, 40, - 145, 40, 41, 37, 39, 201, 41, 199, 201, 46, - 193, 17, 18, 109, 212, 215, 38, 38, 207, 185, - 40, 223, 175, 39, 40, 193, 143, 126, 33, 38, - 201, 231, 151, 38, 185, 200, 70, 220, 224, 39, - 37, 175, 39, 33, 70, 200, 40, 40, 213, 39, - 40, 40, 32, 38, 185, 175, 206, 207, 208, 214, - 232, 39, 220, 33, 39, 216, 217, 220, 39, 40, - 207, 39, 41, 39, 40, 206, 201, 39, 220 + 63, 64, 65, 66, 67, 68, 69, 70, 71, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 86, 88, 89, 90, 91, 92, 93, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, + 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 123, 131, 147, 148, 27, + 130, 144, 36, 147, 34, 123, 140, 27, 130, 33, + 35, 38, 53, 54, 66, 67, 83, 129, 130, 149, + 130, 194, 130, 194, 37, 164, 130, 41, 196, 196, + 196, 196, 199, 31, 37, 42, 31, 44, 197, 38, + 130, 6, 169, 6, 9, 170, 168, 17, 92, 159, + 177, 178, 130, 187, 188, 97, 98, 99, 100, 101, + 102, 103, 207, 208, 209, 222, 223, 229, 230, 231, + 130, 198, 177, 131, 147, 122, 147, 149, 38, 130, + 149, 38, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 71, 128, 41, 42, 183, 183, 37, 182, 183, 182, + 38, 130, 46, 207, 38, 33, 198, 197, 199, 17, + 199, 39, 40, 46, 40, 43, 179, 212, 17, 18, + 31, 33, 35, 38, 114, 115, 116, 117, 118, 119, + 129, 179, 189, 190, 204, 224, 225, 226, 235, 179, + 130, 232, 233, 18, 225, 43, 208, 189, 39, 130, + 39, 40, 38, 39, 130, 149, 150, 151, 149, 149, + 38, 158, 184, 185, 179, 179, 198, 27, 28, 29, + 33, 34, 155, 156, 43, 3, 6, 10, 12, 13, + 14, 15, 16, 17, 39, 202, 203, 205, 206, 45, + 130, 199, 197, 17, 70, 178, 189, 188, 46, 37, + 30, 92, 159, 189, 189, 71, 128, 46, 37, 38, + 32, 46, 38, 37, 40, 37, 37, 39, 197, 70, + 130, 145, 146, 39, 39, 40, 41, 33, 41, 195, + 43, 185, 130, 37, 41, 39, 40, 204, 39, 39, + 18, 27, 95, 104, 105, 106, 107, 108, 109, 110, + 111, 112, 113, 189, 211, 213, 214, 215, 216, 236, + 39, 39, 189, 189, 224, 179, 235, 179, 234, 233, + 39, 39, 40, 149, 149, 40, 41, 37, 39, 205, + 41, 203, 205, 46, 197, 17, 18, 112, 216, 219, + 38, 38, 211, 189, 41, 40, 227, 179, 39, 40, + 197, 147, 130, 33, 38, 205, 235, 155, 38, 189, + 204, 189, 70, 224, 228, 39, 37, 179, 39, 33, + 70, 204, 40, 40, 217, 39, 40, 40, 32, 38, + 189, 179, 210, 211, 212, 218, 236, 39, 224, 33, + 39, 220, 221, 224, 39, 40, 211, 39, 41, 39, + 40, 210, 205, 39, 224 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 123, 124, 124, 124, 124, 124, 124, 124, 124, - 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, - 125, 125, 125, 125, 126, 126, 126, 126, 126, 126, - 126, 126, 126, 126, 126, 126, 126, 126, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 128, 128, 129, 129, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 130, 130, 131, 132, - 133, 133, 133, 133, 133, 133, 133, 134, 134, 135, - 135, 135, 136, 136, 137, 137, 138, 138, 138, 139, - 139, 140, 140, 140, 141, 141, 142, 142, 143, 143, - 144, 144, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 146, 146, 147, 147, 148, 149, 150, 150, 150, - 150, 151, 151, 152, 152, 152, 152, 152, 153, 154, - 154, 154, 154, 154, 155, 155, 156, 156, 157, 157, - 157, 158, 158, 158, 158, 159, 159, 159, 160, 160, - 160, 160, 160, 160, 160, 160, 161, 161, 162, 162, - 162, 163, 163, 163, 163, 164, 164, 164, 164, 164, - 165, 165, 166, 166, 166, 167, 167, 167, 168, 169, - 169, 169, 169, 170, 170, 171, 171, 171, 171, 172, - 172, 173, 173, 173, 173, 174, 174, 174, 175, 175, - 176, 177, 178, 178, 179, 180, 180, 181, 182, 183, - 183, 184, 184, 185, 185, 185, 185, 185, 186, 186, - 186, 186, 187, 188, 189, 190, 190, 191, 191, 192, - 192, 193, 193, 194, 194, 195, 195, 196, 196, 197, - 197, 197, 198, 198, 199, 199, 200, 201, 202, 202, - 202, 202, 202, 202, 202, 202, 202, 203, 203, 204, - 204, 204, 204, 204, 205, 205, 206, 206, 206, 207, - 207, 207, 207, 207, 208, 208, 209, 210, 211, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 213, - 213, 214, 214, 215, 215, 216, 216, 217, 217, 218, - 219, 220, 220, 220, 221, 221, 222, 222, 222, 222, - 222, 222, 222, 222, 223, 223, 224, 224, 225, 226, - 226, 227, 228, 228, 229, 230, 230, 231, 231, 232 + 0, 127, 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, + 129, 129, 129, 129, 130, 130, 130, 130, 130, 130, + 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 132, 132, 133, 133, 134, + 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, + 134, 135, 136, 137, 137, 137, 137, 137, 137, 137, + 137, 137, 138, 138, 139, 139, 139, 140, 140, 141, + 141, 142, 142, 142, 143, 143, 144, 144, 144, 145, + 145, 146, 146, 147, 147, 148, 148, 149, 149, 149, + 149, 149, 149, 149, 149, 149, 149, 150, 150, 151, + 151, 152, 153, 154, 154, 154, 154, 155, 155, 156, + 156, 156, 156, 156, 157, 158, 158, 158, 158, 158, + 158, 159, 159, 160, 160, 161, 161, 161, 162, 162, + 162, 162, 163, 163, 163, 164, 164, 164, 164, 164, + 164, 164, 164, 165, 165, 166, 166, 166, 167, 167, + 167, 167, 168, 168, 168, 168, 168, 169, 169, 170, + 170, 170, 171, 171, 171, 172, 173, 173, 173, 173, + 174, 174, 175, 175, 175, 175, 176, 176, 177, 177, + 177, 177, 178, 178, 178, 179, 179, 180, 181, 182, + 182, 183, 184, 184, 185, 186, 187, 187, 188, 188, + 189, 189, 189, 189, 189, 189, 190, 190, 190, 190, + 191, 192, 193, 194, 194, 195, 195, 196, 196, 197, + 197, 198, 198, 199, 199, 200, 200, 201, 201, 201, + 202, 202, 203, 203, 204, 205, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 207, 207, 208, 208, 208, + 208, 208, 209, 209, 210, 210, 210, 211, 211, 211, + 211, 211, 212, 212, 213, 214, 215, 216, 216, 216, + 216, 216, 216, 216, 216, 216, 216, 217, 217, 218, + 218, 219, 219, 220, 220, 221, 221, 222, 223, 224, + 224, 224, 225, 225, 226, 226, 226, 226, 226, 226, + 226, 226, 227, 227, 228, 228, 229, 230, 230, 231, + 232, 232, 233, 234, 234, 235, 235, 236 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1182,34 +1256,35 @@ static const unsigned char yyr2[] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 1, 1, 2, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, - 2, 2, 1, 2, 2, 2, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 6, 2, 2, 0, 1, 1, 3, 0, 1, - 1, 2, 3, 2, 3, 2, 4, 1, 1, 1, - 4, 0, 1, 1, 3, 6, 1, 1, 1, 1, - 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, - 1, 2, 4, 4, 2, 1, 1, 1, 2, 2, - 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, + 1, 1, 1, 1, 1, 0, 1, 1, 2, 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, 2, 5, - 7, 6, 8, 1, 1, 6, 7, 6, 5, 1, - 2, 0, 1, 1, 3, 2, 4, 3, 3, 2, - 4, 4, 1, 1, 3, 1, 2, 3, 4, 1, - 3, 1, 3, 1, 4, 3, 3, 2, 1, 1, - 1, 1, 2, 2, 2, 0, 1, 0, 7, 0, - 7, 0, 3, 0, 1, 1, 2, 4, 5, 7, - 8, 13, 1, 3, 2, 4, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, - 1, 1, 1, 1, 3, 6, 1, 2, 1, 1, - 1, 1, 1, 1, 3, 4, 6, 8, 5, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, - 2, 1, 3, 1, 1, 0, 1, 1, 3, 3, - 3, 1, 1, 3, 5, 6, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 2, 1, 3, 3, 1, - 1, 3, 1, 3, 4, 1, 3, 0, 1, 1 + 1, 3, 3, 2, 2, 1, 2, 2, 2, 2, + 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 6, 2, 2, 0, + 1, 1, 3, 0, 1, 1, 2, 3, 2, 3, + 5, 2, 4, 1, 1, 1, 4, 0, 1, 1, + 3, 6, 1, 1, 1, 1, 1, 0, 1, 1, + 1, 1, 1, 1, 3, 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, 2, 5, 7, 6, 8, + 1, 1, 6, 7, 6, 5, 1, 2, 0, 1, + 1, 3, 2, 4, 3, 3, 2, 4, 4, 1, + 1, 3, 1, 2, 3, 4, 1, 3, 1, 3, + 1, 4, 3, 3, 2, 5, 1, 1, 1, 1, + 2, 2, 2, 0, 1, 0, 7, 0, 7, 0, + 3, 0, 1, 1, 2, 4, 5, 7, 8, 13, + 1, 3, 2, 4, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, + 1, 1, 3, 6, 1, 2, 1, 1, 1, 1, + 1, 1, 3, 4, 6, 8, 5, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 0, 2, 1, + 3, 1, 1, 0, 1, 1, 3, 3, 3, 1, + 1, 3, 5, 6, 1, 1, 1, 1, 1, 1, + 1, 1, 0, 2, 1, 3, 3, 1, 1, 3, + 1, 3, 4, 1, 3, 0, 1, 1 }; @@ -1258,7 +1333,8 @@ static const unsigned char yydprec[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 }; /* YYMERGER[RULE-NUM] -- Index of merging function for rule #RULE-NUM. */ @@ -1306,7 +1382,8 @@ static const unsigned char yymerger[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 }; /* YYIMMEDIATE[RULE-NUM] -- True iff rule #RULE-NUM is not to be deferred, as @@ -1355,7 +1432,8 @@ static const yybool yyimmediate[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 }; /* YYCONFLP[YYPACT[STATE-NUM]] -- Pointer into YYCONFL of start of @@ -1390,7 +1468,14 @@ static const unsigned char 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, 3, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1536,7 +1621,24 @@ static const unsigned char yyconflp[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 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, + 3, 5, 7, 9, 11, 13, 15, 0, 0, 0, + 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1566,14 +1668,25 @@ static const unsigned char yyconflp[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 21, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 23 }; /* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by 0, pointed into by YYCONFLP. */ static const short int yyconfl[] = { - 0, 244, 0, 244, 0 + 0, 251, 0, 251, 0, 251, 0, 251, 0, 251, + 0, 251, 0, 251, 0, 251, 0, 251, 0, 251, + 0, 210, 0, 325, 0 }; /* Error token number */ @@ -2002,19 +2115,19 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, *yyvalp = yyvsp[YYFILL (1-yyrhslen)].yystate.yysemantics.yysval; switch (yyn) { - case 159: -#line 404 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 162: +#line 407 "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 2014 "src/parser_proc.c" /* glr.c:816 */ +#line 2127 "src/parser_proc.c" /* glr.c:816 */ break; - case 160: -#line 410 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 163: +#line 413 "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, @@ -2023,83 +2136,83 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, P->file.ln = strndup((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text + 1, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->size - 2); } } -#line 2027 "src/parser_proc.c" /* glr.c:816 */ +#line 2140 "src/parser_proc.c" /* glr.c:816 */ break; - case 161: -#line 418 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 164: +#line 421 "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 2035 "src/parser_proc.c" /* glr.c:816 */ +#line 2148 "src/parser_proc.c" /* glr.c:816 */ break; - case 162: -#line 421 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 165: +#line 424 "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 2043 "src/parser_proc.c" /* glr.c:816 */ +#line 2156 "src/parser_proc.c" /* glr.c:816 */ break; - case 163: -#line 424 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 166: +#line 427 "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 2051 "src/parser_proc.c" /* glr.c:816 */ +#line 2164 "src/parser_proc.c" /* glr.c:816 */ break; - case 164: -#line 427 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 167: +#line 430 "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 2059 "src/parser_proc.c" /* glr.c:816 */ +#line 2172 "src/parser_proc.c" /* glr.c:816 */ break; - case 165: -#line 430 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 168: +#line 433 "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 2067 "src/parser_proc.c" /* glr.c:816 */ +#line 2180 "src/parser_proc.c" /* glr.c:816 */ break; - case 166: -#line 433 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 169: +#line 436 "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 2075 "src/parser_proc.c" /* glr.c:816 */ +#line 2188 "src/parser_proc.c" /* glr.c:816 */ break; - case 167: -#line 436 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 170: +#line 439 "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 2083 "src/parser_proc.c" /* glr.c:816 */ +#line 2196 "src/parser_proc.c" /* glr.c:816 */ break; - case 168: -#line 442 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 171: +#line 445 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)); } -#line 2091 "src/parser_proc.c" /* glr.c:816 */ +#line 2204 "src/parser_proc.c" /* glr.c:816 */ break; - case 169: -#line 448 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 172: +#line 451 "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 2099 "src/parser_proc.c" /* glr.c:816 */ +#line 2212 "src/parser_proc.c" /* glr.c:816 */ break; - case 170: -#line 454 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 173: +#line 457 "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; @@ -2123,317 +2236,344 @@ 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 2127 "src/parser_proc.c" /* glr.c:816 */ +#line 2240 "src/parser_proc.c" /* glr.c:816 */ break; - case 171: -#line 477 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 174: +#line 480 "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 2136 "src/parser_proc.c" /* glr.c:816 */ +#line 2249 "src/parser_proc.c" /* glr.c:816 */ break; - case 172: -#line 481 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 175: +#line 484 "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 2145 "src/parser_proc.c" /* glr.c:816 */ +#line 2258 "src/parser_proc.c" /* glr.c:816 */ break; - case 173: -#line 485 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 176: +#line 488 "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 2155 "src/parser_proc.c" /* glr.c:816 */ +#line 2268 "src/parser_proc.c" /* glr.c:816 */ break; - case 174: -#line 490 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 177: +#line 493 "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 2165 "src/parser_proc.c" /* glr.c:816 */ +#line 2278 "src/parser_proc.c" /* glr.c:816 */ break; - case 175: -#line 495 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 178: +#line 498 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_cpp_exp **)(&(*yyvalp))) = psi_cpp_exp_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-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 2174 "src/parser_proc.c" /* glr.c:816 */ +#line 2287 "src/parser_proc.c" /* glr.c:816 */ break; - case 176: -#line 499 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 179: +#line 502 "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 2183 "src/parser_proc.c" /* glr.c:816 */ +#line 2296 "src/parser_proc.c" /* glr.c:816 */ + break; + + case 180: +#line 506 "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 2305 "src/parser_proc.c" /* glr.c:816 */ + break; + + case 181: +#line 510 "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 2314 "src/parser_proc.c" /* glr.c:816 */ break; - case 191: -#line 538 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 196: +#line 549 "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 2193 "src/parser_proc.c" /* glr.c:816 */ +#line 2324 "src/parser_proc.c" /* glr.c:816 */ break; - case 192: -#line 543 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 197: +#line 554 "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 2203 "src/parser_proc.c" /* glr.c:816 */ +#line 2334 "src/parser_proc.c" /* glr.c:816 */ break; - case 193: -#line 548 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 198: +#line 559 "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 2213 "src/parser_proc.c" /* glr.c:816 */ +#line 2344 "src/parser_proc.c" /* glr.c:816 */ break; - case 194: -#line 556 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 199: +#line 567 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL); } -#line 2221 "src/parser_proc.c" /* glr.c:816 */ +#line 2352 "src/parser_proc.c" /* glr.c:816 */ break; - case 196: -#line 563 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 201: +#line 574 "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 2231 "src/parser_proc.c" /* glr.c:816 */ +#line 2362 "src/parser_proc.c" /* glr.c:816 */ break; - case 197: -#line 568 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 202: +#line 579 "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 2241 "src/parser_proc.c" /* glr.c:816 */ +#line 2372 "src/parser_proc.c" /* glr.c:816 */ break; - case 198: -#line 576 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 203: +#line 587 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 2249 "src/parser_proc.c" /* glr.c:816 */ +#line 2380 "src/parser_proc.c" /* glr.c:816 */ break; - case 200: -#line 583 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 205: +#line 594 "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 2258 "src/parser_proc.c" /* glr.c:816 */ +#line 2389 "src/parser_proc.c" /* glr.c:816 */ break; - case 201: -#line 587 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 206: +#line 598 "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 2267 "src/parser_proc.c" /* glr.c:816 */ +#line 2398 "src/parser_proc.c" /* glr.c:816 */ break; - case 202: -#line 594 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 207: +#line 605 "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 2276 "src/parser_proc.c" /* glr.c:816 */ +#line 2407 "src/parser_proc.c" /* glr.c:816 */ break; - case 203: -#line 598 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 208: +#line 609 "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 2285 "src/parser_proc.c" /* glr.c:816 */ +#line 2416 "src/parser_proc.c" /* glr.c:816 */ break; - case 204: -#line 602 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 209: +#line 613 "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 2294 "src/parser_proc.c" /* glr.c:816 */ +#line 2425 "src/parser_proc.c" /* glr.c:816 */ break; - case 205: -#line 606 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 210: +#line 617 "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 2434 "src/parser_proc.c" /* glr.c:816 */ + break; + + case 211: +#line 622 "src/parser_proc_grammar.y" /* glr.c:816 */ { { uint8_t exists; (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME; exists = psi_cpp_defined(P->preproc, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); - (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &exists)); + (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &exists, 0)); (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } } -#line 2309 "src/parser_proc.c" /* glr.c:816 */ +#line 2449 "src/parser_proc.c" /* glr.c:816 */ break; - case 206: -#line 616 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 212: +#line 632 "src/parser_proc_grammar.y" /* glr.c:816 */ { { uint8_t exists; (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME; exists = psi_cpp_defined(P->preproc, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); - (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &exists)); + (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &exists, 0)); (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))); } } -#line 2324 "src/parser_proc.c" /* glr.c:816 */ +#line 2464 "src/parser_proc.c" /* glr.c:816 */ break; - case 207: -#line 626 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 213: +#line 642 "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_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 2334 "src/parser_proc.c" /* glr.c:816 */ +#line 2474 "src/parser_proc.c" /* glr.c:816 */ break; - case 208: -#line 631 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 214: +#line 647 "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_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 2344 "src/parser_proc.c" /* glr.c:816 */ +#line 2484 "src/parser_proc.c" /* glr.c:816 */ break; - case 209: -#line 636 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 215: +#line 652 "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)); + (*(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 2355 "src/parser_proc.c" /* glr.c:816 */ +#line 2495 "src/parser_proc.c" /* glr.c:816 */ break; - case 210: -#line 642 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 216: +#line 658 "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))))); + 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 2366 "src/parser_proc.c" /* glr.c:816 */ +#line 2506 "src/parser_proc.c" /* glr.c:816 */ break; - case 211: -#line 651 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 217: +#line 667 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 2374 "src/parser_proc.c" /* glr.c:816 */ +#line 2514 "src/parser_proc.c" /* glr.c:816 */ break; - case 213: -#line 658 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 219: +#line 674 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((void (*)(void *)) psi_num_exp_free), &(*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 2383 "src/parser_proc.c" /* glr.c:816 */ +#line 2523 "src/parser_proc.c" /* glr.c:816 */ break; - case 214: -#line 662 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 220: +#line 678 "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 2391 "src/parser_proc.c" /* glr.c:816 */ +#line 2531 "src/parser_proc.c" /* glr.c:816 */ break; - case 215: -#line 668 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 221: +#line 684 "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 2400 "src/parser_proc.c" /* glr.c:816 */ +#line 2540 "src/parser_proc.c" /* glr.c:816 */ break; - case 216: -#line 675 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 222: +#line 691 "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 2408 "src/parser_proc.c" /* glr.c:816 */ +#line 2548 "src/parser_proc.c" /* glr.c:816 */ break; - case 221: -#line 688 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 227: +#line 704 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_impl_def_val **)(&(*yyvalp))) = NULL; } -#line 2416 "src/parser_proc.c" /* glr.c:816 */ +#line 2556 "src/parser_proc.c" /* glr.c:816 */ break; - case 222: -#line 691 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 228: +#line 707 "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 2425 "src/parser_proc.c" /* glr.c:816 */ +#line 2565 "src/parser_proc.c" /* glr.c:816 */ break; - case 228: -#line 706 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 234: +#line 722 "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 2433 "src/parser_proc.c" /* glr.c:816 */ +#line 2573 "src/parser_proc.c" /* glr.c:816 */ break; - case 230: -#line 713 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 236: +#line 729 "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), @@ -2442,11 +2582,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 2446 "src/parser_proc.c" /* glr.c:816 */ +#line 2586 "src/parser_proc.c" /* glr.c:816 */ break; - case 231: -#line 721 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 237: +#line 737 "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( @@ -2457,11 +2597,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->token = psi_token_copy((*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->token); (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.enm = (*(struct psi_decl_enum **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)); } -#line 2461 "src/parser_proc.c" /* glr.c:816 */ +#line 2601 "src/parser_proc.c" /* glr.c:816 */ break; - case 232: -#line 731 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 238: +#line 747 "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)); @@ -2470,11 +2610,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct->align = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).pos; (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.strct->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).len; } -#line 2474 "src/parser_proc.c" /* glr.c:816 */ +#line 2614 "src/parser_proc.c" /* glr.c:816 */ break; - case 233: -#line 739 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 239: +#line 755 "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)); @@ -2483,138 +2623,148 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp, (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn->align = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).pos; (*(struct psi_decl_arg **)(&(*yyvalp)))->type->real.unn->size = (*(struct psi_layout*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)).len; } -#line 2487 "src/parser_proc.c" /* glr.c:816 */ +#line 2627 "src/parser_proc.c" /* glr.c:816 */ break; - case 234: -#line 750 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 240: +#line 763 "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 2637 "src/parser_proc.c" /* glr.c:816 */ + break; + + case 241: +#line 771 "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 2495 "src/parser_proc.c" /* glr.c:816 */ +#line 2645 "src/parser_proc.c" /* glr.c:816 */ break; - case 236: -#line 757 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 243: +#line 778 "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 2504 "src/parser_proc.c" /* glr.c:816 */ +#line 2654 "src/parser_proc.c" /* glr.c:816 */ break; - case 238: -#line 765 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 245: +#line 786 "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 2514 "src/parser_proc.c" /* glr.c:816 */ +#line 2664 "src/parser_proc.c" /* glr.c:816 */ break; - case 239: -#line 770 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 246: +#line 791 "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 2524 "src/parser_proc.c" /* glr.c:816 */ +#line 2674 "src/parser_proc.c" /* glr.c:816 */ break; - case 240: -#line 775 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 247: +#line 796 "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 2534 "src/parser_proc.c" /* glr.c:816 */ +#line 2684 "src/parser_proc.c" /* glr.c:816 */ break; - case 243: -#line 785 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 250: +#line 806 "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 2542 "src/parser_proc.c" /* glr.c:816 */ +#line 2692 "src/parser_proc.c" /* glr.c:816 */ break; - case 244: -#line 788 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 251: +#line 809 "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 2550 "src/parser_proc.c" /* glr.c:816 */ +#line 2700 "src/parser_proc.c" /* glr.c:816 */ break; - case 245: -#line 794 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 252: +#line 815 "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 2558 "src/parser_proc.c" /* glr.c:816 */ +#line 2708 "src/parser_proc.c" /* glr.c:816 */ break; - case 246: -#line 797 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 253: +#line 818 "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 2566 "src/parser_proc.c" /* glr.c:816 */ +#line 2716 "src/parser_proc.c" /* glr.c:816 */ break; - case 247: -#line 800 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 254: +#line 821 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 2574 "src/parser_proc.c" /* glr.c:816 */ +#line 2724 "src/parser_proc.c" /* glr.c:816 */ break; - case 258: -#line 822 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 265: +#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 2582 "src/parser_proc.c" /* glr.c:816 */ +#line 2732 "src/parser_proc.c" /* glr.c:816 */ break; - case 259: -#line 825 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 266: +#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 2590 "src/parser_proc.c" /* glr.c:816 */ +#line 2740 "src/parser_proc.c" /* glr.c:816 */ break; - case 260: -#line 828 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 267: +#line 849 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 2598 "src/parser_proc.c" /* glr.c:816 */ +#line 2748 "src/parser_proc.c" /* glr.c:816 */ break; - case 261: -#line 834 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 268: +#line 855 "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 2606 "src/parser_proc.c" /* glr.c:816 */ +#line 2756 "src/parser_proc.c" /* glr.c:816 */ break; - case 262: -#line 837 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 269: +#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))); } -#line 2614 "src/parser_proc.c" /* glr.c:816 */ +#line 2764 "src/parser_proc.c" /* glr.c:816 */ break; - case 263: -#line 840 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 270: +#line 861 "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))); @@ -2623,11 +2773,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 2627 "src/parser_proc.c" /* glr.c:816 */ +#line 2777 "src/parser_proc.c" /* glr.c:816 */ break; - case 264: -#line 848 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 271: +#line 869 "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))); @@ -2637,27 +2787,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 2641 "src/parser_proc.c" /* glr.c:816 */ +#line 2791 "src/parser_proc.c" /* glr.c:816 */ break; - case 265: -#line 860 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 272: +#line 881 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&(*yyvalp))) = NULL; } -#line 2649 "src/parser_proc.c" /* glr.c:816 */ +#line 2799 "src/parser_proc.c" /* glr.c:816 */ break; - case 266: -#line 863 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 273: +#line 884 "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 2657 "src/parser_proc.c" /* glr.c:816 */ +#line 2807 "src/parser_proc.c" /* glr.c:816 */ break; - case 267: -#line 866 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 274: +#line 887 "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))); @@ -2665,19 +2815,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 2669 "src/parser_proc.c" /* glr.c:816 */ +#line 2819 "src/parser_proc.c" /* glr.c:816 */ break; - case 268: -#line 873 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 275: +#line 894 "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 2677 "src/parser_proc.c" /* glr.c:816 */ +#line 2827 "src/parser_proc.c" /* glr.c:816 */ break; - case 269: -#line 876 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 276: +#line 897 "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))); @@ -2685,43 +2835,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 2689 "src/parser_proc.c" /* glr.c:816 */ +#line 2839 "src/parser_proc.c" /* glr.c:816 */ break; - case 270: -#line 886 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 277: +#line 907 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&(*yyvalp))) = NULL; } -#line 2697 "src/parser_proc.c" /* glr.c:816 */ +#line 2847 "src/parser_proc.c" /* glr.c:816 */ break; - case 272: -#line 892 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 279: +#line 913 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&(*yyvalp))) = NULL; } -#line 2705 "src/parser_proc.c" /* glr.c:816 */ +#line 2855 "src/parser_proc.c" /* glr.c:816 */ break; - case 275: -#line 900 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 282: +#line 921 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&(*yyvalp))) = NULL; } -#line 2713 "src/parser_proc.c" /* glr.c:816 */ +#line 2863 "src/parser_proc.c" /* glr.c:816 */ break; - case 276: -#line 903 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 283: +#line 924 "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 2721 "src/parser_proc.c" /* glr.c:816 */ +#line 2871 "src/parser_proc.c" /* glr.c:816 */ break; - case 277: -#line 906 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 284: +#line 927 "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))); @@ -2730,19 +2880,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 2734 "src/parser_proc.c" /* glr.c:816 */ +#line 2884 "src/parser_proc.c" /* glr.c:816 */ break; - case 278: -#line 917 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 285: +#line 938 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)); } -#line 2742 "src/parser_proc.c" /* glr.c:816 */ +#line 2892 "src/parser_proc.c" /* glr.c:816 */ break; - case 279: -#line 923 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 286: +#line 944 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init(psi_decl_abi_init("default"), (*(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))) { @@ -2750,11 +2900,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 2754 "src/parser_proc.c" /* glr.c:816 */ +#line 2904 "src/parser_proc.c" /* glr.c:816 */ break; - case 280: -#line 930 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 287: +#line 951 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init(psi_decl_abi_init("default"), (*(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; @@ -2763,11 +2913,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 2767 "src/parser_proc.c" /* glr.c:816 */ +#line 2917 "src/parser_proc.c" /* glr.c:816 */ break; - case 281: -#line 938 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 288: +#line 959 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init(psi_decl_abi_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval))->text), (*(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))) { @@ -2775,11 +2925,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 2779 "src/parser_proc.c" /* glr.c:816 */ +#line 2929 "src/parser_proc.c" /* glr.c:816 */ break; - case 282: -#line 945 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 289: +#line 966 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl **)(&(*yyvalp))) = psi_decl_init(psi_decl_abi_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-7)].yystate.yysemantics.yysval))->text), (*(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; @@ -2788,22 +2938,22 @@ 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 2792 "src/parser_proc.c" /* glr.c:816 */ +#line 2942 "src/parser_proc.c" /* glr.c:816 */ break; - case 285: -#line 961 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 292: +#line 982 "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_arg **)(&(*yyvalp))) = psi_decl_arg_init((*(struct psi_decl_type **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-5)].yystate.yysemantics.yysval)), psi_decl_var_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->text, (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval)), 0)); (*(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 2803 "src/parser_proc.c" /* glr.c:816 */ +#line 2953 "src/parser_proc.c" /* glr.c:816 */ break; - case 286: -#line 967 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 293: +#line 988 "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_arg **)(&(*yyvalp))) = psi_decl_arg_init( @@ -2814,11 +2964,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 2818 "src/parser_proc.c" /* glr.c:816 */ +#line 2968 "src/parser_proc.c" /* glr.c:816 */ break; - case 287: -#line 977 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 294: +#line 998 "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_arg **)(&(*yyvalp))) = psi_decl_arg_init( @@ -2829,11 +2979,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 2833 "src/parser_proc.c" /* glr.c:816 */ +#line 2983 "src/parser_proc.c" /* glr.c:816 */ break; - case 288: -#line 987 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 295: +#line 1008 "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_arg **)(&(*yyvalp))) = psi_decl_arg_init( @@ -2844,11 +2994,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 2848 "src/parser_proc.c" /* glr.c:816 */ +#line 2998 "src/parser_proc.c" /* glr.c:816 */ break; - case 290: -#line 1001 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 297: +#line 1022 "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), @@ -2858,51 +3008,51 @@ 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 2862 "src/parser_proc.c" /* glr.c:816 */ +#line 3012 "src/parser_proc.c" /* glr.c:816 */ break; - case 291: -#line 1013 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 298: +#line 1034 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 2870 "src/parser_proc.c" /* glr.c:816 */ +#line 3020 "src/parser_proc.c" /* glr.c:816 */ break; - case 292: -#line 1016 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 299: +#line 1037 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 2878 "src/parser_proc.c" /* glr.c:816 */ +#line 3028 "src/parser_proc.c" /* glr.c:816 */ break; - case 293: -#line 1019 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 300: +#line 1040 "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 2886 "src/parser_proc.c" /* glr.c:816 */ +#line 3036 "src/parser_proc.c" /* glr.c:816 */ break; - case 294: -#line 1022 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 301: +#line 1043 "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 2894 "src/parser_proc.c" /* glr.c:816 */ +#line 3044 "src/parser_proc.c" /* glr.c:816 */ break; - case 295: -#line 1028 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 302: +#line 1049 "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 2902 "src/parser_proc.c" /* glr.c:816 */ +#line 3052 "src/parser_proc.c" /* glr.c:816 */ break; - case 296: -#line 1031 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 303: +#line 1052 "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( @@ -2913,11 +3063,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 2917 "src/parser_proc.c" /* glr.c:816 */ +#line 3067 "src/parser_proc.c" /* glr.c:816 */ break; - case 297: -#line 1041 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 304: +#line 1062 "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( @@ -2928,31 +3078,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 2932 "src/parser_proc.c" /* glr.c:816 */ +#line 3082 "src/parser_proc.c" /* glr.c:816 */ break; - case 298: -#line 1054 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 305: +#line 1075 "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 2942 "src/parser_proc.c" /* glr.c:816 */ +#line 3092 "src/parser_proc.c" /* glr.c:816 */ break; - case 299: -#line 1059 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 306: +#line 1080 "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 2952 "src/parser_proc.c" /* glr.c:816 */ +#line 3102 "src/parser_proc.c" /* glr.c:816 */ break; - case 300: -#line 1067 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 307: +#line 1088 "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))); @@ -2960,11 +3110,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 2964 "src/parser_proc.c" /* glr.c:816 */ +#line 3114 "src/parser_proc.c" /* glr.c:816 */ break; - case 301: -#line 1077 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 308: +#line 1098 "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))); @@ -2972,179 +3122,188 @@ 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 2976 "src/parser_proc.c" /* glr.c:816 */ +#line 3126 "src/parser_proc.c" /* glr.c:816 */ break; - case 302: -#line 1087 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 309: +#line 1108 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 2984 "src/parser_proc.c" /* glr.c:816 */ +#line 3134 "src/parser_proc.c" /* glr.c:816 */ break; - case 304: -#line 1094 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 311: +#line 1115 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)); } -#line 2992 "src/parser_proc.c" /* glr.c:816 */ +#line 3142 "src/parser_proc.c" /* glr.c:816 */ break; - case 305: -#line 1100 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 312: +#line 1121 "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 3000 "src/parser_proc.c" /* glr.c:816 */ +#line 3150 "src/parser_proc.c" /* glr.c:816 */ break; - case 306: -#line 1103 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 313: +#line 1124 "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_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))); } -#line 3008 "src/parser_proc.c" /* glr.c:816 */ +#line 3158 "src/parser_proc.c" /* glr.c:816 */ break; - case 307: -#line 1109 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 314: +#line 1130 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_decl_arg **)(&(*yyvalp))) = (*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval)); (*(struct psi_decl_arg **)(&(*yyvalp)))->layout = (*(struct psi_layout **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)); psi_parser_proc_add_from_typedef(P, (*(struct psi_decl_arg **)(&(*yyvalp)))); } -#line 3018 "src/parser_proc.c" /* glr.c:816 */ +#line 3168 "src/parser_proc.c" /* glr.c:816 */ break; - case 308: -#line 1117 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 315: +#line 1138 "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 3027 "src/parser_proc.c" /* glr.c:816 */ +#line 3177 "src/parser_proc.c" /* glr.c:816 */ break; - case 309: -#line 1124 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 316: +#line 1145 "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 3035 "src/parser_proc.c" /* glr.c:816 */ +#line 3185 "src/parser_proc.c" /* glr.c:816 */ break; - case 310: -#line 1127 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 317: +#line 1148 "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 3043 "src/parser_proc.c" /* glr.c:816 */ +#line 3193 "src/parser_proc.c" /* glr.c:816 */ break; - case 311: -#line 1133 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 318: +#line 1154 "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 3053 "src/parser_proc.c" /* glr.c:816 */ +#line 3203 "src/parser_proc.c" /* glr.c:816 */ break; - case 312: -#line 1138 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 319: +#line 1159 "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 3063 "src/parser_proc.c" /* glr.c:816 */ +#line 3213 "src/parser_proc.c" /* glr.c:816 */ break; - case 313: -#line 1146 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 320: +#line 1167 "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 3072 "src/parser_proc.c" /* glr.c:816 */ +#line 3222 "src/parser_proc.c" /* glr.c:816 */ break; - case 314: -#line 1150 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 321: +#line 1171 "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 3081 "src/parser_proc.c" /* glr.c:816 */ +#line 3231 "src/parser_proc.c" /* glr.c:816 */ break; - case 315: -#line 1154 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 322: +#line 1175 "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 3090 "src/parser_proc.c" /* glr.c:816 */ +#line 3240 "src/parser_proc.c" /* glr.c:816 */ break; - case 316: -#line 1158 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 323: +#line 1179 "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 3099 "src/parser_proc.c" /* glr.c:816 */ +#line 3249 "src/parser_proc.c" /* glr.c:816 */ break; - case 317: -#line 1162 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 324: +#line 1183 "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 3108 "src/parser_proc.c" /* glr.c:816 */ +#line 3258 "src/parser_proc.c" /* glr.c:816 */ break; - case 318: -#line 1169 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 325: +#line 1187 "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_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 3267 "src/parser_proc.c" /* glr.c:816 */ + break; + + case 326: +#line 1194 "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 3117 "src/parser_proc.c" /* glr.c:816 */ +#line 3276 "src/parser_proc.c" /* glr.c:816 */ break; - case 319: -#line 1173 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 327: +#line 1198 "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_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 3126 "src/parser_proc.c" /* glr.c:816 */ +#line 3285 "src/parser_proc.c" /* glr.c:816 */ break; - case 320: -#line 1177 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 328: +#line 1202 "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_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 3135 "src/parser_proc.c" /* glr.c:816 */ +#line 3294 "src/parser_proc.c" /* glr.c:816 */ break; - case 321: -#line 1181 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 329: +#line 1206 "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))); + (*(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 3144 "src/parser_proc.c" /* glr.c:816 */ +#line 3303 "src/parser_proc.c" /* glr.c:816 */ break; - case 322: -#line 1188 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 330: +#line 1213 "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))); @@ -3155,11 +3314,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 3159 "src/parser_proc.c" /* glr.c:816 */ +#line 3318 "src/parser_proc.c" /* glr.c:816 */ break; - case 323: -#line 1201 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 331: +#line 1226 "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))); @@ -3170,11 +3329,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 3174 "src/parser_proc.c" /* glr.c:816 */ +#line 3333 "src/parser_proc.c" /* glr.c:816 */ break; - case 324: -#line 1214 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 332: +#line 1239 "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))); @@ -3185,147 +3344,147 @@ 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 3189 "src/parser_proc.c" /* glr.c:816 */ +#line 3348 "src/parser_proc.c" /* glr.c:816 */ break; - case 325: -#line 1227 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 333: +#line 1252 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_token **)(&(*yyvalp))) = NULL; } -#line 3197 "src/parser_proc.c" /* glr.c:816 */ +#line 3356 "src/parser_proc.c" /* glr.c:816 */ break; - case 326: -#line 1230 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 334: +#line 1255 "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 3206 "src/parser_proc.c" /* glr.c:816 */ +#line 3365 "src/parser_proc.c" /* glr.c:816 */ break; - case 327: -#line 1237 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 335: +#line 1262 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_layout **)(&(*yyvalp))) = NULL; } -#line 3214 "src/parser_proc.c" /* glr.c:816 */ +#line 3373 "src/parser_proc.c" /* glr.c:816 */ break; - case 328: -#line 1240 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 336: +#line 1265 "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)); } -#line 3222 "src/parser_proc.c" /* glr.c:816 */ +#line 3381 "src/parser_proc.c" /* glr.c:816 */ break; - case 329: -#line 1246 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 337: +#line 1271 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_layout*)(&(*yyvalp))).pos = 0; (*(struct psi_layout*)(&(*yyvalp))).len = 0; } -#line 3231 "src/parser_proc.c" /* glr.c:816 */ +#line 3390 "src/parser_proc.c" /* glr.c:816 */ break; - case 330: -#line 1250 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 338: +#line 1275 "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 3240 "src/parser_proc.c" /* glr.c:816 */ +#line 3399 "src/parser_proc.c" /* glr.c:816 */ break; - case 331: -#line 1257 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 339: +#line 1282 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(size_t*)(&(*yyvalp))) = 0; } -#line 3248 "src/parser_proc.c" /* glr.c:816 */ +#line 3407 "src/parser_proc.c" /* glr.c:816 */ break; - case 332: -#line 1260 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 340: +#line 1285 "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 3256 "src/parser_proc.c" /* glr.c:816 */ +#line 3415 "src/parser_proc.c" /* glr.c:816 */ break; - case 333: -#line 1266 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 341: +#line 1291 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(size_t*)(&(*yyvalp))) = 0; } -#line 3264 "src/parser_proc.c" /* glr.c:816 */ +#line 3423 "src/parser_proc.c" /* glr.c:816 */ break; - case 334: -#line 1269 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 342: +#line 1294 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 3272 "src/parser_proc.c" /* glr.c:816 */ +#line 3431 "src/parser_proc.c" /* glr.c:816 */ break; - case 335: -#line 1275 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 343: +#line 1300 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(size_t*)(&(*yyvalp))) = 1; } -#line 3280 "src/parser_proc.c" /* glr.c:816 */ +#line 3439 "src/parser_proc.c" /* glr.c:816 */ break; - case 336: -#line 1278 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 344: +#line 1303 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)) + 1; } -#line 3288 "src/parser_proc.c" /* glr.c:816 */ +#line 3447 "src/parser_proc.c" /* glr.c:816 */ break; - case 337: -#line 1290 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 345: +#line 1315 "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 3296 "src/parser_proc.c" /* glr.c:816 */ +#line 3455 "src/parser_proc.c" /* glr.c:816 */ break; - case 338: -#line 1293 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 346: +#line 1318 "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 3305 "src/parser_proc.c" /* glr.c:816 */ +#line 3464 "src/parser_proc.c" /* glr.c:816 */ break; - case 339: -#line 1300 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 347: +#line 1325 "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 3315 "src/parser_proc.c" /* glr.c:816 */ +#line 3474 "src/parser_proc.c" /* glr.c:816 */ break; - case 340: -#line 1305 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 348: +#line 1330 "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 3325 "src/parser_proc.c" /* glr.c:816 */ +#line 3484 "src/parser_proc.c" /* glr.c:816 */ break; - case 341: -#line 1310 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 349: +#line 1335 "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))); @@ -3333,477 +3492,477 @@ 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 3337 "src/parser_proc.c" /* glr.c:816 */ +#line 3496 "src/parser_proc.c" /* glr.c:816 */ break; - case 342: -#line 1320 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 350: +#line 1345 "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 3345 "src/parser_proc.c" /* glr.c:816 */ +#line 3504 "src/parser_proc.c" /* glr.c:816 */ break; - case 343: -#line 1323 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 351: +#line 1348 "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 3353 "src/parser_proc.c" /* glr.c:816 */ +#line 3512 "src/parser_proc.c" /* glr.c:816 */ break; - case 344: -#line 1329 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 352: +#line 1354 "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 3361 "src/parser_proc.c" /* glr.c:816 */ +#line 3520 "src/parser_proc.c" /* glr.c:816 */ break; - case 345: -#line 1332 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 353: +#line 1357 "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 3369 "src/parser_proc.c" /* glr.c:816 */ +#line 3528 "src/parser_proc.c" /* glr.c:816 */ break; - case 346: -#line 1338 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 354: +#line 1363 "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 3378 "src/parser_proc.c" /* glr.c:816 */ +#line 3537 "src/parser_proc.c" /* glr.c:816 */ break; - case 347: -#line 1345 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 355: +#line 1370 "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 3387 "src/parser_proc.c" /* glr.c:816 */ +#line 3546 "src/parser_proc.c" /* glr.c:816 */ break; - case 357: -#line 1364 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 365: +#line 1389 "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 3395 "src/parser_proc.c" /* glr.c:816 */ +#line 3554 "src/parser_proc.c" /* glr.c:816 */ break; - case 358: -#line 1367 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 366: +#line 1392 "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 3403 "src/parser_proc.c" /* glr.c:816 */ +#line 3562 "src/parser_proc.c" /* glr.c:816 */ break; - case 359: -#line 1373 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 367: +#line 1398 "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 3411 "src/parser_proc.c" /* glr.c:816 */ +#line 3570 "src/parser_proc.c" /* glr.c:816 */ break; - case 360: -#line 1376 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 368: +#line 1401 "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 3419 "src/parser_proc.c" /* glr.c:816 */ +#line 3578 "src/parser_proc.c" /* glr.c:816 */ break; - case 361: -#line 1379 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 369: +#line 1404 "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 3427 "src/parser_proc.c" /* glr.c:816 */ +#line 3586 "src/parser_proc.c" /* glr.c:816 */ break; - case 362: -#line 1382 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 370: +#line 1407 "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 3435 "src/parser_proc.c" /* glr.c:816 */ +#line 3594 "src/parser_proc.c" /* glr.c:816 */ break; - case 363: -#line 1385 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 371: +#line 1410 "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 3443 "src/parser_proc.c" /* glr.c:816 */ +#line 3602 "src/parser_proc.c" /* glr.c:816 */ break; - case 364: -#line 1391 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 372: +#line 1416 "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 3452 "src/parser_proc.c" /* glr.c:816 */ +#line 3611 "src/parser_proc.c" /* glr.c:816 */ break; - case 365: -#line 1395 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 373: +#line 1420 "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 3462 "src/parser_proc.c" /* glr.c:816 */ +#line 3621 "src/parser_proc.c" /* glr.c:816 */ break; - case 367: -#line 1404 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 375: +#line 1429 "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 3471 "src/parser_proc.c" /* glr.c:816 */ +#line 3630 "src/parser_proc.c" /* glr.c:816 */ break; - case 368: -#line 1408 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 376: +#line 1433 "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 3480 "src/parser_proc.c" /* glr.c:816 */ +#line 3639 "src/parser_proc.c" /* glr.c:816 */ break; - case 369: -#line 1415 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 377: +#line 1440 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_NULL, NULL); } -#line 3488 "src/parser_proc.c" /* glr.c:816 */ +#line 3647 "src/parser_proc.c" /* glr.c:816 */ break; - case 370: -#line 1418 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 378: +#line 1443 "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 3496 "src/parser_proc.c" /* glr.c:816 */ +#line 3655 "src/parser_proc.c" /* glr.c:816 */ break; - case 371: -#line 1421 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 379: +#line 1446 "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 3504 "src/parser_proc.c" /* glr.c:816 */ +#line 3663 "src/parser_proc.c" /* glr.c:816 */ break; - case 372: -#line 1424 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 380: +#line 1449 "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 3512 "src/parser_proc.c" /* glr.c:816 */ +#line 3671 "src/parser_proc.c" /* glr.c:816 */ break; - case 373: -#line 1427 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 381: +#line 1452 "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 3520 "src/parser_proc.c" /* glr.c:816 */ +#line 3679 "src/parser_proc.c" /* glr.c:816 */ break; - case 374: -#line 1433 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 382: +#line 1458 "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 3529 "src/parser_proc.c" /* glr.c:816 */ +#line 3688 "src/parser_proc.c" /* glr.c:816 */ break; - case 375: -#line 1437 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 383: +#line 1462 "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 3539 "src/parser_proc.c" /* glr.c:816 */ +#line 3698 "src/parser_proc.c" /* glr.c:816 */ break; - case 376: -#line 1445 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 384: +#line 1470 "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 3548 "src/parser_proc.c" /* glr.c:816 */ +#line 3707 "src/parser_proc.c" /* glr.c:816 */ break; - case 377: -#line 1452 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 385: +#line 1477 "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 3558 "src/parser_proc.c" /* glr.c:816 */ +#line 3717 "src/parser_proc.c" /* glr.c:816 */ break; - case 378: -#line 1460 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 386: +#line 1485 "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 3568 "src/parser_proc.c" /* glr.c:816 */ +#line 3727 "src/parser_proc.c" /* glr.c:816 */ break; - case 389: -#line 1481 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 397: +#line 1506 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 3576 "src/parser_proc.c" /* glr.c:816 */ +#line 3735 "src/parser_proc.c" /* glr.c:816 */ break; - case 390: -#line 1484 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 398: +#line 1509 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 3584 "src/parser_proc.c" /* glr.c:816 */ +#line 3743 "src/parser_proc.c" /* glr.c:816 */ break; - case 391: -#line 1490 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 399: +#line 1515 "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 3592 "src/parser_proc.c" /* glr.c:816 */ +#line 3751 "src/parser_proc.c" /* glr.c:816 */ break; - case 392: -#line 1493 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 400: +#line 1518 "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 3600 "src/parser_proc.c" /* glr.c:816 */ +#line 3759 "src/parser_proc.c" /* glr.c:816 */ break; - case 395: -#line 1504 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 403: +#line 1529 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 3608 "src/parser_proc.c" /* glr.c:816 */ +#line 3767 "src/parser_proc.c" /* glr.c:816 */ break; - case 396: -#line 1507 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 404: +#line 1532 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 3616 "src/parser_proc.c" /* glr.c:816 */ +#line 3775 "src/parser_proc.c" /* glr.c:816 */ break; - case 397: -#line 1513 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 405: +#line 1538 "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 3624 "src/parser_proc.c" /* glr.c:816 */ +#line 3783 "src/parser_proc.c" /* glr.c:816 */ break; - case 398: -#line 1516 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 406: +#line 1541 "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 3632 "src/parser_proc.c" /* glr.c:816 */ +#line 3791 "src/parser_proc.c" /* glr.c:816 */ break; - case 399: -#line 1522 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 407: +#line 1547 "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 3641 "src/parser_proc.c" /* glr.c:816 */ +#line 3800 "src/parser_proc.c" /* glr.c:816 */ break; - case 400: -#line 1529 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 408: +#line 1554 "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 3650 "src/parser_proc.c" /* glr.c:816 */ +#line 3809 "src/parser_proc.c" /* glr.c:816 */ break; - case 401: -#line 1536 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 409: +#line 1561 "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 3658 "src/parser_proc.c" /* glr.c:816 */ +#line 3817 "src/parser_proc.c" /* glr.c:816 */ break; - case 402: -#line 1539 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 410: +#line 1564 "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 3666 "src/parser_proc.c" /* glr.c:816 */ +#line 3825 "src/parser_proc.c" /* glr.c:816 */ break; - case 403: -#line 1542 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 411: +#line 1567 "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 3675 "src/parser_proc.c" /* glr.c:816 */ +#line 3834 "src/parser_proc.c" /* glr.c:816 */ break; - case 404: -#line 1549 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 412: +#line 1574 "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 3685 "src/parser_proc.c" /* glr.c:816 */ +#line 3844 "src/parser_proc.c" /* glr.c:816 */ break; - case 405: -#line 1554 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 413: +#line 1579 "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 3695 "src/parser_proc.c" /* glr.c:816 */ +#line 3854 "src/parser_proc.c" /* glr.c:816 */ break; - case 414: -#line 1573 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 422: +#line 1598 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = NULL; } -#line 3703 "src/parser_proc.c" /* glr.c:816 */ +#line 3862 "src/parser_proc.c" /* glr.c:816 */ break; - case 415: -#line 1576 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 423: +#line 1601 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)); } -#line 3711 "src/parser_proc.c" /* glr.c:816 */ +#line 3870 "src/parser_proc.c" /* glr.c:816 */ break; - case 416: -#line 1582 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 424: +#line 1607 "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 3719 "src/parser_proc.c" /* glr.c:816 */ +#line 3878 "src/parser_proc.c" /* glr.c:816 */ break; - case 417: -#line 1585 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 425: +#line 1610 "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 3727 "src/parser_proc.c" /* glr.c:816 */ +#line 3886 "src/parser_proc.c" /* glr.c:816 */ break; - case 418: -#line 1591 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 426: +#line 1616 "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 3736 "src/parser_proc.c" /* glr.c:816 */ +#line 3895 "src/parser_proc.c" /* glr.c:816 */ break; - case 421: -#line 1603 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 429: +#line 1628 "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 3745 "src/parser_proc.c" /* glr.c:816 */ +#line 3904 "src/parser_proc.c" /* glr.c:816 */ break; - case 422: -#line 1610 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 430: +#line 1635 "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 3753 "src/parser_proc.c" /* glr.c:816 */ +#line 3912 "src/parser_proc.c" /* glr.c:816 */ break; - case 423: -#line 1613 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 431: +#line 1638 "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 3761 "src/parser_proc.c" /* glr.c:816 */ +#line 3920 "src/parser_proc.c" /* glr.c:816 */ break; - case 424: -#line 1619 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 432: +#line 1644 "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 3771 "src/parser_proc.c" /* glr.c:816 */ +#line 3930 "src/parser_proc.c" /* glr.c:816 */ break; - case 425: -#line 1627 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 433: +#line 1652 "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 3779 "src/parser_proc.c" /* glr.c:816 */ +#line 3938 "src/parser_proc.c" /* glr.c:816 */ break; - case 426: -#line 1630 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 434: +#line 1655 "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 3787 "src/parser_proc.c" /* glr.c:816 */ +#line 3946 "src/parser_proc.c" /* glr.c:816 */ break; - case 427: -#line 1636 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 435: +#line 1661 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(bool*)(&(*yyvalp))) = false; } -#line 3795 "src/parser_proc.c" /* glr.c:816 */ +#line 3954 "src/parser_proc.c" /* glr.c:816 */ break; - case 428: -#line 1639 "src/parser_proc_grammar.y" /* glr.c:816 */ + case 436: +#line 1664 "src/parser_proc_grammar.y" /* glr.c:816 */ { (*(bool*)(&(*yyvalp))) = true; } -#line 3803 "src/parser_proc.c" /* glr.c:816 */ +#line 3962 "src/parser_proc.c" /* glr.c:816 */ break; -#line 3807 "src/parser_proc.c" /* glr.c:816 */ +#line 3966 "src/parser_proc.c" /* glr.c:816 */ default: break; } @@ -3851,634 +4010,634 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct psi_parser YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN switch (yytype) { - case 124: /* binary_op_token */ -#line 269 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 128: /* binary_op_token */ +#line 272 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 3858 "src/parser_proc.c" /* glr.c:846 */ +#line 4017 "src/parser_proc.c" /* glr.c:846 */ break; - case 125: /* unary_op_token */ -#line 269 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 129: /* unary_op_token */ +#line 272 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 3864 "src/parser_proc.c" /* glr.c:846 */ +#line 4023 "src/parser_proc.c" /* glr.c:846 */ break; - case 126: /* name_token */ -#line 269 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 130: /* name_token */ +#line 272 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 3870 "src/parser_proc.c" /* glr.c:846 */ +#line 4029 "src/parser_proc.c" /* glr.c:846 */ break; - case 127: /* any_noeol_token */ -#line 269 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 131: /* any_noeol_token */ +#line 272 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 3876 "src/parser_proc.c" /* glr.c:846 */ +#line 4035 "src/parser_proc.c" /* glr.c:846 */ break; - case 131: /* lib */ -#line 263 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 135: /* lib */ +#line 266 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 3882 "src/parser_proc.c" /* glr.c:846 */ +#line 4041 "src/parser_proc.c" /* glr.c:846 */ break; - case 132: /* cpp */ -#line 278 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 136: /* cpp */ +#line 281 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));} -#line 3888 "src/parser_proc.c" /* glr.c:846 */ +#line 4047 "src/parser_proc.c" /* glr.c:846 */ break; - case 133: /* cpp_exp */ -#line 278 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 137: /* cpp_exp */ +#line 281 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));} -#line 3894 "src/parser_proc.c" /* glr.c:846 */ +#line 4053 "src/parser_proc.c" /* glr.c:846 */ break; - case 134: /* cpp_message_token */ -#line 266 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 138: /* cpp_message_token */ +#line 269 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 3900 "src/parser_proc.c" /* glr.c:846 */ +#line 4059 "src/parser_proc.c" /* glr.c:846 */ break; - case 135: /* cpp_include_token */ -#line 266 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 139: /* cpp_include_token */ +#line 269 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 3906 "src/parser_proc.c" /* glr.c:846 */ +#line 4065 "src/parser_proc.c" /* glr.c:846 */ break; - case 136: /* cpp_header_token */ -#line 266 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 140: /* cpp_header_token */ +#line 269 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 3912 "src/parser_proc.c" /* glr.c:846 */ +#line 4071 "src/parser_proc.c" /* glr.c:846 */ break; - case 137: /* cpp_no_arg_token */ -#line 266 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 141: /* cpp_no_arg_token */ +#line 269 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 3918 "src/parser_proc.c" /* glr.c:846 */ +#line 4077 "src/parser_proc.c" /* glr.c:846 */ break; - case 138: /* cpp_name_arg_token */ -#line 266 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 142: /* cpp_name_arg_token */ +#line 269 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 3924 "src/parser_proc.c" /* glr.c:846 */ +#line 4083 "src/parser_proc.c" /* glr.c:846 */ break; - case 139: /* cpp_exp_arg_token */ -#line 266 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 143: /* cpp_exp_arg_token */ +#line 269 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 3930 "src/parser_proc.c" /* glr.c:846 */ +#line 4089 "src/parser_proc.c" /* glr.c:846 */ break; - case 140: /* cpp_macro_decl */ -#line 280 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 144: /* cpp_macro_decl */ +#line 283 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_cpp_macro_decl_free(&(*(struct psi_cpp_macro_decl **)(&(*yyvaluep))));} -#line 3936 "src/parser_proc.c" /* glr.c:846 */ +#line 4095 "src/parser_proc.c" /* glr.c:846 */ break; - case 141: /* cpp_macro_sig */ -#line 282 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 145: /* cpp_macro_sig */ +#line 285 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 3942 "src/parser_proc.c" /* glr.c:846 */ +#line 4101 "src/parser_proc.c" /* glr.c:846 */ break; - case 142: /* cpp_macro_sig_args */ -#line 282 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 146: /* cpp_macro_sig_args */ +#line 285 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 3948 "src/parser_proc.c" /* glr.c:846 */ +#line 4107 "src/parser_proc.c" /* glr.c:846 */ break; - case 143: /* cpp_macro_decl_tokens */ -#line 282 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 147: /* cpp_macro_decl_tokens */ +#line 285 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 3954 "src/parser_proc.c" /* glr.c:846 */ +#line 4113 "src/parser_proc.c" /* glr.c:846 */ break; - case 144: /* cpp_macro_decl_token_list */ -#line 282 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 148: /* cpp_macro_decl_token_list */ +#line 285 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 3960 "src/parser_proc.c" /* glr.c:846 */ +#line 4119 "src/parser_proc.c" /* glr.c:846 */ break; - case 145: /* cpp_macro_exp */ -#line 284 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 149: /* cpp_macro_exp */ +#line 287 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));} -#line 3966 "src/parser_proc.c" /* glr.c:846 */ +#line 4125 "src/parser_proc.c" /* glr.c:846 */ break; - case 146: /* cpp_macro_call_args */ -#line 282 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 150: /* cpp_macro_call_args */ +#line 285 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 3972 "src/parser_proc.c" /* glr.c:846 */ +#line 4131 "src/parser_proc.c" /* glr.c:846 */ break; - case 147: /* cpp_macro_call_arg_list */ -#line 282 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 151: /* cpp_macro_call_arg_list */ +#line 285 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 3978 "src/parser_proc.c" /* glr.c:846 */ +#line 4137 "src/parser_proc.c" /* glr.c:846 */ break; - case 148: /* constant */ -#line 290 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 152: /* constant */ +#line 293 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_const_free(&(*(struct psi_const **)(&(*yyvaluep))));} -#line 3984 "src/parser_proc.c" /* glr.c:846 */ +#line 4143 "src/parser_proc.c" /* glr.c:846 */ break; - case 149: /* constant_type */ -#line 292 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 153: /* constant_type */ +#line 295 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_const_type_free(&(*(struct psi_const_type **)(&(*yyvaluep))));} -#line 3990 "src/parser_proc.c" /* glr.c:846 */ +#line 4149 "src/parser_proc.c" /* glr.c:846 */ break; - case 150: /* constant_type_token */ -#line 287 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 154: /* constant_type_token */ +#line 290 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 3996 "src/parser_proc.c" /* glr.c:846 */ +#line 4155 "src/parser_proc.c" /* glr.c:846 */ break; - case 151: /* impl_def_val */ -#line 294 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 155: /* impl_def_val */ +#line 297 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_def_val_free(&(*(struct psi_impl_def_val **)(&(*yyvaluep))));} -#line 4002 "src/parser_proc.c" /* glr.c:846 */ +#line 4161 "src/parser_proc.c" /* glr.c:846 */ break; - case 152: /* impl_def_val_token */ -#line 287 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 156: /* impl_def_val_token */ +#line 290 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4008 "src/parser_proc.c" /* glr.c:846 */ +#line 4167 "src/parser_proc.c" /* glr.c:846 */ break; - case 153: /* decl_typedef */ -#line 307 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 157: /* decl_typedef */ +#line 310 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4014 "src/parser_proc.c" /* glr.c:846 */ +#line 4173 "src/parser_proc.c" /* glr.c:846 */ break; - case 154: /* typedef */ -#line 307 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 158: /* typedef */ +#line 310 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4020 "src/parser_proc.c" /* glr.c:846 */ +#line 4179 "src/parser_proc.c" /* glr.c:846 */ break; - case 155: /* const_decl_type */ -#line 303 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 159: /* const_decl_type */ +#line 306 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));} -#line 4026 "src/parser_proc.c" /* glr.c:846 */ +#line 4185 "src/parser_proc.c" /* glr.c:846 */ break; - case 156: /* decl_type */ -#line 303 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 160: /* decl_type */ +#line 306 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));} -#line 4032 "src/parser_proc.c" /* glr.c:846 */ +#line 4191 "src/parser_proc.c" /* glr.c:846 */ break; - case 157: /* decl_type_complex */ -#line 303 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 161: /* decl_type_complex */ +#line 306 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));} -#line 4038 "src/parser_proc.c" /* glr.c:846 */ +#line 4197 "src/parser_proc.c" /* glr.c:846 */ break; - case 158: /* decl_type_simple */ -#line 297 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 162: /* decl_type_simple */ +#line 300 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4044 "src/parser_proc.c" /* glr.c:846 */ +#line 4203 "src/parser_proc.c" /* glr.c:846 */ break; - case 159: /* decl_real_type */ -#line 297 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 163: /* decl_real_type */ +#line 300 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4050 "src/parser_proc.c" /* glr.c:846 */ +#line 4209 "src/parser_proc.c" /* glr.c:846 */ break; - case 160: /* decl_stdint_type */ -#line 300 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 164: /* decl_stdint_type */ +#line 303 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4056 "src/parser_proc.c" /* glr.c:846 */ +#line 4215 "src/parser_proc.c" /* glr.c:846 */ break; - case 161: /* int_signed */ -#line 275 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 165: /* int_signed */ +#line 278 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4062 "src/parser_proc.c" /* glr.c:846 */ +#line 4221 "src/parser_proc.c" /* glr.c:846 */ break; - case 162: /* int_width */ -#line 272 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 166: /* int_width */ +#line 275 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4068 "src/parser_proc.c" /* glr.c:846 */ +#line 4227 "src/parser_proc.c" /* glr.c:846 */ break; - case 163: /* decl_int_type */ -#line 297 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 167: /* decl_int_type */ +#line 300 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4074 "src/parser_proc.c" /* glr.c:846 */ +#line 4233 "src/parser_proc.c" /* glr.c:846 */ break; - case 164: /* int_signed_types */ -#line 272 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 168: /* int_signed_types */ +#line 275 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4080 "src/parser_proc.c" /* glr.c:846 */ +#line 4239 "src/parser_proc.c" /* glr.c:846 */ break; - case 165: /* signed_short_types */ -#line 275 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 169: /* signed_short_types */ +#line 278 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4086 "src/parser_proc.c" /* glr.c:846 */ +#line 4245 "src/parser_proc.c" /* glr.c:846 */ break; - case 166: /* signed_long_types */ -#line 275 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 170: /* signed_long_types */ +#line 278 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4092 "src/parser_proc.c" /* glr.c:846 */ +#line 4251 "src/parser_proc.c" /* glr.c:846 */ break; - case 167: /* int_width_types */ -#line 272 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 171: /* int_width_types */ +#line 275 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4098 "src/parser_proc.c" /* glr.c:846 */ +#line 4257 "src/parser_proc.c" /* glr.c:846 */ break; - case 168: /* decl_stmt */ -#line 305 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 172: /* decl_stmt */ +#line 308 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));} -#line 4104 "src/parser_proc.c" /* glr.c:846 */ +#line 4263 "src/parser_proc.c" /* glr.c:846 */ break; - case 169: /* decl */ -#line 305 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 173: /* decl */ +#line 308 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));} -#line 4110 "src/parser_proc.c" /* glr.c:846 */ +#line 4269 "src/parser_proc.c" /* glr.c:846 */ break; - case 170: /* decl_fn */ -#line 307 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 174: /* decl_fn */ +#line 310 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4116 "src/parser_proc.c" /* glr.c:846 */ +#line 4275 "src/parser_proc.c" /* glr.c:846 */ break; - case 171: /* decl_functor */ -#line 307 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 175: /* decl_functor */ +#line 310 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4122 "src/parser_proc.c" /* glr.c:846 */ +#line 4281 "src/parser_proc.c" /* glr.c:846 */ break; - case 172: /* decl_func */ -#line 307 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 176: /* decl_func */ +#line 310 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4128 "src/parser_proc.c" /* glr.c:846 */ +#line 4287 "src/parser_proc.c" /* glr.c:846 */ break; - case 173: /* decl_args */ -#line 319 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 177: /* decl_args */ +#line 322 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4134 "src/parser_proc.c" /* glr.c:846 */ +#line 4293 "src/parser_proc.c" /* glr.c:846 */ break; - case 174: /* decl_arg */ -#line 307 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 178: /* decl_arg */ +#line 310 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4140 "src/parser_proc.c" /* glr.c:846 */ +#line 4299 "src/parser_proc.c" /* glr.c:846 */ break; - case 175: /* decl_var */ -#line 309 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 179: /* decl_var */ +#line 312 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_var_free(&(*(struct psi_decl_var **)(&(*yyvaluep))));} -#line 4146 "src/parser_proc.c" /* glr.c:846 */ +#line 4305 "src/parser_proc.c" /* glr.c:846 */ break; - case 176: /* decl_union */ -#line 313 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 180: /* decl_union */ +#line 316 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_union_free(&(*(struct psi_decl_union **)(&(*yyvaluep))));} -#line 4152 "src/parser_proc.c" /* glr.c:846 */ +#line 4311 "src/parser_proc.c" /* glr.c:846 */ break; - case 177: /* decl_struct */ -#line 311 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 181: /* decl_struct */ +#line 314 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_struct_free(&(*(struct psi_decl_struct **)(&(*yyvaluep))));} -#line 4158 "src/parser_proc.c" /* glr.c:846 */ +#line 4317 "src/parser_proc.c" /* glr.c:846 */ break; - case 178: /* decl_struct_args */ -#line 319 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 182: /* decl_struct_args */ +#line 322 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4164 "src/parser_proc.c" /* glr.c:846 */ +#line 4323 "src/parser_proc.c" /* glr.c:846 */ break; - case 179: /* struct_args_block */ -#line 319 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 183: /* struct_args_block */ +#line 322 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4170 "src/parser_proc.c" /* glr.c:846 */ +#line 4329 "src/parser_proc.c" /* glr.c:846 */ break; - case 180: /* struct_args */ -#line 319 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 184: /* struct_args */ +#line 322 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4176 "src/parser_proc.c" /* glr.c:846 */ +#line 4335 "src/parser_proc.c" /* glr.c:846 */ break; - case 181: /* struct_arg */ -#line 307 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 185: /* struct_arg */ +#line 310 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));} -#line 4182 "src/parser_proc.c" /* glr.c:846 */ +#line 4341 "src/parser_proc.c" /* glr.c:846 */ break; - case 182: /* decl_enum */ -#line 315 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 186: /* decl_enum */ +#line 318 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_enum_free(&(*(struct psi_decl_enum **)(&(*yyvaluep))));} -#line 4188 "src/parser_proc.c" /* glr.c:846 */ +#line 4347 "src/parser_proc.c" /* glr.c:846 */ break; - case 183: /* decl_enum_items */ -#line 319 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 187: /* decl_enum_items */ +#line 322 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4194 "src/parser_proc.c" /* glr.c:846 */ +#line 4353 "src/parser_proc.c" /* glr.c:846 */ break; - case 184: /* decl_enum_item */ -#line 317 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 188: /* decl_enum_item */ +#line 320 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_decl_enum_item_free(&(*(struct psi_decl_enum_item **)(&(*yyvaluep))));} -#line 4200 "src/parser_proc.c" /* glr.c:846 */ +#line 4359 "src/parser_proc.c" /* glr.c:846 */ break; - case 185: /* num_exp */ -#line 370 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 189: /* num_exp */ +#line 373 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));} -#line 4206 "src/parser_proc.c" /* glr.c:846 */ +#line 4365 "src/parser_proc.c" /* glr.c:846 */ break; - case 186: /* number */ -#line 372 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 190: /* number */ +#line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));} -#line 4212 "src/parser_proc.c" /* glr.c:846 */ +#line 4371 "src/parser_proc.c" /* glr.c:846 */ break; - case 187: /* enum_name */ -#line 263 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 191: /* enum_name */ +#line 266 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4218 "src/parser_proc.c" /* glr.c:846 */ +#line 4377 "src/parser_proc.c" /* glr.c:846 */ break; - case 188: /* union_name */ -#line 263 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 192: /* union_name */ +#line 266 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4224 "src/parser_proc.c" /* glr.c:846 */ +#line 4383 "src/parser_proc.c" /* glr.c:846 */ break; - case 189: /* struct_name */ -#line 263 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 193: /* struct_name */ +#line 266 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4230 "src/parser_proc.c" /* glr.c:846 */ +#line 4389 "src/parser_proc.c" /* glr.c:846 */ break; - case 190: /* optional_name */ -#line 263 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 194: /* optional_name */ +#line 266 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4236 "src/parser_proc.c" /* glr.c:846 */ +#line 4395 "src/parser_proc.c" /* glr.c:846 */ break; - case 191: /* decl_layout */ -#line 324 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 195: /* decl_layout */ +#line 327 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_layout_free(&(*(struct psi_layout **)(&(*yyvaluep))));} -#line 4242 "src/parser_proc.c" /* glr.c:846 */ +#line 4401 "src/parser_proc.c" /* glr.c:846 */ break; - case 192: /* align_and_size */ -#line 322 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 196: /* align_and_size */ +#line 325 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4248 "src/parser_proc.c" /* glr.c:846 */ +#line 4407 "src/parser_proc.c" /* glr.c:846 */ break; - case 193: /* array_size */ -#line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 197: /* array_size */ +#line 378 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4254 "src/parser_proc.c" /* glr.c:846 */ +#line 4413 "src/parser_proc.c" /* glr.c:846 */ break; - case 194: /* indirection */ -#line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 198: /* indirection */ +#line 378 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4260 "src/parser_proc.c" /* glr.c:846 */ +#line 4419 "src/parser_proc.c" /* glr.c:846 */ break; - case 195: /* pointers */ -#line 375 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 199: /* pointers */ +#line 378 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4266 "src/parser_proc.c" /* glr.c:846 */ +#line 4425 "src/parser_proc.c" /* glr.c:846 */ break; - case 196: /* impl */ -#line 327 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 200: /* impl */ +#line 330 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_free(&(*(struct psi_impl **)(&(*yyvaluep))));} -#line 4272 "src/parser_proc.c" /* glr.c:846 */ +#line 4431 "src/parser_proc.c" /* glr.c:846 */ break; - case 197: /* impl_func */ -#line 329 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 201: /* impl_func */ +#line 332 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_func_free(&(*(struct psi_impl_func **)(&(*yyvaluep))));} -#line 4278 "src/parser_proc.c" /* glr.c:846 */ +#line 4437 "src/parser_proc.c" /* glr.c:846 */ break; - case 198: /* impl_args */ -#line 367 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 202: /* impl_args */ +#line 370 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4284 "src/parser_proc.c" /* glr.c:846 */ +#line 4443 "src/parser_proc.c" /* glr.c:846 */ break; - case 199: /* impl_arg */ -#line 331 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 203: /* impl_arg */ +#line 334 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_arg_free(&(*(struct psi_impl_arg **)(&(*yyvaluep))));} -#line 4290 "src/parser_proc.c" /* glr.c:846 */ +#line 4449 "src/parser_proc.c" /* glr.c:846 */ break; - case 200: /* impl_var */ -#line 335 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 204: /* impl_var */ +#line 338 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_var_free(&(*(struct psi_impl_var **)(&(*yyvaluep))));} -#line 4296 "src/parser_proc.c" /* glr.c:846 */ +#line 4455 "src/parser_proc.c" /* glr.c:846 */ break; - case 201: /* impl_type */ -#line 333 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 205: /* impl_type */ +#line 336 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_type_free(&(*(struct psi_impl_type **)(&(*yyvaluep))));} -#line 4302 "src/parser_proc.c" /* glr.c:846 */ +#line 4461 "src/parser_proc.c" /* glr.c:846 */ break; - case 202: /* impl_type_token */ -#line 365 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 206: /* impl_type_token */ +#line 368 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4308 "src/parser_proc.c" /* glr.c:846 */ +#line 4467 "src/parser_proc.c" /* glr.c:846 */ break; - case 203: /* impl_stmts */ -#line 367 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 207: /* impl_stmts */ +#line 370 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4314 "src/parser_proc.c" /* glr.c:846 */ +#line 4473 "src/parser_proc.c" /* glr.c:846 */ break; - case 204: /* impl_stmt */ -#line 363 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 208: /* impl_stmt */ +#line 366 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_impl_stmt_free(&(*(struct psi_token ***)(&(*yyvaluep))));} -#line 4320 "src/parser_proc.c" /* glr.c:846 */ +#line 4479 "src/parser_proc.c" /* glr.c:846 */ break; - case 205: /* let_stmt */ -#line 338 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 209: /* let_stmt */ +#line 341 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_stmt_free(&(*(struct psi_let_stmt **)(&(*yyvaluep))));} -#line 4326 "src/parser_proc.c" /* glr.c:846 */ +#line 4485 "src/parser_proc.c" /* glr.c:846 */ break; - case 206: /* let_exp */ -#line 340 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 210: /* let_exp */ +#line 343 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));} -#line 4332 "src/parser_proc.c" /* glr.c:846 */ +#line 4491 "src/parser_proc.c" /* glr.c:846 */ break; - case 207: /* let_exp_byref */ -#line 340 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 211: /* let_exp_byref */ +#line 343 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));} -#line 4338 "src/parser_proc.c" /* glr.c:846 */ +#line 4497 "src/parser_proc.c" /* glr.c:846 */ break; - case 208: /* let_exp_assign */ -#line 340 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 212: /* let_exp_assign */ +#line 343 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));} -#line 4344 "src/parser_proc.c" /* glr.c:846 */ +#line 4503 "src/parser_proc.c" /* glr.c:846 */ break; - case 209: /* let_calloc */ -#line 342 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 213: /* let_calloc */ +#line 345 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_calloc_free(&(*(struct psi_let_calloc **)(&(*yyvaluep))));} -#line 4350 "src/parser_proc.c" /* glr.c:846 */ +#line 4509 "src/parser_proc.c" /* glr.c:846 */ break; - case 210: /* let_callback */ -#line 344 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 214: /* let_callback */ +#line 347 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_callback_free(&(*(struct psi_let_callback **)(&(*yyvaluep))));} -#line 4356 "src/parser_proc.c" /* glr.c:846 */ +#line 4515 "src/parser_proc.c" /* glr.c:846 */ break; - case 211: /* let_func */ -#line 346 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 215: /* let_func */ +#line 349 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_let_func_free(&(*(struct psi_let_func **)(&(*yyvaluep))));} -#line 4362 "src/parser_proc.c" /* glr.c:846 */ +#line 4521 "src/parser_proc.c" /* glr.c:846 */ break; - case 212: /* let_func_token */ -#line 365 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 216: /* let_func_token */ +#line 368 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4368 "src/parser_proc.c" /* glr.c:846 */ +#line 4527 "src/parser_proc.c" /* glr.c:846 */ break; - case 213: /* let_func_exps */ -#line 367 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 217: /* let_func_exps */ +#line 370 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4374 "src/parser_proc.c" /* glr.c:846 */ +#line 4533 "src/parser_proc.c" /* glr.c:846 */ break; - case 214: /* let_exps */ -#line 367 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 218: /* let_exps */ +#line 370 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4380 "src/parser_proc.c" /* glr.c:846 */ +#line 4539 "src/parser_proc.c" /* glr.c:846 */ break; - case 215: /* callback_rval */ -#line 365 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 219: /* callback_rval */ +#line 368 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4386 "src/parser_proc.c" /* glr.c:846 */ +#line 4545 "src/parser_proc.c" /* glr.c:846 */ break; - case 216: /* callback_arg_list */ -#line 367 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 220: /* callback_arg_list */ +#line 370 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4392 "src/parser_proc.c" /* glr.c:846 */ +#line 4551 "src/parser_proc.c" /* glr.c:846 */ break; - case 217: /* callback_args */ -#line 367 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 221: /* callback_args */ +#line 370 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4398 "src/parser_proc.c" /* glr.c:846 */ +#line 4557 "src/parser_proc.c" /* glr.c:846 */ break; - case 218: /* return_stmt */ -#line 356 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 222: /* return_stmt */ +#line 359 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_return_stmt_free(&(*(struct psi_return_stmt **)(&(*yyvaluep))));} -#line 4404 "src/parser_proc.c" /* glr.c:846 */ +#line 4563 "src/parser_proc.c" /* glr.c:846 */ break; - case 219: /* set_stmt */ -#line 348 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 223: /* set_stmt */ +#line 351 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_set_stmt_free(&(*(struct psi_set_stmt **)(&(*yyvaluep))));} -#line 4410 "src/parser_proc.c" /* glr.c:846 */ +#line 4569 "src/parser_proc.c" /* glr.c:846 */ break; - case 220: /* set_exp */ -#line 350 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 224: /* set_exp */ +#line 353 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_set_exp_free(&(*(struct psi_set_exp **)(&(*yyvaluep))));} -#line 4416 "src/parser_proc.c" /* glr.c:846 */ +#line 4575 "src/parser_proc.c" /* glr.c:846 */ break; - case 221: /* set_func */ -#line 352 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 225: /* set_func */ +#line 355 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_set_func_free(&(*(struct psi_set_func **)(&(*yyvaluep))));} -#line 4422 "src/parser_proc.c" /* glr.c:846 */ +#line 4581 "src/parser_proc.c" /* glr.c:846 */ break; - case 222: /* set_func_token */ -#line 365 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 226: /* set_func_token */ +#line 368 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4428 "src/parser_proc.c" /* glr.c:846 */ +#line 4587 "src/parser_proc.c" /* glr.c:846 */ break; - case 223: /* set_func_exps */ -#line 367 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 227: /* set_func_exps */ +#line 370 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4434 "src/parser_proc.c" /* glr.c:846 */ +#line 4593 "src/parser_proc.c" /* glr.c:846 */ break; - case 224: /* set_exps */ -#line 367 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 228: /* set_exps */ +#line 370 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4440 "src/parser_proc.c" /* glr.c:846 */ +#line 4599 "src/parser_proc.c" /* glr.c:846 */ break; - case 225: /* assert_stmt */ -#line 354 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 229: /* assert_stmt */ +#line 357 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_assert_stmt_free(&(*(struct psi_assert_stmt **)(&(*yyvaluep))));} -#line 4446 "src/parser_proc.c" /* glr.c:846 */ +#line 4605 "src/parser_proc.c" /* glr.c:846 */ break; - case 226: /* assert_stmt_token */ -#line 365 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 230: /* assert_stmt_token */ +#line 368 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));} -#line 4452 "src/parser_proc.c" /* glr.c:846 */ +#line 4611 "src/parser_proc.c" /* glr.c:846 */ break; - case 227: /* free_stmt */ -#line 358 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 231: /* free_stmt */ +#line 361 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_free_stmt_free(&(*(struct psi_free_stmt **)(&(*yyvaluep))));} -#line 4458 "src/parser_proc.c" /* glr.c:846 */ +#line 4617 "src/parser_proc.c" /* glr.c:846 */ break; - case 228: /* free_exps */ -#line 367 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 232: /* free_exps */ +#line 370 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4464 "src/parser_proc.c" /* glr.c:846 */ +#line 4623 "src/parser_proc.c" /* glr.c:846 */ break; - case 229: /* free_exp */ -#line 360 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 233: /* free_exp */ +#line 363 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_free_exp_free(&(*(struct psi_free_exp **)(&(*yyvaluep))));} -#line 4470 "src/parser_proc.c" /* glr.c:846 */ +#line 4629 "src/parser_proc.c" /* glr.c:846 */ break; - case 230: /* decl_vars */ -#line 319 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 234: /* decl_vars */ +#line 322 "src/parser_proc_grammar.y" /* glr.c:846 */ {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));} -#line 4476 "src/parser_proc.c" /* glr.c:846 */ +#line 4635 "src/parser_proc.c" /* glr.c:846 */ break; - case 231: /* reference */ -#line 377 "src/parser_proc_grammar.y" /* glr.c:846 */ + case 235: /* reference */ +#line 380 "src/parser_proc_grammar.y" /* glr.c:846 */ {} -#line 4482 "src/parser_proc.c" /* glr.c:846 */ +#line 4641 "src/parser_proc.c" /* glr.c:846 */ break; @@ -4535,7 +4694,7 @@ yylhsNonterm (yyRuleNum yyrule) } #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-490))) + (!!((Yystate) == (-505))) /** True iff LR state YYSTATE has only a default reduction (regardless * of token). */ @@ -5827,11 +5986,11 @@ yyparse (struct psi_parser *P, struct psi_plist *tokens, size_t *index) yylval = yyval_default; /* User initialization code. */ - #line 118 "src/parser_proc_grammar.y" /* glr.c:2270 */ + #line 117 "src/parser_proc_grammar.y" /* glr.c:2270 */ { } -#line 5835 "src/parser_proc.c" /* glr.c:2270 */ +#line 5994 "src/parser_proc.c" /* glr.c:2270 */ if (! yyinitGLRStack (yystackp, YYINITDEPTH)) goto yyexhaustedlab; @@ -6137,7 +6296,7 @@ yypdumpstack (yyGLRStack* yystackp) #define yydebug psi_parser_proc_debug #define yynerrs psi_parser_proc_nerrs -#line 1648 "src/parser_proc_grammar.y" /* glr.c:2584 */ +#line 1673 "src/parser_proc_grammar.y" /* glr.c:2584 */ /* epilogue */ diff --git a/src/parser_proc.h b/src/parser_proc.h index a865d80..ba52a9c 100644 --- 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 94 "src/parser_proc_grammar.y" /* glr.c:197 */ +#line 93 "src/parser_proc_grammar.y" /* glr.c:197 */ #include "plist.h" #include "types/layout.h" @@ -124,58 +124,62 @@ struct psi_parser; PSI_T_PERIOD = 323, PSI_T_BACKSLASH = 324, PSI_T_ELLIPSIS = 325, - PSI_T_ERROR = 326, - PSI_T_WARNING = 327, - PSI_T_IF = 328, - PSI_T_IFDEF = 329, - PSI_T_IFNDEF = 330, - PSI_T_ELSE = 331, - PSI_T_ELIF = 332, - PSI_T_ENDIF = 333, - PSI_T_DEFINE = 334, - PSI_T_DEFINED = 335, - PSI_T_UNDEF = 336, - PSI_T_IMPORT = 337, - PSI_T_INCLUDE = 338, - PSI_T_INCLUDE_NEXT = 339, - PSI_T_TYPEDEF = 340, - PSI_T_STRUCT = 341, - PSI_T_UNION = 342, - PSI_T_ENUM = 343, - PSI_T_CONST = 344, - PSI_T_LIB = 345, - PSI_T_STATIC = 346, - PSI_T_CALLBACK = 347, - PSI_T_FUNCTION = 348, - PSI_T_LET = 349, - PSI_T_SET = 350, - PSI_T_TEMP = 351, - PSI_T_FREE = 352, - PSI_T_RETURN = 353, - PSI_T_PRE_ASSERT = 354, - PSI_T_POST_ASSERT = 355, - PSI_T_BOOLVAL = 356, - PSI_T_INTVAL = 357, - PSI_T_STRVAL = 358, - PSI_T_PATHVAL = 359, - PSI_T_STRLEN = 360, - PSI_T_FLOATVAL = 361, - PSI_T_ARRVAL = 362, - PSI_T_OBJVAL = 363, - PSI_T_COUNT = 364, - PSI_T_CALLOC = 365, - PSI_T_TO_BOOL = 366, - PSI_T_TO_INT = 367, - PSI_T_TO_STRING = 368, - PSI_T_TO_FLOAT = 369, - PSI_T_TO_ARRAY = 370, - PSI_T_TO_OBJECT = 371, - PSI_T_COMMENT = 372, - PSI_T_WHITESPACE = 373, - PSI_T_NO_WHITESPACE = 374, - PSI_T_CPP_HEADER = 375, - PSI_T_BINARY = 376, - PSI_T_UNARY = 377 + PSI_T_IIF = 326, + PSI_T_PRAGMA = 327, + PSI_T_ONCE = 328, + PSI_T_ERROR = 329, + PSI_T_WARNING = 330, + PSI_T_IF = 331, + PSI_T_IFDEF = 332, + PSI_T_IFNDEF = 333, + PSI_T_ELSE = 334, + PSI_T_ELIF = 335, + PSI_T_ENDIF = 336, + PSI_T_DEFINE = 337, + PSI_T_DEFINED = 338, + PSI_T_UNDEF = 339, + PSI_T_IMPORT = 340, + PSI_T_INCLUDE = 341, + PSI_T_INCLUDE_NEXT = 342, + PSI_T_TYPEDEF = 343, + PSI_T_STRUCT = 344, + PSI_T_UNION = 345, + PSI_T_ENUM = 346, + PSI_T_CONST = 347, + PSI_T_LIB = 348, + PSI_T_STATIC = 349, + PSI_T_CALLBACK = 350, + PSI_T_FUNCTION = 351, + PSI_T_LET = 352, + PSI_T_SET = 353, + PSI_T_TEMP = 354, + PSI_T_FREE = 355, + PSI_T_RETURN = 356, + PSI_T_PRE_ASSERT = 357, + PSI_T_POST_ASSERT = 358, + PSI_T_BOOLVAL = 359, + PSI_T_INTVAL = 360, + PSI_T_STRVAL = 361, + PSI_T_PATHVAL = 362, + PSI_T_STRLEN = 363, + PSI_T_FLOATVAL = 364, + PSI_T_ARRVAL = 365, + PSI_T_OBJVAL = 366, + PSI_T_COUNT = 367, + PSI_T_CALLOC = 368, + PSI_T_TO_BOOL = 369, + PSI_T_TO_INT = 370, + PSI_T_TO_STRING = 371, + PSI_T_TO_FLOAT = 372, + PSI_T_TO_ARRAY = 373, + PSI_T_TO_OBJECT = 374, + PSI_T_COMMENT = 375, + PSI_T_WHITESPACE = 376, + PSI_T_NO_WHITESPACE = 377, + PSI_T_CPP_HEADER = 378, + PSI_T_CPP_ATTRIBUTE = 379, + PSI_T_BINARY = 380, + PSI_T_UNARY = 381 }; #endif @@ -467,6 +471,12 @@ union YYSTYPE struct psi_token * PSI_T_BACKSLASH; /* "..." */ struct psi_token * PSI_T_ELLIPSIS; + /* "?" */ + struct psi_token * PSI_T_IIF; + /* PRAGMA */ + struct psi_token * PSI_T_PRAGMA; + /* ONCE */ + struct psi_token * PSI_T_ONCE; /* ERROR */ struct psi_token * PSI_T_ERROR; /* WARNING */ @@ -567,6 +577,8 @@ union YYSTYPE struct psi_token * PSI_T_NO_WHITESPACE; /* CPP_HEADER */ struct psi_token * PSI_T_CPP_HEADER; + /* CPP_ATTRIBUTE */ + struct psi_token * PSI_T_CPP_ATTRIBUTE; /* binary_op_token */ struct psi_token * PSI_T_binary_op_token; /* unary_op_token */ @@ -633,7 +645,7 @@ union YYSTYPE struct psi_token * PSI_T_assert_stmt_token; /* impl_stmt */ struct psi_token ** PSI_T_impl_stmt; -#line 637 "src/parser_proc.h" /* glr.c:197 */ +#line 649 "src/parser_proc.h" /* glr.c:197 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/src/parser_proc_grammar.y b/src/parser_proc_grammar.y index 30bc959..f4c1bc0 100644 --- a/src/parser_proc_grammar.y +++ b/src/parser_proc_grammar.y @@ -62,7 +62,6 @@ static inline void psi_parser_proc_add_typedef(struct psi_parser *P, struct psi_ P->types = psi_plist_init((psi_plist_dtor) psi_decl_arg_free); } P->types = psi_plist_add(P->types, &def); - psi_parser_proc_add_from_typedef(P, def); } static inline void psi_parser_proc_add_const(struct psi_parser *P, struct psi_const *cnst) { @@ -190,7 +189,10 @@ struct psi_parser; %token PERIOD "." %token BACKSLASH "\\" %token ELLIPSIS "..." +%token IIF "?" +%token PRAGMA +%token ONCE %token ERROR %token WARNING %token IF @@ -243,10 +245,11 @@ struct psi_parser; %token WHITESPACE %token NO_WHITESPACE %token CPP_HEADER +%token CPP_ATTRIBUTE -//%destructor {psi_token_free((struct psi_token **) &$$);} <> - -%precedence AND OR +%precedence IIF COLON +%precedence OR +%precedence AND %precedence PIPE %precedence CARET %precedence AMPERSAND @@ -385,8 +388,8 @@ struct psi_parser; binary_op_token: PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | RCHEVR | LCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE ; unary_op_token: TILDE | NOT | PLUS | MINUS ; -name_token: NAME | TEMP | FREE | SET | LET | CALLOC | CALLBACK | ZVAL | LIB | STRING | COUNT | ERROR | WARNING | BOOL ; -any_noeol_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | INT8 | UINT8 | INT16 | UINT16 | INT32 | UINT32 | INT64 | UINT64 | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACE | RBRACE | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER ; +name_token: NAME | TEMP | FREE | SET | LET | CALLOC | CALLBACK | ZVAL | LIB | STRING | COUNT | ERROR | WARNING | ONCE | PRAGMA | BOOL ; +any_noeol_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | INT8 | UINT8 | INT16 | UINT16 | INT32 | UINT32 | INT64 | UINT64 | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACE | RBRACE | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER; file: @@ -500,6 +503,14 @@ cpp_exp[exp]: $exp = psi_cpp_exp_init($cpp_exp_arg_token->type, $cpp_macro_exp); $exp->token = psi_token_copy($cpp_exp_arg_token); } +| PRAGMA ONCE { + $exp = psi_cpp_exp_init($ONCE->type, NULL); + $exp->token = psi_token_copy($ONCE); +} +| PRAGMA cpp_macro_decl_tokens[tokens] { + psi_plist_free($tokens); + $exp = NULL; +} ; cpp_message_token: @@ -603,13 +614,18 @@ cpp_macro_exp[exp]: $exp = psi_num_exp_init_binary($binary_op_token->type, $lhs, $rhs); $exp->token = psi_token_copy($binary_op_token); } +| cpp_macro_exp[cond] IIF cpp_macro_exp[truthy] COLON cpp_macro_exp[falsy] { + $exp = psi_num_exp_init_ternary($IIF->type, $cond, $truthy, $falsy); + $exp->token = psi_token_copy($IIF); +} + | DEFINED name_token { { uint8_t exists; $name_token->type = PSI_T_NAME; exists = psi_cpp_defined(P->preproc, $name_token); - $exp = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &exists)); + $exp = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &exists, 0)); $exp->token = psi_token_copy($name_token); } } @@ -619,30 +635,30 @@ cpp_macro_exp[exp]: $name_token->type = PSI_T_NAME; exists = psi_cpp_defined(P->preproc, $name_token); - $exp = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &exists)); + $exp = psi_num_exp_init_num(psi_number_init(PSI_T_UINT8, &exists, 0)); $exp->token = psi_token_copy($name_token); } } | NUMBER { - $exp = psi_num_exp_init_num(psi_number_init($NUMBER->type, $NUMBER->text)); + $exp = psi_num_exp_init_num(psi_number_init($NUMBER->type, $NUMBER->text, $NUMBER->flags)); $exp->token = psi_token_copy($NUMBER); $exp->data.n->token = psi_token_copy($NUMBER); } | QUOTED_CHAR { - $exp = psi_num_exp_init_num(psi_number_init($QUOTED_CHAR->type, $QUOTED_CHAR->text)); + $exp = psi_num_exp_init_num(psi_number_init($QUOTED_CHAR->type, $QUOTED_CHAR->text, 0)); $exp->token = psi_token_copy($QUOTED_CHAR); $exp->data.n->token = psi_token_copy($QUOTED_CHAR); } | name_token { $name_token->type = PSI_T_NAME; - $exp = psi_num_exp_init_num(psi_number_init(PSI_T_DEFINE, $name_token->text)); + $exp = psi_num_exp_init_num(psi_number_init(PSI_T_DEFINE, $name_token->text, 0)); $exp->token = psi_token_copy($name_token); $exp->data.n->token = psi_token_copy($name_token); } | name_token LPAREN cpp_macro_call_args RPAREN { $name_token->type = PSI_T_NAME; $exp = psi_num_exp_init_num(psi_number_init(PSI_T_FUNCTION, - psi_cpp_macro_call_init($name_token->text, $cpp_macro_call_args))); + psi_cpp_macro_call_init($name_token->text, $cpp_macro_call_args), 0)); $exp->token = psi_token_copy($name_token); } ; @@ -744,6 +760,11 @@ typedef[def]: $def->type->real.unn->align = $as.pos; $def->type->real.unn->size = $as.len; } +| const_decl_type[type] decl_stdint_type[stdint] { + $stdint->type = PSI_T_NAME; + $def = psi_decl_arg_init($type, psi_decl_var_init($stdint->text, 0, 0)); + $def->var->token = psi_token_copy($stdint); +} ; const_decl_type[type]: @@ -1163,23 +1184,27 @@ num_exp[exp]: $exp = psi_num_exp_init_unary($op->type, $exp_); $exp->token = psi_token_copy($op); } +| num_exp[cond] IIF num_exp[truthy] COLON num_exp[falsy] { + $exp = psi_num_exp_init_ternary($IIF->type, $cond, $truthy, $falsy); + $exp->token = psi_token_copy($IIF); +} ; number[num]: NUMBER[token] { - $num = psi_number_init($token->type, $token->text); + $num = psi_number_init($token->type, $token->text, $token->flags); $num->token = psi_token_copy($token); } | NSNAME[token] { - $num = psi_number_init($token->type, $token->text); + $num = psi_number_init($token->type, $token->text, 0); $num->token = psi_token_copy($token); } | QUOTED_CHAR[token] { - $num = psi_number_init($token->type, $token->text); + $num = psi_number_init($token->type, $token->text, 0); $num->token = psi_token_copy($token); } | decl_var { - $num = psi_number_init(PSI_T_NAME, $decl_var); + $num = psi_number_init(PSI_T_NAME, $decl_var, 0); $num->token = psi_token_copy($decl_var->token); } ; diff --git a/src/plist.c b/src/plist.c index 2cf4eb3..25f6676 100644 --- a/src/plist.c +++ b/src/plist.c @@ -44,10 +44,10 @@ struct psi_plist { } while (0) /* !!! adjust list->count prior reduction */ #define PLIST_MOV_REDUCE(l, i) PLIST_MOV_REDUCE_EX(l, i, 1) -#define PLIST_MOV_REDUCE_EX(l, i, n) memmove(PLIST_ELE(l, i), PLIST_ELE(l, i + n), (l)->size * ((l)->count - i)) +#define PLIST_MOV_REDUCE_EX(l, i, n) memmove(PLIST_ELE(l, i), PLIST_ELE(l, (i) + (n)), (l)->size * ((l)->count - (i))) /* !!! adjust list->count after expansion */ #define PLIST_MOV_EXPAND(l, i) PLIST_MOV_EXPAND_EX(l, i, 1) -#define PLIST_MOV_EXPAND_EX(l, i, n) memmove(PLIST_ELE(l, i + n), PLIST_ELE(l, i), (l)->size * ((l)->count - i)) +#define PLIST_MOV_EXPAND_EX(l, i, n) memmove(PLIST_ELE(l, (i) + (n)), PLIST_ELE(l, i), (l)->size * ((l)->count - (i))) struct psi_plist *psi_plist_init(void (*dtor)(void *)) { return psi_plist_init_ex(0, dtor); @@ -192,7 +192,7 @@ struct psi_plist *psi_plist_ins_r(struct psi_plist *list, size_t offset_start, s size_t new_count; if (list) { - new_count = MAX(offset_start + 1, list->count) + num_eles; + new_count = MAX(offset_start, list->count) + num_eles; if (new_count) { list = realloc(list, sizeof(*list) + list->size + new_count * list->size); } diff --git a/src/token.h b/src/token.h index a8e68ee..cf9423f 100644 --- a/src/token.h +++ b/src/token.h @@ -131,7 +131,7 @@ static inline const char *psi_t_indirection(unsigned pointer_level) { struct psi_token { token_t type; - unsigned size, line, col; + unsigned size, line, col, flags; char *text, *file; char buf[1]; }; diff --git a/src/types/cpp_exp.c b/src/types/cpp_exp.c index ee7a30b..2371ae2 100644 --- a/src/types/cpp_exp.c +++ b/src/types/cpp_exp.c @@ -54,6 +54,7 @@ struct psi_cpp_exp *psi_cpp_exp_init(token_t type, void *data) break; case PSI_T_ENDIF: case PSI_T_ELSE: + case PSI_T_ONCE: break; default: assert(0); @@ -94,6 +95,7 @@ void psi_cpp_exp_free(struct psi_cpp_exp **exp_ptr) break; case PSI_T_ENDIF: case PSI_T_ELSE: + case PSI_T_ONCE: break; default: assert(0); @@ -133,6 +135,7 @@ void psi_cpp_exp_dump(int fd, struct psi_cpp_exp *exp) break; case PSI_T_ENDIF: case PSI_T_ELSE: + case PSI_T_ONCE: break; default: assert(0); @@ -305,6 +308,17 @@ void psi_cpp_exp_exec(struct psi_cpp_exp *exp, struct psi_cpp *cpp, struct psi_d } } break; + case PSI_T_IMPORT: + if (!cpp->skip) { + if (!psi_cpp_include(cpp, exp->data.tok->text, PSI_CPP_INCLUDE_ONCE)) { + D->error(D, exp->token, PSI_WARNING, "Failed to include %s", exp->data.tok->text); + } + } + case PSI_T_ONCE: + if (!cpp->skip) { + zend_hash_str_add_empty_element(&cpp->once, exp->token->file, strlen(exp->token->file)); + } + break; default: assert(0); break; diff --git a/src/types/decl_enum_item.c b/src/types/decl_enum_item.c index ad78ddd..c403d97 100644 --- a/src/types/decl_enum_item.c +++ b/src/types/decl_enum_item.c @@ -86,13 +86,13 @@ bool psi_decl_enum_item_validate(struct psi_data *data, item->inc.data.b.lhs = psi_num_exp_init_unary(PSI_T_LPAREN, psi_num_exp_copy(item->prev->num)); item->inc.data.b.rhs = psi_num_exp_init_num( - psi_number_init(PSI_T_INT64, &one)); + psi_number_init(PSI_T_INT64, &one, 0)); item->num = &item->inc; } else { int64_t nil = 0; item->inc.op = PSI_T_NUMBER; - item->inc.data.n = psi_number_init(PSI_T_INT64, &nil); + item->inc.data.n = psi_number_init(PSI_T_INT64, &nil, 0); item->num = &item->inc; } } diff --git a/src/types/num_exp.c b/src/types/num_exp.c index 0577acf..91ff887 100644 --- a/src/types/num_exp.c +++ b/src/types/num_exp.c @@ -32,6 +32,19 @@ #include "call.h" #include "calc.h" +struct psi_num_exp *psi_num_exp_init_ternary(token_t op, + struct psi_num_exp *cond, struct psi_num_exp *truthy, + struct psi_num_exp *falsy) +{ + struct psi_num_exp *exp = calloc(1, sizeof(*exp)); + + exp->op = op; + exp->data.t.cond = cond; + exp->data.t.truthy = truthy; + exp->data.t.falsy = falsy; + + return exp; +} struct psi_num_exp *psi_num_exp_init_binary(token_t op, struct psi_num_exp *lhs, struct psi_num_exp *rhs) @@ -129,6 +142,12 @@ struct psi_num_exp *psi_num_exp_copy(struct psi_num_exp *exp) cpy->data.b.rhs = psi_num_exp_copy(exp->data.b.rhs); break; + case PSI_T_IIF: + cpy->data.t.cond = psi_num_exp_copy(exp->data.t.cond); + cpy->data.t.truthy = psi_num_exp_copy(exp->data.t.truthy); + cpy->data.t.falsy = psi_num_exp_copy(exp->data.t.falsy); + break; + default: assert(0); } @@ -187,6 +206,12 @@ void psi_num_exp_free(struct psi_num_exp **c_ptr) psi_num_exp_free(&c->data.b.rhs); break; + case PSI_T_IIF: + psi_num_exp_free(&c->data.t.cond); + psi_num_exp_free(&c->data.t.truthy); + psi_num_exp_free(&c->data.t.falsy); + break; + default: assert(0); } @@ -253,6 +278,9 @@ static inline const char *psi_num_exp_op_tok(token_t op) case PSI_T_LCHEVR: return "<"; + case PSI_T_IIF: + return "?"; + default: assert(0); } @@ -303,6 +331,14 @@ void psi_num_exp_dump(int fd, struct psi_num_exp *exp) psi_num_exp_dump(fd, exp->data.b.rhs); break; + case PSI_T_IIF: + psi_num_exp_dump(fd, exp->data.t.cond); + dprintf(fd, " ? "); + psi_num_exp_dump(fd, exp->data.t.truthy); + dprintf(fd, " : "); + psi_num_exp_dump(fd, exp->data.t.falsy); + break; + default: assert(0); } @@ -349,6 +385,7 @@ bool psi_num_exp_validate(struct psi_data *data, struct psi_num_exp *exp, case PSI_T_CAST: case PSI_T_LPAREN: + case PSI_T_IIF: break; case PSI_T_PIPE: @@ -425,6 +462,12 @@ bool psi_num_exp_validate(struct psi_data *data, struct psi_num_exp *exp, case PSI_T_MODULO: return psi_num_exp_validate(data, exp->data.b.lhs, impl, cb_decl, current_let, current_set, current_enum) && psi_num_exp_validate(data, exp->data.b.rhs, impl, cb_decl, current_let, current_set, current_enum); + + case PSI_T_IIF: + return psi_num_exp_validate(data, exp->data.t.cond, impl, cb_decl, current_let, current_set, current_enum) + && psi_num_exp_validate(data, exp->data.t.truthy, impl, cb_decl, current_let, current_set, current_enum) + && psi_num_exp_validate(data, exp->data.t.falsy, impl, cb_decl, current_let, current_set, current_enum); + default: assert(0); } @@ -535,6 +578,20 @@ static void psi_num_exp_reduce(struct psi_num_exp *exp, struct psi_plist **outpu psi_num_exp_reduce(exp->data.u, &output, &input, frame, defs); break; + case PSI_T_IIF: + { + impl_val cond_val = {0}; + token_t cond_typ = psi_num_exp_exec(exp->data.t.cond, &cond_val, frame, defs); + + psi_calc_bool_not(cond_typ, &cond_val, 0, NULL, &cond_val); + if (cond_val.u8) { + psi_num_exp_reduce(exp->data.t.falsy, &output, &input, frame, defs); + } else { + psi_num_exp_reduce(exp->data.t.truthy, &output, &input, frame, defs); + } + } + break; + default: psi_num_exp_reduce(exp->data.b.lhs, &output, &input, frame, defs); while (psi_plist_top(input, &entry)) { diff --git a/src/types/num_exp.h b/src/types/num_exp.h index 99f0b69..7ec62e1 100644 --- a/src/types/num_exp.h +++ b/src/types/num_exp.h @@ -50,12 +50,20 @@ struct psi_num_exp { struct psi_decl_type *typ; struct psi_num_exp *num; } c; + struct { + struct psi_num_exp *cond; + struct psi_num_exp *truthy; + struct psi_num_exp *falsy; + } t; struct psi_num_exp *u; struct psi_number *n; } data; token_t (*calc)(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res); }; +struct psi_num_exp *psi_num_exp_init_ternary(token_t op, + struct psi_num_exp *cond, struct psi_num_exp *truthy, + struct psi_num_exp *falsy); struct psi_num_exp *psi_num_exp_init_binary(token_t op, struct psi_num_exp *lhs, struct psi_num_exp *rhs); struct psi_num_exp *psi_num_exp_init_unary(token_t op, diff --git a/src/types/number.c b/src/types/number.c index c5f22d2..b0a669f 100644 --- a/src/types/number.c +++ b/src/types/number.c @@ -32,10 +32,11 @@ #include "call.h" #include "parser.h" -struct psi_number *psi_number_init(token_t t, void *num) +struct psi_number *psi_number_init(token_t t, void *num, unsigned flags) { struct psi_number *exp = calloc(1, sizeof(*exp)); + exp->flags = flags; switch (exp->type = t) { case PSI_T_INT8: exp->data.ival.i8 = *(int8_t *) num; @@ -68,6 +69,11 @@ struct psi_number *psi_number_init(token_t t, void *num) case PSI_T_DOUBLE: exp->data.ival.dval = *(double *) num; break; +#if HAVE_LONG_DOUBLE + case PSI_T_LONG_DOUBLE: + exp->data.ival.ldval = *(long double *) num; + break; +#endif case PSI_T_QUOTED_CHAR: case PSI_T_NUMBER: case PSI_T_NSNAME: @@ -106,6 +112,9 @@ struct psi_number *psi_number_copy(struct psi_number *exp) case PSI_T_INT64: case PSI_T_UINT64: case PSI_T_DOUBLE: +#if HAVE_LONG_DOUBLE + case PSI_T_LONG_DOUBLE: +#endif case PSI_T_ENUM: case PSI_T_CONST: break; @@ -146,6 +155,9 @@ void psi_number_free(struct psi_number **exp_ptr) case PSI_T_INT64: case PSI_T_UINT64: case PSI_T_DOUBLE: +#if HAVE_LONG_DOUBLE + case PSI_T_LONG_DOUBLE: +#endif case PSI_T_ENUM: case PSI_T_CONST: break; @@ -198,6 +210,11 @@ void psi_number_dump(int fd, struct psi_number *exp) case PSI_T_DOUBLE: dprintf(fd, "%F", exp->data.ival.dval); break; +#if HAVE_LONG_DOUBLE + case PSI_T_LONG_DOUBLE: + dprintf(fd, "%lF", exp->data.ival.ldval); + break; +#endif case PSI_T_NUMBER: case PSI_T_NSNAME: case PSI_T_DEFINE: @@ -236,12 +253,174 @@ static inline bool psi_number_validate_enum(struct psi_data *data, struct psi_nu return false; } +static inline bool psi_number_validate_char(struct psi_data *data, struct psi_number *exp) +{ + impl_val tmp = {0}; + /* FIXME L */ + tmp.i8 = exp->data.numb[1 + (*exp->data.numb == 'L')]; + switch(tmp.i8) { + case '\\': + tmp.i8 = exp->data.numb[2 + (*exp->data.numb == 'L')]; + switch(tmp.i8) { + case 'x': + tmp.i8 = strtol(&exp->data.numb[3 + (*exp->data.numb == 'L')], NULL, 16); + free(exp->data.numb); + exp->type = PSI_T_INT8; + exp->data.ival.i8 = tmp.i8; + return true; + case '\'': + free(exp->data.numb); + exp->type = PSI_T_INT8; + exp->data.ival.i8 = '\''; + return true; + case 'a': + free(exp->data.numb); + exp->type = PSI_T_INT8; + exp->data.ival.i8 = '\a'; + return true; + case 'b': + free(exp->data.numb); + exp->type = PSI_T_INT8; + exp->data.ival.i8 = '\b'; + return true; + case 'f': + free(exp->data.numb); + exp->type = PSI_T_INT8; + exp->data.ival.i8 = '\f'; + return true; + case 'n': + free(exp->data.numb); + exp->type = PSI_T_INT8; + exp->data.ival.i8 = '\n'; + return true; + case 'r': + free(exp->data.numb); + exp->type = PSI_T_INT8; + exp->data.ival.i8 = '\r'; + return true; + case 't': + free(exp->data.numb); + exp->type = PSI_T_INT8; + exp->data.ival.i8 = '\t'; + return true; + case 'v': + free(exp->data.numb); + exp->type = PSI_T_INT8; + exp->data.ival.i8 = '\v'; + return true; + case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': + tmp.i8 = strtol(&exp->data.numb[2 + (*exp->data.numb == 'L')], NULL, 8); + free(exp->data.numb); + exp->type = PSI_T_INT8; + exp->data.ival.i8 = tmp.i8; + return true; + default: + free(exp->data.numb); + exp->type = PSI_T_INT8; + exp->data.ival.i8 = tmp.i8; + return true; + } + break; + default: + free(exp->data.numb); + exp->type = PSI_T_INT8; + exp->data.ival.i8 = tmp.i8; + return true; + } +} + +static inline bool psi_number_validate_number(struct psi_data *data, struct psi_number *exp) +{ + impl_val tmp = {0}; + + if (exp->flags) { + switch (exp->flags & 0x0f) { + case PSI_NUMBER_INT: + switch (exp->flags & 0x0f00) { + case PSI_NUMBER_L: + default: + tmp.i64 = strtol(exp->data.numb, NULL, 0); + free(exp->data.numb); + exp->type = PSI_T_INT64; + exp->data.ival.i64 = tmp.i64; + break; + case PSI_NUMBER_LL: + tmp.i64 = strtoll(exp->data.numb, NULL, 0); + free(exp->data.numb); + exp->type = PSI_T_INT64; + exp->data.ival.i64 = tmp.i64; + break; + case PSI_NUMBER_U: + case PSI_NUMBER_UL: + tmp.u64 = strtoul(exp->data.numb, NULL, 0); + free(exp->data.numb); + exp->type = PSI_T_UINT64; + exp->data.ival.u64 = tmp.u64; + break; + case PSI_NUMBER_ULL: + tmp.u64 = strtoull(exp->data.numb, NULL, 0); + free(exp->data.numb); + exp->type = PSI_T_UINT64; + exp->data.ival.u64 = tmp.u64; + break; + } + return true; + + case PSI_NUMBER_FLT: + switch (exp->flags & 0x0ff00) { + case PSI_NUMBER_F: + case PSI_NUMBER_DF: + tmp.fval = strtof(exp->data.numb, NULL); + free(exp->data.numb); + exp->type = PSI_T_FLOAT; + exp->data.ival.fval = tmp.fval; + break; + case PSI_NUMBER_L: + case PSI_NUMBER_DL: +#if HAVE_LONG_DOUBLE + tmp.ldval = strtold(exp->data.numb, NULL); + free(exp->data.numb); + exp->type = PSI_T_LONG_DOUBLE; + exp->data.ival.ldval = tmp.ldval; + break; +#endif + case PSI_NUMBER_DD: + default: + tmp.dval = strtod(exp->data.numb, NULL); + free(exp->data.numb); + exp->type = PSI_T_DOUBLE; + exp->data.ival.dval = tmp.dval; + break; + } + return true; + default: + assert(0); + break; + } + } else { + switch (is_numeric_string(exp->data.numb, strlen(exp->data.numb), (zend_long *) &tmp, (double *) &tmp, 1)) { + case IS_LONG: + free(exp->data.numb); + exp->type = PSI_T_INT64; + exp->data.ival.i64 = tmp.zend.lval; + return true; + + case IS_DOUBLE: + free(exp->data.numb); + exp->type = PSI_T_DOUBLE; + exp->data.ival.dval = tmp.dval; + return true; + } + } + data->error(data, exp->token, PSI_WARNING, "Expected numeric entity (parser error?)"); + return false; + +} bool psi_number_validate(struct psi_data *data, struct psi_number *exp, struct psi_impl *impl, struct psi_decl *cb_decl, struct psi_let_exp *current_let, struct psi_set_exp *current_set, struct psi_decl_enum *current_enum) { size_t i = 0; - impl_val tmp = {0}; struct psi_const *cnst; struct psi_decl_enum *enm; @@ -256,6 +435,9 @@ bool psi_number_validate(struct psi_data *data, struct psi_number *exp, case PSI_T_INT64: case PSI_T_UINT64: case PSI_T_DOUBLE: +#if HAVE_LONG_DOUBLE + case PSI_T_LONG_DOUBLE: +#endif case PSI_T_ENUM: case PSI_T_DEFINE: case PSI_T_FUNCTION: @@ -300,95 +482,10 @@ bool psi_number_validate(struct psi_data *data, struct psi_number *exp, return false; case PSI_T_NUMBER: - switch (is_numeric_string(exp->data.numb, strlen(exp->data.numb), (zend_long *) &tmp, (double *) &tmp, 1)) { - case IS_LONG: - free(exp->data.numb); - exp->type = PSI_T_INT64; - exp->data.ival.i64 = tmp.zend.lval; - return true; - - case IS_DOUBLE: - free(exp->data.numb); - exp->type = PSI_T_DOUBLE; - exp->data.ival.dval = tmp.dval; - return true; - } - data->error(data, exp->token, PSI_WARNING, "Expected numeric entity (parser error?)"); - return false; + return psi_number_validate_number(data, exp); case PSI_T_QUOTED_CHAR: - /* FIXME L */ - tmp.i8 = exp->data.numb[1 + (*exp->data.numb == 'L')]; - switch(tmp.i8) { - case '\\': - tmp.i8 = exp->data.numb[2 + (*exp->data.numb == 'L')]; - switch(tmp.i8) { - case 'x': - tmp.i8 = strtol(&exp->data.numb[3 + (*exp->data.numb == 'L')], &exp->data.numb[strlen(exp->data.numb)-1], 16); - free(exp->data.numb); - exp->type = PSI_T_INT8; - exp->data.ival.i8 = tmp.i8; - return true; - case '\'': - free(exp->data.numb); - exp->type = PSI_T_INT8; - exp->data.ival.i8 = '\''; - return true; - case 'a': - free(exp->data.numb); - exp->type = PSI_T_INT8; - exp->data.ival.i8 = '\a'; - return true; - case 'b': - free(exp->data.numb); - exp->type = PSI_T_INT8; - exp->data.ival.i8 = '\b'; - return true; - case 'f': - free(exp->data.numb); - exp->type = PSI_T_INT8; - exp->data.ival.i8 = '\f'; - return true; - case 'n': - free(exp->data.numb); - exp->type = PSI_T_INT8; - exp->data.ival.i8 = '\n'; - return true; - case 'r': - free(exp->data.numb); - exp->type = PSI_T_INT8; - exp->data.ival.i8 = '\r'; - return true; - case 't': - free(exp->data.numb); - exp->type = PSI_T_INT8; - exp->data.ival.i8 = '\t'; - return true; - case 'v': - free(exp->data.numb); - exp->type = PSI_T_INT8; - exp->data.ival.i8 = '\v'; - return true; - case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': - tmp.i8 = strtol(&exp->data.numb[2 + (*exp->data.numb == 'L')], &exp->data.numb[strlen(exp->data.numb)-1], 8); - free(exp->data.numb); - exp->type = PSI_T_INT8; - exp->data.ival.i8 = tmp.i8; - return true; - default: - free(exp->data.numb); - exp->type = PSI_T_INT8; - exp->data.ival.i8 = tmp.i8; - return true; - } - break; - default: - free(exp->data.numb); - exp->type = PSI_T_INT8; - exp->data.ival.i8 = tmp.i8; - return true; - } - break; + return psi_number_validate_char(data, exp); default: assert(0); @@ -443,9 +540,7 @@ static inline token_t psi_number_eval_define(struct psi_number *exp, { struct psi_cpp_macro_decl *macro = zend_hash_str_find_ptr(defs, exp->data.numb, strlen(exp->data.numb)); - //WHATT? - fprintf(stderr, "number_eval_define: %s %s(%p)\n", - exp->token->text, macro ? macro->token->text : "", macro); + assert(!macro); res->u8 = 0; return PSI_T_UINT8; @@ -492,6 +587,13 @@ token_t psi_number_eval(struct psi_number *exp, impl_val *res, struct psi_call_f if (frame) PSI_DEBUG_PRINT(frame->context, " %" PRIdval, res->dval); return exp->type; +#if HAVE_LONG_DOUBLE + case PSI_T_LONG_DOUBLE: + *res = exp->data.ival; + if (frame) PSI_DEBUG_PRINT(frame->context, " %" PRIdval, res->dval); + return exp->type; +#endif + case PSI_T_ENUM: res->i64 = exp->data.enm->val; if (frame) PSI_DEBUG_PRINT(frame->context, " %" PRIi64, res->i64); diff --git a/src/types/number.h b/src/types/number.h index d7fa150..cc5923e 100644 --- a/src/types/number.h +++ b/src/types/number.h @@ -37,9 +37,30 @@ struct psi_set_exp; struct psi_call_frame; struct psi_cpp_macro_call; +enum psi_number_suffix { + PSI_NUMBER_U = 0x0100, + PSI_NUMBER_L = 0x0200, + PSI_NUMBER_UL = 0x0300, + + PSI_NUMBER_LL = 0x0400, + PSI_NUMBER_ULL = 0x0500, + + PSI_NUMBER_F = 0x1000, + PSI_NUMBER_D = 0x2000, + PSI_NUMBER_DF = 0x3000, + PSI_NUMBER_DD = 0x4000, + PSI_NUMBER_DL = 0x2200, +}; + +enum psi_number_kind { + PSI_NUMBER_INT = 0x01, + PSI_NUMBER_FLT = 0x02, +}; + struct psi_number { struct psi_token *token; token_t type; + unsigned flags; union { char *numb; impl_val ival; @@ -50,7 +71,7 @@ struct psi_number { } data; }; -struct psi_number *psi_number_init(token_t t, void *num); +struct psi_number *psi_number_init(token_t t, void *num, unsigned flags); struct psi_number *psi_number_copy(struct psi_number *exp); void psi_number_free(struct psi_number **exp_ptr); void psi_number_dump(int fd, struct psi_number *exp); -- 2.30.2