Merge branch 'slimconfigure'
[m6w6/ext-psi] / src / parser.c
index e4ea9d66c38180f15e1ecb4e8df281aed24b742b..d9d7b58db666af94ab6fd180212db57952f58e32 100644 (file)
@@ -1,15 +1,42 @@
-/* Generated by re2c 0.16 on Mon Feb  6 11:59:53 2017 */
-#line 1 "/home/mike/src/php-master/ext/psi/src/parser.re"
+/* Generated by re2c 1.0.2 on Tue Oct 24 14:53:03 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 15
+
+#ifndef YYMAXFILL
+# define YYMAXFILL 256
+#endif
 
 struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error, unsigned flags)
 {
@@ -20,171 +47,248 @@ struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error, uns
 
        psi_data_ctor_with_dtors(PSI_DATA(P), error, flags);
 
-       P->col = 1;
-       P->line = 1;
-       P->proc = psi_parser_proc_init();
+       P->preproc = psi_cpp_init(P);
 
-       if (flags & PSI_DEBUG) {
-               psi_parser_proc_trace(stderr, "PSI> ");
-       }
+       psi_cpp_load_defaults(P->preproc);
 
        return P;
 }
 
-bool psi_parser_open_file(struct psi_parser *P, const char *filename)
+struct psi_parser_input *psi_parser_open_file(struct psi_parser *P, const char *filename, bool report_errors)
 {
-       FILE *fp = fopen(filename, "r");
+       struct stat sb;
+       FILE *fp;
+       struct psi_parser_input *fb;
 
-       if (!fp) {
-               P->error(PSI_DATA(P), NULL, PSI_WARNING,
-                               "Could not open '%s' for reading: %s",
-                               filename, strerror(errno));
-               return false;
+       if (stat(filename, &sb)) {
+               if (report_errors) {
+                       P->error(PSI_DATA(P), NULL, PSI_WARNING,
+                                       "Could not stat '%s': %s",
+                                       filename, strerror(errno));
+               }
+               return NULL;
        }
 
-       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(sizeof(*fb) + strlen(filename) + 1 + sb.st_size + YYMAXFILL))) {
+               if (report_errors) {
+                       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 NULL;
+       }
 
-       if (fstat(fd, &sb)) {
-               P->error(PSI_DATA(P), NULL, PSI_WARNING,
-                               "Could not stat '%s': %s",
-                               filename, strerror(errno));
-               return false;
+       if (!(fp = fopen(filename, "r"))) {
+               free(fb);
+               if (report_errors) {
+                       P->error(PSI_DATA(P), NULL, PSI_WARNING,
+                                       "Could not open '%s' for reading: %s",
+                                       filename, strerror(errno));
+               }
+               return NULL;
        }
 
-       P->input.data.file.buffer = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
-       if (MAP_FAILED == P->input.data.file.buffer) {
-               P->error(PSI_DATA(P), NULL, PSI_WARNING,
-                               "Could not map '%s' for reading: %s",
-                               filename, strerror(errno));
-               return false;
+       if (sb.st_size != fread(fb->buffer, 1, sb.st_size, fp)) {
+               free(fb);
+               fclose(fp);
+               if (report_errors) {
+                       P->error(PSI_DATA(P), NULL, PSI_WARNING,
+                                       "Could not read %zu bytes from '%s': %s",
+                                       sb.st_size + YYMAXFILL, filename, strerror(errno));
+               }
+               return NULL;
        }
-       P->input.data.file.length = sb.st_size;
-#else
-       P->input.data.file.buffer = malloc(BSIZE);
-#endif
 
-       P->file.fn = strdup(filename);
+       memset(fb->buffer + sb.st_size, 0, YYMAXFILL);
+       fb->length = sb.st_size;
+       fb->file = &fb->buffer[sb.st_size + YYMAXFILL];
+       memcpy(fb->file, filename, strlen(filename) + 1);
 
-       return true;
+       return fb;
 }
 
-bool psi_parser_open_string(struct psi_parser *P, const char *string, size_t length)
+struct psi_parser_input *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))) {
-               return false;
+       struct psi_parser_input *sb;
+
+       if (!(sb = malloc(sizeof(*sb) + sizeof("<stdin>") + length + YYMAXFILL))) {
+               P->error(PSI_DATA(P), NULL, PSI_WARNING,
+                               "Could not allocate %zu bytes: %s",
+                               length + YYMAXFILL, strerror(errno));
+               return NULL;
        }
 
-       P->file.fn = strdup("<input>");
+       memcpy(sb->buffer, string, length);
+       memset(sb->buffer + length, 0, YYMAXFILL);
 
-       return true;
+       sb->length = length;
+       sb->file = &sb->buffer[length + YYMAXFILL];
+       memcpy(sb->file, "<stdin>", sizeof("<stdin>"));
+
+       return sb;
 }
 
-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;
+               }
+
+               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
+
+struct psi_plist *psi_parser_preprocess(struct psi_parser *P, struct psi_plist **tokens)
+{
+       if (psi_cpp_process(P->preproc, tokens)) {
+               return *tokens;
+       }
+       return NULL;
+}
 
-               PSI_DEBUG_PRINT(P, "PSI< Fill: cur=%p lim=%p eof=%p\n", P->cur, P->lim, P->eof);
+bool psi_parser_process(struct psi_parser *P, struct psi_plist *tokens, size_t *processed)
+{
+       if (psi_plist_count(tokens)) {
+               return 0 == psi_parser_proc_parse(P, tokens, processed);
        }
+       return true;
+}
+
+void psi_parser_postprocess(struct psi_parser *P)
+{
+       unsigned flags;
+       zend_string *name;
+       struct psi_validate_scope scope = {0};
 
-       switch (P->input.type) {
-       case PSI_PARSE_STRING:
-               break;
+       psi_validate_scope_ctor(&scope);
+       scope.defs = &P->preproc->defs;
 
-       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;
+       flags = P->flags;
+       P->flags |= PSI_SILENT;
 
-                       if (consumed) {
-                               memmove(P->buf, P->tok, reserved);
-                               P->tok -= consumed;
-                               P->cur -= consumed;
-                               P->lim -= consumed;
-                               P->mrk -= consumed;
-                       }
+       /* register const macros */
+       ZEND_HASH_FOREACH_STR_KEY_PTR(&P->preproc->defs, name, scope.macro)
+       {
+               if (scope.macro->sig) {
+               } else if (scope.macro->exp) {
+                       if (psi_num_exp_validate(PSI_DATA(P), scope.macro->exp, &scope)) {
+                               struct psi_impl_type *type;
+                               struct psi_impl_def_val *def;
+                               struct psi_const *cnst;
+                               struct psi_num_exp *num;
+                               char *name_str = malloc(name->len + sizeof("psi\\"));
 
-                       didread = fread(P->lim, 1, available, P->fp);
-                       P->lim += didread;
-                       if (didread < available) {
-                               P->eof = P->lim;
+                               strcat(strcpy(name_str, "psi\\"), name->val);
+                               num = psi_num_exp_copy(scope.macro->exp);
+                               def = psi_impl_def_val_init(PSI_T_NUMBER, num);
+                               type = psi_impl_type_init(PSI_T_NUMBER, "<eval number>");
+                               cnst = psi_const_init(type, name_str, def);
+                               P->consts = psi_plist_add(P->consts, &cnst);
+                               free(name_str);
+                       }
+               } else {
+                       if (psi_plist_count(scope.macro->tokens) == 1) {
+                               struct psi_token *t;
+
+                               if (psi_plist_get(scope.macro->tokens, 0, &t)) {
+                                       if (t->type == PSI_T_QUOTED_STRING) {
+                                               struct psi_impl_type *type;
+                                               struct psi_impl_def_val *def;
+                                               struct psi_const *cnst;
+                                               char *name_str = malloc(name->len + sizeof("psi\\"));
+
+                                               strcat(strcpy(name_str, "psi\\"), name->val);
+                                               type = psi_impl_type_init(PSI_T_STRING, "string");
+                                               def = psi_impl_def_val_init(PSI_T_QUOTED_STRING, t->text);
+                                               cnst = psi_const_init(type, name_str, def);
+                                               P->consts = psi_plist_add(P->consts, &cnst);
+                                               free(name_str);
+                                       }
+                               }
                        }
-                       PSI_DEBUG_PRINT(P, "PSI< Fill: consumed=%zu reserved=%zu available=%zu didread=%zu\n",
-                                       consumed, reserved, available, didread);
                }
-#endif
-               break;
        }
+       ZEND_HASH_FOREACH_END();
 
-       PSI_DEBUG_PRINT(P, "PSI< Fill: avail=%td\n", P->lim - P->cur);
+       P->flags = flags;
 
-       return P->lim - P->cur;
+       psi_validate_scope_dtor(&scope);
 }
 
-void psi_parser_parse(struct psi_parser *P, struct psi_token *T)
+bool psi_parser_parse(struct psi_parser *P, struct psi_parser_input *I)
 {
-       if (T) {
-               psi_parser_proc_parse(P->proc, T->type, T, P);
-       } else {
-               psi_parser_proc_parse(P->proc, 0, NULL, P);
-       }
-}
+       struct psi_plist *scanned, *preproc;
+       size_t processed = 0;
 
-void psi_parser_dtor(struct psi_parser *P)
-{
-       psi_parser_proc_free(&P->proc);
+       if (!(scanned = psi_parser_scan(P, I))) {
+               return false;
+       }
 
-       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;
+       if (!(preproc = psi_parser_preprocess(P, &scanned))) {
+               psi_plist_free(scanned);
+               return false;
+       }
 
-       case PSI_PARSE_STRING:
-               if (P->input.data.string.buffer) {
-                       free(P->input.data.string.buffer);
-               }
-               break;
+       if (!psi_parser_process(P, preproc, &processed)) {
+               psi_plist_free(preproc);
+               return false;
        }
 
+       psi_parser_postprocess(P);
+
+       psi_plist_free(preproc);
+       return true;
+}
+
+void psi_parser_dtor(struct psi_parser *P)
+{
+       psi_cpp_free(&P->preproc);
        psi_data_dtor(PSI_DATA(P));
 
        memset(P, 0, sizeof(*P));
@@ -199,63 +303,106 @@ void psi_parser_free(struct psi_parser **P)
        }
 }
 
-#define YYMAXFILL 10
-#if BSIZE < YYMAXFILL
-# error BSIZE must be greater than YYMAXFILL
-#endif
-
-#define RETURN(t) do { \
-       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 NEWLINE() \
+       eol = cur; \
+       ++I->lines
 
-#define ADDCOLS \
-       P->col += P->cur - P->tok
+#define NEWTOKEN(t) \
+       token = psi_token_init(t, tok, cur - tok, tok - eol + 1, I->lines, I->file); \
+       tokens = psi_plist_add(tokens, &token); \
+       if (P->flags & PSI_DEBUG) { \
+               fprintf(stderr, "PSI< "); \
+               psi_token_dump(2, token); \
+       }
 
-#define NEWLINE(label) \
-       P->col = 1; \
-       ++P->line; \
-       goto label
+union int_suffix {
+       char s[4];
+       uint32_t i;
+};
 
