X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.c;h=97ef23f5a595345a572cd03318e03d8d6953d30e;hp=ef1fb8504327f9efad39a9d0d14716669e39d985;hb=4d2c075c160bbc1ff49c3499f8fdd07d9c447a12;hpb=e11280a7b6ed67a4d79b14569ca06131ea2338bd

diff --git a/src/parser.c b/src/parser.c
index ef1fb85..97ef23f 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.16 on Thu Feb  9 14:38:14 2017 */
-#line 1 "/home/mike/src/php-master/ext/psi/src/parser.re"
+/* Generated by re2c 0.16 on Mon Feb 20 20:39:25 2017 */
+#line 1 "src/parser.re"
 #include "php_psi_stdinc.h"
 #include <sys/mman.h>
 #include <assert.h>
@@ -199,7 +199,7 @@ void psi_parser_free(struct psi_parser **P)
 	}
 }
 
-#define YYMAXFILL 10
+#define YYMAXFILL 12
 #if BSIZE < YYMAXFILL
 # error BSIZE must be greater than YYMAXFILL
 #endif
@@ -230,11 +230,11 @@ token_t psi_parser_scan(struct psi_parser *P)
 	nextline:
 		P->tok = P->cur;
 		
-#line 234 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 234 "src/parser.c"
 		{
 			unsigned char yych;
 			unsigned int yyaccept = 0;
-			if ((P->lim - P->cur) < 10) { if (!psi_parser_fill(P,10)) RETURN(PSI_T_EOF); };
+			if ((P->lim - P->cur) < 12) { if (!psi_parser_fill(P,12)) RETURN(PSI_T_EOF); };
 			yych = *P->cur;
 			switch (yych) {
 			case '\t':
@@ -336,9 +336,9 @@ token_t psi_parser_scan(struct psi_parser *P)
 yy2:
 			++P->cur;
 yy3:
-#line 344 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 346 "src/parser.re"
 			{break;}
-#line 342 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 342 "src/parser.c"
 yy4:
 			++P->cur;
 			if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
@@ -349,14 +349,14 @@ yy4:
 			default:	goto yy6;
 			}
 yy6:
-#line 281 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 281 "src/parser.re"
 			{ continue; }
-#line 355 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 355 "src/parser.c"
 yy7:
 			++P->cur;
-#line 280 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 280 "src/parser.re"
 			{ NEWLINE(nextline); }
-#line 360 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 360 "src/parser.c"
 yy9:
 			++P->cur;
 			switch ((yych = *P->cur)) {
@@ -364,9 +364,9 @@ yy9:
 			default:	goto yy10;
 			}
 yy10:
-#line 265 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 265 "src/parser.re"
 			{RETURN(PSI_T_NOT);}
-#line 370 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 370 "src/parser.c"
 yy11:
 			yyaccept = 0;
 			yych = *(P->mrk = ++P->cur);
@@ -448,9 +448,9 @@ yy13:
 			}
 yy14:
 			++P->cur;
-#line 266 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 266 "src/parser.re"
 			{RETURN(PSI_T_MODULO);}
-#line 454 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 454 "src/parser.c"
 yy16:
 			++P->cur;
 			switch ((yych = *P->cur)) {
@@ -458,24 +458,24 @@ yy16:
 			default:	goto yy17;
 			}
 yy17:
-#line 267 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 267 "src/parser.re"
 			{RETURN(PSI_T_AMPERSAND);}
-#line 464 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 464 "src/parser.c"
 yy18:
 			++P->cur;
-#line 249 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 249 "src/parser.re"
 			{RETURN(PSI_T_LPAREN);}
-#line 469 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 469 "src/parser.c"
 yy20:
 			++P->cur;
-#line 250 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 250 "src/parser.re"
 			{RETURN(PSI_T_RPAREN);}
-#line 474 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 474 "src/parser.c"
 yy22:
 			++P->cur;
-#line 263 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 263 "src/parser.re"
 			{RETURN(PSI_T_ASTERISK);}
-#line 479 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 479 "src/parser.c"
 yy24:
 			yyaccept = 1;
 			yych = *(P->mrk = ++P->cur);
@@ -494,14 +494,14 @@ yy24:
 			default:	goto yy25;
 			}
 yy25:
-#line 268 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 268 "src/parser.re"
 			{RETURN(PSI_T_PLUS);}
-#line 500 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 500 "src/parser.c"
 yy26:
 			++P->cur;
-#line 252 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 252 "src/parser.re"
 			{RETURN(PSI_T_COMMA);}
-#line 505 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 505 "src/parser.c"
 yy28:
 			yyaccept = 2;
 			yych = *(P->mrk = ++P->cur);
@@ -520,9 +520,9 @@ yy28:
 			default:	goto yy29;
 			}
 yy29:
-#line 269 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 269 "src/parser.re"
 			{RETURN(PSI_T_MINUS);}
-#line 526 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 526 "src/parser.c"
 yy30:
 			yyaccept = 0;
 			yych = *(P->mrk = ++P->cur);
@@ -549,9 +549,9 @@ yy31:
 			default:	goto yy32;
 			}
 yy32:
-#line 270 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 270 "src/parser.re"
 			{RETURN(PSI_T_SLASH);}
-#line 555 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 555 "src/parser.c"
 yy33:
 			yyaccept = 4;
 			P->mrk = ++P->cur;
@@ -574,19 +574,19 @@ yy33:
 			default:	goto yy35;
 			}
 yy35:
-#line 339 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 341 "src/parser.re"
 			{RETURN(PSI_T_NUMBER);}
-#line 580 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 580 "src/parser.c"
 yy36:
 			++P->cur;
-#line 253 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 253 "src/parser.re"
 			{RETURN(PSI_T_COLON);}
-#line 585 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 585 "src/parser.c"
 yy38:
 			++P->cur;
-#line 251 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 251 "src/parser.re"
 			{RETURN(PSI_T_EOS);}
-#line 590 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 590 "src/parser.c"
 yy40:
 			++P->cur;
 			switch ((yych = *P->cur)) {
@@ -595,9 +595,9 @@ yy40:
 			default:	goto yy41;
 			}
 yy41:
-#line 277 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 277 "src/parser.re"
 			{RETURN(PSI_T_LCHEVR);}
-#line 601 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 601 "src/parser.c"
 yy42:
 			++P->cur;
 			switch ((yych = *P->cur)) {
@@ -605,9 +605,9 @@ yy42:
 			default:	goto yy43;
 			}
 yy43:
-#line 262 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 262 "src/parser.re"
 			{RETURN(PSI_T_EQUALS);}
-#line 611 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 611 "src/parser.c"
 yy44:
 			++P->cur;
 			switch ((yych = *P->cur)) {
@@ -616,9 +616,9 @@ yy44:
 			default:	goto yy45;
 			}
 yy45:
-#line 278 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 278 "src/parser.re"
 			{RETURN(PSI_T_RCHEVR);}
-#line 622 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 622 "src/parser.c"
 yy46:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -628,9 +628,9 @@ yy46:
 			default:	goto yy54;
 			}
 yy47:
-#line 340 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 342 "src/parser.re"
 			{RETURN(PSI_T_NAME);}
-#line 634 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 634 "src/parser.c"
 yy48:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
@@ -804,6 +804,10 @@ yy60:
 			switch (yych) {
 			case 'A':
 			case 'a':	goto yy132;
+			case 'O':
+			case 'o':	goto yy133;
+			case 'R':
+			case 'r':	goto yy134;
 			default:	goto yy54;
 			}
 yy61:
@@ -811,7 +815,7 @@ yy61:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy133;
+			case 'e':	goto yy135;
 			default:	goto yy54;
 			}
 yy62:
@@ -819,13 +823,13 @@ yy62:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy134;
+			case 'e':	goto yy136;
 			case 'H':
-			case 'h':	goto yy135;
+			case 'h':	goto yy137;
 			case 'I':
-			case 'i':	goto yy136;
+			case 'i':	goto yy138;
 			case 'T':
-			case 't':	goto yy137;
+			case 't':	goto yy139;
 			default:	goto yy54;
 			}
 yy63:
@@ -833,13 +837,13 @@ yy63:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy138;
+			case 'e':	goto yy140;
 			case 'O':
-			case 'o':	goto yy139;
+			case 'o':	goto yy141;
 			case 'R':
-			case 'r':	goto yy140;
+			case 'r':	goto yy142;
 			case 'Y':
-			case 'y':	goto yy141;
+			case 'y':	goto yy143;
 			default:	goto yy54;
 			}
 yy64:
@@ -847,9 +851,9 @@ yy64:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'I':
-			case 'i':	goto yy142;
+			case 'i':	goto yy144;
 			case 'N':
-			case 'n':	goto yy143;
+			case 'n':	goto yy145;
 			default:	goto yy54;
 			}
 yy65:
@@ -857,7 +861,7 @@ yy65:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'O':
-			case 'o':	goto yy144;
+			case 'o':	goto yy146;
 			default:	goto yy54;
 			}
 yy66:
