cpp
[m6w6/ext-psi] / src / parser.c
index ef1fb8504327f9efad39a9d0d14716669e39d985..2b6c11ef10e8eb9c3172a3fb73b9b0917255c041 100644 (file)
@@ -1,15 +1,52 @@
-/* Generated by re2c 0.16 on Thu Feb  9 14:38:14 2017 */
-#line 1 "/home/mike/src/php-master/ext/psi/src/parser.re"
+/* Generated by re2c 0.16 on Tue Mar  7 09:49:40 2017 */
+#line 1 "src/parser.re"
+/*******************************************************************************
+ Copyright (c) 2016, Michael Wallner <mike@php.net>.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*******************************************************************************/
+
 #include "php_psi_stdinc.h"
 #include <sys/mman.h>
 #include <assert.h>
+#include <stdarg.h>
 
 #include "parser.h"
 
-void *psi_parser_proc_init(void);
-void psi_parser_proc_free(void **parser_proc);
-void psi_parser_proc_parse(void *parser_proc, token_t r, struct psi_token *token, struct psi_parser *parser);
-void psi_parser_proc_trace(FILE *out, char *prefix);
+#define YYMAXFILL 12
+#ifndef YYMAXFILL
+# define YYMAXFILL 256
+#endif
+#line 57 "src/parser.re"
+
+
+static void free_cpp_def(zval *p)
+{
+       if (Z_TYPE_P(p) == IS_PTR) {
+               psi_cpp_macro_decl_free((void *) &Z_PTR_P(p));
+       } else if (Z_REFCOUNTED_P(p)) {
+               zval_ptr_dtor(p);
+       }
+}
 
 struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error, unsigned flags)
 {
@@ -24,6 +61,11 @@ struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error, uns
        P->line = 1;
        P->proc = psi_parser_proc_init();
 
+       zend_hash_init(&P->cpp.defs, 0, NULL, free_cpp_def, 1);
+       zval tmp;
+       ZVAL_ARR(&tmp, &P->cpp.defs);
+       add_assoc_string(&tmp, "PHP_OS", PHP_OS);
+
        if (flags & PSI_DEBUG) {
                psi_parser_proc_trace(stderr, "PSI> ");
        }
@@ -31,162 +73,183 @@ struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error, uns
        return P;
 }
 