-token_t psi_parser_scan(struct psi_parser *P)
+struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input *I)
 {
-       if (!P->cur) {
-               psi_parser_fill(P, 0);
-       }
-       for (;;) {
-               ADDCOLS;
-       nextline:
-               P->tok = P->cur;
+       struct psi_plist *tokens;
+       struct psi_token *token;
+       const char *tok, *cur, *lim, *mrk, *eol, *ctxmrk;
+       unsigned parens;
+       bool escaped;
+       token_t char_width;
+
+       PSI_DEBUG_PRINT(P, "PSI: scanning %s\n", I->file);
+
+       tok = mrk = eol = cur = I->buffer;
+       lim = I->buffer + I->length;
+       I->lines = 1;
+       tokens = psi_plist_init((psi_plist_dtor) psi_token_free);
+
+       start: ;
+               char_width = 1;
+               ctxmrk = NULL;
+               tok = cur;
+
+               (void) ctxmrk;
+
                
-#line 234 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 348 "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); };
-                       yych = *P->cur;
-                       switch (yych) {
+                       if ((lim - cur) < 15) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\v':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case '@':
+                       case '`':
+                       case 0x7F:      goto yy2;
                        case '\t':
+                       case '\f':
                        case ' ':       goto yy4;
                        case '\n':
                        case '\r':      goto yy7;
                        case '!':       goto yy9;
                        case '"':       goto yy11;
-                       case '#':       goto yy12;
-                       case '$':       goto 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 '0':
+                       case '#':       goto yy13;
+                       case '$':       goto yy15;
+                       case '%':       goto yy16;
+                       case '&':       goto yy18;
+                       case '\'':      goto yy20;
+                       case '(':       goto yy22;
+                       case ')':       goto yy24;
+                       case '*':       goto yy26;
+                       case '+':       goto yy28;
+                       case ',':       goto yy30;
+                       case '-':       goto yy32;
+                       case '.':       goto yy34;
+                       case '/':       goto yy36;
+                       case '0':       goto yy38;
                        case '1':
                        case '2':
                        case '3':
@@ -264,118 +411,352 @@ 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 yy41;
-                       case '>':       goto yy43;
+                       case '9':       goto yy40;
+                       case ':':       goto yy42;
+                       case ';':       goto yy44;
+                       case '<':       goto yy46;
+                       case '=':       goto yy48;
+                       case '>':       goto yy50;
+                       case '?':       goto yy52;
                        case 'A':
-                       case 'a':       goto yy44;
-                       case 'B':
-                       case 'b':       goto yy46;
-                       case 'C':
-                       case 'c':       goto yy47;
-                       case 'D':
-                       case 'd':       goto yy48;
-                       case 'E':
-                       case 'e':       goto yy49;
-                       case 'F':
-                       case 'f':       goto yy50;
-                       case 'G':
-                       case 'H':
-                       case 'J':
-                       case 'K':
-                       case 'Q':
-                       case 'W':
-                       case 'X':
-                       case 'Y':
-                       case '_':
-                       case 'g':
-                       case 'h':
-                       case 'j':
-                       case 'k':
-                       case 'q':
-                       case 'w':
-                       case 'x':
-                       case 'y':       goto yy51;
-                       case 'I':
-                       case 'i':       goto yy53;
-                       case 'L':
-                       case 'l':       goto yy54;
+                       case 'a':       goto yy54;
+                       case 'B':       goto yy56;
+                       case 'C':       goto yy57;
+                       case 'D':       goto yy58;
+                       case 'E':       goto yy59;
+                       case 'F':       goto yy60;
+                       case 'I':       goto yy63;
+                       case 'L':       goto yy64;
                        case 'M':
-                       case 'm':       goto yy55;
+                       case 'm':       goto yy65;
                        case 'N':
-                       case 'n':       goto yy56;
+                       case 'n':       goto yy66;
                        case 'O':
-                       case 'o':       goto yy57;
-                       case 'P':
-                       case 'p':       goto yy58;
+                       case 'o':       goto yy67;
+                       case 'P':       goto yy68;
                        case 'R':
-                       case 'r':       goto yy59;
-                       case 'S':
-                       case 's':       goto yy60;
-                       case 'T':
-                       case 't':       goto yy61;
-                       case 'U':
-                       case 'u':       goto yy62;
-                       case 'V':
-                       case 'v':       goto yy63;
+                       case 'r':       goto yy69;
+                       case 'S':       goto yy70;
+                       case 'T':       goto yy71;
+                       case 'U':       goto yy72;
+                       case 'W':
+                       case 'w':       goto yy73;
                        case 'Z':
-                       case 'z':       goto yy64;
-                       case '[':       goto yy65;
-                       case '\\':      goto yy67;
-                       case ']':       goto yy68;
-                       case '^':       goto yy70;
-                       case '{':       goto yy72;
-                       case '|':       goto yy74;
-                       case '}':       goto yy76;
-                       case '~':       goto yy78;
-                       default:        goto yy2;
+                       case 'z':       goto yy74;
+                       case '[':       goto yy75;
+                       case '\\':      goto yy77;
+                       case ']':       goto yy79;
+                       case '^':       goto yy81;
+                       case '_':       goto yy83;
+                       case 'b':       goto yy84;
+                       case 'c':       goto yy85;
+                       case 'd':       goto yy86;
+                       case 'e':       goto yy87;
+                       case 'f':       goto yy88;
+                       case 'i':       goto yy89;
+                       case 'l':       goto yy90;
+                       case 'p':       goto yy91;
+                       case 's':       goto yy92;
+                       case 't':       goto yy93;
+                       case 'u':       goto yy94;
+                       case 'v':       goto yy95;
+                       case '{':       goto yy96;
+                       case '|':       goto yy98;
+                       case '}':       goto yy100;
+                       case '~':       goto yy102;
+                       default:        goto yy61;
                        }
 yy2:
-                       ++P->cur;
+                       ++cur;
 yy3:
-#line 336 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {break;}
-#line 342 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 513 "src/parser.re"
+                       { NEWTOKEN(-2); goto error; }
+#line 475 "src/parser.c"
 yy4:
-                       ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
-                       yych = *P->cur;
+                       ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
                        switch (yych) {
                        case '\t':
+                       case '\f':
                        case ' ':       goto yy4;
                        default:        goto yy6;
                        }
 yy6:
-#line 273 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       { continue; }
-#line 355 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 512 "src/parser.re"
+                       { NEWTOKEN(PSI_T_WHITESPACE); goto start; }
+#line 489 "src/parser.c"
 yy7:
-                       ++P->cur;
-#line 272 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       { NEWLINE(nextline); }
-#line 360 "/home/mike/src/php-master/ext/psi/src/parser.c"
+                       ++cur;
+#line 511 "src/parser.re"
+                       { NEWTOKEN(PSI_T_EOL); NEWLINE(); goto start; }
+#line 494 "src/parser.c"
 yy9:
-                       ++P->cur;
-#line 261 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_NOT);}
-#line 365 "/home/mike/src/php-master/ext/psi/src/parser.c"
+                       yych = *++cur;
+                       switch (yych) {
+                       case '=':       goto yy104;
+                       default:        goto yy10;
+                       }
+yy10:
+#line 414 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NOT); goto start; }
+#line 504 "src/parser.c"
 yy11:
-                       yyaccept = 0;
-                       yych = *(P->mrk = ++P->cur);
+                       ++cur;
+#line 387 "src/parser.re"
+                       { escaped = false; tok += 1; goto string; }
+#line 509 "src/parser.c"
+yy13:
+                       yych = *++cur;
+                       switch (yych) {
+                       case '#':       goto yy106;
+                       default:        goto yy14;
+                       }
+yy14:
+#line 397 "src/parser.re"
+                       { NEWTOKEN(PSI_T_HASH); goto start; }
+#line 519 "src/parser.c"
+yy15:
+                       yych = *++cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case '\\':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy3;
+                       default:        goto yy108;
+                       }
+yy16:
+                       ++cur;
+#line 415 "src/parser.re"
+                       { NEWTOKEN(PSI_T_MODULO); goto start; }
+#line 594 "src/parser.c"
+yy18:
+                       yych = *++cur;
                        switch (yych) {
-                       case '"':       goto yy3;
-                       default:        goto yy80;
+                       case '&':       goto yy111;
+                       default:        goto yy19;
                        }
-yy12:
+yy19:
+#line 416 "src/parser.re"
+                       { NEWTOKEN(PSI_T_AMPERSAND); goto start; }
+#line 604 "src/parser.c"
+yy20:
+                       ++cur;
+#line 386 "src/parser.re"
+                       { escaped = false; tok += 1; goto character; }
+#line 609 "src/parser.c"
+yy22:
+                       ++cur;
+#line 398 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LPAREN); goto start; }
+#line 614 "src/parser.c"
+yy24:
+                       ++cur;
+#line 399 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RPAREN); goto start; }
+#line 619 "src/parser.c"
+yy26:
+                       ++cur;
+#line 412 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ASTERISK); goto start; }
+#line 624 "src/parser.c"
+yy28:
                        yyaccept = 0;
-                       yych = *(P->mrk = ++P->cur);
-                       goto yy83;
-yy13:
-                       yych = *++P->cur;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '.':       goto yy113;
+                       case '0':       goto yy38;
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':       goto yy40;
+                       default:        goto yy29;
+                       }
+yy29:
+#line 417 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PLUS); goto start; }
+#line 645 "src/parser.c"
+yy30:
+                       ++cur;
+#line 401 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COMMA); goto start; }
+#line 650 "src/parser.c"
+yy32:
+                       yyaccept = 1;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '.':       goto yy113;
+                       case '0':       goto yy38;
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':       goto yy40;
+                       default:        goto yy33;
+                       }
+yy33:
+#line 418 "src/parser.re"
+                       { NEWTOKEN(PSI_T_MINUS); goto start; }
+#line 671 "src/parser.c"
+yy34:
+                       yyaccept = 2;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '.':       goto yy115;
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':       goto yy116;
+                       default:        goto yy35;
+                       }
+yy35:
+#line 429 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PERIOD); goto start; }
+#line 692 "src/parser.c"
+yy36:
+                       yych = *++cur;
+                       switch (yych) {
+                       case '*':       goto yy119;
+                       case '/':       goto yy121;
+                       default:        goto yy37;
+                       }
+yy37:
+#line 419 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SLASH); goto start; }
+#line 703 "src/parser.c"
+yy38:
+                       yyaccept = 3;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '.':       goto yy123;
+                       case 'E':
+                       case 'e':       goto yy127;
+                       case 'X':
+                       case 'x':       goto yy132;
+                       default:        goto yy126;
+                       }
+yy39:
+#line 373 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT; goto start; }
+#line 718 "src/parser.c"
+yy40:
+                       yyaccept = 3;
+                       mrk = ++cur;
+                       if ((lim - cur) < 3) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case '.':       goto yy123;
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':       goto yy40;
+                       case 'E':
+                       case 'e':       goto yy127;
+                       case 'L':
+                       case 'l':       goto yy128;
+                       case 'U':
+                       case 'u':       goto yy130;
+                       default:        goto yy39;
+                       }
+yy42:
+                       ++cur;
+#line 402 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COLON); goto start; }
+#line 748 "src/parser.c"
+yy44:
+                       ++cur;
+#line 400 "src/parser.re"
+                       { NEWTOKEN(PSI_T_EOS); goto start; }
+#line 753 "src/parser.c"
+yy46:
+                       yyaccept = 4;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
+                       case '-':
+                       case '.':
+                       case '/':
                        case '0':
                        case '1':
                        case '2':
@@ -438,531 +819,351 @@ yy13:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy86;
-                       default:        goto yy3;
+                       case 'z':       goto yy133;
+                       case '<':       goto yy135;
+                       case '=':       goto yy137;
+                       default:        goto yy47;
                        }
-yy14:
-                       ++P->cur;
-#line 262 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_MODULO);}
-#line 449 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy16:
-                       ++P->cur;
-#line 263 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_AMPERSAND);}
-#line 454 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy18:
-                       ++P->cur;
-#line 249 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LPAREN);}
-#line 459 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy20:
-                       ++P->cur;
-#line 250 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_RPAREN);}
-#line 464 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy22:
-                       ++P->cur;
-#line 259 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_ASTERISK);}
-#line 469 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy24:
-                       yyaccept = 1;
-                       yych = *(P->mrk = ++P->cur);
+yy47:
+#line 427 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LCHEVR); goto start; }
+#line 831 "src/parser.c"
+yy48:
+                       yych = *++cur;
                        switch (yych) {
-                       case '.':       goto yy89;
-                       case '0':
-                       case '1':
-                       case '2':
-                       case '3':
-                       case '4':
-                       case '5':
-                       case '6':
-                       case '7':
-                       case '8':
-                       case '9':       goto yy33;
-                       default:        goto yy25;
+                       case '=':       goto yy139;
+                       default:        goto yy49;
                        }
-yy25:
-#line 264 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_PLUS);}
-#line 490 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy26:
-                       ++P->cur;
-#line 252 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_COMMA);}
-#line 495 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy28:
-                       yyaccept = 2;
-                       yych = *(P->mrk = ++P->cur);
+yy49:
+#line 411 "src/parser.re"
+                       { NEWTOKEN(PSI_T_EQUALS); goto start; }
+#line 841 "src/parser.c"
+yy50:
+                       yych = *++cur;
                        switch (yych) {
-                       case '.':       goto yy89;
-                       case '0':
-                       case '1':
-                       case '2':
-                       case '3':
-                       case '4':
-                       case '5':
-                       case '6':
-                       case '7':
-                       case '8':
-                       case '9':       goto yy33;
-                       default:        goto yy29;
+                       case '=':       goto yy141;
+                       case '>':       goto yy143;
+                       default:        goto yy51;
                        }
-yy29:
-#line 265 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_MINUS);}
-#line 516 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy30:
-                       yyaccept = 0;
-                       yych = *(P->mrk = ++P->cur);
+yy51:
+#line 428 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RCHEVR); goto start; }
+#line 852 "src/parser.c"
+yy52:
+                       ++cur;
+#line 431 "src/parser.re"
+                       { NEWTOKEN(PSI_T_IIF); goto start; }
+#line 857 "src/parser.c"
+yy54:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '.':       goto yy91;
-                       case '0':
-                       case '1':
-                       case '2':
-                       case '3':
-                       case '4':
-                       case '5':
-                       case '6':
-                       case '7':
-                       case '8':
-                       case '9':       goto yy92;
-                       default:        goto yy3;
+                       case 'R':
+                       case 'r':       goto yy145;
+                       case 'S':
+                       case 's':       goto yy146;
+                       default:        goto yy62;
                        }
-yy31:
-                       yyaccept = 3;
-                       yych = *(P->mrk = ++P->cur);
+yy55:
+#line 506 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NAME); goto start; }
+#line 871 "src/parser.c"
+yy56:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '*':       goto yy94;
-                       case '/':       goto yy82;
-                       default:        goto yy32;
+                       case 'O':
+                       case 'o':       goto yy149;
+                       default:        goto yy62;
                        }
-yy32:
-#line 266 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_SLASH);}
-#line 545 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy33:
-                       yyaccept = 4;
-                       P->mrk = ++P->cur;
-                       if ((P->lim - P->cur) < 3) { if (!psi_parser_fill(P,3)) RETURN(PSI_T_EOF); };
-                       yych = *P->cur;
-                       switch (yych) {
-                       case '.':       goto yy89;
-                       case '0':
-                       case '1':
-                       case '2':
-                       case '3':
-                       case '4':
-                       case '5':
-                       case '6':
-                       case '7':
-                       case '8':
-                       case '9':       goto yy33;
-                       case 'E':
-                       case 'e':       goto yy96;
-                       default:        goto yy35;
-                       }
-yy35:
-#line 331 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_NUMBER);}
-#line 570 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy36:
-                       ++P->cur;
-#line 253 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_COLON);}
-#line 575 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy38:
-                       ++P->cur;
-#line 251 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_EOS);}
-#line 580 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy40:
-                       yych = *++P->cur;
-                       switch (yych) {
-                       case '<':       goto yy97;
-                       default:        goto yy3;
-                       }
-yy41:
-                       ++P->cur;
-#line 258 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_EQUALS);}
-#line 591 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy43:
-                       yych = *++P->cur;
-                       switch (yych) {
-                       case '>':       goto yy99;
-                       default:        goto yy3;
-                       }
-yy44:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy101;
-                       default:        goto yy52;
-                       }
-yy45:
-#line 332 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_NAME);}
-#line 609 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy46:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy103;
-                       default:        goto yy52;
-                       }
-yy47:
+yy57:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy104;
-                       case 'H':
-                       case 'h':       goto yy105;
+                       case 'a':       goto yy150;
                        case 'O':
-                       case 'o':       goto yy106;
-                       default:        goto yy52;
+                       case 'o':       goto yy151;
+                       default:        goto yy62;
                        }
-yy48:
+yy58:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy107;
-                       default:        goto yy52;
+                       case 'E':
+                       case 'e':       goto yy152;
+                       default:        goto yy62;
                        }
-yy49:
+yy59:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy153;
                        case 'N':
-                       case 'n':       goto yy108;
-                       default:        goto yy52;
+                       case 'n':       goto yy154;
+                       case 'R':
+                       case 'r':       goto yy155;
+                       default:        goto yy62;
                        }
-yy50:
+yy60:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy109;
+                       case 'a':       goto yy156;
                        case 'L':
-                       case 'l':       goto yy110;
+                       case 'l':       goto yy157;
                        case 'R':
-                       case 'r':       goto yy111;
+                       case 'r':       goto yy158;
                        case 'U':
-                       case 'u':       goto yy112;
-                       default:        goto yy52;
+                       case 'u':       goto yy159;
+                       default:        goto yy62;
                        }
-yy51:
+yy61:
                        yyaccept = 5;
-                       P->mrk = ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
-                       yych = *P->cur;
-yy52:
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+yy62:
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy45;
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy55;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
                        }
-yy53:
+yy63:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
+                       case 'F':
+                       case 'f':       goto yy160;
                        case 'N':
-                       case 'n':       goto yy113;
-                       default:        goto yy52;
+                       case 'n':       goto yy162;
+                       default:        goto yy62;
                        }
-yy54:
+yy64:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
+                       case '"':
+                       case '\'':      goto yy163;
                        case 'E':
-                       case 'e':       goto yy114;
+                       case 'e':       goto yy165;
                        case 'I':
-                       case 'i':       goto yy115;
-                       case 'O':
-                       case 'o':       goto yy116;
-                       default:        goto yy52;
+                       case 'i':       goto yy166;
+                       default:        goto yy62;
                        }
-yy55:
+yy65:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy117;
-                       default:        goto yy52;
+                       case 'i':       goto yy167;
+                       default:        goto yy62;
                        }
-yy56:
+yy66:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy118;
-                       default:        goto yy52;
+                       case 'u':       goto yy168;
+                       default:        goto yy62;
                        }
-yy57:
+yy67:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy119;
-                       default:        goto yy52;
+                       case 'b':       goto yy169;
+                       default:        goto yy62;
                        }
-yy58:
+yy68:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy120;
-                       default:        goto yy52;
+                       case 'a':       goto yy170;
+                       case 'O':
+                       case 'o':       goto yy171;
+                       case 'R':
+                       case 'r':       goto yy172;
+                       default:        goto yy62;
                        }
-yy59:
+yy69:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy121;
-                       default:        goto yy52;
+                       case 'e':       goto yy173;
+                       default:        goto yy62;
                        }
-yy60:
+yy70:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy122;
-                       case 'H':
-                       case 'h':       goto yy123;
-                       case 'I':
-                       case 'i':       goto yy124;
+                       case 'e':       goto yy174;
                        case 'T':
-                       case 't':       goto yy125;
-                       default:        goto yy52;
+                       case 't':       goto yy175;
+                       default:        goto yy62;
                        }
-yy61:
+yy71:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy126;
+                       case 'e':       goto yy176;
                        case 'O':
-                       case 'o':       goto yy127;
+                       case 'o':       goto yy177;
                        case 'R':
-                       case 'r':       goto yy128;
-                       case 'Y':
-                       case 'y':       goto yy129;
-                       default:        goto yy52;
+                       case 'r':       goto yy178;
+                       default:        goto yy62;
                        }
-yy62:
+yy72:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy130;
+                       case '"':
+                       case '\'':      goto yy179;
                        case 'N':
