calc: boolean expressions
authorMichael Wallner <mike@php.net>
Thu, 9 Feb 2017 13:40:22 +0000 (14:40 +0100)
committerMichael Wallner <mike@php.net>
Thu, 9 Feb 2017 13:40:22 +0000 (14:40 +0100)
17 files changed:
Makefile.frag
scripts/gen_cmp.php [new file with mode: 0644]
scripts/gen_int.php [new file with mode: 0644]
scripts/gen_oper.php [new file with mode: 0644]
src/calc.c
src/calc.h
src/parser.c
src/parser.re
src/parser_def.h
src/parser_proc.c
src/parser_proc.h
src/parser_proc.y
src/token.h
src/token_oper_cmp.h [new file with mode: 0644]
src/types/num_exp.c
tests/calc/calc.psi
tests/calc/calc001.phpt

index 78a3a33..06a56ee 100644 (file)
@@ -35,6 +35,10 @@ $(PHP_PSI_SRCDIR)/src/parser.re: $(PHP_PSI_SRCDIR)/src/parser_proc.h
 $(PHP_PSI_SRCDIR)/src/parser.c: $(PHP_PSI_SRCDIR)/src/parser.re
        $(RE2C) -o $@ $<
 
+$(PHP_PSI_SRCDIR)/src/token.h: $(PHP_PSI_SRCDIR)/src/token_oper_cmp.h
+$(PHP_PSI_SRCDIR)/src/token_oper_cmp.h: $(PHP_PSI_SRCDIR)/scripts/gen_oper.php
+       $(PHP_EXECUTABLE) $< >$@
+
 PHP_PSI_DEPEND = $(patsubst $(PHP_PSI_SRCDIR)/%,$(PHP_PSI_BUILDDIR)/%,$(PHP_PSI_SOURCES:.c=.dep))
 
 $(PHP_PSI_BUILDDIR)/%.dep: $(PHP_PSI_SRCDIR)/%.c
@@ -42,7 +46,9 @@ $(PHP_PSI_BUILDDIR)/%.dep: $(PHP_PSI_SRCDIR)/%.c
                $(CPPFLAGS) $(DEFS) $(INCLUDES) $< \
                        || touch $@
 
+token_oper_cmp.h: $(PHP_PSI_SRCDIR)/src/token_oper_cmp.h
 php_psi_stdinc.h:
+php_psi_posix.h:
 
 ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
 ifneq ($(PSI_DEPS),)
diff --git a/scripts/gen_cmp.php b/scripts/gen_cmp.php
new file mode 100644 (file)
index 0000000..89524ee
--- /dev/null
@@ -0,0 +1,27 @@
+<?php
+
+$types = [
+               "FLOAT" => "fval", 
+               "DOUBLE" => "dval",
+               "LONG_DOUBLE" => "ldval",
+               "INT8" => "i8",
+               "UINT8" => "u8",
+               "INT16" => "i16", 
+               "UINT16" => "u16",
+               "INT32" => "i32", 
+               "UINT32" => "u32",
+               "INT64" => "i64", 
+               "UINT64" => "u64",
+];
+
+printf("\tswitch (t1) { \\\n");
+foreach ($types as $t1 => $f1) {
+       printf("\tcase PSI_T_%s: \\\n", $t1);
+       printf("\t\tswitch (t2) { \\\n");
+       foreach ($types as $t2 => $f2) {
+               printf("\t\tcase PSI_T_%s:\tPSI_CALC_OP2(u8, %s, %s);\tbreak; \\\n",
+                               $t2, $f1, $f2);
+       }
+       printf("\t\tEMPTY_SWITCH_DEFAULT_CASE(); \\\n\t\t} \\\n\t\tbreak; \\\n");
+}
+printf("\tEMPTY_SWITCH_DEFAULT_CASE(); \\\n\t} \\\n");
\ No newline at end of file
diff --git a/scripts/gen_int.php b/scripts/gen_int.php
new file mode 100644 (file)
index 0000000..2df05ed
--- /dev/null
@@ -0,0 +1,35 @@
+<?php
+
+$types = [
+               "INT8" => "i8",
+               "UINT8" => "u8",
+               "INT16" => "i16", 
+               "UINT16" => "u16",
+               "INT32" => "i32", 
+               "UINT32" => "u32",
+               "INT64" => "i64", 
+               "UINT64" => "u64",
+];
+
+printf("\tswitch (t1) { \\\n");
+foreach ($types as $t1 => $f1) {
+       $s1 = substr($f1, 1);
+       $u1 = $f1{0} == "u";
+       printf("\tcase PSI_T_%s: \\\n", $t1);
+       printf("\t\tswitch (t2) { \\\n");
+       foreach ($types as $t2 => $f2) {
+               $s2 = substr($f2, 1);
+               $u2 = $f2{0} == "u";
+               
+               if ($u1 && $u2)  {
+                       $fr = "u".min(64,max($s1*2,$s2*2));
+               } else {
+                       $fr = "i".min(64,max($s1*2,$s2*2));
+               }
+               
+               printf("\t\tcase PSI_T_%s:\tPSI_CALC_OP2(%s, %s, %s);\treturn PSI_T_%s; \\\n",
+                               $t2, $fr, $f1, $f2, str_replace(["u","i"], ["UINT","INT"], $fr));
+       }
+       printf("\t\tEMPTY_SWITCH_DEFAULT_CASE(); \\\n\t\t} \\\n\t\tbreak; \\\n");
+}
+printf("\tEMPTY_SWITCH_DEFAULT_CASE(); \\\n\t} \\\n");
\ No newline at end of file
diff --git a/scripts/gen_oper.php b/scripts/gen_oper.php
new file mode 100644 (file)
index 0000000..e35bc4b
--- /dev/null
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ 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.
+*******************************************************************************/
+
+static inline int psi_token_oper_cmp(token_t op1, token_t op2) {
+       switch (op1) {
+<?php
+
+$oper = [
+               ["NOT", "TILDE"],
+               ["ASTERISK", "SLASH", "MODULO"],
+               ["PLUS", "MINUS"],
+               ["LSHIFT", "RSHIFT"],
+               ["LCHEVR", "CMP_LE", "RCHEVR", "CMP_GE"],
+               ["AMPERSAND"],
+               ["CMP_EQ", "CMP_NE"],
+               ["CARET"],
+               ["PIPE"],
+               ["AND"],
+               ["OR"]
+];
+
+
+foreach ($oper as $prec1 => $ops1) {
+       foreach ($ops1 as $op1) {
+               printf("\tcase PSI_T_%s:\n", $op1);
+               printf("\t\tswitch (op2) {\n");
+               foreach ($oper as $prec2 => $ops2) {
+                       foreach ($ops2 as $op2) {
+                               printf("\t\t\tcase PSI_T_%s: %sreturn %2d;\n", $op2,
+                                               str_repeat(" ", 10 - strlen($op2)),
+                                               $prec1==$prec2?0:($prec1>$prec2?1:-1));
+                       }
+               }
+               printf("\t\t}\n\t\tassert(0);\n\t\tbreak;\n");
+       }
+}
+?>
+       }
+       assert(0);
+       return 0;
+}
index f88ab30..2dc85f4 100644 (file)
@@ -234,47 +234,112 @@ void psi_calc_cast(token_t in_type, impl_val *in_val, token_t out_type, impl_val
                } \
                return t2; \
        } else { \
-               int64_t sval1 = v1->i64, sval2 = v2->i64; \
-               uint64_t uval1 = v1->u64, uval2 = v2->u64; \
                switch (t1) { \
-               case PSI_T_INT8:        sval1 >>= 8; \
-               case PSI_T_INT16:       sval1 >>= 8; \
-               case PSI_T_INT32:       sval1 >>= 8; \
+               case PSI_T_INT8: \
+                       switch (t2) { \
+                       case PSI_T_INT8:        PSI_CALC_OP2(i16, i8, i8);      return PSI_T_INT16; \
+                       case PSI_T_UINT8:       PSI_CALC_OP2(i16, i8, u8);      return PSI_T_INT16; \
+                       case PSI_T_INT16:       PSI_CALC_OP2(i32, i8, i16);     return PSI_T_INT32; \
+                       case PSI_T_UINT16:      PSI_CALC_OP2(i32, i8, u16);     return PSI_T_INT32; \
+                       case PSI_T_INT32:       PSI_CALC_OP2(i64, i8, i32);     return PSI_T_INT64; \
+                       case PSI_T_UINT32:      PSI_CALC_OP2(i64, i8, u32);     return PSI_T_INT64; \
+                       case PSI_T_INT64:       PSI_CALC_OP2(i64, i8, i64);     return PSI_T_INT64; \
+                       case PSI_T_UINT64:      PSI_CALC_OP2(i64, i8, u64);     return PSI_T_INT64; \
+                       EMPTY_SWITCH_DEFAULT_CASE(); \
+                       } \
+                       break; \
+               case PSI_T_UINT8: \
+                       switch (t2) { \
+                       case PSI_T_INT8:        PSI_CALC_OP2(i16, u8, i8);      return PSI_T_INT16; \
+                       case PSI_T_UINT8:       PSI_CALC_OP2(u16, u8, u8);      return PSI_T_UINT16; \
+                       case PSI_T_INT16:       PSI_CALC_OP2(i32, u8, i16);     return PSI_T_INT32; \
+                       case PSI_T_UINT16:      PSI_CALC_OP2(u32, u8, u16);     return PSI_T_UINT32; \
+                       case PSI_T_INT32:       PSI_CALC_OP2(i64, u8, i32);     return PSI_T_INT64; \
+                       case PSI_T_UINT32:      PSI_CALC_OP2(u64, u8, u32);     return PSI_T_UINT64; \
+                       case PSI_T_INT64:       PSI_CALC_OP2(i64, u8, i64);     return PSI_T_INT64; \
+                       case PSI_T_UINT64:      PSI_CALC_OP2(u64, u8, u64);     return PSI_T_UINT64; \
+                       EMPTY_SWITCH_DEFAULT_CASE(); \
+                       } \
+                       break; \
+               case PSI_T_INT16: \
+                       switch (t2) { \
+                       case PSI_T_INT8:        PSI_CALC_OP2(i32, i16, i8);     return PSI_T_INT32; \
+                       case PSI_T_UINT8:       PSI_CALC_OP2(i32, i16, u8);     return PSI_T_INT32; \
+                       case PSI_T_INT16:       PSI_CALC_OP2(i32, i16, i16);    return PSI_T_INT32; \
+                       case PSI_T_UINT16:      PSI_CALC_OP2(i32, i16, u16);    return PSI_T_INT32; \
+                       case PSI_T_INT32:       PSI_CALC_OP2(i64, i16, i32);    return PSI_T_INT64; \
+                       case PSI_T_UINT32:      PSI_CALC_OP2(i64, i16, u32);    return PSI_T_INT64; \
+                       case PSI_T_INT64:       PSI_CALC_OP2(i64, i16, i64);    return PSI_T_INT64; \
+                       case PSI_T_UINT64:      PSI_CALC_OP2(i64, i16, u64);    return PSI_T_INT64; \
+                       EMPTY_SWITCH_DEFAULT_CASE(); \
+                       } \
+                       break; \
+               case PSI_T_UINT16: \
+                       switch (t2) { \
+                       case PSI_T_INT8:        PSI_CALC_OP2(i32, u16, i8);     return PSI_T_INT32; \
+                       case PSI_T_UINT8:       PSI_CALC_OP2(u32, u16, u8);     return PSI_T_UINT32; \
+                       case PSI_T_INT16:       PSI_CALC_OP2(i32, u16, i16);    return PSI_T_INT32; \
+                       case PSI_T_UINT16:      PSI_CALC_OP2(u32, u16, u16);    return PSI_T_UINT32; \
+                       case PSI_T_INT32:       PSI_CALC_OP2(i64, u16, i32);    return PSI_T_INT64; \
+                       case PSI_T_UINT32:      PSI_CALC_OP2(u64, u16, u32);    return PSI_T_UINT64; \
+                       case PSI_T_INT64:       PSI_CALC_OP2(i64, u16, i64);    return PSI_T_INT64; \
+                       case PSI_T_UINT64:      PSI_CALC_OP2(u64, u16, u64);    return PSI_T_UINT64; \
+                       EMPTY_SWITCH_DEFAULT_CASE(); \
+                       } \
+                       break; \
+               case PSI_T_INT32: \
+                       switch (t2) { \
+                       case PSI_T_INT8:        PSI_CALC_OP2(i64, i32, i8);     return PSI_T_INT64; \
+                       case PSI_T_UINT8:       PSI_CALC_OP2(i64, i32, u8);     return PSI_T_INT64; \
+                       case PSI_T_INT16:       PSI_CALC_OP2(i64, i32, i16);    return PSI_T_INT64; \
+                       case PSI_T_UINT16:      PSI_CALC_OP2(i64, i32, u16);    return PSI_T_INT64; \
+                       case PSI_T_INT32:       PSI_CALC_OP2(i64, i32, i32);    return PSI_T_INT64; \
+                       case PSI_T_UINT32:      PSI_CALC_OP2(i64, i32, u32);    return PSI_T_INT64; \
+                       case PSI_T_INT64:       PSI_CALC_OP2(i64, i32, i64);    return PSI_T_INT64; \
+                       case PSI_T_UINT64:      PSI_CALC_OP2(i64, i32, u64);    return PSI_T_INT64; \
+                       EMPTY_SWITCH_DEFAULT_CASE(); \
+                       } \
+                       break; \
+               case PSI_T_UINT32: \
+                       switch (t2) { \
+                       case PSI_T_INT8:        PSI_CALC_OP2(i64, u32, i8);     return PSI_T_INT64; \
+                       case PSI_T_UINT8:       PSI_CALC_OP2(u64, u32, u8);     return PSI_T_UINT64; \
+                       case PSI_T_INT16:       PSI_CALC_OP2(i64, u32, i16);    return PSI_T_INT64; \
+                       case PSI_T_UINT16:      PSI_CALC_OP2(u64, u32, u16);    return PSI_T_UINT64; \
+                       case PSI_T_INT32:       PSI_CALC_OP2(i64, u32, i32);    return PSI_T_INT64; \
+                       case PSI_T_UINT32:      PSI_CALC_OP2(u64, u32, u32);    return PSI_T_UINT64; \
+                       case PSI_T_INT64:       PSI_CALC_OP2(i64, u32, i64);    return PSI_T_INT64; \
+                       case PSI_T_UINT64:      PSI_CALC_OP2(u64, u32, u64);    return PSI_T_UINT64; \
+                       EMPTY_SWITCH_DEFAULT_CASE(); \
+                       } \
+                       break; \
                case PSI_T_INT64: \
                        switch (t2) { \
-                       case PSI_T_INT8:        sval2 >>= 8; \
-                       case PSI_T_INT16:       sval2 >>= 8; \
-                       case PSI_T_INT32:       sval2 >>= 8; \
-                       case PSI_T_INT64: \
-                               res->i64 = PSI_CALC(sval1 , sval2); \
-                               return PSI_T_INT64; \
-                       case PSI_T_UINT8:       uval2 >>= 8; \
-                       case PSI_T_UINT16:      uval2 >>= 8; \
-                       case PSI_T_UINT32:      uval2 >>= 8; \
-                       case PSI_T_UINT64: \
-                               res->i64 = PSI_CALC(sval1, uval2); \
-                               return PSI_T_INT64; \
+                       case PSI_T_INT8:        PSI_CALC_OP2(i64, i64, i8);     return PSI_T_INT64; \
+                       case PSI_T_UINT8:       PSI_CALC_OP2(i64, i64, u8);     return PSI_T_INT64; \
+                       case PSI_T_INT16:       PSI_CALC_OP2(i64, i64, i16);    return PSI_T_INT64; \
+                       case PSI_T_UINT16:      PSI_CALC_OP2(i64, i64, u16);    return PSI_T_INT64; \
+                       case PSI_T_INT32:       PSI_CALC_OP2(i64, i64, i32);    return PSI_T_INT64; \
+                       case PSI_T_UINT32:      PSI_CALC_OP2(i64, i64, u32);    return PSI_T_INT64; \
+                       case PSI_T_INT64:       PSI_CALC_OP2(i64, i64, i64);    return PSI_T_INT64; \
+                       case PSI_T_UINT64:      PSI_CALC_OP2(i64, i64, u64);    return PSI_T_INT64; \
+                       EMPTY_SWITCH_DEFAULT_CASE(); \
                        } \
                        break; \
-               case PSI_T_UINT8:       uval1 >>= 8; \
-               case PSI_T_UINT16:      uval1 >>= 8; \
-               case PSI_T_UINT32:      uval1 >>= 8; \
                case PSI_T_UINT64: \
                        switch (t2) { \
-                       case PSI_T_INT8:        sval2 >>= 8; \
-                       case PSI_T_INT16:       sval2 >>= 8; \
-                       case PSI_T_INT32:       sval2 >>= 8; \
-                       case PSI_T_INT64: \
-                               res->i64 = PSI_CALC(uval1, sval2); \
-                               return PSI_T_INT64; \
-                       case PSI_T_UINT8:       uval2 >>= 8; \
-                       case PSI_T_UINT16:      uval2 >>= 8; \
-                       case PSI_T_UINT32:      uval2 >>= 8; \
-                       case PSI_T_UINT64: \
-                               res->u64 = PSI_CALC(uval1, uval2); \
-                               return PSI_T_UINT64; \
+                       case PSI_T_INT8:        PSI_CALC_OP2(i64, u64, i8);     return PSI_T_INT64; \
+                       case PSI_T_UINT8:       PSI_CALC_OP2(u64, u64, u8);     return PSI_T_UINT64; \
+                       case PSI_T_INT16:       PSI_CALC_OP2(i64, u64, i16);    return PSI_T_INT64; \
+                       case PSI_T_UINT16:      PSI_CALC_OP2(u64, u64, u16);    return PSI_T_UINT64; \
+                       case PSI_T_INT32:       PSI_CALC_OP2(i64, u64, i32);    return PSI_T_INT64; \
+                       case PSI_T_UINT32:      PSI_CALC_OP2(u64, u64, u32);    return PSI_T_UINT64; \
+                       case PSI_T_INT64:       PSI_CALC_OP2(i64, u64, i64);    return PSI_T_INT64; \
+                       case PSI_T_UINT64:      PSI_CALC_OP2(u64, u64, u64);    return PSI_T_UINT64; \
+                       EMPTY_SWITCH_DEFAULT_CASE(); \
                        } \
                        break; \
+               EMPTY_SWITCH_DEFAULT_CASE(); \
                } \
        } \
        assert(0); \