+void psi_parser_reset(struct psi_parser *P)
+{
+       P->cur = P->tok = P->mrk = P->input.buffer;
+       P->lim = P->input.buffer + P->input.length;
+}
+
 bool psi_parser_open_file(struct psi_parser *P, const char *filename)
 {
-       FILE *fp = fopen(filename, "r");
+       struct stat sb;
+       FILE *fp;
+       char *fb;
 
-       if (!fp) {
+       if (stat(filename, &sb)) {
                P->error(PSI_DATA(P), NULL, PSI_WARNING,
-                               "Could not open '%s' for reading: %s",
+                               "Could not stat '%s': %s",
                                filename, strerror(errno));
                return false;
        }
 
-       P->input.type = PSI_PARSE_FILE;
-       P->input.data.file.handle = fp;
-
-#if HAVE_MMAP
-       struct stat sb;
-       int fd = fileno(fp);
+       if (!(fb = malloc(sb.st_size + YYMAXFILL))) {
+               P->error(PSI_DATA(P), NULL, PSI_WARNING,
+                               "Could not allocate %zu bytes for reading '%s': %s",
+                               sb.st_size + YYMAXFILL, filename, strerror(errno));
+               return false;
+       }
 
-       if (fstat(fd, &sb)) {
+       if (!(fp = fopen(filename, "r"))) {
+               free(fb);
                P->error(PSI_DATA(P), NULL, PSI_WARNING,
-                               "Could not stat '%s': %s",
+                               "Could not open '%s' for reading: %s",
                                filename, strerror(errno));
                return false;
        }
 
-       P->input.data.file.buffer = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
-       if (MAP_FAILED == P->input.data.file.buffer) {
+       if (sb.st_size != fread(fb, 1, sb.st_size, fp)) {
+               free(fb);
+               fclose(fp);
                P->error(PSI_DATA(P), NULL, PSI_WARNING,
-                               "Could not map '%s' for reading: %s",
-                               filename, strerror(errno));
+                               "Could not read %zu bytes from '%s': %s",
+                               sb.st_size + YYMAXFILL, filename, strerror(errno));
                return false;
        }
-       P->input.data.file.length = sb.st_size;
-#else
-       P->input.data.file.buffer = malloc(BSIZE);
-#endif
+       memset(fb + sb.st_size, 0, YYMAXFILL);
+
+       if (P->input.buffer) {
+               free(P->input.buffer);
+       }
+       P->input.buffer = fb;
+       P->input.length = sb.st_size;
 
        P->file.fn = strdup(filename);
 
+       psi_parser_reset(P);
+
        return true;
 }
 
 bool psi_parser_open_string(struct psi_parser *P, const char *string, size_t length)
 {
-       P->input.type = PSI_PARSE_STRING;
-       P->input.data.string.length = length;
-       if (!(P->input.data.string.buffer = strndup(string, length))) {
+       char *sb;
+
+       if (!(sb = malloc(length + YYMAXFILL))) {
+               P->error(PSI_DATA(P), NULL, PSI_WARNING,
+                               "Could not allocate %zu bytes: %s",
+                               length + YYMAXFILL, strerror(errno));
                return false;
        }
 
+       memcpy(sb, string, length);
+       memset(sb + length, 0, YYMAXFILL);
+
+       if (P->input.buffer) {
+               free(P->input.buffer);
+       }
+       P->input.buffer = sb;
+       P->input.length = length;
+
        P->file.fn = strdup("<input>");
 
+       psi_parser_reset(P);
+
        return true;
 }
 
-static ssize_t psi_parser_fill(struct psi_parser *P, size_t n)
+#if 0
+static void psi_parser_register_constants(struct psi_parser *P)
 {
-       PSI_DEBUG_PRINT(P, "PSI< Fill: n=%zu (input.type=%d)\n", n, P->input.type);
+       zend_string *key;
+       zval *val;
 
-       /* init if n==0 */
-       if (!n) {
-               switch (P->input.type) {
-               case PSI_PARSE_FILE:
-                       P->cur = P->tok = P->mrk = P->input.data.file.buffer;
-#if HAVE_MMAP
-                       P->eof = P->input.data.file.buffer + P->input.data.file.length;
-                       P->lim = P->eof;
-#else
-                       P->eof = NULL;
-                       P->lim = P->input.data.file.buffer;
-#endif
-                       break;
+       ZEND_HASH_FOREACH_STR_KEY_VAL(&P->cpp.defs, key, val)
+       {
+               struct psi_impl_def_val *iv;
+               struct psi_const_type *ct;
+               struct psi_const *c;
+               const char *ctn;
+               token_t ctt;
+               impl_val tmp;
+               zend_string *str;
 
-               case PSI_PARSE_STRING:
-                       P->cur = P->tok = P->mrk = P->input.data.string.buffer;
-                       P->eof = P->input.data.string.buffer + P->input.data.string.length;
-                       P->lim = P->eof;
+               ZVAL_DEREF(val);
+               switch (Z_TYPE_P(val)) {
+               case IS_TRUE:
+               case IS_FALSE:
+                       ctt = PSI_T_BOOL;
+                       ctn = "bool";
+                       tmp.zend.bval = Z_TYPE_P(val) == IS_TRUE;
+                       break;
+               case IS_LONG:
+                       ctt = PSI_T_INT;
+                       ctn = "int";
+                       tmp.zend.lval = Z_LVAL_P(val);
+                       break;
+               case IS_DOUBLE:
+                       ctt = PSI_T_FLOAT;
+                       ctn = "float";
+                       tmp.dval = Z_DVAL_P(val);
+                       break;
+               default:
+                       ctt = PSI_T_STRING;
+                       ctn = "string";
+                       str = zval_get_string(val);
+                       tmp.zend.str = zend_string_dup(str, 1);
+                       zend_string_release(str);
                        break;
                }
 
-               PSI_DEBUG_PRINT(P, "PSI< Fill: cur=%p lim=%p eof=%p\n", P->cur, P->lim, P->eof);
+               iv = psi_impl_def_val_init(ctt, NULL);
+               iv->ival = tmp;
+               ct = psi_const_type_init(ctt, ctn);
+               c = psi_const_init(ct, key->val, iv);
+               if (!P->consts) {
+                       P->consts = psi_plist_init((psi_plist_dtor) psi_const_free);
+               }
+               P->consts = psi_plist_add(P->consts, &c);
        }
+       ZEND_HASH_FOREACH_END();
+}
+#endif
 
-       switch (P->input.type) {
-       case PSI_PARSE_STRING:
-               break;
+void psi_parser_parse(struct psi_parser *P)
+{
+       size_t i = 0;
+       struct psi_token *T;
 
-       case PSI_PARSE_FILE:
-#if !HAVE_MMAP
-               if (!P->eof) {
-                       size_t consumed = P->tok - P->buf;
-                       size_t reserved = P->lim - P->tok;
-                       size_t available = BSIZE - reserved;
-                       size_t didread;
+       P->cpp.tokens = psi_parser_scan(P);
 
-                       if (consumed) {
-                               memmove(P->buf, P->tok, reserved);
-                               P->tok -= consumed;
-                               P->cur -= consumed;
-                               P->lim -= consumed;
-                               P->mrk -= consumed;
-                       }
+       psi_cpp_preprocess(P, &P->cpp);
 
-                       didread = fread(P->lim, 1, available, P->fp);
-                       P->lim += didread;
-                       if (didread < available) {
-                               P->eof = P->lim;
+       if (psi_plist_count(P->cpp.tokens)) {
+               while (psi_plist_get(P->cpp.tokens, i++, &T)) {
+                       if (P->flags & PSI_DEBUG) {
+                               fprintf(stderr, "PSI> ");
+                               psi_token_dump(2, T);
                        }
-                       PSI_DEBUG_PRINT(P, "PSI< Fill: consumed=%zu reserved=%zu available=%zu didread=%zu\n",
-                                       consumed, reserved, available, didread);
+                       psi_parser_proc_parse(P->proc, T->type, T, P);
                }
-#endif
-               break;
-       }
-
-       PSI_DEBUG_PRINT(P, "PSI< Fill: avail=%td\n", P->lim - P->cur);
-
-       return P->lim - P->cur;
-}
-
-void psi_parser_parse(struct psi_parser *P, struct psi_token *T)
-{
-       if (T) {
-               psi_parser_proc_parse(P->proc, T->type, T, P);
-       } else {
                psi_parser_proc_parse(P->proc, 0, NULL, P);
        }
+
+       psi_plist_free(P->cpp.tokens);
+       P->cpp.tokens = NULL;
 }
 
 void psi_parser_dtor(struct psi_parser *P)
 {
        psi_parser_proc_free(&P->proc);
 
-       switch (P->input.type) {
-       case PSI_PARSE_FILE:
-               if (P->input.data.file.buffer) {
-#if HAVE_MMAP
-                       munmap(P->input.data.file.buffer, P->input.data.file.length);
-#else
-                       free(P->input.data.file.buffer);
-#endif
-               }
-               if (P->input.data.file.handle) {
-                       fclose(P->input.data.file.handle);
-               }
-               break;
-
-       case PSI_PARSE_STRING:
-               if (P->input.data.string.buffer) {
-                       free(P->input.data.string.buffer);
-               }
-               break;
+       if (P->input.buffer) {
+               free(P->input.buffer);
+               P->input.buffer = NULL;
        }
 
        psi_data_dtor(PSI_DATA(P));
 
+       zend_hash_destroy(&P->cpp.defs);
+
        memset(P, 0, sizeof(*P));
 }
 
@@ -199,42 +262,42 @@ void psi_parser_free(struct psi_parser **P)
        }
 }
 
-#define YYMAXFILL 10
-#if BSIZE < YYMAXFILL
-# error BSIZE must be greater than YYMAXFILL
-#endif
+#define NEWLINE() \
+       P->col = 1; \
+       ++P->line
 
-#define RETURN(t) do { \
+#define NEWTOKEN(t) \
        P->num = t; \
-       PSI_DEBUG_PRINT(P, "PSI< TOKEN: %d %.*s (EOF=%d %s:%u:%u)\n", \
-                               P->num, (int) (P->cur-P->tok), P->tok, P->num == PSI_T_EOF, \
-                               P->file.fn, P->line, P->col); \
-       return t; \
-} while(1)
-
-#define ADDCOLS \
-       P->col += P->cur - P->tok
+       token = psi_token_alloc(P); \
+       tokens = psi_plist_add(tokens, &token); \
+       P->col += P->cur - P->tok; \
+       if (P->flags & PSI_DEBUG) { \
+               fprintf(stderr, "PSI< "); \
+               psi_token_dump(2, token); \
+       } \
+       token = NULL
 
-#define NEWLINE(label) \
-       P->col = 1; \
-       ++P->line; \
-       goto label
 
-token_t psi_parser_scan(struct psi_parser *P)
+struct psi_plist *psi_parser_scan(struct psi_parser *P)
 {
+       struct psi_plist *tokens;
+       struct psi_token *token;
+
        if (!P->cur) {
-               psi_parser_fill(P, 0);
+               return NULL;
        }
-       for (;;) {
-               ADDCOLS;
-       nextline:
+
+       tokens = psi_plist_init(NULL);
+
+       start: ;
                P->tok = P->cur;
+
                
-#line 234 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 297 "src/parser.c"
                {
                        unsigned char yych;
                        unsigned int yyaccept = 0;
-                       if ((P->lim - P->cur) < 10) { if (!psi_parser_fill(P,10)) RETURN(PSI_T_EOF); };
+                       if ((P->lim - P->cur) < 12) if (P->cur >= P->lim) goto done;;
                        yych = *P->cur;
                        switch (yych) {
                        case '\t':
@@ -244,17 +307,17 @@ token_t psi_parser_scan(struct psi_parser *P)
                        case '!':       goto yy9;
                        case '"':       goto yy11;
                        case '#':       goto yy12;
-                       case '$':       goto yy13;
-                       case '%':       goto yy14;
-                       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 yy31;
+                       case '$':       goto yy14;
+                       case '%':       goto yy15;
+                       case '&':       goto yy17;
+                       case '(':       goto yy19;
+                       case ')':       goto yy21;
+                       case '*':       goto yy23;
+                       case '+':       goto yy25;
+                       case ',':       goto yy27;
+                       case '-':       goto yy29;
+                       case '.':       goto yy31;
+                       case '/':       goto yy32;
                        case '0':
                        case '1':
                        case '2':
@@ -264,30 +327,29 @@ token_t psi_parser_scan(struct psi_parser *P)
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy33;
-                       case ':':       goto yy36;
-                       case ';':       goto yy38;
-                       case '<':       goto yy40;
-                       case '=':       goto yy42;
-                       case '>':       goto yy44;
+                       case '9':       goto yy34;
+                       case ':':       goto yy37;
+                       case ';':       goto yy39;
+                       case '<':       goto yy41;
+                       case '=':       goto yy43;
+                       case '>':       goto yy45;
                        case 'A':
-                       case 'a':       goto yy46;
+                       case 'a':       goto yy47;
                        case 'B':
-                       case 'b':       goto yy48;
+                       case 'b':       goto yy49;
                        case 'C':
-                       case 'c':       goto yy49;
+                       case 'c':       goto yy50;
                        case 'D':
-                       case 'd':       goto yy50;
+                       case 'd':       goto yy51;
                        case 'E':
-                       case 'e':       goto yy51;
+                       case 'e':       goto yy52;
                        case 'F':
-                       case 'f':       goto yy52;
+                       case 'f':       goto yy53;
                        case 'G':
                        case 'H':
                        case 'J':
                        case 'K':
                        case 'Q':
-                       case 'W':
                        case 'X':
                        case 'Y':
                        case '_':
@@ -296,52 +358,53 @@ token_t psi_parser_scan(struct psi_parser *P)
                        case 'j':
                        case 'k':
                        case 'q':
-                       case 'w':
                        case 'x':
-                       case 'y':       goto yy53;
+                       case 'y':       goto yy54;
                        case 'I':
-                       case 'i':       goto yy55;
+                       case 'i':       goto yy56;
                        case 'L':
-                       case 'l':       goto yy56;
+                       case 'l':       goto yy57;
                        case 'M':
-                       case 'm':       goto yy57;
+                       case 'm':       goto yy58;
                        case 'N':
-                       case 'n':       goto yy58;
+                       case 'n':       goto yy59;
                        case 'O':
-                       case 'o':       goto yy59;
+                       case 'o':       goto yy60;
                        case 'P':
-                       case 'p':       goto yy60;
+                       case 'p':       goto yy61;
                        case 'R':
-                       case 'r':       goto yy61;
+                       case 'r':       goto yy62;
                        case 'S':
-                       case 's':       goto yy62;
+                       case 's':       goto yy63;
                        case 'T':
-                       case 't':       goto yy63;
+                       case 't':       goto yy64;
                        case 'U':
-                       case 'u':       goto yy64;
+                       case 'u':       goto yy65;
                        case 'V':
-                       case 'v':       goto yy65;
+                       case 'v':       goto yy66;
+                       case 'W':
+                       case 'w':       goto yy67;
                        case 'Z':
-                       case 'z':       goto yy66;
-                       case '[':       goto yy67;
-                       case '\\':      goto yy69;
-                       case ']':       goto yy70;
-                       case '^':       goto yy72;
-                       case '{':       goto yy74;
-                       case '|':       goto yy76;
-                       case '}':       goto yy78;
-                       case '~':       goto yy80;
+                       case 'z':       goto yy68;
+                       case '[':       goto yy69;
+                       case '\\':      goto yy71;
+                       case ']':       goto yy73;
+                       case '^':       goto yy75;
+                       case '{':       goto yy77;
+                       case '|':       goto yy79;
+                       case '}':       goto yy81;
+                       case '~':       goto yy83;
                        default:        goto yy2;
                        }
 yy2:
                        ++P->cur;
 yy3:
-#line 344 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {break;}
-#line 342 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 426 "src/parser.re"
+                       { goto error; }
+#line 405 "src/parser.c"
 yy4:
                        ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
+                       if (P->lim <= P->cur) if (P->cur >= P->lim) goto done;;
                        yych = *P->cur;
                        switch (yych) {
                        case '\t':
@@ -349,36 +412,37 @@ yy4:
                        default:        goto yy6;
                        }
 yy6:
-#line 281 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       { continue; }
-#line 355 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 425 "src/parser.re"
+                       { NEWTOKEN(PSI_T_WHITESPACE); goto start; }
+#line 418 "src/parser.c"
 yy7:
                        ++P->cur;
-#line 280 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       { NEWLINE(nextline); }
-#line 360 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 424 "src/parser.re"
+                       { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
+#line 423 "src/parser.c"
 yy9:
                        ++P->cur;
                        switch ((yych = *P->cur)) {
-                       case '=':       goto yy82;
+                       case '=':       goto yy85;
                        default:        goto yy10;
                        }
 yy10:
-#line 265 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_NOT);}
-#line 370 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 333 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NOT); goto start; }
+#line 433 "src/parser.c"
 yy11:
                        yyaccept = 0;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '"':       goto yy3;
-                       default:        goto yy84;
+                       default:        goto yy87;
                        }
 yy12:
-                       yyaccept = 0;
-                       yych = *(P->mrk = ++P->cur);
-                       goto yy87;
-yy13:
+                       ++P->cur;
+#line 316 "src/parser.re"
+                       { NEWTOKEN(PSI_T_HASH); goto start; }
+#line 445 "src/parser.c"
+yy14:
                        yych = *++P->cur;
                        switch (yych) {
                        case '0':
@@ -443,44 +507,44 @@ yy13:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy90;
+                       case 'z':       goto yy89;
                        default:        goto yy3;
                        }
-yy14:
+yy15:
                        ++P->cur;
-#line 266 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_MODULO);}
-#line 454 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy16:
+#line 334 "src/parser.re"
+                       { NEWTOKEN(PSI_T_MODULO); goto start; }
+#line 518 "src/parser.c"
+yy17:
                        ++P->cur;
                        switch ((yych = *P->cur)) {
-                       case '&':       goto yy93;
-                       default:        goto yy17;
+                       case '&':       goto yy92;
+                       default:        goto yy18;
                        }
-yy17:
-#line 267 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_AMPERSAND);}
-#line 464 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy18:
+#line 335 "src/parser.re"
+                       { NEWTOKEN(PSI_T_AMPERSAND); goto start; }
+#line 528 "src/parser.c"
+yy19:
                        ++P->cur;
-#line 249 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LPAREN);}
-#line 469 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy20:
+#line 317 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LPAREN); goto start; }
+#line 533 "src/parser.c"
+yy21:
                        ++P->cur;
-#line 250 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_RPAREN);}
-#line 474 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy22:
+#line 318 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RPAREN); goto start; }
+#line 538 "src/parser.c"
+yy23:
                        ++P->cur;
-#line 263 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_ASTERISK);}
-#line 479 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy24:
+#line 331 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ASTERISK); goto start; }
+#line 543 "src/parser.c"
+yy25:
                        yyaccept = 1;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '.':       goto yy95;
+                       case '.':       goto yy94;
                        case '0':
                        case '1':
                        case '2':
@@ -490,23 +554,23 @@ yy24:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy33;
-                       default:        goto yy25;
+                       case '9':       goto yy34;
+                       default:        goto yy26;
                        }
-yy25:
-#line 268 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_PLUS);}
-#line 500 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy26:
+#line 336 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PLUS); goto start; }
+#line 564 "src/parser.c"
+yy27:
                        ++P->cur;
-#line 252 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_COMMA);}
-#line 505 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy28:
+#line 320 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COMMA); goto start; }
+#line 569 "src/parser.c"
+yy29:
                        yyaccept = 2;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '.':       goto yy95;
+                       case '.':       goto yy94;
                        case '0':
                        case '1':
                        case '2':
@@ -516,18 +580,18 @@ yy28:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy33;
-                       default:        goto yy29;
+                       case '9':       goto yy34;
+                       default:        goto yy30;
                        }
-yy29:
-#line 269 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_MINUS);}
-#line 526 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy30:
+#line 337 "src/parser.re"
+                       { NEWTOKEN(PSI_T_MINUS); goto start; }
+#line 590 "src/parser.c"
+yy31:
                        yyaccept = 0;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '.':       goto yy97;
+                       case '.':       goto yy96;
                        case '0':
                        case '1':
                        case '2':
@@ -537,28 +601,27 @@ yy30:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy98;
+                       case '9':       goto yy97;
                        default:        goto yy3;
                        }
-yy31:
-                       yyaccept = 3;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '*':       goto yy100;
-                       case '/':       goto yy86;
-                       default:        goto yy32;
-                       }
 yy32:
-#line 270 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_SLASH);}
-#line 555 "/home/mike/src/php-master/ext/psi/src/parser.c"
+                       ++P->cur;
+                       switch ((yych = *P->cur)) {
+                       case '*':       goto yy99;
+                       case '/':       goto yy101;
+                       default:        goto yy33;
+                       }
 yy33:
-                       yyaccept = 4;
+#line 338 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SLASH); goto start; }
+#line 618 "src/parser.c"
+yy34:
+                       yyaccept = 3;
                        P->mrk = ++P->cur;
-                       if ((P->lim - P->cur) < 3) { if (!psi_parser_fill(P,3)) RETURN(PSI_T_EOF); };
+                       if ((P->lim - P->cur) < 3) if (P->cur >= P->lim) goto done;;
                        yych = *P->cur;
                        switch (yych) {
-                       case '.':       goto yy95;
+                       case '.':       goto yy94;
                        case '0':
                        case '1':
                        case '2':
@@ -568,125 +631,131 @@ yy33:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy33;
+                       case '9':       goto yy34;
                        case 'E':
-                       case 'e':       goto yy102;
-                       default:        goto yy35;
+                       case 'e':       goto yy103;
+                       default:        goto yy36;
                        }
-yy35:
-#line 339 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_NUMBER);}
-#line 580 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy36:
+#line 419 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); goto start; }
+#line 643 "src/parser.c"
+yy37:
                        ++P->cur;
-#line 253 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_COLON);}
-#line 585 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy38:
+#line 321 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COLON); goto start; }
+#line 648 "src/parser.c"
+yy39:
                        ++P->cur;
-#line 251 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_EOS);}
-#line 590 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy40:
+#line 319 "src/parser.re"
+                       { NEWTOKEN(PSI_T_EOS); goto start; }
+#line 653 "src/parser.c"
+yy41:
                        ++P->cur;
                        switch ((yych = *P->cur)) {
-                       case '<':       goto yy103;
-                       case '=':       goto yy105;
-                       default:        goto yy41;
+                       case '<':       goto yy104;
+                       case '=':       goto yy106;
+                       default:        goto yy42;
                        }
-yy41:
-#line 277 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LCHEVR);}
-#line 601 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy42:
+#line 346 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LCHEVR); goto start; }
+#line 664 "src/parser.c"
+yy43:
                        ++P->cur;
                        switch ((yych = *P->cur)) {
-                       case '=':       goto yy107;
-                       default:        goto yy43;
+                       case '=':       goto yy108;
+                       default:        goto yy44;
                        }
-yy43:
-#line 262 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_EQUALS);}
-#line 611 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy44:
+#line 330 "src/parser.re"
+                       { NEWTOKEN(PSI_T_EQUALS); goto start; }
+#line 674 "src/parser.c"
+yy45:
                        ++P->cur;
                        switch ((yych = *P->cur)) {
-                       case '=':       goto yy109;
-                       case '>':       goto yy111;
-                       default:        goto yy45;
+                       case '=':       goto yy110;
+                       case '>':       goto yy112;
+                       default:        goto yy46;
                        }
-yy45:
-#line 278 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_RCHEVR);}
-#line 622 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy46:
-                       yyaccept = 5;
+#line 347 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RCHEVR); goto start; }
+#line 685 "src/parser.c"
+yy47:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy113;
-                       default:        goto yy54;
+                       case 'r':       goto yy114;
+                       default:        goto yy55;
                        }
-yy47:
-#line 340 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_NAME);}
-#line 634 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy48:
-                       yyaccept = 5;
+#line 420 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NAME); goto start; }
+#line 697 "src/parser.c"
+yy49:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy115;
-                       default:        goto yy54;
+                       case 'o':       goto yy116;
+                       default:        goto yy55;
                        }
-yy49:
-                       yyaccept = 5;
+yy50:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy116;
+                       case 'a':       goto yy117;
                        case 'H':
-                       case 'h':       goto yy117;
+                       case 'h':       goto yy118;
                        case 'O':
-                       case 'o':       goto yy118;
-                       default:        goto yy54;
+                       case 'o':       goto yy119;
+                       default:        goto yy55;
                        }
-yy50:
-                       yyaccept = 5;
+yy51:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy120;
                        case 'O':
-                       case 'o':       goto yy119;
-                       default:        goto yy54;
+                       case 'o':       goto yy121;
+                       default:        goto yy55;
                        }
-yy51:
-                       yyaccept = 5;
+yy52:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy122;
                        case 'N':
-                       case 'n':       goto yy120;
-                       default:        goto yy54;
+                       case 'n':       goto yy123;
+                       case 'R':
+                       case 'r':       goto yy124;
+                       default:        goto yy55;
                        }