@@ -865,14 +869,14 @@ yy66:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'V':
-			case 'v':	goto yy145;
+			case 'v':	goto yy147;
 			default:	goto yy54;
 			}
 yy67:
 			++P->cur;
-#line 256 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 256 "src/parser.re"
 			{RETURN(PSI_T_LBRACKET);}
-#line 876 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 880 "src/parser.c"
 yy69:
 			yych = *++P->cur;
 			switch (yych) {
@@ -928,55 +932,55 @@ yy69:
 			case 'w':
 			case 'x':
 			case 'y':
-			case 'z':	goto yy146;
+			case 'z':	goto yy148;
 			default:	goto yy3;
 			}
 yy70:
 			++P->cur;
-#line 257 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 257 "src/parser.re"
 			{RETURN(PSI_T_RBRACKET);}
-#line 939 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 943 "src/parser.c"
 yy72:
 			++P->cur;
-#line 272 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 272 "src/parser.re"
 			{RETURN(PSI_T_CARET);}
-#line 944 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 948 "src/parser.c"
 yy74:
 			++P->cur;
-#line 254 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 254 "src/parser.re"
 			{RETURN(PSI_T_LBRACE);}
-#line 949 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 953 "src/parser.c"
 yy76:
 			++P->cur;
 			switch ((yych = *P->cur)) {
-			case '|':	goto yy149;
+			case '|':	goto yy151;
 			default:	goto yy77;
 			}
 yy77:
-#line 271 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 271 "src/parser.re"
 			{RETURN(PSI_T_PIPE);}
-#line 959 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 963 "src/parser.c"
 yy78:
 			++P->cur;
-#line 255 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 255 "src/parser.re"
 			{RETURN(PSI_T_RBRACE);}
-#line 964 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 968 "src/parser.c"
 yy80:
 			++P->cur;
-#line 264 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 264 "src/parser.re"
 			{RETURN(PSI_T_TILDE);}
-#line 969 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 973 "src/parser.c"
 yy82:
 			++P->cur;
-#line 258 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 258 "src/parser.re"
 			{RETURN(PSI_T_CMP_NE);}
-#line 974 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 978 "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 yy151;
+			case '"':	goto yy153;
 			default:	goto yy84;
 			}
 yy86:
@@ -990,9 +994,9 @@ yy87:
 			}
 yy88:
 			++P->cur;
-#line 248 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 248 "src/parser.re"
 			{ NEWLINE(nextline); }
-#line 996 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1000 "src/parser.c"
 yy90:
 			++P->cur;
 			if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
@@ -1064,14 +1068,14 @@ yy90:
 			default:	goto yy92;
 			}
 yy92:
-#line 342 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 344 "src/parser.re"
 			{RETURN(PSI_T_DOLLAR_NAME);}
-#line 1070 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1074 "src/parser.c"
 yy93:
 			++P->cur;
-#line 260 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 260 "src/parser.re"
 			{RETURN(PSI_T_AND);}
-#line 1075 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1079 "src/parser.c"
 yy95:
 			yych = *++P->cur;
 			switch (yych) {
@@ -1096,69 +1100,71 @@ yy96:
 			case 3: 	goto yy32;
 			case 4: 	goto yy35;
 			case 5: 	goto yy47;
-			case 6: 	goto yy148;
-			case 7: 	goto yy171;
-			case 8: 	goto yy173;
-			case 9: 	goto yy175;
-			case 10: 	goto yy183;
-			case 11: 	goto yy200;
-			case 12: 	goto yy203;
-			case 13: 	goto yy208;
-			case 14: 	goto yy212;
-			case 15: 	goto yy220;
-			case 16: 	goto yy223;
-			case 17: 	goto yy236;
-			case 18: 	goto yy244;
-			case 19: 	goto yy250;
-			case 20: 	goto yy252;
-			case 21: 	goto yy254;
-			case 22: 	goto yy261;
-			case 23: 	goto yy263;
-			case 24: 	goto yy266;
-			case 25: 	goto yy268;
-			case 26: 	goto yy276;
-			case 27: 	goto yy282;
-			case 28: 	goto yy301;
-			case 29: 	goto yy304;
-			case 30: 	goto yy309;
-			case 31: 	goto yy311;
-			case 32: 	goto yy318;
-			case 33: 	goto yy320;
-			case 34: 	goto yy322;
-			case 35: 	goto yy324;
-			case 36: 	goto yy327;
-			case 37: 	goto yy329;
-			case 38: 	goto yy331;
-			case 39: 	goto yy333;
-			case 40: 	goto yy335;
-			case 41: 	goto yy337;
-			case 42: 	goto yy339;
-			case 43: 	goto yy344;
-			case 44: 	goto yy354;
-			case 45: 	goto yy360;
-			case 46: 	goto yy362;
-			case 47: 	goto yy364;
-			case 48: 	goto yy366;
-			case 49: 	goto yy369;
-			case 50: 	goto yy374;
-			case 51: 	goto yy379;
-			case 52: 	goto yy382;
-			case 53: 	goto yy384;
-			case 54: 	goto yy386;
-			case 55: 	goto yy388;
-			case 56: 	goto yy390;
-			case 57: 	goto yy392;
-			case 58: 	goto yy396;
-			case 59: 	goto yy398;
-			case 60: 	goto yy400;
-			case 61: 	goto yy402;
-			case 62: 	goto yy404;
-			default:	goto yy406;
+			case 6: 	goto yy150;
+			case 7: 	goto yy173;
+			case 8: 	goto yy175;
+			case 9: 	goto yy177;
+			case 10: 	goto yy187;
+			case 11: 	goto yy204;
+			case 12: 	goto yy207;
+			case 13: 	goto yy212;
+			case 14: 	goto yy216;
+			case 15: 	goto yy224;
+			case 16: 	goto yy227;
+			case 17: 	goto yy242;
+			case 18: 	goto yy250;
+			case 19: 	goto yy256;
+			case 20: 	goto yy258;
+			case 21: 	goto yy260;
+			case 22: 	goto yy267;
+			case 23: 	goto yy269;
+			case 24: 	goto yy272;
+			case 25: 	goto yy274;
+			case 26: 	goto yy282;
+			case 27: 	goto yy290;
+			case 28: 	goto yy309;
+			case 29: 	goto yy312;
+			case 30: 	goto yy317;
+			case 31: 	goto yy319;
+			case 32: 	goto yy326;
+			case 33: 	goto yy328;
+			case 34: 	goto yy330;
+			case 35: 	goto yy332;
+			case 36: 	goto yy337;
+			case 37: 	goto yy339;
+			case 38: 	goto yy341;
+			case 39: 	goto yy343;
+			case 40: 	goto yy345;
+			case 41: 	goto yy347;
+			case 42: 	goto yy349;
+			case 43: 	goto yy354;
+			case 44: 	goto yy364;
+			case 45: 	goto yy370;
+			case 46: 	goto yy372;
+			case 47: 	goto yy374;
+			case 48: 	goto yy376;
+			case 49: 	goto yy381;
+			case 50: 	goto yy386;
+			case 51: 	goto yy391;
+			case 52: 	goto yy394;
+			case 53: 	goto yy396;
+			case 54: 	goto yy398;
+			case 55: 	goto yy400;
+			case 56: 	goto yy404;
+			case 57: 	goto yy406;
+			case 58: 	goto yy410;
+			case 59: 	goto yy412;
+			case 60: 	goto yy414;
+			case 61: 	goto yy416;
+			case 62: 	goto yy420;
+			case 63: 	goto yy422;
+			case 64: 	goto yy425;
+			default:	goto yy427;
 			}
 yy97:
 			yych = *++P->cur;
 			switch (yych) {
-			case '.':	goto yy153;
+			case '.':	goto yy155;
 			default:	goto yy96;
 			}
 yy98:
@@ -1183,14 +1189,14 @@ yy98:
 			}
 yy100:
 			++P->cur;
-#line 247 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 247 "src/parser.re"
 			{ goto comment; }
-#line 1189 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1195 "src/parser.c"
 yy102:
 			yych = *++P->cur;
 			switch (yych) {
 			case '+':
-			case '-':	goto yy155;
+			case '-':	goto yy157;
 			case '0':
 			case '1':
 			case '2':
@@ -1200,40 +1206,40 @@ yy102:
 			case '6':
 			case '7':
 			case '8':
-			case '9':	goto yy156;
+			case '9':	goto yy158;
 			default:	goto yy96;
 			}
 yy103:
 			++P->cur;
-#line 273 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 273 "src/parser.re"
 			{RETURN(PSI_T_LSHIFT);}
-#line 1211 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1217 "src/parser.c"
 yy105:
 			++P->cur;
-#line 275 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 275 "src/parser.re"
 			{RETURN(PSI_T_CMP_LE);}
-#line 1216 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1222 "src/parser.c"
 yy107:
 			++P->cur;
-#line 259 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 259 "src/parser.re"
 			{RETURN(PSI_T_CMP_EQ);}
-#line 1221 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1227 "src/parser.c"
 yy109:
 			++P->cur;
-#line 276 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 276 "src/parser.re"
 			{RETURN(PSI_T_CMP_GE);}