@@ -332,6 +397,225 @@ PSI_CALC_BIT_FN(bin_xor)
 PSI_CALC_BIT_FN(bin_or)
 #undef PSI_CALC
 
+#define PSI_CALC_CMP_FN(op) token_t psi_calc_##op(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res) \
+{ \
+       switch (t1) { \
+       case PSI_T_FLOAT: \
+               switch (t2) { \
+               case PSI_T_FLOAT:       PSI_CALC_OP2(u8, fval, fval);   break; \
+               case PSI_T_DOUBLE:      PSI_CALC_OP2(u8, fval, dval);   break; \
+               case PSI_T_LONG_DOUBLE: PSI_CALC_OP2(u8, fval, ldval);  break; \
+               case PSI_T_INT8:        PSI_CALC_OP2(u8, fval, i8);     break; \
+               case PSI_T_UINT8:       PSI_CALC_OP2(u8, fval, u8);     break; \
+               case PSI_T_INT16:       PSI_CALC_OP2(u8, fval, i16);    break; \
+               case PSI_T_UINT16:      PSI_CALC_OP2(u8, fval, u16);    break; \
+               case PSI_T_INT32:       PSI_CALC_OP2(u8, fval, i32);    break; \
+               case PSI_T_UINT32:      PSI_CALC_OP2(u8, fval, u32);    break; \
+               case PSI_T_INT64:       PSI_CALC_OP2(u8, fval, i64);    break; \
+               case PSI_T_UINT64:      PSI_CALC_OP2(u8, fval, u64);    break; \
+               EMPTY_SWITCH_DEFAULT_CASE(); \
+               } \
+               break; \
+       case PSI_T_DOUBLE: \
+               switch (t2) { \
+               case PSI_T_FLOAT:       PSI_CALC_OP2(u8, dval, fval);   break; \
+               case PSI_T_DOUBLE:      PSI_CALC_OP2(u8, dval, dval);   break; \
+               case PSI_T_LONG_DOUBLE: PSI_CALC_OP2(u8, dval, ldval);  break; \
+               case PSI_T_INT8:        PSI_CALC_OP2(u8, dval, i8);     break; \
+               case PSI_T_UINT8:       PSI_CALC_OP2(u8, dval, u8);     break; \
+               case PSI_T_INT16:       PSI_CALC_OP2(u8, dval, i16);    break; \
+               case PSI_T_UINT16:      PSI_CALC_OP2(u8, dval, u16);    break; \
+               case PSI_T_INT32:       PSI_CALC_OP2(u8, dval, i32);    break; \
+               case PSI_T_UINT32:      PSI_CALC_OP2(u8, dval, u32);    break; \
+               case PSI_T_INT64:       PSI_CALC_OP2(u8, dval, i64);    break; \
+               case PSI_T_UINT64:      PSI_CALC_OP2(u8, dval, u64);    break; \
+               EMPTY_SWITCH_DEFAULT_CASE(); \
+               } \
+               break; \
+       case PSI_T_LONG_DOUBLE: \
+               switch (t2) { \
+               case PSI_T_FLOAT:       PSI_CALC_OP2(u8, ldval, fval);  break; \
+               case PSI_T_DOUBLE:      PSI_CALC_OP2(u8, ldval, dval);  break; \
+               case PSI_T_LONG_DOUBLE: PSI_CALC_OP2(u8, ldval, ldval); break; \
+               case PSI_T_INT8:        PSI_CALC_OP2(u8, ldval, i8);    break; \
+               case PSI_T_UINT8:       PSI_CALC_OP2(u8, ldval, u8);    break; \
+               case PSI_T_INT16:       PSI_CALC_OP2(u8, ldval, i16);   break; \
+               case PSI_T_UINT16:      PSI_CALC_OP2(u8, ldval, u16);   break; \
+               case PSI_T_INT32:       PSI_CALC_OP2(u8, ldval, i32);   break; \
+               case PSI_T_UINT32:      PSI_CALC_OP2(u8, ldval, u32);   break; \
+               case PSI_T_INT64:       PSI_CALC_OP2(u8, ldval, i64);   break; \
+               case PSI_T_UINT64:      PSI_CALC_OP2(u8, ldval, u64);   break; \
+               EMPTY_SWITCH_DEFAULT_CASE(); \
+               } \
+               break; \
+       case PSI_T_INT8: \
+               switch (t2) { \
+               case PSI_T_FLOAT:       PSI_CALC_OP2(u8, i8, fval);     break; \
+               case PSI_T_DOUBLE:      PSI_CALC_OP2(u8, i8, dval);     break; \
+               case PSI_T_LONG_DOUBLE: PSI_CALC_OP2(u8, i8, ldval);    break; \
+               case PSI_T_INT8:        PSI_CALC_OP2(u8, i8, i8);       break; \
+               case PSI_T_UINT8:       PSI_CALC_OP2(u8, i8, u8);       break; \
+               case PSI_T_INT16:       PSI_CALC_OP2(u8, i8, i16);      break; \
+               case PSI_T_UINT16:      PSI_CALC_OP2(u8, i8, u16);      break; \
+               case PSI_T_INT32:       PSI_CALC_OP2(u8, i8, i32);      break; \
+               case PSI_T_UINT32:      PSI_CALC_OP2(u8, i8, u32);      break; \
+               case PSI_T_INT64:       PSI_CALC_OP2(u8, i8, i64);      break; \
+               case PSI_T_UINT64:      PSI_CALC_OP2(u8, i8, u64);      break; \
+               EMPTY_SWITCH_DEFAULT_CASE(); \
+               } \
+               break; \
+       case PSI_T_UINT8: \
+               switch (t2) { \
+               case PSI_T_FLOAT:       PSI_CALC_OP2(u8, u8, fval);     break; \
+               case PSI_T_DOUBLE:      PSI_CALC_OP2(u8, u8, dval);     break; \
+               case PSI_T_LONG_DOUBLE: PSI_CALC_OP2(u8, u8, ldval);    break; \
+               case PSI_T_INT8:        PSI_CALC_OP2(u8, u8, i8);       break; \
+               case PSI_T_UINT8:       PSI_CALC_OP2(u8, u8, u8);       break; \
+               case PSI_T_INT16:       PSI_CALC_OP2(u8, u8, i16);      break; \
+               case PSI_T_UINT16:      PSI_CALC_OP2(u8, u8, u16);      break; \
+               case PSI_T_INT32:       PSI_CALC_OP2(u8, u8, i32);      break; \
+               case PSI_T_UINT32:      PSI_CALC_OP2(u8, u8, u32);      break; \
+               case PSI_T_INT64:       PSI_CALC_OP2(u8, u8, i64);      break; \
+               case PSI_T_UINT64:      PSI_CALC_OP2(u8, u8, u64);      break; \
+               EMPTY_SWITCH_DEFAULT_CASE(); \
+               } \
+               break; \
+       case PSI_T_INT16: \
+               switch (t2) { \
+               case PSI_T_FLOAT:       PSI_CALC_OP2(u8, i16, fval);    break; \
+               case PSI_T_DOUBLE:      PSI_CALC_OP2(u8, i16, dval);    break; \
+               case PSI_T_LONG_DOUBLE: PSI_CALC_OP2(u8, i16, ldval);   break; \
+               case PSI_T_INT8:        PSI_CALC_OP2(u8, i16, i8);      break; \
+               case PSI_T_UINT8:       PSI_CALC_OP2(u8, i16, u8);      break; \
+               case PSI_T_INT16:       PSI_CALC_OP2(u8, i16, i16);     break; \
+               case PSI_T_UINT16:      PSI_CALC_OP2(u8, i16, u16);     break; \
+               case PSI_T_INT32:       PSI_CALC_OP2(u8, i16, i32);     break; \
+               case PSI_T_UINT32:      PSI_CALC_OP2(u8, i16, u32);     break; \
+               case PSI_T_INT64:       PSI_CALC_OP2(u8, i16, i64);     break; \
+               case PSI_T_UINT64:      PSI_CALC_OP2(u8, i16, u64);     break; \
+               EMPTY_SWITCH_DEFAULT_CASE(); \
+               } \
+               break; \
+       case PSI_T_UINT16: \
+               switch (t2) { \
+               case PSI_T_FLOAT:       PSI_CALC_OP2(u8, u16, fval);    break; \
+               case PSI_T_DOUBLE:      PSI_CALC_OP2(u8, u16, dval);    break; \
+               case PSI_T_LONG_DOUBLE: PSI_CALC_OP2(u8, u16, ldval);   break; \
+               case PSI_T_INT8:        PSI_CALC_OP2(u8, u16, i8);      break; \
+               case PSI_T_UINT8:       PSI_CALC_OP2(u8, u16, u8);      break; \
+               case PSI_T_INT16:       PSI_CALC_OP2(u8, u16, i16);     break; \
+               case PSI_T_UINT16:      PSI_CALC_OP2(u8, u16, u16);     break; \
+               case PSI_T_INT32:       PSI_CALC_OP2(u8, u16, i32);     break; \
+               case PSI_T_UINT32:      PSI_CALC_OP2(u8, u16, u32);     break; \
+               case PSI_T_INT64:       PSI_CALC_OP2(u8, u16, i64);     break; \
+               case PSI_T_UINT64:      PSI_CALC_OP2(u8, u16, u64);     break; \
+               EMPTY_SWITCH_DEFAULT_CASE(); \
+               } \
+               break; \
+       case PSI_T_INT32: \
+               switch (t2) { \
+               case PSI_T_FLOAT:       PSI_CALC_OP2(u8, i32, fval);    break; \
+               case PSI_T_DOUBLE:      PSI_CALC_OP2(u8, i32, dval);    break; \
+               case PSI_T_LONG_DOUBLE: PSI_CALC_OP2(u8, i32, ldval);   break; \
+               case PSI_T_INT8:        PSI_CALC_OP2(u8, i32, i8);      break; \
+               case PSI_T_UINT8:       PSI_CALC_OP2(u8, i32, u8);      break; \
+               case PSI_T_INT16:       PSI_CALC_OP2(u8, i32, i16);     break; \
+               case PSI_T_UINT16:      PSI_CALC_OP2(u8, i32, u16);     break; \
+               case PSI_T_INT32:       PSI_CALC_OP2(u8, i32, i32);     break; \
+               case PSI_T_UINT32:      PSI_CALC_OP2(u8, i32, u32);     break; \
+               case PSI_T_INT64:       PSI_CALC_OP2(u8, i32, i64);     break; \
+               case PSI_T_UINT64:      PSI_CALC_OP2(u8, i32, u64);     break; \
+               EMPTY_SWITCH_DEFAULT_CASE(); \
+               } \
+               break; \
+       case PSI_T_UINT32: \
+               switch (t2) { \
+               case PSI_T_FLOAT:       PSI_CALC_OP2(u8, u32, fval);    break; \
+               case PSI_T_DOUBLE:      PSI_CALC_OP2(u8, u32, dval);    break; \
+               case PSI_T_LONG_DOUBLE: PSI_CALC_OP2(u8, u32, ldval);   break; \
+               case PSI_T_INT8:        PSI_CALC_OP2(u8, u32, i8);      break; \
+               case PSI_T_UINT8:       PSI_CALC_OP2(u8, u32, u8);      break; \
+               case PSI_T_INT16:       PSI_CALC_OP2(u8, u32, i16);     break; \
+               case PSI_T_UINT16:      PSI_CALC_OP2(u8, u32, u16);     break; \
+               case PSI_T_INT32:       PSI_CALC_OP2(u8, u32, i32);     break; \
+               case PSI_T_UINT32:      PSI_CALC_OP2(u8, u32, u32);     break; \
+               case PSI_T_INT64:       PSI_CALC_OP2(u8, u32, i64);     break; \
+               case PSI_T_UINT64:      PSI_CALC_OP2(u8, u32, u64);     break; \
+               EMPTY_SWITCH_DEFAULT_CASE(); \
+               } \
+               break; \
+       case PSI_T_INT64: \
+               switch (t2) { \
+               case PSI_T_FLOAT:       PSI_CALC_OP2(u8, i64, fval);    break; \
+               case PSI_T_DOUBLE:      PSI_CALC_OP2(u8, i64, dval);    break; \
+               case PSI_T_LONG_DOUBLE: PSI_CALC_OP2(u8, i64, ldval);   break; \
+               case PSI_T_INT8:        PSI_CALC_OP2(u8, i64, i8);      break; \
+               case PSI_T_UINT8:       PSI_CALC_OP2(u8, i64, u8);      break; \
+               case PSI_T_INT16:       PSI_CALC_OP2(u8, i64, i16);     break; \
+               case PSI_T_UINT16:      PSI_CALC_OP2(u8, i64, u16);     break; \
+               case PSI_T_INT32:       PSI_CALC_OP2(u8, i64, i32);     break; \
+               case PSI_T_UINT32:      PSI_CALC_OP2(u8, i64, u32);     break; \
+               case PSI_T_INT64:       PSI_CALC_OP2(u8, i64, i64);     break; \
+               case PSI_T_UINT64:      PSI_CALC_OP2(u8, i64, u64);     break; \
+               EMPTY_SWITCH_DEFAULT_CASE(); \
+               } \
+               break; \
+       case PSI_T_UINT64: \
+               switch (t2) { \
+               case PSI_T_FLOAT:       PSI_CALC_OP2(u8, u64, fval);    break; \
+               case PSI_T_DOUBLE:      PSI_CALC_OP2(u8, u64, dval);    break; \
+               case PSI_T_LONG_DOUBLE: PSI_CALC_OP2(u8, u64, ldval);   break; \
+               case PSI_T_INT8:        PSI_CALC_OP2(u8, u64, i8);      break; \
+               case PSI_T_UINT8:       PSI_CALC_OP2(u8, u64, u8);      break; \
+               case PSI_T_INT16:       PSI_CALC_OP2(u8, u64, i16);     break; \
+               case PSI_T_UINT16:      PSI_CALC_OP2(u8, u64, u16);     break; \
+               case PSI_T_INT32:       PSI_CALC_OP2(u8, u64, i32);     break; \
+               case PSI_T_UINT32:      PSI_CALC_OP2(u8, u64, u32);     break; \
+               case PSI_T_INT64:       PSI_CALC_OP2(u8, u64, i64);     break; \
+               case PSI_T_UINT64:      PSI_CALC_OP2(u8, u64, u64);     break; \
+               EMPTY_SWITCH_DEFAULT_CASE(); \
+               } \
+               break; \
+       EMPTY_SWITCH_DEFAULT_CASE(); \
+       } \
+       return PSI_T_UINT8; \
+}
+
+#define PSI_CALC(var1, var2) (var1) == (var2)
+PSI_CALC_CMP_FN(cmp_eq)
+#undef PSI_CALC
+#define PSI_CALC(var1, var2) (var1) != (var2)
+PSI_CALC_CMP_FN(cmp_ne)
+#undef PSI_CALC
+#define PSI_CALC(var1, var2) (var1) <= (var2)
+PSI_CALC_CMP_FN(cmp_le)
+#undef PSI_CALC
+#define PSI_CALC(var1, var2) (var1) >= (var2)
+PSI_CALC_CMP_FN(cmp_ge)
+#undef PSI_CALC
+#define PSI_CALC(var1, var2) (var1) < (var2)
+PSI_CALC_CMP_FN(cmp_lt)
+#undef PSI_CALC
+#define PSI_CALC(var1, var2) (var1) > (var2)
+PSI_CALC_CMP_FN(cmp_gt)
+#undef PSI_CALC
+
+#define PSI_CALC_BOOL_FN(op) token_t psi_calc_##op(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res) \
+{ \
+       impl_val i1, i2; \
+       PSI_CALC_CAST(t1, v1, =!!, PSI_T_UINT8, &i1); \
+       PSI_CALC_CAST(t2, v2, =!!, PSI_T_UINT8, &i2); \
+       res->u8 = PSI_CALC(i1.u8, i2.u8); \
+       return PSI_T_UINT8; \
+}
+
+#define PSI_CALC(var1, var2) (var1) && (var2)
+PSI_CALC_BOOL_FN(and)
+#undef PSI_CALC
+#define PSI_CALC(var1, var2) (var1) || (var2)
+PSI_CALC_BOOL_FN(or)
+#undef PSI_CALC
+
 token_t psi_calc_not(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res)
 {
        (void) t2;
index 8e1ea6b..dbbb116 100644 (file)
@@ -50,6 +50,16 @@ token_t psi_calc_bin_and(token_t t1, impl_val *v1, token_t t2, impl_val *v2, imp
 token_t psi_calc_bin_xor(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
 token_t psi_calc_bin_or(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
 
+token_t psi_calc_and(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
+token_t psi_calc_or(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
+
+token_t psi_calc_cmp_eq(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
+token_t psi_calc_cmp_ne(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
+token_t psi_calc_cmp_le(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
+token_t psi_calc_cmp_ge(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
+token_t psi_calc_cmp_lt(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
+token_t psi_calc_cmp_gt(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
+
 void psi_calc_cast(token_t in_type, impl_val *in_val, token_t out_type, impl_val *out_val);
 
 #endif
index e4ea9d6..ef1fb85 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.16 on Mon Feb  6 11:59:53 2017 */
+/* Generated by re2c 0.16 on Thu Feb  9 14:38:14 2017 */
 #line 1 "/home/mike/src/php-master/ext/psi/src/parser.re"
 #include "php_psi_stdinc.h"
 #include <sys/mman.h>
@@ -268,20 +268,20 @@ token_t psi_parser_scan(struct psi_parser *P)
                        case ':':       goto yy36;
                        case ';':       goto yy38;
                        case '<':       goto yy40;
-                       case '=':       goto yy41;
-                       case '>':       goto yy43;
+                       case '=':       goto yy42;
+                       case '>':       goto yy44;
                        case 'A':
-                       case 'a':       goto yy44;
+                       case 'a':       goto yy46;
                        case 'B':
-                       case 'b':       goto yy46;
+                       case 'b':       goto yy48;
                        case 'C':
-                       case 'c':       goto yy47;
+                       case 'c':       goto yy49;
                        case 'D':
-                       case 'd':       goto yy48;
+                       case 'd':       goto yy50;
                        case 'E':
-                       case 'e':       goto yy49;
+                       case 'e':       goto yy51;
                        case 'F':
-                       case 'f':       goto yy50;
+                       case 'f':       goto yy52;
                        case 'G':
                        case 'H':
                        case 'J':
@@ -298,45 +298,45 @@ token_t psi_parser_scan(struct psi_parser *P)
                        case 'q':
                        case 'w':
                        case 'x':
-                       case 'y':       goto yy51;
+                       case 'y':       goto yy53;
                        case 'I':
-                       case 'i':       goto yy53;
+                       case 'i':       goto yy55;
                        case 'L':
-                       case 'l':       goto yy54;
+                       case 'l':       goto yy56;
                        case 'M':
-                       case 'm':       goto yy55;
+                       case 'm':       goto yy57;
                        case 'N':
-                       case 'n':       goto yy56;
+                       case 'n':       goto yy58;
                        case 'O':
-                       case 'o':       goto yy57;
+                       case 'o':       goto yy59;
                        case 'P':
-                       case 'p':       goto yy58;
+                       case 'p':       goto yy60;
                        case 'R':
-                       case 'r':       goto yy59;
+                       case 'r':       goto yy61;
                        case 'S':
-                       case 's':       goto yy60;
+                       case 's':       goto yy62;
                        case 'T':
-                       case 't':       goto yy61;
+                       case 't':       goto yy63;
                        case 'U':
-                       case 'u':       goto yy62;
+                       case 'u':       goto yy64;
                        case 'V':
-                       case 'v':       goto yy63;
+                       case 'v':       goto yy65;
                        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;
+                       case 'z':       goto yy66;
+                       case '[':       goto yy67;
+                       case '\\':      goto yy69;
+                       case ']':       goto yy70;
+                       case '^':       goto yy72;
+                       case '{':       goto yy74;
+                       case '|':       goto yy76;
+                       case '}':       goto yy78;
+                       case '~':       goto yy80;
                        default:        goto yy2;
                        }
 yy2:
                        ++P->cur;
 yy3:
-#line 336 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 344 "/home/mike/src/php-master/ext/psi/src/parser.re"
                        {break;}
 #line 342 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy4:
@@ -349,30 +349,35 @@ yy4:
                        default:        goto yy6;
                        }
 yy6:
-#line 273 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 281 "/home/mike/src/php-master/ext/psi/src/parser.re"
                        { continue; }
 #line 355 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy7:
                        ++P->cur;
-#line 272 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 280 "/home/mike/src/php-master/ext/psi/src/parser.re"
                        { NEWLINE(nextline); }
 #line 360 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy9:
                        ++P->cur;
-#line 261 "/home/mike/src/php-master/ext/psi/src/parser.re"
+                       switch ((yych = *P->cur)) {
+                       case '=':       goto yy82;
+                       default:        goto yy10;
+                       }
+yy10:
+#line 265 "/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"
+#line 370 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy11:
                        yyaccept = 0;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case '"':       goto yy3;
-                       default:        goto yy80;
+                       default:        goto yy84;
                        }
 yy12:
                        yyaccept = 0;
                        yych = *(P->mrk = ++P->cur);
-                       goto yy83;
+                       goto yy87;
 yy13:
                        yych = *++P->cur;
                        switch (yych) {
@@ -438,39 +443,44 @@ yy13:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy86;
+                       case 'z':       goto yy90;
                        default:        goto yy3;
                        }
 yy14:
                        ++P->cur;
-#line 262 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 266 "/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"
+#line 454 "/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"
+                       switch ((yych = *P->cur)) {
+                       case '&':       goto yy93;
+                       default:        goto yy17;
+                       }
+yy17:
+#line 267 "/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"
+#line 464 "/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"
+#line 469 "/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"
+#line 474 "/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"
+#line 263 "/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"
+#line 479 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy24:
                        yyaccept = 1;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '.':       goto yy89;
+                       case '.':       goto yy95;
                        case '0':
                        case '1':
                        case '2':
@@ -484,19 +494,19 @@ yy24:
                        default:        goto yy25;
                        }
 yy25:
-#line 264 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 268 "/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"
+#line 500 "/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"
+#line 505 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy28:
                        yyaccept = 2;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '.':       goto yy89;
+                       case '.':       goto yy95;
                        case '0':
                        case '1':
                        case '2':
@@ -510,14 +520,14 @@ yy28:
                        default:        goto yy29;
                        }
 yy29:
-#line 265 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 269 "/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"
+#line 526 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy30:
                        yyaccept = 0;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '.':       goto yy91;
+                       case '.':       goto yy97;
                        case '0':
                        case '1':
                        case '2':
@@ -527,28 +537,28 @@ yy30:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy92;
+                       case '9':       goto yy98;
                        default:        goto yy3;
                        }
 yy31:
                        yyaccept = 3;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '*':       goto yy94;
-                       case '/':       goto yy82;
+                       case '*':       goto yy100;
+                       case '/':       goto yy86;
                        default:        goto yy32;
                        }
 yy32:
-#line 266 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 270 "/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"
+#line 555 "/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 '.':       goto yy95;
                        case '0':
                        case '1':
                        case '2':
@@ -560,108 +570,123 @@ yy33:
                        case '8':
                        case '9':       goto yy33;
                        case 'E':
-                       case 'e':       goto yy96;
+                       case 'e':       goto yy102;
                        default:        goto yy35;
                        }
 yy35:
-#line 331 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 339 "/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"
+#line 580 "/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"
+#line 585 "/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"
+#line 590 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy40:
-                       yych = *++P->cur;
-                       switch (yych) {
-                       case '<':       goto yy97;
-                       default:        goto yy3;
+                       ++P->cur;
+                       switch ((yych = *P->cur)) {
+                       case '<':       goto yy103;
+                       case '=':       goto yy105;
+                       default:        goto yy41;
                        }
 yy41:
+#line 277 "/home/mike/src/php-master/ext/psi/src/parser.re"
+                       {RETURN(PSI_T_LCHEVR);}
+#line 601 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy42:
                        ++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;
+                       switch ((yych = *P->cur)) {
+                       case '=':       goto yy107;
+                       default:        goto yy43;
                        }
+yy43:
+#line 262 "/home/mike/src/php-master/ext/psi/src/parser.re"
+                       {RETURN(PSI_T_EQUALS);}
+#line 611 "/home/mike/src/php-master/ext/psi/src/parser.c"
 yy44:
+                       ++P->cur;
+                       switch ((yych = *P->cur)) {
+                       case '=':       goto yy109;
+                       case '>':       goto yy111;
+                       default:        goto yy45;
+                       }
+yy45:
+#line 278 "/home/mike/src/php-master/ext/psi/src/parser.re"
+                       {RETURN(PSI_T_RCHEVR);}
+#line 622 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy46:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy101;
-                       default:        goto yy52;
+                       case 'r':       goto yy113;
+                       default:        goto yy54;
                        }
-yy45:
-#line 332 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy47:
+#line 340 "/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:
+#line 634 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy48:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy103;
-                       default:        goto yy52;
+                       case 'o':       goto yy115;
+                       default:        goto yy54;
                        }
-yy47:
+yy49:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy104;
+                       case 'a':       goto yy116;
                        case 'H':
-                       case 'h':       goto yy105;
+                       case 'h':       goto yy117;
                        case 'O':
-                       case 'o':       goto yy106;
-                       default:        goto yy52;
+                       case 'o':       goto yy118;
+                       default:        goto yy54;
                        }
-yy48:
+yy50:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy107;
-                       default:        goto yy52;
+                       case 'o':       goto yy119;
+                       default:        goto yy54;
                        }
-yy49:
+yy51:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy108;
-                       default:        goto yy52;
+                       case 'n':       goto yy120;
+                       default:        goto yy54;
                        }