-yy52:
-                       yyaccept = 5;
+yy53:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy121;
+                       case 'a':       goto yy125;
                        case 'L':
-                       case 'l':       goto yy122;
+                       case 'l':       goto yy126;
                        case 'R':
-                       case 'r':       goto yy123;
+                       case 'r':       goto yy127;
                        case 'U':
-                       case 'u':       goto yy124;
-                       default:        goto yy54;
+                       case 'u':       goto yy128;
+                       default:        goto yy55;
                        }
-yy53:
-                       yyaccept = 5;
+yy54:
+                       yyaccept = 4;
                        P->mrk = ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
+                       if (P->lim <= P->cur) if (P->cur >= P->lim) goto done;;
                        yych = *P->cur;
-yy54:
+yy55:
                        switch (yych) {
                        case '0':
                        case '1':
@@ -750,132 +819,146 @@ yy54:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy47;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy48;
                        }
-yy55:
-                       yyaccept = 5;
+yy56:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
+                       case 'F':
+                       case 'f':       goto yy129;
                        case 'N':
-                       case 'n':       goto yy125;
-                       default:        goto yy54;
+                       case 'n':       goto yy131;
+                       default:        goto yy55;
                        }
-yy56:
-                       yyaccept = 5;
+yy57:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy126;
+                       case 'e':       goto yy132;
                        case 'I':
-                       case 'i':       goto yy127;
+                       case 'i':       goto yy133;
                        case 'O':
-                       case 'o':       goto yy128;
-                       default:        goto yy54;
+                       case 'o':       goto yy134;
+                       default:        goto yy55;
                        }
-yy57:
-                       yyaccept = 5;
+yy58:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy129;
-                       default:        goto yy54;
+                       case 'i':       goto yy135;
+                       default:        goto yy55;
                        }
-yy58:
-                       yyaccept = 5;
+yy59:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy130;
-                       default:        goto yy54;
+                       case 'u':       goto yy136;
+                       default:        goto yy55;
                        }
-yy59:
-                       yyaccept = 5;
+yy60:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy131;
-                       default:        goto yy54;
+                       case 'b':       goto yy137;
+                       default:        goto yy55;
                        }
-yy60:
-                       yyaccept = 5;
+yy61:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy132;
-                       default:        goto yy54;
+                       case 'a':       goto yy138;
+                       case 'O':
+                       case 'o':       goto yy139;
+                       case 'R':
+                       case 'r':       goto yy140;
+                       default:        goto yy55;
                        }
-yy61:
-                       yyaccept = 5;
+yy62:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy133;
-                       default:        goto yy54;
+                       case 'e':       goto yy141;
+                       default:        goto yy55;
                        }
-yy62:
-                       yyaccept = 5;
+yy63:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy134;
+                       case 'e':       goto yy142;
                        case 'H':
-                       case 'h':       goto yy135;
+                       case 'h':       goto yy143;
                        case 'I':
-                       case 'i':       goto yy136;
+                       case 'i':       goto yy144;
                        case 'T':
-                       case 't':       goto yy137;
-                       default:        goto yy54;
+                       case 't':       goto yy145;
+                       default:        goto yy55;
                        }
-yy63:
-                       yyaccept = 5;
+yy64:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy138;
+                       case 'e':       goto yy146;
                        case 'O':
-                       case 'o':       goto yy139;
+                       case 'o':       goto yy147;
                        case 'R':
-                       case 'r':       goto yy140;
+                       case 'r':       goto yy148;
                        case 'Y':
-                       case 'y':       goto yy141;
-                       default:        goto yy54;
+                       case 'y':       goto yy149;
+                       default:        goto yy55;
                        }
-yy64:
-                       yyaccept = 5;
+yy65:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy142;
+                       case 'i':       goto yy150;
                        case 'N':
-                       case 'n':       goto yy143;
-                       default:        goto yy54;
+                       case 'n':       goto yy151;
+                       default:        goto yy55;
                        }
-yy65:
-                       yyaccept = 5;
+yy66:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy144;
-                       default:        goto yy54;
+                       case 'o':       goto yy152;
+                       default:        goto yy55;
                        }
-yy66:
-                       yyaccept = 5;
+yy67:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy153;
+                       default:        goto yy55;
+                       }
+yy68:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy145;
-                       default:        goto yy54;
+                       case 'v':       goto yy154;
+                       default:        goto yy55;
                        }
-yy67:
-                       ++P->cur;
-#line 256 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LBRACKET);}
-#line 876 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy69:
-                       yych = *++P->cur;
-                       switch (yych) {
+                       ++P->cur;
+#line 324 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LBRACKET); goto start; }
+#line 959 "src/parser.c"
+yy71:
+                       ++P->cur;
+                       switch ((yych = *P->cur)) {
                        case 'A':
                        case 'B':
                        case 'C':
@@ -928,74 +1011,64 @@ yy69:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy146;
-                       default:        goto yy3;
+                       case 'z':       goto yy155;
+                       default:        goto yy72;
                        }
-yy70:
-                       ++P->cur;
-#line 257 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_RBRACKET);}
-#line 939 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy72:
+#line 339 "src/parser.re"
+                       { NEWTOKEN(PSI_T_BSLASH); goto start; }
+#line 1021 "src/parser.c"
+yy73:
+                       ++P->cur;
+#line 325 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RBRACKET); goto start; }
+#line 1026 "src/parser.c"
+yy75:
                        ++P->cur;
-#line 272 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CARET);}
-#line 944 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy74:
+#line 341 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CARET); goto start; }
+#line 1031 "src/parser.c"
+yy77:
                        ++P->cur;
-#line 254 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LBRACE);}
-#line 949 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy76:
+#line 322 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LBRACE); goto start; }
+#line 1036 "src/parser.c"
+yy79:
                        ++P->cur;
                        switch ((yych = *P->cur)) {
-                       case '|':       goto yy149;
-                       default:        goto yy77;
+                       case '|':       goto yy158;
+                       default:        goto yy80;
                        }
-yy77:
-#line 271 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_PIPE);}
-#line 959 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy78:
-                       ++P->cur;
-#line 255 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_RBRACE);}
-#line 964 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy80:
+#line 340 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PIPE); goto start; }
+#line 1046 "src/parser.c"
+yy81:
                        ++P->cur;
-#line 264 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TILDE);}
-#line 969 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy82:
+#line 323 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RBRACE); goto start; }
+#line 1051 "src/parser.c"
+yy83:
                        ++P->cur;
-#line 258 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CMP_NE);}
-#line 974 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy84:
+#line 332 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TILDE); goto start; }
+#line 1056 "src/parser.c"
+yy85:
                        ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
-                       yych = *P->cur;
-                       switch (yych) {
-                       case '"':       goto yy151;
-                       default:        goto yy84;
-                       }
-yy86:
+#line 326 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CMP_NE); goto start; }
+#line 1061 "src/parser.c"
+yy87:
                        ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
+                       if (P->lim <= P->cur) if (P->cur >= P->lim) goto done;;
                        yych = *P->cur;
-yy87:
                        switch (yych) {
-                       case '\n':      goto yy88;
-                       default:        goto yy86;
+                       case '"':       goto yy160;
+                       default:        goto yy87;
                        }
-yy88:
+yy89:
                        ++P->cur;
-#line 248 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       { NEWLINE(nextline); }
-#line 996 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy90:
-                       ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
+                       if (P->lim <= P->cur) if (P->cur >= P->lim) goto done;;
                        yych = *P->cur;
                        switch (yych) {
                        case '0':
@@ -1060,19 +1133,19 @@ yy90:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy90;
-                       default:        goto yy92;
+                       case 'z':       goto yy89;
+                       default:        goto yy91;
                        }
+yy91:
+#line 422 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; }
+#line 1143 "src/parser.c"
 yy92:
-#line 342 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_DOLLAR_NAME);}
-#line 1070 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy93:
                        ++P->cur;
-#line 260 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_AND);}
-#line 1075 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy95:
+#line 328 "src/parser.re"
+                       { NEWTOKEN(PSI_T_AND); goto start; }
+#line 1148 "src/parser.c"
+yy94:
                        yych = *++P->cur;
                        switch (yych) {
                        case '0':
@@ -1084,87 +1157,99 @@ yy95:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy98;
-                       default:        goto yy96;
+                       case '9':       goto yy97;
+                       default:        goto yy95;
                        }
-yy96:
+yy95:
                        P->cur = P->mrk;
                        switch (yyaccept) {
                        case 0:         goto yy3;
-                       case 1:         goto yy25;
-                       case 2:         goto yy29;
-                       case 3:         goto yy32;
-                       case 4:         goto yy35;
-                       case 5:         goto yy47;
-                       case 6:         goto yy148;
-                       case 7:         goto yy171;
-                       case 8:         goto yy173;
-                       case 9:         goto yy175;
-                       case 10:        goto yy183;
-                       case 11:        goto yy200;
-                       case 12:        goto yy203;
-                       case 13:        goto yy208;
-                       case 14:        goto yy212;
-                       case 15:        goto yy220;
-                       case 16:        goto yy223;
-                       case 17:        goto yy236;
-                       case 18:        goto yy244;
-                       case 19:        goto yy250;
-                       case 20:        goto yy252;
-                       case 21:        goto yy254;
-                       case 22:        goto yy261;
-                       case 23:        goto yy263;
-                       case 24:        goto yy266;
-                       case 25:        goto yy268;
-                       case 26:        goto yy276;
-                       case 27:        goto yy282;
-                       case 28:        goto yy301;
-                       case 29:        goto yy304;
+                       case 1:         goto yy26;
+                       case 2:         goto yy30;
+                       case 3:         goto yy36;
+                       case 4:         goto yy48;
+                       case 5:         goto yy130;
+                       case 6:         goto yy157;
+                       case 7:         goto yy187;
+                       case 8:         goto yy189;
+                       case 9:         goto yy191;
+                       case 10:        goto yy201;
+                       case 11:        goto yy220;
+                       case 12:        goto yy223;
+                       case 13:        goto yy229;
+                       case 14:        goto yy231;
+                       case 15:        goto yy234;
+                       case 16:        goto yy239;
+                       case 17:        goto yy249;
+                       case 18:        goto yy252;
+                       case 19:        goto yy267;
+                       case 20:        goto yy275;
+                       case 21:        goto yy282;
+                       case 22:        goto yy285;
+                       case 23:        goto yy287;
+                       case 24:        goto yy294;
+                       case 25:        goto yy296;
+                       case 26:        goto yy300;
+                       case 27:        goto yy302;
+                       case 28:        goto yy304;
+                       case 29:        goto yy306;
                        case 30:        goto yy309;
-                       case 31:        goto yy311;
-                       case 32:        goto yy318;
-                       case 33:        goto yy320;
-                       case 34:        goto yy322;
-                       case 35:        goto yy324;
-                       case 36:        goto yy327;
-                       case 37:        goto yy329;
-                       case 38:        goto yy331;
-                       case 39:        goto yy333;
-                       case 40:        goto yy335;
-                       case 41:        goto yy337;
-                       case 42:        goto yy339;
-                       case 43:        goto yy344;
-                       case 44:        goto yy354;
-                       case 45:        goto yy360;
-                       case 46:        goto yy362;
-                       case 47:        goto yy364;
-                       case 48:        goto yy366;
-                       case 49:        goto yy369;
-                       case 50:        goto yy374;
-                       case 51:        goto yy379;
-                       case 52:        goto yy382;
-                       case 53:        goto yy384;
-                       case 54:        goto yy386;
-                       case 55:        goto yy388;
-                       case 56:        goto yy390;
-                       case 57:        goto yy392;
-                       case 58:        goto yy396;
-                       case 59:        goto yy398;
-                       case 60:        goto yy400;
-                       case 61:        goto yy402;
-                       case 62:        goto yy404;
-                       default:        goto yy406;
+                       case 31:        goto yy317;
+                       case 32:        goto yy325;
+                       case 33:        goto yy344;
+                       case 34:        goto yy346;
+                       case 35:        goto yy350;
+                       case 36:        goto yy355;
+                       case 37:        goto yy357;
+                       case 38:        goto yy359;
+                       case 39:        goto yy363;
+                       case 40:        goto yy368;
+                       case 41:        goto yy370;
+                       case 42:        goto yy372;
+                       case 43:        goto yy374;
+                       case 44:        goto yy379;
+                       case 45:        goto yy381;
+                       case 46:        goto yy383;
+                       case 47:        goto yy385;
+                       case 48:        goto yy387;
+                       case 49:        goto yy389;
+                       case 50:        goto yy391;
+                       case 51:        goto yy396;
+                       case 52:        goto yy407;
+                       case 53:        goto yy411;
+                       case 54:        goto yy415;
+                       case 55:        goto yy417;
+                       case 56:        goto yy419;
+                       case 57:        goto yy421;
+                       case 58:        goto yy426;
+                       case 59:        goto yy431;
+                       case 60:        goto yy436;
+                       case 61:        goto yy439;
+                       case 62:        goto yy441;
+                       case 63:        goto yy443;
+                       case 64:        goto yy445;
+                       case 65:        goto yy447;
+                       case 66:        goto yy451;
+                       case 67:        goto yy453;
+                       case 68:        goto yy457;
+                       case 69:        goto yy459;
+                       case 70:        goto yy461;
+                       case 71:        goto yy463;
+                       case 72:        goto yy467;
+                       case 73:        goto yy469;
+                       case 74:        goto yy472;
+                       default:        goto yy474;
                        }
-yy97:
+yy96:
                        yych = *++P->cur;
                        switch (yych) {
-                       case '.':       goto yy153;
-                       default:        goto yy96;
+                       case '.':       goto yy162;
+                       default:        goto yy95;
                        }
-yy98:
-                       yyaccept = 4;
+yy97:
+                       yyaccept = 3;
                        P->mrk = ++P->cur;
-                       if ((P->lim - P->cur) < 3) { if (!psi_parser_fill(P,3)) RETURN(PSI_T_EOF); };
+                       if ((P->lim - P->cur) < 3) if (P->cur >= P->lim) goto done;;
                        yych = *P->cur;
                        switch (yych) {
                        case '0':
@@ -1176,21 +1261,26 @@ yy98:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy98;
+                       case '9':       goto yy97;
                        case 'E':
-                       case 'e':       goto yy102;
-                       default:        goto yy35;
+                       case 'e':       goto yy103;
+                       default:        goto yy36;
                        }
-yy100:
+yy99:
                        ++P->cur;
-#line 247 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 314 "src/parser.re"
                        { goto comment; }
-#line 1189 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy102:
+#line 1274 "src/parser.c"
+yy101:
+                       ++P->cur;
+#line 315 "src/parser.re"
+                       { goto comment_sl; }
+#line 1279 "src/parser.c"
+yy103:
                        yych = *++P->cur;
                        switch (yych) {
                        case '+':
-                       case '-':       goto yy155;
+                       case '-':       goto yy164;
                        case '0':
                        case '1':
                        case '2':
@@ -1200,45 +1290,45 @@ yy102:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy156;
-                       default:        goto yy96;
+                       case '9':       goto yy165;
+                       default:        goto yy95;
                        }
-yy103:
+yy104:
                        ++P->cur;
-#line 273 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LSHIFT);}
-#line 1211 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy105:
+#line 342 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LSHIFT); goto start; }
+#line 1301 "src/parser.c"
+yy106:
                        ++P->cur;
-#line 275 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CMP_LE);}
-#line 1216 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy107:
+#line 344 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CMP_LE); goto start; }
+#line 1306 "src/parser.c"
+yy108:
                        ++P->cur;
-#line 259 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CMP_EQ);}
-#line 1221 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy109:
+#line 327 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CMP_EQ); goto start; }
+#line 1311 "src/parser.c"
+yy110:
                        ++P->cur;
-#line 276 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CMP_GE);}
-#line 1226 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy111:
+#line 345 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CMP_GE); goto start; }
+#line 1316 "src/parser.c"
+yy112:
                        ++P->cur;
-#line 274 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_RSHIFT);}
-#line 1231 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy113:
-                       yyaccept = 5;
+#line 343 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RSHIFT); goto start; }
+#line 1321 "src/parser.c"
+yy114:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy158;
-                       default:        goto yy54;
+                       case 'r':       goto yy167;
+                       default:        goto yy55;
                        }
