cpp

diff --git a/m4/psi/psi.m4 b/m4/psi/psi.m4
index 92d8babcd21d1acad90ab3d6a26eb379d0f63d8f..470a7a6c816d8fe19894a01518503514c5de9da5 100644 (file)
--- 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 $CPPFLAGS -D_GNU_SOURCE - </dev/null`
-       psi_cpp_search=`$CPP -Wp,-v $CPPFLAGS -D_GNU_SOURCE - </dev/null 2>&1 >/dev/null \
+       psi_cpp_predef=`$CPP -Wp,-dM $CPPFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - </dev/null`
+       psi_cpp_search=`$CPP -Wp,-v $CPPFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 - </dev/null 2>&1 >/dev/null \
                | $AWK '
                        /include.*search.*start/ { 
                                capture = 1

diff --git a/src/cpp.c b/src/cpp.c
index 2cf4094e93efbd5ef9303c67e23ce75c97fefecc..c831b67838171f7157a117e30862b91b10d702cc 100644 (file)
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -100,7 +100,8 @@ static bool psi_cpp_stage1(struct psi_cpp *cpp)
                struct psi_token *token = psi_cpp_tokiter_current(cpp);
 
                /* strip comments and attributes */
-               if (token->type == PSI_T_COMMENT || token->type == PSI_T_CPP_ATTRIBUTE) {
+               if (token->type == PSI_T_COMMENT
+                               || token->type == PSI_T_CPP_ATTRIBUTE) {
                        psi_cpp_tokiter_del_cur(cpp, true);
                        continue;
                }
@@ -125,6 +126,9 @@ static bool psi_cpp_stage1(struct psi_cpp *cpp)
                 */
 
                if (token->type == PSI_T_WHITESPACE) {
+                       if (name) {
+                               name = false;
+                       }
                        ws = true;
                        psi_cpp_tokiter_del_cur(cpp, true);
                        continue;
@@ -415,19 +419,25 @@ static inline bool try_include(struct psi_cpp *cpp, const char *path, bool *pars
 
 bool psi_cpp_include(struct psi_cpp *cpp, const char *file, unsigned flags)
 {
-       char path[PATH_MAX];
        bool parsed = false;
-       int p_len, f_len = strlen(file) - 2;
+       int f_len = strlen(file);
 
-       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;
+       if (!(flags & PSI_CPP_INCLUDE_NEXT) || *file == '/') {
+               /* first try as is, full or relative path */
+               if ((flags & PSI_CPP_INCLUDE_ONCE) && zend_hash_str_exists(&cpp->once, file, f_len)) {
+                       return true;
                }
-       } else {
+               if (try_include(cpp, file, &parsed)) {
+                       /* found */
+                       return parsed;
+               }
+       }
+
+       /* look through search paths */
+       if (*file != '/') {
+               char path[PATH_MAX];
                const char *sep;
+               int p_len;
 
                if ((flags & PSI_CPP_INCLUDE_NEXT) && cpp->search) {
                        if ((sep = strchr(cpp->search, ':'))) {
@@ -448,7 +458,7 @@ 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 > (p_len = 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))) {
                                if ((flags & PSI_CPP_INCLUDE_ONCE) && zend_hash_str_exists(&cpp->once, path, p_len)) {
                                        return true;
                                }

diff --git a/src/cpp_tokiter.c b/src/cpp_tokiter.c
index 2ea9adc80a6411dbff8b2d20b08c591c8404245f..51daaa9bb794a850e3ae215b152471a941255a62 100644 (file)
--- a/src/cpp_tokiter.c
+++ b/src/cpp_tokiter.c
@@ -243,13 +243,15 @@ void psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp, struct psi_plist *tokens
                while (psi_plist_get(tokens, i++, &tok)) {
                        struct psi_token *new_tok;
 
+                       if (tok->type == PSI_T_EOL) {
+                               continue;
+                       }
                        if (tok->type == PSI_T_HASH) {
-                               if (stringify) {
-                                       stringify = false;
-                                       paste = true;
-                               } else {
-                                       stringify = true;
-                               }
+                               stringify = true;
+                               continue;
+                       }
+                       if (tok->type == PSI_T_CPP_PASTE) {
+                               paste = true;
                                continue;
                        }
 
@@ -261,8 +263,6 @@ void psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp, struct psi_plist *tokens
                                struct psi_token *cpy = psi_token_copy(tok);
 
                                if (stringify) {
-                                       cpy = psi_token_append(NULL,
-                                                       psi_token_prepend(NULL, cpy, 1, "\""), 1, "\"");
                                        cpy->type = PSI_T_QUOTED_STRING;
                                }
                                exp_tokens[n++] = cpy;
@@ -272,6 +272,7 @@ void psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp, struct psi_plist *tokens
                        fprintf(stderr, "PSI: CPP expand > ");
                        psi_token_dump(2, tok);
 #endif
+
                        paste = false;
                        stringify = false;
                }

diff --git a/src/parser.c b/src/parser.c
index 434554ee584d7923039c07b10fc35d8cf665ef44..032d88545acf24588ea9db4986b1c28058b6a6d6 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 on Tue Mar 28 19:45:29 2017 */
+/* Generated by re2c 0.16 on Thu Mar 30 13:18:03 2017 */
 #line 1 "src/parser.re"
 /*******************************************************************************
  Copyright (c) 2016, Michael Wallner <mike@php.net>.
@@ -32,7 +32,7 @@
 
 #include "parser.h"
 
-#define YYMAXFILL 13
+#define YYMAXFILL 15
 #ifndef YYMAXFILL
 # define YYMAXFILL 256
 #endif
@@ -262,22 +262,25 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
        struct psi_token *token;
        const char *tok, *cur, *lim, *mrk, *eol, *ctxmrk;
        unsigned parens;
+       bool escaped;
+       token_t char_width;
 
        tok = mrk = eol = cur = I->buffer;
        lim = I->buffer + I->length;
        I->lines = 1;
-       tokens = psi_plist_init((void (*)(void *)) psi_token_free);
+       tokens = psi_plist_init((psi_plist_dtor) psi_token_free);
 
        start: ;
+               char_width = 1;
                ctxmrk = NULL;
                tok = cur;
 
                
-#line 277 "src/parser.c"
+#line 280 "src/parser.c"
                {
                        unsigned char yych;
                        unsigned int yyaccept = 0;
-                       if ((lim - cur) < 13) if (cur >= lim) goto done;;
+                       if ((lim - cur) < 15) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case 0x00:
@@ -290,7 +293,6 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                        case 0x07:
                        case 0x08:
                        case '\v':
-                       case '\f':
                        case 0x0E:
                        case 0x0F:
                        case 0x10:
@@ -313,25 +315,26 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                        case '`':
                        case 0x7F:      goto yy2;
                        case '\t':
+                       case '\f':
                        case ' ':       goto yy4;
                        case '\n':
                        case '\r':      goto yy7;
                        case '!':       goto yy9;
                        case '"':       goto yy11;
-                       case '#':       goto yy12;
-                       case '$':       goto yy14;
-                       case '%':       goto yy15;
-                       case '&':       goto yy17;
-                       case '\'':      goto yy19;
-                       case '(':       goto yy20;
-                       case ')':       goto yy22;
-                       case '*':       goto yy24;
-                       case '+':       goto yy26;
-                       case ',':       goto yy28;
-                       case '-':       goto yy30;
-                       case '.':       goto yy32;
-                       case '/':       goto yy34;
-                       case '0':       goto yy36;
+                       case '#':       goto yy13;
+                       case '$':       goto yy15;
+                       case '%':       goto yy16;
+                       case '&':       goto yy18;
+                       case '\'':      goto yy20;
+                       case '(':       goto yy22;
+                       case ')':       goto yy24;
+                       case '*':       goto yy26;
+                       case '+':       goto yy28;
+                       case ',':       goto yy30;
+                       case '-':       goto yy32;
+                       case '.':       goto yy34;
+                       case '/':       goto yy36;
+                       case '0':       goto yy38;
                        case '1':
                        case '2':
                        case '3':
@@ -340,109 +343,113 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy38;
-                       case ':':       goto yy40;
-                       case ';':       goto yy42;
-                       case '<':       goto yy44;
-                       case '=':       goto yy46;
-                       case '>':       goto yy48;
-                       case '?':       goto yy50;
+                       case '9':       goto yy40;
+                       case ':':       goto yy42;
+                       case ';':       goto yy44;
+                       case '<':       goto yy46;
+                       case '=':       goto yy48;
+                       case '>':       goto yy50;
+                       case '?':       goto yy52;
                        case 'A':
-                       case 'a':       goto yy52;
+                       case 'a':       goto yy54;
                        case 'B':
-                       case 'b':       goto yy54;
+                       case 'b':       goto yy56;
                        case 'C':
-                       case 'c':       goto yy55;
+                       case 'c':       goto yy57;
                        case 'D':
-                       case 'd':       goto yy56;
+                       case 'd':       goto yy58;
                        case 'E':
-                       case 'e':       goto yy57;
+                       case 'e':       goto yy59;
                        case 'F':
-                       case 'f':       goto yy58;
+                       case 'f':       goto yy60;
                        case 'I':
-                       case 'i':       goto yy61;
-                       case 'L':       goto yy62;
+                       case 'i':       goto yy63;
+                       case 'L':       goto yy64;
                        case 'M':
-                       case 'm':       goto yy63;
+                       case 'm':       goto yy65;
                        case 'N':
-                       case 'n':       goto yy64;
-                       case 'O':       goto yy65;
-                       case 'P':       goto yy66;
+                       case 'n':       goto yy66;
+                       case 'O':
+                       case 'o':       goto yy67;
+                       case 'P':       goto yy68;
                        case 'R':
-                       case 'r':       goto yy67;
+                       case 'r':       goto yy69;
                        case 'S':
-                       case 's':       goto yy68;
+                       case 's':       goto yy70;
                        case 'T':
-                       case 't':       goto yy69;
-                       case 'U':
-                       case 'u':       goto yy70;
+                       case 't':       goto yy71;
+                       case 'U':       goto yy72;
                        case 'V':
-                       case 'v':       goto yy71;
+                       case 'v':       goto yy73;
                        case 'W':
-                       case 'w':       goto yy72;
+                       case 'w':       goto yy74;
                        case 'Z':
-                       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;
+                       case 'z':       goto yy75;
+                       case '[':       goto yy76;
+                       case '\\':      goto yy78;
+                       case ']':       goto yy80;
+                       case '^':       goto yy82;
+                       case '_':       goto yy84;
+                       case 'l':       goto yy85;
+                       case 'p':       goto yy86;
+                       case 'u':       goto yy87;
+                       case '{':       goto yy88;
+                       case '|':       goto yy90;
+                       case '}':       goto yy92;
+                       case '~':       goto yy94;
+                       default:        goto yy61;
                        }
 yy2:
                        ++cur;
 yy3:
-#line 449 "src/parser.re"
+#line 450 "src/parser.re"
                        { NEWTOKEN(-2); goto error; }
-#line 405 "src/parser.c"
+#line 408 "src/parser.c"
 yy4:
                        ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\t':
+                       case '\f':
                        case ' ':       goto yy4;
                        default:        goto yy6;
                        }
 yy6:
-#line 448 "src/parser.re"
+#line 449 "src/parser.re"
                        { NEWTOKEN(PSI_T_WHITESPACE); goto start; }
-#line 418 "src/parser.c"
+#line 422 "src/parser.c"
 yy7:
                        ++cur;
-#line 447 "src/parser.re"
+#line 448 "src/parser.re"
                        { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
-#line 423 "src/parser.c"
+#line 427 "src/parser.c"
 yy9:
                        ++cur;
                        switch ((yych = *cur)) {
-                       case '=':       goto yy94;
+                       case '=':       goto yy96;
                        default:        goto yy10;
                        }
 yy10:
-#line 348 "src/parser.re"
+#line 347 "src/parser.re"
                        { NEWTOKEN(PSI_T_NOT); goto start; }
-#line 433 "src/parser.c"
+#line 437 "src/parser.c"
 yy11:
-                       yyaccept = 0;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '"':       goto yy3;
-                       default:        goto yy96;
-                       }
-yy12:
                        ++cur;
-#line 331 "src/parser.re"
-                       { NEWTOKEN(PSI_T_HASH); goto start; }
-#line 445 "src/parser.c"
+#line 320 "src/parser.re"
+                       { escaped = false; tok += 1; goto string; }
+#line 442 "src/parser.c"
+yy13:
+                       ++cur;
+                       switch ((yych = *cur)) {
+                       case '#':       goto yy98;
+                       default:        goto yy14;
+                       }
 yy14:
+#line 330 "src/parser.re"
+                       { NEWTOKEN(PSI_T_HASH); goto start; }
+#line 452 "src/parser.c"
+yy15:
                        yych = *++cur;
                        switch (yych) {
                        case 0x00:
@@ -510,51 +517,49 @@ yy14:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy3;
-                       default:        goto yy98;
+                       default:        goto yy100;
                        }
-yy15:
+yy16:
                        ++cur;
-#line 349 "src/parser.re"
+#line 348 "src/parser.re"
                        { NEWTOKEN(PSI_T_MODULO); goto start; }
-#line 520 "src/parser.c"
-yy17:
+#line 527 "src/parser.c"
+yy18:
                        ++cur;
                        switch ((yych = *cur)) {
-                       case '&':       goto yy101;
-                       default:        goto yy18;
+                       case '&':       goto yy103;
+                       default:        goto yy19;
                        }
-yy18:
-#line 350 "src/parser.re"
-                       { NEWTOKEN(PSI_T_AMPERSAND); goto start; }
-#line 530 "src/parser.c"
 yy19:
-                       yyaccept = 0;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '\'':      goto yy3;
-                       default:        goto yy103;
-                       }
+#line 349 "src/parser.re"
+                       { NEWTOKEN(PSI_T_AMPERSAND); goto start; }
+#line 537 "src/parser.c"
 yy20:
                        ++cur;
-#line 332 "src/parser.re"
-                       { NEWTOKEN(PSI_T_LPAREN); goto start; }
+#line 319 "src/parser.re"
+                       { escaped = false; tok += 1; goto character; }
 #line 542 "src/parser.c"
 yy22:
                        ++cur;
-#line 333 "src/parser.re"
-                       { NEWTOKEN(PSI_T_RPAREN); goto start; }
+#line 331 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LPAREN); goto start; }
 #line 547 "src/parser.c"
 yy24:
                        ++cur;
-#line 346 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ASTERISK); goto start; }
+#line 332 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RPAREN); goto start; }
 #line 552 "src/parser.c"
 yy26:
-                       yyaccept = 1;
+                       ++cur;
+#line 345 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ASTERISK); goto start; }
+#line 557 "src/parser.c"
+yy28:
+                       yyaccept = 0;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '.':       goto yy105;
-                       case '0':       goto yy36;
+                       case '0':       goto yy38;
                        case '1':
                        case '2':
                        case '3':
@@ -563,24 +568,24 @@ yy26:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy38;
-                       default:        goto yy27;
+                       case '9':       goto yy40;
+                       default:        goto yy29;
                        }
-yy27:
-#line 351 "src/parser.re"
+yy29:
+#line 350 "src/parser.re"
                        { NEWTOKEN(PSI_T_PLUS); goto start; }
-#line 573 "src/parser.c"
-yy28:
-                       ++cur;
-#line 335 "src/parser.re"
-                       { NEWTOKEN(PSI_T_COMMA); goto start; }
 #line 578 "src/parser.c"
 yy30:
-                       yyaccept = 2;
+                       ++cur;
+#line 334 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COMMA); goto start; }
+#line 583 "src/parser.c"
+yy32:
+                       yyaccept = 1;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '.':       goto yy105;
-                       case '0':       goto yy36;
+                       case '0':       goto yy38;
                        case '1':
                        case '2':
                        case '3':
@@ -589,15 +594,15 @@ yy30:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy38;
-                       default:        goto yy31;
+                       case '9':       goto yy40;
+                       default:        goto yy33;
                        }
-yy31:
-#line 352 "src/parser.re"
+yy33:
+#line 351 "src/parser.re"
                        { NEWTOKEN(PSI_T_MINUS); goto start; }
-#line 599 "src/parser.c"
-yy32:
-                       yyaccept = 3;
+#line 604 "src/parser.c"
+yy34:
+                       yyaccept = 2;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '.':       goto yy107;
@@ -611,25 +616,25 @@ yy32:
                        case '7':
                        case '8':
                        case '9':       goto yy108;
-                       default:        goto yy33;
+                       default:        goto yy35;
                        }
-yy33:
-#line 363 "src/parser.re"
+yy35:
+#line 362 "src/parser.re"
                        { NEWTOKEN(PSI_T_PERIOD); goto start; }
-#line 620 "src/parser.c"
-yy34:
+#line 625 "src/parser.c"
+yy36:
                        ++cur;
                        switch ((yych = *cur)) {
                        case '*':       goto yy111;
                        case '/':       goto yy113;
-                       default:        goto yy35;
+                       default:        goto yy37;
                        }
-yy35:
-#line 353 "src/parser.re"
+yy37:
+#line 352 "src/parser.re"
                        { NEWTOKEN(PSI_T_SLASH); goto start; }
-#line 631 "src/parser.c"
-yy36:
-                       yyaccept = 4;
+#line 636 "src/parser.c"
+yy38:
+                       yyaccept = 3;
                        yych = *(mrk = ++cur);
                        ctxmrk = cur;
                        switch (yych) {
@@ -650,14 +655,14 @@ yy36:
                        case 'u':       goto yy122;
                        case 'X':
                        case 'x':       goto yy124;
-                       default:        goto yy37;
+                       default:        goto yy39;
                        }
-yy37:
-#line 316 "src/parser.re"
+yy39:
+#line 306 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT; goto start; }
-#line 659 "src/parser.c"
-yy38:
-                       yyaccept = 4;
+#line 664 "src/parser.c"
+yy40:
+                       yyaccept = 3;
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -673,27 +678,27 @@ yy38:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy38;
+                       case '9':       goto yy40;
                        case 'E':
                        case 'e':       goto yy119;
                        case 'L':
                        case 'l':       goto yy120;
                        case 'U':
                        case 'u':       goto yy122;
-                       default:        goto yy37;
+                       default:        goto yy39;
                        }
-yy40:
-                       ++cur;
-#line 336 "src/parser.re"
-                       { NEWTOKEN(PSI_T_COLON); goto start; }
-#line 690 "src/parser.c"
 yy42:
                        ++cur;
-#line 334 "src/parser.re"
-                       { NEWTOKEN(PSI_T_EOS); goto start; }
+#line 335 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COLON); goto start; }
 #line 695 "src/parser.c"
 yy44:
-                       yyaccept = 5;
+                       ++cur;
+#line 333 "src/parser.re"
+                       { NEWTOKEN(PSI_T_EOS); goto start; }
+#line 700 "src/parser.c"
+yy46:
+                       yyaccept = 4;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case '-':
@@ -764,60 +769,60 @@ yy44:
                        case 'z':       goto yy125;
                        case '<':       goto yy127;
                        case '=':       goto yy129;
-                       default:        goto yy45;
+                       default:        goto yy47;
                        }
-yy45:
-#line 361 "src/parser.re"
+yy47:
+#line 360 "src/parser.re"
                        { NEWTOKEN(PSI_T_LCHEVR); goto start; }
-#line 773 "src/parser.c"
-yy46:
+#line 778 "src/parser.c"
+yy48:
                        ++cur;
                        switch ((yych = *cur)) {
                        case '=':       goto yy131;
-                       default:        goto yy47;
+                       default:        goto yy49;
                        }
-yy47:
-#line 345 "src/parser.re"
+yy49:
+#line 344 "src/parser.re"
                        { NEWTOKEN(PSI_T_EQUALS); goto start; }
-#line 783 "src/parser.c"
-yy48:
+#line 788 "src/parser.c"
+yy50:
                        ++cur;
                        switch ((yych = *cur)) {
                        case '=':       goto yy133;
                        case '>':       goto yy135;
-                       default:        goto yy49;
+                       default:        goto yy51;
                        }
-yy49:
-#line 362 "src/parser.re"
+yy51:
+#line 361 "src/parser.re"
                        { NEWTOKEN(PSI_T_RCHEVR); goto start; }
-#line 794 "src/parser.c"
-yy50:
-                       ++cur;
-#line 365 "src/parser.re"
-                       { NEWTOKEN(PSI_T_IIF); goto start; }
 #line 799 "src/parser.c"
 yy52:
-                       yyaccept = 6;
+                       ++cur;
+#line 364 "src/parser.re"
+                       { NEWTOKEN(PSI_T_IIF); goto start; }
+#line 804 "src/parser.c"
+yy54:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
                        case 'r':       goto yy137;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy53:
-#line 440 "src/parser.re"
+yy55:
+#line 443 "src/parser.re"
                        { NEWTOKEN(PSI_T_NAME); goto start; }
-#line 811 "src/parser.c"
-yy54:
-                       yyaccept = 6;
+#line 816 "src/parser.c"
+yy56:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
                        case 'o':       goto yy139;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy55:
-                       yyaccept = 6;
+yy57:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
@@ -826,20 +831,20 @@ yy55:
                        case 'h':       goto yy141;
                        case 'O':
                        case 'o':       goto yy142;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy56:
-                       yyaccept = 6;
+yy58:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
                        case 'e':       goto yy143;
                        case 'O':
                        case 'o':       goto yy144;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy57:
-                       yyaccept = 6;
+yy59:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
@@ -848,10 +853,10 @@ yy57:
                        case 'n':       goto yy146;
                        case 'R':
                        case 'r':       goto yy147;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy58:
-                       yyaccept = 6;
+yy60:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
@@ -862,14 +867,14 @@ yy58:
                        case 'r':       goto yy150;
                        case 'U':
                        case 'u':       goto yy151;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy59:
-                       yyaccept = 6;
+yy61:
+                       yyaccept = 5;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
-yy60:
+yy62:
                        switch (yych) {
                        case 0x00:
                        case 0x01:
@@ -934,60 +939,61 @@ yy60:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy53;
+                       case 0x7F:      goto yy55;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy61:
-                       yyaccept = 6;
+yy63:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
                        case 'f':       goto yy152;
                        case 'N':
                        case 'n':       goto yy154;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy62:
-                       yyaccept = 6;
+yy64:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
+                       ctxmrk = cur;
                        switch (yych) {
-                       case '"':       goto yy155;
-                       case '\'':      goto yy156;
+                       case '"':
+                       case '\'':      goto yy155;
                        case 'E':
                        case 'e':       goto yy157;
                        case 'I':
                        case 'i':       goto yy158;
                        case 'O':
                        case 'o':       goto yy159;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy63:
-                       yyaccept = 6;
+yy65:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
                        case 'i':       goto yy160;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy64:
-                       yyaccept = 6;
+yy66:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
                        case 'u':       goto yy161;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy65:
-                       yyaccept = 6;
+yy67:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
                        case 'b':       goto yy162;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy66:
-                       yyaccept = 6;
+yy68:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
@@ -996,18 +1002,18 @@ yy66:
                        case 'o':       goto yy164;
                        case 'R':
                        case 'r':       goto yy165;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy67:
-                       yyaccept = 6;
+yy69:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
                        case 'e':       goto yy166;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy68:
-                       yyaccept = 6;
+yy70:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
@@ -1018,10 +1024,10 @@ yy68:
                        case 'i':       goto yy169;
                        case 'T':
                        case 't':       goto yy170;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy69:
-                       yyaccept = 6;
+yy71:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
@@ -1032,48 +1038,51 @@ yy69:
                        case 'r':       goto yy173;
                        case 'Y':
                        case 'y':       goto yy174;
-                       default:        goto yy60;
+                       default:        goto yy62;
                        }
-yy70:
-                       yyaccept = 6;
+yy72:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
+                       ctxmrk = cur;
                        switch (yych) {
+                       case '"':
+                       case '\'':      goto yy175;
                        case 'I':
-                       case 'i':       goto yy175;
+                       case 'i':       goto yy177;
                        case 'N':
-                       case 'n':       goto yy176;
-                       default:        goto yy60;
+                       case 'n':       goto yy178;
+                       default:        goto yy62;
                        }
-yy71:
-                       yyaccept = 6;
+yy73:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy177;
-                       default:        goto yy60;
+                       case 'o':       goto yy179;
+                       default:        goto yy62;
                        }
-yy72:
-                       yyaccept = 6;
+yy74:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy178;
-                       default:        goto yy60;
+                       case 'a':       goto yy180;
+                       default:        goto yy62;
                        }
-yy73:
-                       yyaccept = 6;
+yy75:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy179;
-                       default:        goto yy60;
+                       case 'v':       goto yy181;
+                       default:        goto yy62;
                        }
-yy74:
+yy76:
                        ++cur;
-#line 339 "src/parser.re"
+#line 338 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACKET); goto start; }
-#line 1076 "src/parser.c"
-yy76:
+#line 1085 "src/parser.c"
+yy78:
                        ++cur;
                        switch ((yych = *cur)) {
                        case 0x00:
@@ -1150,53 +1159,44 @@ yy76:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy77;
-                       default:        goto yy180;
+                       case 0x7F:      goto yy79;
+                       default:        goto yy182;
                        }
-yy77:
-#line 354 "src/parser.re"
+yy79:
+#line 353 "src/parser.re"
                        { NEWTOKEN(PSI_T_BSLASH); goto start; }
-#line 1160 "src/parser.c"
-yy78:
+#line 1169 "src/parser.c"
+yy80:
                        ++cur;
-#line 340 "src/parser.re"
+#line 339 "src/parser.re"
                        { NEWTOKEN(PSI_T_RBRACKET); goto start; }
-#line 1165 "src/parser.c"
-yy80:
+#line 1174 "src/parser.c"
+yy82:
                        ++cur;
-#line 356 "src/parser.re"
+#line 355 "src/parser.re"
                        { NEWTOKEN(PSI_T_CARET); goto start; }
-#line 1170 "src/parser.c"
-yy82:
-                       yyaccept = 6;
+#line 1179 "src/parser.c"
+yy84:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy183;
-                       default:        goto yy60;
+                       case '_':       goto yy185;
+                       default:        goto yy62;
                        }
-yy83:
-                       yyaccept = 6;
+yy85:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
                        case 'e':       goto yy157;
-                       case 'I':
-                       case 'i':       goto yy158;
+                       case 'I':       goto yy158;
                        case 'O':
                        case 'o':       goto yy159;
-                       default:        goto yy60;
+                       case 'i':       goto yy186;
+                       default:        goto yy62;
                        }
-yy84:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy162;
-                       case 'n':       goto yy184;
-                       default:        goto yy60;
-                       }
-yy85:
-                       yyaccept = 6;
+yy86:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
@@ -1204,49 +1204,60 @@ yy85:
                        case 'O':
                        case 'o':       goto yy164;
                        case 'R':       goto yy165;
-                       case 'r':       goto yy185;
-                       default:        goto yy60;
+                       case 'r':       goto yy187;
+                       default:        goto yy62;
                        }
-yy86:
+yy87:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       ctxmrk = cur;
+                       switch (yych) {
+                       case '"':
+                       case '\'':      goto yy188;
+                       case '8':       goto yy190;
+                       case 'I':
+                       case 'i':       goto yy177;
+                       case 'N':
+                       case 'n':       goto yy178;
+                       default:        goto yy62;
+                       }
+yy88:
                        ++cur;
-#line 337 "src/parser.re"
+#line 336 "src/parser.re"
                        { NEWTOKEN(PSI_T_LBRACE); goto start; }
-#line 1215 "src/parser.c"
-yy88:
+#line 1229 "src/parser.c"
+yy90:
                        ++cur;
                        switch ((yych = *cur)) {
-                       case '|':       goto yy186;
-                       default:        goto yy89;
+                       case '|':       goto yy191;
+                       default:        goto yy91;
                        }
-yy89:
-#line 355 "src/parser.re"
+yy91:
+#line 354 "src/parser.re"
                        { NEWTOKEN(PSI_T_PIPE); goto start; }
-#line 1225 "src/parser.c"
-yy90:
-                       ++cur;
-#line 338 "src/parser.re"
-                       { NEWTOKEN(PSI_T_RBRACE); goto start; }
-#line 1230 "src/parser.c"
+#line 1239 "src/parser.c"
 yy92:
                        ++cur;
-#line 347 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TILDE); goto start; }
-#line 1235 "src/parser.c"
+#line 337 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RBRACE); goto start; }
+#line 1244 "src/parser.c"
 yy94:
                        ++cur;
-#line 341 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CMP_NE); goto start; }
-#line 1240 "src/parser.c"
+#line 346 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TILDE); goto start; }
+#line 1249 "src/parser.c"
 yy96:
                        ++cur;
-                       if (lim <= cur) if (cur >= lim) goto done;;
-                       yych = *cur;
-                       switch (yych) {
-                       case '"':       goto yy188;
-                       default:        goto yy96;
-                       }
+#line 340 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CMP_NE); goto start; }
+#line 1254 "src/parser.c"
 yy98:
                        ++cur;
+#line 329 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_PASTE); goto start; }
+#line 1259 "src/parser.c"
+yy100:
+                       ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
@@ -1314,27 +1325,18 @@ yy98:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy100;
-                       default:        goto yy98;
+                       case 0x7F:      goto yy102;
+                       default:        goto yy100;
                        }
-yy100:
-#line 442 "src/parser.re"
+yy102:
+#line 445 "src/parser.re"
                        { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; }
-#line 1324 "src/parser.c"
-yy101:
-                       ++cur;
-#line 343 "src/parser.re"
-                       { NEWTOKEN(PSI_T_AND); goto start; }
-#line 1329 "src/parser.c"
+#line 1335 "src/parser.c"
 yy103:
                        ++cur;
-                       if (lim <= cur) if (cur >= lim) goto done;;
-                       yych = *cur;
-                       switch (yych) {
-                       case '\'':      goto yy190;
-                       case '\\':      goto yy192;
-                       default:        goto yy103;
-                       }
+#line 342 "src/parser.re"
+                       { NEWTOKEN(PSI_T_AND); goto start; }
+#line 1340 "src/parser.c"
 yy105:
                        yych = *++cur;
                        switch (yych) {
@@ -1353,100 +1355,102 @@ yy105:
 yy106:
                        cur = mrk;
                        switch (yyaccept) {
-                       case 0:         goto yy3;
-                       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;
+                       case 0:         goto yy29;
+                       case 1:         goto yy33;
+                       case 2:         goto yy35;
+                       case 3:         goto yy39;
+                       case 4:         goto yy47;
+                       case 5:         goto yy55;
+                       case 6:         goto yy110;
+                       case 7:         goto yy121;
+                       case 8:         goto yy153;
+                       case 9:         goto yy184;
+                       case 10:        goto yy229;
+                       case 11:        goto yy231;
+                       case 12:        goto yy233;
+                       case 13:        goto yy243;
+                       case 14:        goto yy279;
+                       case 15:        goto yy282;
+                       case 16:        goto yy288;
+                       case 17:        goto yy290;
+                       case 18:        goto yy293;
+                       case 19:        goto yy298;
+                       case 20:        goto yy309;
+                       case 21:        goto yy312;
+                       case 22:        goto yy327;
+                       case 23:        goto yy335;
+                       case 24:        goto yy342;
+                       case 25:        goto yy345;
+                       case 26:        goto yy351;
+                       case 27:        goto yy354;
+                       case 28:        goto yy361;
+                       case 29:        goto yy363;
+                       case 30:        goto yy367;
+                       case 31:        goto yy369;
+                       case 32:        goto yy371;
+                       case 33:        goto yy373;
+                       case 34:        goto yy376;
+                       case 35:        goto yy385;
+                       case 36:        goto yy393;
+                       case 37:        goto yy412;
+                       case 38:        goto yy414;
+                       case 39:        goto yy423;
+                       case 40:        goto yy428;
+                       case 41:        goto yy430;
+                       case 42:        goto yy432;
+                       case 43:        goto yy436;
+                       case 44:        goto yy442;
+                       case 45:        goto yy444;
+                       case 46:        goto yy446;
+                       case 47:        goto yy448;
+                       case 48:        goto yy453;
+                       case 49:        goto yy455;
+                       case 50:        goto yy457;
+                       case 51:        goto yy459;
+                       case 52:        goto yy461;
+                       case 53:        goto yy463;
+                       case 54:        goto yy465;
+                       case 55:        goto yy470;
+                       case 56:        goto yy485;
+                       case 57:        goto yy487;
+                       case 58:        goto yy491;
+                       case 59:        goto yy495;
+                       case 60:        goto yy497;
+                       case 61:        goto yy499;
+                       case 62:        goto yy501;
+                       case 63:        goto yy503;
+                       case 64:        goto yy508;
+                       case 65:        goto yy513;
+                       case 66:        goto yy518;
+                       case 67:        goto yy521;
+                       case 68:        goto yy523;
+                       case 69:        goto yy530;
+                       case 70:        goto yy532;
+                       case 71:        goto yy534;
+                       case 72:        goto yy536;
+                       case 73:        goto yy541;
+                       case 74:        goto yy543;
+                       case 75:        goto yy547;
+                       case 76:        goto yy549;
+                       case 77:        goto yy551;
+                       case 78:        goto yy553;
+                       case 79:        goto yy563;
+                       case 80:        goto yy565;
+                       case 81:        goto yy573;
+                       case 82:        goto yy577;
+                       case 83:        goto yy581;
+                       case 84:        goto yy585;
+                       case 85:        goto yy587;
+                       default:        goto yy592;
                        }
 yy107:
                        yych = *++cur;
                        switch (yych) {
-                       case '.':       goto yy194;
+                       case '.':       goto yy193;
                        default:        goto yy106;
                        }
 yy108:
-                       yyaccept = 7;
+                       yyaccept = 6;
                        mrk = ++cur;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -1463,29 +1467,29 @@ yy108:
                        case '8':
                        case '9':       goto yy108;
                        case 'D':
-                       case 'd':       goto yy196;
+                       case 'd':       goto yy195;
                        case 'F':
-                       case 'f':       goto yy197;
+                       case 'f':       goto yy196;
                        case 'L':
-                       case 'l':       goto yy199;
+                       case 'l':       goto yy198;
                        default:        goto yy110;
                        }
 yy110:
-#line 322 "src/parser.re"
+#line 312 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT; goto start; }
-#line 1477 "src/parser.c"
+#line 1481 "src/parser.c"
 yy111:
                        ++cur;
-#line 329 "src/parser.re"
+#line 326 "src/parser.re"
                        { goto comment; }
-#line 1482 "src/parser.c"
+#line 1486 "src/parser.c"
 yy113:
                        ++cur;
-#line 330 "src/parser.re"
+#line 327 "src/parser.re"
                        { goto comment_sl; }