-                       case 'n':       goto yy131;
-                       default:        goto yy52;
-                       }
-yy63:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy132;
-                       default:        goto yy52;
+                       case 'n':       goto yy181;
+                       default:        goto yy62;
                        }
-yy64:
+yy73:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'V':
-                       case 'v':       goto yy133;
-                       default:        goto yy52;
-                       }
-yy65:
-                       ++P->cur;
-#line 256 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LBRACKET);}
-#line 851 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy67:
-                       yych = *++P->cur;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        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 yy134;
-                       default:        goto yy3;
+                       case 'a':       goto yy182;
+                       default:        goto yy62;
                        }
-yy68:
-                       ++P->cur;
-#line 257 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_RBRACKET);}
-#line 914 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy70:
-                       ++P->cur;
-#line 268 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CARET);}
-#line 919 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy72:
-                       ++P->cur;
-#line 254 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LBRACE);}
-#line 924 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy74:
-                       ++P->cur;
-#line 267 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_PIPE);}
-#line 929 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy76:
-                       ++P->cur;
-#line 255 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_RBRACE);}
-#line 934 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy78:
-                       ++P->cur;
-#line 260 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TILDE);}
-#line 939 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy80:
-                       ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
-                       yych = *P->cur;
-                       switch (yych) {
-                       case '"':       goto yy137;
-                       default:        goto yy80;
-                       }
-yy82:
-                       ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
-                       yych = *P->cur;
-yy83:
-                       switch (yych) {
-                       case '\n':      goto yy84;
-                       default:        goto yy82;
-                       }
-yy84:
-                       ++P->cur;
-#line 248 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       { NEWLINE(nextline); }
-#line 961 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy86:
-                       ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
-                       yych = *P->cur;
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
+                       case 'V':
+                       case 'v':       goto yy183;
+                       default:        goto yy62;
+                       }
+yy75:
+                       ++cur;
+#line 405 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LBRACKET); goto start; }
+#line 1116 "src/parser.c"
+yy77:
+                       yych = *++cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
                        case '0':
                        case '1':
                        case '2':
@@ -973,67 +1174,294 @@ yy86:
                        case '7':
                        case '8':
                        case '9':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case '\\':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy78;
+                       default:        goto yy184;
+                       }
+yy78:
+#line 420 "src/parser.re"
+                       { NEWTOKEN(PSI_T_BSLASH); goto start; }
+#line 1200 "src/parser.c"
+yy79:
+                       ++cur;
+#line 406 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RBRACKET); goto start; }
+#line 1205 "src/parser.c"
+yy81:
+                       ++cur;
+#line 422 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CARET); goto start; }
+#line 1210 "src/parser.c"
+yy83:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy187;
+                       default:        goto yy62;
+                       }
+yy84:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'O':       goto yy149;
+                       case 'o':       goto yy188;
+                       default:        goto yy62;
+                       }
+yy85:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'A':
-                       case 'B':
-                       case 'C':
-                       case 'D':
+                       case 'a':       goto yy150;
+                       case 'O':       goto yy151;
+                       case 'h':       goto yy189;
+                       case 'o':       goto yy190;
+                       default:        goto yy62;
+                       }
+yy86:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'E':
-                       case 'F':
-                       case 'G':
-                       case 'H':
-                       case 'I':
-                       case 'J':
-                       case 'K':
+                       case 'e':       goto yy152;
+                       case 'o':       goto yy191;
+                       default:        goto yy62;
+                       }
+yy87:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'L':
-                       case 'M':
-                       case 'N':
-                       case 'O':
-                       case 'P':
-                       case 'Q':
+                       case 'l':       goto yy153;
+                       case 'N':       goto yy154;
                        case 'R':
-                       case 'S':
-                       case 'T':
+                       case 'r':       goto yy155;
+                       case 'n':       goto yy192;
+                       default:        goto yy62;
+                       }
+yy88:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy156;
+                       case 'L':       goto yy157;
+                       case 'R':
+                       case 'r':       goto yy158;
                        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 yy86;
-                       default:        goto yy88;
+                       case 'u':       goto yy159;
+                       case 'l':       goto yy193;
+                       default:        goto yy62;
                        }
-yy88:
-#line 334 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_DOLLAR_NAME);}
-#line 1035 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy89:
-                       yych = *++P->cur;
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'F':
+                       case 'f':       goto yy160;
+                       case 'N':       goto yy162;
+                       case 'n':       goto yy194;
+                       default:        goto yy62;
+                       }
+yy90:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy165;
+                       case 'I':       goto yy166;
+                       case 'i':       goto yy195;
+                       case 'o':       goto yy196;
+                       default:        goto yy62;
+                       }
+yy91:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy170;
+                       case 'O':
+                       case 'o':       goto yy171;
+                       case 'R':       goto yy172;
+                       case 'r':       goto yy197;
+                       default:        goto yy62;
+                       }
+yy92:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy174;
+                       case 'T':       goto yy175;
+                       case 'h':       goto yy198;
+                       case 'i':       goto yy199;
+                       case 't':       goto yy200;
+                       default:        goto yy62;
+                       }
+yy93:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy176;
+                       case 'O':
+                       case 'o':       goto yy177;
+                       case 'R':
+                       case 'r':       goto yy178;
+                       case 'y':       goto yy201;
+                       default:        goto yy62;
+                       }
+yy94:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '"':
+                       case '\'':      goto yy202;
+                       case '8':       goto yy204;
+                       case 'N':       goto yy181;
+                       case 'n':       goto yy205;
+                       default:        goto yy62;
+                       }
+yy95:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'o':       goto yy206;
+                       default:        goto yy62;
+                       }
+yy96:
+                       ++cur;
+#line 403 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LBRACE); goto start; }
+#line 1352 "src/parser.c"
+yy98:
+                       yych = *++cur;
+                       switch (yych) {
+                       case '|':       goto yy207;
+                       default:        goto yy99;
+                       }
+yy99:
+#line 421 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PIPE); goto start; }
+#line 1362 "src/parser.c"
+yy100:
+                       ++cur;
+#line 404 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RBRACE); goto start; }
+#line 1367 "src/parser.c"
+yy102:
+                       ++cur;
+#line 413 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TILDE); goto start; }
+#line 1372 "src/parser.c"
+yy104:
+                       ++cur;
+#line 407 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CMP_NE); goto start; }
+#line 1377 "src/parser.c"
+yy106:
+                       ++cur;
+#line 396 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_PASTE); goto start; }
+#line 1382 "src/parser.c"
+yy108:
+                       ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case '\\':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy110;
+                       default:        goto yy108;
+                       }
+yy110:
+#line 508 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DOLLAR_NAME); goto start; }
+#line 1458 "src/parser.c"
+yy111:
+                       ++cur;
+#line 409 "src/parser.re"
+                       { NEWTOKEN(PSI_T_AND); goto start; }
+#line 1463 "src/parser.c"
+yy113:
+                       yych = *++cur;
                        switch (yych) {
                        case '0':
                        case '1':
@@ -1044,88 +1472,107 @@ yy89:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy92;
-                       default:        goto yy90;
+                       case '9':       goto yy116;
+                       default:        goto yy114;
                        }
-yy90:
-                       P->cur = P->mrk;
+yy114:
+                       cur = 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 yy45;
-                       case 6:         goto yy136;
-                       case 7:         goto yy157;
-                       case 8:         goto yy159;
+                       case 0:         goto yy29;
+                       case 1:         goto yy33;
+                       case 2:         goto yy35;
+                       case 3:         goto yy39;
+                       case 4:         goto yy47;
+                       case 5:         goto yy55;
+                       case 6:         goto yy118;
+                       case 7:         goto yy129;
+                       case 8:         goto yy147;
                        case 9:         goto yy161;
-                       case 10:        goto yy169;
-                       case 11:        goto yy186;
-                       case 12:        goto yy189;
-                       case 13:        goto yy194;
-                       case 14:        goto yy198;
-                       case 15:        goto yy206;
-                       case 16:        goto yy209;
-                       case 17:        goto yy222;
-                       case 18:        goto yy230;
-                       case 19:        goto yy236;
-                       case 20:        goto yy238;
-                       case 21:        goto yy240;
-                       case 22:        goto yy247;
-                       case 23:        goto yy249;
-                       case 24:        goto yy252;
-                       case 25:        goto yy254;
-                       case 26:        goto yy262;
-                       case 27:        goto yy268;
-                       case 28:        goto yy287;
-                       case 29:        goto yy290;
-                       case 30:        goto yy295;
-                       case 31:        goto yy297;
-                       case 32:        goto yy304;
-                       case 33:        goto yy306;
-                       case 34:        goto yy308;
-                       case 35:        goto yy310;
-                       case 36:        goto yy313;
-                       case 37:        goto yy315;
-                       case 38:        goto yy317;
-                       case 39:        goto yy319;
-                       case 40:        goto yy321;
-                       case 41:        goto yy323;
-                       case 42:        goto yy325;
-                       case 43:        goto yy330;
-                       case 44:        goto yy340;
-                       case 45:        goto yy346;
-                       case 46:        goto yy348;
-                       case 47:        goto yy350;
-                       case 48:        goto yy352;
-                       case 49:        goto yy355;
-                       case 50:        goto yy360;
-                       case 51:        goto yy365;
-                       case 52:        goto yy368;
-                       case 53:        goto yy370;
-                       case 54:        goto yy372;
-                       case 55:        goto yy374;
-                       case 56:        goto yy376;
-                       case 57:        goto yy378;
-                       case 58:        goto yy382;
-                       case 59:        goto yy384;
-                       case 60:        goto yy386;
-                       case 61:        goto yy388;
-                       case 62:        goto yy390;
-                       default:        goto yy392;
+                       case 10:        goto yy186;
+                       case 11:        goto yy242;
+                       case 12:        goto yy244;
+                       case 13:        goto yy253;
+                       case 14:        goto yy273;
+                       case 15:        goto yy305;
+                       case 16:        goto yy307;
+                       case 17:        goto yy313;
+                       case 18:        goto yy321;
+                       case 19:        goto yy333;
+                       case 20:        goto yy341;
+                       case 21:        goto yy345;
+                       case 22:        goto yy352;
+                       case 23:        goto yy354;
+                       case 24:        goto yy358;
+                       case 25:        goto yy361;
+                       case 26:        goto yy363;
+                       case 27:        goto yy373;
+                       case 28:        goto yy376;
+                       case 29:        goto yy383;
+                       case 30:        goto yy386;
+                       case 31:        goto yy388;
+                       case 32:        goto yy390;
+                       case 33:        goto yy394;
+                       case 34:        goto yy399;
+                       case 35:        goto yy417;
+                       case 36:        goto yy425;
+                       case 37:        goto yy428;
+                       case 38:        goto yy431;
+                       case 39:        goto yy437;
+                       case 40:        goto yy441;
+                       case 41:        goto yy446;
+                       case 42:        goto yy448;
+                       case 43:        goto yy452;
+                       case 44:        goto yy455;
+                       case 45:        goto yy457;
+                       case 46:        goto yy459;
+                       case 47:        goto yy464;
+                       case 48:        goto yy466;
+                       case 49:        goto yy468;
+                       case 50:        goto yy470;
+                       case 51:        goto yy472;
+                       case 52:        goto yy477;
+                       case 53:        goto yy487;
+                       case 54:        goto yy489;
+                       case 55:        goto yy491;
+                       case 56:        goto yy493;
+                       case 57:        goto yy495;
+                       case 58:        goto yy500;
+                       case 59:        goto yy504;
+                       case 60:        goto yy508;
+                       case 61:        goto yy510;
+                       case 62:        goto yy515;
+                       case 63:        goto yy520;
+                       case 64:        goto yy522;
+                       case 65:        goto yy530;
+                       case 66:        goto yy534;
+                       case 67:        goto yy536;
+                       case 68:        goto yy538;
+                       case 69:        goto yy540;
+                       case 70:        goto yy545;
+                       case 71:        goto yy547;
+                       case 72:        goto yy553;
+                       case 73:        goto yy558;
+                       case 74:        goto yy560;
+                       case 75:        goto yy565;
+                       case 76:        goto yy567;
+                       case 77:        goto yy575;
+                       case 78:        goto yy579;
+                       case 79:        goto yy583;
+                       case 80:        goto yy587;
+                       case 81:        goto yy589;
+                       default:        goto yy594;
                        }
-yy91:
-                       yych = *++P->cur;
+yy115:
+                       yych = *++cur;
                        switch (yych) {
-                       case '.':       goto yy139;
-                       default:        goto yy90;
+                       case '.':       goto yy209;
+                       default:        goto yy114;
                        }
-yy92:
-                       yyaccept = 4;
-                       P->mrk = ++P->cur;
-                       if ((P->lim - P->cur) < 3) { if (!psi_parser_fill(P,3)) RETURN(PSI_T_EOF); };
-                       yych = *P->cur;
+yy116:
+                       yyaccept = 6;
+                       mrk = ++cur;
+                       if ((lim - cur) < 2) if (cur >= lim) goto done;;
+                       yych = *cur;
                        switch (yych) {
                        case '0':
                        case '1':
@@ -1136,21 +1583,80 @@ yy92:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy92;
-                       case 'E':
-                       case 'e':       goto yy96;
-                       default:        goto yy35;
+                       case '9':       goto yy116;
+                       case 'D':
+                       case 'd':       goto yy211;
+                       case 'F':
+                       case 'f':       goto yy212;
+                       case 'L':
+                       case 'l':       goto yy214;
+                       default:        goto yy118;
                        }
-yy94:
-                       ++P->cur;
-#line 247 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy118:
+#line 379 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT; goto start; }
+#line 1599 "src/parser.c"
+yy119:
+                       ++cur;
+#line 393 "src/parser.re"
                        { goto comment; }
-#line 1149 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy96:
-                       yych = *++P->cur;
+#line 1604 "src/parser.c"
+yy121:
+                       ++cur;
+#line 394 "src/parser.re"
+                       { goto comment_sl; }
+#line 1609 "src/parser.c"
+yy123:
+                       yyaccept = 6;
+                       mrk = ++cur;
+                       if ((lim - cur) < 3) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':       goto yy123;
+                       case 'D':
+                       case 'd':       goto yy211;
+                       case 'E':
+                       case 'e':       goto yy127;
+                       case 'F':
+                       case 'f':       goto yy212;
+                       case 'L':
+                       case 'l':       goto yy214;
+                       default:        goto yy118;
+                       }
+yy125:
+                       ++cur;
+                       if ((lim - cur) < 3) if (cur >= lim) goto done;;
+                       yych = *cur;
+yy126:
+                       switch (yych) {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':       goto yy125;
+                       case 'L':
+                       case 'l':       goto yy128;
+                       case 'U':
+                       case 'u':       goto yy130;
+                       default:        goto yy39;
+                       }
+yy127:
+                       yych = *++cur;
                        switch (yych) {
                        case '+':
-                       case '-':       goto yy141;
+                       case '-':       goto yy113;
                        case '0':
                        case '1':
                        case '2':
@@ -1160,32 +1666,81 @@ yy96:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy142;
-                       default:        goto yy90;
-                       }
-yy97:
-                       ++P->cur;
-#line 269 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LSHIFT);}
-#line 1171 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy99:
-                       ++P->cur;
-#line 270 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_RSHIFT);}
-#line 1176 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy101:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       case '9':       goto yy116;
+                       default:        goto yy114;
+                       }
+yy128:
+                       yyaccept = 7;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy144;
-                       default:        goto yy52;
+                       case 'L':
+                       case 'l':       goto yy216;
+                       case 'U':
+                       case 'u':       goto yy217;
+                       default:        goto yy129;
                        }