-yy114:
+yy115:
                        ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
+                       if (P->lim <= P->cur) if (P->cur >= P->lim) goto done;;
                        yych = *P->cur;
                        switch (yych) {
                        case 'A':
@@ -1293,266 +1383,394 @@ yy114:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy146;
-                       default:        goto yy96;
+                       case 'z':       goto yy155;
+                       default:        goto yy95;
                        }
-yy115:
-                       yyaccept = 5;
+yy116:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy159;
-                       default:        goto yy54;
+                       case 'o':       goto yy168;
+                       default:        goto yy55;
                        }
-yy116:
-                       yyaccept = 5;
+yy117:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy160;
-                       default:        goto yy54;
+                       case 'l':       goto yy169;
+                       default:        goto yy55;
                        }
-yy117:
-                       yyaccept = 5;
+yy118:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy161;
-                       default:        goto yy54;
+                       case 'a':       goto yy170;
+                       default:        goto yy55;
                        }
-yy118:
-                       yyaccept = 5;
+yy119:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy162;
+                       case 'n':       goto yy171;
                        case 'U':
-                       case 'u':       goto yy163;
-                       default:        goto yy54;
+                       case 'u':       goto yy172;
+                       default:        goto yy55;
                        }
-yy119:
-                       yyaccept = 5;
+yy120:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy164;
-                       default:        goto yy54;
+                       case 'F':
+                       case 'f':       goto yy173;
+                       default:        goto yy55;
                        }
-yy120:
-                       yyaccept = 5;
+yy121:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy165;
-                       default:        goto yy54;
+                       case 'u':       goto yy174;
+                       default:        goto yy55;
                        }
-yy121:
-                       yyaccept = 5;
+yy122:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy175;
+                       case 'S':
+                       case 's':       goto yy176;
+                       default:        goto yy55;
+                       }
+yy123:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy177;
+                       case 'U':
+                       case 'u':       goto yy178;
+                       default:        goto yy55;
+                       }
+yy124:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy179;
+                       default:        goto yy55;
+                       }
+yy125:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy166;
-                       default:        goto yy54;
+                       case 'l':       goto yy180;
+                       default:        goto yy55;
                        }
-yy122:
-                       yyaccept = 5;
+yy126:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy167;
-                       default:        goto yy54;
+                       case 'o':       goto yy181;
+                       default:        goto yy55;
                        }
-yy123:
-                       yyaccept = 5;
+yy127:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy168;
-                       default:        goto yy54;
+                       case 'e':       goto yy182;
+                       default:        goto yy55;
                        }
-yy124:
-                       yyaccept = 5;
+yy128:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy169;
-                       default:        goto yy54;
+                       case 'n':       goto yy183;
+                       default:        goto yy55;
                        }
-yy125:
+yy129:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'V':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case 'D':
+                       case 'd':       goto yy184;
+                       case 'N':
+                       case 'n':       goto yy185;
+                       case '\\':      goto yy115;
+                       default:        goto yy130;
+                       }
+yy130:
+#line 349 "src/parser.re"
+                       { NEWTOKEN(PSI_T_IF); goto start; }
+#line 1573 "src/parser.c"
+yy131:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
                        case 'T':
-                       case 't':       goto yy170;
-                       default:        goto yy54;
+                       case 't':       goto yy186;
+                       default:        goto yy55;
                        }
-yy126:
-                       yyaccept = 5;
+yy132:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy172;
-                       default:        goto yy54;
+                       case 't':       goto yy188;
+                       default:        goto yy55;
                        }
-yy127:
-                       yyaccept = 5;
+yy133:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy174;
-                       default:        goto yy54;
+                       case 'b':       goto yy190;
+                       default:        goto yy55;
                        }
-yy128:
-                       yyaccept = 5;
+yy134:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy176;
-                       default:        goto yy54;
+                       case 'n':       goto yy192;
+                       default:        goto yy55;
                        }
-yy129:
-                       yyaccept = 5;
+yy135:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'X':
-                       case 'x':       goto yy177;
-                       default:        goto yy54;
+                       case 'x':       goto yy193;
+                       default:        goto yy55;
                        }
-yy130:
-                       yyaccept = 5;
+yy136:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy178;
-                       default:        goto yy54;
+                       case 'l':       goto yy194;
+                       default:        goto yy55;
                        }
-yy131:
-                       yyaccept = 5;
+yy137:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy179;
-                       default:        goto yy54;
+                       case 'j':       goto yy195;
+                       default:        goto yy55;
                        }
-yy132:
-                       yyaccept = 5;
+yy138:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy180;
-                       default:        goto yy54;
+                       case 't':       goto yy196;
+                       default:        goto yy55;
                        }
-yy133:
-                       yyaccept = 5;
+yy139:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'S':
+                       case 's':       goto yy197;
+                       default:        goto yy55;
+                       }
+yy140:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy198;
+                       default:        goto yy55;
+                       }
+yy141:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy181;
-                       default:        goto yy54;
+                       case 't':       goto yy199;
+                       default:        goto yy55;
                        }
-yy134:
-                       yyaccept = 5;
+yy142:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy182;
-                       default:        goto yy54;
+                       case 't':       goto yy200;
+                       default:        goto yy55;
                        }
-yy135:
-                       yyaccept = 5;
+yy143:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy184;
-                       default:        goto yy54;
+                       case 'o':       goto yy202;
+                       default:        goto yy55;
                        }
-yy136:
-                       yyaccept = 5;
+yy144:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy185;
-                       default:        goto yy54;
+                       case 'g':       goto yy203;
+                       default:        goto yy55;
                        }
-yy137:
-                       yyaccept = 5;
+yy145:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy186;
+                       case 'a':       goto yy204;
                        case 'R':
-                       case 'r':       goto yy187;
-                       default:        goto yy54;
+                       case 'r':       goto yy205;
+                       default:        goto yy55;
                        }
-yy138:
-                       yyaccept = 5;
+yy146:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'M':
-                       case 'm':       goto yy188;
-                       default:        goto yy54;
+                       case 'm':       goto yy206;
+                       default:        goto yy55;
                        }
-yy139:
-                       yyaccept = 5;
+yy147:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '_':       goto yy189;
-                       default:        goto yy54;
+                       case '_':       goto yy207;
+                       default:        goto yy55;
                        }
-yy140:
-                       yyaccept = 5;
+yy148:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy190;
-                       default:        goto yy54;
+                       case 'u':       goto yy208;
+                       default:        goto yy55;
                        }
-yy141:
-                       yyaccept = 5;
+yy149:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'P':
-                       case 'p':       goto yy191;
-                       default:        goto yy54;
+                       case 'p':       goto yy209;
+                       default:        goto yy55;
                        }
-yy142:
-                       yyaccept = 5;
+yy150:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy192;
-                       default:        goto yy54;
+                       case 'n':       goto yy210;
+                       default:        goto yy55;
                        }
-yy143:
-                       yyaccept = 5;
+yy151:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy211;
                        case 'I':
-                       case 'i':       goto yy193;
+                       case 'i':       goto yy212;
                        case 'S':
-                       case 's':       goto yy194;
-                       default:        goto yy54;
+                       case 's':       goto yy213;
+                       default:        goto yy55;
                        }
-yy144:
-                       yyaccept = 5;
+yy152:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy195;
-                       default:        goto yy54;
+                       case 'i':       goto yy214;
+                       default:        goto yy55;
                        }
-yy145:
-                       yyaccept = 5;
+yy153:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy215;
+                       default:        goto yy55;
+                       }
+yy154:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy196;
-                       default:        goto yy54;
+                       case 'a':       goto yy216;
+                       default:        goto yy55;
                        }
-yy146:
+yy155:
                        yyaccept = 6;
                        P->mrk = ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
+                       if (P->lim <= P->cur) if (P->cur >= P->lim) goto done;;
                        yych = *P->cur;
                        switch (yych) {
                        case '0':
@@ -1617,30 +1835,30 @@ yy146:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy146;
-                       case '\\':      goto yy114;
-                       default:        goto yy148;
-                       }
-yy148:
-#line 341 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_NSNAME);}
-#line 1628 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy149:
+                       case 'z':       goto yy155;
+                       case '\\':      goto yy115;
+                       default:        goto yy157;
+                       }
+yy157:
+#line 421 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NSNAME); goto start; }
+#line 1846 "src/parser.c"
+yy158:
                        ++P->cur;
-#line 261 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_OR);}
-#line 1633 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy151:
+#line 329 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OR); goto start; }
+#line 1851 "src/parser.c"
+yy160:
                        ++P->cur;
-#line 343 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_QUOTED_STRING);}
-#line 1638 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy153:
+#line 423 "src/parser.re"
+                       { NEWTOKEN(PSI_T_QUOTED_STRING); goto start; }
+#line 1856 "src/parser.c"
+yy162:
                        ++P->cur;
-#line 279 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_ELLIPSIS);}
-#line 1643 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy155:
+#line 348 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ELLIPSIS); goto start; }
+#line 1861 "src/parser.c"
+yy164:
                        yych = *++P->cur;
                        switch (yych) {
                        case '0':
@@ -1652,12 +1870,12 @@ yy155:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy156;
-                       default:        goto yy96;
+                       case '9':       goto yy165;
+                       default:        goto yy95;
                        }
-yy156:
+yy165:
                        ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
+                       if (P->lim <= P->cur) if (P->cur >= P->lim) goto done;;
                        yych = *P->cur;
                        switch (yych) {
                        case '0':
@@ -1669,116 +1887,1528 @@ yy156:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy156;
-                       default:        goto yy35;
+                       case '9':       goto yy165;
+                       default:        goto yy36;
                        }
-yy158:
-                       yyaccept = 5;
+yy167:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy197;
+                       case 'a':       goto yy217;
                        case 'V':
-                       case 'v':       goto yy198;
-                       default:        goto yy54;
+                       case 'v':       goto yy218;
+                       default:        goto yy55;
                        }
-yy159:
-                       yyaccept = 5;
+yy168:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy199;
-                       default:        goto yy54;
+                       case 'l':       goto yy219;
+                       default:        goto yy55;
                        }
-yy160:
-                       yyaccept = 5;
+yy169:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy201;
-                       default:        goto yy54;
+                       case 'l':       goto yy221;
+                       default:        goto yy55;
                        }
-yy161:
-                       yyaccept = 5;
+yy170:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy202;
-                       default:        goto yy54;
+                       case 'r':       goto yy222;
+                       default:        goto yy55;
                        }