-#line 1487 "src/parser.c"
+#line 1491 "src/parser.c"
 yy115:
-                       yyaccept = 7;
+                       yyaccept = 6;
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -1502,13 +1506,13 @@ yy115:
                        case '8':
                        case '9':       goto yy115;
                        case 'D':
-                       case 'd':       goto yy196;
+                       case 'd':       goto yy195;
                        case 'E':
                        case 'e':       goto yy119;
                        case 'F':
-                       case 'f':       goto yy197;
+                       case 'f':       goto yy196;
                        case 'L':
-                       case 'l':       goto yy199;
+                       case 'l':       goto yy198;
                        default:        goto yy110;
                        }
 yy117:
@@ -1529,7 +1533,7 @@ yy117:
                        case 'l':       goto yy120;
                        case 'U':
                        case 'u':       goto yy122;
-                       default:        goto yy37;
+                       default:        goto yy39;
                        }
 yy119:
                        yych = *++cur;
@@ -1549,32 +1553,32 @@ yy119:
                        default:        goto yy106;
                        }
 yy120:
-                       yyaccept = 8;
+                       yyaccept = 7;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy201;
+                       case 'l':       goto yy200;
                        case 'U':
-                       case 'u':       goto yy202;
+                       case 'u':       goto yy201;
                        default:        goto yy121;
                        }
 yy121:
                        cur = ctxmrk;
-#line 318 "src/parser.re"
+#line 308 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_L; cur += 1; goto start; }
-#line 1566 "src/parser.c"
+#line 1570 "src/parser.c"
 yy122:
                        ++cur;
                        switch ((yych = *cur)) {
                        case 'L':
-                       case 'l':       goto yy204;
+                       case 'l':       goto yy203;
                        default:        goto yy123;
                        }
 yy123:
                        cur = ctxmrk;
-#line 317 "src/parser.re"
+#line 307 "src/parser.re"
                        { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_U; cur += 1; goto start; }
-#line 1578 "src/parser.c"
+#line 1582 "src/parser.c"
 yy124:
                        yych = *++cur;
                        switch (yych) {
@@ -1599,7 +1603,7 @@ yy124:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy205;
+                       case 'f':       goto yy204;
                        default:        goto yy106;
                        }
 yy125:
@@ -1673,41 +1677,41 @@ yy125:
                        case 'x':
                        case 'y':
                        case 'z':       goto yy125;
-                       case '>':       goto yy207;
+                       case '>':       goto yy206;
                        default:        goto yy106;
                        }
 yy127:
                        ++cur;
-#line 357 "src/parser.re"
+#line 356 "src/parser.re"
                        { NEWTOKEN(PSI_T_LSHIFT); goto start; }
-#line 1684 "src/parser.c"
+#line 1688 "src/parser.c"
 yy129:
                        ++cur;
-#line 359 "src/parser.re"
+#line 358 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_LE); goto start; }
-#line 1689 "src/parser.c"
+#line 1693 "src/parser.c"
 yy131:
                        ++cur;
-#line 342 "src/parser.re"
+#line 341 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_EQ); goto start; }
-#line 1694 "src/parser.c"
+#line 1698 "src/parser.c"
 yy133:
                        ++cur;
-#line 360 "src/parser.re"
+#line 359 "src/parser.re"
                        { NEWTOKEN(PSI_T_CMP_GE); goto start; }
-#line 1699 "src/parser.c"
+#line 1703 "src/parser.c"
 yy135:
                        ++cur;
-#line 358 "src/parser.re"
+#line 357 "src/parser.re"
                        { NEWTOKEN(PSI_T_RSHIFT); goto start; }
-#line 1704 "src/parser.c"
+#line 1708 "src/parser.c"
 yy137:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy209;
-                       default:        goto yy60;
+                       case 'r':       goto yy208;
+                       default:        goto yy62;
                        }
 yy138:
                        ++cur;
@@ -1789,120 +1793,120 @@ yy138:
                        case '}':
                        case '~':
                        case 0x7F:      goto yy106;
-                       default:        goto yy180;
+                       default:        goto yy182;
                        }
 yy139:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy210;
-                       default:        goto yy60;
+                       case 'o':       goto yy209;
+                       default:        goto yy62;
                        }
 yy140:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy211;
-                       default:        goto yy60;
+                       case 'l':       goto yy210;
+                       default:        goto yy62;
                        }
 yy141:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy212;
-                       default:        goto yy60;
+                       case 'a':       goto yy211;
+                       default:        goto yy62;
                        }
 yy142:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy213;
+                       case 'n':       goto yy212;
                        case 'U':
-                       case 'u':       goto yy214;
-                       default:        goto yy60;
+                       case 'u':       goto yy213;
+                       default:        goto yy62;
                        }
 yy143:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy215;
-                       default:        goto yy60;
+                       case 'f':       goto yy214;
+                       default:        goto yy62;
                        }
 yy144:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy216;
-                       default:        goto yy60;
+                       case 'u':       goto yy215;
+                       default:        goto yy62;
                        }
 yy145:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy217;
+                       case 'i':       goto yy216;
                        case 'S':
-                       case 's':       goto yy218;
-                       default:        goto yy60;
+                       case 's':       goto yy217;
+                       default:        goto yy62;
                        }
 yy146:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy219;
+                       case 'd':       goto yy218;
                        case 'U':
-                       case 'u':       goto yy220;
-                       default:        goto yy60;
+                       case 'u':       goto yy219;
+                       default:        goto yy62;
                        }
 yy147:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy221;
-                       default:        goto yy60;
+                       case 'r':       goto yy220;
+                       default:        goto yy62;
                        }
 yy148:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy222;
-                       default:        goto yy60;
+                       case 'l':       goto yy221;
+                       default:        goto yy62;
                        }
 yy149:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy223;
-                       default:        goto yy60;
+                       case 'o':       goto yy222;
+                       default:        goto yy62;
                        }
 yy150:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy224;
-                       default:        goto yy60;
+                       case 'e':       goto yy223;
+                       default:        goto yy62;
                        }
 yy151:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy225;
-                       default:        goto yy60;
+                       case 'n':       goto yy224;
+                       default:        goto yy62;
                        }
 yy152:
-                       yyaccept = 9;
+                       yyaccept = 8;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -1970,229 +1974,229 @@ yy152:
                        case '~':
                        case 0x7F:      goto yy153;
                        case 'D':
-                       case 'd':       goto yy226;
+                       case 'd':       goto yy225;
                        case 'N':
-                       case 'n':       goto yy227;
+                       case 'n':       goto yy226;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
 yy153:
-#line 368 "src/parser.re"
+#line 371 "src/parser.re"
                        { NEWTOKEN(PSI_T_IF); goto start; }
-#line 1983 "src/parser.c"
+#line 1987 "src/parser.c"
 yy154:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy228;
+                       case 'c':       goto yy227;
                        case 'T':
-                       case 't':       goto yy229;
-                       default:        goto yy60;
+                       case 't':       goto yy228;
+                       default:        goto yy62;
                        }
 yy155:
-                       yych = *++cur;
-                       switch (yych) {
-                       case '"':       goto yy106;
-                       default:        goto yy96;
-                       }
-yy156:
-                       yych = *++cur;
-                       switch (yych) {
-                       case '\'':      goto yy106;
-                       default:        goto yy103;
-                       }
+                       ++cur;
+                       cur = ctxmrk;
+#line 324 "src/parser.re"
+                       { char_width = SIZEOF_WCHAR_T/8; }
+#line 2003 "src/parser.c"
 yy157:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy231;
-                       default:        goto yy60;
+                       case 't':       goto yy230;
+                       default:        goto yy62;
                        }
 yy158:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy233;
-                       default:        goto yy60;
+                       case 'b':       goto yy232;
+                       default:        goto yy62;
                        }
 yy159:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy235;
-                       default:        goto yy60;
+                       case 'n':       goto yy234;
+                       default:        goto yy62;
                        }
 yy160:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'X':
-                       case 'x':       goto yy236;
-                       default:        goto yy60;
+                       case 'x':       goto yy235;
+                       default:        goto yy62;
                        }
 yy161:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy237;
-                       default:        goto yy60;
+                       case 'l':       goto yy236;
+                       default:        goto yy62;
                        }
 yy162:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy238;
-                       default:        goto yy60;
+                       case 'j':       goto yy237;
+                       default:        goto yy62;
                        }
 yy163:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy239;
-                       default:        goto yy60;
+                       case 't':       goto yy238;
+                       default:        goto yy62;
                        }
 yy164:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy240;
-                       default:        goto yy60;
+                       case 's':       goto yy239;
+                       default:        goto yy62;
                        }
 yy165:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy241;
-                       default:        goto yy60;
+                       case 'e':       goto yy240;
+                       default:        goto yy62;
                        }
 yy166:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy242;
-                       default:        goto yy60;
+                       case 't':       goto yy241;
+                       default:        goto yy62;
                        }
 yy167:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy243;
-                       default:        goto yy60;
+                       case 't':       goto yy242;
+                       default:        goto yy62;
                        }
 yy168:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy245;
-                       default:        goto yy60;
+                       case 'o':       goto yy244;
+                       default:        goto yy62;
                        }
 yy169:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy246;
-                       default:        goto yy60;
+                       case 'g':       goto yy245;
+                       default:        goto yy62;
                        }
 yy170:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy247;
+                       case 'a':       goto yy246;
                        case 'R':
-                       case 'r':       goto yy248;
-                       default:        goto yy60;
+                       case 'r':       goto yy247;
+                       default:        goto yy62;
                        }
 yy171:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'M':
-                       case 'm':       goto yy249;
-                       default:        goto yy60;
+                       case 'm':       goto yy248;
+                       default:        goto yy62;
                        }
 yy172:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy250;
-                       default:        goto yy60;
+                       case '_':       goto yy249;
+                       default:        goto yy62;
                        }
 yy173:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy251;
-                       default:        goto yy60;
+                       case 'u':       goto yy250;
+                       default:        goto yy62;
                        }
 yy174:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'P':
-                       case 'p':       goto yy252;
-                       default:        goto yy60;
+                       case 'p':       goto yy251;
+                       default:        goto yy62;
                        }
 yy175:
-                       yyaccept = 6;
+                       ++cur;
+                       cur = ctxmrk;
+#line 323 "src/parser.re"
+                       { char_width = 4; }
+#line 2154 "src/parser.c"
+yy177:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy253;
-                       default:        goto yy60;
+                       case 'n':       goto yy252;
+                       default:        goto yy62;
                        }
-yy176:
-                       yyaccept = 6;
+yy178:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy254;
+                       case 'd':       goto yy253;
                        case 'I':
-                       case 'i':       goto yy255;
+                       case 'i':       goto yy254;
                        case 'S':
-                       case 's':       goto yy256;
-                       default:        goto yy60;
+                       case 's':       goto yy255;
+                       default:        goto yy62;
                        }
-yy177:
-                       yyaccept = 6;
+yy179:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy257;
-                       default:        goto yy60;
+                       case 'i':       goto yy256;
+                       default:        goto yy62;
                        }
-yy178:
-                       yyaccept = 6;
+yy180:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy258;
-                       default:        goto yy60;
+                       case 'r':       goto yy257;
+                       default:        goto yy62;
                        }
-yy179:
-                       yyaccept = 6;
+yy181:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy259;
-                       default:        goto yy60;
+                       case 'a':       goto yy258;
+                       default:        goto yy62;
                        }
-yy180:
-                       yyaccept = 10;
+yy182:
+                       yyaccept = 9;
                        mrk = ++cur;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -2260,119 +2264,117 @@ yy180:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy182;
+                       case 0x7F:      goto yy184;
                        case '\\':      goto yy138;
-                       default:        goto yy180;
+                       default:        goto yy182;
                        }
-yy182:
-#line 441 "src/parser.re"
+yy184:
+#line 444 "src/parser.re"
                        { NEWTOKEN(PSI_T_NSNAME); goto start; }
-#line 2271 "src/parser.c"
-yy183:
-                       yyaccept = 6;
+#line 2275 "src/parser.c"
+yy185:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy260;
-                       default:        goto yy60;
+                       case 'a':       goto yy259;
+                       case 'e':       goto yy260;
+                       case 'r':       goto yy261;
+                       default:        goto yy62;
                        }
-yy184:
-                       yyaccept = 6;
+yy186:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'c':       goto yy261;
-                       default:        goto yy60;
+                       case 'B':
+                       case 'b':       goto yy232;
+                       case 'n':       goto yy262;
+                       default:        goto yy62;
                        }
-yy185:
-                       yyaccept = 6;
+yy187:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy241;
-                       case 'a':       goto yy262;
-                       default:        goto yy60;
+                       case 'e':       goto yy240;
+                       case 'a':       goto yy263;
+                       default:        goto yy62;
                        }
-yy186:
-                       ++cur;
-#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"
+                       cur = ctxmrk;
+#line 322 "src/parser.re"
+                       { char_width = 2; }
+#line 2308 "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;
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       ctxmrk = cur;
                        switch (yych) {
-                       case '\'':      goto yy263;
-                       case '\\':      goto yy192;
-                       default:        goto yy103;
+                       case '"':       goto yy264;
+                       default:        goto yy62;
                        }
-yy194:
+yy191:
                        ++cur;
-#line 364 "src/parser.re"
+#line 343 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OR); goto start; }
+#line 2321 "src/parser.c"
+yy193:
+                       ++cur;
+#line 363 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELLIPSIS); goto start; }
-#line 2324 "src/parser.c"
-yy196:
+#line 2326 "src/parser.c"
+yy195:
                        yych = *++cur;
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy264;
+                       case 'd':       goto yy266;
                        case 'F':
-                       case 'f':       goto yy266;
+                       case 'f':       goto yy268;
                        case 'L':
-                       case 'l':       goto yy268;
+                       case 'l':       goto yy270;
                        default:        goto yy106;
                        }
-yy197:
+yy196:
                        ++cur;
                        cur = ctxmrk;
-#line 323 "src/parser.re"
+#line 313 "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:
+#line 2343 "src/parser.c"
+yy198:
                        ++cur;
                        cur = ctxmrk;
-#line 324 "src/parser.re"
+#line 314 "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:
+#line 2349 "src/parser.c"
+yy200:
                        yych = *++cur;
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy270;
+                       case 'u':       goto yy272;
                        default:        goto yy106;
                        }
-yy202:
+yy201:
                        ++cur;
-yy203:
+yy202:
                        cur = ctxmrk;
-#line 319 "src/parser.re"
+#line 309 "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:
+#line 2363 "src/parser.c"
+yy203:
                        yych = *++cur;
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy270;
-                       default:        goto yy203;
+                       case 'l':       goto yy272;
+                       default:        goto yy202;
                        }
-yy205:
-                       yyaccept = 4;
+yy204:
+                       yyaccept = 3;
                        mrk = ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
                        ctxmrk = cur;
                        switch (yych) {
-                       case '.':       goto yy272;
+                       case '.':       goto yy274;
                        case '0':
                        case '1':
                        case '2':
@@ -2394,184 +2396,184 @@ yy205:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy205;
+                       case 'f':       goto yy204;
                        case 'L':
                        case 'l':       goto yy120;
                        case 'P':
                        case 'p':       goto yy119;
                        case 'U':
                        case 'u':       goto yy122;
-                       default:        goto yy37;
+                       default:        goto yy39;
                        }
-yy207:
+yy206:
                        ++cur;
-#line 445 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CPP_HEADER); goto start; }
-#line 2411 "src/parser.c"
-yy209:
-                       yyaccept = 6;
+#line 446 "src/parser.re"
+                       { tok += 1; cur -= 1; NEWTOKEN(PSI_T_CPP_HEADER); cur += 1; goto start; }
+#line 2413 "src/parser.c"
+yy208:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy274;
+                       case 'a':       goto yy276;
                        case 'V':
-                       case 'v':       goto yy275;
-                       default:        goto yy60;
+                       case 'v':       goto yy277;
+                       default:        goto yy62;
                        }
-yy210:
-                       yyaccept = 6;
+yy209:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy276;
-                       default:        goto yy60;
+                       case 'l':       goto yy278;
+                       default:        goto yy62;
                        }
-yy211:
-                       yyaccept = 6;
+yy210:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy278;
-                       default:        goto yy60;
+                       case 'l':       goto yy280;
+                       default:        goto yy62;
                        }
-yy212:
-                       yyaccept = 6;
+yy211:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy279;
-                       default:        goto yy60;
+                       case 'r':       goto yy281;
+                       default:        goto yy62;
                        }
-yy213:
-                       yyaccept = 6;
+yy212:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy281;
-                       default:        goto yy60;
+                       case 's':       goto yy283;
+                       default:        goto yy62;
                        }
-yy214:
-                       yyaccept = 6;
+yy213:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy282;
-                       default:        goto yy60;
+                       case 'n':       goto yy284;
+                       default:        goto yy62;
                        }
-yy215:
-                       yyaccept = 6;
+yy214:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy283;
-                       default:        goto yy60;
+                       case 'i':       goto yy285;
+                       default:        goto yy62;
                        }
-yy216:
-                       yyaccept = 6;
+yy215:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy284;
-                       default:        goto yy60;
+                       case 'b':       goto yy286;
+                       default:        goto yy62;
                        }
-yy217:
-                       yyaccept = 6;
+yy216:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy285;
-                       default:        goto yy60;
+                       case 'f':       goto yy287;
+                       default:        goto yy62;
                        }
-yy218:
-                       yyaccept = 6;
+yy217:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy287;
-                       default:        goto yy60;
+                       case 'e':       goto yy289;
+                       default:        goto yy62;
                        }
-yy219:
-                       yyaccept = 6;
+yy218:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy289;
-                       default:        goto yy60;
+                       case 'i':       goto yy291;
+                       default:        goto yy62;
                        }
-yy220:
-                       yyaccept = 6;
+yy219:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'M':
-                       case 'm':       goto yy290;
-                       default:        goto yy60;
+                       case 'm':       goto yy292;
+                       default:        goto yy62;
                        }
-yy221:
-                       yyaccept = 6;
+yy220:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy292;
-                       default:        goto yy60;
+                       case 'o':       goto yy294;
+                       default:        goto yy62;
                        }
-yy222:
-                       yyaccept = 6;
+yy221:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy293;
-                       default:        goto yy60;
+                       case 's':       goto yy295;
+                       default:        goto yy62;
                        }
-yy223:
-                       yyaccept = 6;
+yy222:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy294;
-                       default:        goto yy60;
+                       case 'a':       goto yy296;
+                       default:        goto yy62;
                        }
-yy224:
-                       yyaccept = 6;
+yy223:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy295;
-                       default:        goto yy60;
+                       case 'e':       goto yy297;
+                       default:        goto yy62;
                        }
-yy225:
-                       yyaccept = 6;
+yy224:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy297;
-                       default:        goto yy60;
+                       case 'c':       goto yy299;
+                       default:        goto yy62;
                        }
-yy226:
-                       yyaccept = 6;
+yy225:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy298;
-                       default:        goto yy60;
+                       case 'e':       goto yy300;
+                       default:        goto yy62;
                        }
-yy227:
-                       yyaccept = 6;
+yy226:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy299;
-                       default:        goto yy60;
+                       case 'd':       goto yy301;
+                       default:        goto yy62;
                        }
-yy228:
-                       yyaccept = 6;
+yy227:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy300;
-                       default:        goto yy60;
+                       case 'l':       goto yy302;
+                       default:        goto yy62;
                        }
-yy229:
-                       yyaccept = 11;
+yy228:
+                       yyaccept = 10;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -2637,22 +2639,22 @@ yy229:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy230;
-                       case '1':       goto yy301;
-                       case '3':       goto yy302;
-                       case '6':       goto yy303;
-                       case '8':       goto yy304;
+                       case 0x7F:      goto yy229;
+                       case '1':       goto yy303;
+                       case '3':       goto yy304;
+                       case '6':       goto yy305;
+                       case '8':       goto yy306;
                        case 'V':
-                       case 'v':       goto yy305;
+                       case 'v':       goto yy307;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy230:
-#line 390 "src/parser.re"
+yy229:
+#line 393 "src/parser.re"
                        { NEWTOKEN(PSI_T_INT); goto start; }
-#line 2654 "src/parser.c"
-yy231:
-                       yyaccept = 12;
+#line 2656 "src/parser.c"
+yy230:
+                       yyaccept = 11;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -2718,16 +2720,16 @@ yy231:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy232;
+                       case 0x7F:      goto yy231;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy232:
-#line 416 "src/parser.re"
+yy231:
+#line 419 "src/parser.re"
                        { NEWTOKEN(PSI_T_LET); goto start; }
-#line 2729 "src/parser.c"
-yy233:
-                       yyaccept = 13;
+#line 2731 "src/parser.c"
+yy232:
+                       yyaccept = 12;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -2793,81 +2795,81 @@ yy233:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy234;
+                       case 0x7F:      goto yy233;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy234:
-#line 415 "src/parser.re"
+yy233:
+#line 418 "src/parser.re"
                        { NEWTOKEN(PSI_T_LIB); goto start; }
-#line 2804 "src/parser.c"
-yy235:
-                       yyaccept = 6;
+#line 2806 "src/parser.c"
+yy234:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy306;
-                       default:        goto yy60;
+                       case 'g':       goto yy308;
+                       default:        goto yy62;
                        }
-yy236:
-                       yyaccept = 6;
+yy235:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy308;
-                       default:        goto yy60;
+                       case 'e':       goto yy310;
+                       default:        goto yy62;
                        }
-yy237:
-                       yyaccept = 6;
+yy236:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy309;
-                       default:        goto yy60;
+                       case 'l':       goto yy311;
+                       default:        goto yy62;
                        }
-yy238:
-                       yyaccept = 6;
+yy237:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy311;
+                       case 'e':       goto yy313;
                        case 'V':
-                       case 'v':       goto yy312;
-                       default:        goto yy60;
+                       case 'v':       goto yy314;
+                       default:        goto yy62;
                        }
-yy239:
-                       yyaccept = 6;
+yy238:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'H':
-                       case 'h':       goto yy313;
-                       default:        goto yy60;
+                       case 'h':       goto yy315;
+                       default:        goto yy62;
                        }
-yy240:
-                       yyaccept = 6;
+yy239:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy314;
-                       default:        goto yy60;
+                       case 't':       goto yy316;
+                       default:        goto yy62;
                        }
-yy241:
-                       yyaccept = 6;
+yy240:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy315;
-                       default:        goto yy60;
+                       case '_':       goto yy317;
+                       default:        goto yy62;
                        }
-yy242:
-                       yyaccept = 6;
+yy241:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy316;
-                       default:        goto yy60;
+                       case 'u':       goto yy318;
+                       default:        goto yy62;
                        }
-yy243:
-                       yyaccept = 14;
+yy242:
+                       yyaccept = 13;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -2933,205 +2935,217 @@ yy243:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy244;
+                       case 0x7F:      goto yy243;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy244:
-#line 417 "src/parser.re"
+yy243:
+#line 420 "src/parser.re"
                        { NEWTOKEN(PSI_T_SET); goto start; }
-#line 2944 "src/parser.c"
-yy245:
-                       yyaccept = 6;
+#line 2946 "src/parser.c"
+yy244:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy317;
-                       default:        goto yy60;
+                       case 'r':       goto yy319;
+                       default:        goto yy62;
                        }
-yy246:
-                       yyaccept = 6;
+yy245:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy318;
-                       default:        goto yy60;
+                       case 'n':       goto yy320;
+                       default:        goto yy62;
                        }
-yy247:
-                       yyaccept = 6;
+yy246:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy319;
-                       default:        goto yy60;
+                       case 't':       goto yy321;
+                       default:        goto yy62;
                        }
-yy248:
-                       yyaccept = 6;
+yy247:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy320;
+                       case 'i':       goto yy322;
                        case 'L':
-                       case 'l':       goto yy321;
+                       case 'l':       goto yy323;
                        case 'U':
-                       case 'u':       goto yy322;
+                       case 'u':       goto yy324;
                        case 'V':
-                       case 'v':       goto yy323;
-                       default:        goto yy60;
+                       case 'v':       goto yy325;
+                       default:        goto yy62;
                        }
-yy249:
-                       yyaccept = 6;
+yy248:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'P':
-                       case 'p':       goto yy324;
-                       default:        goto yy60;
+                       case 'p':       goto yy326;
+                       default:        goto yy62;
                        }
-yy250:
-                       yyaccept = 6;
+yy249:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy326;
+                       case 'a':       goto yy328;
                        case 'B':
-                       case 'b':       goto yy327;
+                       case 'b':       goto yy329;
                        case 'F':
-                       case 'f':       goto yy328;
+                       case 'f':       goto yy330;
                        case 'I':
-                       case 'i':       goto yy329;
+                       case 'i':       goto yy331;
                        case 'O':
-                       case 'o':       goto yy330;
+                       case 'o':       goto yy332;
                        case 'S':
-                       case 's':       goto yy331;
-                       default:        goto yy60;
+                       case 's':       goto yy333;
+                       default:        goto yy62;
+                       }
+yy250:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy334;
+                       default:        goto yy62;
                        }
 yy251:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy332;
-                       default:        goto yy60;
+                       case 'e':       goto yy336;
+                       default:        goto yy62;
                        }
 yy252:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy334;
-                       default:        goto yy60;
+                       case 'T':
+                       case 't':       goto yy337;
+                       default:        goto yy62;
                        }
 yy253:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy335;
-                       default:        goto yy60;
+                       case 'E':
+                       case 'e':       goto yy338;
+                       default:        goto yy62;
                        }
 yy254:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy336;
-                       default:        goto yy60;
+                       case 'O':
+                       case 'o':       goto yy339;
+                       default:        goto yy62;
                        }
 yy255:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy337;
-                       default:        goto yy60;
+                       case 'I':
+                       case 'i':       goto yy340;
+                       default:        goto yy62;
                        }
 yy256:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy338;
-                       default:        goto yy60;
+                       case 'D':
+                       case 'd':       goto yy341;
+                       default:        goto yy62;
                        }
 yy257:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy339;
-                       default:        goto yy60;
+                       case 'N':
+                       case 'n':       goto yy343;
+                       default:        goto yy62;
                        }
 yy258:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy341;
-                       default:        goto yy60;
+                       case 'L':
+                       case 'l':       goto yy344;
+                       default:        goto yy62;
                        }
 yy259:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy342;
-                       default:        goto yy60;
+                       case 's':       goto yy346;
+                       case 't':       goto yy347;
+                       default:        goto yy62;
                        }
 yy260:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy344;
-                       default:        goto yy60;
+                       case 'x':       goto yy348;
+                       default:        goto yy62;
                        }
 yy261:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'e':       goto yy345;
-                       default:        goto yy60;
+                       case 'e':       goto yy349;
+                       default:        goto yy62;
                        }
 yy262:
-                       yyaccept = 6;
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'g':       goto yy347;
-                       default:        goto yy60;
+                       case 'e':       goto yy350;
+                       default:        goto yy62;
                        }
 yy263:
-                       yyaccept = 15;
-                       mrk = ++cur;
-                       if (lim <= cur) if (cur >= lim) goto done;;
-                       yych = *cur;
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '\'':      goto yy190;
-                       default:        goto yy103;
+                       case 'g':       goto yy352;
+                       default:        goto yy62;
                        }
 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"
+#line 321 "src/parser.re"
+                       { char_width = 1; }
+#line 3124 "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"
+#line 316 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DD; cur += 2; goto start; }
+#line 3130 "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"
+#line 315 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DF; cur += 2; goto start; }
+#line 3136 "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"
+#line 317 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DL; cur += 2; goto start; }
+#line 3142 "src/parser.c"
 yy272:
+                       ++cur;
+                       cur = ctxmrk;
+#line 310 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_ULL; cur += 3; goto start; }
+#line 3148 "src/parser.c"
+yy274:
                        ++cur;
                        if ((lim - cur) < 3) if (cur >= lim) goto done;;
                        yych = *cur;
@@ -3157,29 +3171,29 @@ yy272:
                        case 'c':
                        case 'd':
                        case 'e':
-                       case 'f':       goto yy272;
+                       case 'f':       goto yy274;
                        case 'P':
                        case 'p':       goto yy119;
                        default:        goto yy106;
                        }
-yy274:
-                       yyaccept = 6;
+yy276:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy348;
-                       default:        goto yy60;
+                       case 'y':       goto yy353;
+                       default:        goto yy62;
                        }
-yy275:
-                       yyaccept = 6;
+yy277:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy350;
-                       default:        goto yy60;
+                       case 'a':       goto yy355;
+                       default:        goto yy62;
                        }
-yy276:
-                       yyaccept = 16;
+yy278:
+                       yyaccept = 14;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3245,30 +3259,30 @@ yy276:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy277;
+                       case 0x7F:      goto yy279;
                        case 'V':
-                       case 'v':       goto yy351;
+                       case 'v':       goto yy356;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy277:
-#line 387 "src/parser.re"
+yy279:
+#line 390 "src/parser.re"
                        { NEWTOKEN(PSI_T_BOOL); goto start; }
-#line 3258 "src/parser.c"
-yy278:
-                       yyaccept = 6;
+#line 3272 "src/parser.c"
+yy280:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy352;
+                       case 'a':       goto yy357;
                        case 'B':
-                       case 'b':       goto yy353;
+                       case 'b':       goto yy358;
                        case 'O':
-                       case 'o':       goto yy354;
-                       default:        goto yy60;
+                       case 'o':       goto yy359;
+                       default:        goto yy62;
                        }
-yy279:
-                       yyaccept = 17;
+yy281:
+                       yyaccept = 15;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3334,48 +3348,48 @@ yy279:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy280;
+                       case 0x7F:      goto yy282;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy280:
-#line 388 "src/parser.re"
+yy282:
+#line 391 "src/parser.re"
                        { NEWTOKEN(PSI_T_CHAR); goto start; }
-#line 3345 "src/parser.c"
-yy281:
-                       yyaccept = 6;
+#line 3359 "src/parser.c"
+yy283:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy355;
-                       default:        goto yy60;
+                       case 't':       goto yy360;
+                       default:        goto yy62;
                        }
-yy282:
-                       yyaccept = 6;
+yy284:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy357;
-                       default:        goto yy60;
+                       case 't':       goto yy362;
+                       default:        goto yy62;
                        }
-yy283:
-                       yyaccept = 6;
+yy285:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy359;
-                       default:        goto yy60;
+                       case 'n':       goto yy364;
+                       default:        goto yy62;
                        }
-yy284:
-                       yyaccept = 6;
+yy286:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy360;
-                       default:        goto yy60;
+                       case 'l':       goto yy365;
+                       default:        goto yy62;
                        }
-yy285:
-                       yyaccept = 18;
+yy287:
+                       yyaccept = 16;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3441,16 +3455,16 @@ yy285:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy286;
+                       case 0x7F:      goto yy288;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy286:
-#line 372 "src/parser.re"
+yy288:
+#line 375 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELIF); goto start; }
-#line 3452 "src/parser.c"
-yy287:
-                       yyaccept = 19;
+#line 3466 "src/parser.c"
+yy289:
+                       yyaccept = 17;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3516,24 +3530,24 @@ yy287:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy288;
+                       case 0x7F:      goto yy290;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy288:
-#line 371 "src/parser.re"
+yy290:
+#line 374 "src/parser.re"
                        { NEWTOKEN(PSI_T_ELSE); goto start; }
-#line 3527 "src/parser.c"
-yy289:
-                       yyaccept = 6;
+#line 3541 "src/parser.c"
+yy291:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy361;
-                       default:        goto yy60;
+                       case 'f':       goto yy366;
+                       default:        goto yy62;
                        }
-yy290:
-                       yyaccept = 20;
+yy292:
+                       yyaccept = 18;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3599,40 +3613,40 @@ yy290:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy291;
+                       case 0x7F:      goto yy293;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy291:
-#line 413 "src/parser.re"
+yy293:
+#line 416 "src/parser.re"
                        { NEWTOKEN(PSI_T_ENUM); goto start; }
-#line 3610 "src/parser.c"
-yy292:
-                       yyaccept = 6;
+#line 3624 "src/parser.c"
+yy294:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy363;
-                       default:        goto yy60;
+                       case 'r':       goto yy368;
+                       default:        goto yy62;
                        }
-yy293:
-                       yyaccept = 6;
+yy295:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy365;
-                       default:        goto yy60;
+                       case 'e':       goto yy370;
+                       default:        goto yy62;
                        }
-yy294:
-                       yyaccept = 6;
+yy296:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy367;
-                       default:        goto yy60;
+                       case 't':       goto yy372;
+                       default:        goto yy62;
                        }
-yy295:
-                       yyaccept = 21;
+yy297:
+                       yyaccept = 19;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3698,84 +3712,84 @@ yy295:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy296;
+                       case 0x7F:      goto yy298;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy296:
-#line 421 "src/parser.re"
+yy298:
+#line 424 "src/parser.re"
                        { NEWTOKEN(PSI_T_FREE); goto start; }
-#line 3709 "src/parser.c"
-yy297:
-                       yyaccept = 6;
+#line 3723 "src/parser.c"
+yy299:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy369;
-                       default:        goto yy60;
+                       case 't':       goto yy374;
+                       default:        goto yy62;
                        }
-yy298:
-                       yyaccept = 6;
+yy300:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy370;
-                       default:        goto yy60;
+                       case 'f':       goto yy375;
+                       default:        goto yy62;
                        }
-yy299:
-                       yyaccept = 6;
+yy301:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy372;
-                       default:        goto yy60;
+                       case 'e':       goto yy377;
+                       default:        goto yy62;
                        }
-yy300:
-                       yyaccept = 6;
+yy302:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy373;
-                       default:        goto yy60;
+                       case 'u':       goto yy378;
+                       default:        goto yy62;
                        }
-yy301:
-                       yyaccept = 6;
+yy303:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '6':       goto yy374;
-                       default:        goto yy60;
+                       case '6':       goto yy379;
+                       default:        goto yy62;
                        }
-yy302:
-                       yyaccept = 6;
+yy304:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '2':       goto yy375;
-                       default:        goto yy60;
+                       case '2':       goto yy380;
+                       default:        goto yy62;
                        }
-yy303:
-                       yyaccept = 6;
+yy305:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '4':       goto yy376;
-                       default:        goto yy60;
+                       case '4':       goto yy381;
+                       default:        goto yy62;
                        }
-yy304:
-                       yyaccept = 6;
+yy306:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy377;
-                       default:        goto yy60;
+                       case '_':       goto yy382;
+                       default:        goto yy62;
                        }
-yy305:
-                       yyaccept = 6;
+yy307:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy378;
-                       default:        goto yy60;
+                       case 'a':       goto yy383;
+                       default:        goto yy62;
                        }