-yy50:
+yy52:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy109;
+                       case 'a':       goto yy121;
                        case 'L':
-                       case 'l':       goto yy110;
+                       case 'l':       goto yy122;
                        case 'R':
-                       case 'r':       goto yy111;
+                       case 'r':       goto yy123;
                        case 'U':
-                       case 'u':       goto yy112;
-                       default:        goto yy52;
+                       case 'u':       goto yy124;
+                       default:        goto yy54;
                        }
-yy51:
+yy53:
                        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:
+yy54:
                        switch (yych) {
                        case '0':
                        case '1':
@@ -725,130 +750,130 @@ yy52:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy45;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy47;
                        }
-yy53:
+yy55:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy113;
-                       default:        goto yy52;
+                       case 'n':       goto yy125;
+                       default:        goto yy54;
                        }
-yy54:
+yy56:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy114;
+                       case 'e':       goto yy126;
                        case 'I':
-                       case 'i':       goto yy115;
+                       case 'i':       goto yy127;
                        case 'O':
-                       case 'o':       goto yy116;
-                       default:        goto yy52;
+                       case 'o':       goto yy128;
+                       default:        goto yy54;
                        }
-yy55:
+yy57:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy117;
-                       default:        goto yy52;
+                       case 'i':       goto yy129;
+                       default:        goto yy54;
                        }
-yy56:
+yy58:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy118;
-                       default:        goto yy52;
+                       case 'u':       goto yy130;
+                       default:        goto yy54;
                        }
-yy57:
+yy59:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy119;
-                       default:        goto yy52;
+                       case 'b':       goto yy131;
+                       default:        goto yy54;
                        }
-yy58:
+yy60:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy120;
-                       default:        goto yy52;
+                       case 'a':       goto yy132;
+                       default:        goto yy54;
                        }
-yy59:
+yy61:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy121;
-                       default:        goto yy52;
+                       case 'e':       goto yy133;
+                       default:        goto yy54;
                        }
-yy60:
+yy62:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy122;
+                       case 'e':       goto yy134;
                        case 'H':
-                       case 'h':       goto yy123;
+                       case 'h':       goto yy135;
                        case 'I':
-                       case 'i':       goto yy124;
+                       case 'i':       goto yy136;
                        case 'T':