-yy162:
-                       yyaccept = 5;
+yy171:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy204;
-                       default:        goto yy54;
+                       case 's':       goto yy224;
+                       default:        goto yy55;
                        }
-yy163:
-                       yyaccept = 5;
+yy172:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy205;
-                       default:        goto yy54;
+                       case 'n':       goto yy225;
+                       default:        goto yy55;
                        }
-yy164:
-                       yyaccept = 5;
+yy173:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy226;
+                       default:        goto yy55;
+                       }
+yy174:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy206;
-                       default:        goto yy54;
+                       case 'b':       goto yy227;
+                       default:        goto yy55;
                        }
-yy165:
-                       yyaccept = 5;
+yy175:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'M':
-                       case 'm':       goto yy207;
-                       default:        goto yy54;
+                       case 'F':
+                       case 'f':       goto yy228;
+                       default:        goto yy55;
                        }
-yy166:
-                       yyaccept = 5;
+yy176:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'S':
-                       case 's':       goto yy209;
-                       default:        goto yy54;
+                       case 'E':
+                       case 'e':       goto yy230;
+                       default:        goto yy55;
                        }
-yy167:
-                       yyaccept = 5;
+yy177:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy232;
+                       default:        goto yy55;
+                       }
+yy178:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'M':
+                       case 'm':       goto yy233;
+                       default:        goto yy55;
+                       }
+yy179:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'O':
+                       case 'o':       goto yy235;
+                       default:        goto yy55;
+                       }
+yy180:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'S':
+                       case 's':       goto yy236;
+                       default:        goto yy55;
+                       }
+yy181:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy237;
+                       default:        goto yy55;
+                       }
+yy182:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy238;
+                       default:        goto yy55;
+                       }
+yy183:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'C':
+                       case 'c':       goto yy240;
+                       default:        goto yy55;
+                       }
+yy184:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy241;
+                       default:        goto yy55;
+                       }
+yy185:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy242;
+                       default:        goto yy55;
+                       }
+yy186:
+                       yyaccept = 7;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '0':
+                       case '2':
+                       case '4':
+                       case '5':
+                       case '7':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'N':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'n':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '1':       goto yy243;
+                       case '3':       goto yy244;
+                       case '6':       goto yy245;
+                       case '8':       goto yy246;
+                       case 'V':
+                       case 'v':       goto yy247;
+                       case '\\':      goto yy115;
+                       default:        goto yy187;
+                       }
+yy187:
+#line 369 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT); goto start; }
+#line 2121 "src/parser.c"
+yy188:
+                       yyaccept = 8;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'N':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'V':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'n':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy189;
+                       }
+yy189:
+#line 395 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LET); goto start; }
+#line 2195 "src/parser.c"
+yy190:
+                       yyaccept = 9;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'N':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'V':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'n':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy191;
+                       }
+yy191:
+#line 394 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LIB); goto start; }
+#line 2269 "src/parser.c"
+yy192:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'G':
+                       case 'g':       goto yy248;
+                       default:        goto yy55;
+                       }
+yy193:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy250;
+                       default:        goto yy55;
+                       }
+yy194:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy251;
+                       default:        goto yy55;
+                       }
+yy195:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy253;
+                       case 'V':
+                       case 'v':       goto yy254;
+                       default:        goto yy55;
+                       }
+yy196:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'H':
+                       case 'h':       goto yy255;
+                       default:        goto yy55;
+                       }
+yy197:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy256;
+                       default:        goto yy55;
+                       }
+yy198:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '_':       goto yy257;
+                       default:        goto yy55;
+                       }
+yy199:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'U':
+                       case 'u':       goto yy258;
+                       default:        goto yy55;
+                       }
+yy200:
+                       yyaccept = 10;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'N':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'V':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'n':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy201;
+                       }
+yy201:
+#line 396 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SET); goto start; }
+#line 2408 "src/parser.c"
+yy202:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy259;
+                       default:        goto yy55;
+                       }
+yy203:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy260;
+                       default:        goto yy55;
+                       }
+yy204:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy261;
+                       default:        goto yy55;
+                       }
+yy205:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy262;
+                       case 'L':
+                       case 'l':       goto yy263;
+                       case 'U':
+                       case 'u':       goto yy264;
+                       case 'V':
+                       case 'v':       goto yy265;
+                       default:        goto yy55;
+                       }
+yy206:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'P':
+                       case 'p':       goto yy266;
+                       default:        goto yy55;
+                       }
+yy207:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy268;
+                       case 'B':
+                       case 'b':       goto yy269;
+                       case 'F':
+                       case 'f':       goto yy270;
+                       case 'I':
+                       case 'i':       goto yy271;
+                       case 'O':
+                       case 'o':       goto yy272;
+                       case 'S':
+                       case 's':       goto yy273;
+                       default:        goto yy55;
+                       }
+yy208:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy274;
+                       default:        goto yy55;
+                       }
+yy209:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy276;
+                       default:        goto yy55;
+                       }
+yy210:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy277;
+                       default:        goto yy55;
+                       }
+yy211:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy278;
+                       default:        goto yy55;
+                       }
+yy212:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'O':
+                       case 'o':       goto yy279;
+                       default:        goto yy55;
+                       }
+yy213:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy280;
+                       default:        goto yy55;
+                       }
+yy214:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy281;
+                       default:        goto yy55;
+                       }
+yy215:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy283;
+                       default:        goto yy55;
+                       }
+yy216:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy284;
+                       default:        goto yy55;
+                       }
+yy217:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'Y':
+                       case 'y':       goto yy286;
+                       default:        goto yy55;
+                       }
+yy218:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy288;
+                       default:        goto yy55;
+                       }
+yy219:
+                       yyaccept = 11;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'N':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'n':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case 'V':
+                       case 'v':       goto yy289;
+                       case '\\':      goto yy115;
+                       default:        goto yy220;
+                       }
+yy220:
+#line 366 "src/parser.re"
+                       { NEWTOKEN(PSI_T_BOOL); goto start; }
+#line 2634 "src/parser.c"
+yy221:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy290;
+                       case 'B':
+                       case 'b':       goto yy291;
+                       case 'O':
+                       case 'o':       goto yy292;
+                       default:        goto yy55;
+                       }
+yy222:
+                       yyaccept = 12;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'N':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'V':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'n':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy223;
+                       }
+yy223:
+#line 367 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CHAR); goto start; }
+#line 2720 "src/parser.c"
+yy224:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy293;
+                       default:        goto yy55;
+                       }
+yy225:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy295;
+                       default:        goto yy55;
+                       }
+yy226:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy297;
+                       default:        goto yy55;
+                       }
+yy227:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy298;
+                       default:        goto yy55;
+                       }
+yy228:
+                       yyaccept = 13;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'N':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'V':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'n':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy229;
+                       }
+yy229:
+#line 353 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ELIF); goto start; }
+#line 2826 "src/parser.c"
+yy230:
+                       yyaccept = 14;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'N':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'V':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'n':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy231;
+                       }
+yy231:
+#line 352 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ELSE); goto start; }
+#line 2900 "src/parser.c"
+yy232:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'F':
+                       case 'f':       goto yy299;
+                       default:        goto yy55;
+                       }
+yy233:
+                       yyaccept = 15;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'N':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'V':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'n':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy234;
+                       }
+yy234:
+#line 392 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ENUM); goto start; }
+#line 2982 "src/parser.c"
+yy235:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy301;
+                       default:        goto yy55;
+                       }
+yy236:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy303;
+                       default:        goto yy55;
+                       }
+yy237:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy305;
+                       default:        goto yy55;
+                       }
+yy238:
+                       yyaccept = 16;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'N':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'V':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'n':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy239;
+                       }
+yy239:
+#line 400 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FREE); goto start; }
+#line 3080 "src/parser.c"
+yy240:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy307;
+                       default:        goto yy55;
+                       }
+yy241:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'F':
+                       case 'f':       goto yy308;
+                       default:        goto yy55;
+                       }
+yy242:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy310;
+                       default:        goto yy55;
+                       }
+yy243:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '6':       goto yy311;
+                       default:        goto yy55;
+                       }
+yy244:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '2':       goto yy312;
+                       default:        goto yy55;
+                       }
+yy245:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '4':       goto yy313;
+                       default:        goto yy55;
+                       }
+yy246:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '_':       goto yy314;
+                       default:        goto yy55;
+                       }
+yy247:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy315;
+                       default:        goto yy55;
+                       }
+yy248:
+                       yyaccept = 17;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'N':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'V':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'n':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy249;
+                       }
+yy249:
+#line 370 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LONG); goto start; }
+#line 3214 "src/parser.c"
+yy250:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy316;
+                       default:        goto yy55;
+                       }
+yy251:
+                       yyaccept = 18;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case 'A':
+                       case 'B':
+                       case 'C':
+                       case 'D':
+                       case 'E':
+                       case 'F':
+                       case 'G':
+                       case 'H':
+                       case 'I':
+                       case 'J':
+                       case 'K':
+                       case 'L':
+                       case 'M':
+                       case 'N':
+                       case 'O':
+                       case 'P':
+                       case 'Q':
+                       case 'R':
+                       case 'S':
+                       case 'T':
+                       case 'U':
+                       case 'V':
+                       case 'W':
+                       case 'X':
+                       case 'Y':
+                       case 'Z':
+                       case '_':
+                       case 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':
+                       case 'g':
+                       case 'h':
+                       case 'i':
+                       case 'j':
+                       case 'k':
+                       case 'l':
+                       case 'm':
+                       case 'n':
+                       case 'o':
+                       case 'p':
+                       case 'q':
+                       case 'r':
+                       case 's':
+                       case 't':
+                       case 'u':
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy252;
+                       }
+yy252:
+#line 362 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NULL); goto start; }
+#line 3296 "src/parser.c"
+yy253:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'C':
+                       case 'c':       goto yy318;
+                       default:        goto yy55;
+                       }
+yy254:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy319;
+                       default:        goto yy55;
+                       }
+yy255:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'V':
+                       case 'v':       goto yy320;
+                       default:        goto yy55;
+                       }
+yy256:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '_':       goto yy321;
+                       default:        goto yy55;
+                       }
+yy257:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy322;
+                       default:        goto yy55;
+                       }
+yy258:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy323;
+                       default:        goto yy55;
+                       }
+yy259:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy324;
+                       default:        goto yy55;
+                       }
+yy260:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy326;
+                       default:        goto yy55;
+                       }
+yy261:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy327;
+                       default:        goto yy55;
+                       }
+yy262:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy210;
-                       default:        goto yy54;
+                       case 'N':
+                       case 'n':       goto yy328;
+                       default:        goto yy55;
                        }
-yy168:
-                       yyaccept = 5;
+yy263:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy211;
-                       default:        goto yy54;
+                       case 'e':       goto yy329;
+                       default:        goto yy55;
                        }
-yy169:
-                       yyaccept = 5;
+yy264:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy213;
-                       default:        goto yy54;
+                       case 'c':       goto yy330;
+                       default:        goto yy55;
                        }
-yy170:
-                       yyaccept = 7;
+yy265:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy331;
+                       default:        goto yy55;
+                       }
+yy266:
+                       yyaccept = 19;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
+                       case '1':
                        case '2':
+                       case '3':
                        case '4':
                        case '5':
+                       case '6':
                        case '7':
+                       case '8':
                        case '9':
                        case 'A':
                        case 'B':
@@ -1801,6 +3431,7 @@ yy170:
                        case 'S':
                        case 'T':
                        case 'U':
+                       case 'V':
                        case 'W':
                        case 'X':
                        case 'Y':
@@ -1827,25 +3458,68 @@ yy170:
                        case 's':
                        case 't':
                        case 'u':
+                       case 'v':
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '1':       goto yy214;
-                       case '3':       goto yy215;
-                       case '6':       goto yy216;
-                       case '8':       goto yy217;
-                       case 'V':
-                       case 'v':       goto yy218;
-                       case '\\':      goto yy114;
-                       default:        goto yy171;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy267;
                        }
-yy171:
-#line 291 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_INT);}
-#line 1847 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy172:
-                       yyaccept = 8;
+yy267:
+#line 401 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TEMP); goto start; }
+#line 3473 "src/parser.c"
+yy268:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy332;
+                       default:        goto yy55;
+                       }
+yy269:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'O':
+                       case 'o':       goto yy333;
+                       default:        goto yy55;
+                       }
+yy270:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy334;
+                       default:        goto yy55;
+                       }
+yy271:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy335;
+                       default:        goto yy55;
+                       }
+yy272:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'B':
+                       case 'b':       goto yy336;
+                       default:        goto yy55;
+                       }
+yy273:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy337;
+                       default:        goto yy55;
+                       }
+yy274:
+                       yyaccept = 20;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -1910,16 +3584,58 @@ yy172:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy173;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy275;
                        }
-yy173:
-#line 317 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LET);}
-#line 1921 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy174:
-                       yyaccept = 9;
+yy275:
+#line 360 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TRUE); goto start; }
+#line 3595 "src/parser.c"
+yy276:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy338;
+                       default:        goto yy55;
+                       }
+yy277:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '1':       goto yy339;
+                       case '3':       goto yy340;
+                       case '6':       goto yy341;
+                       case '8':       goto yy342;
+                       default:        goto yy55;
+                       }
+yy278:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'F':
+                       case 'f':       goto yy343;
+                       default:        goto yy55;
+                       }
+yy279:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy345;
+                       default:        goto yy55;
+                       }
+yy280:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'G':
+                       case 'g':       goto yy347;
+                       default:        goto yy55;
+                       }
+yy281:
+                       yyaccept = 21;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -1984,66 +3700,24 @@ yy174:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy175;
-                       }
-yy175:
-#line 316 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LIB);}
-#line 1995 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy176:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy219;
-                       default:        goto yy54;
-                       }
-yy177:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy221;
-                       default:        goto yy54;
-                       }
-yy178:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy222;
-                       default:        goto yy54;
-                       }
-yy179:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy224;
-                       case 'V':
-                       case 'v':       goto yy225;
-                       default:        goto yy54;
-                       }
-yy180:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'H':
-                       case 'h':       goto yy226;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy282;
                        }