-yy306:
-                       yyaccept = 22;
+yy308:
+                       yyaccept = 20;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3841,24 +3855,24 @@ yy306:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy307;
+                       case 0x7F:      goto yy309;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy307:
-#line 391 "src/parser.re"
+yy309:
+#line 394 "src/parser.re"
                        { NEWTOKEN(PSI_T_LONG); goto start; }
-#line 3852 "src/parser.c"
-yy308:
-                       yyaccept = 6;
+#line 3866 "src/parser.c"
+yy310:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy379;
-                       default:        goto yy60;
+                       case 'd':       goto yy384;
+                       default:        goto yy62;
                        }
-yy309:
-                       yyaccept = 23;
+yy311:
+                       yyaccept = 21;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -3924,119 +3938,119 @@ yy309:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy310;
+                       case 0x7F:      goto yy312;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy310:
-#line 383 "src/parser.re"
+yy312:
+#line 386 "src/parser.re"
                        { NEWTOKEN(PSI_T_NULL); goto start; }
-#line 3935 "src/parser.c"
-yy311:
-                       yyaccept = 6;
+#line 3949 "src/parser.c"
+yy313:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy381;
-                       default:        goto yy60;
+                       case 'c':       goto yy386;
+                       default:        goto yy62;
                        }
-yy312:
-                       yyaccept = 6;
+yy314:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy382;
-                       default:        goto yy60;
+                       case 'a':       goto yy387;
+                       default:        goto yy62;
                        }
-yy313:
-                       yyaccept = 6;
+yy315:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy383;
-                       default:        goto yy60;
+                       case 'v':       goto yy388;
+                       default:        goto yy62;
                        }
-yy314:
-                       yyaccept = 6;
+yy316:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy384;
-                       default:        goto yy60;
+                       case '_':       goto yy389;
+                       default:        goto yy62;
                        }
-yy315:
-                       yyaccept = 6;
+yy317:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy385;
-                       default:        goto yy60;
+                       case 'a':       goto yy390;
+                       default:        goto yy62;
                        }
-yy316:
-                       yyaccept = 6;
+yy318:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy386;
-                       default:        goto yy60;
+                       case 'r':       goto yy391;
+                       default:        goto yy62;
                        }
-yy317:
-                       yyaccept = 6;
+yy319:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy387;
-                       default:        goto yy60;
+                       case 't':       goto yy392;
+                       default:        goto yy62;
                        }
-yy318:
-                       yyaccept = 6;
+yy320:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy389;
-                       default:        goto yy60;
+                       case 'e':       goto yy394;
+                       default:        goto yy62;
                        }
-yy319:
-                       yyaccept = 6;
+yy321:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy390;
-                       default:        goto yy60;
+                       case 'i':       goto yy395;
+                       default:        goto yy62;
                        }
-yy320:
-                       yyaccept = 6;
+yy322:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy391;
-                       default:        goto yy60;
+                       case 'n':       goto yy396;
+                       default:        goto yy62;
                        }
-yy321:
-                       yyaccept = 6;
+yy323:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy392;
-                       default:        goto yy60;
+                       case 'e':       goto yy397;
+                       default:        goto yy62;
                        }
-yy322:
-                       yyaccept = 6;
+yy324:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy393;
-                       default:        goto yy60;
+                       case 'c':       goto yy398;
+                       default:        goto yy62;
                        }
-yy323:
-                       yyaccept = 6;
+yy325:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy394;
-                       default:        goto yy60;
+                       case 'a':       goto yy399;
+                       default:        goto yy62;
                        }
-yy324:
-                       yyaccept = 24;
+yy326:
+                       yyaccept = 22;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4102,64 +4116,64 @@ yy324:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy325;
+                       case 0x7F:      goto yy327;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy325:
-#line 422 "src/parser.re"
+yy327:
+#line 425 "src/parser.re"
                        { NEWTOKEN(PSI_T_TEMP); goto start; }
-#line 4113 "src/parser.c"
-yy326:
-                       yyaccept = 6;
+#line 4127 "src/parser.c"
+yy328:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy395;
-                       default:        goto yy60;
+                       case 'r':       goto yy400;
+                       default:        goto yy62;
                        }
-yy327:
-                       yyaccept = 6;
+yy329:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy396;
-                       default:        goto yy60;
+                       case 'o':       goto yy401;
+                       default:        goto yy62;
                        }
-yy328:
-                       yyaccept = 6;
+yy330:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy397;
-                       default:        goto yy60;
+                       case 'l':       goto yy402;
+                       default:        goto yy62;
                        }
-yy329:
-                       yyaccept = 6;
+yy331:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy398;
-                       default:        goto yy60;
+                       case 'n':       goto yy403;
+                       default:        goto yy62;
                        }
-yy330:
-                       yyaccept = 6;
+yy332:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy399;
-                       default:        goto yy60;
+                       case 'b':       goto yy404;
+                       default:        goto yy62;
                        }
-yy331:
-                       yyaccept = 6;
+yy333:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy400;
-                       default:        goto yy60;
+                       case 't':       goto yy405;
+                       default:        goto yy62;
                        }
-yy332:
-                       yyaccept = 25;
+yy334:
+                       yyaccept = 23;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4225,58 +4239,58 @@ yy332:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy333;
+                       case 0x7F:      goto yy335;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy333:
-#line 381 "src/parser.re"
+yy335:
+#line 384 "src/parser.re"
                        { NEWTOKEN(PSI_T_TRUE); goto start; }
-#line 4236 "src/parser.c"
-yy334:
-                       yyaccept = 6;
+#line 4250 "src/parser.c"
+yy336:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy401;
-                       default:        goto yy60;
+                       case 'd':       goto yy406;
+                       default:        goto yy62;
                        }
-yy335:
-                       yyaccept = 6;
+yy337:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '1':       goto yy402;
-                       case '3':       goto yy403;
-                       case '6':       goto yy404;
-                       case '8':       goto yy405;
-                       default:        goto yy60;
+                       case '1':       goto yy407;
+                       case '3':       goto yy408;
+                       case '6':       goto yy409;
+                       case '8':       goto yy410;
+                       default:        goto yy62;
                        }
-yy336:
-                       yyaccept = 6;
+yy338:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy406;
-                       default:        goto yy60;
+                       case 'f':       goto yy411;
+                       default:        goto yy62;
                        }
-yy337:
-                       yyaccept = 6;
+yy339:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy408;
-                       default:        goto yy60;
+                       case 'n':       goto yy413;
+                       default:        goto yy62;
                        }
-yy338:
-                       yyaccept = 6;
+yy340:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy410;
-                       default:        goto yy60;
+                       case 'g':       goto yy415;
+                       default:        goto yy62;
                        }
-yy339:
-                       yyaccept = 26;
+yy341:
+                       yyaccept = 24;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4342,24 +4356,24 @@ yy339:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy340;
+                       case 0x7F:      goto yy342;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy340:
-#line 386 "src/parser.re"
+yy342:
+#line 389 "src/parser.re"
                        { NEWTOKEN(PSI_T_VOID); goto start; }
-#line 4353 "src/parser.c"
-yy341:
-                       yyaccept = 6;
+#line 4367 "src/parser.c"
+yy343:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy411;
-                       default:        goto yy60;
+                       case 'i':       goto yy416;
+                       default:        goto yy62;
                        }
-yy342:
-                       yyaccept = 27;
+yy344:
+                       yyaccept = 25;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4425,23 +4439,44 @@ yy342:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy343;
+                       case 0x7F:      goto yy345;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy343:
-#line 431 "src/parser.re"
+yy345:
+#line 434 "src/parser.re"
                        { NEWTOKEN(PSI_T_ZVAL); goto start; }
-#line 4436 "src/parser.c"
-yy344:
-                       yyaccept = 6;
+#line 4450 "src/parser.c"
+yy346:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 't':       goto yy412;
-                       default:        goto yy60;
+                       case 'm':       goto yy417;
+                       default:        goto yy62;
                        }
-yy345:
-                       yyaccept = 28;
+yy347:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy418;
+                       default:        goto yy62;
+                       }
+yy348:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy419;
+                       default:        goto yy62;
+                       }
+yy349:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 's':       goto yy420;
+                       default:        goto yy62;
+                       }
+yy350:
+                       yyaccept = 26;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4507,23 +4542,23 @@ yy345:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy346;
+                       case 0x7F:      goto yy351;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy346:
-#line 367 "src/parser.re"
-                       { NEWTOKEN(PSI_T_ONCE); goto start; }
-#line 4518 "src/parser.c"
-yy347:
-                       yyaccept = 6;
+yy351:
+#line 370 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LINE); goto start; }
+#line 4553 "src/parser.c"
+yy352:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'm':       goto yy413;
-                       default:        goto yy60;
+                       case 'm':       goto yy421;
+                       default:        goto yy62;
                        }
-yy348:
-                       yyaccept = 29;
+yy353:
+                       yyaccept = 27;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4589,56 +4624,56 @@ yy348:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy349;
+                       case 0x7F:      goto yy354;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy349:
-#line 405 "src/parser.re"
+yy354:
+#line 408 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRAY); goto start; }
-#line 4600 "src/parser.c"
-yy350:
-                       yyaccept = 6;
+#line 4635 "src/parser.c"
+yy355:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy414;
-                       default:        goto yy60;
+                       case 'l':       goto yy422;
+                       default:        goto yy62;
                        }
-yy351:
-                       yyaccept = 6;
+yy356:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy416;
-                       default:        goto yy60;
+                       case 'a':       goto yy424;
+                       default:        goto yy62;
                        }
-yy352:
-                       yyaccept = 6;
+yy357:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy417;
-                       default:        goto yy60;
+                       case 'b':       goto yy425;
+                       default:        goto yy62;
                        }
-yy353:
-                       yyaccept = 6;
+yy358:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy418;
-                       default:        goto yy60;
+                       case 'a':       goto yy426;
+                       default:        goto yy62;
                        }
-yy354:
-                       yyaccept = 6;
+yy359:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy419;
-                       default:        goto yy60;
+                       case 'c':       goto yy427;
+                       default:        goto yy62;
                        }
-yy355:
-                       yyaccept = 30;
+yy360:
+                       yyaccept = 28;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4704,16 +4739,16 @@ yy355:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy356;
+                       case 0x7F:      goto yy361;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy356:
-#line 414 "src/parser.re"
+yy361:
+#line 417 "src/parser.re"
                        { NEWTOKEN(PSI_T_CONST); goto start; }
-#line 4715 "src/parser.c"
-yy357:
-                       yyaccept = 31;
+#line 4750 "src/parser.c"
+yy362:
+                       yyaccept = 29;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4779,32 +4814,32 @@ yy357:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy358;
+                       case 0x7F:      goto yy363;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy358:
-#line 432 "src/parser.re"
+yy363:
+#line 435 "src/parser.re"
                        { NEWTOKEN(PSI_T_COUNT); goto start; }
-#line 4790 "src/parser.c"
-yy359:
-                       yyaccept = 6;
+#line 4825 "src/parser.c"
+yy364:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy421;
-                       default:        goto yy60;
+                       case 'e':       goto yy429;
+                       default:        goto yy62;
                        }
-yy360:
-                       yyaccept = 6;
+yy365:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy423;
-                       default:        goto yy60;
+                       case 'e':       goto yy431;
+                       default:        goto yy62;
                        }
-yy361:
-                       yyaccept = 32;
+yy366:
+                       yyaccept = 30;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4870,16 +4905,16 @@ yy361:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy362;
+                       case 0x7F:      goto yy367;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy362:
-#line 373 "src/parser.re"
+yy367:
+#line 376 "src/parser.re"
                        { NEWTOKEN(PSI_T_ENDIF); goto start; }
-#line 4881 "src/parser.c"
-yy363:
-                       yyaccept = 33;
+#line 4916 "src/parser.c"
+yy368:
+                       yyaccept = 31;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -4945,16 +4980,16 @@ yy363:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy364;
+                       case 0x7F:      goto yy369;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy364:
-#line 378 "src/parser.re"
+yy369:
+#line 381 "src/parser.re"
                        { NEWTOKEN(PSI_T_ERROR); goto start; }
-#line 4956 "src/parser.c"
-yy365:
-                       yyaccept = 34;
+#line 4991 "src/parser.c"
+yy370:
+                       yyaccept = 32;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5020,16 +5055,16 @@ yy365:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy366;
+                       case 0x7F:      goto yy371;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy366:
-#line 382 "src/parser.re"
+yy371:
+#line 385 "src/parser.re"
                        { NEWTOKEN(PSI_T_FALSE); goto start; }
-#line 5031 "src/parser.c"
-yy367:
-                       yyaccept = 35;
+#line 5066 "src/parser.c"
+yy372:
+                       yyaccept = 33;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5095,26 +5130,26 @@ yy367:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy368;
+                       case 0x7F:      goto yy373;
                        case 'V':
-                       case 'v':       goto yy425;
+                       case 'v':       goto yy433;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy368:
-#line 392 "src/parser.re"
+yy373:
+#line 395 "src/parser.re"
                        { NEWTOKEN(PSI_T_FLOAT); goto start; }
-#line 5108 "src/parser.c"
-yy369:
-                       yyaccept = 6;
+#line 5143 "src/parser.c"
+yy374:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy426;
-                       default:        goto yy60;
+                       case 'i':       goto yy434;
+                       default:        goto yy62;
                        }
-yy370:
-                       yyaccept = 36;
+yy375:
+                       yyaccept = 34;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5180,69 +5215,69 @@ yy370:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy371;
+                       case 0x7F:      goto yy376;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy371:
-#line 369 "src/parser.re"
+yy376:
+#line 372 "src/parser.re"
                        { NEWTOKEN(PSI_T_IFDEF); goto start; }
-#line 5191 "src/parser.c"
-yy372:
-                       yyaccept = 6;
+#line 5226 "src/parser.c"
+yy377:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy427;
-                       default:        goto yy60;
+                       case 'f':       goto yy435;
+                       default:        goto yy62;
                        }
-yy373:
-                       yyaccept = 6;
+yy378:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy429;
-                       default:        goto yy60;
+                       case 'd':       goto yy437;
+                       default:        goto yy62;
                        }
-yy374:
-                       yyaccept = 6;
+yy379:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy430;
-                       default:        goto yy60;
+                       case '_':       goto yy438;
+                       default:        goto yy62;
                        }
-yy375:
-                       yyaccept = 6;
+yy380:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy431;
-                       default:        goto yy60;
+                       case '_':       goto yy439;
+                       default:        goto yy62;
                        }
-yy376:
-                       yyaccept = 6;
+yy381:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy432;
-                       default:        goto yy60;
+                       case '_':       goto yy440;
+                       default:        goto yy62;
                        }
-yy377:
-                       yyaccept = 6;
+yy382:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy433;
-                       default:        goto yy60;
+                       case 't':       goto yy441;
+                       default:        goto yy62;
                        }
-yy378:
-                       yyaccept = 6;
+yy383:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy435;
-                       default:        goto yy60;
+                       case 'l':       goto yy443;
+                       default:        goto yy62;
                        }
-yy379:
-                       yyaccept = 37;
+yy384:
+                       yyaccept = 35;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5308,64 +5343,64 @@ yy379:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy380;
+                       case 0x7F:      goto yy385;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy380:
-#line 384 "src/parser.re"
+yy385:
+#line 387 "src/parser.re"
                        { NEWTOKEN(PSI_T_MIXED); goto start; }
-#line 5319 "src/parser.c"
-yy381:
-                       yyaccept = 6;
+#line 5354 "src/parser.c"
+yy386:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy437;
-                       default:        goto yy60;
+                       case 't':       goto yy445;
+                       default:        goto yy62;
                        }
-yy382:
-                       yyaccept = 6;
+yy387:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy439;
-                       default:        goto yy60;
+                       case 'l':       goto yy447;
+                       default:        goto yy62;
                        }
-yy383:
-                       yyaccept = 6;
+yy388:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy441;
-                       default:        goto yy60;
+                       case 'a':       goto yy449;
+                       default:        goto yy62;
                        }
-yy384:
-                       yyaccept = 6;
+yy389:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy442;
-                       default:        goto yy60;
+                       case 'a':       goto yy450;
+                       default:        goto yy62;
                        }
-yy385:
-                       yyaccept = 6;
+yy390:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy443;
-                       default:        goto yy60;
+                       case 's':       goto yy451;
+                       default:        goto yy62;
                        }
-yy386:
-                       yyaccept = 6;
+yy391:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy444;
-                       default:        goto yy60;
+                       case 'n':       goto yy452;
+                       default:        goto yy62;
                        }
-yy387:
-                       yyaccept = 38;
+yy392:
+                       yyaccept = 36;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5431,148 +5466,148 @@ yy387:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy388;
+                       case 0x7F:      goto yy393;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy388:
-#line 389 "src/parser.re"
+yy393:
+#line 392 "src/parser.re"
                        { NEWTOKEN(PSI_T_SHORT); goto start; }
-#line 5442 "src/parser.c"
-yy389:
-                       yyaccept = 6;
+#line 5477 "src/parser.c"
+yy394:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy446;
-                       default:        goto yy60;
+                       case 'd':       goto yy454;
+                       default:        goto yy62;
                        }
-yy390:
-                       yyaccept = 6;
+yy395:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy448;
-                       default:        goto yy60;
+                       case 'c':       goto yy456;
+                       default:        goto yy62;
                        }
-yy391:
-                       yyaccept = 6;
+yy396:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy450;
-                       default:        goto yy60;
+                       case 'g':       goto yy458;
+                       default:        goto yy62;
                        }
-yy392:
-                       yyaccept = 6;
+yy397:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy452;
-                       default:        goto yy60;
+                       case 'n':       goto yy460;
+                       default:        goto yy62;
                        }
-yy393:
-                       yyaccept = 6;
+yy398:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy454;
-                       default:        goto yy60;
+                       case 't':       goto yy462;
+                       default:        goto yy62;
                        }
-yy394:
-                       yyaccept = 6;
+yy399:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy456;
-                       default:        goto yy60;
+                       case 'l':       goto yy464;
+                       default:        goto yy62;
                        }
-yy395:
-                       yyaccept = 6;
+yy400:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy458;
-                       default:        goto yy60;
+                       case 'r':       goto yy466;
+                       default:        goto yy62;
                        }
-yy396:
-                       yyaccept = 6;
+yy401:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy459;
-                       default:        goto yy60;
+                       case 'o':       goto yy467;
+                       default:        goto yy62;
                        }
-yy397:
-                       yyaccept = 6;
+yy402:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy460;
-                       default:        goto yy60;
+                       case 'o':       goto yy468;
+                       default:        goto yy62;
                        }
-yy398:
-                       yyaccept = 6;
+yy403:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy461;
-                       default:        goto yy60;
+                       case 't':       goto yy469;
+                       default:        goto yy62;
                        }
-yy399:
-                       yyaccept = 6;
+yy404:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy463;
-                       default:        goto yy60;
+                       case 'j':       goto yy471;
+                       default:        goto yy62;
                        }
-yy400:
-                       yyaccept = 6;
+yy405:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy464;
-                       default:        goto yy60;
+                       case 'r':       goto yy472;
+                       default:        goto yy62;
                        }
-yy401:
-                       yyaccept = 6;
+yy406:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy465;
-                       default:        goto yy60;
+                       case 'e':       goto yy473;
+                       default:        goto yy62;
                        }
-yy402:
-                       yyaccept = 6;
+yy407:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '6':       goto yy466;
-                       default:        goto yy60;
+                       case '6':       goto yy474;
+                       default:        goto yy62;
                        }
-yy403:
-                       yyaccept = 6;
+yy408:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '2':       goto yy467;
-                       default:        goto yy60;
+                       case '2':       goto yy475;
+                       default:        goto yy62;
                        }
-yy404:
-                       yyaccept = 6;
+yy409:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '4':       goto yy468;
-                       default:        goto yy60;
+                       case '4':       goto yy476;
+                       default:        goto yy62;
                        }
-yy405:
-                       yyaccept = 6;
+yy410:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy469;
-                       default:        goto yy60;
+                       case '_':       goto yy477;
+                       default:        goto yy62;
                        }
-yy406:
-                       yyaccept = 39;
+yy411:
+                       yyaccept = 37;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5638,16 +5673,16 @@ yy406:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy407;
+                       case 0x7F:      goto yy412;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy407:
-#line 376 "src/parser.re"
+yy412:
+#line 379 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNDEF); goto start; }
-#line 5649 "src/parser.c"
-yy408:
-                       yyaccept = 40;
+#line 5684 "src/parser.c"
+yy413:
+                       yyaccept = 38;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5713,46 +5748,67 @@ yy408:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy409;
+                       case 0x7F:      goto yy414;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy409:
-#line 412 "src/parser.re"
+yy414:
+#line 415 "src/parser.re"
                        { NEWTOKEN(PSI_T_UNION); goto start; }
-#line 5724 "src/parser.c"
-yy410:
-                       yyaccept = 6;
+#line 5759 "src/parser.c"
+yy415:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy470;
-                       default:        goto yy60;
+                       case 'n':       goto yy478;
+                       default:        goto yy62;
                        }
-yy411:
-                       yyaccept = 6;
+yy416:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy471;
-                       default:        goto yy60;
+                       case 'n':       goto yy479;
+                       default:        goto yy62;
                        }
-yy412:
-                       yyaccept = 6;
+yy417:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'r':       goto yy472;
-                       default:        goto yy60;
+                       case '_':       goto yy480;
+                       default:        goto yy62;
                        }
-yy413:
-                       yyaccept = 6;
+yy418:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'a':       goto yy473;
-                       default:        goto yy60;
+                       case 'r':       goto yy481;
+                       default:        goto yy62;
                        }
-yy414:
-                       yyaccept = 41;
+yy419:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy482;
+                       default:        goto yy62;
+                       }
+yy420:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy483;
+                       default:        goto yy62;
+                       }
+yy421:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'a':       goto yy484;
+                       default:        goto yy62;
+                       }
+yy422:
+                       yyaccept = 39;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5818,40 +5874,714 @@ yy414:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy415;
+                       case 0x7F:      goto yy423;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy415:
-#line 429 "src/parser.re"
+yy423:
+#line 432 "src/parser.re"
                        { NEWTOKEN(PSI_T_ARRVAL); goto start; }
-#line 5829 "src/parser.c"
-yy416:
-                       yyaccept = 6;
+#line 5885 "src/parser.c"
+yy424:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy475;
-                       default:        goto yy60;
+                       case 'l':       goto yy486;
+                       default:        goto yy62;
                        }
-yy417:
-                       yyaccept = 6;
+yy425:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy477;
-                       default:        goto yy60;
+                       case 'l':       goto yy488;
+                       default:        goto yy62;
                        }
-yy418:
-                       yyaccept = 6;
+yy426:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy478;
-                       default:        goto yy60;
+                       case 'c':       goto yy489;
+                       default:        goto yy62;
+                       }
+yy427:
+                       yyaccept = 40;
+                       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 yy428;
+                       case '\\':      goto yy138;
+                       default:        goto yy61;
+                       }
+yy428:
+#line 436 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLOC); goto start; }
+#line 5984 "src/parser.c"
+yy429:
+                       yyaccept = 41;
+                       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 yy430;
+                       case 'D':
+                       case 'd':       goto yy490;
+                       case '\\':      goto yy138;
+                       default:        goto yy61;
+                       }
+yy430:
+#line 377 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DEFINE); goto start; }
+#line 6061 "src/parser.c"
+yy431:
+                       yyaccept = 42;
+                       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 yy432;
+                       case '\\':      goto yy138;
+                       default:        goto yy61;
+                       }
+yy432:
+#line 396 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DOUBLE); goto start; }
+#line 6136 "src/parser.c"
+yy433:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy492;
+                       default:        goto yy62;
+                       }
+yy434:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'O':
+                       case 'o':       goto yy493;
+                       default:        goto yy62;
+                       }
+yy435:
+                       yyaccept = 43;
+                       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 yy436;
+                       case '\\':      goto yy138;
+                       default:        goto yy61;
+                       }
+yy436:
+#line 373 "src/parser.re"
+                       { NEWTOKEN(PSI_T_IFNDEF); goto start; }
+#line 6227 "src/parser.c"
+yy437:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy494;
+                       default:        goto yy62;
+                       }
+yy438:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy496;
+                       default:        goto yy62;
+                       }
+yy439:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy498;
+                       default:        goto yy62;
+                       }
+yy440:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy500;
+                       default:        goto yy62;
+                       }
+yy441:
+                       yyaccept = 44;
+                       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 yy442;
+                       case '\\':      goto yy138;
+                       default:        goto yy61;
+                       }
+yy442:
+#line 397 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT8); goto start; }
+#line 6334 "src/parser.c"
+yy443:
+                       yyaccept = 45;
+                       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 yy444;
+                       case '\\':      goto yy138;
+                       default:        goto yy61;
+                       }
+yy444:
+#line 429 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INTVAL); goto start; }
+#line 6409 "src/parser.c"
+yy445:
+                       yyaccept = 46;
+                       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 yy446;
+                       case '\\':      goto yy138;
+                       default:        goto yy61;
+                       }
+yy446:
+#line 409 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OBJECT); goto start; }
+#line 6484 "src/parser.c"
+yy447:
+                       yyaccept = 47;
+                       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 yy448;
+                       case '\\':      goto yy138;
+                       default:        goto yy61;
+                       }
+yy448:
+#line 433 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OBJVAL); goto start; }
+#line 6559 "src/parser.c"
+yy449:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy502;
+                       default:        goto yy62;
+                       }
+yy450:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'S':
+                       case 's':       goto yy504;
+                       default:        goto yy62;
+                       }
+yy451:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'S':
+                       case 's':       goto yy505;
+                       default:        goto yy62;
                        }
-yy419:
-                       yyaccept = 42;
+yy452:
+                       yyaccept = 48;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5917,16 +6647,16 @@ yy419:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy420;
+                       case 0x7F:      goto yy453;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy420:
-#line 433 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CALLOC); goto start; }
-#line 5928 "src/parser.c"
-yy421:
-                       yyaccept = 43;
+yy453:
+#line 423 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RETURN); goto start; }
+#line 6658 "src/parser.c"
+yy454:
+                       yyaccept = 49;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -5992,18 +6722,16 @@ yy421:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy422;
-                       case 'D':
-                       case 'd':       goto yy479;
+                       case 0x7F:      goto yy455;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy422:
-#line 374 "src/parser.re"
-                       { NEWTOKEN(PSI_T_DEFINE); goto start; }
-#line 6005 "src/parser.c"
-yy423:
-                       yyaccept = 44;
+yy455:
+#line 406 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SIGNED); goto start; }
+#line 6733 "src/parser.c"
+yy456:
+                       yyaccept = 50;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6069,32 +6797,16 @@ yy423:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy424;
+                       case 0x7F:      goto yy457;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
-                       }
-yy424:
-#line 393 "src/parser.re"
-                       { NEWTOKEN(PSI_T_DOUBLE); goto start; }
-#line 6080 "src/parser.c"
-yy425:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy481;
-                       default:        goto yy60;
-                       }
-yy426:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy482;
-                       default:        goto yy60;
+                       default:        goto yy61;
                        }
-yy427:
-                       yyaccept = 45;
+yy457:
+#line 411 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STATIC); goto start; }
+#line 6808 "src/parser.c"
+yy458:
+                       yyaccept = 51;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6160,48 +6872,16 @@ yy427:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy428;
+                       case 0x7F:      goto yy459;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
-                       }
-yy428:
-#line 370 "src/parser.re"
-                       { NEWTOKEN(PSI_T_IFNDEF); goto start; }
-#line 6171 "src/parser.c"
-yy429:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy483;
-                       default:        goto yy60;
-                       }
-yy430:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy485;
-                       default:        goto yy60;
-                       }
-yy431:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy487;
-                       default:        goto yy60;
-                       }
-yy432:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy489;
-                       default:        goto yy60;
+                       default:        goto yy61;
                        }
-yy433:
-                       yyaccept = 46;
+yy459:
+#line 407 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRING); goto start; }
+#line 6883 "src/parser.c"
+yy460:
+                       yyaccept = 52;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6267,16 +6947,16 @@ yy433:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy434;
+                       case 0x7F:      goto yy461;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy434:
-#line 394 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT8); goto start; }
-#line 6278 "src/parser.c"
-yy435:
-                       yyaccept = 47;
+yy461:
+#line 426 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRLEN); goto start; }
+#line 6958 "src/parser.c"
+yy462:
+                       yyaccept = 53;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6342,16 +7022,16 @@ yy435:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy436;
+                       case 0x7F:      goto yy463;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy436:
-#line 426 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INTVAL); goto start; }
-#line 6353 "src/parser.c"
-yy437:
-                       yyaccept = 48;
+yy463:
+#line 414 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRUCT); goto start; }
+#line 7033 "src/parser.c"
+yy464:
+                       yyaccept = 54;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6417,16 +7097,40 @@ yy437:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy438;
+                       case 0x7F:      goto yy465;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy438:
-#line 406 "src/parser.re"
-                       { NEWTOKEN(PSI_T_OBJECT); goto start; }
-#line 6428 "src/parser.c"
-yy439:
-                       yyaccept = 49;
+yy465:
+#line 427 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRVAL); goto start; }
+#line 7108 "src/parser.c"
+yy466:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy506;
+                       default:        goto yy62;
+                       }
+yy467:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy507;
+                       default:        goto yy62;
+                       }
+yy468:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy509;
+                       default:        goto yy62;
+                       }
+yy469:
+                       yyaccept = 55;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6492,40 +7196,113 @@ yy439:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy440;
+                       case 0x7F:      goto yy470;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy440:
-#line 430 "src/parser.re"
-                       { NEWTOKEN(PSI_T_OBJVAL); goto start; }
-#line 6503 "src/parser.c"
-yy441:
-                       yyaccept = 6;
+yy470:
+#line 440 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_INT); goto start; }
+#line 7207 "src/parser.c"
+yy471:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy491;
-                       default:        goto yy60;
+                       case 'E':
+                       case 'e':       goto yy510;
+                       default:        goto yy62;
                        }
-yy442:
-                       yyaccept = 6;
+yy472:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'S':
-                       case 's':       goto yy493;
-                       default:        goto yy60;
+                       case 'I':
+                       case 'i':       goto yy511;
+                       default:        goto yy62;
                        }
-yy443:
-                       yyaccept = 6;
+yy473:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'S':
-                       case 's':       goto yy494;
-                       default:        goto yy60;
+                       case 'F':
+                       case 'f':       goto yy512;
+                       default:        goto yy62;
                        }
-yy444:
-                       yyaccept = 50;
+yy474:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy514;
+                       default:        goto yy62;
+                       }
+yy475:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy515;
+                       default:        goto yy62;
+                       }
+yy476:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy516;
+                       default:        goto yy62;
+                       }
+yy477:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy517;
+                       default:        goto yy62;
+                       }
+yy478:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy519;
+                       default:        goto yy62;
+                       }
+yy479:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'G':
+                       case 'g':       goto yy520;
+                       default:        goto yy62;
+                       }
+yy480:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy522;
+                       default:        goto yy62;
+                       }
+yy481:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy524;
+                       default:        goto yy62;
+                       }
+yy482:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy525;
+                       default:        goto yy62;
+                       }
+yy483:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'r':       goto yy526;
+                       default:        goto yy62;
+                       }
+yy484:
+                       yyaccept = 56;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6591,16 +7368,16 @@ yy444:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy445;
+                       case 0x7F:      goto yy485;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy527;
                        }
-yy445:
-#line 420 "src/parser.re"
-                       { NEWTOKEN(PSI_T_RETURN); goto start; }
-#line 6602 "src/parser.c"
-yy446:
-                       yyaccept = 51;
+yy485:
+#line 365 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PRAGMA); goto start; }
+#line 7379 "src/parser.c"
+yy486:
+                       yyaccept = 57;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6666,16 +7443,32 @@ yy446:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy447;
+                       case 0x7F:      goto yy487;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy447:
-#line 403 "src/parser.re"
-                       { NEWTOKEN(PSI_T_SIGNED); goto start; }
-#line 6677 "src/parser.c"
-yy448:
-                       yyaccept = 52;
+yy487:
+#line 431 "src/parser.re"
+                       { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
+#line 7454 "src/parser.c"
+yy488:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy529;
+                       default:        goto yy62;
+                       }
+yy489:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'K':
+                       case 'k':       goto yy531;
+                       default:        goto yy62;
+                       }
+yy490:
+                       yyaccept = 58;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6741,16 +7534,32 @@ yy448:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy449;
+                       case 0x7F:      goto yy491;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
+                       }
+yy491:
+#line 378 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DEFINED); goto start; }
+#line 7545 "src/parser.c"
+yy492:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy533;
+                       default:        goto yy62;
                        }
-yy449:
-#line 408 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STATIC); goto start; }
-#line 6752 "src/parser.c"
-yy450:
-                       yyaccept = 53;
+yy493:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy535;
+                       default:        goto yy62;
+                       }
+yy494:
+                       yyaccept = 59;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6816,16 +7625,17 @@ yy450:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy451;
+                       case 0x7F:      goto yy495;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       case '_':       goto yy537;
+                       default:        goto yy61;
                        }
-yy451:
-#line 404 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STRING); goto start; }
-#line 6827 "src/parser.c"
-yy452:
-                       yyaccept = 54;
+yy495:
+#line 382 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INCLUDE); goto start; }
+#line 7637 "src/parser.c"
+yy496:
+                       yyaccept = 60;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6891,16 +7701,16 @@ yy452:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy453;
+                       case 0x7F:      goto yy497;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy453:
-#line 423 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STRLEN); goto start; }
-#line 6902 "src/parser.c"
-yy454:
-                       yyaccept = 55;
+yy497:
+#line 399 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT16); goto start; }
+#line 7712 "src/parser.c"
+yy498:
+                       yyaccept = 61;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -6966,16 +7776,16 @@ yy454:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy455;
+                       case 0x7F:      goto yy499;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy455:
-#line 411 "src/parser.re"
-                       { NEWTOKEN(PSI_T_STRUCT); goto start; }
-#line 6977 "src/parser.c"
-yy456:
-                       yyaccept = 56;
+yy499:
+#line 401 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT32); goto start; }
+#line 7787 "src/parser.c"
+yy500:
+                       yyaccept = 62;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7041,40 +7851,16 @@ yy456:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy457;
+                       case 0x7F:      goto yy501;
                        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;
+                       default:        goto yy61;
                        }
-yy460:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy498;
-                       default:        goto yy60;
-                       }
-yy461:
-                       yyaccept = 57;
+yy501:
+#line 403 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT64); goto start; }
+#line 7862 "src/parser.c"
+yy502:
+                       yyaccept = 63;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7140,92 +7926,40 @@ yy461:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy462;
+                       case 0x7F:      goto yy503;
                        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;
