cpp
authorMichael Wallner <mike@php.net>
Wed, 29 Mar 2017 08:36:42 +0000 (10:36 +0200)
committerMichael Wallner <mike@php.net>
Wed, 3 May 2017 06:47:48 +0000 (08:47 +0200)
m4/psi/psi.m4
src/cpp.c
src/cpp_tokiter.c
src/parser.c
src/parser.re
src/parser_proc.c
src/parser_proc.h
src/parser_proc_grammar.y
src/types/cpp_exp.c
src/types/impl_def_val.c
src/types/number.c

index 92d8bab..470a7a6 100644 (file)
@@ -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
index 2cf4094..c831b67 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;
                                }
index 2ea9adc..51daaa9 100644 (file)
@@ -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;
                }
index 434554e..032d885 100644 (file)
@@ -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 '}':
+      &nb