-yy102:
-                       ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
-                       yych = *P->cur;
+yy129:
+                       cur -= 1;
+#line 375 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_L; cur += 1; goto start; }
+#line 1687 "src/parser.c"
+yy130:
+                       yych = *++cur;
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy219;
+                       default:        goto yy131;
+                       }
+yy131:
+                       cur -= 1;
+#line 374 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_U; cur += 1; goto start; }
+#line 1699 "src/parser.c"
+yy132:
+                       yych = *++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 'a':
+                       case 'b':
+                       case 'c':
+                       case 'd':
+                       case 'e':
+                       case 'f':       goto yy220;
+                       default:        goto yy114;
+                       }
+yy133:
+                       ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
                        switch (yych) {
+                       case '-':
+                       case '.':
+                       case '/':
+                       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':
@@ -1238,487 +1793,831 @@ yy102:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy134;
-                       default:        goto yy90;
+                       case 'z':       goto yy133;
+                       case '>':       goto yy222;
+                       default:        goto yy114;
+                       }
+yy135:
+                       ++cur;
+#line 423 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LSHIFT); goto start; }
+#line 1805 "src/parser.c"
+yy137:
+                       ++cur;
+#line 425 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CMP_LE); goto start; }
+#line 1810 "src/parser.c"
+yy139:
+                       ++cur;
+#line 408 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CMP_EQ); goto start; }
+#line 1815 "src/parser.c"
+yy141:
+                       ++cur;
+#line 426 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CMP_GE); goto start; }
+#line 1820 "src/parser.c"
+yy143:
+                       ++cur;
+#line 424 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RSHIFT); goto start; }
+#line 1825 "src/parser.c"
+yy145:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy224;
+                       default:        goto yy62;
+                       }
+yy146:
+                       yyaccept = 8;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy147;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy147:
+#line 486 "src/parser.re"
+                       { NEWTOKEN(PSI_T_AS); goto start; }
+#line 1908 "src/parser.c"
+yy148:
+                       ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case '\\':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy114;
+                       default:        goto yy184;
                        }
-yy103:
+yy149:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy145;
-                       default:        goto yy52;
+                       case 'o':       goto yy225;
+                       default:        goto yy62;
                        }
-yy104:
+yy150:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy146;
-                       default:        goto yy52;
+                       case 'l':       goto yy226;
+                       default:        goto yy62;
                        }
-yy105:
+yy151:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy147;
-                       default:        goto yy52;
+                       case 'U':
+                       case 'u':       goto yy227;
+                       default:        goto yy62;
                        }
-yy106:
+yy152:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy148;
-                       case 'U':
-                       case 'u':       goto yy149;
-                       default:        goto yy52;
+                       case 'F':
+                       case 'f':       goto yy228;
+                       default:        goto yy62;
                        }
-yy107:
+yy153:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy150;
-                       default:        goto yy52;
+                       case 'I':
+                       case 'i':       goto yy229;
+                       case 'S':
+                       case 's':       goto yy230;
+                       default:        goto yy62;
                        }
-yy108:
+yy154:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy151;
-                       default:        goto yy52;
+                       case 'D':
+                       case 'd':       goto yy231;
+                       default:        goto yy62;
+                       }
+yy155:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'R':
+                       case 'r':       goto yy232;
+                       default:        goto yy62;
                        }
-yy109:
+yy156:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy152;
-                       default:        goto yy52;
+                       case 'l':       goto yy233;
+                       default:        goto yy62;
                        }
-yy110:
+yy157:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy153;
-                       default:        goto yy52;
+                       case 'o':       goto yy234;
+                       default:        goto yy62;
                        }
-yy111:
+yy158:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy154;
-                       default:        goto yy52;
+                       case 'e':       goto yy235;
+                       default:        goto yy62;
                        }
-yy112:
+yy159:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy155;
-                       default:        goto yy52;
+                       case 'n':       goto yy236;
+                       default:        goto yy62;
                        }
-yy113:
+yy160:
+                       yyaccept = 9;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy161;
+                       case 'D':
+                       case 'd':       goto yy237;
+                       case 'N':
+                       case 'n':       goto yy238;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy161:
+#line 456 "src/parser.re"
+                       { NEWTOKEN(PSI_T_IF); goto start; }
+#line 2159 "src/parser.c"
+yy162:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
+                       case 'C':
+                       case 'c':       goto yy239;
                        case 'T':
-                       case 't':       goto yy156;
-                       default:        goto yy52;
+                       case 't':       goto yy240;
+                       default:        goto yy62;
                        }
-yy114:
+yy163:
+                       ++cur;
+                       cur -= 1;
+#line 391 "src/parser.re"
+                       { char_width = sizeof(wchar_t)/8; }
+#line 2175 "src/parser.c"
+yy165:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy158;
-                       default:        goto yy52;
+                       case 't':       goto yy241;
+                       default:        goto yy62;
                        }
-yy115:
+yy166:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy160;
-                       default:        goto yy52;
+                       case 'b':       goto yy243;
+                       default:        goto yy62;
                        }
-yy116:
+yy167:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy162;
-                       default:        goto yy52;
-                       }
-yy117:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'X':
-                       case 'x':       goto yy163;
-                       default:        goto yy52;
+                       case 'x':       goto yy245;
+                       default:        goto yy62;
                        }
-yy118:
+yy168:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy164;
-                       default:        goto yy52;
+                       case 'l':       goto yy246;
+                       default:        goto yy62;
                        }
-yy119:
+yy169:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy165;
-                       default:        goto yy52;
+                       case 'j':       goto yy247;
+                       default:        goto yy62;
                        }
-yy120:
+yy170:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy166;
-                       default:        goto yy52;
+                       case 't':       goto yy248;
+                       default:        goto yy62;
                        }
-yy121:
+yy171:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy167;
-                       default:        goto yy52;
+                       case 'S':
+                       case 's':       goto yy249;
+                       default:        goto yy62;
                        }
-yy122:
+yy172:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy168;
-                       default:        goto yy52;
+                       case 'E':
+                       case 'e':       goto yy250;
+                       default:        goto yy62;
                        }
-yy123:
+yy173:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy170;
-                       default:        goto yy52;
+                       case 'T':
+                       case 't':       goto yy251;
+                       default:        goto yy62;
                        }
-yy124:
+yy174:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy171;
-                       default:        goto yy52;
+                       case 'T':
+                       case 't':       goto yy252;
+                       default:        goto yy62;
                        }
-yy125:
+yy175:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy172;
+                       case 'a':       goto yy254;
                        case 'R':
-                       case 'r':       goto yy173;
-                       default:        goto yy52;
+                       case 'r':       goto yy255;
+                       default:        goto yy62;
                        }
-yy126:
+yy176:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'M':
-                       case 'm':       goto yy174;
-                       default:        goto yy52;
+                       case 'm':       goto yy256;
+                       default:        goto yy62;
                        }
-yy127:
+yy177:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy175;
-                       default:        goto yy52;
+                       case '_':       goto yy257;
+                       default:        goto yy62;
                        }
-yy128:
+yy178:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy176;
-                       default:        goto yy52;
+                       case 'u':       goto yy258;
+                       default:        goto yy62;
                        }
-yy129:
+yy179:
+                       ++cur;
+                       cur -= 1;
+#line 390 "src/parser.re"
+                       { char_width = 4; }
+#line 2294 "src/parser.c"
+yy181:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'P':
-                       case 'p':       goto yy177;
-                       default:        goto yy52;
+                       case 'D':
+                       case 'd':       goto yy259;
+                       default:        goto yy62;
                        }
-yy130:
+yy182:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy178;
-                       default:        goto yy52;
+                       case 'R':
+                       case 'r':       goto yy260;
+                       default:        goto yy62;
                        }
-yy131:
+yy183:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy179;
-                       case 'S':
-                       case 's':       goto yy180;
-                       default:        goto yy52;
+                       case 'A':
+                       case 'a':       goto yy261;
+                       default:        goto yy62;
                        }
-yy132:
+yy184:
+                       yyaccept = 10;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy186;
+                       case '\\':      goto yy148;
+                       default:        goto yy184;
+                       }
+yy186:
+#line 507 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NSNAME); goto start; }
+#line 2395 "src/parser.c"
+yy187:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy181;
-                       default:        goto yy52;
+                       case 'a':       goto yy262;
+                       case 'e':       goto yy263;
+                       case 'i':       goto yy264;
+                       case 'r':       goto yy265;
+                       default:        goto yy62;
                        }
-yy133:
+yy188:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy182;
-                       default:        goto yy52;
+                       case 'O':       goto yy225;
+                       case 'o':       goto yy266;
+                       default:        goto yy62;
                        }
-yy134:
-                       yyaccept = 6;
-                       P->mrk = ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
-                       yych = *P->cur;
+yy189:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'a':       goto yy267;
+                       default:        goto yy62;
+                       }
+yy190:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 yy134;
-                       case '\\':      goto yy102;
-                       default:        goto yy136;
-                       }
-yy136:
-#line 333 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_NSNAME);}
-#line 1573 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy137:
-                       ++P->cur;
-#line 335 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_QUOTED_STRING);}
-#line 1578 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy139:
-                       ++P->cur;
-#line 271 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_ELLIPSIS);}
-#line 1583 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy141:
-                       yych = *++P->cur;
+                       case 'u':       goto yy227;
+                       case 'n':       goto yy268;
+                       default:        goto yy62;
+                       }
+yy191:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '0':
-                       case '1':
-                       case '2':
-                       case '3':
-                       case '4':
-                       case '5':
-                       case '6':
-                       case '7':
-                       case '8':
-                       case '9':       goto yy142;
-                       default:        goto yy90;
+                       case 'u':       goto yy269;
+                       default:        goto yy62;
                        }
-yy142:
-                       ++P->cur;
-                       if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
-                       yych = *P->cur;
+yy192:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '0':
-                       case '1':
-                       case '2':
-                       case '3':
-                       case '4':
-                       case '5':
-                       case '6':
-                       case '7':
-                       case '8':
-                       case '9':       goto yy142;
-                       default:        goto yy35;
+                       case 'D':
+                       case 'd':       goto yy231;
+                       case 'u':       goto yy270;
+                       default:        goto yy62;
                        }
-yy144:
+yy193:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy183;
-                       case 'V':
-                       case 'v':       goto yy184;
-                       default:        goto yy52;
+                       case 'O':       goto yy234;
+                       case 'o':       goto yy271;
+                       default:        goto yy62;
                        }
-yy145:
+yy194:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy185;
-                       default:        goto yy52;
+                       case 'C':
+                       case 'c':       goto yy239;
+                       case 'T':       goto yy240;
+                       case 't':       goto yy272;
+                       default:        goto yy62;
                        }
-yy146:
+yy195:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy187;
-                       default:        goto yy52;
+                       case 'B':
+                       case 'b':       goto yy243;
+                       case 'n':       goto yy274;
+                       default:        goto yy62;
                        }
-yy147:
+yy196:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy188;
-                       default:        goto yy52;
+                       case 'n':       goto yy275;
+                       default:        goto yy62;
                        }
-yy148:
+yy197:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'S':
-                       case 's':       goto yy190;
-                       default:        goto yy52;
+                       case 'E':
+                       case 'e':       goto yy250;
+                       case 'a':       goto yy276;
+                       default:        goto yy62;
                        }
-yy149:
+yy198:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy191;
-                       default:        goto yy52;
+                       case 'o':       goto yy277;
+                       default:        goto yy62;
                        }
-yy150:
+yy199:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'B':
-                       case 'b':       goto yy192;
-                       default:        goto yy52;
+                       case 'g':       goto yy278;
+                       case 'z':       goto yy279;
+                       default:        goto yy62;
                        }
-yy151:
+yy200:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'M':
-                       case 'm':       goto yy193;
-                       default:        goto yy52;
+                       case 'A':
+                       case 'a':       goto yy254;
+                       case 'R':       goto yy255;
+                       case 'r':       goto yy280;
+                       default:        goto yy62;
                        }
-yy152:
+yy201:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'S':
-                       case 's':       goto yy195;
-                       default:        goto yy52;
+                       case 'p':       goto yy281;
+                       default:        goto yy62;
                        }
-yy153:
+yy202:
+                       ++cur;
+                       cur -= 1;
+#line 389 "src/parser.re"
+                       { char_width = 2; }
+#line 2526 "src/parser.c"
+yy204:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy196;
-                       default:        goto yy52;
+                       case '"':       goto yy282;
+                       default:        goto yy62;
                        }
-yy154:
+yy205:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy197;
-                       default:        goto yy52;
+                       case 'D':
+                       case 'd':       goto yy259;
+                       case 'i':       goto yy284;
+                       case 's':       goto yy285;
+                       default:        goto yy62;
                        }
-yy155:
+yy206:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy199;
-                       default:        goto yy52;
+                       case 'i':       goto yy286;
+                       case 'l':       goto yy287;
+                       default:        goto yy62;
                        }
-yy156:
-                       yyaccept = 7;
-                       yych = *(P->mrk = ++P->cur);
+yy207:
+                       ++cur;
+#line 410 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OR); goto start; }
+#line 2556 "src/parser.c"
+yy209:
+                       ++cur;
+#line 430 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ELLIPSIS); goto start; }
+#line 2561 "src/parser.c"
+yy211:
+                       yych = *++cur;
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy288;
+                       case 'F':
+                       case 'f':       goto yy290;
+                       case 'L':
+                       case 'l':       goto yy292;
+                       default:        goto yy114;
+                       }
+yy212:
+                       ++cur;
+                       cur -= 1;
+#line 380 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_F; cur += 1; goto start; }
+#line 2578 "src/parser.c"
+yy214:
+                       ++cur;
+                       cur -= 1;
+#line 381 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_L; cur += 1; goto start; }
+#line 2584 "src/parser.c"
+yy216:
+                       yych = *++cur;
+                       switch (yych) {
+                       case 'U':
+                       case 'u':       goto yy294;
+                       default:        goto yy114;
+                       }
+yy217:
+                       ++cur;
+yy218:
+                       cur -= 2;
+#line 376 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_UL; cur += 2; goto start; }
+#line 2598 "src/parser.c"
+yy219:
+                       yych = *++cur;
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy294;
+                       default:        goto yy218;
+                       }
+yy220:
+                       yyaccept = 3;
+                       mrk = ++cur;
+                       if ((lim - cur) < 3) if (cur >= lim) goto done;;
+                       yych = *cur;
                        switch (yych) {
+                       case '.':       goto yy296;
                        case '0':
+                       case '1':
                        case '2':
+                       case '3':
                        case '4':
                        case '5':
+                       case '6':
                        case '7':
+                       case '8':
                        case '9':
                        case 'A':
                        case 'B':
@@ -1726,475 +2625,797 @@ yy156:
                        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 yy51;
-                       case '1':       goto yy200;
-                       case '3':       goto yy201;
-                       case '6':       goto yy202;
-                       case '8':       goto yy203;
-                       case 'V':
-                       case 'v':       goto yy204;
-                       case '\\':      goto yy102;
-                       default:        goto yy157;
-                       }
-yy157:
-#line 283 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_INT);}
-#line 1787 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy158:
-                       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 'f':       goto yy220;
                        case 'L':
-                       case 'M':
-                       case 'N':
-                       case 'O':
+                       case 'l':       goto yy128;
                        case 'P':
-                       case 'Q':
-                       case 'R':
-                       case 'S':
-                       case 'T':
+                       case 'p':       goto yy127;
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy159;
+                       case 'u':       goto yy130;
+                       default:        goto yy39;
                        }
-yy159:
-#line 309 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LET);}
-#line 1861 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy160:
-                       yyaccept = 9;
-                       yych = *(P->mrk = ++P->cur);
+yy222:
+                       ++cur;
+#line 509 "src/parser.re"
+                       { tok += 1; cur -= 1; NEWTOKEN(PSI_T_CPP_HEADER); cur += 1; goto start; }
+#line 2647 "src/parser.c"
+yy224:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 'a':       goto yy298;
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy161;
+                       case 'v':       goto yy299;
+                       default:        goto yy62;
                        }