-                       }
-yy466:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy503;
-                       default:        goto yy60;
-                       }
-yy467:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy504;
-                       default:        goto yy60;
-                       }
-yy468:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case '_':       goto yy505;
-                       default:        goto yy60;
+                       default:        goto yy61;
                        }
-yy469:
-                       yyaccept = 6;
+yy503:
+#line 428 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PATHVAL); goto start; }
+#line 7937 "src/parser.c"
+yy504:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy506;
-                       default:        goto yy60;
+                       case 'S':
+                       case 's':       goto yy538;
+                       default:        goto yy62;
                        }
-yy470:
-                       yyaccept = 6;
+yy505:
+                       yyaccept = 5;
                        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;
+                       case 'e':       goto yy539;
+                       default:        goto yy62;
                        }
-yy472:
-                       yyaccept = 6;
+yy506:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'i':       goto yy511;
-                       default:        goto yy60;
+                       case 'Y':
+                       case 'y':       goto yy540;
+                       default:        goto yy62;
                        }
-yy473:
-                       yyaccept = 58;
+yy507:
+                       yyaccept = 64;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7291,16 +8025,40 @@ yy473:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy474;
+                       case 0x7F:      goto yy508;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy474:
-#line 366 "src/parser.re"
-                       { NEWTOKEN(PSI_T_PRAGMA); goto start; }
-#line 7302 "src/parser.c"
-yy475:
-                       yyaccept = 59;
+yy508:
+#line 442 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_BOOL); goto start; }
+#line 8036 "src/parser.c"
+yy509:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy542;
+                       default:        goto yy62;
+                       }
+yy510:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'C':
+                       case 'c':       goto yy544;
+                       default:        goto yy62;
+                       }
+yy511:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy545;
+                       default:        goto yy62;
+                       }
+yy512:
+                       yyaccept = 65;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7366,32 +8124,40 @@ yy475:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy476;
+                       case 0x7F:      goto yy513;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy476:
-#line 428 "src/parser.re"
-                       { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
-#line 7377 "src/parser.c"
-yy477:
-                       yyaccept = 6;
+yy513:
+#line 413 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
+#line 8135 "src/parser.c"
+yy514:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy512;
-                       default:        goto yy60;
+                       case 'T':
+                       case 't':       goto yy546;
+                       default:        goto yy62;
                        }
-yy478:
-                       yyaccept = 6;
+yy515:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'K':
-                       case 'k':       goto yy514;
-                       default:        goto yy60;
+                       case 'T':
+                       case 't':       goto yy548;
+                       default:        goto yy62;
                        }
-yy479:
-                       yyaccept = 60;
+yy516:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy550;
+                       default:        goto yy62;
+                       }
+yy517:
+                       yyaccept = 66;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7457,32 +8223,24 @@ yy479:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy480;
+                       case 0x7F:      goto yy518;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
-                       }
-yy480:
-#line 375 "src/parser.re"
-                       { NEWTOKEN(PSI_T_DEFINED); goto start; }
-#line 7468 "src/parser.c"
-yy481:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy516;
-                       default:        goto yy60;
+                       default:        goto yy61;
                        }
-yy482:
-                       yyaccept = 6;
+yy518:
+#line 398 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT8); goto start; }
+#line 8234 "src/parser.c"
+yy519:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy518;
-                       default:        goto yy60;
+                       case 'D':
+                       case 'd':       goto yy552;
+                       default:        goto yy62;
                        }
-yy483:
-                       yyaccept = 61;
+yy520:
+                       yyaccept = 67;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7548,17 +8306,16 @@ yy483:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy484;
+                       case 0x7F:      goto yy521;
                        case '\\':      goto yy138;
-                       case '_':       goto yy520;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy484:
-#line 379 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INCLUDE); goto start; }
-#line 7560 "src/parser.c"
-yy485:
-                       yyaccept = 62;
+yy521:
+#line 380 "src/parser.re"
+                       { NEWTOKEN(PSI_T_WARNING); goto start; }
+#line 8317 "src/parser.c"
+yy522:
+                       yyaccept = 68;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7624,18 +8381,41 @@ yy485:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy486;
+                       case 0x7F:      goto yy523;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy486:
-#line 396 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT16); goto start; }
-#line 7635 "src/parser.c"
-yy487:
-                       yyaccept = 63;
+yy523:
+#line 369 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_ASM); goto start; }
+#line 8392 "src/parser.c"
+yy524:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'b':       goto yy554;
+                       default:        goto yy62;
+                       }
+yy525:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
+                       case 's':       goto yy555;
+                       default:        goto yy62;
+                       }
+yy526:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy556;
+                       default:        goto yy62;
+                       }
+yy527:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
                        case 0x00:
                        case 0x01:
                        case 0x02:
@@ -7699,16 +8479,13 @@ yy487:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy488;
+                       case 0x7F:      goto yy55;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       case 'o':       goto yy557;
+                       default:        goto yy527;
                        }
-yy488:
-#line 398 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT32); goto start; }
-#line 7710 "src/parser.c"
-yy489:
-                       yyaccept = 64;
+yy529:
+                       yyaccept = 69;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7774,16 +8551,16 @@ yy489:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy490;
+                       case 0x7F:      goto yy530;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy490:
-#line 400 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INT64); goto start; }
-#line 7785 "src/parser.c"
-yy491:
-                       yyaccept = 65;
+yy530:
+#line 388 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLABLE); goto start; }
+#line 8562 "src/parser.c"
+yy531:
+                       yyaccept = 70;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7849,40 +8626,16 @@ yy491:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy492;
+                       case 0x7F:      goto yy532;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
-                       }
-yy492:
-#line 425 "src/parser.re"
-                       { NEWTOKEN(PSI_T_PATHVAL); goto start; }
-#line 7860 "src/parser.c"
-yy493:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'S':
-                       case 's':       goto yy521;
-                       default:        goto yy60;
+                       default:        goto yy61;
                        }
-yy494:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy522;
-                       default:        goto yy60;
-                       }
-yy495:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'Y':
-                       case 'y':       goto yy523;
-                       default:        goto yy60;
-                       }
-yy496:
-                       yyaccept = 66;
+yy532:
+#line 410 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLBACK); goto start; }
+#line 8637 "src/parser.c"
+yy533:
+                       yyaccept = 71;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -7948,40 +8701,16 @@ yy496:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy497;
+                       case 0x7F:      goto yy534;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
-                       }
-yy497:
-#line 439 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TO_BOOL); goto start; }
-#line 7959 "src/parser.c"
-yy498:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy525;
-                       default:        goto yy60;
-                       }
-yy499:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy527;
-                       default:        goto yy60;
-                       }
-yy500:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy528;
-                       default:        goto yy60;
+                       default:        goto yy61;
                        }
-yy501:
-                       yyaccept = 67;
+yy534:
+#line 430 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
+#line 8712 "src/parser.c"
+yy535:
+                       yyaccept = 72;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8047,40 +8776,40 @@ yy501:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy502;
+                       case 0x7F:      goto yy536;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy502:
-#line 410 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
-#line 8058 "src/parser.c"
-yy503:
-                       yyaccept = 6;
+yy536:
+#line 412 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FUNCTION); goto start; }
+#line 8787 "src/parser.c"
+yy537:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy529;
-                       default:        goto yy60;
+                       case 'N':
+                       case 'n':       goto yy559;
+                       default:        goto yy62;
                        }
-yy504:
-                       yyaccept = 6;
+yy538:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy531;
-                       default:        goto yy60;
+                       case 'E':
+                       case 'e':       goto yy560;
+                       default:        goto yy62;
                        }
-yy505:
-                       yyaccept = 6;
+yy539:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy533;
-                       default:        goto yy60;
+                       case 'R':
+                       case 'r':       goto yy561;
+                       default:        goto yy62;
                        }
-yy506:
-                       yyaccept = 68;
+yy540:
+                       yyaccept = 73;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8146,24 +8875,16 @@ yy506:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy507;
+                       case 0x7F:      goto yy541;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
-                       }
-yy507:
-#line 395 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT8); goto start; }
-#line 8157 "src/parser.c"
-yy508:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy535;
-                       default:        goto yy60;
+                       default:        goto yy61;
                        }
-yy509:
-                       yyaccept = 69;
+yy541:
+#line 438 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
+#line 8886 "src/parser.c"
+yy542:
+                       yyaccept = 74;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8229,23 +8950,32 @@ yy509:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy510;
+                       case 0x7F:      goto yy543;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy510:
-#line 377 "src/parser.re"
-                       { NEWTOKEN(PSI_T_WARNING); goto start; }
-#line 8240 "src/parser.c"
-yy511:
-                       yyaccept = 6;
+yy543:
+#line 441 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
+#line 8961 "src/parser.c"
+yy544:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'b':       goto yy537;
-                       default:        goto yy60;
+                       case 'T':
+                       case 't':       goto yy562;
+                       default:        goto yy62;
                        }
-yy512:
-                       yyaccept = 70;
+yy545:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'G':
+                       case 'g':       goto yy564;
+                       default:        goto yy62;
+                       }
+yy546:
+                       yyaccept = 75;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8311,16 +9041,16 @@ yy512:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy513;
+                       case 0x7F:      goto yy547;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy513:
-#line 385 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CALLABLE); goto start; }
-#line 8322 "src/parser.c"
-yy514:
-                       yyaccept = 71;
+yy547:
+#line 400 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT16); goto start; }
+#line 9052 "src/parser.c"
+yy548:
+                       yyaccept = 76;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8386,16 +9116,16 @@ yy514:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy515;
+                       case 0x7F:      goto yy549;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy515:
-#line 407 "src/parser.re"
-                       { NEWTOKEN(PSI_T_CALLBACK); goto start; }
-#line 8397 "src/parser.c"
-yy516:
-                       yyaccept = 72;
+yy549:
+#line 402 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT32); goto start; }
+#line 9127 "src/parser.c"
+yy550:
+                       yyaccept = 77;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8461,16 +9191,16 @@ yy516:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy517;
+                       case 0x7F:      goto yy551;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy517:
-#line 427 "src/parser.re"
-                       { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
-#line 8472 "src/parser.c"
-yy518:
-                       yyaccept = 73;
+yy551:
+#line 404 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT64); goto start; }
+#line 9202 "src/parser.c"
+yy552:
+                       yyaccept = 78;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8536,41 +9266,40 @@ yy518:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy519;
+                       case 0x7F:      goto yy553;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy519:
-#line 409 "src/parser.re"
-                       { NEWTOKEN(PSI_T_FUNCTION); goto start; }
-#line 8547 "src/parser.c"
-yy520:
-                       yyaccept = 6;
+yy553:
+#line 405 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
+#line 9277 "src/parser.c"
+yy554:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy538;
-                       default:        goto yy60;
+                       case 'u':       goto yy566;
+                       default:        goto yy62;
                        }
-yy521:
-                       yyaccept = 6;
+yy555:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy539;
-                       default:        goto yy60;
+                       case 'i':       goto yy567;
+                       default:        goto yy62;
                        }
-yy522:
-                       yyaccept = 6;
+yy556:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy540;
-                       default:        goto yy60;
+                       case 'c':       goto yy568;
+                       default:        goto yy62;
                        }
-yy523:
-                       yyaccept = 74;
-                       yych = *(mrk = ++cur);
+yy557:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
                        switch (yych) {
                        case 0x00:
                        case 0x01:
@@ -8635,16 +9364,38 @@ yy523:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy524;
+                       case 0x7F:      goto yy55;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       case 'n':       goto yy569;
+                       case 'o':       goto yy557;
+                       default:        goto yy527;
                        }
-yy524:
-#line 435 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
-#line 8646 "src/parser.c"
-yy525:
-                       yyaccept = 75;
+yy559:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy570;
+                       default:        goto yy62;
+                       }
+yy560:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy571;
+                       default:        goto yy62;
+                       }
+yy561:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy572;
+                       default:        goto yy62;
+                       }
+yy562:
+                       yyaccept = 79;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8710,32 +9461,16 @@ yy525:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy526;
+                       case 0x7F:      goto yy563;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
-                       }
-yy526:
-#line 438 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
-#line 8721 "src/parser.c"
-yy527:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy541;
-                       default:        goto yy60;
-                       }
-yy528:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy543;
-                       default:        goto yy60;
+                       default:        goto yy61;
                        }
-yy529:
-                       yyaccept = 76;
+yy563:
+#line 437 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_OBJECT); goto start; }
+#line 9472 "src/parser.c"
+yy564:
+                       yyaccept = 80;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8801,18 +9536,41 @@ yy529:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy530;
+                       case 0x7F:      goto yy565;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
+                       }
+yy565:
+#line 439 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_STRING); goto start; }
+#line 9547 "src/parser.c"
+yy566:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy574;
+                       default:        goto yy62;
                        }
-yy530:
-#line 397 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT16); goto start; }
-#line 8812 "src/parser.c"
-yy531:
-                       yyaccept = 77;
+yy567:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'o':       goto yy575;
+                       default:        goto yy62;
+                       }
+yy568:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
+                       case 't':       goto yy576;
+                       default:        goto yy62;
+                       }
+yy569:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
                        case 0x00:
                        case 0x01:
                        case 0x02:
@@ -8876,16 +9634,30 @@ yy531:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy532;
+                       case 0x7F:      goto yy55;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       case 'c':       goto yy578;
+                       case 'o':       goto yy557;
+                       default:        goto yy527;
                        }
-yy532:
-#line 399 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT32); goto start; }
-#line 8887 "src/parser.c"
-yy533:
-                       yyaccept = 78;
+yy570:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'X':
+                       case 'x':       goto yy579;
+                       default:        goto yy62;
+                       }
+yy571:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy580;
+                       default:        goto yy62;
+                       }
+yy572:
+                       yyaccept = 81;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -8951,16 +9723,30 @@ yy533:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy534;
+                       case 0x7F:      goto yy573;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy534:
-#line 401 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UINT64); goto start; }
-#line 8962 "src/parser.c"
-yy535:
-                       yyaccept = 79;
+yy573:
+#line 421 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
+#line 9734 "src/parser.c"
+yy574:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy582;
+                       default:        goto yy62;
+                       }
+yy575:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy583;
+                       default:        goto yy62;
+                       }
+yy576:
+                       yyaccept = 82;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9026,48 +9812,19 @@ yy535:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy536;
+                       case 0x7F:      goto yy577;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
-                       }
-yy536:
-#line 402 "src/parser.re"
-                       { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
-#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 yy546;
-                       default:        goto yy60;
-                       }
-yy539:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy547;
-                       default:        goto yy60;
-                       }
-yy540:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy548;
-                       default:        goto yy60;
+                       default:        goto yy61;
                        }
-yy541:
-                       yyaccept = 80;
-                       yych = *(mrk = ++cur);
+yy577:
+#line 367 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_RESTRICT); goto start; }
+#line 9823 "src/parser.c"
+yy578:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
                        switch (yych) {
                        case 0x00:
                        case 0x01:
@@ -9132,16 +9889,22 @@ yy541:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy542;
+                       case 0x7F:      goto yy55;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       case 'e':       goto yy584;
+                       case 'o':       goto yy557;
+                       default:        goto yy527;
                        }
-yy542:
-#line 434 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TO_OBJECT); goto start; }
-#line 9143 "src/parser.c"
-yy543:
-                       yyaccept = 81;
+yy579:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy586;
+                       default:        goto yy62;
+                       }
+yy580:
+                       yyaccept = 83;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9207,40 +9970,33 @@ yy543:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy544;
+                       case 0x7F:      goto yy581;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
-                       }
-yy544:
-#line 436 "src/parser.re"
-                       { NEWTOKEN(PSI_T_TO_STRING); goto start; }
-#line 9218 "src/parser.c"
-yy545:
-                       yyaccept = 6;
-                       yych = *(mrk = ++cur);
-                       switch (yych) {
-                       case 't':       goto yy550;
-                       default:        goto yy60;
+                       default:        goto yy61;
                        }
-yy546:
-                       yyaccept = 6;
+yy581:
+#line 422 "src/parser.re"
+                       { NEWTOKEN(PSI_T_POST_ASSERT); goto start; }
+#line 9981 "src/parser.c"
+yy582:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'X':
-                       case 'x':       goto yy551;
-                       default:        goto yy60;
+                       case '_':       goto yy588;
+                       default:        goto yy62;
                        }
-yy547:
-                       yyaccept = 6;
+yy583:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy552;
-                       default:        goto yy60;
+                       case '_':       goto yy589;
+                       default:        goto yy62;
                        }
-yy548:
-                       yyaccept = 82;
-                       yych = *(mrk = ++cur);
+yy584:
+                       yyaccept = 84;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
                        switch (yych) {
                        case 0x00:
                        case 0x01:
@@ -9305,31 +10061,17 @@ yy548:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy549;
+                       case 0x7F:      goto yy585;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
-                       }
-yy549:
-#line 418 "src/parser.re"
-                       { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
-#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 yy555;
-                       default:        goto yy60;
+                       case 'o':       goto yy557;
+                       default:        goto yy527;
                        }
-yy552:
-                       yyaccept = 83;
+yy585:
+#line 366 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PRAGMA_ONCE); goto start; }
+#line 10073 "src/parser.c"
+yy586:
+                       yyaccept = 85;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9395,23 +10137,30 @@ yy552:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy553;
+                       case 0x7F:      goto yy587;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy553:
-#line 419 "src/parser.re"
-                       { NEWTOKEN(PSI_T_POST_ASSERT); goto start; }
-#line 9406 "src/parser.c"
-yy554:
-                       yyaccept = 6;
+yy587:
+#line 383 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INCLUDE_NEXT); goto start; }
+#line 10148 "src/parser.c"
+yy588:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy557;
-                       default:        goto yy60;
+                       case '_':       goto yy590;
+                       default:        goto yy62;
                        }
-yy555:
-                       yyaccept = 84;
+yy589:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy591;
+                       default:        goto yy62;
+                       }
+yy590:
+                       yyaccept = 5;
                        yych = *(mrk = ++cur);
                        switch (yych) {
                        case 0x00:
@@ -9423,10 +10172,8 @@ yy555:
                        case 0x06:
                        case 0x07:
                        case 0x08:
-                       case '\t':
                        case '\n':
                        case '\v':
-                       case '\f':
                        case '\r':
                        case 0x0E:
                        case 0x0F:
@@ -9446,7 +10193,6 @@ yy555:
                        case 0x1D:
                        case 0x1E:
                        case 0x1F:
-                       case ' ':
                        case '!':
                        case '"':
                        case '#':
@@ -9454,7 +10200,6 @@ yy555:
                        case '%':
                        case '&':
                        case '\'':
-                       case '(':
                        case ')':
                        case '*':
                        case '+':
@@ -9477,27 +10222,18 @@ yy555:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy556;
+                       case 0x7F:      goto yy55;
+                       case '\t':
+                       case '\f':
+                       case ' ':       goto yy593;
+                       case '(':       goto yy595;
                        case '\\':      goto yy138;
-                       default:        goto yy59;
+                       default:        goto yy61;
                        }
-yy556:
-#line 380 "src/parser.re"
-                       { NEWTOKEN(PSI_T_INCLUDE_NEXT); goto start; }
-#line 9488 "src/parser.c"
-yy557:
-                       yyaccept = 6;
+yy591:
+                       yyaccept = 86;
                        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:
@@ -9538,6 +10274,7 @@ yy558:
                        case '%':
                        case '&':
                        case '\'':
+                       case '(':
                        case ')':
                        case '*':
                        case '+':
@@ -9560,128 +10297,217 @@ yy558:
                        case '|':
                        case '}':
                        case '~':
-                       case 0x7F:      goto yy53;
-                       case '(':       goto yy560;
+                       case 0x7F:      goto yy592;
                        case '\\':      goto yy138;
-                       default:        goto yy558;
+                       default:        goto yy61;
                        }
-yy560:
+yy592:
+#line 368 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_EXTENSION); goto start; }
+#line 10308 "src/parser.c"
+yy593:
+                       ++cur;
+                       if ((lim - cur) < 2) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case '\t':
+                       case '\f':
+                       case ' ':       goto yy593;
+                       case '(':       goto yy595;
+                       default:        goto yy106;
+                       }
+yy595:
                        yych = *++cur;
                        switch (yych) {
-                       case '(':       goto yy561;
+                       case '(':       goto yy596;
                        default:        goto yy106;
                        }
-yy561:
+yy596:
                        ++cur;
-#line 446 "src/parser.re"
+#line 447 "src/parser.re"
                        { parens = 2; goto cpp_attribute; }
-#line 9579 "src/parser.c"
+#line 10330 "src/parser.c"
+               }
+#line 453 "src/parser.re"
+
+
+       character: ;
+               
+#line 10337 "src/parser.c"
+               {
+                       unsigned char yych;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case '\n':
+                       case '\r':      goto yy602;
+                       case '\'':      goto yy604;
+                       case '\\':      goto yy606;
+                       default:        goto yy600;
+                       }
+yy600:
+                       ++cur;
+#line 461 "src/parser.re"
+                       { goto character; }
+#line 10353 "src/parser.c"
+yy602:
+                       ++cur;
+#line 459 "src/parser.re"
+                       { NEWLINE(); goto character; }
+#line 10358 "src/parser.c"
+yy604:
+                       ++cur;
+#line 458 "src/parser.re"
+                       { if (escaped) goto character; cur -= 1; NEWTOKEN(PSI_T_QUOTED_CHAR); cur += 1; token->flags = char_width; goto start; }
+#line 10363 "src/parser.c"
+yy606:
+                       ++cur;
+#line 460 "src/parser.re"
+                       { escaped = !escaped; }
+#line 10368 "src/parser.c"
+               }
+#line 463 "src/parser.re"
+
+       string: ;
+               
+#line 10374 "src/parser.c"
+               {
+                       unsigned char yych;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case '\n':
+                       case '\r':      goto yy612;
+                       case '"':       goto yy614;
+                       case '\\':      goto yy616;
+                       default:        goto yy610;
+                       }
+yy610:
+                       ++cur;
+#line 470 "src/parser.re"
+                       { goto string; }
+#line 10390 "src/parser.c"
+yy612:
+                       ++cur;
+#line 468 "src/parser.re"
+                       { NEWLINE(); goto string; }
+#line 10395 "src/parser.c"
+yy614:
+                       ++cur;
+#line 467 "src/parser.re"
+                       { if (escaped) goto string; cur -= 1; NEWTOKEN(PSI_T_QUOTED_STRING); cur += 1; token->flags = char_width; goto start; }
+#line 10400 "src/parser.c"
+yy616:
+                       ++cur;
+#line 469 "src/parser.re"
+                       { escaped = !escaped; goto string; }
+#line 10405 "src/parser.c"
                }
-#line 452 "src/parser.re"
+#line 472 "src/parser.re"
 
 
        comment: ;
                
-#line 9586 "src/parser.c"
+#line 10412 "src/parser.c"
                {
                        unsigned char yych;
                        if ((lim - cur) < 2) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy567;
-                       case '*':       goto yy569;
-                       default:        goto yy565;
+                       case '\r':      goto yy622;
+                       case '*':       goto yy624;
+                       default:        goto yy620;
                        }
-yy565:
+yy620:
                        ++cur;
-yy566:
-#line 459 "src/parser.re"
+yy621:
+#line 479 "src/parser.re"
                        { goto comment; }
-#line 9602 "src/parser.c"
-yy567:
+#line 10428 "src/parser.c"
+yy622:
                        ++cur;
-#line 457 "src/parser.re"
+#line 477 "src/parser.re"
                        { NEWLINE(); goto comment; }
-#line 9607 "src/parser.c"
-yy569:
+#line 10433 "src/parser.c"
+yy624:
                        yych = *++cur;
                        switch (yych) {
-                       case '/':       goto yy570;
-                       default:        goto yy566;
+                       case '/':       goto yy625;
+                       default:        goto yy621;
                        }
-yy570:
+yy625:
                        ++cur;
-#line 458 "src/parser.re"
+#line 478 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); goto start; }
-#line 9618 "src/parser.c"
+#line 10444 "src/parser.c"
                }
-#line 461 "src/parser.re"
+#line 481 "src/parser.re"
 
 
        comment_sl: ;
                
-#line 9625 "src/parser.c"
+#line 10451 "src/parser.c"
                {
                        unsigned char yych;
                        if (lim <= cur) if (cur >= lim) goto done;;
                        yych = *cur;
                        switch (yych) {
                        case '\n':
-                       case '\r':      goto yy576;
-                       default:        goto yy574;
+                       case '\r':      goto yy631;
+                       default:        goto yy629;
                        }
-yy574:
+yy629:
                        ++cur;
-#line 467 "src/parser.re"
+#line 487 "src/parser.re"
                        { goto comment_sl; }
-#line 9639 "src/parser.c"
-yy576:
+#line 10465 "src/parser.c"
+yy631:
                        ++cur;
-#line 466 "src/parser.re"
+#line 486 "src/parser.re"
                        { NEWTOKEN(PSI_T_COMMENT); NEWLINE(); goto start; }
-#line 9644 "src/parser.c"
+#line 10470 "src/parser.c"
                }
-#line 469 "src/parser.re"
+#line 489 "src/parser.re"
 
 
        cpp_attribute: ;
 
                
-#line 9652 "src/parser.c"
+#line 10478 "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;
+                       case '\r':      goto yy637;
+                       case '(':       goto yy639;
+                       case ')':       goto yy641;
+                       default:        goto yy635;
                        }
-yy580:
+yy635:
                        ++cur;
-#line 478 "src/parser.re"
+#line 498 "src/parser.re"
                        { goto cpp_attribute; }
-#line 9668 "src/parser.c"
-yy582:
+#line 10494 "src/parser.c"
+yy637:
                        ++cur;
-#line 477 "src/parser.re"
+#line 497 "src/parser.re"
                        { NEWLINE(); goto cpp_attribute; }
-#line 9673 "src/parser.c"
-yy584:
+#line 10499 "src/parser.c"
+yy639:
                        ++cur;
-#line 475 "src/parser.re"
+#line 495 "src/parser.re"
                        { ++parens; goto cpp_attribute; }
-#line 9678 "src/parser.c"
-yy586:
+#line 10504 "src/parser.c"
+yy641:
                        ++cur;
-#line 476 "src/parser.re"
+#line 496 "src/parser.re"
                        { if (parens == 1) { NEWTOKEN(PSI_T_CPP_ATTRIBUTE); goto start; } else { --parens; goto cpp_attribute; } }
-#line 9683 "src/parser.c"
+#line 10509 "src/parser.c"
                }
-#line 480 "src/parser.re"
+#line 500 "src/parser.re"
 
 error: ;
 

diff --git a/src/parser.re b/src/parser.re
index a313ac91a7e73ae0ec397c164b91dd1c49d66f13..2cdb1e84bf0dbcc59b5b0f7eabe86376dbca024b 100644 (file)
--- a/src/parser.re
+++ b/src/parser.re
@@ -260,13 +260,16 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
        struct psi_token *token;
        const char *tok, *cur, *lim, *mrk, *eol, *ctxmrk;
        unsigned parens;
+       bool escaped;
+       token_t char_width;
 
        tok = mrk = eol = cur = I->buffer;
        lim = I->buffer + I->length;
        I->lines = 1;
-       tokens = psi_plist_init((void (*)(void *)) psi_token_free);
+       tokens = psi_plist_init((psi_plist_dtor) psi_token_free);
 
        start: ;
+               char_width = 1;
                ctxmrk = NULL;
                tok = cur;
 
@@ -282,36 +285,23 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                re2c:yyfill:parameter = 0;
 
                W = [a-zA-Z0-9_\x80-\xff];
-               SP = [ \t];
+               SP = [ \t\f];
                EOL = [\r\n];
-               NAME = [a-zA-Z_\x80-\xff]W*;
+               NAME = [a-zA-Z_\x80-\xff] W*;
                NSNAME = (NAME)? ("\\" NAME)+;
                DOLLAR_NAME = '$' W+;