-yy181:
-                       yyaccept = 5;
+yy282:
+#line 365 "src/parser.re"
+                       { NEWTOKEN(PSI_T_VOID); goto start; }
+#line 3711 "src/parser.c"
+yy283:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy227;
-                       default:        goto yy54;
+                       case 'I':
+                       case 'i':       goto yy348;
+                       default:        goto yy55;
                        }
-yy182:
-                       yyaccept = 10;
+yy284:
+                       yyaccept = 22;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -2104,156 +3778,20 @@ yy182:
                        case 's':
                        case 't':
                        case 'u':
-                       case 'v':
-                       case 'w':
-                       case 'x':
-                       case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy183;
-                       }
-yy183:
-#line 318 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_SET);}
-#line 2119 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy184:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy228;
-                       default:        goto yy54;
-                       }
-yy185:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy229;
-                       default:        goto yy54;
-                       }
-yy186:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy230;
-                       default:        goto yy54;
-                       }
-yy187:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy231;
-                       case 'L':
-                       case 'l':       goto yy232;
-                       case 'U':
-                       case 'u':       goto yy233;
-                       case 'V':
-                       case 'v':       goto yy234;
-                       default:        goto yy54;
-                       }
-yy188:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'P':
-                       case 'p':       goto yy235;
-                       default:        goto yy54;
-                       }
-yy189:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy237;
-                       case 'B':
-                       case 'b':       goto yy238;
-                       case 'F':
-                       case 'f':       goto yy239;
-                       case 'I':
-                       case 'i':       goto yy240;
-                       case 'O':
-                       case 'o':       goto yy241;
-                       case 'S':
-                       case 's':       goto yy242;
-                       default:        goto yy54;
-                       }
-yy190:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy243;
-                       default:        goto yy54;
-                       }
-yy191:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy245;
-                       default:        goto yy54;
-                       }
-yy192:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy246;
-                       default:        goto yy54;
-                       }
-yy193:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy247;
-                       default:        goto yy54;
-                       }
-yy194:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy248;
-                       default:        goto yy54;
-                       }
-yy195:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy249;
-                       default:        goto yy54;
-                       }
-yy196:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy251;
-                       default:        goto yy54;
-                       }
-yy197:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'Y':
-                       case 'y':       goto yy253;
-                       default:        goto yy54;
-                       }
-yy198:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy255;
-                       default:        goto yy54;
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy285;
                        }
-yy199:
-                       yyaccept = 11;
+yy285:
+#line 410 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ZVAL); goto start; }
+#line 3793 "src/parser.c"
+yy286:
+                       yyaccept = 23;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -2287,6 +3825,7 @@ yy199:
                        case 'S':
                        case 'T':
                        case 'U':
+                       case 'V':
                        case 'W':
                        case 'X':
                        case 'Y':
@@ -2313,33 +3852,60 @@ yy199:
                        case 's':
                        case 't':
                        case 'u':
+                       case 'v':
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case 'V':
-                       case 'v':       goto yy256;
-                       case '\\':      goto yy114;
-                       default:        goto yy200;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy287;
                        }
-yy200:
-#line 288 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_BOOL);}
-#line 2329 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy201:
-                       yyaccept = 5;
+yy287:
+#line 384 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ARRAY); goto start; }
+#line 3867 "src/parser.c"
+yy288:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy349;
+                       default:        goto yy55;
+                       }
+yy289:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy257;
+                       case 'a':       goto yy351;
+                       default:        goto yy55;
+                       }
+yy290:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
                        case 'B':
-                       case 'b':       goto yy258;
-                       case 'O':
-                       case 'o':       goto yy259;
-                       default:        goto yy54;
+                       case 'b':       goto yy352;
+                       default:        goto yy55;
                        }
-yy202:
-                       yyaccept = 12;
+yy291:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy353;
+                       default:        goto yy55;
+                       }
+yy292:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'C':
+                       case 'c':       goto yy354;
+                       default:        goto yy55;
+                       }
+yy293:
+                       yyaccept = 24;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -2404,40 +3970,16 @@ yy202:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy203;
-                       }
-yy203:
-#line 289 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CHAR);}
-#line 2415 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy204:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy260;
-                       default:        goto yy54;
-                       }
-yy205:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy262;
-                       default:        goto yy54;
-                       }
-yy206:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy264;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy294;
                        }
-yy207:
-                       yyaccept = 13;
+yy294:
+#line 393 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CONST); goto start; }
+#line 3981 "src/parser.c"
+yy295:
+                       yyaccept = 25;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -2502,32 +4044,32 @@ yy207:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy208;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy296;
                        }
-yy208:
-#line 314 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_ENUM);}
-#line 2513 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy209:
-                       yyaccept = 5;
+yy296:
+#line 411 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COUNT); goto start; }
+#line 4055 "src/parser.c"
+yy297:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy265;
-                       default:        goto yy54;
+                       case 'e':       goto yy356;
+                       default:        goto yy55;
                        }
-yy210:
-                       yyaccept = 5;
+yy298:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy267;
-                       default:        goto yy54;
+                       case 'E':
+                       case 'e':       goto yy358;
+                       default:        goto yy55;
                        }
-yy211:
-                       yyaccept = 14;
+yy299:
+                       yyaccept = 26;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -2592,60 +4134,16 @@ yy211:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy212;
-                       }
-yy212:
-#line 320 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_FREE);}
-#line 2603 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy213:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy269;
-                       default:        goto yy54;
-                       }
-yy214:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '6':       goto yy270;
-                       default:        goto yy54;
-                       }
-yy215:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '2':       goto yy271;
-                       default:        goto yy54;
-                       }
-yy216:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '4':       goto yy272;
-                       default:        goto yy54;
-                       }
-yy217:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '_':       goto yy273;
-                       default:        goto yy54;
-                       }
-yy218:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy274;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy300;
                        }
-yy219:
-                       yyaccept = 15;
+yy300:
+#line 354 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ENDIF); goto start; }
+#line 4145 "src/parser.c"
+yy301:
+                       yyaccept = 27;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -2710,24 +4208,16 @@ yy219:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy220;
-                       }
-yy220:
-#line 292 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LONG);}
-#line 2721 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy221:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy275;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy302;
                        }
-yy222:
-                       yyaccept = 16;
+yy302:
+#line 359 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ERROR); goto start; }
+#line 4219 "src/parser.c"
+yy303:
+                       yyaccept = 28;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -2792,104 +4282,16 @@ yy222:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy223;
-                       }
-yy223:
-#line 284 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_NULL);}
-#line 2803 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy224:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy277;
-                       default:        goto yy54;
-                       }
-yy225:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy278;
-                       default:        goto yy54;
-                       }
-yy226:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'V':
-                       case 'v':       goto yy279;
-                       default:        goto yy54;
-                       }
-yy227:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy280;
-                       default:        goto yy54;
-                       }
-yy228:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy281;
-                       default:        goto yy54;
-                       }
-yy229:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy283;
-                       default:        goto yy54;
-                       }
-yy230:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy284;
-                       default:        goto yy54;
-                       }
-yy231:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy285;
-                       default:        goto yy54;
-                       }
-yy232:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy286;
-                       default:        goto yy54;
-                       }
-yy233:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy287;
-                       default:        goto yy54;
-                       }
-yy234:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy288;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy304;
                        }
-yy235:
-                       yyaccept = 17;
+yy304:
+#line 361 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FALSE); goto start; }
+#line 4293 "src/parser.c"
+yy305:
+                       yyaccept = 29;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -2923,7 +4325,6 @@ yy235:
                        case 'S':
                        case 'T':
                        case 'U':
-                       case 'V':
                        case 'W':
                        case 'X':
                        case 'Y':
@@ -2950,68 +4351,29 @@ yy235:
                        case 's':
                        case 't':
                        case 'u':
-                       case 'v':
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy236;
-                       }
-yy236:
-#line 321 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TEMP);}
-#line 2965 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy237:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy289;
-                       default:        goto yy54;
-                       }
-yy238:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy290;
-                       default:        goto yy54;
-                       }
-yy239:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy291;
-                       default:        goto yy54;
-                       }
-yy240:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy292;
-                       default:        goto yy54;
-                       }
-yy241:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy293;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case 'V':
+                       case 'v':       goto yy360;
+                       case '\\':      goto yy115;
+                       default:        goto yy306;
                        }
-yy242:
-                       yyaccept = 5;
+yy306:
+#line 371 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FLOAT); goto start; }
+#line 4367 "src/parser.c"
+yy307:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy294;
-                       default:        goto yy54;
-                       }
-yy243:
-                       yyaccept = 18;
+                       case 'I':
+                       case 'i':       goto yy361;
+                       default:        goto yy55;
+                       }
+yy308:
+                       yyaccept = 30;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -3076,50 +4438,61 @@ yy243:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy244;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy309;
                        }
-yy244:
-#line 282 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TRUE);}
-#line 3087 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy245:
-                       yyaccept = 5;
+yy309:
+#line 350 "src/parser.re"
+                       { NEWTOKEN(PSI_T_IFDEF); goto start; }
+#line 4449 "src/parser.c"
+yy310:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy295;
-                       default:        goto yy54;
+                       case 'F':
+                       case 'f':       goto yy362;
+                       default:        goto yy55;
                        }
-yy246:
-                       yyaccept = 5;
+yy311:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '1':       goto yy296;
-                       case '3':       goto yy297;
-                       case '6':       goto yy298;
-                       case '8':       goto yy299;
-                       default:        goto yy54;
+                       case '_':       goto yy364;
+                       default:        goto yy55;
                        }
-yy247:
-                       yyaccept = 5;
+yy312:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy300;
-                       default:        goto yy54;
+                       case '_':       goto yy365;
+                       default:        goto yy55;
                        }
-yy248:
-                       yyaccept = 5;
+yy313:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy302;
-                       default:        goto yy54;
+                       case '_':       goto yy366;
+                       default:        goto yy55;
                        }
-yy249:
-                       yyaccept = 19;
+yy314:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy367;
+                       default:        goto yy55;
+                       }
+yy315:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy369;
+                       default:        goto yy55;
+                       }
+yy316:
+                       yyaccept = 31;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -3184,16 +4557,64 @@ yy249:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy250;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy317;
                        }
-yy250:
-#line 287 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_VOID);}
-#line 3195 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy251:
-                       yyaccept = 20;
+yy317:
+#line 363 "src/parser.re"
+                       { NEWTOKEN(PSI_T_MIXED); goto start; }
+#line 4568 "src/parser.c"
+yy318:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy371;
+                       default:        goto yy55;
+                       }
+yy319:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy373;
+                       default:        goto yy55;
+                       }
+yy320:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy375;
+                       default:        goto yy55;
+                       }
+yy321:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy376;
+                       default:        goto yy55;
+                       }
+yy322:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'S':
+                       case 's':       goto yy377;
+                       default:        goto yy55;
+                       }
+yy323:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy378;
+                       default:        goto yy55;
+                       }
+yy324:
+                       yyaccept = 32;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -3258,16 +4679,148 @@ yy251:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy252;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy325;
                        }
-yy252:
-#line 330 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_ZVAL);}
-#line 3269 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy253:
-                       yyaccept = 21;
+yy325:
+#line 368 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SHORT); goto start; }
+#line 4690 "src/parser.c"
+yy326:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy380;
+                       default:        goto yy55;
+                       }
+yy327:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'C':
+                       case 'c':       goto yy382;
+                       default:        goto yy55;
+                       }
+yy328:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'G':
+                       case 'g':       goto yy384;
+                       default:        goto yy55;
+                       }
+yy329:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy386;
+                       default:        goto yy55;
+                       }
+yy330:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy388;
+                       default:        goto yy55;
+                       }
+yy331:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy390;
+                       default:        goto yy55;
+                       }
+yy332:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy392;
+                       default:        goto yy55;
+                       }
+yy333:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'O':
+                       case 'o':       goto yy393;
+                       default:        goto yy55;
+                       }
+yy334:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'O':
+                       case 'o':       goto yy394;
+                       default:        goto yy55;
+                       }
+yy335:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy395;
+                       default:        goto yy55;
+                       }
+yy336:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'J':
+                       case 'j':       goto yy397;
+                       default:        goto yy55;
+                       }
+yy337:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy398;
+                       default:        goto yy55;
+                       }
+yy338:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy399;
+                       default:        goto yy55;
+                       }
+yy339:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '6':       goto yy400;
+                       default:        goto yy55;
+                       }
+yy340:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '2':       goto yy401;
+                       default:        goto yy55;
+                       }
+yy341:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '4':       goto yy402;
+                       default:        goto yy55;
+                       }
+yy342:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '_':       goto yy403;
+                       default:        goto yy55;
+                       }
+yy343:
+                       yyaccept = 33;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -3332,56 +4885,16 @@ yy253:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy254;
-                       }
-yy254:
-#line 306 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_ARRAY);}
-#line 3343 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy255:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy303;
-                       default:        goto yy54;
-                       }
-yy256:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy305;
-                       default:        goto yy54;
-                       }
-yy257:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy306;
-                       default:        goto yy54;
-                       }
-yy258:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy307;
-                       default:        goto yy54;
-                       }
-yy259:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy308;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy344;
                        }