-#line 1226 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1232 "src/parser.c"
 yy111:
 			++P->cur;
-#line 274 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 274 "src/parser.re"
 			{RETURN(PSI_T_RSHIFT);}
-#line 1231 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 1237 "src/parser.c"
 yy113:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'R':
-			case 'r':	goto yy158;
+			case 'r':	goto yy160;
 			default:	goto yy54;
 			}
 yy114:
@@ -1293,7 +1299,7 @@ yy114:
 			case 'w':
 			case 'x':
 			case 'y':
-			case 'z':	goto yy146;
+			case 'z':	goto yy148;
 			default:	goto yy96;
 			}
 yy115:
@@ -1301,7 +1307,7 @@ yy115:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'O':
-			case 'o':	goto yy159;
+			case 'o':	goto yy161;
 			default:	goto yy54;
 			}
 yy116:
@@ -1309,7 +1315,7 @@ yy116:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy160;
+			case 'l':	goto yy162;
 			default:	goto yy54;
 			}
 yy117:
@@ -1317,7 +1323,7 @@ yy117:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy161;
+			case 'a':	goto yy163;
 			default:	goto yy54;
 			}
 yy118:
@@ -1325,9 +1331,9 @@ yy118:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy162;
+			case 'n':	goto yy164;
 			case 'U':
-			case 'u':	goto yy163;
+			case 'u':	goto yy165;
 			default:	goto yy54;
 			}
 yy119:
@@ -1335,7 +1341,7 @@ yy119:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'U':
-			case 'u':	goto yy164;
+			case 'u':	goto yy166;
 			default:	goto yy54;
 			}
 yy120:
@@ -1343,7 +1349,7 @@ yy120:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'U':
-			case 'u':	goto yy165;
+			case 'u':	goto yy167;
 			default:	goto yy54;
 			}
 yy121:
@@ -1351,7 +1357,7 @@ yy121:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy166;
+			case 'l':	goto yy168;
 			default:	goto yy54;
 			}
 yy122:
@@ -1359,7 +1365,7 @@ yy122:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'O':
-			case 'o':	goto yy167;
+			case 'o':	goto yy169;
 			default:	goto yy54;
 			}
 yy123:
@@ -1367,7 +1373,7 @@ yy123:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy168;
+			case 'e':	goto yy170;
 			default:	goto yy54;
 			}
 yy124:
@@ -1375,7 +1381,7 @@ yy124:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy169;
+			case 'n':	goto yy171;
 			default:	goto yy54;
 			}
 yy125:
@@ -1383,7 +1389,7 @@ yy125:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy170;
+			case 't':	goto yy172;
 			default:	goto yy54;
 			}
 yy126:
@@ -1391,7 +1397,7 @@ yy126:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy172;
+			case 't':	goto yy174;
 			default:	goto yy54;
 			}
 yy127:
@@ -1399,7 +1405,7 @@ yy127:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'B':
-			case 'b':	goto yy174;
+			case 'b':	goto yy176;
 			default:	goto yy54;
 			}
 yy128:
@@ -1407,7 +1413,7 @@ yy128:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy176;
+			case 'n':	goto yy178;
 			default:	goto yy54;
 			}
 yy129:
@@ -1415,7 +1421,7 @@ yy129:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'X':
-			case 'x':	goto yy177;
+			case 'x':	goto yy179;
 			default:	goto yy54;
 			}
 yy130:
@@ -1423,7 +1429,7 @@ yy130:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy178;
+			case 'l':	goto yy180;
 			default:	goto yy54;
 			}
 yy131:
@@ -1431,7 +1437,7 @@ yy131:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'J':
-			case 'j':	goto yy179;
+			case 'j':	goto yy181;
 			default:	goto yy54;
 			}
 yy132:
@@ -1439,117 +1445,133 @@ yy132:
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy180;
+			case 't':	goto yy182;
 			default:	goto yy54;
 			}
 yy133:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case 'T':
-			case 't':	goto yy181;
+			case 'S':
+			case 's':	goto yy183;
 			default:	goto yy54;
 			}
 yy134:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case 'T':
-			case 't':	goto yy182;
+			case 'E':
+			case 'e':	goto yy184;
 			default:	goto yy54;
 			}
 yy135:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case 'O':
-			case 'o':	goto yy184;
+			case 'T':
+			case 't':	goto yy185;
 			default:	goto yy54;
 			}
 yy136:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case 'G':
-			case 'g':	goto yy185;
+			case 'T':
+			case 't':	goto yy186;
 			default:	goto yy54;
 			}
 yy137:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case 'A':
-			case 'a':	goto yy186;
-			case 'R':
-			case 'r':	goto yy187;
+			case 'O':
+			case 'o':	goto yy188;
 			default:	goto yy54;
 			}
 yy138:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case 'M':
-			case 'm':	goto yy188;
+			case 'G':
+			case 'g':	goto yy189;
 			default:	goto yy54;
 			}
 yy139:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '_':	goto yy189;
+			case 'A':
+			case 'a':	goto yy190;
+			case 'R':
+			case 'r':	goto yy191;
 			default:	goto yy54;
 			}
 yy140:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case 'U':
-			case 'u':	goto yy190;
+			case 'M':
+			case 'm':	goto yy192;
 			default:	goto yy54;
 			}
 yy141:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case 'P':
-			case 'p':	goto yy191;
+			case '_':	goto yy193;
 			default:	goto yy54;
 			}
 yy142:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case 'N':
-			case 'n':	goto yy192;
+			case 'U':
+			case 'u':	goto yy194;
 			default:	goto yy54;
 			}
 yy143:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'P':
+			case 'p':	goto yy195;
+			default:	goto yy54;
+			}
+yy144:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'N':
+			case 'n':	goto yy196;
+			default:	goto yy54;
+			}
+yy145:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'I':
-			case 'i':	goto yy193;
+			case 'i':	goto yy197;
 			case 'S':
-			case 's':	goto yy194;
+			case 's':	goto yy198;
 			default:	goto yy54;
 			}
-yy144:
+yy146:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'I':
-			case 'i':	goto yy195;
+			case 'i':	goto yy199;
 			default:	goto yy54;
 			}
-yy145:
+yy147:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy196;
+			case 'a':	goto yy200;
 			default:	goto yy54;
 			}
-yy146:
+yy148:
 			yyaccept = 6;
 			P->mrk = ++P->cur;
 			if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
@@ -1617,30 +1639,30 @@ yy146:
 			case 'w':
 			case 'x':
 			case 'y':
-			case 'z':	goto yy146;
+			case 'z':	goto yy148;
 			case '\\':	goto yy114;
-			default:	goto yy148;
+			default:	goto yy150;
 			}
-yy148:
-#line 341 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy150:
+#line 343 "src/parser.re"
 			{RETURN(PSI_T_NSNAME);}
-#line 1628 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy149:
+#line 1650 "src/parser.c"
+yy151:
 			++P->cur;
-#line 261 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 261 "src/parser.re"
 			{RETURN(PSI_T_OR);}
-#line 1633 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy151:
+#line 1655 "src/parser.c"
+yy153:
 			++P->cur;
-#line 343 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 345 "src/parser.re"
 			{RETURN(PSI_T_QUOTED_STRING);}
-#line 1638 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy153:
+#line 1660 "src/parser.c"
+yy155:
 			++P->cur;
-#line 279 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 279 "src/parser.re"
 			{RETURN(PSI_T_ELLIPSIS);}
-#line 1643 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy155:
+#line 1665 "src/parser.c"
+yy157:
 			yych = *++P->cur;
 			switch (yych) {
 			case '0':
@@ -1652,10 +1674,10 @@ yy155:
 			case '6':
 			case '7':
 			case '8':
-			case '9':	goto yy156;
+			case '9':	goto yy158;
 			default:	goto yy96;
 			}
-yy156:
+yy158:
 			++P->cur;
 			if (P->lim <= P->cur) { if (!psi_parser_fill(P,1)) RETURN(PSI_T_EOF); };
 			yych = *P->cur;
@@ -1669,108 +1691,108 @@ yy156:
 			case '6':
 			case '7':
 			case '8':
-			case '9':	goto yy156;
+			case '9':	goto yy158;
 			default:	goto yy35;
 			}
-yy158:
+yy160:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy197;
+			case 'a':	goto yy201;
 			case 'V':
-			case 'v':	goto yy198;
+			case 'v':	goto yy202;
 			default:	goto yy54;
 			}
-yy159:
+yy161:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy199;
+			case 'l':	goto yy203;
 			default:	goto yy54;
 			}
-yy160:
+yy162:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy201;
+			case 'l':	goto yy205;
 			default:	goto yy54;
 			}
-yy161:
+yy163:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'R':
-			case 'r':	goto yy202;
+			case 'r':	goto yy206;
 			default:	goto yy54;
 			}
-yy162:
+yy164:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'S':
-			case 's':	goto yy204;
+			case 's':	goto yy208;
 			default:	goto yy54;
 			}
-yy163:
+yy165:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy205;
+			case 'n':	goto yy209;
 			default:	goto yy54;
 			}