-                       case 't':       goto yy125;
-                       default:        goto yy52;
+                       case 't':       goto yy137;
+                       default:        goto yy54;
                        }
-yy61:
+yy63:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy126;
+                       case 'e':       goto yy138;
                        case 'O':
-                       case 'o':       goto yy127;
+                       case 'o':       goto yy139;
                        case 'R':
-                       case 'r':       goto yy128;
+                       case 'r':       goto yy140;
                        case 'Y':
-                       case 'y':       goto yy129;
-                       default:        goto yy52;
+                       case 'y':       goto yy141;
+                       default:        goto yy54;
                        }
-yy62:
+yy64:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy130;
+                       case 'i':       goto yy142;
                        case 'N':
-                       case 'n':       goto yy131;
-                       default:        goto yy52;
+                       case 'n':       goto yy143;
+                       default:        goto yy54;
                        }
-yy63:
+yy65:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy132;
-                       default:        goto yy52;
+                       case 'o':       goto yy144;
+                       default:        goto yy54;
                        }
-yy64:
+yy66:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy133;
-                       default:        goto yy52;
+                       case 'v':       goto yy145;
+                       default:        goto yy54;
                        }
-yy65:
+yy67:
                        ++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:
+#line 876 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy69:
                        yych = *++P->cur;
                        switch (yych) {
                        case 'A':
@@ -903,62 +928,72 @@ yy67:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy134;
+                       case 'z':       goto yy146;
                        default:        goto yy3;
                        }
-yy68:
+yy70:
                        ++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:
+#line 939 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy72:
                        ++P->cur;
-#line 268 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 272 "/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:
+#line 944 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy74:
                        ++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:
+#line 949 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy76:
                        ++P->cur;
-#line 267 "/home/mike/src/php-master/ext/psi/src/parser.re"
+                       switch ((yych = *P->cur)) {
+                       case '|':       goto yy149;
+                       default:        goto yy77;
+                       }
+yy77:
+#line 271 "/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:
+#line 959 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy78:
                        ++P->cur;
 #line 255 "/home/mike/src/php-master/ext/psi/src/parser.re"
                        {RETURN(PSI_T_RBRACE);}
-#line 934 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy78:
+#line 964 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy80:
                        ++P->cur;
-#line 260 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 264 "/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:
+#line 969 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy82:
+                       ++P->cur;
+#line 258 "/home/mike/src/php-master/ext/psi/src/parser.re"
+                       {RETURN(PSI_T_CMP_NE);}
+#line 974 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy84:
                        ++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;
+                       case '"':       goto yy151;
+                       default:        goto yy84;
                        }
-yy82:
+yy86:
                        ++P->cur;
                        if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
                        yych = *P->cur;
-yy83:
+yy87:
                        switch (yych) {
-                       case '\n':      goto yy84;
-                       default:        goto yy82;
+                       case '\n':      goto yy88;
+                       default:        goto yy86;
                        }
-yy84:
+yy88:
                        ++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:
+#line 996 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy90:
                        ++P->cur;
                        if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
                        yych = *P->cur;
@@ -1025,14 +1060,19 @@ yy86:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy86;
-                       default:        goto yy88;
+                       case 'z':       goto yy90;
+                       default:        goto yy92;
                        }
-yy88:
-#line 334 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy92:
+#line 342 "/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:
+#line 1070 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy93:
+                       ++P->cur;
+#line 260 "/home/mike/src/php-master/ext/psi/src/parser.re"
+                       {RETURN(PSI_T_AND);}
+#line 1075 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy95:
                        yych = *++P->cur;
                        switch (yych) {
                        case '0':
@@ -1044,10 +1084,10 @@ yy89:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy92;
-                       default:        goto yy90;
+                       case '9':       goto yy98;
+                       default:        goto yy96;
                        }
-yy90:
+yy96:
                        P->cur = P->mrk;
                        switch (yyaccept) {
                        case 0:         goto yy3;
@@ -1055,73 +1095,73 @@ yy90:
                        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 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 5:         goto yy47;
+                       case 6:         goto yy148;
+                       case 7:         goto yy171;
+                       case 8:         goto yy173;
+                       case 9:         goto yy175;
+                       case 10:        goto yy183;
+                       case 11:        goto yy200;
+                       case 12:        goto yy203;
+                       case 13:        goto yy208;
+                       case 14:        goto yy212;
+                       case 15:        goto yy220;
+                       case 16:        goto yy223;
+                       case 17:        goto yy236;
+                       case 18:        goto yy244;
+                       case 19:        goto yy250;
+                       case 20:        goto yy252;
+                       case 21:        goto yy254;
+                       case 22:        goto yy261;
+                       case 23:        goto yy263;
+                       case 24:        goto yy266;
+                       case 25:        goto yy268;
+                       case 26:        goto yy276;
+                       case 27:        goto yy282;
+                       case 28:        goto yy301;
+                       case 29:        goto yy304;
+                       case 30:        goto yy309;
+                       case 31:        goto yy311;
+                       case 32:        goto yy318;
+                       case 33:        goto yy320;
+                       case 34:        goto yy322;
+                       case 35:        goto yy324;
+                       case 36:        goto yy327;
+                       case 37:        goto yy329;
+                       case 38:        goto yy331;
+                       case 39:        goto yy333;
+                       case 40:        goto yy335;
+                       case 41:        goto yy337;
+                       case 42:        goto yy339;
+                       case 43:        goto yy344;
+                       case 44:        goto yy354;
+                       case 45:        goto yy360;
+                       case 46:        goto yy362;
+                       case 47:        goto yy364;
+                       case 48:        goto yy366;
+                       case 49:        goto yy369;
+                       case 50:        goto yy374;
+                       case 51:        goto yy379;
+                       case 52:        goto yy382;
+                       case 53:        goto yy384;
+                       case 54:        goto yy386;
+                       case 55:        goto yy388;
+                       case 56:        goto yy390;
+                       case 57:        goto yy392;
+                       case 58:        goto yy396;
+                       case 59:        goto yy398;
+                       case 60:        goto yy400;
+                       case 61:        goto yy402;
+                       case 62:        goto yy404;
+                       default:        goto yy406;
                        }
-yy91:
+yy97:
                        yych = *++P->cur;
                        switch (yych) {
-                       case '.':       goto yy139;
-                       default:        goto yy90;
+                       case '.':       goto yy153;
+                       default:        goto yy96;
                        }
-yy92:
+yy98:
                        yyaccept = 4;
                        P->mrk = ++P->cur;
                        if ((P->lim - P->cur) < 3) { if (!psi_parser_fill(P,3)) RETURN(PSI_T_EOF); };
@@ -1136,21 +1176,21 @@ yy92:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy92;
+                       case '9':       goto yy98;
                        case 'E':
-                       case 'e':       goto yy96;
+                       case 'e':       goto yy102;
                        default:        goto yy35;
                        }
-yy94:
+yy100:
                        ++P->cur;
 #line 247 "/home/mike/src/php-master/ext/psi/src/parser.re"
                        { goto comment; }
-#line 1149 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy96:
+#line 1189 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy102:
                        yych = *++P->cur;
                        switch (yych) {
                        case '+':
-                       case '-':       goto yy141;
+                       case '-':       goto yy155;
                        case '0':
                        case '1':
                        case '2':
@@ -1160,28 +1200,43 @@ yy96:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy142;
-                       default:        goto yy90;
+                       case '9':       goto yy156;
+                       default:        goto yy96;
                        }
-yy97:
+yy103:
                        ++P->cur;
-#line 269 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 273 "/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:
+#line 1211 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy105:
                        ++P->cur;
-#line 270 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 275 "/home/mike/src/php-master/ext/psi/src/parser.re"
+                       {RETURN(PSI_T_CMP_LE);}
+#line 1216 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy107:
+                       ++P->cur;
+#line 259 "/home/mike/src/php-master/ext/psi/src/parser.re"
+                       {RETURN(PSI_T_CMP_EQ);}
+#line 1221 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy109:
+                       ++P->cur;
+#line 276 "/home/mike/src/php-master/ext/psi/src/parser.re"
+                       {RETURN(PSI_T_CMP_GE);}
+#line 1226 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy111:
+                       ++P->cur;
+#line 274 "/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:
+#line 1231 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy113:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy144;
-                       default:        goto yy52;
+                       case 'r':       goto yy158;
+                       default:        goto yy54;
                        }
-yy102:
+yy114:
                        ++P->cur;
                        if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
                        yych = *P->cur;
@@ -1238,263 +1293,263 @@ yy102:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy134;
-                       default:        goto yy90;
+                       case 'z':       goto yy146;
+                       default:        goto yy96;
                        }
-yy103:
+yy115:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy145;
-                       default:        goto yy52;
+                       case 'o':       goto yy159;
+                       default:        goto yy54;
                        }
-yy104:
+yy116:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy146;
-                       default:        goto yy52;
+                       case 'l':       goto yy160;
+                       default:        goto yy54;
                        }
-yy105:
+yy117:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy147;
-                       default:        goto yy52;
+                       case 'a':       goto yy161;
+                       default:        goto yy54;
                        }
-yy106:
+yy118:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy148;
+                       case 'n':       goto yy162;
                        case 'U':
-                       case 'u':       goto yy149;
-                       default:        goto yy52;
+                       case 'u':       goto yy163;
+                       default:        goto yy54;
                        }
-yy107:
+yy119:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy150;
-                       default:        goto yy52;
+                       case 'u':       goto yy164;
+                       default:        goto yy54;
                        }
-yy108:
+yy120:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy151;
-                       default:        goto yy52;
+                       case 'u':       goto yy165;
+                       default:        goto yy54;
                        }
-yy109:
+yy121:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy152;
-                       default:        goto yy52;
+                       case 'l':       goto yy166;
+                       default:        goto yy54;
                        }
-yy110:
+yy122:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy153;
-                       default:        goto yy52;
+                       case 'o':       goto yy167;
+                       default:        goto yy54;
                        }
-yy111:
+yy123:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy154;
-                       default:        goto yy52;
+                       case 'e':       goto yy168;
+                       default:        goto yy54;
                        }
-yy112:
+yy124:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy155;
-                       default:        goto yy52;
+                       case 'n':       goto yy169;
+                       default:        goto yy54;
                        }
-yy113:
+yy125:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy156;
-                       default:        goto yy52;
+                       case 't':       goto yy170;
+                       default:        goto yy54;
                        }
-yy114:
+yy126:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy158;
-                       default:        goto yy52;
+                       case 't':       goto yy172;
+                       default:        goto yy54;
                        }
-yy115:
+yy127:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy160;
-                       default:        goto yy52;
+                       case 'b':       goto yy174;
+                       default:        goto yy54;
                        }
-yy116:
+yy128:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy162;
-                       default:        goto yy52;
+                       case 'n':       goto yy176;
+                       default:        goto yy54;
                        }
-yy117:
+yy129:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'X':
-                       case 'x':       goto yy163;
-                       default:        goto yy52;
+                       case 'x':       goto yy177;
+                       default:        goto yy54;
                        }
-yy118:
+yy130:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy164;
-                       default:        goto yy52;
+                       case 'l':       goto yy178;
+                       default:        goto yy54;
                        }
-yy119:
+yy131:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy165;
-                       default:        goto yy52;
+                       case 'j':       goto yy179;
+                       default:        goto yy54;
                        }
-yy120:
+yy132:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy166;
-                       default:        goto yy52;
+                       case 't':       goto yy180;
+                       default:        goto yy54;
                        }
-yy121:
+yy133:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy167;
-                       default:        goto yy52;
+                       case 't':       goto yy181;
+                       default:        goto yy54;
                        }
-yy122:
+yy134:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy168;
-                       default:        goto yy52;
+                       case 't':       goto yy182;
+                       default:        goto yy54;
                        }
-yy123:
+yy135:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy170;
-                       default:        goto yy52;
+                       case 'o':       goto yy184;
+                       default:        goto yy54;
                        }
-yy124:
+yy136:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy171;
-                       default:        goto yy52;
+                       case 'g':       goto yy185;
+                       default:        goto yy54;
                        }
-yy125:
+yy137:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy172;
+                       case 'a':       goto yy186;
                        case 'R':
-                       case 'r':       goto yy173;
-                       default:        goto yy52;
+                       case 'r':       goto yy187;
+                       default:        goto yy54;
                        }
-yy126:
+yy138:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'M':
-                       case 'm':       goto yy174;
-                       default:        goto yy52;
+                       case 'm':       goto yy188;
+                       default:        goto yy54;
                        }
-yy127:
+yy139:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '_':       goto yy175;
-                       default:        goto yy52;
+                       case '_':       goto yy189;
+                       default:        goto yy54;
                        }
-yy128:
+yy140:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy176;
-                       default:        goto yy52;
+                       case 'u':       goto yy190;
+                       default:        goto yy54;
                        }
-yy129:
+yy141:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'P':
-                       case 'p':       goto yy177;
-                       default:        goto yy52;
+                       case 'p':       goto yy191;
+                       default:        goto yy54;
                        }
-yy130:
+yy142:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy178;
-                       default:        goto yy52;
+                       case 'n':       goto yy192;
+                       default:        goto yy54;
                        }
-yy131:
+yy143:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy179;
+                       case 'i':       goto yy193;
                        case 'S':
-                       case 's':       goto yy180;
-                       default:        goto yy52;
+                       case 's':       goto yy194;
+                       default:        goto yy54;
                        }
-yy132:
+yy144:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy181;
-                       default:        goto yy52;
+                       case 'i':       goto yy195;
+                       default:        goto yy54;
                        }
-yy133:
+yy145:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy182;
-                       default:        goto yy52;
+                       case 'a':       goto yy196;
+                       default:        goto yy54;
                        }
-yy134:
+yy146:
                        yyaccept = 6;
                        P->mrk = ++P->cur;
                        if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
@@ -1562,25 +1617,30 @@ yy134:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy134;
-                       case '\\':      goto yy102;
-                       default:        goto yy136;
+                       case 'z':       goto yy146;
+                       case '\\':      goto yy114;
+                       default:        goto yy148;
                        }
-yy136:
-#line 333 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy148:
+#line 341 "/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:
+#line 1628 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy149:
                        ++P->cur;
-#line 335 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 261 "/home/mike/src/php-master/ext/psi/src/parser.re"
+                       {RETURN(PSI_T_OR);}
+#line 1633 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy151:
+                       ++P->cur;
+#line 343 "/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:
+#line 1638 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy153:
                        ++P->cur;
-#line 271 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 279 "/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:
+#line 1643 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy155:
                        yych = *++P->cur;
                        switch (yych) {
                        case '0':
@@ -1592,10 +1652,10 @@ yy141:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy142;
-                       default:        goto yy90;
+                       case '9':       goto yy156;
+                       default:        goto yy96;
                        }
-yy142:
+yy156:
                        ++P->cur;
                        if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
                        yych = *P->cur;
@@ -1609,108 +1669,108 @@ yy142:
                        case '6':
                        case '7':
                        case '8':
-                       case '9':       goto yy142;
+                       case '9':       goto yy156;
                        default:        goto yy35;
                        }
-yy144:
+yy158:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy183;
+                       case 'a':       goto yy197;
                        case 'V':
-                       case 'v':       goto yy184;
-                       default:        goto yy52;
+                       case 'v':       goto yy198;
+                       default:        goto yy54;
                        }
-yy145:
+yy159:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy185;
-                       default:        goto yy52;
+                       case 'l':       goto yy199;
+                       default:        goto yy54;
                        }
-yy146:
+yy160:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy187;
-                       default:        goto yy52;
+                       case 'l':       goto yy201;
+                       default:        goto yy54;
                        }