-yy260:
-                       yyaccept = 22;
+yy344:
+#line 357 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNDEF); goto start; }
+#line 4896 "src/parser.c"
+yy345:
+                       yyaccept = 34;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -3446,16 +4959,32 @@ yy260:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy261;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy346;
                        }
-yy261:
-#line 315 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CONST);}
-#line 3457 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy262:
-                       yyaccept = 23;
+yy346:
+#line 391 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNION); goto start; }
+#line 4970 "src/parser.c"
+yy347:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy404;
+                       default:        goto yy55;
+                       }
+yy348:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy405;
+                       default:        goto yy55;
+                       }
+yy349:
+                       yyaccept = 35;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -3520,24 +5049,40 @@ yy262:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy263;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy350;
+                       }
+yy350:
+#line 408 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ARRVAL); goto start; }
+#line 5060 "src/parser.c"
+yy351:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy406;
+                       default:        goto yy55;
+                       }
+yy352:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy408;
+                       default:        goto yy55;
                        }
-yy263:
-#line 331 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_COUNT);}
-#line 3531 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy264:
-                       yyaccept = 5;
+yy353:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy310;
-                       default:        goto yy54;
+                       case 'C':
+                       case 'c':       goto yy409;
+                       default:        goto yy55;
                        }
-yy265:
-                       yyaccept = 24;
+yy354:
+                       yyaccept = 36;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -3602,16 +5147,16 @@ yy265:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy266;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy355;
                        }
-yy266:
-#line 283 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_FALSE);}
-#line 3613 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy267:
-                       yyaccept = 25;
+yy355:
+#line 412 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLOC); goto start; }
+#line 5158 "src/parser.c"
+yy356:
+                       yyaccept = 37;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -3627,7 +5172,6 @@ yy267:
                        case 'A':
                        case 'B':
                        case 'C':
-                       case 'D':
                        case 'E':
                        case 'F':
                        case 'G':
@@ -3645,6 +5189,7 @@ yy267:
                        case 'S':
                        case 'T':
                        case 'U':
+                       case 'V':
                        case 'W':
                        case 'X':
                        case 'Y':
@@ -3653,7 +5198,6 @@ yy267:
                        case 'a':
                        case 'b':
                        case 'c':
-                       case 'd':
                        case 'e':
                        case 'f':
                        case 'g':
@@ -3671,66 +5215,22 @@ yy267:
                        case 's':
                        case 't':
                        case 'u':
+                       case 'v':
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case 'V':
-                       case 'v':       goto yy312;
-                       case '\\':      goto yy114;
-                       default:        goto yy268;
-                       }
-yy268:
-#line 293 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_FLOAT);}
-#line 3687 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy269:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy313;
-                       default:        goto yy54;
-                       }
-yy270:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '_':       goto yy314;
-                       default:        goto yy54;
-                       }
-yy271:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '_':       goto yy315;
-                       default:        goto yy54;
-                       }
-yy272:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '_':       goto yy316;
-                       default:        goto yy54;
-                       }
-yy273:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy317;
-                       default:        goto yy54;
-                       }
-yy274:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy319;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case 'D':
+                       case 'd':       goto yy410;
+                       case '\\':      goto yy115;
+                       default:        goto yy357;
                        }
-yy275:
-                       yyaccept = 26;
+yy357:
+#line 355 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DEFINE); goto start; }
+#line 5232 "src/parser.c"
+yy358:
+                       yyaccept = 38;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -3795,48 +5295,32 @@ yy275:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy276;
-                       }
-yy276:
-#line 285 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_MIXED);}
-#line 3806 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy277:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy321;
-                       default:        goto yy54;
-                       }
-yy278:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy323;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy359;
                        }
-yy279:
-                       yyaccept = 5;
+yy359:
+#line 372 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DOUBLE); goto start; }
+#line 5306 "src/parser.c"
+yy360:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy325;
-                       default:        goto yy54;
+                       case 'a':       goto yy412;
+                       default:        goto yy55;
                        }
-yy280:
-                       yyaccept = 5;
+yy361:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy326;
-                       default:        goto yy54;
+                       case 'O':
+                       case 'o':       goto yy413;
+                       default:        goto yy55;
                        }
-yy281:
-                       yyaccept = 27;
+yy362:
+                       yyaccept = 39;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -3901,148 +5385,40 @@ yy281:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy282;
-                       }
-yy282:
-#line 290 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_SHORT);}
-#line 3912 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy283:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy328;
-                       default:        goto yy54;
-                       }
-yy284:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy330;
-                       default:        goto yy54;
-                       }
-yy285:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy332;
-                       default:        goto yy54;
-                       }
-yy286:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy334;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy363;
                        }
-yy287:
-                       yyaccept = 5;
+yy363:
+#line 351 "src/parser.re"
+                       { NEWTOKEN(PSI_T_IFNDEF); goto start; }
+#line 5396 "src/parser.c"
+yy364:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy336;
-                       default:        goto yy54;
-                       }
-yy288:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy338;
-                       default:        goto yy54;
-                       }
-yy289:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy340;
-                       default:        goto yy54;
-                       }
-yy290:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy341;
-                       default:        goto yy54;
+                       case 't':       goto yy414;
+                       default:        goto yy55;
                        }
-yy291:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy342;
-                       default:        goto yy54;
-                       }
-yy292:
-                       yyaccept = 5;
+yy365:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy343;
-                       default:        goto yy54;
-                       }
-yy293:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'J':
-                       case 'j':       goto yy345;
-                       default:        goto yy54;
+                       case 't':       goto yy416;
+                       default:        goto yy55;
                        }
-yy294:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy346;
-                       default:        goto yy54;
-                       }
-yy295:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy347;
-                       default:        goto yy54;
-                       }
-yy296:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '6':       goto yy348;
-                       default:        goto yy54;
-                       }
-yy297:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '2':       goto yy349;
-                       default:        goto yy54;
-                       }
-yy298:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '4':       goto yy350;
-                       default:        goto yy54;
-                       }
-yy299:
-                       yyaccept = 5;
+yy366:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '_':       goto yy351;
-                       default:        goto yy54;
+                       case 'T':
+                       case 't':       goto yy418;
+                       default:        goto yy55;
                        }
-yy300:
-                       yyaccept = 28;
+yy367:
+                       yyaccept = 40;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -4107,24 +5483,16 @@ yy300:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy301;
-                       }
-yy301:
-#line 313 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_UNION);}
-#line 4118 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy302:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy352;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy368;
                        }
-yy303:
-                       yyaccept = 29;
+yy368:
+#line 373 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT8); goto start; }
+#line 5494 "src/parser.c"
+yy369:
+                       yyaccept = 41;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -4189,40 +5557,16 @@ yy303:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy304;
-                       }
-yy304:
-#line 328 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_ARRVAL);}
-#line 4200 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy305:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy353;
-                       default:        goto yy54;
-                       }
-yy306:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy355;
-                       default:        goto yy54;
-                       }
-yy307:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy356;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy370;
                        }
-yy308:
-                       yyaccept = 30;
+yy370:
+#line 405 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INTVAL); goto start; }
+#line 5568 "src/parser.c"
+yy371:
+                       yyaccept = 42;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -4287,16 +5631,16 @@ yy308:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy309;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy372;
                        }
-yy309:
-#line 332 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CALLOC);}
-#line 4298 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy310:
-                       yyaccept = 31;
+yy372:
+#line 385 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OBJECT); goto start; }
+#line 5642 "src/parser.c"
+yy373:
+                       yyaccept = 43;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -4361,56 +5705,40 @@ yy310:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy311;
-                       }
-yy311:
-#line 294 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_DOUBLE);}
-#line 4372 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy312:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy357;
-                       default:        goto yy54;
-                       }
-yy313:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy358;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy374;
                        }
-yy314:
-                       yyaccept = 5;
+yy374:
+#line 409 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OBJVAL); goto start; }
+#line 5716 "src/parser.c"
+yy375:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy359;
-                       default:        goto yy54;
+                       case 'L':
+                       case 'l':       goto yy420;
+                       default:        goto yy55;
                        }
-yy315:
-                       yyaccept = 5;
+yy376:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy361;
-                       default:        goto yy54;
+                       case 'S':
+                       case 's':       goto yy422;
+                       default:        goto yy55;
                        }
-yy316:
-                       yyaccept = 5;
+yy377:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy363;
-                       default:        goto yy54;
+                       case 'S':
+                       case 's':       goto yy423;
+                       default:        goto yy55;
                        }
-yy317:
-                       yyaccept = 32;
+yy378:
+                       yyaccept = 44;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -4475,16 +5803,16 @@ yy317:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy318;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy379;
                        }
-yy318:
-#line 295 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_INT8);}
-#line 4486 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy319:
-                       yyaccept = 33;
+yy379:
+#line 399 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RETURN); goto start; }
+#line 5814 "src/parser.c"
+yy380:
+                       yyaccept = 45;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -4549,16 +5877,16 @@ yy319:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy320;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy381;
                        }
-yy320:
-#line 325 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_INTVAL);}
-#line 4560 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy321:
-                       yyaccept = 34;
+yy381:
+#line 382 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SIGNED); goto start; }
+#line 5888 "src/parser.c"
+yy382:
+                       yyaccept = 46;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -4623,16 +5951,16 @@ yy321:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy322;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy383;
                        }
-yy322:
-#line 307 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_OBJECT);}
-#line 4634 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy323:
-                       yyaccept = 35;
+yy383:
+#line 387 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STATIC); goto start; }
+#line 5962 "src/parser.c"
+yy384:
+                       yyaccept = 47;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -4697,24 +6025,16 @@ yy323:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy324;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy385;
                        }
-yy324:
-#line 329 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_OBJVAL);}
-#line 4708 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy325:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy365;
-                       default:        goto yy54;
-                       }
-yy326:
-                       yyaccept = 36;
+yy385:
+#line 383 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRING); goto start; }
+#line 6036 "src/parser.c"
+yy386:
+                       yyaccept = 48;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -4779,16 +6099,16 @@ yy326:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy327;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy387;
                        }
-yy327:
-#line 319 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_RETURN);}
-#line 4790 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy328:
-                       yyaccept = 37;
+yy387:
+#line 402 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRLEN); goto start; }
+#line 6110 "src/parser.c"
+yy388:
+                       yyaccept = 49;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -4853,16 +6173,16 @@ yy328:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy329;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy389;
                        }
-yy329:
-#line 304 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_SIGNED);}
-#line 4864 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy330:
-                       yyaccept = 38;
+yy389:
+#line 390 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRUCT); goto start; }
+#line 6184 "src/parser.c"
+yy390:
+                       yyaccept = 50;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -4927,16 +6247,40 @@ yy330:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy331;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy391;
                        }
-yy331:
-#line 309 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_STATIC);}
-#line 4938 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy332:
-                       yyaccept = 39;
+yy391:
+#line 403 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRVAL); goto start; }
+#line 6258 "src/parser.c"
+yy392:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy424;
+                       default:        goto yy55;
+                       }
+yy393:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy425;
+                       default:        goto yy55;
+                       }
+yy394:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy427;
+                       default:        goto yy55;
+                       }
+yy395:
+                       yyaccept = 51;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -5001,16 +6345,85 @@ yy332:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy333;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy396;
                        }
-yy333:
-#line 305 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_STRING);}
-#line 5012 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy334:
-                       yyaccept = 40;
+yy396:
+#line 416 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_INT); goto start; }
+#line 6356 "src/parser.c"
+yy397:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy428;
+                       default:        goto yy55;
+                       }
+yy398:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy429;
+                       default:        goto yy55;
+                       }
+yy399:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'F':
+                       case 'f':       goto yy430;
+                       default:        goto yy55;
+                       }
+yy400:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '_':       goto yy432;
+                       default:        goto yy55;
+                       }
+yy401:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '_':       goto yy433;
+                       default:        goto yy55;
+                       }
+yy402:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case '_':       goto yy434;
+                       default:        goto yy55;
+                       }
+yy403:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy435;
+                       default:        goto yy55;
+                       }
+yy404:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy437;
+                       default:        goto yy55;
+                       }
+yy405:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'G':
+                       case 'g':       goto yy438;
+                       default:        goto yy55;
+                       }
+yy406:
+                       yyaccept = 52;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -5075,16 +6488,32 @@ yy334:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy335;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy407;
+                       }
+yy407:
+#line 407 "src/parser.re"
+                       { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
+#line 6499 "src/parser.c"
+yy408:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy440;
+                       default:        goto yy55;
                        }
-yy335:
-#line 322 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_STRLEN);}
-#line 5086 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy336:
-                       yyaccept = 41;
+yy409:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'K':
+                       case 'k':       goto yy442;
+                       default:        goto yy55;
+                       }
+yy410:
+                       yyaccept = 53;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -5149,16 +6578,32 @@ yy336:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy337;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy411;
                        }
-yy337:
-#line 312 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_STRUCT);}
-#line 5160 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy338:
-                       yyaccept = 42;
+yy411:
+#line 356 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DEFINED); goto start; }
+#line 6589 "src/parser.c"
+yy412:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy444;
+                       default:        goto yy55;
+                       }
+yy413:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy446;
+                       default:        goto yy55;
+                       }
+yy414:
+                       yyaccept = 54;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -5223,40 +6668,16 @@ yy338:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy339;
-                       }
-yy339:
-#line 323 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_STRVAL);}
-#line 5234 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy340:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy367;
-                       default:        goto yy54;
-                       }
-yy341:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy368;
-                       default:        goto yy54;
-                       }
-yy342:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy370;
-                       default:        goto yy54;
-                       }
-yy343:
-                       yyaccept = 43;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy415;
+                       }
+yy415:
+#line 375 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT16); goto start; }
+#line 6679 "src/parser.c"
+yy416:
+                       yyaccept = 55;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -5316,82 +6737,21 @@ yy343:
                        case 'r':
                        case 's':
                        case 't':