-yy161:
-#line 308 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LIB);}
-#line 1935 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy162:
+yy225:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy205;
-                       default:        goto yy52;
+                       case 'L':
+                       case 'l':       goto yy300;
+                       default:        goto yy62;
                        }
-yy163:
+yy226:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy207;
-                       default:        goto yy52;
+                       case 'L':
+                       case 'l':       goto yy301;
+                       default:        goto yy62;
                        }
-yy164:
+yy227:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy208;
-                       default:        goto yy52;
+                       case 'N':
+                       case 'n':       goto yy302;
+                       default:        goto yy62;
                        }
-yy165:
+yy228:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy210;
-                       case 'V':
-                       case 'v':       goto yy211;
-                       default:        goto yy52;
+                       case 'I':
+                       case 'i':       goto yy303;
+                       default:        goto yy62;
                        }
-yy166:
+yy229:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'H':
-                       case 'h':       goto yy212;
-                       default:        goto yy52;
+                       case 'F':
+                       case 'f':       goto yy304;
+                       default:        goto yy62;
                        }
-yy167:
+yy230:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'U':
-                       case 'u':       goto yy213;
-                       default:        goto yy52;
+                       case 'E':
+                       case 'e':       goto yy306;
+                       default:        goto yy62;
                        }
-yy168:
-                       yyaccept = 10;
-                       yych = *(P->mrk = ++P->cur);
+yy231:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy169;
+                       case 'i':       goto yy308;
+                       default:        goto yy62;
                        }
-yy169:
-#line 310 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_SET);}
-#line 2059 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy170:
+yy232:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy214;
-                       default:        goto yy52;
+                       case 'O':
+                       case 'o':       goto yy309;
+                       default:        goto yy62;
                        }
-yy171:
+yy233:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy215;
-                       default:        goto yy52;
+                       case 'S':
+                       case 's':       goto yy310;
+                       default:        goto yy62;
                        }
-yy172:
+yy234:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy216;
-                       default:        goto yy52;
+                       case 'A':
+                       case 'a':       goto yy311;
+                       default:        goto yy62;
                        }
-yy173:
+yy235:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy217;
-                       case 'L':
-                       case 'l':       goto yy218;
-                       case 'U':
-                       case 'u':       goto yy219;
-                       case 'V':
-                       case 'v':       goto yy220;
-                       default:        goto yy52;
+                       case 'E':
+                       case 'e':       goto yy312;
+                       default:        goto yy62;
                        }
-yy174:
+yy236:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'P':
-                       case 'p':       goto yy221;
-                       default:        goto yy52;
+                       case 'C':
+                       case 'c':       goto yy314;
+                       default:        goto yy62;
                        }
-yy175:
+yy237:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy315;
+                       default:        goto yy62;
+                       }
+yy238:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'D':
+                       case 'd':       goto yy316;
+                       default:        goto yy62;
+                       }
+yy239:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy317;
+                       default:        goto yy62;
+                       }
+yy240:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'V':
+                       case 'v':       goto yy318;
+                       default:        goto yy62;
+                       }
+yy241:
+                       yyaccept = 11;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy242;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy242:
+#line 481 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LET); goto start; }
+#line 2860 "src/parser.c"
+yy243:
+                       yyaccept = 12;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy244;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy244:
+#line 480 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LIB); goto start; }
+#line 2935 "src/parser.c"
+yy245:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy319;
+                       default:        goto yy62;
+                       }
+yy246:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy320;
+                       default:        goto yy62;
+                       }
+yy247:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy322;
+                       case 'V':
+                       case 'v':       goto yy323;
+                       default:        goto yy62;
+                       }
+yy248:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'H':
+                       case 'h':       goto yy324;
+                       default:        goto yy62;
+                       }
+yy249:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy325;
+                       default:        goto yy62;
+                       }
+yy250:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy326;
+                       default:        goto yy62;
+                       }
+yy251:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'U':
+                       case 'u':       goto yy327;
+                       default:        goto yy62;
+                       }
+yy252:
+                       yyaccept = 13;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy253;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy253:
+#line 482 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SET); goto start; }
+#line 3067 "src/parser.c"
+yy254:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy328;
+                       default:        goto yy62;
+                       }
+yy255:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy329;
+                       case 'L':
+                       case 'l':       goto yy330;
+                       case 'V':
+                       case 'v':       goto yy331;
+                       default:        goto yy62;
+                       }
+yy256:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'P':
+                       case 'p':       goto yy332;
+                       default:        goto yy62;
+                       }
+yy257:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy223;
+                       case 'a':       goto yy334;
                        case 'B':
-                       case 'b':       goto yy224;
+                       case 'b':       goto yy335;
                        case 'F':
-                       case 'f':       goto yy225;
+                       case 'f':       goto yy336;
                        case 'I':
-                       case 'i':       goto yy226;
+                       case 'i':       goto yy337;
                        case 'O':
-                       case 'o':       goto yy227;
+                       case 'o':       goto yy338;
                        case 'S':
-                       case 's':       goto yy228;
-                       default:        goto yy52;
+                       case 's':       goto yy339;
+                       default:        goto yy62;
                        }
-yy176:
+yy258:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy229;
-                       default:        goto yy52;
+                       case 'e':       goto yy340;
+                       default:        goto yy62;
                        }
-yy177:
+yy259:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy231;
-                       default:        goto yy52;
+                       case 'e':       goto yy342;
+                       default:        goto yy62;
                        }
-yy178:
+yy260:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy232;
-                       default:        goto yy52;
+                       case 'N':
+                       case 'n':       goto yy343;
+                       default:        goto yy62;
                        }
-yy179:
+yy261:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy233;
-                       default:        goto yy52;
+                       case 'L':
+                       case 'l':       goto yy344;
+                       default:        goto yy62;
                        }
-yy180:
+yy262:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy234;
-                       default:        goto yy52;
+                       case 's':       goto yy346;
+                       case 't':       goto yy347;
+                       default:        goto yy62;
                        }
-yy181:
+yy263:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy235;
-                       default:        goto yy52;
+                       case 'x':       goto yy348;
+                       default:        goto yy62;
                        }
-yy182:
+yy264:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy349;
+                       default:        goto yy62;
+                       }
+yy265:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy350;
+                       default:        goto yy62;
+                       }
+yy266:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':       goto yy300;
+                       case 'l':       goto yy351;
+                       default:        goto yy62;
+                       }
+yy267:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
+                       case 'r':       goto yy353;
+                       default:        goto yy62;
+                       }
+yy268:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 's':       goto yy355;
+                       default:        goto yy62;
+                       }
+yy269:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'b':       goto yy356;
+                       default:        goto yy62;
+                       }
+yy270:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'm':       goto yy357;
+                       default:        goto yy62;
+                       }
+yy271:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':       goto yy311;
+                       case 'a':       goto yy359;
+                       default:        goto yy62;
+                       }
+yy272:
+                       yyaccept = 14;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy273;
+                       case 'V':
+                       case 'v':       goto yy318;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy273:
+#line 450 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INT); goto start; }
+#line 3295 "src/parser.c"
+yy274:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy360;
+                       default:        goto yy62;
+                       }
+yy275:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'g':       goto yy362;
+                       default:        goto yy62;
+                       }
+yy276:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'g':       goto yy364;
+                       default:        goto yy62;
+                       }
+yy277:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'r':       goto yy365;
+                       default:        goto yy62;
+                       }
+yy278:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy366;
+                       default:        goto yy62;
+                       }
+yy279:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy367;
+                       default:        goto yy62;
+                       }
+yy280:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'I':
+                       case 'i':       goto yy329;
                        case 'L':
-                       case 'l':       goto yy237;
-                       default:        goto yy52;
+                       case 'l':       goto yy330;
+                       case 'V':
+                       case 'v':       goto yy331;
+                       case 'u':       goto yy368;
+                       default:        goto yy62;
                        }
-yy183:
+yy281:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'Y':
-                       case 'y':       goto yy239;
-                       default:        goto yy52;
+                       case 'e':       goto yy369;
+                       default:        goto yy62;
                        }
-yy184:
+yy282:
+                       ++cur;
+                       cur -= 1;
+#line 388 "src/parser.re"
+                       { char_width = 1; }
+#line 3363 "src/parser.c"
+yy284:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy241;
-                       default:        goto yy52;
+                       case 'o':       goto yy370;
+                       default:        goto yy62;
                        }
-yy185:
-                       yyaccept = 11;
-                       yych = *(P->mrk = ++P->cur);
+yy285:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy371;
+                       default:        goto yy62;
+                       }
+yy286:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'd':       goto yy372;
+                       default:        goto yy62;
+                       }
+yy287:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'a':       goto yy374;
+                       default:        goto yy62;
+                       }
+yy288:
+                       ++cur;
+                       cur -= 2;
+#line 383 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DD; cur += 2; goto start; }
+#line 3397 "src/parser.c"
+yy290:
+                       ++cur;
+                       cur -= 2;
+#line 382 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DF; cur += 2; goto start; }
+#line 3403 "src/parser.c"
+yy292:
+                       ++cur;
+                       cur -= 2;
+#line 384 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_FLT | PSI_NUMBER_DL; cur += 2; goto start; }
+#line 3409 "src/parser.c"
+yy294:
+                       ++cur;
+                       cur -= 3;
+#line 377 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NUMBER); token->flags = PSI_NUMBER_INT | PSI_NUMBER_ULL; cur += 3; goto start; }
+#line 3415 "src/parser.c"
+yy296:
+                       ++cur;
+                       if ((lim - cur) < 3) if (cur >= lim) goto done;;
+                       yych = *cur;
                        switch (yych) {
                        case '0':
                        case '1':
@@ -2212,4758 +3433,6850 @@ yy185:
                        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 yy51;
-                       case 'V':
-                       case 'v':       goto yy242;
-                       case '\\':      goto yy102;
-                       default:        goto yy186;
+                       case 'f':       goto yy296;
+                       case 'P':
+                       case 'p':       goto yy127;
+                       default:        goto yy114;
                        }
-yy186:
-#line 280 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_BOOL);}
-#line 2269 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy187:
+yy298:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy243;
-                       case 'B':
-                       case 'b':       goto yy244;
-                       case 'O':
-                       case 'o':       goto yy245;
-                       default:        goto yy52;
-                       }
-yy188:
-                       yyaccept = 12;
-                       yych = *(P->mrk = ++P->cur);
+                       case 'Y':
+                       case 'y':       goto yy375;
+                       default:        goto yy62;
+                       }
+yy299:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 'a':       goto yy377;
+                       default:        goto yy62;
+                       }
+yy300:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy189;
+                       case 'v':       goto yy378;
+                       default:        goto yy62;
                        }
-yy189:
-#line 281 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CHAR);}
-#line 2355 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy190:
+yy301:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy246;
-                       default:        goto yy52;
+                       case 'A':
+                       case 'a':       goto yy379;
+                       case 'B':
+                       case 'b':       goto yy380;
+                       case 'O':
+                       case 'o':       goto yy381;
+                       default:        goto yy62;
                        }
-yy191:
+yy302:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy248;
-                       default:        goto yy52;
+                       case 't':       goto yy382;
+                       default:        goto yy62;
                        }
-yy192:
+yy303:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy250;
-                       default:        goto yy52;
+                       case 'N':
+                       case 'n':       goto yy384;
+                       default:        goto yy62;
                        }
-yy193:
-                       yyaccept = 13;
-                       yych = *(P->mrk = ++P->cur);
+yy304:
+                       yyaccept = 15;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy305;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy305:
+#line 460 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ELIF); goto start; }
+#line 3573 "src/parser.c"
+yy306:
+                       yyaccept = 16;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy307;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy307:
+#line 459 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ELSE); goto start; }
+#line 3648 "src/parser.c"
+yy308:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 'f':       goto yy385;
+                       default:        goto yy62;
+                       }
+yy309:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy194;
+                       case 'r':       goto yy387;
+                       default:        goto yy62;
                        }
-yy194:
-#line 306 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_ENUM);}
-#line 2453 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy195:
+yy310:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy251;
-                       default:        goto yy52;
+                       case 'e':       goto yy389;
+                       default:        goto yy62;
                        }
-yy196:
+yy311:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy253;
-                       default:        goto yy52;
+                       case 't':       goto yy391;
+                       default:        goto yy62;
                        }
-yy197:
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy198;
+yy312:
+                       yyaccept = 17;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy313;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
                        }
-yy198:
-#line 312 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_FREE);}
-#line 2543 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy199:
+yy313:
+#line 487 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FREE); goto start; }
+#line 3755 "src/parser.c"
+yy314:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy255;
-                       default:        goto yy52;
+                       case 't':       goto yy392;
+                       default:        goto yy62;
                        }
-yy200:
+yy315:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '6':       goto yy256;
-                       default:        goto yy52;
+                       case 'F':
+                       case 'f':       goto yy393;
+                       default:        goto yy62;
                        }
-yy201:
+yy316:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '2':       goto yy257;
-                       default:        goto yy52;
+                       case 'E':
+                       case 'e':       goto yy395;
+                       default:        goto yy62;
                        }
-yy202:
+yy317:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '4':       goto yy258;
-                       default:        goto yy52;
+                       case 'U':
+                       case 'u':       goto yy396;
+                       default:        goto yy62;
                        }
-yy203:
+yy318:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy259;
-                       default:        goto yy52;
-                       }
-yy204:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy260;
-                       default:        goto yy52;
-                       }
-yy205:
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy206;
+                       case 'a':       goto yy397;
+                       default:        goto yy62;
                        }
-yy206:
-#line 284 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_LONG);}
-#line 2661 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy207:
+yy319:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy261;
-                       default:        goto yy52;
+                       case 'd':       goto yy398;
+                       default:        goto yy62;
                        }
-yy208:
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy209;
+yy320:
+                       yyaccept = 18;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy321;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
                        }
-yy209:
-#line 276 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_NULL);}
-#line 2743 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy210:
+yy321:
+#line 471 "src/parser.re"
+                       { NEWTOKEN(PSI_T_NULL); goto start; }
+#line 3878 "src/parser.c"
+yy322:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy263;
-                       default:        goto yy52;
+                       case 'c':       goto yy400;
+                       default:        goto yy62;
                        }
-yy211:
+yy323:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy264;
-                       default:        goto yy52;
+                       case 'a':       goto yy401;
+                       default:        goto yy62;
                        }
-yy212:
+yy324:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy265;
-                       default:        goto yy52;
+                       case 'v':       goto yy402;
+                       default:        goto yy62;
                        }
-yy213:
+yy325:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy266;
-                       default:        goto yy52;
+                       case '_':       goto yy403;
+                       default:        goto yy62;
                        }
-yy214:
+yy326:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy267;
-                       default:        goto yy52;
+                       case 'A':
+                       case 'a':       goto yy404;
+                       default:        goto yy62;
                        }
-yy215:
+yy327:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy269;
-                       default:        goto yy52;
+                       case 'R':
+                       case 'r':       goto yy405;
+                       default:        goto yy62;
                        }
-yy216:
+yy328:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy270;
-                       default:        goto yy52;
+                       case 'i':       goto yy406;
+                       default:        goto yy62;
                        }
-yy217:
+yy329:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy271;
-                       default:        goto yy52;
+                       case 'n':       goto yy407;
+                       default:        goto yy62;
                        }
-yy218:
+yy330:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy272;
-                       default:        goto yy52;
-                       }
-yy219:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy273;
-                       default:        goto yy52;
+                       case 'e':       goto yy408;
+                       default:        goto yy62;
                        }
-yy220:
+yy331:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy274;
-                       default:        goto yy52;
+                       case 'a':       goto yy409;
+                       default:        goto yy62;
                        }