-yy147:
+yy161:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy188;
-                       default:        goto yy52;
+                       case 'r':       goto yy202;
+                       default:        goto yy54;
                        }
-yy148:
+yy162:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy190;
-                       default:        goto yy52;
+                       case 's':       goto yy204;
+                       default:        goto yy54;
                        }
-yy149:
+yy163:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy191;
-                       default:        goto yy52;
+                       case 'n':       goto yy205;
+                       default:        goto yy54;
                        }
-yy150:
+yy164:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy192;
-                       default:        goto yy52;
+                       case 'b':       goto yy206;
+                       default:        goto yy54;
                        }
-yy151:
+yy165:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'M':
-                       case 'm':       goto yy193;
-                       default:        goto yy52;
+                       case 'm':       goto yy207;
+                       default:        goto yy54;
                        }
-yy152:
+yy166:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'S':
-                       case 's':       goto yy195;
-                       default:        goto yy52;
+                       case 's':       goto yy209;
+                       default:        goto yy54;
                        }
-yy153:
+yy167:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy196;
-                       default:        goto yy52;
+                       case 'a':       goto yy210;
+                       default:        goto yy54;
                        }
-yy154:
+yy168:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy197;
-                       default:        goto yy52;
+                       case 'e':       goto yy211;
+                       default:        goto yy54;
                        }
-yy155:
+yy169:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy199;
-                       default:        goto yy52;
+                       case 'c':       goto yy213;
+                       default:        goto yy54;
                        }
-yy156:
+yy170:
                        yyaccept = 7;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -1770,21 +1830,21 @@ yy156:
                        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 'z':       goto yy53;
+                       case '1':       goto yy214;
+                       case '3':       goto yy215;
+                       case '6':       goto yy216;
+                       case '8':       goto yy217;
                        case 'V':
-                       case 'v':       goto yy204;
-                       case '\\':      goto yy102;
-                       default:        goto yy157;
+                       case 'v':       goto yy218;
+                       case '\\':      goto yy114;
+                       default:        goto yy171;
                        }
-yy157:
-#line 283 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy171:
+#line 291 "/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:
+#line 1847 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy172:
                        yyaccept = 8;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -1850,15 +1910,15 @@ yy158:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy159;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy173;
                        }
-yy159:
-#line 309 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy173:
+#line 317 "/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:
+#line 1921 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy174:
                        yyaccept = 9;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -1924,65 +1984,65 @@ yy160:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy161;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy175;
                        }
-yy161:
-#line 308 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy175:
+#line 316 "/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:
+#line 1995 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy176:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy205;
-                       default:        goto yy52;
+                       case 'g':       goto yy219;
+                       default:        goto yy54;
                        }
-yy163:
+yy177:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy207;
-                       default:        goto yy52;
+                       case 'e':       goto yy221;
+                       default:        goto yy54;
                        }
-yy164:
+yy178:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy208;
-                       default:        goto yy52;
+                       case 'l':       goto yy222;
+                       default:        goto yy54;
                        }
-yy165:
+yy179:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy210;
+                       case 'e':       goto yy224;
                        case 'V':
-                       case 'v':       goto yy211;
-                       default:        goto yy52;
+                       case 'v':       goto yy225;
+                       default:        goto yy54;
                        }
-yy166:
+yy180:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'H':
-                       case 'h':       goto yy212;
-                       default:        goto yy52;
+                       case 'h':       goto yy226;
+                       default:        goto yy54;
                        }
-yy167:
+yy181:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'U':
-                       case 'u':       goto yy213;
-                       default:        goto yy52;
+                       case 'u':       goto yy227;
+                       default:        goto yy54;
                        }
-yy168:
+yy182:
                        yyaccept = 10;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -2048,151 +2108,151 @@ yy168:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy169;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy183;
                        }
-yy169:
-#line 310 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy183:
+#line 318 "/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:
+#line 2119 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy184:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy214;
-                       default:        goto yy52;
+                       case 'r':       goto yy228;
+                       default:        goto yy54;
                        }
-yy171:
+yy185:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy215;
-                       default:        goto yy52;
+                       case 'n':       goto yy229;
+                       default:        goto yy54;
                        }
-yy172:
+yy186:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy216;
-                       default:        goto yy52;
+                       case 't':       goto yy230;
+                       default:        goto yy54;
                        }
-yy173:
+yy187:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy217;
+                       case 'i':       goto yy231;
                        case 'L':
-                       case 'l':       goto yy218;
+                       case 'l':       goto yy232;
                        case 'U':
-                       case 'u':       goto yy219;
+                       case 'u':       goto yy233;
                        case 'V':
-                       case 'v':       goto yy220;
-                       default:        goto yy52;
+                       case 'v':       goto yy234;
+                       default:        goto yy54;
                        }
-yy174:
+yy188:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'P':
-                       case 'p':       goto yy221;
-                       default:        goto yy52;
+                       case 'p':       goto yy235;
+                       default:        goto yy54;
                        }
-yy175:
+yy189:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy223;
+                       case 'a':       goto yy237;
                        case 'B':
-                       case 'b':       goto yy224;
+                       case 'b':       goto yy238;
                        case 'F':
-                       case 'f':       goto yy225;
+                       case 'f':       goto yy239;
                        case 'I':
-                       case 'i':       goto yy226;
+                       case 'i':       goto yy240;
                        case 'O':
-                       case 'o':       goto yy227;
+                       case 'o':       goto yy241;
                        case 'S':
-                       case 's':       goto yy228;
-                       default:        goto yy52;
+                       case 's':       goto yy242;
+                       default:        goto yy54;
                        }
-yy176:
+yy190:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy229;
-                       default:        goto yy52;
+                       case 'e':       goto yy243;
+                       default:        goto yy54;
                        }
-yy177:
+yy191:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy231;
-                       default:        goto yy52;
+                       case 'e':       goto yy245;
+                       default:        goto yy54;
                        }
-yy178:
+yy192:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy232;
-                       default:        goto yy52;
+                       case 't':       goto yy246;
+                       default:        goto yy54;
                        }
-yy179:
+yy193:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy233;
-                       default:        goto yy52;
+                       case 'o':       goto yy247;
+                       default:        goto yy54;
                        }
-yy180:
+yy194:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy234;
-                       default:        goto yy52;
+                       case 'i':       goto yy248;
+                       default:        goto yy54;
                        }
-yy181:
+yy195:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy235;
-                       default:        goto yy52;
+                       case 'd':       goto yy249;
+                       default:        goto yy54;
                        }
-yy182:
+yy196:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy237;
-                       default:        goto yy52;
+                       case 'l':       goto yy251;
+                       default:        goto yy54;
                        }
-yy183:
+yy197:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy239;
-                       default:        goto yy52;
+                       case 'y':       goto yy253;
+                       default:        goto yy54;
                        }
-yy184:
+yy198:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy241;
-                       default:        goto yy52;
+                       case 'a':       goto yy255;
+                       default:        goto yy54;
                        }
-yy185:
+yy199:
                        yyaccept = 11;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -2256,29 +2316,29 @@ yy185:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
+                       case 'z':       goto yy53;
                        case 'V':
-                       case 'v':       goto yy242;
-                       case '\\':      goto yy102;
-                       default:        goto yy186;
+                       case 'v':       goto yy256;
+                       case '\\':      goto yy114;
+                       default:        goto yy200;
                        }
-yy186:
-#line 280 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy200:
+#line 288 "/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:
+#line 2329 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy201:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy243;
+                       case 'a':       goto yy257;
                        case 'B':
-                       case 'b':       goto yy244;
+                       case 'b':       goto yy258;
                        case 'O':
-                       case 'o':       goto yy245;
-                       default:        goto yy52;
+                       case 'o':       goto yy259;
+                       default:        goto yy54;
                        }
-yy188:
+yy202:
                        yyaccept = 12;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -2344,39 +2404,39 @@ yy188:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy189;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy203;
                        }
-yy189:
-#line 281 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy203:
+#line 289 "/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:
+#line 2415 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy204:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy246;
-                       default:        goto yy52;
+                       case 't':       goto yy260;
+                       default:        goto yy54;
                        }
-yy191:
+yy205:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy248;
-                       default:        goto yy52;
+                       case 't':       goto yy262;
+                       default:        goto yy54;
                        }
-yy192:
+yy206:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy250;
-                       default:        goto yy52;
+                       case 'l':       goto yy264;
+                       default:        goto yy54;
                        }
-yy193:
+yy207:
                        yyaccept = 13;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -2442,31 +2502,31 @@ yy193:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy194;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy208;
                        }
-yy194:
-#line 306 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy208:
+#line 314 "/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:
+#line 2513 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy209:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy251;
-                       default:        goto yy52;
+                       case 'e':       goto yy265;
+                       default:        goto yy54;
                        }
-yy196:
+yy210:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy253;
-                       default:        goto yy52;
+                       case 't':       goto yy267;
+                       default:        goto yy54;
                        }
-yy197:
+yy211:
                        yyaccept = 14;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -2532,59 +2592,59 @@ yy197:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy198;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy212;
                        }
-yy198:
-#line 312 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy212:
+#line 320 "/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:
+#line 2603 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy213:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy255;
-                       default:        goto yy52;
+                       case 't':       goto yy269;
+                       default:        goto yy54;
                        }
-yy200:
+yy214:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '6':       goto yy256;
-                       default:        goto yy52;
+                       case '6':       goto yy270;
+                       default:        goto yy54;
                        }
-yy201:
+yy215:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '2':       goto yy257;
-                       default:        goto yy52;
+                       case '2':       goto yy271;
+                       default:        goto yy54;
                        }
-yy202:
+yy216:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '4':       goto yy258;
-                       default:        goto yy52;
+                       case '4':       goto yy272;
+                       default:        goto yy54;
                        }
-yy203:
+yy217:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '_':       goto yy259;
-                       default:        goto yy52;
+                       case '_':       goto yy273;
+                       default:        goto yy54;
                        }
-yy204:
+yy218:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy260;
-                       default:        goto yy52;
+                       case 'a':       goto yy274;
+                       default:        goto yy54;
                        }
-yy205:
+yy219:
                        yyaccept = 15;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -2650,23 +2710,23 @@ yy205:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy206;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy220;
                        }
-yy206:
-#line 284 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy220:
+#line 292 "/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:
+#line 2721 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy221:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy261;
-                       default:        goto yy52;
+                       case 'd':       goto yy275;
+                       default:        goto yy54;
                        }
-yy208:
+yy222:
                        yyaccept = 16;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -2732,103 +2792,103 @@ yy208:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy209;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy223;
                        }
-yy209:
-#line 276 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy223:
+#line 284 "/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:
+#line 2803 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy224:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy263;
-                       default:        goto yy52;
+                       case 'c':       goto yy277;
+                       default:        goto yy54;
                        }
-yy211:
+yy225:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy264;
-                       default:        goto yy52;
+                       case 'a':       goto yy278;
+                       default:        goto yy54;
                        }
-yy212:
+yy226:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'V':
-                       case 'v':       goto yy265;
-                       default:        goto yy52;
+                       case 'v':       goto yy279;
+                       default:        goto yy54;
                        }
-yy213:
+yy227:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy266;
-                       default:        goto yy52;
+                       case 'r':       goto yy280;
+                       default:        goto yy54;
                        }
-yy214:
+yy228:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy267;
-                       default:        goto yy52;
+                       case 't':       goto yy281;
+                       default:        goto yy54;
                        }
-yy215:
+yy229:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy269;
-                       default:        goto yy52;
+                       case 'e':       goto yy283;
+                       default:        goto yy54;
                        }
-yy216:
+yy230:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy270;
-                       default:        goto yy52;
+                       case 'i':       goto yy284;
+                       default:        goto yy54;
                        }
-yy217:
+yy231:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy271;
-                       default:        goto yy52;
+                       case 'n':       goto yy285;
+                       default:        goto yy54;
                        }
-yy218:
+yy232:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy272;
-                       default:        goto yy52;
+                       case 'e':       goto yy286;
+                       default:        goto yy54;
                        }
-yy219:
+yy233:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy273;
-                       default:        goto yy52;
+                       case 'c':       goto yy287;
+                       default:        goto yy54;
                        }
-yy220:
+yy234:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy274;
-                       default:        goto yy52;
+                       case 'a':       goto yy288;
+                       default:        goto yy54;
                        }
-yy221:
+yy235:
                        yyaccept = 17;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -2894,63 +2954,63 @@ yy221:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy222;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy236;
                        }
-yy222:
-#line 313 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy236:
+#line 321 "/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:
+#line 2965 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy237:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy275;
-                       default:        goto yy52;
+                       case 'r':       goto yy289;
+                       default:        goto yy54;
                        }
-yy224:
+yy238:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy276;
-                       default:        goto yy52;
+                       case 'o':       goto yy290;
+                       default:        goto yy54;
                        }
-yy225:
+yy239:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy277;
-                       default:        goto yy52;
+                       case 'l':       goto yy291;
+                       default:        goto yy54;
                        }
-yy226:
+yy240:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy278;
-                       default:        goto yy52;
+                       case 'n':       goto yy292;
+                       default:        goto yy54;
                        }
-yy227:
+yy241:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy279;
-                       default:        goto yy52;
+                       case 'b':       goto yy293;
+                       default:        goto yy54;
                        }
-yy228:
+yy242:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy280;
-                       default:        goto yy52;
+                       case 't':       goto yy294;
+                       default:        goto yy54;
                        }
-yy229:
+yy243:
                        yyaccept = 18;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -3016,49 +3076,49 @@ yy229:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy230;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy244;
                        }
-yy230:
-#line 274 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy244:
+#line 282 "/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:
+#line 3087 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy245:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy281;
-                       default:        goto yy52;
+                       case 'd':       goto yy295;
+                       default:        goto yy54;
                        }
-yy232:
+yy246:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '1':       goto yy282;
-                       case '3':       goto yy283;
-                       case '6':       goto yy284;
-                       case '8':       goto yy285;
-                       default:        goto yy52;
+                       case '1':       goto yy296;
+                       case '3':       goto yy297;
+                       case '6':       goto yy298;
+                       case '8':       goto yy299;
+                       default:        goto yy54;
                        }
-yy233:
+yy247:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy286;
-                       default:        goto yy52;
+                       case 'n':       goto yy300;
+                       default:        goto yy54;
                        }
-yy234:
+yy248:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy288;
-                       default:        goto yy52;
+                       case 'g':       goto yy302;
+                       default:        goto yy54;
                        }
-yy235:
+yy249:
                        yyaccept = 19;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -3124,15 +3184,15 @@ yy235:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy236;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy250;
                        }
-yy236:
-#line 279 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy250:
+#line 287 "/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:
+#line 3195 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy251:
                        yyaccept = 20;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -3198,15 +3258,15 @@ yy237:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy238;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy252;
                        }
-yy238:
-#line 322 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy252:
+#line 330 "/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:
+#line 3269 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy253:
                        yyaccept = 21;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -3272,55 +3332,55 @@ yy239:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy240;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy254;
                        }
-yy240:
-#line 298 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy254:
+#line 306 "/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:
+#line 3343 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy255:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy289;
-                       default:        goto yy52;
+                       case 'l':       goto yy303;
+                       default:        goto yy54;
                        }
-yy242:
+yy256:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy291;
-                       default:        goto yy52;
+                       case 'a':       goto yy305;
+                       default:        goto yy54;
                        }
-yy243:
+yy257:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'B':
-                       case 'b':       goto yy292;
-                       default:        goto yy52;
+                       case 'b':       goto yy306;
+                       default:        goto yy54;
                        }