-               QUOTED_STRING = "L"? "\"" ([^"])+ "\"";
-               QUOTED_CHAR = "L"? "'" ([^']+ "\\'"?)+ "'";
                CPP_HEADER = "<" [-._/a-zA-Z0-9]+ ">";
-               CPP_ATTRIBUTE = "__attribute__" W* "((";
-               CPP_PRAGMA_ONCE = "pragma" W+ "once";
+               CPP_ATTRIBUTE = "__attribute__" SP* "((";
 
                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?;
 
-               FLT_HEX_FRAC = [0-9a-fA-F]*;
-               FLT_HEX_SIG = HEX_CONST ("." FLT_HEX_FRAC)?;
-               FLT_HEX_EXPO = 'p' [+-]? [0-9]+;
-               FLT_HEX_CONST = FLT_HEX_SIG FLT_HEX_EXPO;
+               FLT_HEX_CONST = HEX_CONST ("." [0-9a-fA-F]*)? 'p' [+-]? [0-9]+;
                FLT_DEC_NUM = "0" | DEC_CONST;
-               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) | ("." [0-9]+);
+               FLT_DEC_CONST = (FLT_DEC_NUM ("." [0-9]*)? 'e' [+-]? [0-9]+) | (FLT_DEC_NUM "." [0-9]*) | ("." [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?;
 
                [+-]? 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; }
@@ -326,8 +316,17 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                [+-]? 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; }
 
+               "'"                             { escaped = false; tok += 1; goto character; }
+               "\""                    { escaped = false; tok += 1; goto string; }
+               "u8" / "\""             { char_width = 1; }
+               "u" / ['"]              { char_width = 2; }
+               "U" / ['"]              { char_width = 4; }
+               "L" / ['"]              { char_width = SIZEOF_WCHAR_T/8; }
+
                "/*"                    { goto comment; }
                "//"                    { goto comment_sl; }
+
+               "##"                    { NEWTOKEN(PSI_T_CPP_PASTE); goto start; }
                "#"                             { NEWTOKEN(PSI_T_HASH); goto start; }
                "("                             { NEWTOKEN(PSI_T_LPAREN); goto start; }
                ")"                             { NEWTOKEN(PSI_T_RPAREN); goto start; }
@@ -364,7 +363,11 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                "..."                   { 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; }
+               "pragma" W+ "once"      { NEWTOKEN(PSI_T_PRAGMA_ONCE); goto start; }
+               "__restrict"    { NEWTOKEN(PSI_T_CPP_RESTRICT); goto start; }
+               "__extension__" { NEWTOKEN(PSI_T_CPP_EXTENSION); goto start; }
+               "__asm__"               { NEWTOKEN(PSI_T_CPP_ASM); goto start; }
+               "line"                  { NEWTOKEN(PSI_T_LINE); goto start; }
                'IF'                    { NEWTOKEN(PSI_T_IF); goto start; }
                'IFDEF'                 { NEWTOKEN(PSI_T_IFDEF); goto start; }
                'IFNDEF'                { NEWTOKEN(PSI_T_IFNDEF); goto start; }
@@ -440,9 +443,7 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
                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_HEADER              { tok += 1; cur -= 1; NEWTOKEN(PSI_T_CPP_HEADER); cur += 1; goto start; }
                CPP_ATTRIBUTE   { parens = 2; goto cpp_attribute; }
                EOL                             { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
                SP+                             { NEWTOKEN(PSI_T_WHITESPACE); goto start; }
@@ -451,6 +452,25 @@ struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input
 
                */
 
+       character: ;
+               /*!re2c
+
+               "'"             { if (escaped) goto character; cur -= 1; NEWTOKEN(PSI_T_QUOTED_CHAR); cur += 1; token->flags = char_width; goto start; }
+               EOL             { NEWLINE(); goto character; }
+               "\\"    { escaped = !escaped; }
+               *               { goto character; }
+
+               */
+       string: ;
+               /*!re2c
+
+               "\""    { if (escaped) goto string; cur -= 1; NEWTOKEN(PSI_T_QUOTED_STRING); cur += 1; token->flags = char_width; goto start; }
+               EOL             { NEWLINE(); goto string; }
+               "\\"    { escaped = !escaped; goto string; }
+               *               { goto string; }
+
+               */
+
        comment: ;
                /*!re2c
 

diff --git a/src/parser_proc.c b/src/parser_proc.c
index 30a7e38251fbb2d08848e4c2907f48a437fb58fd..8dfc9bc5e3ff7127b9634cf9fba60863179d70ae 100644 (file)
--- a/src/parser_proc.c
+++ b/src/parser_proc.c
@@ -285,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  133
+#define YYFINAL  162
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2352
+#define YYLAST   3077
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  127
+#define YYNTOKENS  132
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  110
+#define YYNNTS  118
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  437
+#define YYNRULES  464
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  645
+#define YYNSTATES  680
 /* 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
@@ -305,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   381
+#define YYMAXUTOK   386
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -351,57 +351,60 @@ static const unsigned char yytranslate[] =
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126
+     125,   126,   127,   128,   129,   130,   131
 };
 
 #if YYDEBUG
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   389,   389,   389,   389,   389,   389,   389,   389,   389,
-     389,   389,   389,   389,   389,   389,   389,   389,   389,   389,
-     390,   390,   390,   390,   391,   391,   391,   391,   391,   391,
-     391,   391,   391,   391,   391,   391,   391,   391,   391,   391,
+       0,   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,   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
+     393,   393,   393,   393,   394,   394,   394,   394,   394,   394,
+     394,   394,   394,   394,   394,   394,   394,   394,   394,   394,
+     394,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   395,   395,   395,   395,   395,   395,   395,
+     395,   395,   395,   399,   400,   403,   404,   407,   408,   409,
+     410,   416,   424,   427,   430,   431,   434,   437,   440,   443,
+     449,   455,   458,   464,   487,   491,   495,   500,   504,   508,
+     512,   519,   520,   524,   525,   529,   530,   531,   535,   536,
+     540,   541,   545,   546,   547,   551,   552,   556,   557,   558,
+     559,   560,   561,   565,   570,   578,   581,   585,   590,   598,
+     601,   605,   609,   616,   620,   624,   628,   633,   643,   653,
+     658,   663,   669,   678,   681,   685,   689,   695,   702,   708,
+     709,   710,   711,   715,   718,   725,   726,   727,   728,   729,
+     733,   739,   740,   748,   758,   766,   774,   782,   785,   789,
+     793,   797,   802,   807,   815,   816,   817,   820,   826,   829,
+     832,   838,   839,   840,   841,   842,   843,   844,   845,   849,
+     850,   854,   857,   860,   866,   869,   872,   880,   892,   895,
+     898,   905,   908,   918,   921,   924,   927,   928,   932,   935,
+     938,   949,   952,   958,   959,   963,   964,   968,   972,   978,
+     979,   985,   992,  1000,  1007,  1018,  1019,  1023,  1030,  1041,
+    1052,  1066,  1067,  1079,  1082,  1085,  1088,  1094,  1097,  1107,
+    1120,  1125,  1133,  1143,  1153,  1156,  1160,  1166,  1169,  1175,
+    1183,  1190,  1193,  1199,  1204,  1212,  1216,  1220,  1224,  1228,
+    1232,  1239,  1243,  1247,  1251,  1258,  1271,  1284,  1297,  1300,
+    1307,  1310,  1316,  1320,  1327,  1330,  1336,  1339,  1345,  1346,
+    1352,  1355,  1367,  1370,  1377,  1382,  1387,  1397,  1400,  1406,
+    1409,  1415,  1422,  1429,  1430,  1431,  1432,  1433,  1434,  1435,
+    1436,  1437,  1441,  1444,  1450,  1453,  1456,  1459,  1462,  1468,
+    1472,  1480,  1481,  1485,  1492,  1495,  1498,  1501,  1504,  1510,
+    1514,  1522,  1529,  1537,  1545,  1546,  1547,  1548,  1549,  1550,
+    1551,  1552,  1553,  1554,  1558,  1561,  1567,  1570,  1576,  1577,
+    1581,  1584,  1590,  1593,  1599,  1606,  1613,  1616,  1619,  1626,
+    1631,  1639,  1640,  1641,  1642,  1643,  1644,  1645,  1646,  1650,
+    1653,  1659,  1662,  1668,  1675,  1676,  1680,  1687,  1690,  1696,
+    1704,  1707,  1713,  1716,  1722
 };
 #endif
 
@@ -420,115 +423,123 @@ static const char *const yytname[] =
   "\"^\"", "\"&\"", "\"<<\"", "\">>\"", "\"+\"", "\"-\"", "\"*\"", "\"/\"",
   "\"%\"", "\"<\"", "\">\"", "\">=\"", "\"<=\"", "\"||\"", "\"&&\"",
   "\"==\"", "\"!=\"", "\"~\"", "\"!\"", "\".\"", "\"\\\\\"", "\"...\"",
-  "\"?\"", "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",
+  "\"?\"", "PRAGMA", "PRAGMA_ONCE", "LINE", "ERROR", "WARNING", "IF",
+  "IFDEF", "IFNDEF", "ELSE", "ELIF", "ENDIF", "DEFINE", "DEFINED", "UNDEF",
+  "IMPORT", "INCLUDE", "INCLUDE_NEXT", "TYPEDEF", "STRUCT", "UNION",
+  "ENUM", "CONST", "LIB", "STATIC", "CALLBACK", "FUNCTION", "LET", "SET",
+  "TEMP", "FREE", "RETURN", "PRE_ASSERT", "POST_ASSERT", "BOOLVAL",
+  "INTVAL", "STRVAL", "PATHVAL", "STRLEN", "FLOATVAL", "ARRVAL", "OBJVAL",
+  "COUNT", "CALLOC", "TO_BOOL", "TO_INT", "TO_STRING", "TO_FLOAT",
+  "TO_ARRAY", "TO_OBJECT", "COMMENT", "WHITESPACE", "NO_WHITESPACE",
+  "CPP_HEADER", "CPP_ATTRIBUTE", "CPP_EXTENSION", "CPP_PASTE",
+  "CPP_RESTRICT", "CPP_ASM", "BINARY", "UNARY", "$accept",
+  "binary_op_token", "unary_op_token", "name_token", "any_noeol_token",
+  "file", "blocks", "block", "lib", "cpp", "cpp_exp", "cpp_ignored_token",
+  "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",
-  "cpp_macro_call_args", "cpp_macro_call_arg_list", "constant",
-  "constant_type", "constant_type_token", "impl_def_val",
-  "impl_def_val_token", "decl_typedef", "typedef", "const_decl_type",
-  "decl_type", "decl_type_complex", "decl_type_simple", "decl_real_type",
+  "cpp_special_name_token", "cpp_macro_decl", "cpp_macro_sig",
+  "cpp_macro_sig_args", "cpp_macro_decl_tokens",
+  "cpp_macro_decl_token_list", "cpp_macro_exp", "cpp_macro_call_args",
+  "cpp_macro_call_arg_list", "constant", "constant_type",
+  "constant_type_token", "impl_def_val", "impl_def_val_token",
+  "decl_typedef", "typedef", "const_decl_type", "decl_type",
+  "decl_type_complex", "decl_type_simple", "decl_real_type",
   "decl_stdint_type", "int_signed", "int_width", "decl_int_type",
   "int_signed_types", "signed_short_types", "signed_long_types",
-  "int_width_types", "decl_stmt", "decl", "decl_fn", "decl_functor",
-  "decl_func", "decl_args", "decl_arg", "decl_var", "decl_union",
-  "decl_struct", "decl_struct_args", "struct_args_block", "struct_args",
-  "struct_arg", "decl_enum", "decl_enum_items", "decl_enum_item",
-  "num_exp", "number", "enum_name", "union_name", "struct_name",
-  "optional_name", "decl_layout", "align_and_size", "array_size",
-  "indirection", "pointers", "impl", "impl_func", "impl_args", "impl_arg",
-  "impl_var", "impl_type", "impl_type_token", "impl_stmts", "impl_stmt",
-  "let_stmt", "let_exp", "let_exp_byref", "let_exp_assign", "let_calloc",
-  "let_callback", "let_func", "let_func_token", "let_func_exps",
-  "let_exps", "callback_rval", "callback_arg_list", "callback_args",
-  "return_stmt", "set_stmt", "set_exp", "set_func", "set_func_token",
-  "set_func_exps", "set_exps", "assert_stmt", "assert_stmt_token",
-  "free_stmt", "free_exps", "free_exp", "decl_vars", "reference", "byref", YY_NULLPTR
+  "int_width_types", "decl_stmt", "decl_asm", "ignored_quoted_strings",
+  "decl_ext_var_stmt", "decl_ext_var", "decl_ext_var_list", "decl",
+  "decl_fn", "decl_functor", "decl_func", "decl_args", "decl_arg",
+  "decl_var", "decl_union", "decl_struct", "decl_struct_args",
+  "struct_args_block", "struct_args", "struct_arg", "decl_enum",
+  "decl_enum_items", "decl_enum_item", "num_exp", "number", "enum_name",
+  "union_name", "struct_name", "optional_name", "decl_layout",
+  "align_and_size", "array_size", "indirection", "pointers", "asterisks",
+  "impl", "impl_func", "impl_args", "impl_arg", "impl_var", "impl_type",
+  "impl_type_token", "impl_stmts", "impl_stmt", "let_stmt", "let_exp",
+  "let_exp_byref", "let_exp_assign", "let_calloc", "let_callback",
+  "let_func", "let_func_token", "let_func_exps", "let_exps",
+  "callback_rval", "callback_arg_list", "callback_args", "return_stmt",
+  "set_stmt", "set_exp", "set_func", "set_func_token", "set_func_exps",
+  "set_exps", "assert_stmt", "assert_stmt_token", "free_stmt", "free_exps",
+  "free_exp", "decl_vars", "reference", "byref", YY_NULLPTR
 };
 #endif
 
-#define YYPACT_NINF -505
-#define YYTABLE_NINF -436
+#define YYPACT_NINF -547
+#define YYTABLE_NINF -463
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const short int yypact[] =
 {
-    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
+     919,  -547,  -547,  -547,  -547,  -547,    56,  -547,  -547,  1936,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  2491,  -547,
+    -547,   236,  2541,  2319,  2319,  2319,  1554,     9,   -63,    21,
+    -547,  2568,    73,   919,  -547,  -547,  -547,  -547,  -547,  1985,
+    -547,  -547,  -547,  -547,  -547,   104,    78,  -547,  -547,  -547,
+      43,   -10,    67,  -547,  -547,  -547,  -547,  -547,  -547,    81,
+    -547,    87,  -547,  -547,  -547,  -547,  -547,   629,  -547,    80,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  2103,
+     -38,  -547,  -547,  -547,  2319,  2319,  2319,  2672,   100,    58,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,   878,  -547,  -547,  -547,  -547,   108,   759,   759,
+      -9,  -547,   878,  1818,  2595,  2319,  2319,   110,  1582,  -547,
+     111,  2319,   115,   115,    -6,    -6,   117,  -547,  -547,   130,
+     142,  -547,    80,   148,  -547,  -547,   144,   140,  -547,   154,
+    -547,   -10,  -547,  -547,   150,  -547,   155,  2319,  -547,   189,
+    -547,    38,  -547,  -547,   104,  -547,  -547,   158,   160,  2645,
+    2319,   165,  2319,  -547,    80,  -547,  -547,  -547,  -547,  -547,
+    -547,  2645,  1985,  -547,  -547,  -547,  -547,  -547,  -547,    75,
+     759,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,   759,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  1818,  -547,  -547,  -547,
+    -547,  2152,  1818,   163,  2934,    59,  -547,    59,  -547,  -547,
+    -547,  -547,   164,   162,   162,     3,     3,  2270,   166,  -547,
+     165,   168,   171,   176,  -547,    80,   150,  -547,  -547,  -547,
+    -547,  -547,  -547,   177,  -547,    80,  2699,  1985,    72,  -547,
+     169,    51,  -547,  1985,  1397,  1985,  2319,    71,  -547,  -547,
+     123,  -547,  -547,  -547,  -547,  -547,  1700,  -547,   175,  2319,
+      82,  -547,  2319,   170,   178,  -547,  -547,  2780,  2319,  -547,
+    -547,  1818,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+    1818,  1818,   179,  2541,  1985,  1985,  -547,  -547,  -547,  -547,
+      80,  -547,    27,   149,    36,  -547,   174,  2319,  -547,  -547,
+      24,  2319,    80,   150,  1013,  1700,  2319,  -547,   183,   191,
+    -547,  -547,  -547,  1043,  1700,  -547,  2958,  -547,   184,   195,
+    -547,   196,   188,   187,   198,    55,  -547,  -547,   200,   196,
+    -547,  -547,  2744,  -547,   203,   150,  2436,  1985,  2319,  -547,
+     204,  2934,   205,   199,  2885,  -547,   212,   214,  2464,  -547,
+    -547,  -547,  2319,  -547,  -547,  -547,  -547,  -547,   209,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,
+     215,   102,  -547,    21,  -547,  -547,   218,  -547,  -547,  2319,
+    -547,    80,   219,  -547,  2958,  -547,  1161,  -547,   220,  2735,
+     221,  2807,  -547,  1700,  1700,  1397,  -547,  1985,  -547,    21,
+    1985,  -547,  2319,  -547,  -547,  -547,  -547,   234,  -547,  -547,
+     235,   237,  -547,  -547,  1818,  1818,   238,   239,   242,  -547,
+    -547,   246,  -547,   344,   240,   344,   230,  -547,   150,  -547,
+     182,   258,  2958,  -547,  -547,  -547,  -547,   259,  1515,  1700,
+    -547,  2910,  -547,  -547,   260,  1985,   129,  -547,   150,   759,
+    2319,  2934,  2982,   265,   261,  -547,  -547,  -547,   344,  -547,
+      21,    27,  -547,  -547,  -547,  -547,   266,  1700,    21,  -547,
+    -547,  1700,   459,   264,   269,  -547,  -547,  -547,  -547,   281,
+     292,  -547,     0,  -547,    21,  2860,   286,  3006,   288,  -547,
+     289,  -547,  -547,  -547,   290,   296,   293,  1700,  1161,   294,
+    -547,  1397,   299,   297,  1279,  2834,   183,  -547,  -547,  -547,
+     295,  1515,  -547,  -547,   298,   300,   303,   305,  -547,  -547,
+    1161,  -547,  -547,   344,   304,  1397,  -547,  -547,  -547,  -547
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -536,103 +547,108 @@ static const short int yypact[] =
      means the default is an error.  */
 static const unsigned short int yydefact[] =
 {
-     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,
+     163,   284,   281,   285,   279,   280,   282,   268,   269,     0,
+     271,   272,   273,   274,   275,   276,   277,   278,   267,   168,
+     167,     0,     0,     0,     0,   358,     0,     0,     0,   462,
+     169,     0,     0,   164,   165,   171,   170,   172,   175,   366,
+     258,   260,   259,   265,   266,   288,   298,   264,   173,   174,
+       0,   303,     0,   316,   315,   321,   177,   176,   178,     0,
+     179,     0,   283,   270,    32,    33,   448,   414,    24,   366,
+     370,    38,    37,    36,    34,    35,    31,    30,    28,    27,
+      25,    26,   422,   421,   419,   417,   418,   420,   416,   415,
+     423,    29,   446,   444,   443,   445,   442,   441,   322,     0,
+     368,    39,    40,   267,     0,     0,     0,     0,     0,   309,
+     181,   192,   189,   191,   193,   194,   205,   202,   203,   200,
+     206,   201,     0,   204,   195,   196,   197,     0,   219,   219,
+       0,   185,     0,     0,   267,   358,   358,     0,   366,   252,
+     251,     0,   362,   362,   261,   262,   263,   355,   239,   285,
+     268,   242,     0,     0,   238,   257,     0,     0,   464,     0,
+     463,   303,     1,   166,   364,   327,     0,   367,   289,   293,
+     291,   295,   286,   299,   288,   287,   307,     0,     0,   323,
+       0,     0,     0,   367,   366,   329,   371,   369,   261,   262,
+     263,   323,     0,   308,   208,   209,   210,   212,   211,   207,
+     219,   187,   182,    74,    41,    42,    43,    44,    45,    46,
+      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
+      67,    68,    69,    70,    71,    72,    73,    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,   114,   112,   113,   111,   109,   110,   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,   155,   156,   157,
+     158,   161,   159,   160,   162,   221,   190,   220,   183,   198,
+     199,   184,   207,   186,   229,   230,     0,    22,    23,    20,
+      21,     0,     0,   231,   188,   261,   357,   262,   356,   250,
+     256,   253,     0,     0,     0,     0,     0,     0,     0,   180,
+       0,     0,     0,     0,   331,   366,   364,   294,   290,   296,
+     297,   292,   300,     0,   301,   324,     0,     0,     0,   325,
+     343,     0,   341,     0,   462,     0,     0,     0,   454,   455,
+       0,   392,   395,   394,   396,   397,     0,   398,     0,     0,
+       0,   460,     0,   310,     0,   214,   222,     0,     0,   227,
+     224,   233,     2,     3,     4,     5,     6,     7,     8,     9,
       10,    11,    13,    12,    14,    15,    16,    17,    18,    19,
-       0,     0,     0,     0,     0,     0,   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
+       0,     0,     0,     0,     0,     0,   334,   333,   335,   332,
+     366,   328,   243,     0,     0,   302,     0,     0,   330,   305,
+       0,     0,     0,   364,     0,     0,     0,   340,     0,     0,
+     352,   351,   353,     0,     0,   354,   437,   345,     0,     0,
+     436,    40,     0,     0,     0,     0,   457,   447,     0,     0,
+     372,   393,     0,   320,     0,   364,     0,     0,   215,   223,
+       0,   235,     0,   234,     0,   225,     0,   360,     0,   337,
+     255,   254,     0,   245,   247,   248,   246,   249,     0,   244,
+     373,   385,   386,   387,   388,   384,   389,   390,   391,   383,
+       0,     0,   377,   462,   382,   365,     0,   306,   304,     0,
+     311,     0,     0,   326,   344,   342,     0,   399,    24,     0,
+       0,     0,   349,     0,     0,   462,   435,     0,   381,   462,
+       0,   456,     0,   434,   453,   319,   313,     0,   461,   217,
+       0,   216,   228,   232,     0,     0,     0,     0,     0,   336,
+     338,     0,   237,     0,     0,     0,   379,   317,   364,   404,
+      30,    29,   408,   409,   405,   406,   407,    39,     0,     0,
+     347,     0,   348,   438,   449,     0,     0,   458,   364,   219,
+       0,   236,   226,     0,     0,   339,   318,   374,     0,   378,
+     462,   243,   312,   428,   414,   429,     0,     0,   462,   410,
+     346,     0,   462,     0,     0,   459,   314,   213,   218,     0,
+       0,   375,     0,   380,   462,     0,   424,   350,     0,   451,
+     450,   439,   400,   363,     0,     0,     0,     0,     0,     0,
+     440,   462,     0,     0,   430,     0,   354,   426,   403,   401,
+     425,     0,   413,   452,     0,     0,     0,   431,   432,   411,
+       0,   402,   361,     0,     0,   462,   427,   376,   412,   433
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -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
+    -547,  -331,  -129,    -2,    22,  -547,  -547,   315,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -547,  -547,  -547,   231,  -547,
+    -547,  -547,  -126,  -547,  -324,  -547,  -547,  -547,  -547,  -547,
+    -260,  -547,  -547,   331,   -17,   -24,  -547,  -547,  -547,   224,
+     319,  -547,  -547,   192,  -547,  -547,  -547,  -547,   206,  -547,
+    -547,  -547,  -547,    26,     6,  -547,  -547,   180,    -7,   -39,
+    -547,  -547,    12,  -183,  -547,  -128,    33,  -547,   -87,  -386,
+    -547,  -547,  -547,  -547,    40,  -547,   -27,  -360,   -60,    -1,
+    -547,  -547,   345,  -547,  -203,  -482,  -546,  -547,    15,  -362,
+    -547,  -294,  -506,    -5,  -547,  -547,  -547,  -516,  -547,  -547,
+    -547,  -547,  -547,  -547,  -547,  -508,    -8,  -368,  -547,  -547,
+    -547,  -547,  -547,  -547,  -175,  -169,   -28,  -522
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const short int yydefgoto[] =
 {
-      -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
+      -1,   544,   464,   164,   325,    32,    33,    34,    35,    36,
+     127,   128,   129,   130,   331,   131,   132,   133,   200,   201,
+     560,   561,   326,   327,   344,   492,   493,    37,   153,   154,
+     508,   509,    38,   497,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,   172,   368,   371,   175,    48,   178,   450,
+      49,    50,   193,   139,    52,    53,    54,   378,    55,   465,
+      56,    57,   437,   438,   498,   499,   141,   381,   382,   466,
+     467,    59,   142,   143,   147,   568,   353,   364,   166,   402,
+     100,    60,    61,   521,   522,   468,   523,   524,   390,   391,
+     392,   657,   658,   659,   584,   585,   586,   101,   649,   660,
+     616,   666,   667,   393,   394,   469,   470,   102,   623,   640,
+     395,   396,   397,   475,   476,   403,   472,   160
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -640,482 +656,626 @@ static const short int yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const short int yytable[] =
 {
-     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,
+     165,   159,   155,   328,   342,   138,   448,    98,    99,   182,
+     482,   109,   407,   431,   588,   140,   471,   186,   410,   479,
+     587,   144,   145,   146,   108,   329,    51,   607,   481,   610,
+     583,  -362,   548,    58,    29,   352,  -362,   593,   167,   511,
+     436,   576,   512,   156,   369,   433,   513,   370,   514,   515,
+     516,   517,   518,   519,   503,   504,   505,   161,   527,    51,
+     506,   507,   631,   528,   615,    62,    58,    63,   183,   534,
+     645,   158,   587,   162,   405,   520,   431,   541,   542,   431,
+     176,   481,   619,   155,   173,     4,     5,   491,    66,   477,
+     187,   456,   551,   530,   457,   552,  -321,   185,   192,   165,
+    -359,  -359,   188,   189,   190,   179,   494,   495,   168,   169,
+     170,   453,   454,   171,   639,   330,   354,   355,   356,   177,
+     199,   485,   486,   180,   399,   556,   661,   677,   576,   181,
+     332,   343,   587,   345,   347,    70,   636,   167,   191,   351,
+     108,   574,   575,   663,   202,   587,   668,   349,   661,  -321,
+     582,   357,   646,   401,   587,   671,   352,   591,   592,  -359,
+     431,  -240,   377,   431,   431,   366,   480,   679,   625,   487,
+     434,   435,   379,  -241,   377,   346,   348,   471,   380,   358,
+     398,   359,   360,   183,   379,   361,    92,    93,    94,    95,
+      96,    97,   510,   365,   363,   367,   373,   374,   404,   613,
+     614,   411,   582,   620,   433,   432,   444,   342,   445,   446,
+     487,   449,   442,   342,   483,   455,   488,   496,   612,   525,
+     548,   383,   384,   385,   386,   387,   388,   389,   537,   536,
+     545,   635,   546,   549,   547,   637,   550,   553,   626,   564,
+     601,   602,   555,   562,   563,   566,   572,   383,   384,   385,
+     386,   387,   388,   389,   471,   567,   573,   577,   578,   -24,
+     589,   655,   582,   383,   384,   385,   386,   387,   388,   389,
+     431,   431,   110,   598,   599,   582,   611,   600,   603,   605,
+     604,   608,   342,   471,   582,   606,   471,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,   617,   618,   629,   630,
+     622,   342,   342,   641,   634,   447,   642,   471,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,   121,   122,
+     643,   123,   124,   125,   126,   644,   648,   650,   653,   651,
+     652,   654,   664,   662,   343,   670,   665,   672,   165,   409,
+     343,   673,   674,   678,   458,   675,   473,   511,   163,   406,
+     512,   633,   155,   137,   513,   441,   514,   515,   516,   517,
+     518,   519,   350,   333,   183,   174,   372,   362,   439,   535,
+     570,   400,   609,   157,   451,   443,   676,   597,   459,   478,
+     502,   596,     0,     0,   474,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   500,   501,   484,     0,     0,
+     366,     0,     0,     0,     0,     0,   490,     0,     0,   343,
+       0,     0,     0,     0,     0,     0,   138,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   140,     0,   343,   343,
+       0,     0,     0,     0,     0,   342,   342,   377,     0,   183,
+       0,     0,     0,     0,     0,   526,   540,   533,   558,   185,
+       0,   529,     0,     0,   380,     0,     0,     0,     0,     0,
+       0,     0,    64,     0,     0,     0,     0,     0,     0,   377,
+       0,    65,     0,   627,     0,     0,    66,    67,     0,   533,
+       0,   138,     0,     0,     0,     0,   559,     0,     0,    68,
+     460,   140,   461,     0,   462,     0,     0,   463,     0,     0,
+     571,     0,     0,     0,     0,     0,     0,     0,   594,   158,
+       0,   401,   337,   338,    70,   155,     0,     0,     0,     0,
+       0,   595,     0,     0,     0,   339,   340,   441,     0,   638,
+     451,    71,    72,    73,    74,    75,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     474,     0,     0,    76,     0,    77,   624,    78,    79,    80,
+      81,     0,   343,   343,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+       0,     0,   632,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   628,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   656,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  -414,
+       0,   656,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
+    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
+    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
+    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
+    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
+    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
+    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
+    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
+    -414,  -414,  -414,  -414,  -414,     0,  -414,     0,  -414,  -414,
+    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
+    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
+    -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,  -414,
+    -414,     0,  -414,  -414,     0,  -414,  -414,  -414,  -414,   203,
+       0,     0,   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,     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,
+     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
+     232,   233,   234,   235,   236,     0,   237,   238,   239,   240,
+     241,   242,   243,   244,   245,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   255,   256,   257,   258,   259,   260,
+     261,   262,   263,   264,   265,   266,   267,   268,   269,   270,
+     271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
+     281,   282,   283,   284,   285,     0,   286,     0,   287,   288,
+     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
+     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     319,    64,     0,   320,     0,   321,   322,   323,   324,     0,
+      65,     0,     0,     0,     0,    66,    67,     0,     0,     0,
+       0,     0,     0,     0,     0,   194,   195,   196,    68,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     1,     2,     3,     4,     5,     6,     7,
        8,     0,     0,     0,     0,     0,     9,     0,    10,    11,
       12,    13,    14,    15,    16,    17,     0,     0,     0,    18,
-       0,     0,     0,     0,     0,    19,    20,     0,     0,     0,
+      71,    72,    73,    74,    75,    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,
+       0,     0,    76,     0,    77,     0,    78,    79,    80,    81,
+       0,     0,     0,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    95,    96,    97,     0,
+       0,     0,     0,     0,   197,     0,   198,     0,    22,    23,
+      24,    25,    26,    27,    28,     0,    29,     1,     2,     3,
+       4,     5,     6,     7,     8,     0,     0,     0,     0,     0,
+     531,     0,    10,    11,    12,    13,    14,    15,    16,    17,
+      30,     0,     0,   103,     0,    31,    64,     1,     2,     3,
+       4,     5,     6,     7,     8,    65,     0,     0,     0,     0,
+      66,    67,    10,    11,    12,    13,    14,    15,    16,    17,
+       0,     0,     0,   538,   460,     0,   461,     0,   462,     0,
+       0,   463,     0,   532,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   337,   338,    70,     0,
+       0,     0,     0,   104,   105,   106,   376,     0,     0,   339,
+     340,     0,     0,     0,     0,    71,    72,    73,    74,    75,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   104,   105,   106,   539,    76,     0,    77,
+       0,    78,    79,    80,    81,     0,     0,     0,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    64,     0,     0,     0,     0,     0,
+       0,     0,     0,    65,     0,     0,     0,     0,    66,    67,
+       0,     0,     0,     0,     0,     0,     0,     0,   579,     0,
+       0,    68,   460,     0,   461,     0,   462,     0,     0,   463,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   158,     0,     0,   337,   338,    70,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   339,   340,     0,
+       0,     0,     0,    71,    72,    73,    74,    75,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    76,     0,   580,     0,    78,
+      79,    80,    81,     0,     0,     0,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,   581,    92,    93,    94,    95,
+      96,    97,    64,     0,     0,     0,     0,     0,     0,     0,
+       0,    65,     0,     0,     0,     0,    66,    67,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    68,
+     460,  -462,   461,     0,   462,     0,     0,   463,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   158,
+       0,     0,   337,   338,    70,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   339,   340,     0,     0,     0,
+       0,    71,    72,    73,    74,    75,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    76,     0,    77,     0,    78,    79,    80,
+      81,     0,     0,     0,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      64,     0,     0,     0,     0,     0,     0,     0,     0,    65,
+       0,     0,     0,     0,    66,    67,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    68,   460,     0,
+     461,     0,   462,     0,     0,   463,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   158,     0,     0,
+     337,   338,    70,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   339,   340,     0,     0,     0,     0,    71,
+      72,    73,    74,    75,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    76,     0,    77,     0,    78,    79,    80,    81,     0,
+       0,     0,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    64,     0,
+       0,     0,     0,     0,     0,     0,     0,    65,     0,     0,
+       0,     0,    66,    67,     0,     0,     0,     0,     0,     0,
+       0,     0,   579,     0,     0,    68,   460,     0,   461,     0,
+     462,     0,     0,   463,     0,     0,     0,   148,     1,     2,
+     149,     4,     5,     6,   150,     8,   151,     0,   337,   338,
+      70,   152,     0,    10,    11,    12,    13,    14,    15,    16,
+      17,   339,   340,     0,   103,    64,     0,    71,    72,    73,
+      74,    75,     0,     0,    65,     0,     0,     0,     0,    66,
+      67,    10,    11,    12,    13,    14,    15,    16,    17,    76,
+       0,   580,    68,    78,    79,    80,    81,     0,     0,     0,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,   581,
+      92,    93,    94,    95,    96,    97,     0,    70,     0,     0,
+       0,     0,     0,     0,   104,   105,   106,     0,     0,     0,
+       0,     0,     0,     0,    71,    72,    73,    74,    75,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    76,     0,    77,     0,
+      78,    79,    80,    81,     0,     0,     0,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    64,     0,     0,     0,     0,     0,     0,
+       0,     0,    65,     0,     0,     0,     0,    66,    67,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      68,   460,     0,   461,     0,   462,     0,     0,   463,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   337,   338,    70,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   339,   340,     0,     0,
+       0,     0,    71,    72,    73,    74,    75,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    76,     0,    77,     0,    78,    79,
+      80,    81,     0,     0,     0,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    64,     0,     0,     0,     0,     0,     0,     0,     0,
+      65,     0,     0,     0,     0,    66,    67,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    68,     0,
+       0,   334,     0,   335,     0,     0,   336,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   337,   338,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   339,   340,     0,     0,     0,     0,
+      71,    72,    73,    74,    75,     0,     0,     0,     0,     0,
+       0,     0,   341,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    76,     0,    77,     0,    78,    79,    80,    81,
+       0,     0,     0,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    94,    95,    96,    97,    64,
+       0,     0,     0,     0,     0,     0,     0,     0,    65,     0,
+       0,     0,     0,    66,    67,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    68,     0,     0,     0,
+       0,     0,     0,     0,    69,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    64,     0,
+       0,    70,     0,     0,     0,     0,     0,    65,     0,     0,
+       0,     0,    66,    67,     0,     0,     0,     0,    71,    72,
+      73,    74,    75,     0,     0,    68,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      76,     0,    77,     0,    78,    79,    80,    81,     0,     0,
+      70,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,    95,    96,    97,    71,    72,    73,
+      74,    75,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    76,
+       0,    77,     0,    78,    79,    80,    81,     0,     0,     0,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    64,     0,     0,     0,
+       0,     0,     0,     0,     0,    65,     0,     0,     0,     0,
+      66,    67,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    68,     0,     0,     0,     0,     0,     0,
+       0,   184,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    64,     0,     0,     0,     0,
+       0,     0,     0,     0,    65,     0,     0,     0,     0,    66,
+      67,     0,     0,     0,     0,    71,    72,    73,    74,    75,
+       0,     0,    68,     0,     0,     0,     0,     0,     0,     0,
+     408,     0,     0,     0,     0,     0,     0,    76,     0,    77,
+       0,    78,    79,    80,    81,     0,     0,     0,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    71,    72,    73,    74,    75,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    76,     0,    77,     0,
+      78,    79,    80,    81,     0,     0,     0,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    64,     0,     0,     0,     0,     0,     0,
+       0,     0,    65,     0,     0,     0,     0,    66,    67,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      68,     0,     0,     0,     0,     0,     0,     0,   440,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    64,     0,     0,     0,     0,     0,     0,     0,
+       0,    65,     0,     0,     0,     0,    66,    67,     0,     0,
+       0,     0,    71,    72,    73,    74,    75,     0,     0,    68,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    76,     0,    77,     0,    78,    79,
+      80,    81,     0,     0,     0,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    71,    72,    73,    74,    75,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    76,     0,    77,     0,    78,    79,    80,
+      81,     0,     0,     0,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+       1,     2,     3,     4,     5,     6,     7,     8,     0,     0,
+       0,     0,     0,   531,     0,    10,    11,    12,    13,    14,
+      15,    16,    17,     0,     0,     0,   103,     0,     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,     9,     0,    10,    11,    12,    13,    14,    15,    16,
+      17,     0,     0,     0,   134,     1,     2,     3,     4,     5,
+       6,     7,     8,     0,     0,     0,   557,   569,     9,     0,
+      10,    11,    12,    13,    14,    15,    16,    17,     0,     0,
+       0,   103,     0,     0,     0,     0,   104,   105,   106,   376,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     1,     2,     3,     4,     5,
+       6,     7,     8,     0,   135,   136,    25,   107,     9,     0,
+      10,    11,    12,    13,    14,    15,    16,    17,     0,     0,
+       0,   134,     1,     2,     3,     4,     5,     6,     7,     8,
+       0,   104,   105,   106,   107,     9,     0,    10,    11,    12,
+      13,    14,    15,    16,    17,     0,     0,     0,   134,     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,   103,     0,     0,     0,     0,
+       0,   135,   136,    25,   107,     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,
+     106,   107,   375,     0,    10,    11,    12,    13,    14,    15,
+      16,    17,     0,     0,     0,   103,     1,     2,     3,     4,
+       5,     6,     7,     8,     0,   104,   105,   106,   107,   152,
        0,    10,    11,    12,    13,    14,    15,    16,    17,     0,
-       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,
+       0,     0,   103,     1,     2,     3,     4,     5,     6,     7,
+       8,     0,     0,     0,     0,     0,   452,     0,    10,    11,
+      12,    13,    14,    15,    16,    17,     0,     0,     0,   103,
+       0,     0,     0,     0,     0,   104,   105,   106,   376,     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
+       0,     0,     0,     0,    10,    11,    12,    13,    14,    15,
+      16,    17,   104,   105,   106,   103,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   554,     0,     0,     0,     0,     0,     0,     0,   104,
+     105,   106,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+       0,     0,     0,     0,     0,   543,     0,     0,     0,   489,
+       0,     0,     0,     0,     0,   104,   105,   106,   412,   413,
+     414,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,   590,     0,     0,     0,
+       0,   430,     0,     0,     0,   412,   413,   414,   415,   416,
+     417,   418,   419,   420,   421,   422,   423,   424,   425,   426,
+     427,   428,   429,   669,     0,     0,     0,     0,   543,     0,
+       0,     0,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+     647,     0,     0,     0,     0,   543,     0,     0,   412,   413,
+     414,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,   565,     0,     0,     0,
+       0,   543,     0,   412,   413,   414,   415,   416,   417,   418,
+     419,   420,   421,   422,   423,   424,   425,   426,   427,   428,
+     429,   621,     0,     0,     0,     0,   430,     0,   412,   413,
+     414,   415,   416,   417,   418,   419,   420,   421,   422,   423,
+     424,   425,   426,   427,   428,   429,     0,     0,     0,     0,
+       0,   543,   412,   413,   414,   415,   416,   417,   418,   419,
+     420,   421,   422,   423,   424,   425,   426,   427,   428,   429,
+       0,     0,     0,     0,     0,   430,   412,   413,   414,   415,
+     416,   417,   418,   419,   420,   421,   422,   423,   424,   425,
+     426,   427,   428,   429,     0,     0,     0,     0,     0,   543,
+     412,   413,   414,   415,   416,   417,   418,   419,   420,   421,
+     422,   423,   424,   425,   426,   427,   428,   429,     0,     0,
+       0,     0,     0,   430,   412,   413,   414,   415,   416,   417,
+     418,   419,   420,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,     0,     0,     0,     0,     0,   543
 };
 
 static const short int yycheck[] =
 {
-      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,
+      39,    29,    26,   129,   133,    22,   366,     9,     9,    69,
+     396,    18,   336,   344,   536,    22,   384,    55,   342,   387,
+     536,    23,    24,    25,    18,    34,     0,   573,   390,   575,
+     536,    37,    32,     0,    97,    41,    42,   545,    39,     3,
+      37,   523,     6,    34,     6,    42,    10,     9,    12,    13,
+      14,    15,    16,    17,    27,    28,    29,    31,    34,    33,
+      33,    34,   608,    39,   580,     9,    33,    11,    69,   455,
+      70,    50,   588,     0,   200,    39,   407,   463,   464,   410,
+      37,   443,   588,   107,     6,     7,     8,   411,    17,    18,
+     128,    40,    37,   453,    43,    40,    38,    99,    40,   138,
+      41,    42,   104,   105,   106,    38,   430,   431,     4,     5,
+       6,    39,    40,     9,   622,   124,   143,   144,   145,   129,
+     122,    39,    40,    42,   184,   485,   648,   673,   610,    42,
+     132,   133,   648,   135,   136,    55,   618,   138,    38,   141,
+     134,    39,    40,   651,    36,   661,   654,    37,   670,    38,
+     536,   152,   634,   192,   670,   661,    41,   543,   544,    42,
+     491,    31,   179,   494,   495,   167,    43,   675,    39,    40,
+     353,   354,   179,    31,   191,   135,   136,   545,   180,    31,
+     182,    37,    42,   184,   191,    31,   115,   116,   117,   118,
+     119,   120,    43,    38,    44,     6,    38,    37,   123,    17,
+      18,    38,   588,   589,    42,    41,    38,   336,    37,    33,
+      40,    34,    46,   342,    39,    46,    38,    38,   578,    45,
+      32,    98,    99,   100,   101,   102,   103,   104,    37,    46,
+      46,   617,    37,    46,    38,   621,    38,    37,   598,    40,
+     564,   565,    39,    39,    39,    33,    37,    98,    99,   100,
+     101,   102,   103,   104,   622,    41,    41,    39,    39,    39,
+      39,   647,   648,    98,    99,   100,   101,   102,   103,   104,
+     601,   602,    36,    39,    39,   661,    46,    40,    40,    37,
+      41,    41,   411,   651,   670,    39,   654,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,    38,    38,    33,    38,
+      40,   430,   431,    39,    38,   365,    37,   675,    72,    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,   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,    -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,     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,
+      39,    85,    86,    87,    88,    33,    40,    39,    32,    40,
+      40,    38,    33,    39,   336,    40,    39,    39,   377,   341,
+     342,    41,    39,    39,   383,    40,   385,     3,    33,   327,
+       6,   611,   376,    22,    10,   357,    12,    13,    14,    15,
+      16,    17,   138,   132,   365,    46,   174,   161,   356,   456,
+     498,   191,   575,    28,   375,   360,   670,   552,   383,   387,
+     440,   550,    -1,    -1,   386,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   434,   435,   399,    -1,    -1,
+     402,    -1,    -1,    -1,    -1,    -1,   408,    -1,    -1,   411,
+      -1,    -1,    -1,    -1,    -1,    -1,   433,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   433,    -1,   430,   431,
+      -1,    -1,    -1,    -1,    -1,   564,   565,   454,    -1,   440,
+      -1,    -1,    -1,    -1,    -1,   447,   463,   454,   487,   451,
+      -1,   452,    -1,    -1,   456,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,   486,
+      -1,    12,    -1,   599,    -1,    -1,    17,    18,    -1,   486,
+      -1,   498,    -1,    -1,    -1,    -1,   488,    -1,    -1,    30,
+      31,   498,    33,    -1,    35,    -1,    -1,    38,    -1,    -1,
+     502,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   547,    50,
+      -1,   550,    53,    54,    55,   539,    -1,    -1,    -1,    -1,
+      -1,   549,    -1,    -1,    -1,    66,    67,   529,    -1,    70,
+     531,    72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    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,
+     552,    -1,    -1,    94,    -1,    96,   595,    98,    99,   100,
+     101,    -1,   564,   565,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+      -1,    -1,   610,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   600,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   648,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     0,
+      -1,   670,     3,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
+      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    -1,    89,    90,
+      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+     121,    -1,   123,   124,    -1,   126,   127,   128,   129,     0,
+      -1,    -1,     3,     4,     5,     6,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    -1,    37,    38,    39,    40,
+      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    -1,    87,    -1,    89,    90,
+      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+     121,     3,    -1,   124,    -1,   126,   127,   128,   129,    -1,
+      12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    27,    28,    29,    30,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     4,     5,     6,     7,     8,     9,    10,
       11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    19,    20,
       21,    22,    23,    24,    25,    26,    -1,    -1,    -1,    30,
-      -1,    -1,    -1,    -1,    -1,    36,    37,    -1,    -1,    -1,
+      72,    73,    74,    75,    76,    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,
+      -1,    -1,    94,    -1,    96,    -1,    98,    99,   100,   101,
+      -1,    -1,    -1,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,    -1,
+      -1,    -1,    -1,    -1,   126,    -1,   128,    -1,    89,    90,
+      91,    92,    93,    94,    95,    -1,    97,     4,     5,     6,
+       7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
       17,    -1,    19,    20,    21,    22,    23,    24,    25,    26,
-      66,    67,    -1,    30,    -1,    -1,    72,    73,    74,    75,
+     121,    -1,    -1,    30,    -1,   126,     3,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    -1,    -1,    -1,    -1,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+      -1,    -1,    -1,    30,    31,    -1,    33,    -1,    35,    -1,
+      -1,    38,    -1,    70,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    53,    54,    55,    -1,
+      -1,    -1,    -1,    90,    91,    92,    93,    -1,    -1,    66,
+      67,    -1,    -1,    -1,    -1,    72,    73,    74,    75,    76,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    90,    91,    92,    93,    94,    -1,    96,
+      -1,    98,    99,   100,   101,    -1,    -1,    -1,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,     3,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    27,    -1,
+      -1,    30,    31,    -1,    33,    -1,    35,    -1,    -1,    38,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    50,    -1,    -1,    53,    54,    55,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    -1,
+      -1,    -1,    -1,    72,    73,    74,    75,    76,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    94,    -1,    96,    -1,    98,
+      99,   100,   101,    -1,    -1,    -1,   105,   106,   107,   108,
+     109,   110,   111,   112,   113,   114,   115,   116,   117,   118,
+     119,   120,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,
+      31,    32,    33,    -1,    35,    -1,    -1,    38,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,
+      -1,    -1,    53,    54,    55,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    66,    67,    -1,    -1,    -1,
+      -1,    72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -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,    -1,    -1,    94,    -1,    96,    -1,    98,    99,   100,
+     101,    -1,    -1,    -1,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+       3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,
+      -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,    31,    -1,
+      33,    -1,    35,    -1,    -1,    38,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,
+      53,    54,    55,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    66,    67,    -1,    -1,    -1,    -1,    72,
+      73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    94,    -1,    96,    -1,    98,    99,   100,   101,    -1,
+      -1,    -1,   105,   106,   107,   108,   109,   110,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,     3,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,
+      -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    27,    -1,    -1,    30,    31,    -1,    33,    -1,
+      35,    -1,    -1,    38,    -1,    -1,    -1,     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,     3,    -1,    72,    73,    74,
+      75,    76,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
+      18,    19,    20,    21,    22,    23,    24,    25,    26,    94,
+      -1,    96,    30,    98,    99,   100,   101,    -1,    -1,    -1,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,    90,    91,    92,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    72,    73,    74,    75,    76,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,    -1,
+      98,    99,   100,   101,    -1,    -1,    -1,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      30,    31,    -1,    33,    -1,    35,    -1,    -1,    38,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    53,    54,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    66,    67,    -1,    -1,
+      -1,    -1,    72,    73,    74,    75,    76,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    -1,    96,    -1,    98,    99,
+     100,   101,    -1,    -1,    -1,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    30,    -1,
       -1,    33,    -1,    35,    -1,    -1,    38,    -1,    -1,    -1,
-      -1,    -1,    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,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    53,    54,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    66,    67,    -1,    -1,    -1,    -1,
+      72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    84,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    94,    -1,    96,    -1,    98,    99,   100,   101,
+      -1,    -1,    -1,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,     3,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,
+      -1,    -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    30,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    38,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,
+      -1,    -1,    17,    18,    -1,    -1,    -1,    -1,    72,    73,
+      74,    75,    76,    -1,    -1,    30,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      94,    -1,    96,    -1,    98,    99,   100,   101,    -1,    -1,
+      55,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,    72,    73,    74,
+      75,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    94,
+      -1,    96,    -1,    98,    99,   100,   101,    -1,    -1,    -1,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,     3,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,
+      17,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     3,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,    -1,    17,
+      18,    -1,    -1,    -1,    -1,    72,    73,    74,    75,    76,
+      -1,    -1,    30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      38,    -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,
+      -1,    98,    99,   100,   101,    -1,    -1,    -1,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   114,   115,   116,
+     117,   118,   119,   120,    72,    73,    74,    75,    76,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    94,    -1,    96,    -1,
+      98,    99,   100,   101,    -1,    -1,    -1,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,     3,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      30,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    38,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    12,    -1,    -1,    -1,    -1,    17,    18,    -1,    -1,
+      -1,    -1,    72,    73,    74,    75,    76,    -1,    -1,    30,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    94,    -1,    96,    -1,    98,    99,
+     100,   101,    -1,    -1,    -1,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,    72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    94,    -1,    96,    -1,    98,    99,   100,
+     101,    -1,    -1,    -1,   105,   106,   107,   108,   109,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+       4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
+      -1,    -1,    -1,    17,    -1,    19,    20,    21,    22,    23,
+      24,    25,    26,    -1,    -1,    -1,    30,    -1,     4,     5,
        6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
       -1,    17,    -1,    19,    20,    21,    22,    23,    24,    25,
-      26,    -1,    -1,    -1,    30,    -1,     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,    -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,
+       9,    10,    11,    -1,    -1,    -1,    70,    43,    17,    -1,
+      19,    20,    21,    22,    23,    24,    25,    26,    -1,    -1,
+      -1,    30,    -1,    -1,    -1,    -1,    90,    91,    92,    93,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     4,     5,     6,     7,     8,
+       9,    10,    11,    -1,    90,    91,    92,    93,    17,    -1,
       19,    20,    21,    22,    23,    24,    25,    26,    -1,    -1,
       -1,    30,     4,     5,     6,     7,     8,     9,    10,    11,
-      -1,    -1,    -1,    -1,    -1,    -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,    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,
+      -1,    90,    91,    92,    93,    17,    -1,    19,    20,    21,
+      22,    23,    24,    25,    26,    -1,    -1,    -1,    30,     4,
+       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    -1,
+      -1,    -1,    17,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    -1,    -1,    -1,    30,    -1,    -1,    -1,    -1,
+      -1,    90,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     4,
+       5,     6,     7,     8,     9,    10,    11,    -1,    90,    91,
+      92,    93,    17,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    -1,    -1,    -1,    30,     4,     5,     6,     7,
+       8,     9,    10,    11,    -1,    90,    91,    92,    93,    17,
+      -1,    19,    20,    21,    22,    23,    24,    25,    26,    -1,
+      -1,    -1,    30,     4,     5,     6,     7,     8,     9,    10,
+      11,    -1,    -1,    -1,    -1,    -1,    17,    -1,    19,    20,
+      21,    22,    23,    24,    25,    26,    -1,    -1,    -1,    30,
+      -1,    -1,    -1,    -1,    -1,    90,    91,    92,    93,     4,
+       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    19,    20,    21,    22,    23,    24,
+      25,    26,    90,    91,    92,    30,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    90,
+      91,    92,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      -1,    -1,    -1,    -1,    -1,    71,    -1,    -1,    -1,    39,
+      -1,    -1,    -1,    -1,    -1,    90,    91,    92,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    39,    -1,    -1,    -1,
+      -1,    71,    -1,    -1,    -1,    48,    49,    50,    51,    52,
+      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    39,    -1,    -1,    -1,    -1,    71,    -1,
+      -1,    -1,    48,    49,    50,    51,    52,    53,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
+      40,    -1,    -1,    -1,    -1,    71,    -1,    -1,    48,    49,
       50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
       60,    61,    62,    63,    64,    65,    41,    -1,    -1,    -1,
       -1,    71,    -1,    48,    49,    50,    51,    52,    53,    54,
       55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    -1,    -1,    -1,    -1,    -1,    71,    48,    49,    50,
-      51,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    63,    64,    65,    -1,    -1,    -1,    -1,    -1,
-      71,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    -1,
-      -1,    -1,    -1,    -1,    71,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    64,    65,    -1,    -1,    -1,    -1,    -1,    71,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    -1,    -1,    -1,
-      -1,    -1,    71
+      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
@@ -1124,118 +1284,124 @@ 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,    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,    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,
+      37,    47,    89,    90,    91,    92,    93,    94,    95,    97,
+     121,   126,   137,   138,   139,   140,   141,   159,   164,   166,
+     167,   168,   169,   170,   171,   172,   173,   174,   179,   182,
+     183,   185,   186,   187,   188,   190,   192,   193,   198,   203,
+     213,   214,     9,    11,     3,    12,    17,    18,    30,    38,
+      55,    72,    73,    74,    75,    76,    94,    96,    98,    99,
+     100,   101,   105,   106,   107,   108,   109,   110,   111,   112,
+     113,   114,   115,   116,   117,   118,   119,   120,   135,   211,
+     212,   229,   239,    30,    90,    91,    92,    93,   186,   190,
+      36,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    85,    86,    87,    88,   142,   143,   144,
+     145,   147,   148,   149,    30,    90,    91,   165,   166,   185,
+     190,   198,   204,   205,   135,   135,   135,   206,     3,     6,
+      10,    12,    17,   160,   161,   167,    34,   214,    50,   248,
+     249,   185,     0,   139,   135,   191,   210,   211,     4,     5,
+       6,     9,   175,     6,   172,   178,    37,   129,   180,    38,
+      42,    42,   210,   211,    38,   135,    55,   128,   135,   135,
+     135,    38,    40,   184,    27,    28,    29,   126,   128,   135,
+     150,   151,    36,     0,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    35,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50,    51,    52,    53,    54,    55,    56,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    87,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
+     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
+     124,   126,   127,   128,   129,   136,   154,   155,   154,    34,
+     124,   146,   135,   150,    33,    35,    38,    53,    54,    66,
+      67,    84,   134,   135,   156,   135,   206,   135,   206,    37,
+     171,   135,    41,   208,   208,   208,   208,   211,    31,    37,
+      42,    31,   180,    44,   209,    38,   135,     6,   176,     6,
+       9,   177,   175,    38,    37,    17,    93,   166,   189,   190,
+     135,   199,   200,    98,    99,   100,   101,   102,   103,   104,
+     220,   221,   222,   235,   236,   242,   243,   244,   135,   210,
+     189,   191,   211,   247,   123,   154,   136,   156,    38,   135,
+     156,    38,    48,    49,    50,    51,    52,    53,    54,    55,
       56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      71,   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
+      71,   133,    41,    42,   195,   195,    37,   194,   195,   194,
+      38,   135,    46,   220,    38,    37,    33,   210,   209,    34,
+     181,   211,    17,    39,    40,    46,    40,    43,   191,   225,
+      31,    33,    35,    38,   134,   191,   201,   202,   217,   237,
+     238,   239,   248,   191,   135,   245,   246,    18,   238,   239,
+      43,   221,   201,    39,   135,    39,    40,    40,    38,    39,
+     135,   156,   157,   158,   156,   156,    38,   165,   196,   197,
+     191,   191,   210,    27,    28,    29,    33,    34,   162,   163,
+      43,     3,     6,    10,    12,    13,    14,    15,    16,    17,
+      39,   215,   216,   218,   219,    45,   135,    34,    39,   211,
+     209,    17,    70,   190,   201,   200,    46,    37,    30,    93,
+     166,   201,   201,    71,   133,    46,    37,    38,    32,    46,
+      38,    37,    40,    37,    37,    39,   209,    70,   191,   135,
+     152,   153,    39,    39,    40,    41,    33,    41,   207,    43,
+     197,   135,    37,    41,    39,    40,   217,    39,    39,    27,
+      96,   114,   201,   224,   226,   227,   228,   229,   249,    39,
+      39,   201,   201,   237,   191,   248,   247,   246,    39,    39,
+      40,   156,   156,    40,    41,    37,    39,   218,    41,   216,
+     218,    46,   209,    17,    18,   229,   232,    38,    38,   224,
+     201,    41,    40,   240,   191,    39,   209,   154,   135,    33,
+      38,   218,   248,   162,    38,   201,   217,   201,    70,   237,
+     241,    39,    37,    39,    33,    70,   217,    40,    40,   230,
+      39,    40,    40,    32,    38,   201,   191,   223,   224,   225,
+     231,   249,    39,   237,    33,    39,   233,   234,   237,    39,
+      40,   224,    39,    41,    39,    40,   223,   218,    39,   237
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned char yyr1[] =
 {
-       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
+       0,   132,   133,   133,   133,   133,   133,   133,   133,   133,
+     133,   133,   133,   133,   133,   133,   133,   133,   133,   133,
+     134,   134,   134,   134,   135,   135,   135,   135,   135,   135,
+     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
+     135,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   136,   136,   136,   136,   136,   136,   136,
+     136,   136,   136,   137,   137,   138,   138,   139,   139,   139,
+     139,   139,   139,   139,   139,   139,   139,   139,   139,   139,
+     140,   141,   141,   142,   142,   142,   142,   142,   142,   142,
+     142,   143,   143,   144,   144,   145,   145,   145,   146,   146,
+     147,   147,   148,   148,   148,   149,   149,   150,   150,   150,
+     150,   150,   150,   151,   151,   152,   152,   153,   153,   154,
+     154,   155,   155,   156,   156,   156,   156,   156,   156,   156,
+     156,   156,   156,   157,   157,   158,   158,   159,   160,   161,
+     161,   161,   161,   162,   162,   163,   163,   163,   163,   163,
+     164,   165,   165,   165,   165,   165,   165,   166,   166,   167,
+     167,   168,   168,   168,   169,   169,   169,   169,   170,   170,
+     170,   171,   171,   171,   171,   171,   171,   171,   171,   172,
+     172,   173,   173,   173,   174,   174,   174,   174,   175,   175,
+     175,   175,   175,   176,   176,   177,   177,   177,   178,   178,
+     178,   179,   179,   180,   180,   181,   181,   182,   183,   184,
+     184,   185,   185,   185,   185,   186,   186,   187,   187,   187,
+     187,   188,   188,   189,   189,   189,   189,   190,   190,   190,
+     191,   191,   192,   193,   194,   194,   195,   196,   196,   197,
+     198,   199,   199,   200,   200,   201,   201,   201,   201,   201,
+     201,   202,   202,   202,   202,   203,   204,   205,   206,   206,
+     207,   207,   208,   208,   209,   209,   210,   210,   211,   211,
+     212,   212,   213,   213,   214,   214,   214,   215,   215,   216,
+     216,   217,   218,   219,   219,   219,   219,   219,   219,   219,
+     219,   219,   220,   220,   221,   221,   221,   221,   221,   222,
+     222,   223,   223,   223,   224,   224,   224,   224,   224,   225,
+     225,   226,   227,   228,   229,   229,   229,   229,   229,   229,
+     229,   229,   229,   229,   230,   230,   231,   231,   232,   232,
+     233,   233,   234,   234,   235,   236,   237,   237,   237,   238,
+     238,   239,   239,   239,   239,   239,   239,   239,   239,   240,
+     240,   241,   241,   242,   243,   243,   244,   245,   245,   246,
+     247,   247,   248,   248,   249
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1256,35 +1422,38 @@ static const unsigned char yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     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,
-       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
+       1,     1,     1,     0,     1,     1,     2,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       3,     2,     3,     2,     2,     1,     2,     2,     2,     1,
+       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     6,     2,     0,     1,     1,     3,     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,     3,     4,     0,     4,     1,     2,     2,     3,     0,
+       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,
+       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
 };
 
 
@@ -1334,7 +1503,10 @@ static const unsigned char yydprec[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0
 };
 
 /* YYMERGER[RULE-NUM] -- Index of merging function for rule #RULE-NUM.  */
@@ -1383,7 +1555,10 @@ static const unsigned char yymerger[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0
 };
 
 /* YYIMMEDIATE[RULE-NUM] -- True iff rule #RULE-NUM is not to be deferred, as
@@ -1433,14 +1608,17 @@ static const yybool yyimmediate[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0
 };
 
 /* YYCONFLP[YYPACT[STATE-NUM]] -- Pointer into YYCONFL of start of
    list of conflicting reductions corresponding to action entry for
    state STATE-NUM in yytable.  0 means no conflicts.  The list in
    yyconfl is terminated by a rule number of 0.  */
-static const unsigned char yyconflp[] =
+static const unsigned short int yyconflp[] =
 {
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1467,9 +1645,9 @@ 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,   273,
        0,     0,     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,
@@ -1480,6 +1658,44 @@ 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,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     5,
+       0,     0,     7,     9,    11,    13,    15,    17,    19,    21,
+      23,    25,    27,    29,    31,    33,    35,    37,    39,    41,
+      43,    45,    47,    49,    51,    53,    55,    57,    59,    61,
+      63,    65,    67,    69,    71,    73,    75,    77,    79,    81,
+      83,    85,    87,    89,    91,    93,    95,    97,    99,   101,
+     103,   105,   107,   109,   111,   113,   115,   117,   119,   121,
+     123,   125,   127,   129,   131,   133,   135,   137,   139,   141,
+     143,   145,   147,   149,   151,   153,   155,   157,   159,   161,
+     163,   165,   167,   169,   171,     0,   173,     0,   175,   177,
+     179,   181,   183,   185,   187,   189,   191,   193,   195,   197,
+     199,   201,   203,   205,   207,   209,   211,   213,   215,   217,
+     219,   221,   223,   225,   227,   229,   231,   233,   235,   237,
+     239,     0,   241,   243,     0,   245,   247,   249,   251,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1631,9 +1847,6 @@ 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,     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,
@@ -1657,7 +1870,9 @@ 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,     1,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     3,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1666,6 +1881,8 @@ 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,   253,     0,   255,   257,   259,   261,   263,   265,
+     267,   269,     0,     0,     0,   271,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1674,19 +1891,77 @@ 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,    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
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   275,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   277
 };
 
 /* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by
    0, pointed into by YYCONFLP.  */
 static const short int yyconfl[] =
 {
-       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
+       0,   267,     0,   267,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   447,     0,   447,     0,   447,     0,   447,
+       0,   447,     0,   267,     0,   267,     0,   267,     0,   267,
+       0,   267,     0,   267,     0,   267,     0,   267,     0,   267,
+       0,   267,     0,   267,     0,   226,     0,   350,     0
 };
 
 /* Error token number */
@@ -2115,104 +2390,112 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
     *yyvalp = yyvsp[YYFILL (1-yyrhslen)].yystate.yysemantics.yysval;
   switch (yyn)
     {
-        case 162:
-#line 407 "src/parser_proc_grammar.y" /* glr.c:816  */
+        case 170:
+#line 410 "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 2127 "src/parser_proc.c" /* glr.c:816  */
+#line 2402 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 163:
-#line 413 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 171:
+#line 416 "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,
-                               "Extra 'lib %s' statement has no effect", (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
+                               "Extra 'lib \"%s\"' statement has no effect", (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text);
        } else {
-               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);
+               P->file.ln = strndup((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->size);
        }
 }
-#line 2140 "src/parser_proc.c" /* glr.c:816  */
+#line 2415 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 164:
-#line 421 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 172:
+#line 424 "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 2148 "src/parser_proc.c" /* glr.c:816  */
+#line 2423 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 165:
-#line 424 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 173:
+#line 427 "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 2156 "src/parser_proc.c" /* glr.c:816  */
+#line 2431 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 166:
-#line 427 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 175:
+#line 431 "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 2164 "src/parser_proc.c" /* glr.c:816  */
+#line 2439 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 167:
-#line 430 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 176:
+#line 434 "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 2172 "src/parser_proc.c" /* glr.c:816  */
+#line 2447 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 168:
-#line 433 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 177:
+#line 437 "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 2180 "src/parser_proc.c" /* glr.c:816  */
+#line 2455 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 169:
-#line 436 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 178:
+#line 440 "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 2188 "src/parser_proc.c" /* glr.c:816  */
+#line 2463 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 170:
-#line 439 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 179:
+#line 443 "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 2196 "src/parser_proc.c" /* glr.c:816  */
+#line 2471 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 171:
-#line 445 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 180:
+#line 449 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 2204 "src/parser_proc.c" /* glr.c:816  */
+#line 2479 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 172:
-#line 451 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 181:
+#line 455 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(struct psi_cpp_exp **)(&(*yyvalp))) = NULL;
+}
+#line 2487 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 182:
+#line 458 "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 2212 "src/parser_proc.c" /* glr.c:816  */
+#line 2495 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 173:
-#line 457 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 183:
+#line 464 "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;
@@ -2236,205 +2519,185 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
        }
        (*(struct psi_cpp_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
 }
-#line 2240 "src/parser_proc.c" /* glr.c:816  */
+#line 2523 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 174:
-#line 480 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 184:
+#line 487 "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 2249 "src/parser_proc.c" /* glr.c:816  */
+#line 2532 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 175:
-#line 484 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 185:
+#line 491 "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 2258 "src/parser_proc.c" /* glr.c:816  */
-    break;
-
-  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 2268 "src/parser_proc.c" /* glr.c:816  */
+#line 2541 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 177:
-#line 493 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 186:
+#line 495 "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 2278 "src/parser_proc.c" /* glr.c:816  */
+#line 2551 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 178:
-#line 498 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 187:
+#line 500 "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 2287 "src/parser_proc.c" /* glr.c:816  */
+#line 2560 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 179:
-#line 502 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 188:
+#line 504 "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 2296 "src/parser_proc.c" /* glr.c:816  */
+#line 2569 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 180:
-#line 506 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 189:
+#line 508 "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  */
+#line 2578 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 181:
-#line 510 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 190:
+#line 512 "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  */
+#line 2587 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 196:
-#line 549 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 213:
+#line 565 "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 2324 "src/parser_proc.c" /* glr.c:816  */
+#line 2597 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  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 2334 "src/parser_proc.c" /* glr.c:816  */
-    break;
-
-  case 198:
-#line 559 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 214:
+#line 570 "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 2344 "src/parser_proc.c" /* glr.c:816  */
+#line 2607 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 199:
-#line 567 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 215:
+#line 578 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = psi_plist_init(NULL);
 }
-#line 2352 "src/parser_proc.c" /* glr.c:816  */
+#line 2615 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 201:
-#line 574 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 217:
+#line 585 "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 2362 "src/parser_proc.c" /* glr.c:816  */
+#line 2625 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 202:
-#line 579 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 218:
+#line 590 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_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 2372 "src/parser_proc.c" /* glr.c:816  */
+#line 2635 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 203:
-#line 587 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 219:
+#line 598 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 2380 "src/parser_proc.c" /* glr.c:816  */
+#line 2643 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 205:
-#line 594 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 221:
+#line 605 "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 2389 "src/parser_proc.c" /* glr.c:816  */
+#line 2652 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 206:
-#line 598 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 222:
+#line 609 "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 2398 "src/parser_proc.c" /* glr.c:816  */
+#line 2661 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 207:
-#line 605 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 223:
+#line 616 "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 2407 "src/parser_proc.c" /* glr.c:816  */
+#line 2670 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 208:
-#line 609 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 224:
+#line 620 "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 2416 "src/parser_proc.c" /* glr.c:816  */
+#line 2679 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 209:
-#line 613 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 225:
+#line 624 "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 2425 "src/parser_proc.c" /* glr.c:816  */
+#line 2688 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 210:
-#line 617 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 226:
+#line 628 "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  */
+#line 2697 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 211:
-#line 622 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 227:
+#line 633 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                uint8_t exists;
@@ -2445,11 +2708,11 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        }
 }
-#line 2449 "src/parser_proc.c" /* glr.c:816  */
+#line 2712 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 212:
-#line 632 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 228:
+#line 643 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        {
                uint8_t exists;
@@ -2460,120 +2723,120 @@ yyuserAction (yyRuleNum yyn, size_t yyrhslen, yyGLRStackItem* yyvsp,
                (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
        }
 }
-#line 2464 "src/parser_proc.c" /* glr.c:816  */
+#line 2727 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 213:
-#line 642 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 229:
+#line 653 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->flags));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2474 "src/parser_proc.c" /* glr.c:816  */
+#line 2737 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 214:
-#line 647 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 230:
+#line 658 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2484 "src/parser_proc.c" /* glr.c:816  */
+#line 2747 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 215:
-#line 652 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 231:
+#line 663 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init(PSI_T_DEFINE, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
        (*(struct psi_num_exp **)(&(*yyvalp)))->data.n->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2495 "src/parser_proc.c" /* glr.c:816  */
+#line 2758 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 216:
-#line 658 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 232:
+#line 669 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_num_exp **)(&(*yyvalp))) = psi_num_exp_init_num(psi_number_init(PSI_T_FUNCTION,
                psi_cpp_macro_call_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval))->text, (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))), 0));
        (*(struct psi_num_exp **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-3)].yystate.yysemantics.yysval)));
 }