-yy221:
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy222;
+yy332:
+                       yyaccept = 19;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy333;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
                        }
-yy222:
-#line 313 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TEMP);}
-#line 2905 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy223:
+yy333:
+#line 488 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TEMP); goto start; }
+#line 4032 "src/parser.c"
+yy334:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy275;
-                       default:        goto yy52;
+                       case 'r':       goto yy410;
+                       default:        goto yy62;
                        }
-yy224:
+yy335:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy276;
-                       default:        goto yy52;
+                       case 'o':       goto yy411;
+                       default:        goto yy62;
                        }
-yy225:
+yy336:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy277;
-                       default:        goto yy52;
+                       case 'l':       goto yy412;
+                       default:        goto yy62;
                        }
-yy226:
+yy337:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy278;
-                       default:        goto yy52;
+                       case 'n':       goto yy413;
+                       default:        goto yy62;
                        }
-yy227:
+yy338:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy279;
-                       default:        goto yy52;
+                       case 'b':       goto yy414;
+                       default:        goto yy62;
                        }
-yy228:
+yy339:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy280;
-                       default:        goto yy52;
+                       case 't':       goto yy415;
+                       default:        goto yy62;
                        }
-yy229:
-                       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':
+yy340:
+                       yyaccept = 20;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy341;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy341:
+#line 469 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TRUE); goto start; }
+#line 4155 "src/parser.c"
+yy342:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'F':
-                       case 'G':
-                       case 'H':
+                       case 'f':       goto yy416;
+                       default:        goto yy62;
+                       }
+yy343:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy230;
+                       case 'i':       goto yy418;
+                       default:        goto yy62;
                        }
-yy230:
-#line 274 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TRUE);}
-#line 3027 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy231:
+yy344:
+                       yyaccept = 21;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy345;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy345:
+#line 497 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ZVAL); goto start; }
+#line 4246 "src/parser.c"
+yy346:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy281;
-                       default:        goto yy52;
+                       case 'm':       goto yy419;
+                       default:        goto yy62;
                        }
-yy232:
+yy347:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '1':       goto yy282;
-                       case '3':       goto yy283;
-                       case '6':       goto yy284;
-                       case '8':       goto yy285;
-                       default:        goto yy52;
+                       case 't':       goto yy420;
+                       default:        goto yy62;
                        }
-yy233:
+yy348:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy286;
-                       default:        goto yy52;
+                       case 't':       goto yy421;
+                       default:        goto yy62;
                        }
-yy234:
+yy349:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy288;
-                       default:        goto yy52;
+                       case 'l':       goto yy422;
+                       default:        goto yy62;
                        }
-yy235:
-                       yyaccept = 19;
-                       yych = *(P->mrk = ++P->cur);
+yy350:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 's':       goto yy423;
+                       default:        goto yy62;
+                       }
+yy351:
+                       yyaccept = 22;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy352;
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy236;
+                       case 'v':       goto yy378;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
                        }
-yy236:
-#line 279 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_VOID);}
-#line 3135 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy237:
-                       yyaccept = 20;
-                       yych = *(P->mrk = ++P->cur);
+yy352:
+#line 447 "src/parser.re"
+                       { NEWTOKEN(PSI_T_BOOL); goto start; }
+#line 4358 "src/parser.c"
+yy353:
+                       yyaccept = 23;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy354;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy354:
+#line 448 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CHAR); goto start; }
+#line 4433 "src/parser.c"
+yy355:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy238;
+                       case 't':       goto yy424;
+                       default:        goto yy62;
                        }
-yy238:
-#line 322 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_ZVAL);}
-#line 3209 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy239:
-                       yyaccept = 21;
-                       yych = *(P->mrk = ++P->cur);
+yy356:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy240;
+                       case 'l':       goto yy426;
+                       default:        goto yy62;
                        }
-yy240:
-#line 298 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_ARRAY);}
-#line 3283 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy241:
+yy357:
+                       yyaccept = 24;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy358;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy358:
+#line 444 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ENUM); goto start; }
+#line 4522 "src/parser.c"
+yy359:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':       goto yy391;
+                       case 't':       goto yy427;
+                       default:        goto yy62;
+                       }
+yy360:
+                       yyaccept = 25;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy361;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy361:
+#line 440 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LINE); goto start; }
+#line 4605 "src/parser.c"
+yy362:
+                       yyaccept = 26;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy363;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy363:
+#line 451 "src/parser.re"
+                       { NEWTOKEN(PSI_T_LONG); goto start; }
+#line 4680 "src/parser.c"
+yy364:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'm':       goto yy429;
+                       default:        goto yy62;
+                       }
+yy365:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy430;
+                       default:        goto yy62;
+                       }
+yy366:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy432;
+                       default:        goto yy62;
+                       }
+yy367:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'o':       goto yy433;
+                       default:        goto yy62;
+                       }
+yy368:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'c':       goto yy434;
+                       default:        goto yy62;
+                       }
+yy369:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'd':       goto yy435;
+                       default:        goto yy62;
+                       }
+yy370:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy436;
+                       default:        goto yy62;
+                       }
+yy371:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'g':       goto yy438;
+                       default:        goto yy62;
+                       }
+yy372:
+                       yyaccept = 27;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy373;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy373:
+#line 446 "src/parser.re"
+                       { NEWTOKEN(PSI_T_VOID); goto start; }
+#line 4811 "src/parser.c"
+yy374:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy439;
+                       default:        goto yy62;
+                       }
+yy375:
+                       yyaccept = 28;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy376;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy376:
+#line 475 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ARRAY); goto start; }
+#line 4893 "src/parser.c"
+yy377:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy289;
-                       default:        goto yy52;
+                       case 'l':       goto yy440;
+                       default:        goto yy62;
                        }
-yy242:
+yy378:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy291;
-                       default:        goto yy52;
+                       case 'a':       goto yy442;
+                       default:        goto yy62;
                        }
-yy243:
+yy379:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy292;
-                       default:        goto yy52;
+                       case 'b':       goto yy443;
+                       default:        goto yy62;
                        }
-yy244:
+yy380:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy293;
-                       default:        goto yy52;
+                       case 'a':       goto yy444;
+                       default:        goto yy62;
                        }
-yy245:
+yy381:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy294;
-                       default:        goto yy52;
+                       case 'c':       goto yy445;
+                       default:        goto yy62;
                        }
-yy246:
-                       yyaccept = 22;
-                       yych = *(P->mrk = ++P->cur);
+yy382:
+                       yyaccept = 29;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy383;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy383:
+#line 498 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COUNT); goto start; }
+#line 5008 "src/parser.c"
+yy384:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 'e':       goto yy447;
+                       default:        goto yy62;
+                       }
+yy385:
+                       yyaccept = 30;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy386;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy386:
+#line 461 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ENDIF); goto start; }
+#line 5091 "src/parser.c"
+yy387:
+                       yyaccept = 31;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy388;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy388:
+#line 466 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ERROR); goto start; }
+#line 5166 "src/parser.c"
+yy389:
+                       yyaccept = 32;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy390;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy390:
+#line 470 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FALSE); goto start; }
+#line 5241 "src/parser.c"
+yy391:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy247;
+                       case 'v':       goto yy449;
+                       default:        goto yy62;
                        }
-yy247:
-#line 307 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CONST);}
-#line 3397 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy248:
-                       yyaccept = 23;
-                       yych = *(P->mrk = ++P->cur);
+yy392:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy249;
+                       case 'i':       goto yy450;
+                       default:        goto yy62;
                        }
-yy249:
-#line 323 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_COUNT);}
-#line 3471 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy250:
+yy393:
+                       yyaccept = 33;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy394;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy394:
+#line 457 "src/parser.re"
+                       { NEWTOKEN(PSI_T_IFDEF); goto start; }
+#line 5332 "src/parser.c"
+yy395:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy296;
-                       default:        goto yy52;
+                       case 'F':
+                       case 'f':       goto yy451;
+                       default:        goto yy62;
                        }
-yy251:
-                       yyaccept = 24;
-                       yych = *(P->mrk = ++P->cur);
+yy396:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 'd':       goto yy453;
+                       default:        goto yy62;
+                       }
+yy397:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'L':
-                       case 'M':
-                       case 'N':
-                       case 'O':
-                       case 'P':
-                       case 'Q':
-                       case 'R':
-                       case 'S':
+                       case 'l':       goto yy454;
+                       default:        goto yy62;
+                       }
+yy398:
+                       yyaccept = 34;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy399;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy399:
+#line 472 "src/parser.re"
+                       { NEWTOKEN(PSI_T_MIXED); goto start; }
+#line 5431 "src/parser.c"
+yy400:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy252;
+                       case 't':       goto yy456;
+                       default:        goto yy62;
                        }
-yy252:
-#line 275 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_FALSE);}
-#line 3553 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy253:
-                       yyaccept = 25;
-                       yych = *(P->mrk = ++P->cur);
+yy401:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy458;
+                       default:        goto yy62;
+                       }
+yy402:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 'a':       goto yy460;
+                       default:        goto yy62;
+                       }
+yy403:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'A':
+                       case 'a':       goto yy461;
+                       default:        goto yy62;
+                       }
+yy404:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'S':
+                       case 's':       goto yy462;
+                       default:        goto yy62;
+                       }
+yy405:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy463;
+                       default:        goto yy62;
+                       }
+yy406:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'C':
-                       case 'D':
-                       case 'E':
-                       case 'F':
+                       case 'c':       goto yy465;
+                       default:        goto yy62;
+                       }
+yy407:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'G':
-                       case 'H':
-                       case 'I':
-                       case 'J':
-                       case 'K':
-                       case 'L':
-                       case 'M':
+                       case 'g':       goto yy467;
+                       default:        goto yy62;
+                       }
+yy408:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'N':
-                       case 'O':
-                       case 'P':
-                       case 'Q':
+                       case 'n':       goto yy469;
+                       default:        goto yy62;
+                       }
+yy409:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'L':
+                       case 'l':       goto yy471;
+                       default:        goto yy62;
+                       }
+yy410:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'R':
-                       case 'S':
+                       case 'r':       goto yy473;
+                       default:        goto yy62;
+                       }
+yy411:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'O':
+                       case 'o':       goto yy474;
+                       default:        goto yy62;
+                       }
+yy412:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'O':
+                       case 'o':       goto yy475;
+                       default:        goto yy62;
+                       }
+yy413:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        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 yy51;
-                       case 'V':
-                       case 'v':       goto yy298;
-                       case '\\':      goto yy102;
-                       default:        goto yy254;
+                       case 't':       goto yy476;
+                       default:        goto yy62;
                        }
-yy254:
-#line 285 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_FLOAT);}
-#line 3627 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy255:
+yy414:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy299;
-                       default:        goto yy52;
+                       case 'J':
+                       case 'j':       goto yy478;
+                       default:        goto yy62;
                        }
-yy256:
+yy415:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy300;
-                       default:        goto yy52;
+                       case 'R':
+                       case 'r':       goto yy479;
+                       default:        goto yy62;
                        }
-yy257:
+yy416:
+                       yyaccept = 35;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy417;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy417:
+#line 464 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNDEF); goto start; }
+#line 5634 "src/parser.c"
+yy418:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy480;
+                       default:        goto yy62;
+                       }
+yy419:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy301;
-                       default:        goto yy52;
+                       case '_':       goto yy481;
+                       default:        goto yy62;
                        }
-yy258:
+yy420:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy302;
-                       default:        goto yy52;
+                       case 'r':       goto yy482;
+                       default:        goto yy62;
                        }
-yy259:
+yy421:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy303;
-                       default:        goto yy52;
+                       case 'e':       goto yy483;
+                       default:        goto yy62;
                        }
-yy260:
+yy422:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy305;
-                       default:        goto yy52;
+                       case 'i':       goto yy484;
+                       default:        goto yy62;
                        }
-yy261:
-                       yyaccept = 26;
-                       yych = *(P->mrk = ++P->cur);
+yy423:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 't':       goto yy485;
+                       default:        goto yy62;
+                       }
+yy424:
+                       yyaccept = 36;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy425;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy425:
+#line 445 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CONST); goto start; }
+#line 5752 "src/parser.c"
+yy426:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy486;
+                       default:        goto yy62;
+                       }
+yy427:
+                       yyaccept = 37;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy428;
                        case '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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy262;
+                       case 'v':       goto yy449;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
                        }
-yy262:
-#line 277 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_MIXED);}
-#line 3746 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy263:
+yy428:
+#line 452 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FLOAT); goto start; }
+#line 5836 "src/parser.c"
+yy429:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy307;
-                       default:        goto yy52;
+                       case 'a':       goto yy488;
+                       default:        goto yy62;
                        }
-yy264:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+yy430:
+                       yyaccept = 38;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy431;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy431:
+#line 449 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SHORT); goto start; }
+#line 5918 "src/parser.c"
+yy432:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'd':       goto yy490;
+                       default:        goto yy62;
+                       }
+yy433:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'f':       goto yy492;
+                       default:        goto yy62;
+                       }
+yy434:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy494;
+                       default:        goto yy62;
+                       }
+yy435:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy496;
+                       default:        goto yy62;
+                       }
+yy436:
+                       yyaccept = 39;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy437;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy437:
+#line 443 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNION); goto start; }
+#line 6021 "src/parser.c"
+yy438:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy497;
+                       default:        goto yy62;
+                       }
+yy439:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy498;
+                       default:        goto yy62;
+                       }
+yy440:
+                       yyaccept = 40;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy441;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy441:
+#line 495 "src/parser.re"
+                       { NEWTOKEN(PSI_T_ARRVAL); goto start; }
+#line 6110 "src/parser.c"
+yy442:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy309;
-                       default:        goto yy52;
+                       case 'l':       goto yy499;
+                       default:        goto yy62;
                        }
-yy265:
+yy443:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy311;
-                       default:        goto yy52;
+                       case 'L':
+                       case 'l':       goto yy501;
+                       default:        goto yy62;
                        }
-yy266:
+yy444:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy312;
-                       default:        goto yy52;
-                       }
-yy267:
-                       yyaccept = 27;
-                       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 'c':       goto yy502;
+                       default:        goto yy62;
+                       }
+yy445:
+                       yyaccept = 41;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy446;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy446:
+#line 499 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLOC); goto start; }
+#line 6209 "src/parser.c"
+yy447:
+                       yyaccept = 42;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy448;
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy268;
+                       case 'd':       goto yy503;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
                        }
-yy268:
-#line 282 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_SHORT);}
-#line 3852 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy269:
+yy448:
+#line 462 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DEFINE); goto start; }
+#line 6286 "src/parser.c"
+yy449:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy314;
-                       default:        goto yy52;
+                       case 'A':
+                       case 'a':       goto yy505;
+                       default:        goto yy62;
                        }
-yy270:
+yy450:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy316;
-                       default:        goto yy52;
+                       case 'O':
+                       case 'o':       goto yy506;
+                       default:        goto yy62;
                        }
-yy271:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+yy451:
+                       yyaccept = 43;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy452;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy452:
+#line 458 "src/parser.re"
+                       { NEWTOKEN(PSI_T_IFNDEF); goto start; }
+#line 6377 "src/parser.c"
+yy453:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy318;
-                       default:        goto yy52;
+                       case 'E':
+                       case 'e':       goto yy507;
+                       default:        goto yy62;
                        }
-yy272:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+yy454:
+                       yyaccept = 44;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy455;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy455:
+#line 492 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INTVAL); goto start; }
+#line 6460 "src/parser.c"
+yy456:
+                       yyaccept = 45;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy457;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy457:
+#line 476 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OBJECT); goto start; }
+#line 6535 "src/parser.c"
+yy458:
+                       yyaccept = 46;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy459;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy459:
+#line 496 "src/parser.re"
+                       { NEWTOKEN(PSI_T_OBJVAL); goto start; }
+#line 6610 "src/parser.c"
+yy460:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy320;
-                       default:        goto yy52;
+                       case 'L':
+                       case 'l':       goto yy509;
+                       default:        goto yy62;
                        }