-yy244:
+yy258:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy293;
-                       default:        goto yy52;
+                       case 'a':       goto yy307;
+                       default:        goto yy54;
                        }
-yy245:
+yy259:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy294;
-                       default:        goto yy52;
+                       case 'c':       goto yy308;
+                       default:        goto yy54;
                        }
-yy246:
+yy260:
                        yyaccept = 22;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -3386,15 +3446,15 @@ yy246:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy247;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy261;
                        }
-yy247:
-#line 307 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy261:
+#line 315 "/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:
+#line 3457 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy262:
                        yyaccept = 23;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -3460,23 +3520,23 @@ yy248:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy249;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy263;
                        }
-yy249:
-#line 323 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy263:
+#line 331 "/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:
+#line 3531 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy264:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy296;
-                       default:        goto yy52;
+                       case 'e':       goto yy310;
+                       default:        goto yy54;
                        }
-yy251:
+yy265:
                        yyaccept = 24;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -3542,15 +3602,15 @@ yy251:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy252;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy266;
                        }
-yy252:
-#line 275 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy266:
+#line 283 "/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:
+#line 3613 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy267:
                        yyaccept = 25;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -3614,62 +3674,62 @@ yy253:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
+                       case 'z':       goto yy53;
                        case 'V':
-                       case 'v':       goto yy298;
-                       case '\\':      goto yy102;
-                       default:        goto yy254;
+                       case 'v':       goto yy312;
+                       case '\\':      goto yy114;
+                       default:        goto yy268;
                        }
-yy254:
-#line 285 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy268:
+#line 293 "/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:
+#line 3687 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy269:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy299;
-                       default:        goto yy52;
+                       case 'i':       goto yy313;
+                       default:        goto yy54;
                        }
-yy256:
+yy270:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '_':       goto yy300;
-                       default:        goto yy52;
+                       case '_':       goto yy314;
+                       default:        goto yy54;
                        }
-yy257:
+yy271:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '_':       goto yy301;
-                       default:        goto yy52;
+                       case '_':       goto yy315;
+                       default:        goto yy54;
                        }
-yy258:
+yy272:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '_':       goto yy302;
-                       default:        goto yy52;
+                       case '_':       goto yy316;
+                       default:        goto yy54;
                        }
-yy259:
+yy273:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy303;
-                       default:        goto yy52;
+                       case 't':       goto yy317;
+                       default:        goto yy54;
                        }
-yy260:
+yy274:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy305;
-                       default:        goto yy52;
+                       case 'l':       goto yy319;
+                       default:        goto yy54;
                        }
-yy261:
+yy275:
                        yyaccept = 26;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -3735,47 +3795,47 @@ yy261:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy262;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy276;
                        }
-yy262:
-#line 277 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy276:
+#line 285 "/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:
+#line 3806 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy277:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy307;
-                       default:        goto yy52;
+                       case 't':       goto yy321;
+                       default:        goto yy54;
                        }
-yy264:
+yy278:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy309;
-                       default:        goto yy52;
+                       case 'l':       goto yy323;
+                       default:        goto yy54;
                        }
-yy265:
+yy279:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy311;
-                       default:        goto yy52;
+                       case 'a':       goto yy325;
+                       default:        goto yy54;
                        }
-yy266:
+yy280:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy312;
-                       default:        goto yy52;
+                       case 'n':       goto yy326;
+                       default:        goto yy54;
                        }
-yy267:
+yy281:
                        yyaccept = 27;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -3841,147 +3901,147 @@ yy267:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy268;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy282;
                        }
-yy268:
-#line 282 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy282:
+#line 290 "/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:
+#line 3912 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy283:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy314;
-                       default:        goto yy52;
+                       case 'd':       goto yy328;
+                       default:        goto yy54;
                        }
-yy270:
+yy284:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy316;
-                       default:        goto yy52;
+                       case 'c':       goto yy330;
+                       default:        goto yy54;
                        }
-yy271:
+yy285:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy318;
-                       default:        goto yy52;
+                       case 'g':       goto yy332;
+                       default:        goto yy54;
                        }
-yy272:
+yy286:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy320;
-                       default:        goto yy52;
+                       case 'n':       goto yy334;
+                       default:        goto yy54;
                        }
-yy273:
+yy287:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy322;
-                       default:        goto yy52;
+                       case 't':       goto yy336;
+                       default:        goto yy54;
                        }
-yy274:
+yy288:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy324;
-                       default:        goto yy52;
+                       case 'l':       goto yy338;
+                       default:        goto yy54;
                        }
-yy275:
+yy289:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy326;
-                       default:        goto yy52;
+                       case 'r':       goto yy340;
+                       default:        goto yy54;
                        }
-yy276:
+yy290:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy327;
-                       default:        goto yy52;
+                       case 'o':       goto yy341;
+                       default:        goto yy54;
                        }
-yy277:
+yy291:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy328;
-                       default:        goto yy52;
+                       case 'o':       goto yy342;
+                       default:        goto yy54;
                        }
-yy278:
+yy292:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy329;
-                       default:        goto yy52;
+                       case 't':       goto yy343;
+                       default:        goto yy54;
                        }
-yy279:
+yy293:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'J':
-                       case 'j':       goto yy331;
-                       default:        goto yy52;
+                       case 'j':       goto yy345;
+                       default:        goto yy54;
                        }
-yy280:
+yy294:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'R':
-                       case 'r':       goto yy332;
-                       default:        goto yy52;
+                       case 'r':       goto yy346;
+                       default:        goto yy54;
                        }
-yy281:
+yy295:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy333;
-                       default:        goto yy52;
+                       case 'e':       goto yy347;
+                       default:        goto yy54;
                        }
-yy282:
+yy296:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '6':       goto yy334;
-                       default:        goto yy52;
+                       case '6':       goto yy348;
+                       default:        goto yy54;
                        }
-yy283:
+yy297:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '2':       goto yy335;
-                       default:        goto yy52;
+                       case '2':       goto yy349;
+                       default:        goto yy54;
                        }
-yy284:
+yy298:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '4':       goto yy336;
-                       default:        goto yy52;
+                       case '4':       goto yy350;
+                       default:        goto yy54;
                        }
-yy285:
+yy299:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '_':       goto yy337;
-                       default:        goto yy52;
+                       case '_':       goto yy351;
+                       default:        goto yy54;
                        }
-yy286:
+yy300:
                        yyaccept = 28;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -4047,23 +4107,23 @@ yy286:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy287;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy301;
                        }
-yy287:
-#line 305 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy301:
+#line 313 "/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:
+#line 4118 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy302:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy338;
-                       default:        goto yy52;
+                       case 'n':       goto yy352;
+                       default:        goto yy54;
                        }
-yy289:
+yy303:
                        yyaccept = 29;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -4129,39 +4189,39 @@ yy289:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy290;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy304;
                        }
-yy290:
-#line 320 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy304:
+#line 328 "/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:
+#line 4200 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy305:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy339;
-                       default:        goto yy52;
+                       case 'l':       goto yy353;
+                       default:        goto yy54;
                        }
-yy292:
+yy306:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy341;
-                       default:        goto yy52;
+                       case 'l':       goto yy355;
+                       default:        goto yy54;
                        }
-yy293:
+yy307:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy342;
-                       default:        goto yy52;
+                       case 'c':       goto yy356;
+                       default:        goto yy54;
                        }
-yy294:
+yy308:
                        yyaccept = 30;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -4227,15 +4287,15 @@ yy294:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy295;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy309;
                        }
-yy295:
-#line 324 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy309:
+#line 332 "/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:
+#line 4298 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy310:
                        yyaccept = 31;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -4301,55 +4361,55 @@ yy296:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy297;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy311;
                        }
-yy297:
-#line 286 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy311:
+#line 294 "/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:
+#line 4372 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy312:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy343;
-                       default:        goto yy52;
+                       case 'a':       goto yy357;
+                       default:        goto yy54;
                        }
-yy299:
+yy313:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'O':
-                       case 'o':       goto yy344;
-                       default:        goto yy52;
+                       case 'o':       goto yy358;
+                       default:        goto yy54;
                        }
-yy300:
+yy314:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy345;
-                       default:        goto yy52;
+                       case 't':       goto yy359;
+                       default:        goto yy54;
                        }
-yy301:
+yy315:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy347;
-                       default:        goto yy52;
+                       case 't':       goto yy361;
+                       default:        goto yy54;
                        }
-yy302:
+yy316:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy349;
-                       default:        goto yy52;
+                       case 't':       goto yy363;
+                       default:        goto yy54;
                        }
-yy303:
+yy317:
                        yyaccept = 32;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -4415,15 +4475,15 @@ yy303:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy304;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy318;
                        }
-yy304:
-#line 287 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy318:
+#line 295 "/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:
+#line 4486 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy319:
                        yyaccept = 33;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -4489,15 +4549,15 @@ yy305:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy306;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy320;
                        }
-yy306:
-#line 317 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy320:
+#line 325 "/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:
+#line 4560 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy321:
                        yyaccept = 34;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -4563,15 +4623,15 @@ yy307:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy308;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy322;
                        }
-yy308:
-#line 299 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy322:
+#line 307 "/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:
+#line 4634 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy323:
                        yyaccept = 35;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -4637,23 +4697,23 @@ yy309:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy310;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy324;
                        }
-yy310:
-#line 321 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy324:
+#line 329 "/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:
+#line 4708 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy325:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy351;
-                       default:        goto yy52;
+                       case 'l':       goto yy365;
+                       default:        goto yy54;
                        }
-yy312:
+yy326:
                        yyaccept = 36;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -4719,15 +4779,15 @@ yy312:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy313;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy327;
                        }
-yy313:
-#line 311 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy327:
+#line 319 "/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:
+#line 4790 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy328:
                        yyaccept = 37;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -4793,15 +4853,15 @@ yy314:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy315;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy329;
                        }
-yy315:
-#line 296 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy329:
+#line 304 "/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:
+#line 4864 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy330:
                        yyaccept = 38;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -4867,15 +4927,15 @@ yy316:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy317;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy331;
                        }
-yy317:
-#line 301 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy331:
+#line 309 "/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:
+#line 4938 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy332:
                        yyaccept = 39;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -4941,15 +5001,15 @@ yy318:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy319;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy333;
                        }
-yy319:
-#line 297 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy333:
+#line 305 "/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:
+#line 5012 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy334:
                        yyaccept = 40;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -5015,15 +5075,15 @@ yy320:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy321;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy335;
                        }
-yy321:
-#line 314 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy335:
+#line 322 "/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:
+#line 5086 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy336:
                        yyaccept = 41;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -5089,15 +5149,15 @@ yy322:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy323;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy337;
                        }
-yy323:
-#line 304 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy337:
+#line 312 "/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:
+#line 5160 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy338:
                        yyaccept = 42;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -5163,39 +5223,39 @@ yy324:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy325;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy339;
                        }
-yy325:
-#line 315 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy339:
+#line 323 "/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:
+#line 5234 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy340:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy353;
-                       default:        goto yy52;
+                       case 'a':       goto yy367;
+                       default:        goto yy54;
                        }
-yy327:
+yy341:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy354;
-                       default:        goto yy52;
+                       case 'l':       goto yy368;
+                       default:        goto yy54;
                        }
-yy328:
+yy342:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'A':
-                       case 'a':       goto yy356;
-                       default:        goto yy52;
+                       case 'a':       goto yy370;
+                       default:        goto yy54;
                        }
-yy329:
+yy343:
                        yyaccept = 43;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -5261,76 +5321,76 @@ yy329:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy330;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy344;
                        }
-yy330:
-#line 328 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy344:
+#line 336 "/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:
+#line 5332 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy345:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy357;
-                       default:        goto yy52;
+                       case 'e':       goto yy371;
+                       default:        goto yy54;
                        }
-yy332:
+yy346:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'I':
-                       case 'i':       goto yy358;
-                       default:        goto yy52;
+                       case 'i':       goto yy372;
+                       default:        goto yy54;
                        }
-yy333:
+yy347:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'F':
-                       case 'f':       goto yy359;
-                       default:        goto yy52;
+                       case 'f':       goto yy373;
+                       default:        goto yy54;
                        }
-yy334:
+yy348:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '_':       goto yy361;
-                       default:        goto yy52;
+                       case '_':       goto yy375;
+                       default:        goto yy54;
                        }
-yy335:
+yy349:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '_':       goto yy362;
-                       default:        goto yy52;
+                       case '_':       goto yy376;
+                       default:        goto yy54;
                        }
-yy336:
+yy350:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
-                       case '_':       goto yy363;
-                       default:        goto yy52;
+                       case '_':       goto yy377;
+                       default:        goto yy54;
                        }
-yy337:
+yy351:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy364;
-                       default:        goto yy52;
+                       case 't':       goto yy378;
+                       default:        goto yy54;
                        }
-yy338:
+yy352:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy366;
-                       default:        goto yy52;
+                       case 'e':       goto yy380;
+                       default:        goto yy54;
                        }
-yy339:
+yy353:
                        yyaccept = 44;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -5396,47 +5456,47 @@ yy339:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy340;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy354;
                        }
-yy340:
-#line 319 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy354:
+#line 327 "/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:
+#line 5467 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy355:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'E':
-                       case 'e':       goto yy367;
-                       default:        goto yy52;
+                       case 'e':       goto yy381;
+                       default:        goto yy54;
                        }
-yy342:
+yy356:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'K':
-                       case 'k':       goto yy369;
-                       default:        goto yy52;
+                       case 'k':       goto yy383;
+                       default:        goto yy54;
                        }
-yy343:
+yy357:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'L':
-                       case 'l':       goto yy371;
-                       default:        goto yy52;
+                       case 'l':       goto yy385;
+                       default:        goto yy54;
                        }
-yy344:
+yy358:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy373;
-                       default:        goto yy52;
+                       case 'n':       goto yy387;
+                       default:        goto yy54;
                        }
-yy345:
+yy359:
                        yyaccept = 45;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -5502,15 +5562,15 @@ yy345:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy346;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy360;
                        }
-yy346:
-#line 289 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy360:
+#line 297 "/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:
+#line 5573 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy361:
                        yyaccept = 46;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -5576,15 +5636,15 @@ yy347:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy348;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy362;
                        }
-yy348:
-#line 291 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy362:
+#line 299 "/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:
+#line 5647 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy363:
                        yyaccept = 47;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -5650,15 +5710,15 @@ yy349:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy350;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy364;
                        }
-yy350:
-#line 293 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy364:
+#line 301 "/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:
+#line 5721 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy365:
                        yyaccept = 48;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -5724,23 +5784,23 @@ yy351:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy352;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy366;
                        }
-yy352:
-#line 316 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy366:
+#line 324 "/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:
+#line 5795 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy367:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'Y':
-                       case 'y':       goto yy375;
-                       default:        goto yy52;
+                       case 'y':       goto yy389;
+                       default:        goto yy54;
                        }
-yy354:
+yy368:
                        yyaccept = 49;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -5806,39 +5866,39 @@ yy354:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy355;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy369;
                        }
-yy355:
-#line 330 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy369:
+#line 338 "/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:
+#line 5877 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy370:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy377;
-                       default:        goto yy52;
+                       case 't':       goto yy391;
+                       default:        goto yy54;
                        }
-yy357:
+yy371:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'C':
-                       case 'c':       goto yy379;
-                       default:        goto yy52;
+                       case 'c':       goto yy393;
+                       default:        goto yy54;
                        }
-yy358:
+yy372:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'N':
-                       case 'n':       goto yy380;
-                       default:        goto yy52;
+                       case 'n':       goto yy394;
+                       default:        goto yy54;
                        }