-                       case 'u':
-                       case 'v':
-                       case 'w':
-                       case 'x':
-                       case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy344;
-                       }
-yy344:
-#line 336 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TO_INT);}
-#line 5332 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy345:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy371;
-                       default:        goto yy54;
-                       }
-yy346:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy372;
-                       default:        goto yy54;
-                       }
-yy347:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'F':
-                       case 'f':       goto yy373;
-                       default:        goto yy54;
-                       }
-yy348:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '_':       goto yy375;
-                       default:        goto yy54;
-                       }
-yy349:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '_':       goto yy376;
-                       default:        goto yy54;
-                       }
-yy350:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '_':       goto yy377;
-                       default:        goto yy54;
-                       }
-yy351:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy378;
-                       default:        goto yy54;
-                       }
-yy352:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy380;
-                       default:        goto yy54;
-                       }
-yy353:
-                       yyaccept = 44;
+                       case 'u':
+                       case 'v':
+                       case 'w':
+                       case 'x':
+                       case 'y':
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy417;
+                       }
+yy417:
+#line 377 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT32); goto start; }
+#line 6753 "src/parser.c"
+yy418:
+                       yyaccept = 56;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -5456,48 +6816,16 @@ yy353:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy354;
-                       }
-yy354:
-#line 327 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_BOOLVAL);}
-#line 5467 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy355:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy381;
-                       default:        goto yy54;
-                       }
-yy356:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'K':
-                       case 'k':       goto yy383;
-                       default:        goto yy54;
-                       }
-yy357:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy385;
-                       default:        goto yy54;
-                       }
-yy358:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy387;
-                       default:        goto yy54;
-                       }
-yy359:
-                       yyaccept = 45;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy419;
+                       }
+yy419:
+#line 379 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT64); goto start; }
+#line 6827 "src/parser.c"
+yy420:
+                       yyaccept = 57;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -5562,16 +6890,40 @@ yy359:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy360;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy421;
+                       }
+yy421:
+#line 404 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PATHVAL); goto start; }
+#line 6901 "src/parser.c"
+yy422:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'S':
+                       case 's':       goto yy448;
+                       default:        goto yy55;
                        }
-yy360:
-#line 297 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_INT16);}
-#line 5573 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy361:
-                       yyaccept = 46;
+yy423:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy449;
+                       default:        goto yy55;
+                       }
+yy424:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'Y':
+                       case 'y':       goto yy450;
+                       default:        goto yy55;
+                       }
+yy425:
+                       yyaccept = 58;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -5636,16 +6988,40 @@ yy361:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy362;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy426;
+                       }
+yy426:
+#line 418 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_BOOL); goto start; }
+#line 6999 "src/parser.c"
+yy427:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy452;
+                       default:        goto yy55;
                        }
-yy362:
-#line 299 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_INT32);}
-#line 5647 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy363:
-                       yyaccept = 47;
+yy428:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'C':
+                       case 'c':       goto yy454;
+                       default:        goto yy55;
+                       }
+yy429:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy455;
+                       default:        goto yy55;
+                       }
+yy430:
+                       yyaccept = 59;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -5710,16 +7086,40 @@ yy363:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy364;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy431;
+                       }
+yy431:
+#line 389 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
+#line 7097 "src/parser.c"
+yy432:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy456;
+                       default:        goto yy55;
                        }
-yy364:
-#line 301 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_INT64);}
-#line 5721 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy365:
-                       yyaccept = 48;
+yy433:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy458;
+                       default:        goto yy55;
+                       }
+yy434:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy460;
+                       default:        goto yy55;
+                       }
+yy435:
+                       yyaccept = 60;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -5784,24 +7184,24 @@ yy365:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy366;
-                       }
-yy366:
-#line 324 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_PATHVAL);}
-#line 5795 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy367:
-                       yyaccept = 5;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy436;
+                       }
+yy436:
+#line 374 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT8); goto start; }
+#line 7195 "src/parser.c"
+yy437:
+                       yyaccept = 4;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case 'Y':
-                       case 'y':       goto yy389;
-                       default:        goto yy54;
+                       case 'D':
+                       case 'd':       goto yy462;
+                       default:        goto yy55;
                        }
-yy368:
-                       yyaccept = 49;
+yy438:
+                       yyaccept = 61;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -5866,40 +7266,16 @@ yy368:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy369;
-                       }
-yy369:
-#line 338 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TO_BOOL);}
-#line 5877 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy370:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy391;
-                       default:        goto yy54;
-                       }
-yy371:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy393;
-                       default:        goto yy54;
-                       }
-yy372:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy394;
-                       default:        goto yy54;
-                       }
-yy373:
-                       yyaccept = 50;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy439;
+                       }
+yy439:
+#line 358 "src/parser.re"
+                       { NEWTOKEN(PSI_T_WARNING); goto start; }
+#line 7277 "src/parser.c"
+yy440:
+                       yyaccept = 62;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -5964,40 +7340,16 @@ yy373:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy374;
-                       }
-yy374:
-#line 311 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TYPEDEF);}
-#line 5975 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy375:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy395;
-                       default:        goto yy54;
-                       }
-yy376:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy397;
-                       default:        goto yy54;
-                       }
-yy377:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy399;
-                       default:        goto yy54;
-                       }
-yy378:
-                       yyaccept = 51;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy441;
+                       }
+yy441:
+#line 364 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLABLE); goto start; }
+#line 7351 "src/parser.c"
+yy442:
+                       yyaccept = 63;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6062,24 +7414,16 @@ yy378:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy379;
-                       }
-yy379:
-#line 296 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_UINT8);}
-#line 6073 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy380:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy401;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy443;
                        }
-yy381:
-                       yyaccept = 52;
+yy443:
+#line 386 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLBACK); goto start; }
+#line 7425 "src/parser.c"
+yy444:
+                       yyaccept = 64;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6144,16 +7488,16 @@ yy381:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy382;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy445;
                        }
-yy382:
-#line 286 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CALLABLE);}
-#line 6155 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy383:
-                       yyaccept = 53;
+yy445:
+#line 406 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
+#line 7499 "src/parser.c"
+yy446:
+                       yyaccept = 65;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6218,16 +7562,32 @@ yy383:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy384;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy447;
+                       }
+yy447:
+#line 388 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FUNCTION); goto start; }
+#line 7573 "src/parser.c"
+yy448:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy464;
+                       default:        goto yy55;
                        }
-yy384:
-#line 308 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CALLBACK);}
-#line 6229 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy385:
-                       yyaccept = 54;
+yy449:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy465;
+                       default:        goto yy55;
+                       }
+yy450:
+                       yyaccept = 66;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6292,16 +7652,16 @@ yy385:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy386;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy451;
                        }
-yy386:
-#line 326 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_FLOATVAL);}
-#line 6303 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy387:
-                       yyaccept = 55;
+yy451:
+#line 414 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
+#line 7663 "src/parser.c"
+yy452:
+                       yyaccept = 67;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6366,16 +7726,32 @@ yy387:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy388;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy453;
+                       }
+yy453:
+#line 417 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
+#line 7737 "src/parser.c"
+yy454:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy466;
+                       default:        goto yy55;
                        }
-yy388:
-#line 310 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_FUNCTION);}
-#line 6377 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy389:
-                       yyaccept = 56;
+yy455:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'G':
+                       case 'g':       goto yy468;
+                       default:        goto yy55;
+                       }
+yy456:
+                       yyaccept = 68;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6440,16 +7816,16 @@ yy389:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy390;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy457;
                        }
-yy390:
-#line 334 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TO_ARRAY);}
-#line 6451 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy391:
-                       yyaccept = 57;
+yy457:
+#line 376 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT16); goto start; }
+#line 7827 "src/parser.c"
+yy458:
+                       yyaccept = 69;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6514,32 +7890,16 @@ yy391:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy392;
-                       }
-yy392:
-#line 337 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TO_FLOAT);}
-#line 6525 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy393:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy403;
-                       default:        goto yy54;
-                       }
-yy394:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy405;
-                       default:        goto yy54;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy459;
                        }
-yy395:
-                       yyaccept = 58;
+yy459:
+#line 378 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT32); goto start; }
+#line 7901 "src/parser.c"
+yy460:
+                       yyaccept = 70;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6604,16 +7964,16 @@ yy395:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy396;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy461;
                        }
-yy396:
-#line 298 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_UINT16);}
-#line 6615 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy397:
-                       yyaccept = 59;
+yy461:
+#line 380 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UINT64); goto start; }
+#line 7975 "src/parser.c"
+yy462:
+                       yyaccept = 71;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6678,16 +8038,32 @@ yy397:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy398;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy463;
+                       }
+yy463:
+#line 381 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
+#line 8049 "src/parser.c"
+yy464:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy470;
+                       default:        goto yy55;
                        }
-yy398:
-#line 300 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_UINT32);}
-#line 6689 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy399:
-                       yyaccept = 60;
+yy465:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy471;
+                       default:        goto yy55;
+                       }
+yy466:
+                       yyaccept = 72;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6752,16 +8128,16 @@ yy399:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy400;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy467;
                        }
-yy400:
-#line 302 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_UINT64);}
-#line 6763 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy401:
-                       yyaccept = 61;
+yy467:
+#line 413 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_OBJECT); goto start; }
+#line 8139 "src/parser.c"
+yy468:
+                       yyaccept = 73;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6826,16 +8202,24 @@ yy401:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy402;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy469;
+                       }
+yy469:
+#line 415 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_STRING); goto start; }
+#line 8213 "src/parser.c"
+yy470:
+                       yyaccept = 4;
+                       yych = *(P->mrk = ++P->cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy473;
+                       default:        goto yy55;
                        }
-yy402:
-#line 303 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_UNSIGNED);}
-#line 6837 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy403:
-                       yyaccept = 62;
+yy471:
+                       yyaccept = 74;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6900,16 +8284,16 @@ yy403:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy404;
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy472;
                        }
-yy404:
-#line 333 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TO_OBJECT);}
-#line 6911 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy405:
-                       yyaccept = 63;
+yy472:
+#line 397 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
+#line 8295 "src/parser.c"
+yy473:
+                       yyaccept = 75;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '0':
@@ -6974,56 +8358,85 @@ yy405:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy53;
-                       case '\\':      goto yy114;
-                       default:        goto yy406;
-                       }
-yy406:
-#line 335 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TO_STRING);}
-#line 6985 "/home/mike/src/php-master/ext/psi/src/parser.c"
+                       case 'z':       goto yy54;
+                       case '\\':      goto yy115;
+                       default:        goto yy474;
+                       }
+yy474:
+#line 398 "src/parser.re"
+                       { NEWTOKEN(PSI_T_POST_ASSERT); goto start; }
+#line 8369 "src/parser.c"
                }
-#line 345 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 428 "src/parser.re"
 
 
-       comment:
-               P->tok = P->cur;
+       comment: ;
                
-#line 6993 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 8376 "src/parser.c"
                {
                        unsigned char yych;
-                       if ((P->lim - P->cur) < 2) { if (!psi_parser_fill(P,2)) RETURN(PSI_T_EOF); };
+                       if ((P->lim - P->cur) < 2) if (P->cur >= P->lim) goto done;;
                        yych = *P->cur;
                        switch (yych) {
-                       case '\n':      goto yy411;
-                       case '*':       goto yy413;
-                       default:        goto yy409;
+                       case '\n':
+                       case '\r':      goto yy479;
+                       case '*':       goto yy481;
+                       default:        goto yy477;
                        }
-yy409:
+yy477:
                        ++P->cur;
-yy410:
-#line 352 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy478:
+#line 435 "src/parser.re"
                        { goto comment; }
-#line 7008 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy411:
+#line 8392 "src/parser.c"
+yy479:
                        ++P->cur;
-#line 350 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       { NEWLINE(comment); }
-#line 7013 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy413:
+#line 433 "src/parser.re"
+                       { NEWLINE(); goto comment; }
+#line 8397 "src/parser.c"
+yy481:
                        yych = *++P->cur;
                        switch (yych) {
-                       case '/':       goto yy414;
-                       default:        goto yy410;
+                       case '/':       goto yy482;
+                       default:        goto yy478;
                        }
-yy414:
+yy482:
                        ++P->cur;
-#line 351 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       { continue; }
-#line 7024 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 434 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COMMENT); goto start; }
+#line 8408 "src/parser.c"
                }
-#line 353 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 437 "src/parser.re"
 
-       }
-       return -1;
+
+       comment_sl: ;
+               
+#line 8415 "src/parser.c"
+               {
+                       unsigned char yych;
+                       if (P->lim <= P->cur) if (P->cur >= P->lim) goto done;;
+                       yych = *P->cur;
+                       switch (yych) {
+                       case '\n':
+                       case '\r':      goto yy488;
+                       default:        goto yy486;
+                       }
+yy486:
+                       ++P->cur;
+#line 443 "src/parser.re"
+                       { goto comment_sl; }
+#line 8429 "src/parser.c"
+yy488:
+                       ++P->cur;
+#line 442 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COMMENT); NEWLINE(); goto start; }
+#line 8434 "src/parser.c"
+               }
+#line 445 "src/parser.re"
+
+error:
+       psi_plist_free(tokens);
+       return NULL;
+done:
+       return tokens;
 }