-yy164:
+yy166:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'B':
-			case 'b':	goto yy206;
+			case 'b':	goto yy210;
 			default:	goto yy54;
 			}
-yy165:
+yy167:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'M':
-			case 'm':	goto yy207;
+			case 'm':	goto yy211;
 			default:	goto yy54;
 			}
-yy166:
+yy168:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'S':
-			case 's':	goto yy209;
+			case 's':	goto yy213;
 			default:	goto yy54;
 			}
-yy167:
+yy169:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy210;
+			case 'a':	goto yy214;
 			default:	goto yy54;
 			}
-yy168:
+yy170:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy211;
+			case 'e':	goto yy215;
 			default:	goto yy54;
 			}
-yy169:
+yy171:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'C':
-			case 'c':	goto yy213;
+			case 'c':	goto yy217;
 			default:	goto yy54;
 			}
-yy170:
+yy172:
 			yyaccept = 7;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -1831,20 +1853,20 @@ yy170:
 			case 'x':
 			case 'y':
 			case 'z':	goto yy53;
-			case '1':	goto yy214;
-			case '3':	goto yy215;
-			case '6':	goto yy216;
-			case '8':	goto yy217;
+			case '1':	goto yy218;
+			case '3':	goto yy219;
+			case '6':	goto yy220;
+			case '8':	goto yy221;
 			case 'V':
-			case 'v':	goto yy218;
+			case 'v':	goto yy222;
 			case '\\':	goto yy114;
-			default:	goto yy171;
+			default:	goto yy173;
 			}
-yy171:
-#line 291 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy173:
+#line 291 "src/parser.re"
 			{RETURN(PSI_T_INT);}
-#line 1847 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy172:
+#line 1869 "src/parser.c"
+yy174:
 			yyaccept = 8;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -1912,13 +1934,13 @@ yy172:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy173;
+			default:	goto yy175;
 			}
-yy173:
-#line 317 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy175:
+#line 317 "src/parser.re"
 			{RETURN(PSI_T_LET);}
-#line 1921 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy174:
+#line 1943 "src/parser.c"
+yy176:
 			yyaccept = 9;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -1986,63 +2008,78 @@ yy174:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy175;
+			default:	goto yy177;
 			}
-yy175:
-#line 316 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy177:
+#line 316 "src/parser.re"
 			{RETURN(PSI_T_LIB);}
-#line 1995 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy176:
+#line 2017 "src/parser.c"
+yy178:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'G':
-			case 'g':	goto yy219;
+			case 'g':	goto yy223;
 			default:	goto yy54;
 			}
-yy177:
+yy179:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy221;
+			case 'e':	goto yy225;
 			default:	goto yy54;
 			}
-yy178:
+yy180:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy222;
+			case 'l':	goto yy226;
 			default:	goto yy54;
 			}
-yy179:
+yy181:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy224;
+			case 'e':	goto yy228;
 			case 'V':
-			case 'v':	goto yy225;
+			case 'v':	goto yy229;
 			default:	goto yy54;
 			}
-yy180:
+yy182:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'H':
-			case 'h':	goto yy226;
+			case 'h':	goto yy230;
 			default:	goto yy54;
 			}
-yy181:
+yy183:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'T':
+			case 't':	goto yy231;
+			default:	goto yy54;
+			}
+yy184:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case '_':	goto yy232;
+			default:	goto yy54;
+			}
+yy185:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'U':
-			case 'u':	goto yy227;
+			case 'u':	goto yy233;
 			default:	goto yy54;
 			}
-yy182:
+yy186:
 			yyaccept = 10;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -2110,149 +2147,149 @@ yy182:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy183;
+			default:	goto yy187;
 			}
-yy183:
-#line 318 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy187:
+#line 318 "src/parser.re"
 			{RETURN(PSI_T_SET);}
-#line 2119 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy184:
+#line 2156 "src/parser.c"
+yy188:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'R':
-			case 'r':	goto yy228;
+			case 'r':	goto yy234;
 			default:	goto yy54;
 			}
-yy185:
+yy189:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy229;
+			case 'n':	goto yy235;
 			default:	goto yy54;
 			}
-yy186:
+yy190:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy230;
+			case 't':	goto yy236;
 			default:	goto yy54;
 			}
-yy187:
+yy191:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'I':
-			case 'i':	goto yy231;
+			case 'i':	goto yy237;
 			case 'L':
-			case 'l':	goto yy232;
+			case 'l':	goto yy238;
 			case 'U':
-			case 'u':	goto yy233;
+			case 'u':	goto yy239;
 			case 'V':
-			case 'v':	goto yy234;
+			case 'v':	goto yy240;
 			default:	goto yy54;
 			}
-yy188:
+yy192:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'P':
-			case 'p':	goto yy235;
+			case 'p':	goto yy241;
 			default:	goto yy54;
 			}
-yy189:
+yy193:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy237;
+			case 'a':	goto yy243;
 			case 'B':
-			case 'b':	goto yy238;
+			case 'b':	goto yy244;
 			case 'F':
-			case 'f':	goto yy239;
+			case 'f':	goto yy245;
 			case 'I':
-			case 'i':	goto yy240;
+			case 'i':	goto yy246;
 			case 'O':
-			case 'o':	goto yy241;
+			case 'o':	goto yy247;
 			case 'S':
-			case 's':	goto yy242;
+			case 's':	goto yy248;
 			default:	goto yy54;
 			}
-yy190:
+yy194:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy243;
+			case 'e':	goto yy249;
 			default:	goto yy54;
 			}
-yy191:
+yy195:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy245;
+			case 'e':	goto yy251;
 			default:	goto yy54;
 			}
-yy192:
+yy196:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy246;
+			case 't':	goto yy252;
 			default:	goto yy54;
 			}
-yy193:
+yy197:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'O':
-			case 'o':	goto yy247;
+			case 'o':	goto yy253;
 			default:	goto yy54;
 			}
-yy194:
+yy198:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'I':
-			case 'i':	goto yy248;
+			case 'i':	goto yy254;
 			default:	goto yy54;
 			}
-yy195:
+yy199:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'D':
-			case 'd':	goto yy249;
+			case 'd':	goto yy255;
 			default:	goto yy54;
 			}
-yy196:
+yy200:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy251;
+			case 'l':	goto yy257;
 			default:	goto yy54;
 			}
-yy197:
+yy201:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'Y':
-			case 'y':	goto yy253;
+			case 'y':	goto yy259;
 			default:	goto yy54;
 			}
-yy198:
+yy202:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy255;
+			case 'a':	goto yy261;
 			default:	goto yy54;
 			}
-yy199:
+yy203:
 			yyaccept = 11;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -2318,27 +2355,27 @@ yy199:
 			case 'y':
 			case 'z':	goto yy53;
 			case 'V':
-			case 'v':	goto yy256;
+			case 'v':	goto yy262;
 			case '\\':	goto yy114;
-			default:	goto yy200;
+			default:	goto yy204;
 			}
-yy200:
-#line 288 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy204:
+#line 288 "src/parser.re"
 			{RETURN(PSI_T_BOOL);}
-#line 2329 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy201:
+#line 2366 "src/parser.c"
+yy205:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy257;
+			case 'a':	goto yy263;
 			case 'B':
-			case 'b':	goto yy258;
+			case 'b':	goto yy264;
 			case 'O':
-			case 'o':	goto yy259;
+			case 'o':	goto yy265;
 			default:	goto yy54;
 			}
-yy202:
+yy206:
 			yyaccept = 12;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -2406,37 +2443,37 @@ yy202:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy203;
+			default:	goto yy207;
 			}
-yy203:
-#line 289 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy207:
+#line 289 "src/parser.re"
 			{RETURN(PSI_T_CHAR);}
-#line 2415 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy204:
+#line 2452 "src/parser.c"
+yy208:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy260;
+			case 't':	goto yy266;
 			default:	goto yy54;
 			}
-yy205:
+yy209:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy262;
+			case 't':	goto yy268;
 			default:	goto yy54;
 			}
-yy206:
+yy210:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy264;
+			case 'l':	goto yy270;
 			default:	goto yy54;
 			}
-yy207:
+yy211:
 			yyaccept = 13;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -2504,29 +2541,29 @@ yy207:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy208;
+			default:	goto yy212;
 			}
-yy208:
-#line 314 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy212:
+#line 314 "src/parser.re"
 			{RETURN(PSI_T_ENUM);}
-#line 2513 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy209:
+#line 2550 "src/parser.c"
+yy213:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy265;
+			case 'e':	goto yy271;
 			default:	goto yy54;
 			}
-yy210:
+yy214:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy267;
+			case 't':	goto yy273;
 			default:	goto yy54;
 			}
-yy211:
+yy215:
 			yyaccept = 14;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -2594,57 +2631,57 @@ yy211:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy212;
+			default:	goto yy216;
 			}
-yy212:
-#line 320 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy216:
+#line 322 "src/parser.re"
 			{RETURN(PSI_T_FREE);}
-#line 2603 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy213:
+#line 2640 "src/parser.c"
+yy217:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy269;
+			case 't':	goto yy275;
 			default:	goto yy54;
 			}