-yy359:
+yy373:
                        yyaccept = 50;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -5904,39 +5964,39 @@ yy359:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy360;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy374;
                        }
-yy360:
-#line 303 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy374:
+#line 311 "/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:
+#line 5975 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy375:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy381;
-                       default:        goto yy52;
+                       case 't':       goto yy395;
+                       default:        goto yy54;
                        }
-yy362:
+yy376:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy383;
-                       default:        goto yy52;
+                       case 't':       goto yy397;
+                       default:        goto yy54;
                        }
-yy363:
+yy377:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy385;
-                       default:        goto yy52;
+                       case 't':       goto yy399;
+                       default:        goto yy54;
                        }
-yy364:
+yy378:
                        yyaccept = 51;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6002,23 +6062,23 @@ yy364:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy365;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy379;
                        }
-yy365:
-#line 288 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy379:
+#line 296 "/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:
+#line 6073 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy380:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'D':
-                       case 'd':       goto yy387;
-                       default:        goto yy52;
+                       case 'd':       goto yy401;
+                       default:        goto yy54;
                        }
-yy367:
+yy381:
                        yyaccept = 52;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6084,15 +6144,15 @@ yy367:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy368;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy382;
                        }
-yy368:
-#line 278 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy382:
+#line 286 "/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:
+#line 6155 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy383:
                        yyaccept = 53;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6158,15 +6218,15 @@ yy369:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy370;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy384;
                        }
-yy370:
-#line 300 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy384:
+#line 308 "/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:
+#line 6229 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy385:
                        yyaccept = 54;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6232,15 +6292,15 @@ yy371:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy372;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy386;
                        }
-yy372:
-#line 318 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy386:
+#line 326 "/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:
+#line 6303 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy387:
                        yyaccept = 55;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6306,15 +6366,15 @@ yy373:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy374;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy388;
                        }
-yy374:
-#line 302 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy388:
+#line 310 "/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:
+#line 6377 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy389:
                        yyaccept = 56;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6380,15 +6440,15 @@ yy375:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy376;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy390;
                        }
-yy376:
-#line 326 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy390:
+#line 334 "/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:
+#line 6451 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy391:
                        yyaccept = 57;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6454,31 +6514,31 @@ yy377:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy378;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy392;
                        }
-yy378:
-#line 329 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy392:
+#line 337 "/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:
+#line 6525 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy393:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'T':
-                       case 't':       goto yy389;
-                       default:        goto yy52;
+                       case 't':       goto yy403;
+                       default:        goto yy54;
                        }
-yy380:
+yy394:
                        yyaccept = 5;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
                        case 'G':
-                       case 'g':       goto yy391;
-                       default:        goto yy52;
+                       case 'g':       goto yy405;
+                       default:        goto yy54;
                        }
-yy381:
+yy395:
                        yyaccept = 58;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6544,15 +6604,15 @@ yy381:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy382;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy396;
                        }
-yy382:
-#line 290 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy396:
+#line 298 "/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:
+#line 6615 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy397:
                        yyaccept = 59;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6618,15 +6678,15 @@ yy383:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy384;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy398;
                        }
-yy384:
-#line 292 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy398:
+#line 300 "/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:
+#line 6689 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy399:
                        yyaccept = 60;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6692,15 +6752,15 @@ yy385:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy386;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy400;
                        }
-yy386:
-#line 294 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy400:
+#line 302 "/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:
+#line 6763 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy401:
                        yyaccept = 61;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6766,15 +6826,15 @@ yy387:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy388;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy402;
                        }
-yy388:
-#line 295 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy402:
+#line 303 "/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:
+#line 6837 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy403:
                        yyaccept = 62;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6840,15 +6900,15 @@ yy389:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy390;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy404;
                        }
-yy390:
-#line 325 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy404:
+#line 333 "/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:
+#line 6911 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy405:
                        yyaccept = 63;
                        yych = *(P->mrk = ++P->cur);
                        switch (yych) {
@@ -6914,55 +6974,55 @@ yy391:
                        case 'w':
                        case 'x':
                        case 'y':
-                       case 'z':       goto yy51;
-                       case '\\':      goto yy102;
-                       default:        goto yy392;
+                       case 'z':       goto yy53;
+                       case '\\':      goto yy114;
+                       default:        goto yy406;
                        }
-yy392:
-#line 327 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy406:
+#line 335 "/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"
+#line 6985 "/home/mike/src/php-master/ext/psi/src/parser.c"
                }
-#line 337 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 345 "/home/mike/src/php-master/ext/psi/src/parser.re"
 
 
        comment:
                P->tok = P->cur;
                
-#line 6933 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 6993 "/home/mike/src/php-master/ext/psi/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;
                        switch (yych) {
-                       case '\n':      goto yy397;
-                       case '*':       goto yy399;
-                       default:        goto yy395;
+                       case '\n':      goto yy411;
+                       case '*':       goto yy413;
+                       default:        goto yy409;
                        }
-yy395:
+yy409:
                        ++P->cur;
-yy396:
-#line 344 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy410:
+#line 352 "/home/mike/src/php-master/ext/psi/src/parser.re"
                        { goto comment; }
-#line 6948 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy397:
+#line 7008 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy411:
                        ++P->cur;
-#line 342 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 350 "/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:
+#line 7013 "/home/mike/src/php-master/ext/psi/src/parser.c"
+yy413:
                        yych = *++P->cur;
                        switch (yych) {
-                       case '/':       goto yy400;
-                       default:        goto yy396;
+                       case '/':       goto yy414;
+                       default:        goto yy410;
                        }
-yy400:
+yy414:
                        ++P->cur;
-#line 343 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 351 "/home/mike/src/php-master/ext/psi/src/parser.re"
                        { continue; }
-#line 6964 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 7024 "/home/mike/src/php-master/ext/psi/src/parser.c"
                }
-#line 345 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 353 "/home/mike/src/php-master/ext/psi/src/parser.re"
 
        }
        return -1;
index b56385d..1b2aae7 100644 (file)
@@ -255,6 +255,10 @@ token_t psi_parser_scan(struct psi_parser *P)
                "}" {RETURN(PSI_T_RBRACE);}
                "[" {RETURN(PSI_T_LBRACKET);}
                "]" {RETURN(PSI_T_RBRACKET);}
+               "!=" {RETURN(PSI_T_CMP_NE);}
+               "==" {RETURN(PSI_T_CMP_EQ);}
+               "&&" {RETURN(PSI_T_AND);}
+               "||" {RETURN(PSI_T_OR);}
                "=" {RETURN(PSI_T_EQUALS);}
                "*" {RETURN(PSI_T_ASTERISK);}
                "~" {RETURN(PSI_T_TILDE);}
@@ -268,6 +272,10 @@ token_t psi_parser_scan(struct psi_parser *P)
                "^" {RETURN(PSI_T_CARET);}
                "<<" {RETURN(PSI_T_LSHIFT);}
                ">>" {RETURN(PSI_T_RSHIFT);}
+               "<=" {RETURN(PSI_T_CMP_LE);}
+               ">=" {RETURN(PSI_T_CMP_GE);}
+               "<" {RETURN(PSI_T_LCHEVR);}
+               ">" {RETURN(PSI_T_RCHEVR);}
                "..." {RETURN(PSI_T_ELLIPSIS);}
                [\r\n] { NEWLINE(nextline); }
                [\t ]+ { continue; }
index ab0ba73..b299c19 100644 (file)
@@ -89,17 +89,20 @@ TOKEN_CLASS(const_type, T(BOOL) T(INT) T(FLOAT) T(STRING))
 TOKEN_CLASS(decl_type, T(FLOAT) T(DOUBLE) T(INT8) T(UINT8) T(INT16) T(UINT16) T(INT32) T(UINT32) T(INT64) T(UINT64) T(NAME))
 TOKEN_CLASS(impl_def_val, T(NULL) T(NUMBER) T(TRUE) T(FALSE) T(QUOTED_STRING))
 TOKEN_CLASS(number, T(NUMBER) T(NSNAME))
-TOKEN_CLASS(num_exp_binary_op, T(PIPE) T(CARET) T(AMPERSAND) T(LSHIFT) T(RSHIFT) T(PLUS) T(MINUS) T(ASTERISK) T(SLASH) T(MODULO))
-TOKEN_CLASS(num_exp_unary_op, T(TILDE) T(NOT) T(PLUS) T(MINUS))
+TOKEN_CLASS(binary_op, T(PIPE) T(CARET) T(AMPERSAND) T(LSHIFT) T(RSHIFT) T(PLUS) T(MINUS) T(ASTERISK) T(SLASH) T(MODULO) T(RCHEVR) T(LCHEVR) T(CMP_GE) T(CMP_LE) T(OR) T(AND) T(CMP_EQ) T(CMP_NE))
+TOKEN_CLASS(unary_op, T(TILDE) T(NOT) T(PLUS) T(MINUS))
 TOKEN_CLASS(let_func, T(ZVAL) T(OBJVAL) T(ARRVAL) T(PATHVAL) T(STRLEN) T(STRVAL) T(FLOATVAL) T(INTVAL) T(BOOLVAL) T(COUNT))
 TOKEN_CLASS(set_func, T(TO_OBJECT) T(TO_ARRAY) T(TO_STRING) T(TO_INT) T(TO_FLOAT) T(TO_BOOL) T(ZVAL) T(VOID))
 TOKEN_CLASS(impl_type, T(VOID) T(MIXED) T(BOOL) T(INT) T(FLOAT) T(STRING) T(ARRAY) T(OBJECT) T(CALLABLE))
 
 DEF(%nonassoc, NAME.)
 DEF(%right, NOT TILDE.)
+DEF(%left, AND OR.)
 DEF(%left, PIPE.)
 DEF(%left, CARET.)
 DEF(%left, AMPERSAND.)
+DEF(%left, CMP_EQ CMP_NE.)
+DEF(%left, LCHEVR CMP_LE RCHEVR CMP_GE.)
 DEF(%left, LSHIFT RSHIFT.)
 DEF(%left, PLUS MINUS.)
 DEF(%left, ASTERISK SLASH MODULO.)