-yy273:
+yy461:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy322;
-                       default:        goto yy52;
+                       case 'S':
+                       case 's':       goto yy511;
+                       default:        goto yy62;
                        }
-yy274:
+yy462:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy324;
-                       default:        goto yy52;
+                       case 'S':
+                       case 's':       goto yy512;
+                       default:        goto yy62;
                        }
-yy275:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+yy463:
+                       yyaccept = 47;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy464;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy464:
+#line 485 "src/parser.re"
+                       { NEWTOKEN(PSI_T_RETURN); goto start; }
+#line 6709 "src/parser.c"
+yy465:
+                       yyaccept = 48;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy466;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy466:
+#line 478 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STATIC); goto start; }
+#line 6784 "src/parser.c"
+yy467:
+                       yyaccept = 49;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy468;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy468:
+#line 474 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRING); goto start; }
+#line 6859 "src/parser.c"
+yy469:
+                       yyaccept = 50;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy470;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy470:
+#line 489 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRLEN); goto start; }
+#line 6934 "src/parser.c"
+yy471:
+                       yyaccept = 51;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy472;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy472:
+#line 490 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRVAL); goto start; }
+#line 7009 "src/parser.c"
+yy473:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy326;
-                       default:        goto yy52;
+                       case 'A':
+                       case 'a':       goto yy513;
+                       default:        goto yy62;
                        }
-yy276:
+yy474:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy327;
-                       default:        goto yy52;
+                       case 'L':
+                       case 'l':       goto yy514;
+                       default:        goto yy62;
                        }
-yy277:
+yy475:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy328;
-                       default:        goto yy52;
+                       case 'A':
+                       case 'a':       goto yy516;
+                       default:        goto yy62;
                        }
-yy278:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+yy476:
+                       yyaccept = 52;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy477;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy477:
+#line 503 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_INT); goto start; }
+#line 7108 "src/parser.c"
+yy478:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'T':
-                       case 't':       goto yy329;
-                       default:        goto yy52;
+                       case 'E':
+                       case 'e':       goto yy517;
+                       default:        goto yy62;
                        }
-yy279:
+yy479:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'J':
-                       case 'j':       goto yy331;
-                       default:        goto yy52;
+                       case 'I':
+                       case 'i':       goto yy518;
+                       default:        goto yy62;
                        }
-yy280:
+yy480:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'R':
-                       case 'r':       goto yy332;
-                       default:        goto yy52;
+                       case 'G':
+                       case 'g':       goto yy519;
+                       default:        goto yy62;
                        }
-yy281:
+yy481:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy333;
-                       default:        goto yy52;
+                       case '_':       goto yy521;
+                       default:        goto yy62;
                        }
-yy282:
+yy482:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '6':       goto yy334;
-                       default:        goto yy52;
+                       case 'i':       goto yy523;
+                       default:        goto yy62;
                        }
-yy283:
+yy483:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '2':       goto yy335;
-                       default:        goto yy52;
+                       case 'n':       goto yy524;
+                       default:        goto yy62;
                        }
-yy284:
+yy484:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '4':       goto yy336;
-                       default:        goto yy52;
+                       case 'n':       goto yy525;
+                       default:        goto yy62;
                        }
-yy285:
+yy485:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case '_':       goto yy337;
-                       default:        goto yy52;
+                       case 'r':       goto yy526;
+                       default:        goto yy62;
                        }
-yy286:
-                       yyaccept = 28;
-                       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':
+yy486:
+                       yyaccept = 53;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy487;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy487:
+#line 453 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DOUBLE); goto start; }
+#line 7242 "src/parser.c"
+yy488:
+                       yyaccept = 54;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy489;
+                       case '\\':      goto yy148;
+                       default:        goto yy527;
+                       }
+yy489:
+#line 432 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PRAGMA); goto start; }
+#line 7317 "src/parser.c"
+yy490:
+                       yyaccept = 55;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy491;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy491:
+#line 455 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SIGNED); goto start; }
+#line 7392 "src/parser.c"
+yy492:
+                       yyaccept = 56;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy493;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy493:
+#line 439 "src/parser.re"
+                       { NEWTOKEN(PSI_T_SIZEOF); goto start; }
+#line 7467 "src/parser.c"
+yy494:
+                       yyaccept = 57;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy495;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy495:
+#line 442 "src/parser.re"
+                       { NEWTOKEN(PSI_T_STRUCT); goto start; }
+#line 7542 "src/parser.c"
+yy496:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'f':       goto yy529;
+                       default:        goto yy62;
+                       }
+yy497:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy531;
+                       default:        goto yy62;
+                       }
+yy498:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'l':       goto yy532;
+                       default:        goto yy62;
+                       }
+yy499:
+                       yyaccept = 58;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy500;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy500:
+#line 494 "src/parser.re"
+                       { NEWTOKEN(PSI_T_BOOLVAL); goto start; }
+#line 7638 "src/parser.c"
+yy501:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'E':
-                       case 'F':
-                       case 'G':
-                       case 'H':
-                       case 'I':
-                       case 'J':
+                       case 'e':       goto yy533;
+                       default:        goto yy62;
+                       }
+yy502:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'K':
+                       case 'k':       goto yy535;
+                       default:        goto yy62;
+                       }
+yy503:
+                       yyaccept = 59;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy504;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy504:
+#line 463 "src/parser.re"
+                       { NEWTOKEN(PSI_T_DEFINED); goto start; }
+#line 7729 "src/parser.c"
+yy505:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy287;
+                       case 'l':       goto yy537;
+                       default:        goto yy62;
                        }
-yy287:
-#line 305 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_UNION);}
-#line 4058 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy288:
+yy506:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy338;
-                       default:        goto yy52;
+                       case 'n':       goto yy539;
+                       default:        goto yy62;
                        }
-yy289:
-                       yyaccept = 29;
-                       yych = *(P->mrk = ++P->cur);
+yy507:
+                       yyaccept = 60;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy508;
+                       case '\\':      goto yy148;
+                       case '_':       goto yy541;
+                       default:        goto yy61;
+                       }
+yy508:
+#line 467 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INCLUDE); goto start; }
+#line 7821 "src/parser.c"
+yy509:
+                       yyaccept = 61;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy510;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy510:
+#line 491 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PATHVAL); goto start; }
+#line 7896 "src/parser.c"
+yy511:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy290;
+                       case 's':       goto yy542;
+                       default:        goto yy62;
                        }
-yy290:
-#line 320 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_ARRVAL);}
-#line 4140 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy291:
+yy512:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy339;
-                       default:        goto yy52;
+                       case 'E':
+                       case 'e':       goto yy543;
+                       default:        goto yy62;
                        }
-yy292:
+yy513:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy341;
-                       default:        goto yy52;
+                       case 'Y':
+                       case 'y':       goto yy544;
+                       default:        goto yy62;
+                       }
+yy514:
+                       yyaccept = 62;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy515;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy515:
+#line 505 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_BOOL); goto start; }
+#line 7995 "src/parser.c"
+yy516:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy546;
+                       default:        goto yy62;
                        }
-yy293:
+yy517:
                        yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
+                       yych = *(mrk = ++cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy342;
-                       default:        goto yy52;
+                       case 'c':       goto yy548;
+                       default:        goto yy62;
                        }
-yy294:
-                       yyaccept = 30;
-                       yych = *(P->mrk = ++P->cur);
+yy518:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy295;
-                       }
-yy295:
-#line 324 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CALLOC);}
-#line 4238 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy296:
-                       yyaccept = 31;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy297;
-                       }
-yy297:
-#line 286 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_DOUBLE);}
-#line 4312 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy298:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy343;
-                       default:        goto yy52;
-                       }
-yy299:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'O':
-                       case 'o':       goto yy344;
-                       default:        goto yy52;
-                       }
-yy300:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy345;
-                       default:        goto yy52;
-                       }
-yy301:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy347;
-                       default:        goto yy52;
-                       }
-yy302:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy349;
-                       default:        goto yy52;
-                       }
-yy303:
-                       yyaccept = 32;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy304;
-                       }
-yy304:
-#line 287 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_INT8);}
-#line 4426 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy305:
-                       yyaccept = 33;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy306;
-                       }
-yy306:
-#line 317 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_INTVAL);}
-#line 4500 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy307:
-                       yyaccept = 34;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy308;
-                       }
-yy308:
-#line 299 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_OBJECT);}
-#line 4574 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy309:
-                       yyaccept = 35;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy310;
-                       }
-yy310:
-#line 321 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_OBJVAL);}
-#line 4648 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy311:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy351;
-                       default:        goto yy52;
-                       }
-yy312:
-                       yyaccept = 36;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy313;
-                       }
-yy313:
-#line 311 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_RETURN);}
-#line 4730 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy314:
-                       yyaccept = 37;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy315;
-                       }
-yy315:
-#line 296 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_SIGNED);}
-#line 4804 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy316:
-                       yyaccept = 38;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy317;
-                       }
-yy317:
-#line 301 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_STATIC);}
-#line 4878 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy318:
-                       yyaccept = 39;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy319;
-                       }
-yy319:
-#line 297 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_STRING);}
-#line 4952 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy320:
-                       yyaccept = 40;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy321;
-                       }
-yy321:
-#line 314 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_STRLEN);}
-#line 5026 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy322:
-                       yyaccept = 41;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy323;
-                       }
-yy323:
-#line 304 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_STRUCT);}
-#line 5100 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy324:
-                       yyaccept = 42;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy325;
-                       }
-yy325:
-#line 315 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_STRVAL);}
-#line 5174 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy326:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy353;
-                       default:        goto yy52;
-                       }
-yy327:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy354;
-                       default:        goto yy52;
-                       }
-yy328:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'A':
-                       case 'a':       goto yy356;
-                       default:        goto yy52;
-                       }
-yy329:
-                       yyaccept = 43;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy330;
-                       }
-yy330:
-#line 328 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TO_INT);}
-#line 5272 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy331:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy357;
-                       default:        goto yy52;
-                       }
-yy332:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'I':
-                       case 'i':       goto yy358;
-                       default:        goto yy52;
-                       }
-yy333:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'F':
-                       case 'f':       goto yy359;
-                       default:        goto yy52;
-                       }
-yy334:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '_':       goto yy361;
-                       default:        goto yy52;
-                       }
-yy335:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '_':       goto yy362;
-                       default:        goto yy52;
-                       }
-yy336:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case '_':       goto yy363;
-                       default:        goto yy52;
-                       }
-yy337:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy364;
-                       default:        goto yy52;
-                       }
-yy338:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy366;
-                       default:        goto yy52;
-                       }
-yy339:
-                       yyaccept = 44;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy340;
-                       }
-yy340:
-#line 319 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_BOOLVAL);}
-#line 5407 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy341:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'E':
-                       case 'e':       goto yy367;
-                       default:        goto yy52;
-                       }
-yy342:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'K':
-                       case 'k':       goto yy369;
-                       default:        goto yy52;
-                       }
-yy343:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'L':
-                       case 'l':       goto yy371;
-                       default:        goto yy52;
-                       }
-yy344:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy373;
-                       default:        goto yy52;
-                       }
-yy345:
-                       yyaccept = 45;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy346;
-                       }
-yy346:
-#line 289 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_INT16);}
-#line 5513 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy347:
-                       yyaccept = 46;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy348;
-                       }
-yy348:
-#line 291 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_INT32);}
-#line 5587 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy349:
-                       yyaccept = 47;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy350;
-                       }
-yy350:
-#line 293 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_INT64);}
-#line 5661 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy351:
-                       yyaccept = 48;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy352;
-                       }
-yy352:
-#line 316 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_PATHVAL);}
-#line 5735 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy353:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'Y':
-                       case 'y':       goto yy375;
-                       default:        goto yy52;
-                       }
-yy354:
-                       yyaccept = 49;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy355;
-                       }
-yy355:
-#line 330 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TO_BOOL);}
-#line 5817 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy356:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy377;
-                       default:        goto yy52;
-                       }
-yy357:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'C':
-                       case 'c':       goto yy379;
-                       default:        goto yy52;
-                       }
-yy358:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'N':
-                       case 'n':       goto yy380;
-                       default:        goto yy52;
-                       }
-yy359:
-                       yyaccept = 50;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy360;
-                       }
-yy360:
-#line 303 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TYPEDEF);}
-#line 5915 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy361:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy381;
-                       default:        goto yy52;
-                       }
-yy362:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy383;
-                       default:        goto yy52;
-                       }
-yy363:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy385;
-                       default:        goto yy52;
-                       }
-yy364:
-                       yyaccept = 51;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy365;
-                       }
-yy365:
-#line 288 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_UINT8);}
-#line 6013 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy366:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'D':
-                       case 'd':       goto yy387;
-                       default:        goto yy52;
-                       }
-yy367:
-                       yyaccept = 52;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy368;
-                       }
-yy368:
-#line 278 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CALLABLE);}
-#line 6095 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy369:
-                       yyaccept = 53;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy370;
-                       }
-yy370:
-#line 300 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_CALLBACK);}
-#line 6169 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy371:
-                       yyaccept = 54;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy372;
-                       }
-yy372:
-#line 318 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_FLOATVAL);}
-#line 6243 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy373:
-                       yyaccept = 55;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy374;
-                       }
-yy374:
-#line 302 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_FUNCTION);}
-#line 6317 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy375:
-                       yyaccept = 56;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy376;
-                       }
-yy376:
-#line 326 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TO_ARRAY);}
-#line 6391 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy377:
-                       yyaccept = 57;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy378;
-                       }
-yy378:
-#line 329 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TO_FLOAT);}
-#line 6465 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy379:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'T':
-                       case 't':       goto yy389;
-                       default:        goto yy52;
-                       }
-yy380:
-                       yyaccept = 5;
-                       yych = *(P->mrk = ++P->cur);
-                       switch (yych) {
-                       case 'G':
-                       case 'g':       goto yy391;
-                       default:        goto yy52;
-                       }
-yy381:
-                       yyaccept = 58;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy382;
-                       }
-yy382:
-#line 290 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_UINT16);}
-#line 6555 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy383:
-                       yyaccept = 59;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy384;
-                       }
-yy384:
-#line 292 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_UINT32);}
-#line 6629 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy385:
-                       yyaccept = 60;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy386;
+                       case 'n':       goto yy549;
+                       default:        goto yy62;
                        }
-yy386:
-#line 294 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_UINT64);}
-#line 6703 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy387:
-                       yyaccept = 61;
-                       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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy388;
+yy519:
+                       yyaccept = 63;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy520;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy520:
+#line 465 "src/parser.re"
+                       { NEWTOKEN(PSI_T_WARNING); goto start; }
+#line 8094 "src/parser.c"
+yy521:
+                       yyaccept = 64;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy522;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy522:
+#line 437 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_ASM); goto start; }
+#line 8169 "src/parser.c"
+yy523:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'b':       goto yy550;
+                       default:        goto yy62;
+                       }
+yy524:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 's':       goto yy551;
+                       default:        goto yy62;
+                       }
+yy525:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy552;
+                       default:        goto yy62;
+                       }
+yy526:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy554;
+                       default:        goto yy62;
+                       }
+yy527:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy55;
+                       case '\\':      goto yy148;
+                       case 'o':       goto yy555;
+                       default:        goto yy527;
+                       }
+yy529:
+                       yyaccept = 65;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy530;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy530:
+#line 441 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TYPEDEF); goto start; }
+#line 8346 "src/parser.c"
+yy531:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'd':       goto yy557;
+                       default:        goto yy62;
+                       }
+yy532:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy559;
+                       default:        goto yy62;
+                       }
+yy533:
+                       yyaccept = 66;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy534;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy534:
+#line 473 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLABLE); goto start; }
+#line 8435 "src/parser.c"
+yy535:
+                       yyaccept = 67;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy536;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy536:
+#line 477 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CALLBACK); goto start; }
+#line 8510 "src/parser.c"
+yy537:
+                       yyaccept = 68;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy538;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy538:
+#line 493 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FLOATVAL); goto start; }
+#line 8585 "src/parser.c"
+yy539:
+                       yyaccept = 69;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy540;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy540:
+#line 479 "src/parser.re"
+                       { NEWTOKEN(PSI_T_FUNCTION); goto start; }
+#line 8660 "src/parser.c"
+yy541:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'N':
+                       case 'n':       goto yy561;
+                       default:        goto yy62;
                        }