-yy214:
+yy218:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '6':	goto yy270;
+			case '6':	goto yy276;
 			default:	goto yy54;
 			}
-yy215:
+yy219:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '2':	goto yy271;
+			case '2':	goto yy277;
 			default:	goto yy54;
 			}
-yy216:
+yy220:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '4':	goto yy272;
+			case '4':	goto yy278;
 			default:	goto yy54;
 			}
-yy217:
+yy221:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '_':	goto yy273;
+			case '_':	goto yy279;
 			default:	goto yy54;
 			}
-yy218:
+yy222:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy274;
+			case 'a':	goto yy280;
 			default:	goto yy54;
 			}
-yy219:
+yy223:
 			yyaccept = 15;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -2712,21 +2749,21 @@ yy219:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy220;
+			default:	goto yy224;
 			}
-yy220:
-#line 292 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy224:
+#line 292 "src/parser.re"
 			{RETURN(PSI_T_LONG);}
-#line 2721 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy221:
+#line 2758 "src/parser.c"
+yy225:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'D':
-			case 'd':	goto yy275;
+			case 'd':	goto yy281;
 			default:	goto yy54;
 			}
-yy222:
+yy226:
 			yyaccept = 16;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -2794,101 +2831,116 @@ yy222:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy223;
+			default:	goto yy227;
 			}
-yy223:
-#line 284 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy227:
+#line 284 "src/parser.re"
 			{RETURN(PSI_T_NULL);}
-#line 2803 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy224:
+#line 2840 "src/parser.c"
+yy228:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'C':
-			case 'c':	goto yy277;
+			case 'c':	goto yy283;
 			default:	goto yy54;
 			}
-yy225:
+yy229:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy278;
+			case 'a':	goto yy284;
 			default:	goto yy54;
 			}
-yy226:
+yy230:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'V':
-			case 'v':	goto yy279;
+			case 'v':	goto yy285;
 			default:	goto yy54;
 			}
-yy227:
+yy231:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case '_':	goto yy286;
+			default:	goto yy54;
+			}
+yy232:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'A':
+			case 'a':	goto yy287;
+			default:	goto yy54;
+			}
+yy233:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'R':
-			case 'r':	goto yy280;
+			case 'r':	goto yy288;
 			default:	goto yy54;
 			}
-yy228:
+yy234:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy281;
+			case 't':	goto yy289;
 			default:	goto yy54;
 			}
-yy229:
+yy235:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy283;
+			case 'e':	goto yy291;
 			default:	goto yy54;
 			}
-yy230:
+yy236:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'I':
-			case 'i':	goto yy284;
+			case 'i':	goto yy292;
 			default:	goto yy54;
 			}
-yy231:
+yy237:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy285;
+			case 'n':	goto yy293;
 			default:	goto yy54;
 			}
-yy232:
+yy238:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy286;
+			case 'e':	goto yy294;
 			default:	goto yy54;
 			}
-yy233:
+yy239:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'C':
-			case 'c':	goto yy287;
+			case 'c':	goto yy295;
 			default:	goto yy54;
 			}
-yy234:
+yy240:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy288;
+			case 'a':	goto yy296;
 			default:	goto yy54;
 			}
-yy235:
+yy241:
 			yyaccept = 17;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -2956,61 +3008,61 @@ yy235:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy236;
+			default:	goto yy242;
 			}
-yy236:
-#line 321 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy242:
+#line 323 "src/parser.re"
 			{RETURN(PSI_T_TEMP);}
-#line 2965 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy237:
+#line 3017 "src/parser.c"
+yy243:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'R':
-			case 'r':	goto yy289;
+			case 'r':	goto yy297;
 			default:	goto yy54;
 			}
-yy238:
+yy244:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'O':
-			case 'o':	goto yy290;
+			case 'o':	goto yy298;
 			default:	goto yy54;
 			}
-yy239:
+yy245:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy291;
+			case 'l':	goto yy299;
 			default:	goto yy54;
 			}
-yy240:
+yy246:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy292;
+			case 'n':	goto yy300;
 			default:	goto yy54;
 			}
-yy241:
+yy247:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'B':
-			case 'b':	goto yy293;
+			case 'b':	goto yy301;
 			default:	goto yy54;
 			}
-yy242:
+yy248:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy294;
+			case 't':	goto yy302;
 			default:	goto yy54;
 			}
-yy243:
+yy249:
 			yyaccept = 18;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -3078,47 +3130,47 @@ yy243:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy244;
+			default:	goto yy250;
 			}
-yy244:
-#line 282 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy250:
+#line 282 "src/parser.re"
 			{RETURN(PSI_T_TRUE);}
-#line 3087 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy245:
+#line 3139 "src/parser.c"
+yy251:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'D':
-			case 'd':	goto yy295;
+			case 'd':	goto yy303;
 			default:	goto yy54;
 			}
-yy246:
+yy252:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '1':	goto yy296;
-			case '3':	goto yy297;
-			case '6':	goto yy298;
-			case '8':	goto yy299;
+			case '1':	goto yy304;
+			case '3':	goto yy305;
+			case '6':	goto yy306;
+			case '8':	goto yy307;
 			default:	goto yy54;
 			}
-yy247:
+yy253:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy300;
+			case 'n':	goto yy308;
 			default:	goto yy54;
 			}
-yy248:
+yy254:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'G':
-			case 'g':	goto yy302;
+			case 'g':	goto yy310;
 			default:	goto yy54;
 			}
-yy249:
+yy255:
 			yyaccept = 19;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -3186,13 +3238,13 @@ yy249:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy250;
+			default:	goto yy256;
 			}
-yy250:
-#line 287 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy256:
+#line 287 "src/parser.re"
 			{RETURN(PSI_T_VOID);}
-#line 3195 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy251:
+#line 3247 "src/parser.c"
+yy257:
 			yyaccept = 20;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -3260,13 +3312,13 @@ yy251:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy252;
+			default:	goto yy258;
 			}
-yy252:
-#line 330 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy258:
+#line 332 "src/parser.re"
 			{RETURN(PSI_T_ZVAL);}
-#line 3269 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy253:
+#line 3321 "src/parser.c"
+yy259:
 			yyaccept = 21;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -3334,53 +3386,53 @@ yy253:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy254;
+			default:	goto yy260;
 			}
-yy254:
-#line 306 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy260:
+#line 306 "src/parser.re"
 			{RETURN(PSI_T_ARRAY);}
-#line 3343 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy255:
+#line 3395 "src/parser.c"
+yy261:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy303;
+			case 'l':	goto yy311;
 			default:	goto yy54;
 			}
-yy256:
+yy262:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy305;
+			case 'a':	goto yy313;
 			default:	goto yy54;
 			}
-yy257:
+yy263:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'B':
-			case 'b':	goto yy306;
+			case 'b':	goto yy314;
 			default:	goto yy54;
 			}
-yy258:
+yy264:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy307;
+			case 'a':	goto yy315;
 			default:	goto yy54;
 			}
-yy259:
+yy265:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'C':
-			case 'c':	goto yy308;
+			case 'c':	goto yy316;
 			default:	goto yy54;
 			}
-yy260:
+yy266:
 			yyaccept = 22;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -3448,13 +3500,13 @@ yy260:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy261;
+			default:	goto yy267;
 			}
-yy261:
-#line 315 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy267:
+#line 315 "src/parser.re"
 			{RETURN(PSI_T_CONST);}
-#line 3457 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy262:
+#line 3509 "src/parser.c"
+yy268:
 			yyaccept = 23;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -3522,21 +3574,21 @@ yy262:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy263;
+			default:	goto yy269;
 			}
-yy263:
-#line 331 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy269:
+#line 333 "src/parser.re"
 			{RETURN(PSI_T_COUNT);}
-#line 3531 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy264:
+#line 3583 "src/parser.c"
+yy270:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy310;
+			case 'e':	goto yy318;
 			default:	goto yy54;
 			}
-yy265:
+yy271:
 			yyaccept = 24;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -3604,13 +3656,13 @@ yy265:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy266;
+			default:	goto yy272;
 			}
-yy266:
-#line 283 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy272:
+#line 283 "src/parser.re"
 			{RETURN(PSI_T_FALSE);}
-#line 3613 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy267:
+#line 3665 "src/parser.c"
+yy273:
 			yyaccept = 25;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -3676,60 +3728,60 @@ yy267:
 			case 'y':
 			case 'z':	goto yy53;
 			case 'V':
-			case 'v':	goto yy312;
+			case 'v':	goto yy320;
 			case '\\':	goto yy114;
-			default:	goto yy268;
+			default:	goto yy274;
 			}
-yy268:
-#line 293 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy274:
+#line 293 "src/parser.re"
 			{RETURN(PSI_T_FLOAT);}
-#line 3687 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy269:
+#line 3739 "src/parser.c"
+yy275:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'I':
-			case 'i':	goto yy313;
+			case 'i':	goto yy321;
 			default:	goto yy54;
 			}