-#line 2506 "src/parser_proc.c" /* glr.c:816  */
+#line 2769 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 217:
-#line 667 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 233:
+#line 678 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 2514 "src/parser_proc.c" /* glr.c:816  */
+#line 2777 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 219:
-#line 674 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 235:
+#line 685 "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_plist **)(&(*yyvalp))) = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_num_exp_free), 
                &(*(struct psi_num_exp **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2523 "src/parser_proc.c" /* glr.c:816  */
+#line 2786 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 220:
-#line 678 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 236:
+#line 689 "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 2531 "src/parser_proc.c" /* glr.c:816  */
+#line 2794 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 221:
-#line 684 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 237:
+#line 695 "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 2540 "src/parser_proc.c" /* glr.c:816  */
+#line 2803 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 222:
-#line 691 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 238:
+#line 702 "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 2548 "src/parser_proc.c" /* glr.c:816  */
+#line 2811 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 227:
-#line 704 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 243:
+#line 715 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_impl_def_val **)(&(*yyvalp))) = NULL;
 }
-#line 2556 "src/parser_proc.c" /* glr.c:816  */
+#line 2819 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 228:
-#line 707 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 244:
+#line 718 "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 2565 "src/parser_proc.c" /* glr.c:816  */
+#line 2828 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 234:
-#line 722 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 250:
+#line 733 "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 2573 "src/parser_proc.c" /* glr.c:816  */
+#line 2836 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 236:
-#line 729 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 252:
+#line 740 "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),
@@ -2582,11 +2845,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 2586 "src/parser_proc.c" /* glr.c:816  */
+#line 2849 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 237:
-#line 737 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 253:
+#line 748 "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(
@@ -2597,11 +2860,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 2601 "src/parser_proc.c" /* glr.c:816  */
+#line 2864 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 238:
-#line 747 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 254:
+#line 758 "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));
@@ -2610,11 +2873,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 2614 "src/parser_proc.c" /* glr.c:816  */
+#line 2877 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 239:
-#line 755 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 255:
+#line 766 "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));
@@ -2623,148 +2886,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 2627 "src/parser_proc.c" /* glr.c:816  */
+#line 2890 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 240:
-#line 763 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 256:
+#line 774 "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  */
+#line 2900 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 241:
-#line 771 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 257:
+#line 782 "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 2645 "src/parser_proc.c" /* glr.c:816  */
+#line 2908 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 243:
-#line 778 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 259:
+#line 789 "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 2654 "src/parser_proc.c" /* glr.c:816  */
+#line 2917 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 245:
-#line 786 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 261:
+#line 797 "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 2664 "src/parser_proc.c" /* glr.c:816  */
+#line 2927 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 246:
-#line 791 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 262:
+#line 802 "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 2674 "src/parser_proc.c" /* glr.c:816  */
+#line 2937 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 247:
-#line 796 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 263:
+#line 807 "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 2684 "src/parser_proc.c" /* glr.c:816  */
+#line 2947 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 250:
-#line 806 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 266:
+#line 817 "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 2692 "src/parser_proc.c" /* glr.c:816  */
+#line 2955 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 251:
-#line 809 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 267:
+#line 820 "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 2700 "src/parser_proc.c" /* glr.c:816  */
+#line 2963 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 252:
-#line 815 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 268:
+#line 826 "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 2708 "src/parser_proc.c" /* glr.c:816  */
+#line 2971 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 253:
-#line 818 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 269:
+#line 829 "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 2716 "src/parser_proc.c" /* glr.c:816  */
+#line 2979 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 254:
-#line 821 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 270:
+#line 832 "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 2724 "src/parser_proc.c" /* glr.c:816  */
+#line 2987 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 265:
-#line 843 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 281:
+#line 854 "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 2732 "src/parser_proc.c" /* glr.c:816  */
+#line 2995 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 266:
-#line 846 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 282:
+#line 857 "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 2740 "src/parser_proc.c" /* glr.c:816  */
+#line 3003 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 267:
-#line 849 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 283:
+#line 860 "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 2748 "src/parser_proc.c" /* glr.c:816  */
+#line 3011 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 268:
-#line 855 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 284:
+#line 866 "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 2756 "src/parser_proc.c" /* glr.c:816  */
+#line 3019 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 269:
-#line 858 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 285:
+#line 869 "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 2764 "src/parser_proc.c" /* glr.c:816  */
+#line 3027 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 270:
-#line 861 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 286:
+#line 872 "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)));
@@ -2773,11 +3036,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 2777 "src/parser_proc.c" /* glr.c:816  */
+#line 3040 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 271:
-#line 869 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 287:
+#line 880 "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)));
@@ -2787,27 +3050,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 2791 "src/parser_proc.c" /* glr.c:816  */
+#line 3054 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 272:
-#line 881 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 288:
+#line 892 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 2799 "src/parser_proc.c" /* glr.c:816  */
+#line 3062 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 273:
-#line 884 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 289:
+#line 895 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2807 "src/parser_proc.c" /* glr.c:816  */
+#line 3070 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 274:
-#line 887 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 290:
+#line 898 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        if ((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))) {
                (*(struct psi_token **)(&(*yyvalp))) = psi_token_cat(" ", 2, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)), (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
@@ -2815,19 +3078,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 2819 "src/parser_proc.c" /* glr.c:816  */
+#line 3082 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 275:
-#line 894 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 291:
+#line 905 "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 2827 "src/parser_proc.c" /* glr.c:816  */
+#line 3090 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 276:
-#line 897 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 292:
+#line 908 "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)));
@@ -2835,43 +3098,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 2839 "src/parser_proc.c" /* glr.c:816  */
+#line 3102 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 277:
-#line 907 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 293:
+#line 918 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 2847 "src/parser_proc.c" /* glr.c:816  */
+#line 3110 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 279:
-#line 913 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 295:
+#line 924 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 2855 "src/parser_proc.c" /* glr.c:816  */
+#line 3118 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 282:
-#line 921 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 298:
+#line 932 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 2863 "src/parser_proc.c" /* glr.c:816  */
+#line 3126 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 283:
-#line 924 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 299:
+#line 935 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 2871 "src/parser_proc.c" /* glr.c:816  */
+#line 3134 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 284:
-#line 927 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 300:
+#line 938 "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)));
@@ -2880,19 +3143,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 2884 "src/parser_proc.c" /* glr.c:816  */
+#line 3147 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 285:
-#line 938 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 301:
+#line 949 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
-       (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
+       (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
 }
-#line 2892 "src/parser_proc.c" /* glr.c:816  */
+#line 3155 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 286:
-#line 944 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 302:
+#line 952 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(struct psi_decl **)(&(*yyvalp))) = (*(struct psi_decl **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
+}
+#line 3163 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 308:
+#line 972 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       psi_decl_arg_free(&(*(struct psi_decl_arg **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)));
+}
+#line 3171 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 310:
+#line 979 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       psi_plist_free((*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
+}
+#line 3179 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 311:
+#line 985 "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))) {
@@ -2900,11 +3187,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 2904 "src/parser_proc.c" /* glr.c:816  */
+#line 3191 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 287:
-#line 951 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 312:
+#line 992 "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;
@@ -2913,11 +3200,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 2917 "src/parser_proc.c" /* glr.c:816  */
+#line 3204 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 288:
-#line 959 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 313:
+#line 1000 "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))) {
@@ -2925,11 +3212,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 2929 "src/parser_proc.c" /* glr.c:816  */
+#line 3216 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 289:
-#line 966 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 314:
+#line 1007 "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;
@@ -2938,23 +3225,25 @@ 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 2942 "src/parser_proc.c" /* glr.c:816  */
+#line 3229 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 292:
-#line 982 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 317:
+#line 1023 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
+       (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(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 2953 "src/parser_proc.c" /* glr.c:816  */
+#line 3241 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 293:
-#line 988 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 318:
+#line 1030 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
+       (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_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),
@@ -2964,12 +3253,13 @@ 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 2968 "src/parser_proc.c" /* glr.c:816  */
+#line 3257 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 294:
-#line 998 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 319:
+#line 1041 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
+       (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_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),
@@ -2979,12 +3269,13 @@ 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 2983 "src/parser_proc.c" /* glr.c:816  */
+#line 3273 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 295:
-#line 1008 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 320:
+#line 1052 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
+       (void) (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-2)].yystate.yysemantics.yysval));
        (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval))->type = PSI_T_NAME;
        (*(struct psi_decl_arg **)(&(*yyvalp))) = psi_decl_arg_init(
                psi_decl_type_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),