@@ -1426,7 +1429,7 @@ PARSE_TYPED(number, exp,
 }
 
 /*
- * num_exp: decl_var
+ * number: decl_var
  */
 PARSE_TYPED(number, exp,
                TYPED(decl_var, var)) {
@@ -1435,7 +1438,7 @@ PARSE_TYPED(number, exp,
 }
 
 /*
- * num_exp: num_exp
+ * num_exp: number
  */
 PARSE_TYPED(num_exp, exp,
                TYPED(number, num)) {
@@ -1455,21 +1458,21 @@ PARSE_TYPED(num_exp, exp,
 }
 
 /*
- * num_exp: num_exp num_exp_binary_op_token num_exp
+ * num_exp: num_exp binary_op_token num_exp
  */
 PARSE_TYPED(num_exp, exp,
                TYPED(num_exp, lhs_)
-               NAMED(num_exp_binary_op_token, OP)
+               NAMED(binary_op_token, OP)
                TYPED(num_exp, rhs_)) {
        exp = psi_num_exp_init_binary(OP->type, lhs_, rhs_);
        exp->token = OP;
 }
 
 /*
- * num_exp: num_exp_unary_op_token num_exp
+ * num_exp: unary_op_token num_exp
  */
 PARSE_TYPED(num_exp, exp,
-               NAMED(num_exp_unary_op_token, OP)
+               NAMED(unary_op_token, OP)
                TYPED(num_exp, exp_)) {
        exp = psi_num_exp_init_unary(OP->type, exp_);
        exp->token = OP;
index 316805e..07478fa 100644 (file)
@@ -118,49 +118,49 @@ void psi_parser_proc_free(void **parser_proc)
 #endif
 /************* Begin control #defines *****************************************/
 #define YYCODETYPE unsigned char
-#define YYNOCODE 159
+#define YYNOCODE 167
 #define YYACTIONTYPE unsigned short int
 #define ParseTOKENTYPE struct psi_token *
 typedef union {
   int yyinit;
   ParseTOKENTYPE yy0;
-  struct psi_let_calloc* yy9;
-  struct psi_decl_var* yy11;
-  struct psi_let_exp* yy20;
-  struct psi_set_func* yy26;
-  struct psi_let_func* yy27;
-  struct psi_impl_var* yy37;
-  struct psi_plist * yy43;
-  struct psi_decl_enum * yy63;
-  struct psi_token** yy78;
-  struct psi_return_stmt* yy90;
-  struct psi_layout yy91;
-  struct psi_impl_def_val* yy93;
-  struct psi_free_exp* yy94;
-  struct psi_impl* yy97;
-  struct psi_set_stmt* yy98;
-  struct psi_decl* yy103;
-  bool yy121;
-  struct psi_decl_type* yy132;
-  struct psi_impl_type* yy138;
-  struct psi_layout* yy141;
-  struct psi_set_exp* yy147;
-  struct psi_const* yy154;
-  struct psi_plist* yy163;
-  struct psi_impl_func* yy168;
-  struct psi_const_type* yy171;
-  struct psi_decl_arg* yy184;
-  struct psi_number* yy188;
-  struct psi_free_stmt* yy192;
-  unsigned yy202;
-  struct psi_impl_arg* yy210;
-  struct psi_decl_enum_item* yy217;
-  struct psi_decl_abi* yy218;
-  struct psi_let_callback* yy220;
-  struct psi_num_exp* yy259;
-  struct psi_decl_union* yy271;
-  struct psi_decl_struct* yy275;
-  struct psi_let_stmt* yy311;
+  struct psi_const_type* yy7;
+  struct psi_let_calloc* yy17;
+  struct psi_decl_union* yy19;
+  struct psi_impl_def_val* yy21;
+  struct psi_token** yy38;
+  struct psi_num_exp* yy39;
+  struct psi_impl* yy49;
+  struct psi_set_exp* yy67;
+  struct psi_decl_enum_item* yy69;
+  struct psi_decl* yy71;
+  struct psi_let_func* yy72;
+  struct psi_free_stmt* yy76;
+  struct psi_set_func* yy78;
+  struct psi_layout* yy81;
+  struct psi_const* yy106;
+  struct psi_impl_func* yy120;
+  struct psi_return_stmt* yy130;
+  struct psi_let_stmt* yy139;
+  struct psi_impl_type* yy142;
+  struct psi_let_exp* yy144;
+  struct psi_decl_type* yy152;
+  struct psi_number* yy160;
+  struct psi_let_callback* yy164;
+  struct psi_impl_var* yy185;
+  unsigned yy190;
+  struct psi_free_exp* yy197;
+  struct psi_decl_var* yy207;
+  struct psi_set_stmt* yy226;
+  struct psi_impl_arg* yy238;
+  struct psi_decl_abi* yy242;
+  struct psi_decl_arg* yy260;
+  struct psi_decl_struct* yy271;
+  bool yy273;
+  struct psi_decl_enum * yy279;
+  struct psi_plist * yy287;
+  struct psi_plist* yy303;
+  struct psi_layout yy323;
 } YYMINORTYPE;
 #ifndef YYSTACKDEPTH
 #define YYSTACKDEPTH 100
@@ -251,244 +251,258 @@ typedef union {
 **  yy_default[]       Default action for each state.
 **
 *********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (960)
+#define YY_ACTTAB_COUNT (1024)
 static const YYACTIONTYPE yy_action[] = {
  /*     0 */   394,  409,   93,  409,  409,  409,  409,  409,  409,  409,
- /*    10 */   409,  409,  409,   93,  436,  430,  478,  164,  116,  430,
- /*    20 */   350,  423,   15,  475,  431,   27,   27,  478,    2,  133,
- /*    30 */    27,   27,  148,  148,  148,  148,  148,  148,  148,  148,
- /*    40 */   148,  148,  432,  100,   48,  440,  442,   83,   29,   29,
- /*    50 */    29,   29,   29,   29,   29,   29,   29,   29,  149,   56,
- /*    60 */   478,  422,  107,  122,   28,  155,   90,   89,   88,  365,
- /*    70 */   348,  397,   35,  470,  410,   43,   70,  390,   81,   67,
- /*    80 */    65,   64,  394,  409,   47,  409,  409,  409,  409,  409,
- /*    90 */   409,  409,  409,  409,  409,   39,   49,   11,   10,   60,
- /*   100 */    93,  437,  430,  349,  352,  411,  430,  417,  417,  417,
- /*   110 */   417,  417,   27,   27,  478,  405,  146,   27,   27,  148,
- /*   120 */   148,  148,  148,  148,  148,  148,  148,  148,  148,   83,
- /*   130 */   374,  108,  394,  409,  376,  409,  409,  409,  409,  409,
- /*   140 */   409,  409,  409,  409,  409,  149,  405,   80,  179,  181,
- /*   150 */   180,   28,  193,  182,   35,  425,  153,  376,  427,  390,
- /*   160 */    81,   67,   65,   64,  359,  166,  428,  494,   77,  122,
- /*   170 */   426,  429,  165,  122,  494,  382,  114,  410,   33,   41,
- /*   180 */   410,   43,  394,  409,  431,  409,  409,  409,  409,  409,
- /*   190 */   409,  409,  409,  409,  409,  158,  115,  416,   90,   89,
- /*   200 */    88,  415,  432,   96,   34,  414,  182,  375,  134,  390,
- /*   210 */    81,   67,   65,   64,  194,   87,   85,  178,  405,  136,
- /*   220 */   421,  405,  167,  122,  169,   79,  137,    4,  384,   83,
- /*   230 */   410,   43,  394,  409,  112,  409,  409,  409,  409,  409,
- /*   240 */   409,  409,  409,  409,  409,  357,  122,  394,   90,   89,
- /*   250 */    88,  382,  117,  182,   35,  119,  410,   43,  122,  390,
- /*   260 */    81,   67,   65,   64,  178,  122,  379,  194,   87,   85,
- /*   270 */    94,  405,   79,  122,  395,  385,  343,  410,   43,   76,
- /*   280 */   479,  366,  394,  409,  122,  409,  409,  409,  409,  409,
- /*   290 */   409,  409,  409,  409,  409,  478,  402,  405,  179,  181,
- /*   300 */   180,  383,  349,  351,   35,  124,  410,   43,  401,  390,
- /*   310 */    81,   67,   65,   64,  194,   87,   85,   53,  405,  131,
- /*   320 */   419,  419,  419,  419,  390,   81,   67,  431,   68,   66,
- /*   330 */   147,  132,  394,  409,  431,  409,  409,  409,  409,  409,
- /*   340 */   409,  409,  409,  409,  409,  432,   97,  405,  179,  181,
- /*   350 */   180,   38,  432,  102,   35,  124,  431,  127,  431,  390,
- /*   360 */    81,   67,   65,   64,   36,  128,  122,  418,  419,  419,
- /*   370 */   419,  419,  419,  122,  432,   98,  432,  104,   20,   83,
- /*   380 */   106,  472,  394,  409,  431,  409,  409,  409,  409,  409,
- /*   390 */   409,  409,  409,  409,  409,  122,  377,  122,  179,  181,
- /*   400 */   180,  368,  432,  103,   35,  353,  353,  353,  353,  390,
- /*   410 */    81,   67,   65,   64,   29,   29,   29,   29,   29,   29,
- /*   420 */    29,   29,   29,  122,  109,  471,  356,  145,  113,   74,
- /*   430 */   157,  161,  394,  409,  105,  409,  409,  409,  409,  409,
- /*   440 */   409,  409,  409,  409,  409,  160,  161,  367,  179,  181,
- /*   450 */   180,  361,  147,  147,  189,  163,  161,   42,  176,  390,
- /*   460 */    81,   67,   65,   64,   92,  122,  177,  458,  458,  458,
- /*   470 */   458,  458,  458,  458,  458,  458,  458,  335,  479,   82,
- /*   480 */   123,  344,  333,  459,  334,  400,  332,  331,   37,  473,
- /*   490 */   398,  329,  393,   19,    8,  451,  391,  118,  179,  181,
- /*   500 */   180,  378,    2,  330,  151,   13,  461,    7,  460,  390,
- /*   510 */    81,   67,   65,   64,   93,  479,  430,    6,  450,   84,
- /*   520 */   430,   86,  120,  475,   44,  342,   27,   27,  478,   23,
- /*   530 */   154,   27,   27,  141,  643,    3,    3,   45,  194,   24,
- /*   540 */   360,  379,  121,  141,  141,  141,  141,  141,  141,  141,
- /*   550 */   341,  183,   46,  340,  192,  479,  345,  337,   93,  373,
- /*   560 */   430,  372,   61,   57,  430,   28,  126,  475,  125,   58,
- /*   570 */    27,   27,  478,   59,  130,   27,   27,  141,  419,  419,
- /*   580 */   419,  419,   31,   16,   32,  469,  631,  141,  141,  141,
- /*   590 */   141,  141,  141,  141,   29,   29,   29,   29,   29,   29,
- /*   600 */    29,   29,   29,   29,   93,  637,  430,   71,  468,   28,
- /*   610 */   430,  447,  446,  475,  462,   12,   27,   27,  478,  369,
- /*   620 */   139,   27,   27,  141,   40,  448,  419,  419,  419,  419,
- /*   630 */   419,   14,    5,  141,  141,  141,  141,  141,  141,  141,
- /*   640 */   449,  143,  418,   50,  129,   51,   26,  364,  369,    9,
- /*   650 */    17,  363,  152,   72,   18,   28,   29,   29,   29,   29,
- /*   660 */    29,   29,   29,   29,   29,   29,  196,  483,  484,  156,
- /*   670 */    93,   52,  430,   95,  190,  170,  430,   73,  159,   63,
- /*   680 */     1,  479,   27,   27,  478,  162,   75,   27,   27,   69,
- /*   690 */    68,   54,  522,  355,  354,  196,  483,  484,   62,  168,
- /*   700 */    78,   25,   95,  190,  170,  389,  335,  171,   63,    1,
- /*   710 */   172,  333,  173,  334,  141,  332,  331,  174,   69,   68,
- /*   720 */   329,   28,   19,  175,  141,  141,  141,  141,  141,  141,
- /*   730 */   141,  387,  330,  151,  150,   29,   29,   29,   29,   29,
- /*   740 */    29,   29,   29,   29,   29,  431,  386,  494,  408,  407,
- /*   750 */   185,  406,  432,  101,  358,  439,  441,  140,  184,  438,
- /*   760 */   452,  110,  339,  432,   99,  482,  186,  194,  144,  142,
- /*   770 */   187,  431,  188,  122,  456,   91,  463,  371,  191,   30,
- /*   780 */    55,  433,  147,  140,  122,  328,  195,  487,  487,  432,
- /*   790 */    99,  487,  487,  150,  487,   39,   49,   11,   10,   60,
- /*   800 */   465,  111,  463,  150,  487,  487,  487,  487,  147,  487,
- /*   810 */   122,  432,  101,  413,  439,  441,  487,  487,  438,  453,
- /*   820 */   487,  432,  101,  487,  439,  441,  150,  487,  438,  445,
- /*   830 */   487,  487,  122,  487,  487,  487,  487,  487,  431,  487,
- /*   840 */   487,  431,  122,  487,  432,  101,  487,  439,  441,  487,
- /*   850 */   140,  438,  138,  140,  487,  487,  432,   99,  487,  432,
- /*   860 */    99,  487,  487,  487,  487,  122,  487,  135,  487,  463,
- /*   870 */   467,  431,  463,  487,  431,  147,  487,  122,  147,  487,
- /*   880 */   122,  487,  487,  140,  487,  487,  140,  487,  487,  432,
- /*   890 */    99,  487,  432,   99,  487,  487,  487,  487,  487,  487,
- /*   900 */   466,  487,  463,  457,  487,  463,  487,  487,  147,  487,
- /*   910 */   122,  147,  487,  122,  487,   21,  424,  487,  487,  427,
- /*   920 */   487,  487,   22,  424,  487,  487,  427,  428,  487,  487,
- /*   930 */   487,  426,  429,  487,  428,  487,  487,  487,  426,  429,
- /*   940 */   487,   39,   49,   11,   10,   60,  487,  487,  487,  487,
- /*   950 */   487,  487,  487,  487,  487,  487,  487,  487,  487,  412,
+ /*    10 */   409,  409,  409,   93,  436,  430,  478,   21,  424,  430,
+ /*    20 */   425,  427,   15,  427,  411,   27,   27,  478,  475,  428,
+ /*    30 */   494,  428,  150,  426,  429,  426,  429,  494,   27,   27,
+ /*    40 */   148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
+ /*    50 */   432,  101,  124,  439,  441,   83,  423,  438,  452,  110,
+ /*    60 */   417,  417,  417,  417,  417,  405,  149,   56,  366,  422,
+ /*    70 */   107,  122,   28,  376,   90,   89,   88,  147,  348,   48,
+ /*    80 */    35,  133,  478,  164,  116,  390,   81,   67,   65,   64,
+ /*    90 */   394,  409,   47,  409,  409,  409,  409,  409,  409,  409,
+ /*   100 */   409,  409,  409,   39,   49,   11,   10,   60,   93,  437,
+ /*   110 */   430,  158,  115,  141,  430,  353,  353,  353,  353,  478,
+ /*   120 */    27,   27,  478,  141,  141,  141,  141,  141,  141,  141,
+ /*   130 */   375,  193,  136,   27,   27,  148,  148,  148,  148,  148,
+ /*   140 */   148,  148,  148,  148,  148,   83,  349,  352,  394,  409,
+ /*   150 */   146,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+ /*   160 */   409,  149,  349,  351,  179,  181,  180,   28,  134,  122,
+ /*   170 */    35,  122,  153,  109,  471,  390,   81,   67,   65,   64,
+ /*   180 */    29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
+ /*   190 */    29,   29,   29,   29,   29,   29,   29,   29,  394,  419,
+ /*   200 */   419,  419,  419,   41,  124,  145,  394,  409,  416,  409,
+ /*   210 */   409,  409,  409,  409,  409,  409,  409,  409,  409,  415,
+ /*   220 */   382,  114,   90,   89,   88,  410,   43,  414,   34,  106,
+ /*   230 */   147,  123,  344,  390,   81,   67,   65,   64,   29,   29,
+ /*   240 */    29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
+ /*   250 */    29,  374,  108,   29,   29,  419,  419,  419,  419,  419,
+ /*   260 */   421,   83,  113,  397,  394,  409,  405,  409,  409,  409,
+ /*   270 */   409,  409,  409,  409,  409,  409,  409,  167,  137,  112,
+ /*   280 */    90,   89,   88,  390,   81,   67,   35,  147,   36,  128,
+ /*   290 */   122,  390,   81,   67,   65,   64,  458,  458,  458,  458,
+ /*   300 */   458,  458,  458,  458,  458,  458,  155,  379,  157,  161,
+ /*   310 */   365,  169,  459,  160,  161,  410,   43,  122,  122,   76,
+ /*   320 */   119,  479,  394,  409,  431,  409,  409,  409,  409,  409,
+ /*   330 */   409,  409,  409,  409,  409,  376,  431,  357,  179,  181,
+ /*   340 */   180,  402,  432,  100,   35,  440,  442,   80,  140,  390,
+ /*   350 */    81,   67,   65,   64,  432,   99,  405,  163,  161,  144,
+ /*   360 */   142,  127,  350,  122,  356,  456,   53,  463,   37,  473,
+ /*   370 */     2,  418,  395,  147,  122,  122,  122,   66,    8,  451,
+ /*   380 */   394,  409,  431,  409,  409,  409,  409,  409,  409,  409,
+ /*   390 */   409,  409,  409,   94,  431,  401,  179,  181,  180,  343,
+ /*   400 */   432,   96,   35,  122,   13,  461,  140,  390,   81,   67,
+ /*   410 */    65,   64,  432,   99,   39,   49,   11,   10,   60,  470,
+ /*   420 */    92,  122,   70,  465,  111,  463,  131,    7,  460,    6,
+ /*   430 */   450,  147,  413,  122,  479,   83,   23,  154,  394,  409,
+ /*   440 */   431,  409,  409,  409,  409,  409,  409,  409,  409,  409,
+ /*   450 */   409,   68,  150,  472,  179,  181,  180,  132,  432,   97,
+ /*   460 */    35,  378,   24,  360,   38,  390,   81,   67,   65,   64,
+ /*   470 */   432,  101,   20,  439,  441,  479,  383,  438,  453,  122,
+ /*   480 */   369,  410,   43,  382,  117,  377,  368,  105,  410,   43,
+ /*   490 */   367,  122,  361,   74,  189,  379,  394,  409,   42,  409,
+ /*   500 */   409,  409,  409,  409,  409,  409,  409,  409,  409,  479,
+ /*   510 */   176,  177,  179,  181,  180,  398,   22,  424,  393,  400,
+ /*   520 */   427,  431,  405,  390,   81,   67,   65,   64,  428,  405,
+ /*   530 */    44,  391,  426,  429,  118,  196,  483,  484,    2,  432,
+ /*   540 */   102,   84,   95,  190,  170,   45,   86,  335,   63,    1,
+ /*   550 */   120,   82,  333,  342,  334,  121,  332,  331,   69,   68,
+ /*   560 */   122,  329,  183,   19,   46,  341,  340,  192,  345,  337,
+ /*   570 */   179,  181,  180,  330,  151,   39,   49,   11,   10,   60,
+ /*   580 */   373,  390,   81,   67,   65,   64,   93,  372,  430,   61,
+ /*   590 */    57,  126,  430,  412,  125,  475,  182,   58,   27,   27,
+ /*   600 */   478,   59,  130,   31,  643,    3,    3,  178,  194,  469,
+ /*   610 */    16,   27,   27,  141,  468,   79,  431,    4,  384,   32,
+ /*   620 */   410,   43,  447,  141,  141,  141,  141,  141,  141,  141,
+ /*   630 */   419,  419,  419,  419,  432,   98,  446,   71,   93,  462,
+ /*   640 */   430,   12,   40,  448,  430,   28,  143,  475,   14,  182,
+ /*   650 */    27,   27,  478,    5,   50,  122,  418,  194,   87,   85,
+ /*   660 */   178,  405,   51,   27,   27,  141,  631,   26,   79,    9,
+ /*   670 */    17,  385,  364,  410,   43,  141,  141,  141,  141,  141,
+ /*   680 */   141,  141,  152,  363,   18,   72,  419,  419,  419,  419,
+ /*   690 */   419,  156,   52,   73,  159,  479,   75,   28,  431,  162,
+ /*   700 */    54,  522,  355,  354,  129,   78,   62,  168,  139,  389,
+ /*   710 */   194,   87,   85,  171,  405,  172,  432,  104,  173,   29,
+ /*   720 */    29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
+ /*   730 */    29,   29,   29,   29,   29,   29,   29,  122,  174,  408,
+ /*   740 */   175,   29,   29,   29,   29,   29,   29,   29,   29,   29,
+ /*   750 */    29,   29,   29,