-yy270:
+yy276:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '_':	goto yy314;
+			case '_':	goto yy322;
 			default:	goto yy54;
 			}
-yy271:
+yy277:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '_':	goto yy315;
+			case '_':	goto yy323;
 			default:	goto yy54;
 			}
-yy272:
+yy278:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '_':	goto yy316;
+			case '_':	goto yy324;
 			default:	goto yy54;
 			}
-yy273:
+yy279:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy317;
+			case 't':	goto yy325;
 			default:	goto yy54;
 			}
-yy274:
+yy280:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy319;
+			case 'l':	goto yy327;
 			default:	goto yy54;
 			}
-yy275:
+yy281:
 			yyaccept = 26;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -3797,45 +3849,61 @@ yy275:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy276;
+			default:	goto yy282;
 			}
-yy276:
-#line 285 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy282:
+#line 285 "src/parser.re"
 			{RETURN(PSI_T_MIXED);}
-#line 3806 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy277:
+#line 3858 "src/parser.c"
+yy283:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy321;
+			case 't':	goto yy329;
 			default:	goto yy54;
 			}
-yy278:
+yy284:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy323;
+			case 'l':	goto yy331;
 			default:	goto yy54;
 			}
-yy279:
+yy285:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy325;
+			case 'a':	goto yy333;
 			default:	goto yy54;
 			}
-yy280:
+yy286:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'A':
+			case 'a':	goto yy334;
+			default:	goto yy54;
+			}
+yy287:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'S':
+			case 's':	goto yy335;
+			default:	goto yy54;
+			}
+yy288:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy326;
+			case 'n':	goto yy336;
 			default:	goto yy54;
 			}
-yy281:
+yy289:
 			yyaccept = 27;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -3903,145 +3971,145 @@ yy281:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy282;
+			default:	goto yy290;
 			}
-yy282:
-#line 290 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy290:
+#line 290 "src/parser.re"
 			{RETURN(PSI_T_SHORT);}
-#line 3912 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy283:
+#line 3980 "src/parser.c"
+yy291:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'D':
-			case 'd':	goto yy328;
+			case 'd':	goto yy338;
 			default:	goto yy54;
 			}
-yy284:
+yy292:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'C':
-			case 'c':	goto yy330;
+			case 'c':	goto yy340;
 			default:	goto yy54;
 			}
-yy285:
+yy293:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'G':
-			case 'g':	goto yy332;
+			case 'g':	goto yy342;
 			default:	goto yy54;
 			}
-yy286:
+yy294:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy334;
+			case 'n':	goto yy344;
 			default:	goto yy54;
 			}
-yy287:
+yy295:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy336;
+			case 't':	goto yy346;
 			default:	goto yy54;
 			}
-yy288:
+yy296:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy338;
+			case 'l':	goto yy348;
 			default:	goto yy54;
 			}
-yy289:
+yy297:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'R':
-			case 'r':	goto yy340;
+			case 'r':	goto yy350;
 			default:	goto yy54;
 			}
-yy290:
+yy298:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'O':
-			case 'o':	goto yy341;
+			case 'o':	goto yy351;
 			default:	goto yy54;
 			}
-yy291:
+yy299:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'O':
-			case 'o':	goto yy342;
+			case 'o':	goto yy352;
 			default:	goto yy54;
 			}
-yy292:
+yy300:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy343;
+			case 't':	goto yy353;
 			default:	goto yy54;
 			}
-yy293:
+yy301:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'J':
-			case 'j':	goto yy345;
+			case 'j':	goto yy355;
 			default:	goto yy54;
 			}
-yy294:
+yy302:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'R':
-			case 'r':	goto yy346;
+			case 'r':	goto yy356;
 			default:	goto yy54;
 			}
-yy295:
+yy303:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy347;
+			case 'e':	goto yy357;
 			default:	goto yy54;
 			}
-yy296:
+yy304:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '6':	goto yy348;
+			case '6':	goto yy358;
 			default:	goto yy54;
 			}
-yy297:
+yy305:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '2':	goto yy349;
+			case '2':	goto yy359;
 			default:	goto yy54;
 			}
-yy298:
+yy306:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '4':	goto yy350;
+			case '4':	goto yy360;
 			default:	goto yy54;
 			}
-yy299:
+yy307:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '_':	goto yy351;
+			case '_':	goto yy361;
 			default:	goto yy54;
 			}
-yy300:
+yy308:
 			yyaccept = 28;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -4109,21 +4177,21 @@ yy300:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy301;
+			default:	goto yy309;
 			}
-yy301:
-#line 313 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy309:
+#line 313 "src/parser.re"
 			{RETURN(PSI_T_UNION);}
-#line 4118 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy302:
+#line 4186 "src/parser.c"
+yy310:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy352;
+			case 'n':	goto yy362;
 			default:	goto yy54;
 			}
-yy303:
+yy311:
 			yyaccept = 29;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -4191,37 +4259,37 @@ yy303:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy304;
+			default:	goto yy312;
 			}
-yy304:
-#line 328 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy312:
+#line 330 "src/parser.re"
 			{RETURN(PSI_T_ARRVAL);}
-#line 4200 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy305:
+#line 4268 "src/parser.c"
+yy313:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy353;
+			case 'l':	goto yy363;
 			default:	goto yy54;
 			}
-yy306:
+yy314:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy355;
+			case 'l':	goto yy365;
 			default:	goto yy54;
 			}
-yy307:
+yy315:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'C':
-			case 'c':	goto yy356;
+			case 'c':	goto yy366;
 			default:	goto yy54;
 			}
-yy308:
+yy316:
 			yyaccept = 30;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -4289,13 +4357,13 @@ yy308:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy309;
+			default:	goto yy317;
 			}
-yy309:
-#line 332 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy317:
+#line 334 "src/parser.re"
 			{RETURN(PSI_T_CALLOC);}
-#line 4298 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy310:
+#line 4366 "src/parser.c"
+yy318:
 			yyaccept = 31;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -4363,53 +4431,53 @@ yy310:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy311;
+			default:	goto yy319;
 			}
-yy311:
-#line 294 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy319:
+#line 294 "src/parser.re"
 			{RETURN(PSI_T_DOUBLE);}
-#line 4372 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy312:
+#line 4440 "src/parser.c"
+yy320:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy357;
+			case 'a':	goto yy367;
 			default:	goto yy54;
 			}
-yy313:
+yy321:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'O':
-			case 'o':	goto yy358;
+			case 'o':	goto yy368;
 			default:	goto yy54;
 			}
-yy314:
+yy322:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy359;
+			case 't':	goto yy369;
 			default:	goto yy54;
 			}
-yy315:
+yy323:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy361;
+			case 't':	goto yy371;
 			default:	goto yy54;
 			}
-yy316:
+yy324:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy363;
+			case 't':	goto yy373;
 			default:	goto yy54;
 			}
-yy317:
+yy325:
 			yyaccept = 32;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -4477,13 +4545,13 @@ yy317:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy318;
+			default:	goto yy326;
 			}
-yy318:
-#line 295 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy326:
+#line 295 "src/parser.re"
 			{RETURN(PSI_T_INT8);}
-#line 4486 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy319:
+#line 4554 "src/parser.c"
+yy327:
 			yyaccept = 33;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -4551,13 +4619,13 @@ yy319:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy320;
+			default:	goto yy328;
 			}
-yy320:
-#line 325 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy328:
+#line 327 "src/parser.re"
 			{RETURN(PSI_T_INTVAL);}
-#line 4560 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy321:
+#line 4628 "src/parser.c"
+yy329:
 			yyaccept = 34;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -4625,13 +4693,13 @@ yy321:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy322;
+			default:	goto yy330;
 			}
-yy322:
-#line 307 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy330:
+#line 307 "src/parser.re"
 			{RETURN(PSI_T_OBJECT);}
-#line 4634 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy323:
+#line 4702 "src/parser.c"
+yy331:
 			yyaccept = 35;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -4699,21 +4767,37 @@ yy323:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy324;
+			default:	goto yy332;
 			}
-yy324:
-#line 329 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy332:
+#line 331 "src/parser.re"
 			{RETURN(PSI_T_OBJVAL);}
-#line 4708 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy325:
+#line 4776 "src/parser.c"
+yy333:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy365;
+			case 'l':	goto yy375;
 			default:	goto yy54;
 			}
-yy326:
+yy334:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'S':
+			case 's':	goto yy377;
+			default:	goto yy54;
+			}
+yy335:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'S':
+			case 's':	goto yy378;
+			default:	goto yy54;
+			}
+yy336:
 			yyaccept = 36;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -4781,13 +4865,13 @@ yy326:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy327;
+			default:	goto yy337;
 			}
-yy327:
-#line 319 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy337:
+#line 321 "src/parser.re"
 			{RETURN(PSI_T_RETURN);}
-#line 4790 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy328:
+#line 4874 "src/parser.c"
+yy338:
 			yyaccept = 37;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -4855,13 +4939,13 @@ yy328:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy329;
+			default:	goto yy339;
 			}
-yy329:
-#line 304 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy339:
+#line 304 "src/parser.re"
 			{RETURN(PSI_T_SIGNED);}