@@ -2994,11 +3285,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 2998 "src/parser_proc.c" /* glr.c:816  */
+#line 3289 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 297:
-#line 1022 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 322:
+#line 1067 "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),
@@ -3008,51 +3299,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 3012 "src/parser_proc.c" /* glr.c:816  */
+#line 3303 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 298:
-#line 1034 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 323:
+#line 1079 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3020 "src/parser_proc.c" /* glr.c:816  */
+#line 3311 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 299:
-#line 1037 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 324:
+#line 1082 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3028 "src/parser_proc.c" /* glr.c:816  */
+#line 3319 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 300:
-#line 1040 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 325:
+#line 1085 "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 3036 "src/parser_proc.c" /* glr.c:816  */
+#line 3327 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 301:
-#line 1043 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 326:
+#line 1088 "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 3044 "src/parser_proc.c" /* glr.c:816  */
+#line 3335 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 302:
-#line 1049 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 327:
+#line 1094 "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 3052 "src/parser_proc.c" /* glr.c:816  */
+#line 3343 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 303:
-#line 1052 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 328:
+#line 1097 "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(
@@ -3063,11 +3354,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 3067 "src/parser_proc.c" /* glr.c:816  */
+#line 3358 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 304:
-#line 1062 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 329:
+#line 1107 "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(
@@ -3078,31 +3369,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 3082 "src/parser_proc.c" /* glr.c:816  */
+#line 3373 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 305:
-#line 1075 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 330:
+#line 1120 "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 3092 "src/parser_proc.c" /* glr.c:816  */
+#line 3383 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 306:
-#line 1080 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 331:
+#line 1125 "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 3102 "src/parser_proc.c" /* glr.c:816  */
+#line 3393 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 307:
-#line 1088 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 332:
+#line 1133 "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)));
@@ -3110,11 +3401,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 3114 "src/parser_proc.c" /* glr.c:816  */
+#line 3405 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 308:
-#line 1098 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 333:
+#line 1143 "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)));
@@ -3122,188 +3413,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 3126 "src/parser_proc.c" /* glr.c:816  */
+#line 3417 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 309:
-#line 1108 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 334:
+#line 1153 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3134 "src/parser_proc.c" /* glr.c:816  */
+#line 3425 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 311:
-#line 1115 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 336:
+#line 1160 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
 }
-#line 3142 "src/parser_proc.c" /* glr.c:816  */
+#line 3433 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 312:
-#line 1121 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 337:
+#line 1166 "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 3150 "src/parser_proc.c" /* glr.c:816  */
+#line 3441 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 313:
-#line 1124 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 338:
+#line 1169 "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 3158 "src/parser_proc.c" /* glr.c:816  */
+#line 3449 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 314:
-#line 1130 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 339:
+#line 1175 "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 3168 "src/parser_proc.c" /* glr.c:816  */
+#line 3459 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 315:
-#line 1138 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 340:
+#line 1183 "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 3177 "src/parser_proc.c" /* glr.c:816  */
+#line 3468 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 316:
-#line 1145 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 341:
+#line 1190 "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 3185 "src/parser_proc.c" /* glr.c:816  */
+#line 3476 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 317:
-#line 1148 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 342:
+#line 1193 "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 3193 "src/parser_proc.c" /* glr.c:816  */
+#line 3484 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 318:
-#line 1154 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 343:
+#line 1199 "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 3203 "src/parser_proc.c" /* glr.c:816  */
+#line 3494 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 319:
-#line 1159 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 344:
+#line 1204 "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 3213 "src/parser_proc.c" /* glr.c:816  */
+#line 3504 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 320:
-#line 1167 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 345:
+#line 1212 "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 3222 "src/parser_proc.c" /* glr.c:816  */
+#line 3513 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 321:
-#line 1171 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 346:
+#line 1216 "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 3231 "src/parser_proc.c" /* glr.c:816  */
+#line 3522 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 322:
-#line 1175 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 347:
+#line 1220 "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 3240 "src/parser_proc.c" /* glr.c:816  */
+#line 3531 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 323:
-#line 1179 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 348:
+#line 1224 "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 3249 "src/parser_proc.c" /* glr.c:816  */
+#line 3540 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 324:
-#line 1183 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 349:
+#line 1228 "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 3258 "src/parser_proc.c" /* glr.c:816  */
+#line 3549 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 325:
-#line 1187 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 350:
+#line 1232 "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 3267 "src/parser_proc.c" /* glr.c:816  */
+#line 3558 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 326:
-#line 1194 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 351:
+#line 1239 "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 3276 "src/parser_proc.c" /* glr.c:816  */
+#line 3567 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 327:
-#line 1198 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 352:
+#line 1243 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0);
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3285 "src/parser_proc.c" /* glr.c:816  */
+#line 3576 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 328:
-#line 1202 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 353:
+#line 1247 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->type, (*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->text, 0);
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_token **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)));
 }
-#line 3294 "src/parser_proc.c" /* glr.c:816  */
+#line 3585 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 329:
-#line 1206 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 354:
+#line 1251 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_number **)(&(*yyvalp))) = psi_number_init(PSI_T_NAME, (*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval)), 0);
        (*(struct psi_number **)(&(*yyvalp)))->token = psi_token_copy((*(struct psi_decl_var **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval))->token);
 }
-#line 3303 "src/parser_proc.c" /* glr.c:816  */
+#line 3594 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 330:
-#line 1213 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 355:
+#line 1258 "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)));
@@ -3314,11 +3605,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 3318 "src/parser_proc.c" /* glr.c:816  */
+#line 3609 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 331:
-#line 1226 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 356:
+#line 1271 "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)));
@@ -3329,11 +3620,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 3333 "src/parser_proc.c" /* glr.c:816  */
+#line 3624 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 332:
-#line 1239 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 357:
+#line 1284 "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)));
@@ -3344,147 +3635,155 @@ 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 3348 "src/parser_proc.c" /* glr.c:816  */
+#line 3639 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 333:
-#line 1252 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 358:
+#line 1297 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_token **)(&(*yyvalp))) = NULL;
 }
-#line 3356 "src/parser_proc.c" /* glr.c:816  */
+#line 3647 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 334:
-#line 1255 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 359:
+#line 1300 "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 3365 "src/parser_proc.c" /* glr.c:816  */
+#line 3656 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 335:
-#line 1262 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 360:
+#line 1307 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout **)(&(*yyvalp))) = NULL;
 }
-#line 3373 "src/parser_proc.c" /* glr.c:816  */
+#line 3664 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 336:
-#line 1265 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 361:
+#line 1310 "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 3381 "src/parser_proc.c" /* glr.c:816  */
+#line 3672 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 337:
-#line 1271 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 362:
+#line 1316 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_layout*)(&(*yyvalp))).pos = 0;
        (*(struct psi_layout*)(&(*yyvalp))).len = 0;
 }
-#line 3390 "src/parser_proc.c" /* glr.c:816  */
+#line 3681 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 338:
-#line 1275 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 363:
+#line 1320 "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 3399 "src/parser_proc.c" /* glr.c:816  */
+#line 3690 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 339:
-#line 1282 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 364:
+#line 1327 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 3407 "src/parser_proc.c" /* glr.c:816  */
+#line 3698 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 340:
-#line 1285 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 365:
+#line 1330 "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 3415 "src/parser_proc.c" /* glr.c:816  */
+#line 3706 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 341:
-#line 1291 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 366:
+#line 1336 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 0;
 }
-#line 3423 "src/parser_proc.c" /* glr.c:816  */
+#line 3714 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 342:
-#line 1294 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 367:
+#line 1339 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3431 "src/parser_proc.c" /* glr.c:816  */
+#line 3722 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 343:
-#line 1300 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 369:
+#line 1346 "src/parser_proc_grammar.y" /* glr.c:816  */
+    {
+       (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval));
+}
+#line 3730 "src/parser_proc.c" /* glr.c:816  */
+    break;
+
+  case 370:
+#line 1352 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = 1;
 }
-#line 3439 "src/parser_proc.c" /* glr.c:816  */
+#line 3738 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 344:
-#line 1303 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 371:
+#line 1355 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(size_t*)(&(*yyvalp))) = (*(size_t*)(&((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval)) + 1;
 }
-#line 3447 "src/parser_proc.c" /* glr.c:816  */
+#line 3746 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 345:
-#line 1315 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 372:
+#line 1367 "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 3455 "src/parser_proc.c" /* glr.c:816  */
+#line 3754 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 346:
-#line 1318 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 373:
+#line 1370 "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 3464 "src/parser_proc.c" /* glr.c:816  */
+#line 3763 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 347:
-#line 1325 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 374:
+#line 1377 "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 3474 "src/parser_proc.c" /* glr.c:816  */
+#line 3773 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 348:
-#line 1330 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 375:
+#line 1382 "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 3484 "src/parser_proc.c" /* glr.c:816  */
+#line 3783 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 349:
-#line 1335 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 376:
+#line 1387 "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)));
@@ -3492,477 +3791,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 3496 "src/parser_proc.c" /* glr.c:816  */
+#line 3795 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 350:
-#line 1345 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 377:
+#line 1397 "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 3504 "src/parser_proc.c" /* glr.c:816  */
+#line 3803 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 351:
-#line 1348 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 378:
+#line 1400 "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 3512 "src/parser_proc.c" /* glr.c:816  */
+#line 3811 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 352:
-#line 1354 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 379:
+#line 1406 "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 3520 "src/parser_proc.c" /* glr.c:816  */
+#line 3819 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 353:
-#line 1357 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 380:
+#line 1409 "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 3528 "src/parser_proc.c" /* glr.c:816  */
+#line 3827 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 354:
-#line 1363 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 381:
+#line 1415 "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 3537 "src/parser_proc.c" /* glr.c:816  */
+#line 3836 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 355:
-#line 1370 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 382:
+#line 1422 "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 3546 "src/parser_proc.c" /* glr.c:816  */
+#line 3845 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 365:
-#line 1389 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 392:
+#line 1441 "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 3554 "src/parser_proc.c" /* glr.c:816  */
+#line 3853 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 366:
-#line 1392 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 393:
+#line 1444 "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 3562 "src/parser_proc.c" /* glr.c:816  */
+#line 3861 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 367:
-#line 1398 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 394:
+#line 1450 "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 3570 "src/parser_proc.c" /* glr.c:816  */
+#line 3869 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 368:
-#line 1401 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 395:
+#line 1453 "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 3578 "src/parser_proc.c" /* glr.c:816  */
+#line 3877 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 369:
-#line 1404 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 396:
+#line 1456 "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 3586 "src/parser_proc.c" /* glr.c:816  */
+#line 3885 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 370:
-#line 1407 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 397:
+#line 1459 "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 3594 "src/parser_proc.c" /* glr.c:816  */
+#line 3893 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 371:
-#line 1410 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 398:
+#line 1462 "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 3602 "src/parser_proc.c" /* glr.c:816  */
+#line 3901 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 372:
-#line 1416 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 399:
+#line 1468 "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 3611 "src/parser_proc.c" /* glr.c:816  */
+#line 3910 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 373:
-#line 1420 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 400:
+#line 1472 "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 3621 "src/parser_proc.c" /* glr.c:816  */
+#line 3920 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 375:
-#line 1429 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 402:
+#line 1481 "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 3630 "src/parser_proc.c" /* glr.c:816  */
+#line 3929 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 376:
-#line 1433 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 403:
+#line 1485 "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 3639 "src/parser_proc.c" /* glr.c:816  */
+#line 3938 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 377:
-#line 1440 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 404:
+#line 1492 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_let_exp **)(&(*yyvalp))) = psi_let_exp_init(PSI_LET_NULL, NULL);
 }
-#line 3647 "src/parser_proc.c" /* glr.c:816  */
+#line 3946 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 378:
-#line 1443 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 405:
+#line 1495 "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 3655 "src/parser_proc.c" /* glr.c:816  */
+#line 3954 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 379:
-#line 1446 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 406:
+#line 1498 "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 3663 "src/parser_proc.c" /* glr.c:816  */
+#line 3962 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 380:
-#line 1449 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 407:
+#line 1501 "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 3671 "src/parser_proc.c" /* glr.c:816  */
+#line 3970 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 381:
-#line 1452 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 408:
+#line 1504 "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 3679 "src/parser_proc.c" /* glr.c:816  */
+#line 3978 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 382:
-#line 1458 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 409:
+#line 1510 "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 3688 "src/parser_proc.c" /* glr.c:816  */
+#line 3987 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 383:
-#line 1462 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 410:
+#line 1514 "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 3698 "src/parser_proc.c" /* glr.c:816  */
+#line 3997 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 384:
-#line 1470 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 411:
+#line 1522 "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 3707 "src/parser_proc.c" /* glr.c:816  */
+#line 4006 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 385:
-#line 1477 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 412:
+#line 1529 "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 3717 "src/parser_proc.c" /* glr.c:816  */
+#line 4016 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 386:
-#line 1485 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 413:
+#line 1537 "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 3727 "src/parser_proc.c" /* glr.c:816  */
+#line 4026 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 397:
-#line 1506 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 424:
+#line 1558 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3735 "src/parser_proc.c" /* glr.c:816  */
+#line 4034 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 398:
-#line 1509 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 425:
+#line 1561 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3743 "src/parser_proc.c" /* glr.c:816  */
+#line 4042 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 399:
-#line 1515 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 426:
+#line 1567 "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 3751 "src/parser_proc.c" /* glr.c:816  */
+#line 4050 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 400:
-#line 1518 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 427:
+#line 1570 "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 3759 "src/parser_proc.c" /* glr.c:816  */
+#line 4058 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 403:
-#line 1529 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 430:
+#line 1581 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3767 "src/parser_proc.c" /* glr.c:816  */
+#line 4066 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 404:
-#line 1532 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 431:
+#line 1584 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3775 "src/parser_proc.c" /* glr.c:816  */
+#line 4074 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 405:
-#line 1538 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 432:
+#line 1590 "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 3783 "src/parser_proc.c" /* glr.c:816  */
+#line 4082 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 406:
-#line 1541 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 433:
+#line 1593 "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 3791 "src/parser_proc.c" /* glr.c:816  */
+#line 4090 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 407:
-#line 1547 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 434:
+#line 1599 "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 3800 "src/parser_proc.c" /* glr.c:816  */
+#line 4099 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 408:
-#line 1554 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 435:
+#line 1606 "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 3809 "src/parser_proc.c" /* glr.c:816  */
+#line 4108 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 409:
-#line 1561 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 436:
+#line 1613 "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 3817 "src/parser_proc.c" /* glr.c:816  */
+#line 4116 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 410:
-#line 1564 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 437:
+#line 1616 "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 3825 "src/parser_proc.c" /* glr.c:816  */
+#line 4124 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 411:
-#line 1567 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 438:
+#line 1619 "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 3834 "src/parser_proc.c" /* glr.c:816  */
+#line 4133 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 412:
-#line 1574 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 439:
+#line 1626 "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 3844 "src/parser_proc.c" /* glr.c:816  */
+#line 4143 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 413:
-#line 1579 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 440:
+#line 1631 "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 3854 "src/parser_proc.c" /* glr.c:816  */
+#line 4153 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 422:
-#line 1598 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 449:
+#line 1650 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = NULL;
 }
-#line 3862 "src/parser_proc.c" /* glr.c:816  */
+#line 4161 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 423:
-#line 1601 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 450:
+#line 1653 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(struct psi_plist **)(&(*yyvalp))) = (*(struct psi_plist **)(&((yyGLRStackItem const *)yyvsp)[YYFILL (0)].yystate.yysemantics.yysval));
 }
-#line 3870 "src/parser_proc.c" /* glr.c:816  */
+#line 4169 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 424:
-#line 1607 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 451:
+#line 1659 "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 3878 "src/parser_proc.c" /* glr.c:816  */
+#line 4177 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 425:
-#line 1610 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 452:
+#line 1662 "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 3886 "src/parser_proc.c" /* glr.c:816  */
+#line 4185 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 426:
-#line 1616 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 453:
+#line 1668 "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 3895 "src/parser_proc.c" /* glr.c:816  */
+#line 4194 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 429:
-#line 1628 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 456:
+#line 1680 "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 3904 "src/parser_proc.c" /* glr.c:816  */
+#line 4203 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 430:
-#line 1635 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 457:
+#line 1687 "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 3912 "src/parser_proc.c" /* glr.c:816  */
+#line 4211 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 431:
-#line 1638 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 458:
+#line 1690 "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 3920 "src/parser_proc.c" /* glr.c:816  */
+#line 4219 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 432:
-#line 1644 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 459:
+#line 1696 "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 3930 "src/parser_proc.c" /* glr.c:816  */
+#line 4229 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 433:
-#line 1652 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 460:
+#line 1704 "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 3938 "src/parser_proc.c" /* glr.c:816  */
+#line 4237 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 434:
-#line 1655 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 461:
+#line 1707 "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 3946 "src/parser_proc.c" /* glr.c:816  */
+#line 4245 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 435:
-#line 1661 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 462:
+#line 1713 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = false;
 }
-#line 3954 "src/parser_proc.c" /* glr.c:816  */
+#line 4253 "src/parser_proc.c" /* glr.c:816  */
     break;
 
-  case 436:
-#line 1664 "src/parser_proc_grammar.y" /* glr.c:816  */
+  case 463:
+#line 1716 "src/parser_proc_grammar.y" /* glr.c:816  */
     {
        (*(bool*)(&(*yyvalp))) = true;
 }
-#line 3962 "src/parser_proc.c" /* glr.c:816  */
+#line 4261 "src/parser_proc.c" /* glr.c:816  */
     break;
 
 
-#line 3966 "src/parser_proc.c" /* glr.c:816  */
+#line 4265 "src/parser_proc.c" /* glr.c:816  */
       default: break;
     }
 
@@ -4010,634 +4309,646 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, struct psi_parser
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   switch (yytype)
     {
-          case 128: /* binary_op_token  */
-#line 272 "src/parser_proc_grammar.y" /* glr.c:846  */
+          case 133: /* binary_op_token  */
+#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4017 "src/parser_proc.c" /* glr.c:846  */
+#line 4316 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 129: /* unary_op_token  */
-#line 272 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 134: /* unary_op_token  */
+#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4023 "src/parser_proc.c" /* glr.c:846  */
+#line 4322 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 130: /* name_token  */
-#line 272 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 135: /* name_token  */
+#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4029 "src/parser_proc.c" /* glr.c:846  */
+#line 4328 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 131: /* any_noeol_token  */
-#line 272 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 136: /* any_noeol_token  */
+#line 277 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4035 "src/parser_proc.c" /* glr.c:846  */
+#line 4334 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 135: /* lib  */
-#line 266 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 140: /* lib  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4041 "src/parser_proc.c" /* glr.c:846  */
+#line 4340 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 136: /* cpp  */
-#line 281 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 141: /* cpp  */
+#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 4047 "src/parser_proc.c" /* glr.c:846  */
+#line 4346 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 137: /* cpp_exp  */
-#line 281 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 142: /* cpp_exp  */
+#line 286 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_exp_free(&(*(struct psi_cpp_exp **)(&(*yyvaluep))));}
-#line 4053 "src/parser_proc.c" /* glr.c:846  */
+#line 4352 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 138: /* cpp_message_token  */
-#line 269 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 144: /* cpp_message_token  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4059 "src/parser_proc.c" /* glr.c:846  */
+#line 4358 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 139: /* cpp_include_token  */
-#line 269 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 145: /* cpp_include_token  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4065 "src/parser_proc.c" /* glr.c:846  */
+#line 4364 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 140: /* cpp_header_token  */
-#line 269 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 146: /* cpp_header_token  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4071 "src/parser_proc.c" /* glr.c:846  */
+#line 4370 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 141: /* cpp_no_arg_token  */
-#line 269 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 147: /* cpp_no_arg_token  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4077 "src/parser_proc.c" /* glr.c:846  */
+#line 4376 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 142: /* cpp_name_arg_token  */
-#line 269 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 148: /* cpp_name_arg_token  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4083 "src/parser_proc.c" /* glr.c:846  */
+#line 4382 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 143: /* cpp_exp_arg_token  */
-#line 269 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 149: /* cpp_exp_arg_token  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4089 "src/parser_proc.c" /* glr.c:846  */
+#line 4388 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 144: /* cpp_macro_decl  */
-#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 150: /* cpp_special_name_token  */
+#line 274 "src/parser_proc_grammar.y" /* glr.c:846  */
+      {}
+#line 4394 "src/parser_proc.c" /* glr.c:846  */
+        break;
+
+    case 151: /* cpp_macro_decl  */
+#line 288 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_cpp_macro_decl_free(&(*(struct psi_cpp_macro_decl **)(&(*yyvaluep))));}
-#line 4095 "src/parser_proc.c" /* glr.c:846  */
+#line 4400 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 145: /* cpp_macro_sig  */
-#line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 152: /* cpp_macro_sig  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4101 "src/parser_proc.c" /* glr.c:846  */
+#line 4406 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 146: /* cpp_macro_sig_args  */
-#line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 153: /* cpp_macro_sig_args  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4107 "src/parser_proc.c" /* glr.c:846  */
+#line 4412 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 147: /* cpp_macro_decl_tokens  */
-#line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 154: /* cpp_macro_decl_tokens  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4113 "src/parser_proc.c" /* glr.c:846  */
+#line 4418 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 148: /* cpp_macro_decl_token_list  */
-#line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 155: /* cpp_macro_decl_token_list  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4119 "src/parser_proc.c" /* glr.c:846  */
+#line 4424 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 149: /* cpp_macro_exp  */
-#line 287 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 156: /* cpp_macro_exp  */
+#line 292 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 4125 "src/parser_proc.c" /* glr.c:846  */
+#line 4430 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 150: /* cpp_macro_call_args  */
-#line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 157: /* cpp_macro_call_args  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4131 "src/parser_proc.c" /* glr.c:846  */
+#line 4436 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 151: /* cpp_macro_call_arg_list  */
-#line 285 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 158: /* cpp_macro_call_arg_list  */
+#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4137 "src/parser_proc.c" /* glr.c:846  */
+#line 4442 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 152: /* constant  */
-#line 293 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 159: /* constant  */
+#line 298 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_free(&(*(struct psi_const **)(&(*yyvaluep))));}
-#line 4143 "src/parser_proc.c" /* glr.c:846  */
+#line 4448 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 153: /* constant_type  */
-#line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 160: /* constant_type  */
+#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_const_type_free(&(*(struct psi_const_type **)(&(*yyvaluep))));}
-#line 4149 "src/parser_proc.c" /* glr.c:846  */
+#line 4454 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 154: /* constant_type_token  */
-#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 161: /* constant_type_token  */
+#line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4155 "src/parser_proc.c" /* glr.c:846  */
+#line 4460 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 155: /* impl_def_val  */
-#line 297 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 162: /* impl_def_val  */
+#line 302 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_def_val_free(&(*(struct psi_impl_def_val **)(&(*yyvaluep))));}
-#line 4161 "src/parser_proc.c" /* glr.c:846  */
+#line 4466 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 156: /* impl_def_val_token  */
-#line 290 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 163: /* impl_def_val_token  */
+#line 295 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4167 "src/parser_proc.c" /* glr.c:846  */
+#line 4472 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 157: /* decl_typedef  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 164: /* decl_typedef  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4173 "src/parser_proc.c" /* glr.c:846  */
+#line 4478 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 158: /* typedef  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 165: /* typedef  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4179 "src/parser_proc.c" /* glr.c:846  */
+#line 4484 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 159: /* const_decl_type  */
-#line 306 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 166: /* const_decl_type  */
+#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 4185 "src/parser_proc.c" /* glr.c:846  */
+#line 4490 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 160: /* decl_type  */
-#line 306 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 167: /* decl_type  */
+#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 4191 "src/parser_proc.c" /* glr.c:846  */
+#line 4496 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 161: /* decl_type_complex  */
-#line 306 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 168: /* decl_type_complex  */
+#line 311 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_type_free(&(*(struct psi_decl_type **)(&(*yyvaluep))));}
-#line 4197 "src/parser_proc.c" /* glr.c:846  */
+#line 4502 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 162: /* decl_type_simple  */
-#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 169: /* decl_type_simple  */
+#line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4203 "src/parser_proc.c" /* glr.c:846  */
+#line 4508 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 163: /* decl_real_type  */
-#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 170: /* decl_real_type  */
+#line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4209 "src/parser_proc.c" /* glr.c:846  */
+#line 4514 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 164: /* decl_stdint_type  */
-#line 303 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 171: /* decl_stdint_type  */
+#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4215 "src/parser_proc.c" /* glr.c:846  */
+#line 4520 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 165: /* int_signed  */
-#line 278 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 172: /* int_signed  */
+#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4221 "src/parser_proc.c" /* glr.c:846  */
+#line 4526 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 166: /* int_width  */
-#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 173: /* int_width  */
+#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4227 "src/parser_proc.c" /* glr.c:846  */
+#line 4532 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 167: /* decl_int_type  */
-#line 300 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 174: /* decl_int_type  */
+#line 305 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4233 "src/parser_proc.c" /* glr.c:846  */
+#line 4538 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 168: /* int_signed_types  */
-#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 175: /* int_signed_types  */
+#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4239 "src/parser_proc.c" /* glr.c:846  */
+#line 4544 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 169: /* signed_short_types  */
-#line 278 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 176: /* signed_short_types  */
+#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4245 "src/parser_proc.c" /* glr.c:846  */
+#line 4550 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 170: /* signed_long_types  */
-#line 278 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 177: /* signed_long_types  */
+#line 283 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4251 "src/parser_proc.c" /* glr.c:846  */
+#line 4556 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 171: /* int_width_types  */
-#line 275 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 178: /* int_width_types  */
+#line 280 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4257 "src/parser_proc.c" /* glr.c:846  */
+#line 4562 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 172: /* decl_stmt  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 179: /* decl_stmt  */
+#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4263 "src/parser_proc.c" /* glr.c:846  */
+#line 4568 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 173: /* decl  */
-#line 308 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 185: /* decl  */
+#line 313 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_free(&(*(struct psi_decl **)(&(*yyvaluep))));}
-#line 4269 "src/parser_proc.c" /* glr.c:846  */
+#line 4574 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 174: /* decl_fn  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 186: /* decl_fn  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4275 "src/parser_proc.c" /* glr.c:846  */
+#line 4580 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 175: /* decl_functor  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 187: /* decl_functor  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4281 "src/parser_proc.c" /* glr.c:846  */
+#line 4586 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 176: /* decl_func  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 188: /* decl_func  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4287 "src/parser_proc.c" /* glr.c:846  */
+#line 4592 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 177: /* decl_args  */
-#line 322 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 189: /* decl_args  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4293 "src/parser_proc.c" /* glr.c:846  */
+#line 4598 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 178: /* decl_arg  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 190: /* decl_arg  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4299 "src/parser_proc.c" /* glr.c:846  */
+#line 4604 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 179: /* decl_var  */
-#line 312 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 191: /* decl_var  */
+#line 317 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_var_free(&(*(struct psi_decl_var **)(&(*yyvaluep))));}
-#line 4305 "src/parser_proc.c" /* glr.c:846  */
+#line 4610 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 180: /* decl_union  */
-#line 316 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 192: /* decl_union  */
+#line 321 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_union_free(&(*(struct psi_decl_union **)(&(*yyvaluep))));}
-#line 4311 "src/parser_proc.c" /* glr.c:846  */
+#line 4616 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 181: /* decl_struct  */
-#line 314 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 193: /* decl_struct  */
+#line 319 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_struct_free(&(*(struct psi_decl_struct **)(&(*yyvaluep))));}
-#line 4317 "src/parser_proc.c" /* glr.c:846  */
+#line 4622 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 182: /* decl_struct_args  */
-#line 322 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 194: /* decl_struct_args  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4323 "src/parser_proc.c" /* glr.c:846  */
+#line 4628 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 183: /* struct_args_block  */
-#line 322 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 195: /* struct_args_block  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4329 "src/parser_proc.c" /* glr.c:846  */
+#line 4634 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 184: /* struct_args  */
-#line 322 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 196: /* struct_args  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4335 "src/parser_proc.c" /* glr.c:846  */
+#line 4640 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 185: /* struct_arg  */
-#line 310 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 197: /* struct_arg  */
+#line 315 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_arg_free(&(*(struct psi_decl_arg **)(&(*yyvaluep))));}
-#line 4341 "src/parser_proc.c" /* glr.c:846  */
+#line 4646 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 186: /* decl_enum  */
-#line 318 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 198: /* decl_enum  */
+#line 323 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_free(&(*(struct psi_decl_enum **)(&(*yyvaluep))));}
-#line 4347 "src/parser_proc.c" /* glr.c:846  */
+#line 4652 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 187: /* decl_enum_items  */
-#line 322 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 199: /* decl_enum_items  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4353 "src/parser_proc.c" /* glr.c:846  */
+#line 4658 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 188: /* decl_enum_item  */
-#line 320 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 200: /* decl_enum_item  */
+#line 325 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_decl_enum_item_free(&(*(struct psi_decl_enum_item **)(&(*yyvaluep))));}
-#line 4359 "src/parser_proc.c" /* glr.c:846  */
+#line 4664 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 189: /* num_exp  */
-#line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 201: /* num_exp  */
+#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_num_exp_free(&(*(struct psi_num_exp **)(&(*yyvaluep))));}
-#line 4365 "src/parser_proc.c" /* glr.c:846  */
+#line 4670 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 190: /* number  */
-#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 202: /* number  */
+#line 380 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_number_free(&(*(struct psi_number **)(&(*yyvaluep))));}
-#line 4371 "src/parser_proc.c" /* glr.c:846  */
+#line 4676 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 191: /* enum_name  */
-#line 266 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 203: /* enum_name  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4377 "src/parser_proc.c" /* glr.c:846  */
+#line 4682 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 192: /* union_name  */
-#line 266 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 204: /* union_name  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4383 "src/parser_proc.c" /* glr.c:846  */
+#line 4688 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 193: /* struct_name  */
-#line 266 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 205: /* struct_name  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4389 "src/parser_proc.c" /* glr.c:846  */
+#line 4694 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 194: /* optional_name  */
-#line 266 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 206: /* optional_name  */
+#line 271 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4395 "src/parser_proc.c" /* glr.c:846  */
+#line 4700 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 195: /* decl_layout  */
-#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 207: /* decl_layout  */
+#line 332 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_layout_free(&(*(struct psi_layout **)(&(*yyvaluep))));}
-#line 4401 "src/parser_proc.c" /* glr.c:846  */
+#line 4706 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 196: /* align_and_size  */
-#line 325 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 208: /* align_and_size  */
+#line 330 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4407 "src/parser_proc.c" /* glr.c:846  */
+#line 4712 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 197: /* array_size  */
-#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 209: /* array_size  */
+#line 383 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4413 "src/parser_proc.c" /* glr.c:846  */
+#line 4718 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 198: /* indirection  */
-#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 210: /* indirection  */
+#line 383 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4419 "src/parser_proc.c" /* glr.c:846  */
+#line 4724 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 199: /* pointers  */
-#line 378 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 211: /* pointers  */
+#line 383 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4425 "src/parser_proc.c" /* glr.c:846  */
+#line 4730 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 200: /* impl  */
-#line 330 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 212: /* asterisks  */
+#line 383 "src/parser_proc_grammar.y" /* glr.c:846  */
+      {}
+#line 4736 "src/parser_proc.c" /* glr.c:846  */
+        break;
+
+    case 213: /* impl  */
+#line 335 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_free(&(*(struct psi_impl **)(&(*yyvaluep))));}
-#line 4431 "src/parser_proc.c" /* glr.c:846  */
+#line 4742 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 201: /* impl_func  */
-#line 332 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 214: /* impl_func  */
+#line 337 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_func_free(&(*(struct psi_impl_func **)(&(*yyvaluep))));}
-#line 4437 "src/parser_proc.c" /* glr.c:846  */
+#line 4748 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 202: /* impl_args  */
-#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 215: /* impl_args  */
+#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4443 "src/parser_proc.c" /* glr.c:846  */
+#line 4754 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 203: /* impl_arg  */
-#line 334 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 216: /* impl_arg  */
+#line 339 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_arg_free(&(*(struct psi_impl_arg **)(&(*yyvaluep))));}
-#line 4449 "src/parser_proc.c" /* glr.c:846  */
+#line 4760 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 204: /* impl_var  */
-#line 338 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 217: /* impl_var  */
+#line 343 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_var_free(&(*(struct psi_impl_var **)(&(*yyvaluep))));}
-#line 4455 "src/parser_proc.c" /* glr.c:846  */
+#line 4766 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 205: /* impl_type  */
-#line 336 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 218: /* impl_type  */
+#line 341 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_type_free(&(*(struct psi_impl_type **)(&(*yyvaluep))));}
-#line 4461 "src/parser_proc.c" /* glr.c:846  */
+#line 4772 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 206: /* impl_type_token  */
-#line 368 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 219: /* impl_type_token  */
+#line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4467 "src/parser_proc.c" /* glr.c:846  */
+#line 4778 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 207: /* impl_stmts  */
-#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 220: /* impl_stmts  */
+#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4473 "src/parser_proc.c" /* glr.c:846  */
+#line 4784 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 208: /* impl_stmt  */
-#line 366 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 221: /* impl_stmt  */
+#line 371 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_impl_stmt_free(&(*(struct psi_token ***)(&(*yyvaluep))));}
-#line 4479 "src/parser_proc.c" /* glr.c:846  */
+#line 4790 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 209: /* let_stmt  */
-#line 341 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 222: /* let_stmt  */
+#line 346 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_stmt_free(&(*(struct psi_let_stmt **)(&(*yyvaluep))));}
-#line 4485 "src/parser_proc.c" /* glr.c:846  */
+#line 4796 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 210: /* let_exp  */
-#line 343 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 223: /* let_exp  */
+#line 348 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 4491 "src/parser_proc.c" /* glr.c:846  */
+#line 4802 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 211: /* let_exp_byref  */
-#line 343 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 224: /* let_exp_byref  */
+#line 348 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 4497 "src/parser_proc.c" /* glr.c:846  */
+#line 4808 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 212: /* let_exp_assign  */
-#line 343 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 225: /* let_exp_assign  */
+#line 348 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_exp_free(&(*(struct psi_let_exp **)(&(*yyvaluep))));}
-#line 4503 "src/parser_proc.c" /* glr.c:846  */
+#line 4814 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 213: /* let_calloc  */
-#line 345 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 226: /* let_calloc  */
+#line 350 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_calloc_free(&(*(struct psi_let_calloc **)(&(*yyvaluep))));}
-#line 4509 "src/parser_proc.c" /* glr.c:846  */
+#line 4820 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 214: /* let_callback  */
-#line 347 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 227: /* let_callback  */
+#line 352 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_callback_free(&(*(struct psi_let_callback **)(&(*yyvaluep))));}
-#line 4515 "src/parser_proc.c" /* glr.c:846  */
+#line 4826 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 215: /* let_func  */
-#line 349 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 228: /* let_func  */
+#line 354 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_let_func_free(&(*(struct psi_let_func **)(&(*yyvaluep))));}
-#line 4521 "src/parser_proc.c" /* glr.c:846  */
+#line 4832 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 216: /* let_func_token  */
-#line 368 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 229: /* let_func_token  */
+#line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4527 "src/parser_proc.c" /* glr.c:846  */
+#line 4838 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 217: /* let_func_exps  */
-#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 230: /* let_func_exps  */
+#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4533 "src/parser_proc.c" /* glr.c:846  */
+#line 4844 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 218: /* let_exps  */
-#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 231: /* let_exps  */
+#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4539 "src/parser_proc.c" /* glr.c:846  */
+#line 4850 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 219: /* callback_rval  */
-#line 368 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 232: /* callback_rval  */
+#line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4545 "src/parser_proc.c" /* glr.c:846  */
+#line 4856 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 220: /* callback_arg_list  */
-#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 233: /* callback_arg_list  */
+#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4551 "src/parser_proc.c" /* glr.c:846  */
+#line 4862 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 221: /* callback_args  */
-#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 234: /* callback_args  */
+#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4557 "src/parser_proc.c" /* glr.c:846  */
+#line 4868 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 222: /* return_stmt  */
-#line 359 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 235: /* return_stmt  */
+#line 364 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_return_stmt_free(&(*(struct psi_return_stmt **)(&(*yyvaluep))));}
-#line 4563 "src/parser_proc.c" /* glr.c:846  */
+#line 4874 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 223: /* set_stmt  */
-#line 351 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 236: /* set_stmt  */
+#line 356 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_stmt_free(&(*(struct psi_set_stmt **)(&(*yyvaluep))));}
-#line 4569 "src/parser_proc.c" /* glr.c:846  */
+#line 4880 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 224: /* set_exp  */
-#line 353 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 237: /* set_exp  */
+#line 358 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_exp_free(&(*(struct psi_set_exp **)(&(*yyvaluep))));}
-#line 4575 "src/parser_proc.c" /* glr.c:846  */
+#line 4886 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 225: /* set_func  */
-#line 355 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 238: /* set_func  */
+#line 360 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_set_func_free(&(*(struct psi_set_func **)(&(*yyvaluep))));}
-#line 4581 "src/parser_proc.c" /* glr.c:846  */
+#line 4892 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 226: /* set_func_token  */
-#line 368 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 239: /* set_func_token  */
+#line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4587 "src/parser_proc.c" /* glr.c:846  */
+#line 4898 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 227: /* set_func_exps  */
-#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 240: /* set_func_exps  */
+#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4593 "src/parser_proc.c" /* glr.c:846  */
+#line 4904 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 228: /* set_exps  */
-#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 241: /* set_exps  */
+#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4599 "src/parser_proc.c" /* glr.c:846  */
+#line 4910 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 229: /* assert_stmt  */
-#line 357 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 242: /* assert_stmt  */
+#line 362 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_assert_stmt_free(&(*(struct psi_assert_stmt **)(&(*yyvaluep))));}
-#line 4605 "src/parser_proc.c" /* glr.c:846  */
+#line 4916 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 230: /* assert_stmt_token  */
-#line 368 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 243: /* assert_stmt_token  */
+#line 373 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_token_free(&(*(struct psi_token **)(&(*yyvaluep))));}
-#line 4611 "src/parser_proc.c" /* glr.c:846  */
+#line 4922 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 231: /* free_stmt  */
-#line 361 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 244: /* free_stmt  */
+#line 366 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_stmt_free(&(*(struct psi_free_stmt **)(&(*yyvaluep))));}
-#line 4617 "src/parser_proc.c" /* glr.c:846  */
+#line 4928 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 232: /* free_exps  */
-#line 370 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 245: /* free_exps  */
+#line 375 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4623 "src/parser_proc.c" /* glr.c:846  */
+#line 4934 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 233: /* free_exp  */
-#line 363 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 246: /* free_exp  */
+#line 368 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_free_exp_free(&(*(struct psi_free_exp **)(&(*yyvaluep))));}
-#line 4629 "src/parser_proc.c" /* glr.c:846  */
+#line 4940 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 234: /* decl_vars  */
-#line 322 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 247: /* decl_vars  */
+#line 327 "src/parser_proc_grammar.y" /* glr.c:846  */
       {psi_plist_free((*(struct psi_plist **)(&(*yyvaluep))));}
-#line 4635 "src/parser_proc.c" /* glr.c:846  */
+#line 4946 "src/parser_proc.c" /* glr.c:846  */
         break;
 
-    case 235: /* reference  */
-#line 380 "src/parser_proc_grammar.y" /* glr.c:846  */
+    case 248: /* reference  */
+#line 385 "src/parser_proc_grammar.y" /* glr.c:846  */
       {}
-#line 4641 "src/parser_proc.c" /* glr.c:846  */
+#line 4952 "src/parser_proc.c" /* glr.c:846  */
         break;
 
 
@@ -4694,7 +5005,7 @@ yylhsNonterm (yyRuleNum yyrule)
 }
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-505)))
+  (!!((Yystate) == (-547)))
 
 /** True iff LR state YYSTATE has only a default reduction (regardless
  *  of token).  */