-yy388:
-#line 295 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_UNSIGNED);}
-#line 6777 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy389:
-                       yyaccept = 62;
-                       yych = *(P->mrk = ++P->cur);
+yy542:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 'e':       goto yy562;
+                       default:        goto yy62;
+                       }
+yy543:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'R':
-                       case 'S':
+                       case 'r':       goto yy563;
+                       default:        goto yy62;
+                       }
+yy544:
+                       yyaccept = 70;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy545;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy545:
+#line 501 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_ARRAY); goto start; }
+#line 8759 "src/parser.c"
+yy546:
+                       yyaccept = 71;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy547;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy547:
+#line 504 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_FLOAT); goto start; }
+#line 8834 "src/parser.c"
+yy548:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy390;
+                       case 't':       goto yy564;
+                       default:        goto yy62;
                        }
-yy390:
-#line 325 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TO_OBJECT);}
-#line 6851 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy391:
-                       yyaccept = 63;
-                       yych = *(P->mrk = ++P->cur);
+yy549:
+                       yyaccept = 5;
+                       yych = *(mrk = ++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 'g':       goto yy566;
+                       default:        goto yy62;
+                       }
+yy550:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'u':       goto yy568;
+                       default:        goto yy62;
+                       }
+yy551:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'i':       goto yy569;
+                       default:        goto yy62;
+                       }
+yy552:
+                       yyaccept = 72;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy553;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy553:
+#line 434 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_INLINE); goto start; }
+#line 8939 "src/parser.c"
+yy554:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'c':       goto yy570;
+                       default:        goto yy62;
+                       }
+yy555:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy55;
+                       case '\\':      goto yy148;
+                       case 'n':       goto yy571;
+                       case 'o':       goto yy555;
+                       default:        goto yy527;
+                       }
+yy557:
+                       yyaccept = 73;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy558;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy558:
+#line 454 "src/parser.re"
+                       { NEWTOKEN(PSI_T_UNSIGNED); goto start; }
+#line 9096 "src/parser.c"
+yy559:
+                       yyaccept = 74;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy560;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy560:
+#line 438 "src/parser.re"
+                       { NEWTOKEN(PSI_T_VOLATILE); goto start; }
+#line 9171 "src/parser.c"
+yy561:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'E':
+                       case 'e':       goto yy572;
+                       default:        goto yy62;
+                       }
+yy562:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'R':
-                       case 'S':
+                       case 'r':       goto yy573;
+                       default:        goto yy62;
+                       }
+yy563:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        case 'T':
-                       case 'U':
-                       case 'V':
-                       case 'W':
+                       case 't':       goto yy574;
+                       default:        goto yy62;
+                       }
+yy564:
+                       yyaccept = 75;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy565;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy565:
+#line 500 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_OBJECT); goto start; }
+#line 9270 "src/parser.c"
+yy566:
+                       yyaccept = 76;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy567;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy567:
+#line 502 "src/parser.re"
+                       { NEWTOKEN(PSI_T_TO_STRING); goto start; }
+#line 9345 "src/parser.c"
+yy568:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy576;
+                       default:        goto yy62;
+                       }
+yy569:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'o':       goto yy577;
+                       default:        goto yy62;
+                       }
+yy570:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 't':       goto yy578;
+                       default:        goto yy62;
+                       }
+yy571:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy55;
+                       case '\\':      goto yy148;
+                       case 'c':       goto yy580;
+                       case 'o':       goto yy555;
+                       default:        goto yy527;
+                       }
+yy572:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
                        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 yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy392;
+                       case 'x':       goto yy581;
+                       default:        goto yy62;
                        }
-yy392:
-#line 327 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       {RETURN(PSI_T_TO_STRING);}
-#line 6925 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy573:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy582;
+                       default:        goto yy62;
+                       }
+yy574:
+                       yyaccept = 77;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy575;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy575:
+#line 483 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PRE_ASSERT); goto start; }
+#line 9532 "src/parser.c"
+yy576:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'e':       goto yy584;
+                       default:        goto yy62;
+                       }
+yy577:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'n':       goto yy585;
+                       default:        goto yy62;
+                       }
+yy578:
+                       yyaccept = 78;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy579;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy579:
+#line 435 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_RESTRICT); goto start; }
+#line 9621 "src/parser.c"
+yy580:
+                       yyaccept = 5;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy55;
+                       case '\\':      goto yy148;
+                       case 'e':       goto yy586;
+                       case 'o':       goto yy555;
+                       default:        goto yy527;
+                       }
+yy581:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 'T':
+                       case 't':       goto yy588;
+                       default:        goto yy62;
+                       }
+yy582:
+                       yyaccept = 79;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy583;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy583:
+#line 484 "src/parser.re"
+                       { NEWTOKEN(PSI_T_POST_ASSERT); goto start; }
+#line 9779 "src/parser.c"
+yy584:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy590;
+                       default:        goto yy62;
+                       }
+yy585:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy591;
+                       default:        goto yy62;
+                       }
+yy586:
+                       yyaccept = 80;
+                       mrk = ++cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy587;
+                       case '\\':      goto yy148;
+                       case 'o':       goto yy555;
+                       default:        goto yy527;
+                       }
+yy587:
+#line 433 "src/parser.re"
+                       { NEWTOKEN(PSI_T_PRAGMA_ONCE); goto start; }
+#line 9871 "src/parser.c"
+yy588:
+                       yyaccept = 81;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy589;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy589:
+#line 468 "src/parser.re"
+                       { NEWTOKEN(PSI_T_INCLUDE_NEXT); goto start; }
+#line 9946 "src/parser.c"
+yy590:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy592;
+                       default:        goto yy62;
+                       }
+yy591:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '_':       goto yy593;
+                       default:        goto yy62;
+                       }
+yy592:
+                       yyaccept = 5;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case '\t':
+                       case '\f':
+                       case ' ':       goto yy595;
+                       case '(':       goto yy597;
+                       default:        goto yy62;
+                       }
+yy593:
+                       yyaccept = 82;
+                       yych = *(mrk = ++cur);
+                       switch (yych) {
+                       case 0x00:
+                       case 0x01:
+                       case 0x02:
+                       case 0x03:
+                       case 0x04:
+                       case 0x05:
+                       case 0x06:
+                       case 0x07:
+                       case 0x08:
+                       case '\t':
+                       case '\n':
+                       case '\v':
+                       case '\f':
+                       case '\r':
+                       case 0x0E:
+                       case 0x0F:
+                       case 0x10:
+                       case 0x11:
+                       case 0x12:
+                       case 0x13:
+                       case 0x14:
+                       case 0x15:
+                       case 0x16:
+                       case 0x17:
+                       case 0x18:
+                       case 0x19:
+                       case 0x1A:
+                       case 0x1B:
+                       case 0x1C:
+                       case 0x1D:
+                       case 0x1E:
+                       case 0x1F:
+                       case ' ':
+                       case '!':
+                       case '"':
+                       case '#':
+                       case '$':
+                       case '%':
+                       case '&':
+                       case '\'':
+                       case '(':
+                       case ')':
+                       case '*':
+                       case '+':
+                       case ',':
+                       case '-':
+                       case '.':
+                       case '/':
+                       case ':':
+                       case ';':
+                       case '<':
+                       case '=':
+                       case '>':
+                       case '?':
+                       case '@':
+                       case '[':
+                       case ']':
+                       case '^':
+                       case '`':
+                       case '{':
+                       case '|':
+                       case '}':
+                       case '~':
+                       case 0x7F:      goto yy594;
+                       case '\\':      goto yy148;
+                       default:        goto yy61;
+                       }
+yy594:
+#line 436 "src/parser.re"
+                       { NEWTOKEN(PSI_T_CPP_EXTENSION); goto start; }
+#line 10045 "src/parser.c"
+yy595:
+                       ++cur;
+                       if ((lim - cur) < 2) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case '\t':
+                       case '\f':
+                       case ' ':       goto yy595;
+                       case '(':       goto yy597;
+                       default:        goto yy114;
+                       }
+yy597:
+                       yych = *++cur;
+                       switch (yych) {
+                       case '(':       goto yy598;
+                       default:        goto yy114;
+                       }
+yy598:
+                       ++cur;
+#line 510 "src/parser.re"
+                       { parens = 2; goto cpp_attribute; }
+#line 10067 "src/parser.c"
                }
-#line 337 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 516 "src/parser.re"
 
 
-       comment:
-               P->tok = P->cur;
+       character: ;
                
-#line 6933 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 10074 "src/parser.c"
                {
                        unsigned char yych;
-                       if ((P->lim - P->cur) < 2) { if (!psi_parser_fill(P,2)) RETURN(PSI_T_EOF); };
-                       yych = *P->cur;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
                        switch (yych) {
-                       case '\n':      goto yy397;
-                       case '*':       goto yy399;
-                       default:        goto yy395;
-                       }
-yy395:
-                       ++P->cur;
-yy396:
-#line 344 "/home/mike/src/php-master/ext/psi/src/parser.re"
+                       case '\n':
+                       case '\r':      goto yy604;
+                       case '\'':      goto yy606;
+                       case '\\':      goto yy608;
+                       default:        goto yy602;
+                       }
+yy602:
+                       ++cur;
+#line 534 "src/parser.re"
+                       { escaped = false; goto character; }
+#line 10090 "src/parser.c"
+yy604:
+                       ++cur;
+#line 521 "src/parser.re"
+                       { NEWLINE(); goto character; }
+#line 10095 "src/parser.c"
+yy606:
+                       ++cur;
+#line 523 "src/parser.re"
+                       {
+                       if (escaped) {
+                               escaped = false;
+                               goto character;
+                       }
+                       cur -= 1;
+                       NEWTOKEN(PSI_T_QUOTED_CHAR);
+                       cur += 1;
+                       token->flags = char_width;
+                       goto start;
+               }
+#line 10110 "src/parser.c"
+yy608:
+                       ++cur;
+#line 522 "src/parser.re"
+                       { escaped = !escaped;  goto character; }
+#line 10115 "src/parser.c"
+               }
+#line 536 "src/parser.re"
+
+
+       string: ;
+               
+#line 10122 "src/parser.c"
+               {
+                       unsigned char yych;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case '\n':
+                       case '\r':      goto yy614;
+                       case '"':       goto yy616;
+                       case '\\':      goto yy618;
+                       default:        goto yy612;
+                       }
+yy612:
+                       ++cur;
+#line 554 "src/parser.re"
+                       { escaped = false; goto string; }
+#line 10138 "src/parser.c"
+yy614:
+                       ++cur;
+#line 541 "src/parser.re"
+                       { NEWLINE(); goto string; }
+#line 10143 "src/parser.c"
+yy616:
+                       ++cur;
+#line 543 "src/parser.re"
+                       {
+                       if (escaped) {
+                               escaped = false;
+                               goto string;
+                       }
+                       cur -= 1;
+                       NEWTOKEN(PSI_T_QUOTED_STRING);
+                       cur += 1;
+                       token->flags = char_width;
+                       goto start;
+               }
+#line 10158 "src/parser.c"
+yy618:
+                       ++cur;
+#line 542 "src/parser.re"
+                       { escaped = !escaped; goto string; }
+#line 10163 "src/parser.c"
+               }
+#line 556 "src/parser.re"
+
+
+       comment: ;
+               
+#line 10170 "src/parser.c"
+               {
+                       unsigned char yych;
+                       if ((lim - cur) < 2) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case '\n':
+                       case '\r':      goto yy624;
+                       case '*':       goto yy626;
+                       default:        goto yy622;
+                       }
+yy622:
+                       ++cur;
+yy623:
+#line 563 "src/parser.re"
                        { goto comment; }
-#line 6948 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy397:
-                       ++P->cur;
-#line 342 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       { NEWLINE(comment); }
-#line 6953 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy399:
-                       yych = *++P->cur;
+#line 10186 "src/parser.c"
+yy624:
+                       ++cur;
+#line 561 "src/parser.re"
+                       { NEWLINE(); goto comment; }
+#line 10191 "src/parser.c"
+yy626:
+                       yych = *++cur;
+                       switch (yych) {
+                       case '/':       goto yy627;
+                       default:        goto yy623;
+                       }
+yy627:
+                       ++cur;
+#line 562 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COMMENT); goto start; }
+#line 10202 "src/parser.c"
+               }
+#line 565 "src/parser.re"
+
+
+       comment_sl: ;
+               
+#line 10209 "src/parser.c"
+               {
+                       unsigned char yych;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
                        switch (yych) {
-                       case '/':       goto yy400;
-                       default:        goto yy396;
-                       }
-yy400:
-                       ++P->cur;
-#line 343 "/home/mike/src/php-master/ext/psi/src/parser.re"
-                       { continue; }
-#line 6964 "/home/mike/src/php-master/ext/psi/src/parser.c"
+                       case '\n':
+                       case '\r':      goto yy633;
+                       default:        goto yy631;
+                       }
+yy631:
+                       ++cur;
+#line 571 "src/parser.re"
+                       { goto comment_sl; }
+#line 10223 "src/parser.c"
+yy633:
+                       ++cur;
+#line 570 "src/parser.re"
+                       { NEWTOKEN(PSI_T_COMMENT); NEWLINE(); goto start; }
+#line 10228 "src/parser.c"
                }
-#line 345 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 573 "src/parser.re"
 
-       }
-       return -1;
+
+       cpp_attribute: ;
+
+               
+#line 10236 "src/parser.c"
+               {
+                       unsigned char yych;
+                       if (lim <= cur) if (cur >= lim) goto done;;
+                       yych = *cur;
+                       switch (yych) {
+                       case '\n':
+                       case '\r':      goto yy639;
+                       case '(':       goto yy641;
+                       case ')':       goto yy643;
+                       default:        goto yy637;
+                       }
+yy637:
+                       ++cur;
+#line 582 "src/parser.re"
+                       { goto cpp_attribute; }
+#line 10252 "src/parser.c"
+yy639:
+                       ++cur;
+#line 581 "src/parser.re"
+                       { NEWLINE(); goto cpp_attribute; }
+#line 10257 "src/parser.c"
+yy641:
+                       ++cur;
+#line 579 "src/parser.re"
+                       { ++parens; goto cpp_attribute; }
+#line 10262 "src/parser.c"
+yy643:
+                       ++cur;
+#line 580 "src/parser.re"
+                       { if (parens == 1) { NEWTOKEN(PSI_T_CPP_ATTRIBUTE); goto start; } else { --parens; goto cpp_attribute; } }
+#line 10267 "src/parser.c"
+               }
+#line 584 "src/parser.re"
+
+error: ;
+
+       P->error(PSI_DATA(P), token, PSI_WARNING, "PSI syntax error: unexpected input (%d) '%.*s' at col %tu",
+                       token->type, token->size, token->text, tok - eol + 1);
+       psi_plist_free(tokens);
+       return NULL;
+
+done:
+
+       PSI_DEBUG_PRINT(P, "PSI: EOF cur=%p lim=%p\n", cur, lim);
+
+       return tokens;
 }