-#line 4864 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy330:
+#line 4948 "src/parser.c"
+yy340:
 			yyaccept = 38;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -4929,13 +5013,13 @@ yy330:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy331;
+			default:	goto yy341;
 			}
-yy331:
-#line 309 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy341:
+#line 309 "src/parser.re"
 			{RETURN(PSI_T_STATIC);}
-#line 4938 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy332:
+#line 5022 "src/parser.c"
+yy342:
 			yyaccept = 39;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -5003,13 +5087,13 @@ yy332:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy333;
+			default:	goto yy343;
 			}
-yy333:
-#line 305 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy343:
+#line 305 "src/parser.re"
 			{RETURN(PSI_T_STRING);}
-#line 5012 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy334:
+#line 5096 "src/parser.c"
+yy344:
 			yyaccept = 40;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -5077,13 +5161,13 @@ yy334:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy335;
+			default:	goto yy345;
 			}
-yy335:
-#line 322 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy345:
+#line 324 "src/parser.re"
 			{RETURN(PSI_T_STRLEN);}
-#line 5086 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy336:
+#line 5170 "src/parser.c"
+yy346:
 			yyaccept = 41;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -5151,13 +5235,13 @@ yy336:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy337;
+			default:	goto yy347;
 			}
-yy337:
-#line 312 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy347:
+#line 312 "src/parser.re"
 			{RETURN(PSI_T_STRUCT);}
-#line 5160 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy338:
+#line 5244 "src/parser.c"
+yy348:
 			yyaccept = 42;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -5225,37 +5309,37 @@ yy338:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy339;
+			default:	goto yy349;
 			}
-yy339:
-#line 323 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy349:
+#line 325 "src/parser.re"
 			{RETURN(PSI_T_STRVAL);}
-#line 5234 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy340:
+#line 5318 "src/parser.c"
+yy350:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy367;
+			case 'a':	goto yy379;
 			default:	goto yy54;
 			}
-yy341:
+yy351:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy368;
+			case 'l':	goto yy380;
 			default:	goto yy54;
 			}
-yy342:
+yy352:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'A':
-			case 'a':	goto yy370;
+			case 'a':	goto yy382;
 			default:	goto yy54;
 			}
-yy343:
+yy353:
 			yyaccept = 43;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -5323,74 +5407,74 @@ yy343:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy344;
+			default:	goto yy354;
 			}
-yy344:
-#line 336 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy354:
+#line 338 "src/parser.re"
 			{RETURN(PSI_T_TO_INT);}
-#line 5332 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy345:
+#line 5416 "src/parser.c"
+yy355:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy371;
+			case 'e':	goto yy383;
 			default:	goto yy54;
 			}
-yy346:
+yy356:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'I':
-			case 'i':	goto yy372;
+			case 'i':	goto yy384;
 			default:	goto yy54;
 			}
-yy347:
+yy357:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'F':
-			case 'f':	goto yy373;
+			case 'f':	goto yy385;
 			default:	goto yy54;
 			}
-yy348:
+yy358:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '_':	goto yy375;
+			case '_':	goto yy387;
 			default:	goto yy54;
 			}
-yy349:
+yy359:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '_':	goto yy376;
+			case '_':	goto yy388;
 			default:	goto yy54;
 			}
-yy350:
+yy360:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
-			case '_':	goto yy377;
+			case '_':	goto yy389;
 			default:	goto yy54;
 			}
-yy351:
+yy361:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy378;
+			case 't':	goto yy390;
 			default:	goto yy54;
 			}
-yy352:
+yy362:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy380;
+			case 'e':	goto yy392;
 			default:	goto yy54;
 			}
-yy353:
+yy363:
 			yyaccept = 44;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -5458,45 +5542,45 @@ yy353:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy354;
+			default:	goto yy364;
 			}
-yy354:
-#line 327 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy364:
+#line 329 "src/parser.re"
 			{RETURN(PSI_T_BOOLVAL);}
-#line 5467 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy355:
+#line 5551 "src/parser.c"
+yy365:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'E':
-			case 'e':	goto yy381;
+			case 'e':	goto yy393;
 			default:	goto yy54;
 			}
-yy356:
+yy366:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'K':
-			case 'k':	goto yy383;
+			case 'k':	goto yy395;
 			default:	goto yy54;
 			}
-yy357:
+yy367:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'L':
-			case 'l':	goto yy385;
+			case 'l':	goto yy397;
 			default:	goto yy54;
 			}
-yy358:
+yy368:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy387;
+			case 'n':	goto yy399;
 			default:	goto yy54;
 			}
-yy359:
+yy369:
 			yyaccept = 45;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -5564,13 +5648,13 @@ yy359:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy360;
+			default:	goto yy370;
 			}
-yy360:
-#line 297 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy370:
+#line 297 "src/parser.re"
 			{RETURN(PSI_T_INT16);}
-#line 5573 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy361:
+#line 5657 "src/parser.c"
+yy371:
 			yyaccept = 46;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -5638,13 +5722,13 @@ yy361:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy362;
+			default:	goto yy372;
 			}
-yy362:
-#line 299 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy372:
+#line 299 "src/parser.re"
 			{RETURN(PSI_T_INT32);}
-#line 5647 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy363:
+#line 5731 "src/parser.c"
+yy373:
 			yyaccept = 47;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -5712,13 +5796,13 @@ yy363:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy364;
+			default:	goto yy374;
 			}
-yy364:
-#line 301 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy374:
+#line 301 "src/parser.re"
 			{RETURN(PSI_T_INT64);}
-#line 5721 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy365:
+#line 5805 "src/parser.c"
+yy375:
 			yyaccept = 48;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -5786,21 +5870,37 @@ yy365:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy366;
+			default:	goto yy376;
 			}
-yy366:
-#line 324 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy376:
+#line 326 "src/parser.re"
 			{RETURN(PSI_T_PATHVAL);}
-#line 5795 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy367:
+#line 5879 "src/parser.c"
+yy377:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'S':
+			case 's':	goto yy401;
+			default:	goto yy54;
+			}
+yy378:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'E':
+			case 'e':	goto yy402;
+			default:	goto yy54;
+			}
+yy379:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'Y':
-			case 'y':	goto yy389;
+			case 'y':	goto yy403;
 			default:	goto yy54;
 			}
-yy368:
+yy380:
 			yyaccept = 49;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -5868,37 +5968,37 @@ yy368:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy369;
+			default:	goto yy381;
 			}
-yy369:
-#line 338 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy381:
+#line 340 "src/parser.re"
 			{RETURN(PSI_T_TO_BOOL);}
-#line 5877 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy370:
+#line 5977 "src/parser.c"
+yy382:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy391;
+			case 't':	goto yy405;
 			default:	goto yy54;
 			}
-yy371:
+yy383:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'C':
-			case 'c':	goto yy393;
+			case 'c':	goto yy407;
 			default:	goto yy54;
 			}
-yy372:
+yy384:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'N':
-			case 'n':	goto yy394;
+			case 'n':	goto yy408;
 			default:	goto yy54;
 			}
-yy373:
+yy385:
 			yyaccept = 50;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -5966,37 +6066,37 @@ yy373:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy374;
+			default:	goto yy386;
 			}
-yy374:
-#line 311 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy386:
+#line 311 "src/parser.re"
 			{RETURN(PSI_T_TYPEDEF);}
-#line 5975 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy375:
+#line 6075 "src/parser.c"
+yy387:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy395;
+			case 't':	goto yy409;
 			default:	goto yy54;
 			}
-yy376:
+yy388:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy397;
+			case 't':	goto yy411;
 			default:	goto yy54;
 			}
-yy377:
+yy389:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy399;
+			case 't':	goto yy413;
 			default:	goto yy54;
 			}
-yy378:
+yy390:
 			yyaccept = 51;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6064,21 +6164,21 @@ yy378:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy379;
+			default:	goto yy391;
 			}
-yy379:
-#line 296 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy391:
+#line 296 "src/parser.re"
 			{RETURN(PSI_T_UINT8);}
-#line 6073 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy380:
+#line 6173 "src/parser.c"
+yy392:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'D':
-			case 'd':	goto yy401;
+			case 'd':	goto yy415;
 			default:	goto yy54;
 			}
-yy381:
+yy393:
 			yyaccept = 52;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6146,13 +6246,13 @@ yy381:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy382;
+			default:	goto yy394;
 			}
-yy382:
-#line 286 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy394:
+#line 286 "src/parser.re"
 			{RETURN(PSI_T_CALLABLE);}
-#line 6155 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy383:
+#line 6255 "src/parser.c"
+yy395:
 			yyaccept = 53;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6220,13 +6320,13 @@ yy383:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy384;
+			default:	goto yy396;
 			}
-yy384:
-#line 308 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy396:
+#line 308 "src/parser.re"
 			{RETURN(PSI_T_CALLBACK);}
-#line 6229 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy385:
+#line 6329 "src/parser.c"
+yy397:
 			yyaccept = 54;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6294,13 +6394,13 @@ yy385:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy386;