@@ -5990,7 +6301,7 @@ yyparse (struct psi_parser *P, struct psi_plist *tokens, size_t *index)
 {
 }
 
-#line 5994 "src/parser_proc.c" /* glr.c:2270  */
+#line 6305 "src/parser_proc.c" /* glr.c:2270  */
 
   if (! yyinitGLRStack (yystackp, YYINITDEPTH))
     goto yyexhaustedlab;
@@ -6296,7 +6607,7 @@ yypdumpstack (yyGLRStack* yystackp)
 #define yydebug psi_parser_proc_debug
 #define yynerrs psi_parser_proc_nerrs
 
-#line 1673 "src/parser_proc_grammar.y" /* glr.c:2584  */
+#line 1725 "src/parser_proc_grammar.y" /* glr.c:2584  */
 
 
 /* epilogue */

diff --git a/src/parser_proc.h b/src/parser_proc.h
index ba52a9c924bf103966cd699f996031b674cbbca8..021c8867d592a683192f837ec06d23fc986c10a6 100644 (file)
--- a/src/parser_proc.h
+++ b/src/parser_proc.h
@@ -126,60 +126,65 @@ struct psi_parser;
     PSI_T_ELLIPSIS = 325,
     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
+    PSI_T_PRAGMA_ONCE = 328,
+    PSI_T_LINE = 329,
+    PSI_T_ERROR = 330,
+    PSI_T_WARNING = 331,
+    PSI_T_IF = 332,
+    PSI_T_IFDEF = 333,
+    PSI_T_IFNDEF = 334,
+    PSI_T_ELSE = 335,
+    PSI_T_ELIF = 336,
+    PSI_T_ENDIF = 337,
+    PSI_T_DEFINE = 338,
+    PSI_T_DEFINED = 339,
+    PSI_T_UNDEF = 340,
+    PSI_T_IMPORT = 341,
+    PSI_T_INCLUDE = 342,
+    PSI_T_INCLUDE_NEXT = 343,
+    PSI_T_TYPEDEF = 344,
+    PSI_T_STRUCT = 345,
+    PSI_T_UNION = 346,
+    PSI_T_ENUM = 347,
+    PSI_T_CONST = 348,
+    PSI_T_LIB = 349,
+    PSI_T_STATIC = 350,
+    PSI_T_CALLBACK = 351,
+    PSI_T_FUNCTION = 352,
+    PSI_T_LET = 353,
+    PSI_T_SET = 354,
+    PSI_T_TEMP = 355,
+    PSI_T_FREE = 356,
+    PSI_T_RETURN = 357,
+    PSI_T_PRE_ASSERT = 358,
+    PSI_T_POST_ASSERT = 359,
+    PSI_T_BOOLVAL = 360,
+    PSI_T_INTVAL = 361,
+    PSI_T_STRVAL = 362,
+    PSI_T_PATHVAL = 363,
+    PSI_T_STRLEN = 364,
+    PSI_T_FLOATVAL = 365,
+    PSI_T_ARRVAL = 366,
+    PSI_T_OBJVAL = 367,
+    PSI_T_COUNT = 368,
+    PSI_T_CALLOC = 369,
+    PSI_T_TO_BOOL = 370,
+    PSI_T_TO_INT = 371,
+    PSI_T_TO_STRING = 372,
+    PSI_T_TO_FLOAT = 373,
+    PSI_T_TO_ARRAY = 374,
+    PSI_T_TO_OBJECT = 375,
+    PSI_T_COMMENT = 376,
+    PSI_T_WHITESPACE = 377,
+    PSI_T_NO_WHITESPACE = 378,
+    PSI_T_CPP_HEADER = 379,
+    PSI_T_CPP_ATTRIBUTE = 380,
+    PSI_T_CPP_EXTENSION = 381,
+    PSI_T_CPP_PASTE = 382,
+    PSI_T_CPP_RESTRICT = 383,
+    PSI_T_CPP_ASM = 384,
+    PSI_T_BINARY = 385,
+    PSI_T_UNARY = 386
   };
 #endif
 
@@ -197,6 +202,8 @@ union YYSTYPE
   size_t PSI_T_indirection;
   /* pointers  */
   size_t PSI_T_pointers;
+  /* asterisks  */
+  size_t PSI_T_asterisks;
   /* assert_stmt  */
   struct psi_assert_stmt * PSI_T_assert_stmt;
   /* constant  */
@@ -475,8 +482,10 @@ union YYSTYPE
   struct psi_token * PSI_T_IIF;
   /* PRAGMA  */
   struct psi_token * PSI_T_PRAGMA;
-  /* ONCE  */
-  struct psi_token * PSI_T_ONCE;
+  /* PRAGMA_ONCE  */
+  struct psi_token * PSI_T_PRAGMA_ONCE;
+  /* LINE  */
+  struct psi_token * PSI_T_LINE;
   /* ERROR  */
   struct psi_token * PSI_T_ERROR;
   /* WARNING  */
@@ -579,6 +588,14 @@ union YYSTYPE
   struct psi_token * PSI_T_CPP_HEADER;
   /* CPP_ATTRIBUTE  */
   struct psi_token * PSI_T_CPP_ATTRIBUTE;
+  /* CPP_EXTENSION  */
+  struct psi_token * PSI_T_CPP_EXTENSION;
+  /* CPP_PASTE  */
+  struct psi_token * PSI_T_CPP_PASTE;
+  /* CPP_RESTRICT  */
+  struct psi_token * PSI_T_CPP_RESTRICT;
+  /* CPP_ASM  */
+  struct psi_token * PSI_T_CPP_ASM;
   /* binary_op_token  */
   struct psi_token * PSI_T_binary_op_token;
   /* unary_op_token  */
@@ -601,6 +618,8 @@ union YYSTYPE
   struct psi_token * PSI_T_cpp_name_arg_token;
   /* cpp_exp_arg_token  */
   struct psi_token * PSI_T_cpp_exp_arg_token;
+  /* cpp_special_name_token  */
+  struct psi_token * PSI_T_cpp_special_name_token;
   /* constant_type_token  */
   struct psi_token * PSI_T_constant_type_token;
   /* impl_def_val_token  */
@@ -645,7 +664,7 @@ union YYSTYPE
   struct psi_token * PSI_T_assert_stmt_token;
   /* impl_stmt  */
   struct psi_token ** PSI_T_impl_stmt;
-#line 649 "src/parser_proc.h" /* glr.c:197  */
+#line 668 "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 f4c1bc0a3d7045abc53995affff4e851ea0202cd..442f93d84f070bf037e73d216e831ac48a694c77 100644 (file)
--- a/src/parser_proc_grammar.y
+++ b/src/parser_proc_grammar.y
@@ -192,7 +192,8 @@ struct psi_parser;
 %token <struct psi_token *> IIF                        "?"
 
 %token <struct psi_token *> PRAGMA
-%token <struct psi_token *> ONCE
+%token <struct psi_token *> PRAGMA_ONCE
+%token <struct psi_token *> LINE
 %token <struct psi_token *> ERROR
 %token <struct psi_token *> WARNING
 %token <struct psi_token *> IF
@@ -246,6 +247,10 @@ struct psi_parser;
 %token <struct psi_token *> NO_WHITESPACE
 %token <struct psi_token *> CPP_HEADER
 %token <struct psi_token *> CPP_ATTRIBUTE
+%token <struct psi_token *> CPP_EXTENSION
+%token <struct psi_token *> CPP_PASTE
+%token <struct psi_token *> CPP_RESTRICT
+%token <struct psi_token *> CPP_ASM
 
 %precedence IIF COLON
 %precedence OR
@@ -265,8 +270,8 @@ struct psi_parser;
 %type          <struct psi_token *>                            lib optional_name enum_name struct_name union_name
 %destructor    {psi_token_free(&$$);}                          lib optional_name enum_name struct_name union_name
 
-%type          <struct psi_token *>                            cpp_message_token cpp_include_token cpp_header_token cpp_no_arg_token cpp_name_arg_token cpp_exp_arg_token
-%destructor    {}                                                                      cpp_message_token cpp_include_token cpp_header_token cpp_no_arg_token cpp_name_arg_token cpp_exp_arg_token
+%type          <struct psi_token *>                            cpp_message_token cpp_include_token cpp_header_token cpp_no_arg_token cpp_name_arg_token cpp_exp_arg_token cpp_special_name_token
+%destructor    {}                                                                      cpp_message_token cpp_include_token cpp_header_token cpp_no_arg_token cpp_name_arg_token cpp_exp_arg_token cpp_special_name_token
 
 %type          <struct psi_token *>                            name_token any_noeol_token binary_op_token unary_op_token
 %destructor    {}                                                                      name_token any_noeol_token binary_op_token unary_op_token
@@ -374,13 +379,11 @@ struct psi_parser;
 %type          <struct psi_number *>                           number
 %destructor    {psi_number_free(&$$);}                         number
 
-%type          <size_t>                                                        indirection pointers array_size
-%destructor    {}                                                                      indirection pointers array_size
+%type          <size_t>                                                        indirection pointers asterisks array_size
+%destructor    {}                                                                      indirection pointers asterisks array_size
 %type          <bool>                                                          reference
 %destructor    {}                                                                      reference
 
-//%destructor {}                                                                       file blocks block
-
 %%
 
 /* rules */
@@ -388,8 +391,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 | 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;
+name_token: NAME | TEMP | FREE | SET | LET | CALLOC | CALLBACK | LIB | BOOL | STRING | ERROR | WARNING | LINE | PRAGMA_ONCE | PRAGMA | let_func_token | set_func_token;
+any_noeol_token: BOOL | CHAR | SHORT | INT | SIGNED | UNSIGNED | LONG | FLOAT | DOUBLE | STRING | MIXED | ARRAY | OBJECT | CALLABLE | VOID | ZVAL | INT8 | UINT8 | INT16 | UINT16 | INT32 | UINT32 | INT64 | UINT64 | NULL | TRUE | FALSE | NAME | NSNAME | DOLLAR_NAME | NUMBER | QUOTED_STRING | QUOTED_CHAR | EOF | EOS | LPAREN | RPAREN | COMMA | COLON | LBRACE | RBRACE | LBRACKET | RBRACKET | EQUALS | HASH | PIPE | CARET | AMPERSAND | LSHIFT | RSHIFT | PLUS | MINUS | ASTERISK | SLASH | MODULO | LCHEVR | RCHEVR | CMP_GE | CMP_LE | OR | AND | CMP_EQ | CMP_NE | TILDE | NOT | PERIOD | BACKSLASH | ELLIPSIS | ERROR | WARNING | LINE | PRAGMA | PRAGMA_ONCE | IIF | IF | IFDEF | IFNDEF | ELSE | ELIF | ENDIF | DEFINE | DEFINED | UNDEF | INCLUDE | TYPEDEF | STRUCT | UNION | ENUM | CONST | LIB | STATIC | CALLBACK | FUNCTION | LET | SET | TEMP | FREE | RETURN | PRE_ASSERT | POST_ASSERT | BOOLVAL | INTVAL | STRVAL | PATHVAL | STRLEN | FLOATVAL | ARRVAL | OBJVAL | COUNT | CALLOC | TO_BOOL | TO_INT | TO_STRING | TO_FLOAT | TO_ARRAY | TO_OBJECT | COMMENT | CPP_HEADER | CPP_PASTE | CPP_RESTRICT | CPP_EXTENSION | CPP_ASM;
 
 
 file:
@@ -413,9 +416,9 @@ block:
 |      lib {
        if (P->file.ln) {
                P->error(PSI_DATA(P), $lib, PSI_WARNING,
-                               "Extra 'lib %s' statement has no effect", $lib->text);
+                               "Extra 'lib \"%s\"' statement has no effect", $lib->text);
        } else {
-               P->file.ln = strndup($lib->text + 1, $lib->size - 2);
+               P->file.ln = strndup($lib->text, $lib->size);
        }
 }
 |      constant {
@@ -424,6 +427,7 @@ block:
 |      decl_stmt {
        psi_parser_proc_add_decl(P, $decl_stmt);
 }
+|      decl_ext_var_stmt
 |      decl_typedef[def] {
        psi_parser_proc_add_typedef(P, $def);
 }
@@ -448,7 +452,10 @@ lib:
 ;
 
 cpp:
-       HASH cpp_exp[exp] EOL {
+       HASH EOL {
+       $cpp = NULL;
+}
+|      HASH cpp_exp[exp] EOL {
        $cpp = $exp;
 }
 ;
@@ -485,12 +492,7 @@ cpp_exp[exp]:
        $exp = psi_cpp_exp_init($cpp_no_arg_token->type, NULL);
        $exp->token = psi_token_copy($cpp_no_arg_token);
 }
-|      cpp_name_arg_token name_token {
-       $name_token->type = PSI_T_NAME;
-       $exp = psi_cpp_exp_init($cpp_name_arg_token->type, psi_token_copy($name_token));
-       $exp->token = psi_token_copy($cpp_name_arg_token);
-}
-|      cpp_name_arg_token NULL[name_token] {
+|      cpp_name_arg_token cpp_special_name_token[name_token] {
        $name_token->type = PSI_T_NAME;
        $exp = psi_cpp_exp_init($cpp_name_arg_token->type, psi_token_copy($name_token));
        $exp->token = psi_token_copy($cpp_name_arg_token);
@@ -503,16 +505,21 @@ 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_ONCE {
+       $exp = psi_cpp_exp_init($PRAGMA_ONCE->type, NULL);
+       $exp->token = psi_token_copy($PRAGMA_ONCE);
 }
-|      PRAGMA cpp_macro_decl_tokens[tokens] {
+|      cpp_ignored_token cpp_macro_decl_tokens[tokens] {
        psi_plist_free($tokens);
        $exp = NULL;
 }
 ;
 
+cpp_ignored_token:
+       LINE
+|      PRAGMA
+;
+
 cpp_message_token: 
        ERROR
 |      WARNING
@@ -545,18 +552,22 @@ cpp_exp_arg_token:
 |      ELIF
 ;
 
+cpp_special_name_token:
+       name_token
+|      NULL
+|      TRUE
+|      FALSE
+|      CPP_RESTRICT
+|      CPP_EXTENSION
+;
+
 cpp_macro_decl[macro]:
        name_token NO_WHITESPACE LPAREN cpp_macro_sig RPAREN cpp_macro_decl_tokens {
        $name_token->type = PSI_T_NAME;
        $macro = psi_cpp_macro_decl_init($cpp_macro_sig, $cpp_macro_decl_tokens, NULL);
        $macro->token = psi_token_copy($name_token);
 }
-|      name_token cpp_macro_decl_tokens {
-       $name_token->type = PSI_T_NAME;
-       $macro = psi_cpp_macro_decl_init(NULL, $cpp_macro_decl_tokens, NULL);
-       $macro->token = psi_token_copy($name_token);
-}
-|      NULL[name_token] cpp_macro_decl_tokens {
+|      cpp_special_name_token[name_token] cpp_macro_decl_tokens {
        $name_token->type = PSI_T_NAME;
        $macro = psi_cpp_macro_decl_init(NULL, $cpp_macro_decl_tokens, NULL);
        $macro->token = psi_token_copy($name_token);
@@ -672,7 +683,7 @@ cpp_macro_call_args[args]:
 
 cpp_macro_call_arg_list[args]:
        cpp_macro_exp {
-       $args = psi_plist_add(psi_plist_init((void (*)(void *)) psi_num_exp_free), 
+       $args = psi_plist_add(psi_plist_init((psi_plist_dtor) psi_num_exp_free), 
                &$cpp_macro_exp);
 }
 |      cpp_macro_call_arg_list[args_] COMMA cpp_macro_exp {
@@ -935,11 +946,41 @@ int_width_types[type]:
 ;
 
 decl_stmt:
-       decl EOS {
+       decl decl_asm EOS {
+       $decl_stmt = $decl;
+}
+|      CPP_EXTENSION decl decl_asm EOS {
        $decl_stmt = $decl;
 }
 ;
 
+decl_asm:
+       %empty
+|      CPP_ASM LPAREN ignored_quoted_strings RPAREN
+;
+
+ignored_quoted_strings:
+       QUOTED_STRING
+|      ignored_quoted_strings QUOTED_STRING
+;
+
+decl_ext_var_stmt:
+       decl_ext_var EOS
+;
+
+decl_ext_var: 
+       NAME decl_arg decl_ext_var_list {
+       psi_decl_arg_free(&$decl_arg);
+}
+;
+
+decl_ext_var_list:
+       %empty
+|      COMMA decl_vars {
+       psi_plist_free($decl_vars);
+}
+;
+
 decl:
        decl_fn[func] LPAREN decl_args[args] RPAREN array_size[as] {
        $decl = psi_decl_init(psi_decl_abi_init("default"), $func, $args);
@@ -979,13 +1020,15 @@ decl_fn:
 ;
 
 decl_functor[arg]:
-       const_decl_type[type] indirection[i] LPAREN indirection name_token[NAME] RPAREN {
+       const_decl_type[type] indirection[i] LPAREN indirection[unused1] name_token[NAME] RPAREN {
+       (void) $unused1;
        $NAME->type = PSI_T_NAME;
        $arg = psi_decl_arg_init($type, psi_decl_var_init($NAME->text, $i, 0));
        $arg->var->token = psi_token_copy($NAME);
        $arg->token = psi_token_copy($NAME);
 }
-|      CONST VOID pointers LPAREN indirection name_token[NAME] RPAREN {
+|      CONST VOID pointers LPAREN indirection[unused1] name_token[NAME] RPAREN {
+       (void) $unused1;
        $NAME->type = PSI_T_NAME;
        $arg = psi_decl_arg_init(
                psi_decl_type_init($VOID->type, $VOID->text),
@@ -995,7 +1038,8 @@ decl_functor[arg]:
        $arg->var->token = psi_token_copy($NAME);
        $arg->token = psi_token_copy($NAME);
 }
-|      VOID pointers LPAREN indirection name_token[NAME] RPAREN {
+|      VOID pointers LPAREN indirection[unused1] name_token[NAME] RPAREN {
+       (void) $unused1;
        $NAME->type = PSI_T_NAME;
        $arg = psi_decl_arg_init(
                psi_decl_type_init($VOID->type, $VOID->text),
@@ -1005,7 +1049,8 @@ decl_functor[arg]:
        $arg->var->token = psi_token_copy($NAME);
        $arg->token = psi_token_copy($NAME);
 }
-|      VOID LPAREN indirection name_token[NAME] RPAREN {
+|      VOID LPAREN indirection[unused1] name_token[NAME] RPAREN {
+       (void) $unused1;
        $NAME->type = PSI_T_NAME;
        $arg = psi_decl_arg_init(
                psi_decl_type_init($VOID->type, $VOID->text),
@@ -1297,11 +1342,18 @@ indirection[i]:
 ;
 
 pointers[p]:
+       asterisks
+|      asterisks[a] CPP_RESTRICT {
+       $p = $a;
+}
+;
+
+asterisks[a]:
        ASTERISK {
-       $p = 1;
+       $a = 1;
 }
-|      pointers[p_] ASTERISK {
-       $p = $p_ + 1;
+|      asterisks[a_] ASTERISK {
+       $a = $a_ + 1;
 }
 ;
 

diff --git a/src/types/cpp_exp.c b/src/types/cpp_exp.c
index 2371ae25f1047fabd6f260b97de3e522688ebc49..d4bb9bb7796cafe6dd6606403b8d3953adb0e860 100644 (file)
--- a/src/types/cpp_exp.c
+++ b/src/types/cpp_exp.c
@@ -54,7 +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:
+       case PSI_T_PRAGMA_ONCE:
                break;
        default:
                assert(0);
@@ -95,7 +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:
+               case PSI_T_PRAGMA_ONCE:
                        break;
                default:
                        assert(0);
@@ -121,10 +121,16 @@ void psi_cpp_exp_dump(int fd, struct psi_cpp_exp *exp)
        case PSI_T_UNDEF:
        case PSI_T_IFDEF:
        case PSI_T_IFNDEF:
+               dprintf(fd, "%s", exp->data.tok->text);
+               break;
        case PSI_T_IMPORT:
        case PSI_T_INCLUDE:
        case PSI_T_INCLUDE_NEXT:
-               dprintf(fd, "%s", exp->data.tok->text);
+               if (exp->data.tok->type == PSI_T_CPP_HEADER) {
+                       dprintf(fd, "<%s>", exp->data.tok->text);
+               } else {
+                       dprintf(fd, "\"%s\"", exp->data.tok->text);
+               }
                break;
        case PSI_T_DEFINE:
                psi_cpp_macro_decl_dump(fd, exp->data.decl);
@@ -135,7 +141,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:
+       case PSI_T_PRAGMA_ONCE:
                break;
        default:
                assert(0);
@@ -314,7 +320,8 @@ void psi_cpp_exp_exec(struct psi_cpp_exp *exp, struct psi_cpp *cpp, struct psi_d
                                D->error(D, exp->token, PSI_WARNING, "Failed to include %s", exp->data.tok->text);
                        }
                }
-       case PSI_T_ONCE:
+               break;
+       case PSI_T_PRAGMA_ONCE:
                if (!cpp->skip) {
                        zend_hash_str_add_empty_element(&cpp->once, exp->token->file, strlen(exp->token->file));
                }

diff --git a/src/types/impl_def_val.c b/src/types/impl_def_val.c
index cadefe23db5b848404043ee83429312b31207bbe..69b5db4ca067321a3541d5025295d85789842671 100644 (file)
--- a/src/types/impl_def_val.c
+++ b/src/types/impl_def_val.c
@@ -78,11 +78,8 @@ bool psi_impl_def_val_validate(struct psi_data *data,
                        def->ival.dval = zend_strtod(def->text, NULL);
                        break;
                case PSI_T_STRING:
-                       /* used for consts */
-                       def->ival.zend.str = zend_string_init(def->text, strlen(def->text), 1);
-                       break;
                case PSI_T_QUOTED_STRING:
-                       def->ival.zend.str = zend_string_init(&def->text[1], strlen(def->text) - 2, 1);
+                       def->ival.zend.str = zend_string_init(def->text, strlen(def->text), 1);
                        break;
                default:
                        data->error(data, def->token, PSI_WARNING,

diff --git a/src/types/number.c b/src/types/number.c
index b0a669f978d25fd7780919af401679548f488da0..057bd9fb8d3d2a2629c9d95185378235cb6a5600 100644 (file)
--- a/src/types/number.c
+++ b/src/types/number.c
@@ -207,12 +207,15 @@ void psi_number_dump(int fd, struct psi_number *exp)
        case PSI_T_UINT64:
                dprintf(fd, "%" PRIu64, exp->data.ival.u64);
                break;
+       case PSI_T_FLOAT:
+               dprintf(fd, "%" PRIfval, exp->data.ival.dval);
+               break;
        case PSI_T_DOUBLE:
-               dprintf(fd, "%F", exp->data.ival.dval);
+               dprintf(fd, "%" PRIdval, exp->data.ival.dval);
                break;
 #if HAVE_LONG_DOUBLE
        case PSI_T_LONG_DOUBLE:
-               dprintf(fd, "%lF", exp->data.ival.ldval);
+               dprintf(fd, "%" PRIldval, exp->data.ival.ldval);
                break;
 #endif
        case PSI_T_NUMBER:
@@ -253,80 +256,88 @@ 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)
+static inline token_t validate_char(char *numb, impl_val *res, unsigned *lvl)
 {
-       impl_val tmp = {0};
-       /* FIXME L */
-       tmp.i8 = exp->data.numb[1 + (*exp->data.numb == 'L')];
-       switch(tmp.i8) {
+       char *endptr;
+       token_t typ = PSI_T_INT8;
+
+       res->i8 = numb[0];
+       endptr = &numb[1];
+
+       switch(res->i8) {
        case '\\':
-               tmp.i8 = exp->data.numb[2 + (*exp->data.numb == 'L')];
-               switch(tmp.i8) {
+               res->i8 = numb[1];
+               endptr = &numb[2];
+
+               switch(res->i8) {
+               case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7':
+                       res->i8 = strtol(&numb[1], &endptr, 8);
+                       break;
+
                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;
+                       res->i8 = strtol(&numb[2], &endptr, 16);
+                       break;
+
                case 'a':
-                       free(exp->data.numb);
-                       exp->type = PSI_T_INT8;
-                       exp->data.ival.i8 = '\a';
-                       return true;
+                       res->i8 = '\a';
+                       break;
                case 'b':
-                       free(exp->data.numb);
-                       exp->type = PSI_T_INT8;
-                       exp->data.ival.i8 = '\b';
-                       return true;
+                       res->i8 = '\b';
+                       break;
                case 'f':
-                       free(exp->data.numb);
-                       exp->type = PSI_T_INT8;
-                       exp->data.ival.i8 = '\f';
-                       return true;
+                       res->i8 = '\f';
+                       break;
                case 'n':
-                       free(exp->data.numb);
-                       exp->type = PSI_T_INT8;
-                       exp->data.ival.i8 = '\n';
-                       return true;
+                       res->i8 = '\n';
+                       break;
                case 'r':
-                       free(exp->data.numb);
-                       exp->type = PSI_T_INT8;
-                       exp->data.ival.i8 = '\r';
-                       return true;
+                       res->i8 = '\r';
+                       break;
                case 't':
-                       free(exp->data.numb);
-                       exp->type = PSI_T_INT8;
-                       exp->data.ival.i8 = '\t';
-                       return true;
+                       res->i8 = '\t';
+                       break;
                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;
+                       res->i8 = '\v';
+                       break;
                default:
-                       free(exp->data.numb);
-                       exp->type = PSI_T_INT8;
-                       exp->data.ival.i8 = tmp.i8;
-                       return true;
+                       break;
                }
                break;
        default:
-               free(exp->data.numb);
-               exp->type = PSI_T_INT8;
-               exp->data.ival.i8 = tmp.i8;
-               return true;
+               break;
        }
+
+       /* more to grok? */
+       if (*endptr) {
+               impl_val tmp_val = {0};
+               token_t tmp_typ = validate_char(endptr, &tmp_val, lvl);
+
+               if (!tmp_typ) {
+                       return 0;
+               }
+
+               res->i32 = res->i8 << (8 * *lvl);
+               typ = psi_calc_add(PSI_T_INT32, res, tmp_typ, &tmp_val, res);
+       }
+
+       ++(*lvl);
+
+       return typ;
+}
+static inline bool psi_number_validate_char(struct psi_data *data, struct psi_number *exp)
+{
+       impl_val val = {0};
+       unsigned lvl = 1;
+       token_t typ = validate_char(exp->data.numb, &val, &lvl);
+
+       if (!typ) {
+               return false;
+       }
+
+       free(exp->data.numb);
+       exp->type = typ;
+       exp->data.ival = val;
+       return true;
 }
 
 static inline bool psi_number_validate_number(struct psi_data *data, struct psi_number *exp)
@@ -590,7 +601,7 @@ token_t psi_number_eval(struct psi_number *exp, impl_val *res, struct psi_call_f
 #if HAVE_LONG_DOUBLE
        case PSI_T_LONG_DOUBLE:
                *res = exp->data.ival;
-               if (frame) PSI_DEBUG_PRINT(frame->context, " %" PRIdval, res->dval);
+               if (frame) PSI_DEBUG_PRINT(frame->context, " %" PRIldval, res->ldval);
                return exp->type;
 #endif