+			default:	goto yy398;
 			}
-yy386:
-#line 326 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy398:
+#line 328 "src/parser.re"
 			{RETURN(PSI_T_FLOATVAL);}
-#line 6303 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy387:
+#line 6403 "src/parser.c"
+yy399:
 			yyaccept = 55;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6368,13 +6468,29 @@ yy387:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy388;
+			default:	goto yy400;
 			}
-yy388:
-#line 310 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy400:
+#line 310 "src/parser.re"
 			{RETURN(PSI_T_FUNCTION);}
-#line 6377 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy389:
+#line 6477 "src/parser.c"
+yy401:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'E':
+			case 'e':	goto yy417;
+			default:	goto yy54;
+			}
+yy402:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'R':
+			case 'r':	goto yy418;
+			default:	goto yy54;
+			}
+yy403:
 			yyaccept = 56;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6442,13 +6558,13 @@ yy389:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy390;
+			default:	goto yy404;
 			}
-yy390:
-#line 334 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy404:
+#line 336 "src/parser.re"
 			{RETURN(PSI_T_TO_ARRAY);}
-#line 6451 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy391:
+#line 6567 "src/parser.c"
+yy405:
 			yyaccept = 57;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6516,29 +6632,29 @@ yy391:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy392;
+			default:	goto yy406;
 			}
-yy392:
-#line 337 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy406:
+#line 339 "src/parser.re"
 			{RETURN(PSI_T_TO_FLOAT);}
-#line 6525 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy393:
+#line 6641 "src/parser.c"
+yy407:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'T':
-			case 't':	goto yy403;
+			case 't':	goto yy419;
 			default:	goto yy54;
 			}
-yy394:
+yy408:
 			yyaccept = 5;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
 			case 'G':
-			case 'g':	goto yy405;
+			case 'g':	goto yy421;
 			default:	goto yy54;
 			}
-yy395:
+yy409:
 			yyaccept = 58;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6606,13 +6722,13 @@ yy395:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy396;
+			default:	goto yy410;
 			}
-yy396:
-#line 298 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy410:
+#line 298 "src/parser.re"
 			{RETURN(PSI_T_UINT16);}
-#line 6615 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy397:
+#line 6731 "src/parser.c"
+yy411:
 			yyaccept = 59;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6680,13 +6796,13 @@ yy397:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy398;
+			default:	goto yy412;
 			}
-yy398:
-#line 300 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy412:
+#line 300 "src/parser.re"
 			{RETURN(PSI_T_UINT32);}
-#line 6689 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy399:
+#line 6805 "src/parser.c"
+yy413:
 			yyaccept = 60;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6754,13 +6870,13 @@ yy399:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy400;
+			default:	goto yy414;
 			}
-yy400:
-#line 302 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy414:
+#line 302 "src/parser.re"
 			{RETURN(PSI_T_UINT64);}
-#line 6763 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy401:
+#line 6879 "src/parser.c"
+yy415:
 			yyaccept = 61;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6828,13 +6944,29 @@ yy401:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy402;
+			default:	goto yy416;
 			}
-yy402:
-#line 303 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy416:
+#line 303 "src/parser.re"
 			{RETURN(PSI_T_UNSIGNED);}
-#line 6837 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy403:
+#line 6953 "src/parser.c"
+yy417:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'R':
+			case 'r':	goto yy423;
+			default:	goto yy54;
+			}
+yy418:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'T':
+			case 't':	goto yy424;
+			default:	goto yy54;
+			}
+yy419:
 			yyaccept = 62;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6902,13 +7034,13 @@ yy403:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy404;
+			default:	goto yy420;
 			}
-yy404:
-#line 333 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy420:
+#line 335 "src/parser.re"
 			{RETURN(PSI_T_TO_OBJECT);}
-#line 6911 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy405:
+#line 7043 "src/parser.c"
+yy421:
 			yyaccept = 63;
 			yych = *(P->mrk = ++P->cur);
 			switch (yych) {
@@ -6976,53 +7108,209 @@ yy405:
 			case 'y':
 			case 'z':	goto yy53;
 			case '\\':	goto yy114;
-			default:	goto yy406;
+			default:	goto yy422;
 			}
-yy406:
-#line 335 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy422:
+#line 337 "src/parser.re"
 			{RETURN(PSI_T_TO_STRING);}
-#line 6985 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 7117 "src/parser.c"
+yy423:
+			yyaccept = 5;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case 'T':
+			case 't':	goto yy426;
+			default:	goto yy54;
+			}
+yy424:
+			yyaccept = 64;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case '0':
+			case '1':
+			case '2':
+			case '3':
+			case '4':
+			case '5':
+			case '6':
+			case '7':
+			case '8':
+			case '9':
+			case 'A':
+			case 'B':
+			case 'C':
+			case 'D':
+			case 'E':
+			case 'F':
+			case 'G':
+			case 'H':
+			case 'I':
+			case 'J':
+			case 'K':
+			case 'L':
+			case 'M':
+			case 'N':
+			case 'O':
+			case 'P':
+			case 'Q':
+			case 'R':
+			case 'S':
+			case 'T':
+			case 'U':
+			case 'V':
+			case 'W':
+			case 'X':
+			case 'Y':
+			case 'Z':
+			case '_':
+			case 'a':
+			case 'b':
+			case 'c':
+			case 'd':
+			case 'e':
+			case 'f':
+			case 'g':
+			case 'h':
+			case 'i':
+			case 'j':
+			case 'k':
+			case 'l':
+			case 'm':
+			case 'n':
+			case 'o':
+			case 'p':
+			case 'q':
+			case 'r':
+			case 's':
+			case 't':
+			case 'u':
+			case 'v':
+			case 'w':
+			case 'x':
+			case 'y':
+			case 'z':	goto yy53;
+			case '\\':	goto yy114;
+			default:	goto yy425;
+			}
+yy425:
+#line 319 "src/parser.re"
+			{RETURN(PSI_T_PRE_ASSERT);}
+#line 7199 "src/parser.c"
+yy426:
+			yyaccept = 65;
+			yych = *(P->mrk = ++P->cur);
+			switch (yych) {
+			case '0':
+			case '1':
+			case '2':
+			case '3':
+			case '4':
+			case '5':
+			case '6':
+			case '7':
+			case '8':
+			case '9':
+			case 'A':
+			case 'B':
+			case 'C':
+			case 'D':
+			case 'E':
+			case 'F':
+			case 'G':
+			case 'H':
+			case 'I':
+			case 'J':
+			case 'K':
+			case 'L':
+			case 'M':
+			case 'N':
+			case 'O':
+			case 'P':
+			case 'Q':
+			case 'R':
+			case 'S':
+			case 'T':
+			case 'U':
+			case 'V':
+			case 'W':
+			case 'X':
+			case 'Y':
+			case 'Z':
+			case '_':
+			case 'a':
+			case 'b':
+			case 'c':
+			case 'd':
+			case 'e':
+			case 'f':
+			case 'g':
+			case 'h':
+			case 'i':
+			case 'j':
+			case 'k':
+			case 'l':
+			case 'm':
+			case 'n':
+			case 'o':
+			case 'p':
+			case 'q':
+			case 'r':
+			case 's':
+			case 't':
+			case 'u':
+			case 'v':
+			case 'w':
+			case 'x':
+			case 'y':
+			case 'z':	goto yy53;
+			case '\\':	goto yy114;
+			default:	goto yy427;
+			}
+yy427:
+#line 320 "src/parser.re"
+			{RETURN(PSI_T_POST_ASSERT);}
+#line 7273 "src/parser.c"
 		}
-#line 345 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 347 "src/parser.re"
 
 
 	comment:
 		P->tok = P->cur;
 		
-#line 6993 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 7281 "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 yy411;
-			case '*':	goto yy413;
-			default:	goto yy409;
+			case '\n':	goto yy432;
+			case '*':	goto yy434;
+			default:	goto yy430;
 			}
-yy409:
+yy430:
 			++P->cur;
-yy410:
-#line 352 "/home/mike/src/php-master/ext/psi/src/parser.re"
+yy431:
+#line 354 "src/parser.re"
 			{ goto comment; }
-#line 7008 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy411:
+#line 7296 "src/parser.c"
+yy432:
 			++P->cur;
-#line 350 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 352 "src/parser.re"
 			{ NEWLINE(comment); }
-#line 7013 "/home/mike/src/php-master/ext/psi/src/parser.c"
-yy413:
+#line 7301 "src/parser.c"
+yy434:
 			yych = *++P->cur;
 			switch (yych) {
-			case '/':	goto yy414;
-			default:	goto yy410;
+			case '/':	goto yy435;
+			default:	goto yy431;
 			}
-yy414:
+yy435:
 			++P->cur;
-#line 351 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 353 "src/parser.re"
 			{ continue; }
-#line 7024 "/home/mike/src/php-master/ext/psi/src/parser.c"
+#line 7312 "src/parser.c"
 		}
-#line 353 "/home/mike/src/php-master/ext/psi/src/parser.re"
+#line 355 "src/parser.re"
 
 	}
 	return -1;