From b65abecfdf31978a1c4e768bb84c014b18f58598 Mon Sep 17 00:00:00 2001
From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 2 Jan 2018 13:54:29 +0800
Subject: regenerated with newer re2c

---
 ext/pdo/pdo_sql_parser.c   |  239 ++---
 sapi/phpdbg/phpdbg_lexer.c | 2511 +++++++++++++++++++++-----------------------
 2 files changed, 1345 insertions(+), 1405 deletions(-)

diff --git a/ext/pdo/pdo_sql_parser.c b/ext/pdo/pdo_sql_parser.c
index e9556972ed..4848189063 100644
--- a/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo/pdo_sql_parser.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 */
+/* Generated by re2c 0.16 */
 #line 1 "ext/pdo/pdo_sql_parser.re"
 /*
   +----------------------------------------------------------------------+
@@ -54,13 +54,12 @@ static int scan(Scanner *s)
 #line 55 "ext/pdo/pdo_sql_parser.c"
 {
 	YYCTYPE yych;
-
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	switch (yych) {
 	case 0x00:	goto yy2;
-	case '"':	goto yy3;
-	case '\'':	goto yy5;
+	case '"':	goto yy6;
+	case '\'':	goto yy8;
 	case '(':
 	case ')':
 	case '*':
@@ -69,25 +68,64 @@ static int scan(Scanner *s)
 	case '.':	goto yy9;
 	case '-':	goto yy10;
 	case '/':	goto yy11;
-	case ':':	goto yy6;
-	case '?':	goto yy7;
-	default:	goto yy12;
+	case ':':	goto yy12;
+	case '?':	goto yy13;
+	default:	goto yy3;
 	}
 yy2:
 	YYCURSOR = YYMARKER;
-	goto yy4;
+	goto yy7;
 yy3:
+	++YYCURSOR;
+	if (YYLIMIT <= YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	switch (yych) {
+	case 0x00:
+	case '"':
+	case '\'':
+	case '(':
+	case ')':
+	case '*':
+	case '+':
+	case ',':
+	case '-':
+	case '.':
+	case '/':
+	case ':':
+	case '?':	goto yy5;
+	default:	goto yy3;
+	}
+yy5:
+#line 65 "ext/pdo/pdo_sql_parser.re"
+	{ RET(PDO_PARSER_TEXT); }
+#line 102 "ext/pdo/pdo_sql_parser.c"
+yy6:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych >= 0x01) goto yy37;
-yy4:
+	if (yych >= 0x01) goto yy16;
+yy7:
 #line 63 "ext/pdo/pdo_sql_parser.re"
 	{ SKIP_ONE(PDO_PARSER_TEXT); }
-#line 86 "ext/pdo/pdo_sql_parser.c"
-yy5:
+#line 109 "ext/pdo/pdo_sql_parser.c"
+yy8:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x00) goto yy4;
-	goto yy32;
-yy6:
+	if (yych <= 0x00) goto yy7;
+	goto yy21;
+yy9:
+	yych = *++YYCURSOR;
+	goto yy7;
+yy10:
+	yych = *++YYCURSOR;
+	switch (yych) {
+	case '-':	goto yy25;
+	default:	goto yy7;
+	}
+yy11:
+	yych = *(YYMARKER = ++YYCURSOR);
+	switch (yych) {
+	case '*':	goto yy28;
+	default:	goto yy7;
+	}
+yy12:
 	yych = *++YYCURSOR;
 	switch (yych) {
 	case '0':
@@ -152,104 +190,86 @@ yy6:
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy26;
-	case ':':	goto yy29;
-	default:	goto yy4;
+	case 'z':	goto yy30;
+	case ':':	goto yy33;
+	default:	goto yy7;
 	}
-yy7:
+yy13:
 	++YYCURSOR;
 	switch ((yych = *YYCURSOR)) {
-	case '?':	goto yy23;
-	default:	goto yy8;
+	case '?':	goto yy36;
+	default:	goto yy14;
 	}
-yy8:
+yy14:
 #line 62 "ext/pdo/pdo_sql_parser.re"
 	{ RET(PDO_PARSER_BIND_POS); }
-#line 169 "ext/pdo/pdo_sql_parser.c"
-yy9:
-	yych = *++YYCURSOR;
-	goto yy4;
-yy10:
-	yych = *++YYCURSOR;
-	switch (yych) {
-	case '-':	goto yy21;
-	default:	goto yy4;
-	}
-yy11:
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch (yych) {
-	case '*':	goto yy15;
-	default:	goto yy4;
-	}
-yy12:
+#line 207 "ext/pdo/pdo_sql_parser.c"
+yy15:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
+yy16:
 	switch (yych) {
-	case 0x00:
-	case '"':
-	case '\'':
-	case '(':
-	case ')':
-	case '*':
-	case '+':
-	case ',':
-	case '-':
-	case '.':
-	case '/':
-	case ':':
-	case '?':	goto yy14;
-	default:	goto yy12;
+	case 0x00:	goto yy2;
+	case '"':	goto yy17;
+	case '\\':	goto yy19;
+	default:	goto yy15;
 	}
-yy14:
-#line 65 "ext/pdo/pdo_sql_parser.re"
+yy17:
+	++YYCURSOR;
+#line 58 "ext/pdo/pdo_sql_parser.re"
 	{ RET(PDO_PARSER_TEXT); }
-#line 208 "ext/pdo/pdo_sql_parser.c"
-yy15:
+#line 223 "ext/pdo/pdo_sql_parser.c"
+yy19:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	switch (yych) {
-	case '*':	goto yy17;
-	default:	goto yy15;
-	}
-yy17:
+	if (yych <= 0x00) goto yy2;
+	goto yy15;
+yy20:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
+yy21:
 	switch (yych) {
-	case '*':	goto yy17;
-	case '/':	goto yy19;
-	default:	goto yy15;
+	case 0x00:	goto yy2;
+	case '\'':	goto yy22;
+	case '\\':	goto yy24;
+	default:	goto yy20;
 	}
-yy19:
+yy22:
 	++YYCURSOR;
-yy20:
-#line 64 "ext/pdo/pdo_sql_parser.re"
+#line 59 "ext/pdo/pdo_sql_parser.re"
 	{ RET(PDO_PARSER_TEXT); }
-#line 231 "ext/pdo/pdo_sql_parser.c"
-yy21:
+#line 245 "ext/pdo/pdo_sql_parser.c"
+yy24:
+	++YYCURSOR;
+	if (YYLIMIT <= YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	if (yych <= 0x00) goto yy2;
+	goto yy20;
+yy25:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
 	case '\n':
-	case '\r':	goto yy20;
-	default:	goto yy21;
+	case '\r':	goto yy27;
+	default:	goto yy25;
 	}
-yy23:
+yy27:
+#line 64 "ext/pdo/pdo_sql_parser.re"
+	{ RET(PDO_PARSER_TEXT); }
+#line 264 "ext/pdo/pdo_sql_parser.c"
+yy28:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-	case '?':	goto yy23;
-	default:	goto yy25;
+	case '*':	goto yy38;
+	default:	goto yy28;
 	}
-yy25:
-#line 60 "ext/pdo/pdo_sql_parser.re"
-	{ RET(PDO_PARSER_TEXT); }
-#line 252 "ext/pdo/pdo_sql_parser.c"
-yy26:
+yy30:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
@@ -316,65 +336,46 @@ yy26:
 	case 'w':
 	case 'x':
 	case 'y':
-	case 'z':	goto yy26;
-	default:	goto yy28;
+	case 'z':	goto yy30;
+	default:	goto yy32;
 	}
-yy28:
+yy32:
 #line 61 "ext/pdo/pdo_sql_parser.re"
 	{ RET(PDO_PARSER_BIND); }
-#line 326 "ext/pdo/pdo_sql_parser.c"
-yy29:
-	++YYCURSOR;
-	if (YYLIMIT <= YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	switch (yych) {
-	case ':':	goto yy29;
-	default:	goto yy25;
-	}
-yy31:
+#line 346 "ext/pdo/pdo_sql_parser.c"
+yy33:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy32:
 	switch (yych) {
-	case 0x00:	goto yy2;
-	case '\'':	goto yy34;
-	case '\\':	goto yy33;
-	default:	goto yy31;
+	case ':':	goto yy33;
+	default:	goto yy35;
 	}
-yy33:
-	++YYCURSOR;
-	if (YYLIMIT <= YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x00) goto yy2;
-	goto yy31;
-yy34:
-	++YYCURSOR;
-#line 59 "ext/pdo/pdo_sql_parser.re"
+yy35:
+#line 60 "ext/pdo/pdo_sql_parser.re"
 	{ RET(PDO_PARSER_TEXT); }
-#line 356 "ext/pdo/pdo_sql_parser.c"
+#line 358 "ext/pdo/pdo_sql_parser.c"
 yy36:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy37:
 	switch (yych) {
-	case 0x00:	goto yy2;
-	case '"':	goto yy39;
-	case '\\':	goto yy38;
-	default:	goto yy36;
+	case '?':	goto yy36;
+	default:	goto yy35;
 	}
 yy38:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= 0x00) goto yy2;
-	goto yy36;
-yy39:
+	switch (yych) {
+	case '*':	goto yy38;
+	case '/':	goto yy40;
+	default:	goto yy28;
+	}
+yy40:
 	++YYCURSOR;
-#line 58 "ext/pdo/pdo_sql_parser.re"
-	{ RET(PDO_PARSER_TEXT); }
-#line 378 "ext/pdo/pdo_sql_parser.c"
+	yych = *YYCURSOR;
+	goto yy27;
 }
 #line 66 "ext/pdo/pdo_sql_parser.re"
 
diff --git a/sapi/phpdbg/phpdbg_lexer.c b/sapi/phpdbg/phpdbg_lexer.c
index 74cad5b8f2..55bc3275ac 100644
--- a/sapi/phpdbg/phpdbg_lexer.c
+++ b/sapi/phpdbg/phpdbg_lexer.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.14.3 */
+/* Generated by re2c 0.16 */
 #line 1 "sapi/phpdbg/phpdbg_lexer.l"
 /*
  * phpdbg_lexer.l
@@ -121,52 +121,31 @@ yyc_INITIAL:
 		YYDEBUG(1, *YYCURSOR);
 		YYFILL(4);
 		yych = *YYCURSOR;
-		if (yych <= '#') {
-			if (yych <= '\f') {
-				if (yych <= 0x08) {
-					if (yych <= 0x00) goto yy9;
-					goto yy14;
-				} else {
-					if (yych <= '\t') goto yy3;
-					if (yych <= '\n') goto yy9;
-					goto yy14;
-				}
+		if (yych <= 'E') {
+			if (yych <= '\r') {
+				if (yych == '\t') goto yy5;
+				if (yych >= '\r') goto yy5;
 			} else {
-				if (yych <= 0x1F) {
-					if (yych >= 0x0E) goto yy14;
-				} else {
-					if (yych <= ' ') goto yy5;
-					if (yych <= '"') goto yy14;
-					goto yy8;
-				}
+				if (yych == ' ') goto yy6;
+				if (yych >= 'E') goto yy9;
 			}
 		} else {
-			if (yych <= 'S') {
-				if (yych <= 'E') {
-					if (yych <= 'D') goto yy14;
-					goto yy10;
-				} else {
-					if (yych <= 'Q') goto yy14;
-					if (yych <= 'R') goto yy13;
-					goto yy11;
-				}
+			if (yych <= 'd') {
+				if (yych <= 'Q') goto yy3;
+				if (yych <= 'R') goto yy10;
+				if (yych <= 'S') goto yy11;
 			} else {
 				if (yych <= 'q') {
-					if (yych == 'e') goto yy10;
-					goto yy14;
+					if (yych <= 'e') goto yy9;
 				} else {
 					if (yych <= 'r') goto yy12;
 					if (yych <= 's') goto yy11;
-					goto yy14;
 				}
 			}
 		}
 yy3:
 		YYDEBUG(3, *YYCURSOR);
 		++YYCURSOR;
-		if (yybm[0+(yych = *YYCURSOR)] & 128) {
-			goto yy5;
-		}
 yy4:
 		YYDEBUG(4, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
@@ -177,17 +156,24 @@ yy4:
 	YYCURSOR = LEX(text);
 	goto restart;
 }
-#line 181 "sapi/phpdbg/phpdbg_lexer.c"
+#line 160 "sapi/phpdbg/phpdbg_lexer.c"
 yy5:
 		YYDEBUG(5, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy6;
+		}
+		goto yy4;
+yy6:
+		YYDEBUG(6, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(6, *YYCURSOR);
+		YYDEBUG(7, *YYCURSOR);
 		if (yybm[0+yych] & 128) {
-			goto yy5;
+			goto yy6;
 		}
-		YYDEBUG(7, *YYCURSOR);
+		YYDEBUG(8, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 175 "sapi/phpdbg/phpdbg_lexer.l"
 		{
@@ -195,44 +181,39 @@ yy5:
 
 	goto restart;
 }
-#line 199 "sapi/phpdbg/phpdbg_lexer.c"
-yy8:
-		YYDEBUG(8, *YYCURSOR);
-		yych = *++YYCURSOR;
-		goto yy4;
+#line 185 "sapi/phpdbg/phpdbg_lexer.c"
 yy9:
 		YYDEBUG(9, *YYCURSOR);
-		yych = *++YYCURSOR;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'V') goto yy13;
+		if (yych == 'v') goto yy13;
 		goto yy4;
 yy10:
 		YYDEBUG(10, *YYCURSOR);
-		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'V') goto yy25;
-		if (yych == 'v') goto yy25;
+		if (yych == 'U') goto yy15;
+		if (yych == 'u') goto yy15;
 		goto yy4;
 yy11:
 		YYDEBUG(11, *YYCURSOR);
-		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy21;
-		if (yych == 'h') goto yy21;
+		if (yych == 'H') goto yy16;
+		if (yych == 'h') goto yy16;
 		goto yy4;
 yy12:
 		YYDEBUG(12, *YYCURSOR);
-		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 0x1F) {
 			if (yych <= '\t') {
 				if (yych <= 0x08) goto yy4;
-				goto yy18;
+				goto yy17;
 			} else {
-				if (yych == '\r') goto yy18;
+				if (yych == '\r') goto yy17;
 				goto yy4;
 			}
 		} else {
 			if (yych <= 'U') {
-				if (yych <= ' ') goto yy18;
+				if (yych <= ' ') goto yy17;
 				if (yych <= 'T') goto yy4;
 				goto yy15;
 			} else {
@@ -242,46 +223,47 @@ yy12:
 		}
 yy13:
 		YYDEBUG(13, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'U') goto yy15;
-		if (yych == 'u') goto yy15;
-		goto yy4;
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy20;
+		} else {
+			if (yych <= '\r') goto yy20;
+			if (yych == ' ') goto yy20;
+		}
 yy14:
 		YYDEBUG(14, *YYCURSOR);
-		yych = *++YYCURSOR;
+		YYCURSOR = YYMARKER;
 		goto yy4;
 yy15:
 		YYDEBUG(15, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy17;
-		if (yych == 'n') goto yy17;
+		if (yych == 'N') goto yy23;
+		if (yych == 'n') goto yy23;
+		goto yy14;
 yy16:
 		YYDEBUG(16, *YYCURSOR);
-		YYCURSOR = YYMARKER;
-		goto yy4;
-yy17:
-		YYDEBUG(17, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\f') {
-			if (yych != '\t') goto yy16;
+			if (yych == '\t') goto yy24;
+			goto yy14;
 		} else {
-			if (yych <= '\r') goto yy18;
-			if (yych != ' ') goto yy16;
+			if (yych <= '\r') goto yy24;
+			if (yych == ' ') goto yy24;
+			goto yy14;
 		}
-yy18:
-		YYDEBUG(18, *YYCURSOR);
+yy17:
+		YYDEBUG(17, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(19, *YYCURSOR);
+		YYDEBUG(18, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy18;
+			if (yych == '\t') goto yy17;
 		} else {
-			if (yych <= '\r') goto yy18;
-			if (yych == ' ') goto yy18;
+			if (yych <= '\r') goto yy17;
+			if (yych == ' ') goto yy17;
 		}
-		YYDEBUG(20, *YYCURSOR);
+		YYDEBUG(19, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 193 "sapi/phpdbg/phpdbg_lexer.l"
 		{
@@ -289,154 +271,146 @@ yy18:
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_RUN;
 }
-#line 293 "sapi/phpdbg/phpdbg_lexer.c"
-yy21:
-		YYDEBUG(21, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych <= '\f') {
-			if (yych != '\t') goto yy16;
-		} else {
-			if (yych <= '\r') goto yy22;
-			if (yych != ' ') goto yy16;
-		}
-yy22:
-		YYDEBUG(22, *YYCURSOR);
+#line 275 "sapi/phpdbg/phpdbg_lexer.c"
+yy20:
+		YYDEBUG(20, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(23, *YYCURSOR);
+		YYDEBUG(21, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy22;
+			if (yych == '\t') goto yy20;
 		} else {
-			if (yych <= '\r') goto yy22;
-			if (yych == ' ') goto yy22;
+			if (yych <= '\r') goto yy20;
+			if (yych == ' ') goto yy20;
 		}
-		YYDEBUG(24, *YYCURSOR);
+		YYDEBUG(22, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 187 "sapi/phpdbg/phpdbg_lexer.l"
+#line 181 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
-	return T_SHELL;
+	return T_EVAL;
 }
-#line 323 "sapi/phpdbg/phpdbg_lexer.c"
-yy25:
-		YYDEBUG(25, *YYCURSOR);
+#line 296 "sapi/phpdbg/phpdbg_lexer.c"
+yy23:
+		YYDEBUG(23, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\f') {
-			if (yych != '\t') goto yy16;
+			if (yych == '\t') goto yy17;
+			goto yy14;
 		} else {
-			if (yych <= '\r') goto yy26;
-			if (yych != ' ') goto yy16;
+			if (yych <= '\r') goto yy17;
+			if (yych == ' ') goto yy17;
+			goto yy14;
 		}
-yy26:
-		YYDEBUG(26, *YYCURSOR);
+yy24:
+		YYDEBUG(24, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(27, *YYCURSOR);
+		YYDEBUG(25, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy26;
+			if (yych == '\t') goto yy24;
 		} else {
-			if (yych <= '\r') goto yy26;
-			if (yych == ' ') goto yy26;
+			if (yych <= '\r') goto yy24;
+			if (yych == ' ') goto yy24;
 		}
-		YYDEBUG(28, *YYCURSOR);
+		YYDEBUG(26, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 181 "sapi/phpdbg/phpdbg_lexer.l"
+#line 187 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
-	return T_EVAL;
+	return T_SHELL;
 }
-#line 353 "sapi/phpdbg/phpdbg_lexer.c"
+#line 328 "sapi/phpdbg/phpdbg_lexer.c"
 	}
 /* *********************************** */
 yyc_NORMAL:
 	{
 		static const unsigned char yybm[] = {
 			/* table 1 .. 8: 0 */
-			  0, 242, 242, 242, 242, 242, 242, 242, 
-			242, 160,   0, 242, 242, 160, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			160, 242,  50, 160, 242, 242, 242, 194, 
-			242, 242, 242, 242, 242, 242, 243, 242, 
-			251, 251, 251, 251, 251, 251, 251, 251, 
-			251, 251, 160, 242, 242, 242, 242, 242, 
-			242, 254, 254, 254, 254, 254, 254, 246, 
-			246, 246, 246, 246, 246, 246, 246, 246, 
-			246, 246, 246, 246, 246, 246, 246, 246, 
-			246, 246, 246, 242,   2, 242, 242, 242, 
-			242, 254, 254, 254, 254, 254, 254, 246, 
-			246, 246, 246, 246, 246, 246, 246, 246, 
-			246, 246, 246, 246, 246, 246, 246, 246, 
-			246, 246, 246, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
-			242, 242, 242, 242, 242, 242, 242, 242, 
+			  0,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  40,   0,  62,  62,  40,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 40,  62,  50,  40,  62,  62,  62,  14, 
+			 62,  62,  62,  62,  62,  62,  63,  62, 
+			127, 127, 127, 127, 127, 127, 127, 127, 
+			127, 127,  40,  62,  62,  62,  62,  62, 
+			 62, 254, 254, 254, 254, 254, 254, 190, 
+			190, 190, 190, 190, 190, 190, 190, 190, 
+			190, 190, 190, 190, 190, 190, 190, 190, 
+			190, 190, 190,  62,   2,  62,  62,  62, 
+			 62, 254, 254, 254, 254, 254, 254, 190, 
+			190, 190, 190, 190, 190, 190, 190, 190, 
+			190, 190, 190, 190, 190, 190, 190, 190, 
+			190, 190, 190,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
 			/* table 9 .. 10: 256 */
-			  0, 128, 128, 128, 128, 128, 128, 128, 
-			128,  64,   0, 128, 128,  64, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			 64, 128,   0,   0, 128, 128, 128,   0, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128,   0, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
-			128, 128, 128, 128, 128, 128, 128, 128, 
+			  0,  64,  64,  64,  64,  64,  64,  64, 
+			 64, 128,   0,  64,  64, 128,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			128,  64,   0,   0,  64,  64,  64,   0, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,   0,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
 		};
-		YYDEBUG(29, *YYCURSOR);
+		YYDEBUG(27, *YYCURSOR);
 		YYFILL(11);
 		yych = *YYCURSOR;
-		if (yybm[256+yych] & 64) {
-			goto yy31;
+		if (yybm[256+yych] & 128) {
+			goto yy34;
 		}
-		YYDEBUG(-1, yych);
 		switch (yych) {
 		case 0x00:
 		case '\t':
-		case '\n':	goto yy36;
-		case '"':	goto yy44;
-		case '#':	goto yy34;
-		case '\'':	goto yy46;
-		case '-':	goto yy38;
+		case '\n':	goto yy29;
+		case '"':	goto yy37;
+		case '#':	goto yy39;
+		case '\'':	goto yy41;
+		case '-':	goto yy42;
 		case '.':
 		case '1':
 		case '2':
@@ -446,91 +420,57 @@ yyc_NORMAL:
 		case '6':
 		case '7':
 		case '8':
-		case '9':	goto yy47;
-		case '0':	goto yy50;
-		case ':':	goto yy41;
+		case '9':	goto yy43;
+		case '0':	goto yy46;
+		case ':':	goto yy47;
 		case 'D':
-		case 'd':	goto yy51;
+		case 'd':	goto yy48;
 		case 'E':
-		case 'e':	goto yy52;
+		case 'e':	goto yy49;
 		case 'F':
-		case 'f':	goto yy53;
+		case 'f':	goto yy50;
 		case 'I':
-		case 'i':	goto yy40;
+		case 'i':	goto yy51;
 		case 'N':
-		case 'n':	goto yy54;
+		case 'n':	goto yy52;
 		case 'O':
-		case 'o':	goto yy55;
+		case 'o':	goto yy53;
 		case 'T':
-		case 't':	goto yy56;
+		case 't':	goto yy54;
 		case 'Y':
-		case 'y':	goto yy57;
-		case 'Z':	goto yy58;
-		case 'z':	goto yy59;
-		default:	goto yy42;
+		case 'y':	goto yy55;
+		case 'Z':	goto yy56;
+		case 'z':	goto yy57;
+		default:	goto yy31;
 		}
+yy29:
+		YYDEBUG(29, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(30, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 89 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	return 0;
+}
+#line 456 "sapi/phpdbg/phpdbg_lexer.c"
 yy31:
 		YYDEBUG(31, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
 		yych = *YYCURSOR;
+yy32:
 		YYDEBUG(32, *YYCURSOR);
 		if (yybm[256+yych] & 64) {
 			goto yy31;
 		}
+		if (yych <= ' ') goto yy33;
+		if (yych == '#') goto yy33;
+		if (yych <= '\'') goto yy58;
+		goto yy60;
+yy33:
 		YYDEBUG(33, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 175 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	/* ignore whitespace */
-
-	goto restart;
-}
-#line 490 "sapi/phpdbg/phpdbg_lexer.c"
-yy34:
-		YYDEBUG(34, *YYCURSOR);
-		YYCTXMARKER = YYCURSOR + 1;
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '.') {
-			if (yych <= ',') goto yy35;
-			if (yych <= '-') goto yy146;
-			goto yy147;
-		} else {
-			if (yych <= '/') goto yy35;
-			if (yych <= '9') goto yy147;
-		}
-yy35:
-		YYDEBUG(35, *YYCURSOR);
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 110 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	YYSETCONDITION(INITIAL);
-	return T_SEPARATOR;
-}
-#line 512 "sapi/phpdbg/phpdbg_lexer.c"
-yy36:
-		YYDEBUG(36, *YYCURSOR);
-		++YYCURSOR;
-		YYDEBUG(37, *YYCURSOR);
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 89 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	return 0;
-}
-#line 522 "sapi/phpdbg/phpdbg_lexer.c"
-yy38:
-		YYDEBUG(38, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yybm[0+yych] & 1) {
-			goto yy47;
-		}
-		if (yych == 'r') goto yy136;
-		goto yy43;
-yy39:
-		YYDEBUG(39, *YYCURSOR);
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 161 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	phpdbg_init_param(yylval, STR_PARAM);
@@ -538,106 +478,126 @@ yy39:
 	yylval->len = yyleng;
 	return T_ID;
 }
-#line 542 "sapi/phpdbg/phpdbg_lexer.c"
-yy40:
-		YYDEBUG(40, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'F') goto yy132;
-		if (yych == 'f') goto yy132;
-		goto yy43;
-yy41:
-		YYDEBUG(41, *YYCURSOR);
-		YYCTXMARKER = YYCURSOR + 1;
-		yych = *++YYCURSOR;
-		if (yych == ':') goto yy130;
-		if (yych == '\\') goto yy68;
-		goto yy128;
-yy42:
-		YYDEBUG(42, *YYCURSOR);
-		yyaccept = 1;
-		YYMARKER = ++YYCURSOR;
-		YYFILL(3);
+#line 482 "sapi/phpdbg/phpdbg_lexer.c"
+yy34:
+		YYDEBUG(34, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
 		yych = *YYCURSOR;
-yy43:
-		YYDEBUG(43, *YYCURSOR);
+		YYDEBUG(35, *YYCURSOR);
 		if (yybm[256+yych] & 128) {
-			goto yy42;
+			goto yy34;
 		}
-		if (yych <= ' ') goto yy39;
-		if (yych == '#') goto yy39;
-		if (yych <= '\'') goto yy62;
-		goto yy61;
-yy44:
-		YYDEBUG(44, *YYCURSOR);
+		YYDEBUG(36, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 175 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	/* ignore whitespace */
+
+	goto restart;
+}
+#line 500 "sapi/phpdbg/phpdbg_lexer.c"
+yy37:
+		YYDEBUG(37, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '"') goto yy62;
-		goto yy120;
-yy45:
-		YYDEBUG(45, *YYCURSOR);
+		if (yych == '"') goto yy58;
+		goto yy62;
+yy38:
+		YYDEBUG(38, *YYCURSOR);
 		YYCURSOR = YYMARKER;
 		if (yyaccept <= 3) {
 			if (yyaccept <= 1) {
 				if (yyaccept == 0) {
-					goto yy35;
+					goto yy33;
 				} else {
-					goto yy39;
+					goto yy40;
 				}
 			} else {
 				if (yyaccept == 2) {
-					goto yy49;
+					goto yy45;
 				} else {
-					goto yy76;
+					goto yy109;
 				}
 			}
 		} else {
 			if (yyaccept <= 5) {
 				if (yyaccept == 4) {
-					goto yy107;
+					goto yy112;
 				} else {
-					goto yy67;
+					goto yy128;
 				}
 			} else {
-				goto yy142;
+				goto yy145;
 			}
 		}
-yy46:
-		YYDEBUG(46, *YYCURSOR);
+yy39:
+		YYDEBUG(39, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		YYCTXMARKER = YYCURSOR;
+		if (yych <= '.') {
+			if (yych <= ',') goto yy40;
+			if (yych <= '-') goto yy67;
+			goto yy68;
+		} else {
+			if (yych <= '/') goto yy40;
+			if (yych <= '9') goto yy68;
+		}
+yy40:
+		YYDEBUG(40, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 110 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	YYSETCONDITION(INITIAL);
+	return T_SEPARATOR;
+}
+#line 555 "sapi/phpdbg/phpdbg_lexer.c"
+yy41:
+		YYDEBUG(41, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych == '\'') goto yy62;
-		goto yy109;
-yy47:
-		YYDEBUG(47, *YYCURSOR);
+		if (yych == '\'') goto yy58;
+		goto yy72;
+yy42:
+		YYDEBUG(42, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 1) {
+			goto yy43;
+		}
+		if (yych == 'r') goto yy77;
+		goto yy32;
+yy43:
+		YYDEBUG(43, *YYCURSOR);
 		yyaccept = 2;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(48, *YYCURSOR);
+		YYDEBUG(44, *YYCURSOR);
 		if (yybm[0+yych] & 1) {
-			goto yy47;
+			goto yy43;
 		}
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy49;
-				if (yych <= 0x08) goto yy42;
+				if (yych <= 0x00) goto yy45;
+				if (yych <= 0x08) goto yy31;
 			} else {
-				if (yych == '\r') goto yy49;
-				if (yych <= 0x1F) goto yy42;
+				if (yych == '\r') goto yy45;
+				if (yych <= 0x1F) goto yy31;
 			}
 		} else {
 			if (yych <= '&') {
-				if (yych <= '!') goto yy42;
-				if (yych <= '"') goto yy62;
-				if (yych >= '$') goto yy42;
+				if (yych <= '!') goto yy31;
+				if (yych <= '"') goto yy58;
+				if (yych >= '$') goto yy31;
 			} else {
-				if (yych <= '\'') goto yy62;
-				if (yych <= '/') goto yy42;
-				if (yych <= ':') goto yy61;
-				goto yy42;
+				if (yych <= '\'') goto yy58;
+				if (yych <= '/') goto yy31;
+				if (yych <= ':') goto yy60;
+				goto yy31;
 			}
 		}
-yy49:
-		YYDEBUG(49, *YYCURSOR);
+yy45:
+		YYDEBUG(45, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 142 "sapi/phpdbg/phpdbg_lexer.l"
 		{
@@ -645,454 +605,639 @@ yy49:
 	yylval->num = atoi(yytext);
 	return T_DIGITS;
 }
-#line 649 "sapi/phpdbg/phpdbg_lexer.c"
-yy50:
-		YYDEBUG(50, *YYCURSOR);
+#line 609 "sapi/phpdbg/phpdbg_lexer.c"
+yy46:
+		YYDEBUG(46, *YYCURSOR);
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm[0+yych] & 1) {
-			goto yy47;
+			goto yy43;
 		}
 		if (yych <= 0x1F) {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy49;
-				if (yych <= 0x08) goto yy43;
-				goto yy49;
+				if (yych <= 0x00) goto yy45;
+				if (yych <= 0x08) goto yy32;
+				goto yy45;
 			} else {
-				if (yych == '\r') goto yy49;
-				goto yy43;
+				if (yych == '\r') goto yy45;
+				goto yy32;
 			}
 		} else {
 			if (yych <= '#') {
-				if (yych <= ' ') goto yy49;
-				if (yych <= '"') goto yy43;
-				goto yy49;
+				if (yych <= ' ') goto yy45;
+				if (yych <= '"') goto yy32;
+				goto yy45;
 			} else {
-				if (yych == 'x') goto yy104;
-				goto yy43;
+				if (yych == 'x') goto yy78;
+				goto yy32;
 			}
 		}
+yy47:
+		YYDEBUG(47, *YYCURSOR);
+		yych = *++YYCURSOR;
+		YYCTXMARKER = YYCURSOR;
+		if (yych == ':') goto yy81;
+		if (yych == '\\') goto yy83;
+		goto yy79;
+yy48:
+		YYDEBUG(48, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy85;
+		if (yych == 'i') goto yy85;
+		goto yy32;
+yy49:
+		YYDEBUG(49, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy86;
+		if (yych == 'n') goto yy86;
+		goto yy32;
+yy50:
+		YYDEBUG(50, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy87;
+		if (yych == 'a') goto yy87;
+		goto yy32;
 yy51:
 		YYDEBUG(51, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy98;
-		if (yych == 'i') goto yy98;
-		goto yy43;
+		if (yych == 'F') goto yy88;
+		if (yych == 'f') goto yy88;
+		goto yy32;
 yy52:
 		YYDEBUG(52, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy93;
-		if (yych == 'n') goto yy93;
-		goto yy43;
+		if (yych == 'O') goto yy89;
+		if (yych == 'o') goto yy89;
+		goto yy32;
 yy53:
 		YYDEBUG(53, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy90;
-		if (yych == 'a') goto yy90;
-		goto yy43;
-yy54:
-		YYDEBUG(54, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy87;
-		if (yych == 'o') goto yy87;
-		goto yy43;
-yy55:
-		YYDEBUG(55, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'N') {
-			if (yych == 'F') goto yy86;
-			if (yych <= 'M') goto yy43;
-			goto yy81;
+			if (yych == 'F') goto yy90;
+			if (yych <= 'M') goto yy32;
+			goto yy91;
 		} else {
 			if (yych <= 'f') {
-				if (yych <= 'e') goto yy43;
-				goto yy86;
+				if (yych <= 'e') goto yy32;
+				goto yy90;
 			} else {
-				if (yych == 'n') goto yy81;
-				goto yy43;
+				if (yych == 'n') goto yy91;
+				goto yy32;
 			}
 		}
+yy54:
+		YYDEBUG(54, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy92;
+		if (yych == 'r') goto yy92;
+		goto yy32;
+yy55:
+		YYDEBUG(55, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy93;
+		if (yych == 'e') goto yy93;
+		goto yy32;
 yy56:
 		YYDEBUG(56, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy84;
-		if (yych == 'r') goto yy84;
-		goto yy43;
+		if (yych == 'E') goto yy94;
+		goto yy32;
 yy57:
 		YYDEBUG(57, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy80;
-		if (yych == 'e') goto yy80;
-		goto yy43;
+		if (yych == 'e') goto yy95;
+		goto yy32;
 yy58:
 		YYDEBUG(58, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy77;
-		goto yy43;
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
 yy59:
 		YYDEBUG(59, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych != 'e') goto yy43;
+		if (yybm[0+yych] & 2) {
+			goto yy58;
+		}
+		if (yych <= '#') goto yy38;
+		goto yy96;
+yy60:
 		YYDEBUG(60, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'n') goto yy71;
-		goto yy43;
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy97;
+		if (yych == '\\') goto yy83;
+		goto yy38;
 yy61:
 		YYDEBUG(61, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '/') goto yy65;
-		if (yych == '\\') goto yy68;
-		goto yy45;
-yy62:
-		YYDEBUG(62, *YYCURSOR);
 		++YYCURSOR;
-		YYFILL(3);
+		YYFILL(4);
 		yych = *YYCURSOR;
+yy62:
+		YYDEBUG(62, *YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy61;
+		}
+		if (yych <= ' ') {
+			if (yych <= 0x00) goto yy38;
+			if (yych == '\n') goto yy38;
+		} else {
+			if (yych <= '"') goto yy98;
+			if (yych <= '#') goto yy63;
+			if (yych <= ':') goto yy65;
+			goto yy66;
+		}
 yy63:
 		YYDEBUG(63, *YYCURSOR);
-		if (yybm[0+yych] & 2) {
-			goto yy62;
-		}
-		if (yych <= '#') goto yy45;
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy64:
 		YYDEBUG(64, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych != '/') goto yy45;
+		if (yybm[0+yych] & 8) {
+			goto yy63;
+		}
+		if (yych <= '\n') goto yy38;
+		if (yych <= '"') goto yy99;
+		goto yy100;
 yy65:
 		YYDEBUG(65, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yych != '/') goto yy45;
+		if (yych == '/') goto yy101;
+		goto yy64;
+yy66:
 		YYDEBUG(66, *YYCURSOR);
 		++YYCURSOR;
-yy67:
-		YYDEBUG(67, *YYCURSOR);
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 123 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	phpdbg_init_param(yylval, STR_PARAM);
-	yylval->str = estrndup(yytext, yyleng);
-	yylval->len = yyleng;
-	return T_PROTO;
-}
-#line 788 "sapi/phpdbg/phpdbg_lexer.c"
-yy68:
-		YYDEBUG(68, *YYCURSOR);
-		yyaccept = 1;
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
+		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(69, *YYCURSOR);
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy39;
-				if (yych <= 0x08) goto yy68;
-				goto yy39;
+				if (yych <= 0x00) goto yy38;
+				if (yych <= 0x08) goto yy58;
+				goto yy38;
 			} else {
-				if (yych == '\r') goto yy39;
-				if (yych <= 0x1F) goto yy68;
-				goto yy39;
+				if (yych == '\r') goto yy38;
+				if (yych <= 0x1F) goto yy58;
+				goto yy38;
 			}
 		} else {
-			if (yych <= '&') {
-				if (yych <= '!') goto yy68;
-				if (yych <= '#') goto yy39;
-				goto yy68;
+			if (yych <= '9') {
+				if (yych <= '!') goto yy58;
+				if (yych <= '"') goto yy61;
+				if (yych <= '#') goto yy38;
+				goto yy58;
 			} else {
-				if (yych <= '\'') goto yy39;
-				if (yych != ':') goto yy68;
+				if (yych <= ':') goto yy96;
+				if (yych == '\\') goto yy61;
+				goto yy58;
 			}
 		}
-		YYDEBUG(70, *YYCURSOR);
+yy67:
+		YYDEBUG(67, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy68;
+		if (yych <= '/') goto yy38;
+		if (yych >= ':') goto yy38;
+yy68:
+		YYDEBUG(68, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych == '\\') goto yy68;
-		goto yy45;
+		YYDEBUG(69, *YYCURSOR);
+		if (yych == '.') goto yy68;
+		if (yych <= '/') goto yy70;
+		if (yych <= '9') goto yy68;
+yy70:
+		YYDEBUG(70, *YYCURSOR);
+		YYCURSOR = YYCTXMARKER;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 106 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	return T_POUND;
+}
+#line 826 "sapi/phpdbg/phpdbg_lexer.c"
 yy71:
 		YYDEBUG(71, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych != 'd') goto yy43;
+		++YYCURSOR;
+		YYFILL(4);
+		yych = *YYCURSOR;
+yy72:
 		YYDEBUG(72, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych != '_') goto yy43;
+		if (yybm[0+yych] & 16) {
+			goto yy71;
+		}
+		if (yych <= '\n') {
+			if (yych <= 0x00) goto yy38;
+			if (yych >= '\n') goto yy38;
+		} else {
+			if (yych <= '#') goto yy73;
+			if (yych <= '\'') goto yy98;
+			if (yych <= ':') goto yy75;
+			goto yy76;
+		}
 yy73:
 		YYDEBUG(73, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yybm[0+yych] & 4) {
-			goto yy74;
-		}
-		goto yy43;
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy74:
 		YYDEBUG(74, *YYCURSOR);
-		yyaccept = 3;
-		YYMARKER = ++YYCURSOR;
+		if (yybm[0+yych] & 32) {
+			goto yy73;
+		}
+		if (yych <= '\n') goto yy38;
+		if (yych <= '\'') goto yy99;
+		goto yy102;
+yy75:
+		YYDEBUG(75, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy103;
+		goto yy74;
+yy76:
+		YYDEBUG(76, *YYCURSOR);
+		++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(75, *YYCURSOR);
-		if (yybm[0+yych] & 4) {
-			goto yy74;
-		}
-		if (yych <= ' ') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy76;
-				if (yych <= 0x08) goto yy42;
+		if (yych <= '"') {
+			if (yych <= '\f') {
+				if (yych <= 0x00) goto yy38;
+				if (yych <= 0x08) goto yy58;
+				if (yych <= '\n') goto yy38;
+				goto yy58;
 			} else {
-				if (yych == '\r') goto yy76;
-				if (yych <= 0x1F) goto yy42;
+				if (yych <= '\r') goto yy38;
+				if (yych == ' ') goto yy38;
+				goto yy58;
 			}
 		} else {
-			if (yych <= '&') {
-				if (yych <= '!') goto yy42;
-				if (yych <= '"') goto yy62;
-				if (yych >= '$') goto yy42;
+			if (yych <= '9') {
+				if (yych <= '#') goto yy38;
+				if (yych == '\'') goto yy71;
+				goto yy58;
 			} else {
-				if (yych <= '\'') goto yy62;
-				if (yych == ':') goto yy61;
-				goto yy42;
+				if (yych <= ':') goto yy96;
+				if (yych == '\\') goto yy71;
+				goto yy58;
 			}
 		}
-yy76:
-		YYDEBUG(76, *YYCURSOR);
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 154 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	phpdbg_init_param(yylval, OP_PARAM);
-	yylval->str = estrndup(yytext, yyleng);
-	yylval->len = yyleng;
-	return T_OPCODE;
-}
-#line 878 "sapi/phpdbg/phpdbg_lexer.c"
 yy77:
 		YYDEBUG(77, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych != 'N') goto yy43;
+		if (yych <= ' ') {
+			if (yych <= '\f') {
+				if (yych == '\t') goto yy104;
+				goto yy32;
+			} else {
+				if (yych <= '\r') goto yy104;
+				if (yych <= 0x1F) goto yy32;
+				goto yy104;
+			}
+		} else {
+			if (yych <= '.') {
+				if (yych <= ',') goto yy32;
+				if (yych <= '-') goto yy106;
+				goto yy107;
+			} else {
+				if (yych <= '/') goto yy32;
+				if (yych <= '9') goto yy107;
+				goto yy32;
+			}
+		}
+yy78:
 		YYDEBUG(78, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych != 'D') goto yy43;
+		if (yybm[0+yych] & 64) {
+			goto yy110;
+		}
+		goto yy32;
+yy79:
 		YYDEBUG(79, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy73;
-		goto yy43;
-yy80:
+		++YYCURSOR;
 		YYDEBUG(80, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy81;
-		if (yych != 's') goto yy43;
+		YYCURSOR = YYCTXMARKER;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 119 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	return T_COLON;
+}
+#line 933 "sapi/phpdbg/phpdbg_lexer.c"
 yy81:
 		YYDEBUG(81, *YYCURSOR);
-		YYCTXMARKER = YYCURSOR + 1;
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy82;
-			if (yych <= 0x08) goto yy43;
-			if (yych >= '\v') goto yy43;
-		} else {
-			if (yych <= '\r') goto yy82;
-			if (yych != ' ') goto yy43;
-		}
-yy82:
-		YYDEBUG(82, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(83, *YYCURSOR);
-		YYCURSOR = YYCTXMARKER;
+		YYDEBUG(82, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 130 "sapi/phpdbg/phpdbg_lexer.l"
+#line 115 "sapi/phpdbg/phpdbg_lexer.l"
 		{
-	phpdbg_init_param(yylval, NUMERIC_PARAM);
-	yylval->num = 1;
-	return T_TRUTHY;
+	return T_DCOLON;
 }
-#line 924 "sapi/phpdbg/phpdbg_lexer.c"
-yy84:
+#line 943 "sapi/phpdbg/phpdbg_lexer.c"
+yy83:
+		YYDEBUG(83, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(84, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'U') goto yy85;
-		if (yych != 'u') goto yy43;
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy33;
+				if (yych <= 0x08) goto yy83;
+				goto yy33;
+			} else {
+				if (yych == '\r') goto yy33;
+				if (yych <= 0x1F) goto yy83;
+				goto yy33;
+			}
+		} else {
+			if (yych <= '&') {
+				if (yych <= '!') goto yy83;
+				if (yych <= '#') goto yy33;
+				goto yy83;
+			} else {
+				if (yych <= '\'') goto yy33;
+				if (yych == ':') goto yy113;
+				goto yy83;
+			}
+		}
 yy85:
 		YYDEBUG(85, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy81;
-		if (yych == 'e') goto yy81;
-		goto yy43;
+		if (yych == 'S') goto yy114;
+		if (yych == 's') goto yy114;
+		goto yy32;
 yy86:
 		YYDEBUG(86, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'F') goto yy87;
-		if (yych != 'f') goto yy43;
+		if (yych == 'A') goto yy115;
+		if (yych == 'a') goto yy115;
+		goto yy32;
 yy87:
 		YYDEBUG(87, *YYCURSOR);
-		YYCTXMARKER = YYCURSOR + 1;
-		yyaccept = 1;
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy116;
+		if (yych == 'l') goto yy116;
+		goto yy32;
+yy88:
+		YYDEBUG(88, *YYCURSOR);
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy88;
-			if (yych <= 0x08) goto yy43;
-			if (yych >= '\v') goto yy43;
+			if (yych == '\t') goto yy117;
+			goto yy32;
 		} else {
-			if (yych <= '\r') goto yy88;
-			if (yych != ' ') goto yy43;
+			if (yych <= '\r') goto yy117;
+			if (yych == ' ') goto yy117;
+			goto yy32;
 		}
-yy88:
-		YYDEBUG(88, *YYCURSOR);
-		++YYCURSOR;
+yy89:
 		YYDEBUG(89, *YYCURSOR);
-		YYCURSOR = YYCTXMARKER;
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 136 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	phpdbg_init_param(yylval, NUMERIC_PARAM);
-	yylval->num = 0;
-	return T_FALSY;
-}
-#line 969 "sapi/phpdbg/phpdbg_lexer.c"
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		YYCTXMARKER = YYCURSOR;
+		if (yych <= '\f') {
+			if (yych <= 0x00) goto yy120;
+			if (yych <= 0x08) goto yy32;
+			if (yych <= '\n') goto yy120;
+			goto yy32;
+		} else {
+			if (yych <= '\r') goto yy120;
+			if (yych == ' ') goto yy120;
+			goto yy32;
+		}
 yy90:
 		YYDEBUG(90, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy91;
-		if (yych != 'l') goto yy43;
+		if (yych == 'F') goto yy89;
+		if (yych == 'f') goto yy89;
+		goto yy32;
 yy91:
 		YYDEBUG(91, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy92;
-		if (yych != 's') goto yy43;
+		YYCTXMARKER = YYCURSOR;
+		if (yych <= '\f') {
+			if (yych <= 0x00) goto yy122;
+			if (yych <= 0x08) goto yy32;
+			if (yych <= '\n') goto yy122;
+			goto yy32;
+		} else {
+			if (yych <= '\r') goto yy122;
+			if (yych == ' ') goto yy122;
+			goto yy32;
+		}
 yy92:
 		YYDEBUG(92, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy87;
-		if (yych == 'e') goto yy87;
-		goto yy43;
+		if (yych == 'U') goto yy124;
+		if (yych == 'u') goto yy124;
+		goto yy32;
 yy93:
 		YYDEBUG(93, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy94;
-		if (yych != 'a') goto yy43;
+		if (yych == 'S') goto yy91;
+		if (yych == 's') goto yy91;
+		goto yy32;
 yy94:
 		YYDEBUG(94, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'B') goto yy95;
-		if (yych != 'b') goto yy43;
+		if (yych == 'N') goto yy125;
+		goto yy32;
 yy95:
 		YYDEBUG(95, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy96;
-		if (yych != 'l') goto yy43;
+		if (yych == 'n') goto yy126;
+		goto yy32;
 yy96:
 		YYDEBUG(96, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy97;
-		if (yych != 'e') goto yy43;
+		yych = *++YYCURSOR;
+		if (yych != '/') goto yy38;
 yy97:
 		YYDEBUG(97, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy81;
-		if (yych == 'd') goto yy81;
-		goto yy43;
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy127;
+		goto yy38;
 yy98:
 		YYDEBUG(98, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy99;
-		if (yych != 's') goto yy43;
+		if (yych <= '\r') {
+			if (yych <= 0x08) {
+				if (yych <= 0x00) goto yy33;
+				goto yy59;
+			} else {
+				if (yych <= '\n') goto yy33;
+				if (yych <= '\f') goto yy59;
+				goto yy33;
+			}
+		} else {
+			if (yych <= ' ') {
+				if (yych <= 0x1F) goto yy59;
+				goto yy33;
+			} else {
+				if (yych == '#') goto yy33;
+				goto yy59;
+			}
+		}
 yy99:
 		YYDEBUG(99, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy100;
-		if (yych != 'a') goto yy43;
+		yych = *++YYCURSOR;
+		goto yy33;
 yy100:
 		YYDEBUG(100, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'B') goto yy101;
-		if (yych != 'b') goto yy43;
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych == '"') goto yy63;
+		if (yych == '\\') goto yy63;
+		goto yy38;
 yy101:
 		YYDEBUG(101, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy102;
-		if (yych != 'l') goto yy43;
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy129;
+		goto yy64;
 yy102:
 		YYDEBUG(102, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy103;
-		if (yych != 'e') goto yy43;
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych == '\'') goto yy73;
+		if (yych == '\\') goto yy73;
+		goto yy38;
 yy103:
 		YYDEBUG(103, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy87;
-		if (yych == 'd') goto yy87;
-		goto yy43;
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy130;
+		goto yy74;
 yy104:
 		YYDEBUG(104, *YYCURSOR);
-		yyaccept = 1;
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(105, *YYCURSOR);
+		if (yych <= ' ') {
+			if (yych <= '\f') {
+				if (yych == '\t') goto yy104;
+				goto yy38;
+			} else {
+				if (yych <= '\r') goto yy104;
+				if (yych <= 0x1F) goto yy38;
+				goto yy104;
+			}
+		} else {
+			if (yych <= '.') {
+				if (yych <= ',') goto yy38;
+				if (yych <= '-') goto yy131;
+				goto yy132;
+			} else {
+				if (yych <= '/') goto yy38;
+				if (yych <= '9') goto yy132;
+				goto yy38;
+			}
+		}
+yy106:
+		YYDEBUG(106, *YYCURSOR);
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yybm[0+yych] & 8) {
-			goto yy105;
+		if (yych == '.') goto yy107;
+		if (yych <= '/') goto yy32;
+		if (yych >= ':') goto yy32;
+yy107:
+		YYDEBUG(107, *YYCURSOR);
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		YYDEBUG(108, *YYCURSOR);
+		if (yych <= '"') {
+			if (yych <= '\f') {
+				if (yych <= 0x00) goto yy109;
+				if (yych <= 0x08) goto yy31;
+				if (yych >= '\v') goto yy31;
+			} else {
+				if (yych <= 0x1F) {
+					if (yych >= 0x0E) goto yy31;
+				} else {
+					if (yych <= ' ') goto yy109;
+					if (yych <= '!') goto yy31;
+					goto yy58;
+				}
+			}
+		} else {
+			if (yych <= '-') {
+				if (yych <= '#') goto yy109;
+				if (yych == '\'') goto yy58;
+				goto yy31;
+			} else {
+				if (yych <= '/') {
+					if (yych <= '.') goto yy107;
+					goto yy31;
+				} else {
+					if (yych <= '9') goto yy107;
+					if (yych <= ':') goto yy60;
+					goto yy31;
+				}
+			}
 		}
-		goto yy43;
-yy105:
-		YYDEBUG(105, *YYCURSOR);
+yy109:
+		YYDEBUG(109, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 93 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	char *text = yytext + 2;
+	while (*++text < '0');
+	yylval->num = atoi(text);
+	return T_REQ_ID;
+}
+#line 1209 "sapi/phpdbg/phpdbg_lexer.c"
+yy110:
+		YYDEBUG(110, *YYCURSOR);
 		yyaccept = 4;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(106, *YYCURSOR);
-		if (yybm[0+yych] & 8) {
-			goto yy105;
+		YYDEBUG(111, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy110;
 		}
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy107;
-				if (yych <= 0x08) goto yy42;
+				if (yych <= 0x00) goto yy112;
+				if (yych <= 0x08) goto yy31;
 			} else {
-				if (yych == '\r') goto yy107;
-				if (yych <= 0x1F) goto yy42;
+				if (yych == '\r') goto yy112;
+				if (yych <= 0x1F) goto yy31;
 			}
 		} else {
 			if (yych <= '&') {
-				if (yych <= '!') goto yy42;
-				if (yych <= '"') goto yy62;
-				if (yych >= '$') goto yy42;
+				if (yych <= '!') goto yy31;
+				if (yych <= '"') goto yy58;
+				if (yych >= '$') goto yy31;
 			} else {
-				if (yych <= '\'') goto yy62;
-				if (yych <= '/') goto yy42;
-				if (yych <= ':') goto yy61;
-				goto yy42;
+				if (yych <= '\'') goto yy58;
+				if (yych <= '/') goto yy31;
+				if (yych <= ':') goto yy60;
+				goto yy31;
 			}
 		}
-yy107:
-		YYDEBUG(107, *YYCURSOR);
+yy112:
+		YYDEBUG(112, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 148 "sapi/phpdbg/phpdbg_lexer.l"
 		{
@@ -1100,396 +1245,255 @@ yy107:
 	yylval->addr = strtoul(yytext, 0, 16);
 	return T_ADDR;
 }
-#line 1104 "sapi/phpdbg/phpdbg_lexer.c"
-yy108:
-		YYDEBUG(108, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(4);
-		yych = *YYCURSOR;
-yy109:
-		YYDEBUG(109, *YYCURSOR);
-		if (yybm[0+yych] & 16) {
-			goto yy108;
-		}
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy45;
-			if (yych >= '\n') goto yy45;
-		} else {
-			if (yych <= '#') goto yy110;
-			if (yych <= '\'') goto yy118;
-			if (yych <= ':') goto yy112;
-			goto yy113;
-		}
-yy110:
-		YYDEBUG(110, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-yy111:
-		YYDEBUG(111, *YYCURSOR);
-		if (yybm[0+yych] & 32) {
-			goto yy110;
-		}
-		if (yych <= '\n') goto yy45;
-		if (yych <= '\'') goto yy115;
-		goto yy116;
-yy112:
-		YYDEBUG(112, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '/') goto yy114;
-		goto yy111;
+#line 1249 "sapi/phpdbg/phpdbg_lexer.c"
 yy113:
 		YYDEBUG(113, *YYCURSOR);
 		++YYCURSOR;
-		YYFILL(3);
+		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych <= '"') {
-			if (yych <= '\f') {
-				if (yych <= 0x00) goto yy45;
-				if (yych <= 0x08) goto yy62;
-				if (yych <= '\n') goto yy45;
-				goto yy62;
-			} else {
-				if (yych <= '\r') goto yy45;
-				if (yych == ' ') goto yy45;
-				goto yy62;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '#') goto yy45;
-				if (yych == '\'') goto yy108;
-				goto yy62;
-			} else {
-				if (yych <= ':') goto yy64;
-				if (yych == '\\') goto yy108;
-				goto yy62;
-			}
-		}
+		if (yych == '\\') goto yy83;
+		goto yy38;
 yy114:
 		YYDEBUG(114, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '/') goto yy117;
-		goto yy111;
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy134;
+		if (yych == 'a') goto yy134;
+		goto yy32;
 yy115:
 		YYDEBUG(115, *YYCURSOR);
-		yych = *++YYCURSOR;
-		goto yy39;
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'B') goto yy135;
+		if (yych == 'b') goto yy135;
+		goto yy32;
 yy116:
 		YYDEBUG(116, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		if (yych == '\'') goto yy110;
-		if (yych == '\\') goto yy110;
-		goto yy45;
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy136;
+		if (yych == 's') goto yy136;
+		goto yy32;
 yy117:
 		YYDEBUG(117, *YYCURSOR);
-		yyaccept = 5;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x00) goto yy67;
-		if (yych == '\n') goto yy67;
-		goto yy111;
-yy118:
-		YYDEBUG(118, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '\r') {
-			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy39;
-				goto yy63;
-			} else {
-				if (yych <= '\n') goto yy39;
-				if (yych <= '\f') goto yy63;
-				goto yy39;
-			}
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(118, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy117;
 		} else {
-			if (yych <= ' ') {
-				if (yych <= 0x1F) goto yy63;
-				goto yy39;
-			} else {
-				if (yych == '#') goto yy39;
-				goto yy63;
-			}
+			if (yych <= '\r') goto yy117;
+			if (yych == ' ') goto yy117;
 		}
-yy119:
 		YYDEBUG(119, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(4);
-		yych = *YYCURSOR;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 100 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	YYSETCONDITION(RAW);
+	phpdbg_init_param(yylval, EMPTY_PARAM);
+	return T_IF;
+}
+#line 1298 "sapi/phpdbg/phpdbg_lexer.c"
 yy120:
 		YYDEBUG(120, *YYCURSOR);
-		if (yybm[0+yych] & 64) {
-			goto yy119;
-		}
-		if (yych <= ' ') {
-			if (yych <= 0x00) goto yy45;
-			if (yych == '\n') goto yy45;
-		} else {
-			if (yych <= '"') goto yy118;
-			if (yych <= '#') goto yy121;
-			if (yych <= ':') goto yy123;
-			goto yy124;
-		}
-yy121:
-		YYDEBUG(121, *YYCURSOR);
 		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
+		YYDEBUG(121, *YYCURSOR);
+		YYCURSOR = YYCTXMARKER;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 136 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	phpdbg_init_param(yylval, NUMERIC_PARAM);
+	yylval->num = 0;
+	return T_FALSY;
+}
+#line 1311 "sapi/phpdbg/phpdbg_lexer.c"
 yy122:
 		YYDEBUG(122, *YYCURSOR);
-		if (yybm[0+yych] & 128) {
-			goto yy121;
-		}
-		if (yych <= '\n') goto yy45;
-		if (yych <= '"') goto yy115;
-		goto yy126;
-yy123:
+		++YYCURSOR;
 		YYDEBUG(123, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '/') goto yy125;
-		goto yy122;
+		YYCURSOR = YYCTXMARKER;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 130 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	phpdbg_init_param(yylval, NUMERIC_PARAM);
+	yylval->num = 1;
+	return T_TRUTHY;
+}
+#line 1324 "sapi/phpdbg/phpdbg_lexer.c"
 yy124:
 		YYDEBUG(124, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(3);
-		yych = *YYCURSOR;
-		if (yych <= ' ') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy45;
-				if (yych <= 0x08) goto yy62;
-				goto yy45;
-			} else {
-				if (yych == '\r') goto yy45;
-				if (yych <= 0x1F) goto yy62;
-				goto yy45;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '!') goto yy62;
-				if (yych <= '"') goto yy119;
-				if (yych <= '#') goto yy45;
-				goto yy62;
-			} else {
-				if (yych <= ':') goto yy64;
-				if (yych == '\\') goto yy119;
-				goto yy62;
-			}
-		}
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy91;
+		if (yych == 'e') goto yy91;
+		goto yy32;
 yy125:
 		YYDEBUG(125, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '/') goto yy127;
-		goto yy122;
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy137;
+		goto yy32;
 yy126:
 		YYDEBUG(126, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		if (yych == '"') goto yy121;
-		if (yych == '\\') goto yy121;
-		goto yy45;
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'd') goto yy137;
+		goto yy32;
 yy127:
 		YYDEBUG(127, *YYCURSOR);
-		yyaccept = 5;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x00) goto yy67;
-		if (yych == '\n') goto yy67;
-		goto yy122;
+		++YYCURSOR;
 yy128:
 		YYDEBUG(128, *YYCURSOR);
-		++YYCURSOR;
-		YYDEBUG(129, *YYCURSOR);
-		YYCURSOR = YYCTXMARKER;
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 119 "sapi/phpdbg/phpdbg_lexer.l"
+#line 123 "sapi/phpdbg/phpdbg_lexer.l"
 		{
-	return T_COLON;
+	phpdbg_init_param(yylval, STR_PARAM);
+	yylval->str = estrndup(yytext, yyleng);
+	yylval->len = yyleng;
+	return T_PROTO;
 }
-#line 1309 "sapi/phpdbg/phpdbg_lexer.c"
+#line 1357 "sapi/phpdbg/phpdbg_lexer.c"
+yy129:
+		YYDEBUG(129, *YYCURSOR);
+		yyaccept = 5;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 0x00) goto yy128;
+		if (yych == '\n') goto yy128;
+		goto yy64;
 yy130:
 		YYDEBUG(130, *YYCURSOR);
-		++YYCURSOR;
+		yyaccept = 5;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 0x00) goto yy128;
+		if (yych == '\n') goto yy128;
+		goto yy74;
+yy131:
 		YYDEBUG(131, *YYCURSOR);
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 115 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	return T_DCOLON;
-}
-#line 1319 "sapi/phpdbg/phpdbg_lexer.c"
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy132;
+		if (yych <= '/') goto yy38;
+		if (yych >= ':') goto yy38;
 yy132:
 		YYDEBUG(132, *YYCURSOR);
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= '\f') {
-			if (yych != '\t') goto yy43;
-		} else {
-			if (yych <= '\r') goto yy133;
-			if (yych != ' ') goto yy43;
-		}
-yy133:
-		YYDEBUG(133, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
+		YYDEBUG(133, *YYCURSOR);
+		if (yych == '.') goto yy132;
+		if (yych <= '/') goto yy109;
+		if (yych <= '9') goto yy132;
+		goto yy109;
+yy134:
 		YYDEBUG(134, *YYCURSOR);
-		if (yych <= '\f') {
-			if (yych == '\t') goto yy133;
-		} else {
-			if (yych <= '\r') goto yy133;
-			if (yych == ' ') goto yy133;
-		}
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'B') goto yy138;
+		if (yych == 'b') goto yy138;
+		goto yy32;
+yy135:
 		YYDEBUG(135, *YYCURSOR);
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 100 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	YYSETCONDITION(RAW);
-	phpdbg_init_param(yylval, EMPTY_PARAM);
-	return T_IF;
-}
-#line 1350 "sapi/phpdbg/phpdbg_lexer.c"
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy139;
+		if (yych == 'l') goto yy139;
+		goto yy32;
 yy136:
 		YYDEBUG(136, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= ' ') {
-			if (yych <= '\f') {
-				if (yych != '\t') goto yy43;
-			} else {
-				if (yych <= '\r') goto yy137;
-				if (yych <= 0x1F) goto yy43;
-			}
-		} else {
-			if (yych <= '.') {
-				if (yych <= ',') goto yy43;
-				if (yych <= '-') goto yy139;
-				goto yy140;
-			} else {
-				if (yych <= '/') goto yy43;
-				if (yych <= '9') goto yy140;
-				goto yy43;
-			}
-		}
+		if (yych == 'E') goto yy89;
+		if (yych == 'e') goto yy89;
+		goto yy32;
 yy137:
 		YYDEBUG(137, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(2);
-		yych = *YYCURSOR;
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy140;
+		goto yy32;
+yy138:
 		YYDEBUG(138, *YYCURSOR);
-		if (yych <= ' ') {
-			if (yych <= '\f') {
-				if (yych == '\t') goto yy137;
-				goto yy45;
-			} else {
-				if (yych <= '\r') goto yy137;
-				if (yych <= 0x1F) goto yy45;
-				goto yy137;
-			}
-		} else {
-			if (yych <= '.') {
-				if (yych <= ',') goto yy45;
-				if (yych <= '-') goto yy143;
-				goto yy144;
-			} else {
-				if (yych <= '/') goto yy45;
-				if (yych <= '9') goto yy144;
-				goto yy45;
-			}
-		}
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy141;
+		if (yych == 'l') goto yy141;
+		goto yy32;
 yy139:
 		YYDEBUG(139, *YYCURSOR);
-		yyaccept = 1;
+		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '.') goto yy140;
-		if (yych <= '/') goto yy43;
-		if (yych >= ':') goto yy43;
+		if (yych == 'E') goto yy142;
+		if (yych == 'e') goto yy142;
+		goto yy32;
 yy140:
 		YYDEBUG(140, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy143;
+		}
+		goto yy32;
+yy141:
+		YYDEBUG(141, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy146;
+		if (yych == 'e') goto yy146;
+		goto yy32;
+yy142:
+		YYDEBUG(142, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy91;
+		if (yych == 'd') goto yy91;
+		goto yy32;
+yy143:
+		YYDEBUG(143, *YYCURSOR);
 		yyaccept = 6;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(141, *YYCURSOR);
-		if (yych <= '"') {
-			if (yych <= '\f') {
-				if (yych <= 0x00) goto yy142;
-				if (yych <= 0x08) goto yy42;
-				if (yych >= '\v') goto yy42;
+		YYDEBUG(144, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy143;
+		}
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy145;
+				if (yych <= 0x08) goto yy31;
 			} else {
-				if (yych <= 0x1F) {
-					if (yych >= 0x0E) goto yy42;
-				} else {
-					if (yych <= ' ') goto yy142;
-					if (yych <= '!') goto yy42;
-					goto yy62;
-				}
+				if (yych == '\r') goto yy145;
+				if (yych <= 0x1F) goto yy31;
 			}
 		} else {
-			if (yych <= '-') {
-				if (yych <= '#') goto yy142;
-				if (yych == '\'') goto yy62;
-				goto yy42;
+			if (yych <= '&') {
+				if (yych <= '!') goto yy31;
+				if (yych <= '"') goto yy58;
+				if (yych >= '$') goto yy31;
 			} else {
-				if (yych <= '/') {
-					if (yych <= '.') goto yy140;
-					goto yy42;
-				} else {
-					if (yych <= '9') goto yy140;
-					if (yych <= ':') goto yy61;
-					goto yy42;
-				}
+				if (yych <= '\'') goto yy58;
+				if (yych == ':') goto yy60;
+				goto yy31;
 			}
 		}
-yy142:
-		YYDEBUG(142, *YYCURSOR);
+yy145:
+		YYDEBUG(145, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 93 "sapi/phpdbg/phpdbg_lexer.l"
+#line 154 "sapi/phpdbg/phpdbg_lexer.l"
 		{
-	char *text = yytext + 2;
-	while (*++text < '0');
-	yylval->num = atoi(text);
-	return T_REQ_ID;
+	phpdbg_init_param(yylval, OP_PARAM);
+	yylval->str = estrndup(yytext, yyleng);
+	yylval->len = yyleng;
+	return T_OPCODE;
 }
-#line 1453 "sapi/phpdbg/phpdbg_lexer.c"
-yy143:
-		YYDEBUG(143, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '.') goto yy144;
-		if (yych <= '/') goto yy45;
-		if (yych >= ':') goto yy45;
-yy144:
-		YYDEBUG(144, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		YYDEBUG(145, *YYCURSOR);
-		if (yych == '.') goto yy144;
-		if (yych <= '/') goto yy142;
-		if (yych <= '9') goto yy144;
-		goto yy142;
+#line 1490 "sapi/phpdbg/phpdbg_lexer.c"
 yy146:
 		YYDEBUG(146, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '.') goto yy147;
-		if (yych <= '/') goto yy45;
-		if (yych >= ':') goto yy45;
-yy147:
-		YYDEBUG(147, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		YYDEBUG(148, *YYCURSOR);
-		if (yych == '.') goto yy147;
-		if (yych <= '/') goto yy149;
-		if (yych <= '9') goto yy147;
-yy149:
-		YYDEBUG(149, *YYCURSOR);
-		YYCURSOR = YYCTXMARKER;
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 106 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	return T_POUND;
-}
-#line 1493 "sapi/phpdbg/phpdbg_lexer.c"
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy89;
+		if (yych == 'd') goto yy89;
+		goto yy32;
 	}
 /* *********************************** */
 yyc_PRE_RAW:
@@ -1528,34 +1532,23 @@ yyc_PRE_RAW:
 			  0,   0,   0,   0,   0,   0,   0,   0, 
 			  0,   0,   0,   0,   0,   0,   0,   0, 
 		};
-		YYDEBUG(150, *YYCURSOR);
+		YYDEBUG(147, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
 		if (yych <= '\r') {
-			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy158;
-				if (yych <= 0x08) goto yy160;
-			} else {
-				if (yych <= '\n') goto yy158;
-				if (yych <= '\f') goto yy160;
-			}
+			if (yych == '\t') goto yy151;
+			if (yych >= '\r') goto yy151;
 		} else {
-			if (yych <= '"') {
-				if (yych == ' ') goto yy154;
-				goto yy160;
+			if (yych <= ' ') {
+				if (yych >= ' ') goto yy152;
 			} else {
-				if (yych <= '#') goto yy157;
-				if (yych == '-') goto yy159;
-				goto yy160;
+				if (yych == '-') goto yy155;
 			}
 		}
-		YYDEBUG(152, *YYCURSOR);
+		YYDEBUG(149, *YYCURSOR);
 		++YYCURSOR;
-		if (yybm[0+(yych = *YYCURSOR)] & 64) {
-			goto yy154;
-		}
-yy153:
-		YYDEBUG(153, *YYCURSOR);
+yy150:
+		YYDEBUG(150, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 199 "sapi/phpdbg/phpdbg_lexer.l"
 		{
@@ -1564,17 +1557,24 @@ yy153:
 	YYCURSOR = LEX(text);
 	goto restart;
 }
-#line 1568 "sapi/phpdbg/phpdbg_lexer.c"
-yy154:
-		YYDEBUG(154, *YYCURSOR);
+#line 1561 "sapi/phpdbg/phpdbg_lexer.c"
+yy151:
+		YYDEBUG(151, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm[0+yych] & 64) {
+			goto yy152;
+		}
+		goto yy150;
+yy152:
+		YYDEBUG(152, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(155, *YYCURSOR);
+		YYDEBUG(153, *YYCURSOR);
 		if (yybm[0+yych] & 64) {
-			goto yy154;
+			goto yy152;
 		}
-		YYDEBUG(156, *YYCURSOR);
+		YYDEBUG(154, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 175 "sapi/phpdbg/phpdbg_lexer.l"
 		{
@@ -1583,64 +1583,50 @@ yy154:
 	goto restart;
 }
 #line 1586 "sapi/phpdbg/phpdbg_lexer.c"
-yy157:
-		YYDEBUG(157, *YYCURSOR);
-		yych = *++YYCURSOR;
-		goto yy153;
-yy158:
-		YYDEBUG(158, *YYCURSOR);
-		yych = *++YYCURSOR;
-		goto yy153;
-yy159:
-		YYDEBUG(159, *YYCURSOR);
-		yyaccept = 0;
+yy155:
+		YYDEBUG(155, *YYCURSOR);
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'r') goto yy161;
-		goto yy153;
-yy160:
-		YYDEBUG(160, *YYCURSOR);
-		yych = *++YYCURSOR;
-		goto yy153;
-yy161:
-		YYDEBUG(161, *YYCURSOR);
+		if (yych != 'r') goto yy150;
+yy156:
+		YYDEBUG(156, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(162, *YYCURSOR);
+		YYDEBUG(157, *YYCURSOR);
 		if (yybm[0+yych] & 128) {
-			goto yy165;
+			goto yy160;
 		}
 		if (yych <= '\r') {
-			if (yych == '\t') goto yy161;
-			if (yych >= '\r') goto yy161;
+			if (yych == '\t') goto yy156;
+			if (yych >= '\r') goto yy156;
 		} else {
 			if (yych <= ' ') {
-				if (yych >= ' ') goto yy161;
+				if (yych >= ' ') goto yy156;
 			} else {
-				if (yych == '-') goto yy164;
+				if (yych == '-') goto yy159;
 			}
 		}
-yy163:
-		YYDEBUG(163, *YYCURSOR);
+yy158:
+		YYDEBUG(158, *YYCURSOR);
 		YYCURSOR = YYMARKER;
-		goto yy153;
-yy164:
-		YYDEBUG(164, *YYCURSOR);
+		goto yy150;
+yy159:
+		YYDEBUG(159, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yybm[0+yych] & 128) {
-			goto yy165;
+			goto yy160;
 		}
-		goto yy163;
-yy165:
-		YYDEBUG(165, *YYCURSOR);
+		goto yy158;
+yy160:
+		YYDEBUG(160, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(166, *YYCURSOR);
+		YYDEBUG(161, *YYCURSOR);
 		if (yybm[0+yych] & 128) {
-			goto yy165;
+			goto yy160;
 		}
-		YYDEBUG(167, *YYCURSOR);
+		YYDEBUG(162, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 93 "sapi/phpdbg/phpdbg_lexer.l"
 		{
@@ -1649,17 +1635,17 @@ yy165:
 	yylval->num = atoi(text);
 	return T_REQ_ID;
 }
-#line 1653 "sapi/phpdbg/phpdbg_lexer.c"
+#line 1639 "sapi/phpdbg/phpdbg_lexer.c"
 	}
 /* *********************************** */
 yyc_RAW:
 	{
 		static const unsigned char yybm[] = {
 			  0, 232, 232, 232, 232, 232, 232, 232, 
-			232, 236,   0, 232, 232, 236, 232, 232, 
+			232, 232,   0, 232, 232, 232, 232, 232, 
 			232, 232, 232, 232, 232, 232, 232, 232, 
 			232, 232, 232, 232, 232, 232, 232, 232, 
-			236, 232,  32, 224, 232, 232, 232, 128, 
+			232, 232,  64, 224, 232, 232, 232,  32, 
 			232, 232, 232, 232, 232, 232, 232, 232, 
 			232, 232, 232, 232, 232, 232, 232, 232, 
 			232, 232, 232, 232, 232, 232, 232, 232, 
@@ -1688,61 +1674,43 @@ yyc_RAW:
 			232, 232, 232, 232, 232, 232, 232, 232, 
 			232, 232, 232, 232, 232, 232, 232, 232, 
 		};
-		YYDEBUG(168, *YYCURSOR);
+		YYDEBUG(163, *YYCURSOR);
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yybm[0+yych] & 4) {
-			goto yy170;
-		}
-		if (yych <= '"') {
-			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy175;
-				goto yy177;
-			} else {
-				if (yych <= '\n') goto yy175;
-				if (yych <= '!') goto yy177;
-				goto yy181;
-			}
-		} else {
-			if (yych <= '\'') {
-				if (yych <= '#') goto yy173;
-				if (yych <= '&') goto yy177;
-				goto yy183;
-			} else {
-				if (yych == '\\') goto yy179;
-				goto yy177;
-			}
+		if (yybm[0+yych] & 8) {
+			goto yy167;
 		}
-yy170:
-		YYDEBUG(170, *YYCURSOR);
-		yyaccept = 0;
+		if (yych <= '\n') goto yy165;
+		if (yych <= '"') goto yy170;
+		if (yych <= '#') goto yy172;
+		if (yych <= '\'') goto yy174;
+		goto yy175;
+yy165:
+		YYDEBUG(165, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(166, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 89 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	return 0;
+}
+#line 1698 "sapi/phpdbg/phpdbg_lexer.c"
+yy167:
+		YYDEBUG(167, *YYCURSOR);
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(171, *YYCURSOR);
-		if (yybm[0+yych] & 4) {
-			goto yy170;
-		}
-		if (yych <= '"') {
-			if (yych <= 0x08) {
-				if (yych >= 0x01) goto yy177;
-			} else {
-				if (yych <= '\n') goto yy172;
-				if (yych <= '!') goto yy177;
-				goto yy181;
-			}
-		} else {
-			if (yych <= '\'') {
-				if (yych <= '#') goto yy172;
-				if (yych <= '&') goto yy177;
-				goto yy183;
-			} else {
-				if (yych == '\\') goto yy179;
-				goto yy177;
-			}
-		}
-yy172:
-		YYDEBUG(172, *YYCURSOR);
+		YYDEBUG(168, *YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy167;
+		}
+		if (yych <= '\n') goto yy169;
+		if (yych <= '"') goto yy170;
+		if (yych <= '#') goto yy169;
+		if (yych <= '\'') goto yy174;
+		goto yy175;
+yy169:
+		YYDEBUG(169, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 168 "sapi/phpdbg/phpdbg_lexer.l"
 		{
@@ -1751,390 +1719,361 @@ yy172:
 	yylval->len = yyleng;
 	return T_INPUT;
 }
-#line 1755 "sapi/phpdbg/phpdbg_lexer.c"
-yy173:
-		YYDEBUG(173, *YYCURSOR);
+#line 1723 "sapi/phpdbg/phpdbg_lexer.c"
+yy170:
+		YYDEBUG(170, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(174, *YYCURSOR);
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 32) {
+			goto yy177;
+		}
+		if (yych >= '#') goto yy179;
+yy171:
+		YYDEBUG(171, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy169;
+yy172:
+		YYDEBUG(172, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(173, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 110 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	YYSETCONDITION(INITIAL);
 	return T_SEPARATOR;
 }
-#line 1766 "sapi/phpdbg/phpdbg_lexer.c"
+#line 1747 "sapi/phpdbg/phpdbg_lexer.c"
+yy174:
+		YYDEBUG(174, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 64) {
+			goto yy181;
+		}
+		if (yych <= '\'') goto yy171;
+		goto yy183;
 yy175:
 		YYDEBUG(175, *YYCURSOR);
 		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(176, *YYCURSOR);
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 89 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	return 0;
-}
-#line 1776 "sapi/phpdbg/phpdbg_lexer.c"
+		if (yybm[0+yych] & 16) {
+			goto yy175;
+		}
+		if (yych <= '!') {
+			if (yych <= 0x00) goto yy169;
+			if (yych == '\n') goto yy169;
+			goto yy167;
+		} else {
+			if (yych <= '"') goto yy185;
+			if (yych == '\'') goto yy186;
+			goto yy167;
+		}
 yy177:
 		YYDEBUG(177, *YYCURSOR);
-		yyaccept = 0;
-		YYMARKER = ++YYCURSOR;
+		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		YYDEBUG(178, *YYCURSOR);
-		if (yybm[0+yych] & 8) {
+		if (yybm[0+yych] & 32) {
 			goto yy177;
 		}
-		if (yych <= '\n') goto yy172;
-		if (yych <= '"') goto yy181;
-		if (yych <= '#') goto yy172;
-		if (yych <= '\'') goto yy183;
+		if (yych <= '\n') goto yy171;
+		if (yych <= '"') goto yy167;
 yy179:
 		YYDEBUG(179, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		YYDEBUG(180, *YYCURSOR);
-		if (yybm[0+yych] & 16) {
-			goto yy179;
-		}
-		if (yych <= '!') {
-			if (yych <= 0x00) goto yy172;
-			if (yych == '\n') goto yy172;
-			goto yy177;
-		} else {
-			if (yych <= '"') goto yy211;
-			if (yych == '\'') goto yy193;
+		if (yybm[0+yych] & 32) {
 			goto yy177;
 		}
+		if (yych <= '\n') goto yy171;
+		if (yych <= '"') goto yy187;
+		goto yy179;
 yy181:
 		YYDEBUG(181, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yybm[0+yych] & 128) {
-			goto yy207;
-		}
-		if (yych >= '#') goto yy209;
-yy182:
 		YYDEBUG(182, *YYCURSOR);
-		YYCURSOR = YYMARKER;
-		goto yy172;
+		if (yybm[0+yych] & 64) {
+			goto yy181;
+		}
+		if (yych <= '\n') goto yy171;
+		if (yych <= '\'') goto yy167;
 yy183:
 		YYDEBUG(183, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yybm[0+yych] & 32) {
-			goto yy184;
-		}
-		if (yych <= '\'') goto yy182;
-		goto yy186;
-yy184:
 		YYDEBUG(184, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		YYDEBUG(185, *YYCURSOR);
-		if (yybm[0+yych] & 32) {
-			goto yy184;
-		}
-		if (yych <= '\n') goto yy182;
-		if (yych <= '\'') goto yy177;
-yy186:
-		YYDEBUG(186, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		YYDEBUG(187, *YYCURSOR);
-		if (yybm[0+yych] & 32) {
-			goto yy184;
+		if (yybm[0+yych] & 64) {
+			goto yy181;
 		}
-		if (yych <= '\n') goto yy182;
-		if (yych >= '(') goto yy186;
-yy188:
-		YYDEBUG(188, *YYCURSOR);
-		yyaccept = 0;
+		if (yych <= '\n') goto yy171;
+		if (yych <= '\'') goto yy189;
+		goto yy183;
+yy185:
+		YYDEBUG(185, *YYCURSOR);
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(189, *YYCURSOR);
 		if (yych <= '"') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy172;
-				goto yy188;
+				if (yych <= 0x00) goto yy169;
+				goto yy187;
 			} else {
-				if (yych <= '\n') goto yy172;
-				if (yych <= '!') goto yy188;
-				goto yy192;
+				if (yych <= '\n') goto yy169;
+				if (yych <= '!') goto yy187;
+				goto yy170;
 			}
 		} else {
 			if (yych <= '\'') {
-				if (yych <= '#') goto yy184;
-				if (yych <= '&') goto yy188;
-				goto yy193;
+				if (yych <= '#') goto yy177;
+				if (yych <= '&') goto yy187;
+				goto yy191;
 			} else {
-				if (yych != '\\') goto yy188;
+				if (yych == '\\') goto yy192;
+				goto yy187;
 			}
 		}
-yy190:
-		YYDEBUG(190, *YYCURSOR);
-		++YYCURSOR;
+yy186:
+		YYDEBUG(186, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(191, *YYCURSOR);
-		if (yych <= '!') {
-			if (yych <= 0x00) goto yy172;
-			if (yych == '\n') goto yy172;
-			goto yy188;
+		if (yych <= '"') {
+			if (yych <= '\t') {
+				if (yych <= 0x00) goto yy169;
+				goto yy189;
+			} else {
+				if (yych <= '\n') goto yy169;
+				if (yych <= '!') goto yy189;
+				goto yy194;
+			}
 		} else {
-			if (yych <= '"') goto yy203;
-			if (yych == '\\') goto yy190;
-			goto yy188;
-		}
-yy192:
-		YYDEBUG(192, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		if (yybm[0+yych] & 64) {
-			goto yy196;
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy181;
+				if (yych <= '&') goto yy189;
+				goto yy174;
+			} else {
+				if (yych == '\\') goto yy195;
+				goto yy189;
+			}
 		}
-		if (yych <= '\n') goto yy182;
-		if (yych <= '"') goto yy184;
-		if (yych <= '\'') goto yy194;
-		goto yy198;
-yy193:
-		YYDEBUG(193, *YYCURSOR);
-		yyaccept = 0;
+yy187:
+		YYDEBUG(187, *YYCURSOR);
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
+		YYDEBUG(188, *YYCURSOR);
 		if (yych <= '"') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy172;
-				goto yy188;
+				if (yych <= 0x00) goto yy169;
+				goto yy187;
 			} else {
-				if (yych <= '\n') goto yy172;
-				if (yych <= '!') goto yy188;
-				goto yy192;
+				if (yych <= '\n') goto yy169;
+				if (yych <= '!') goto yy187;
+				goto yy185;
 			}
 		} else {
 			if (yych <= '\'') {
-				if (yych <= '#') goto yy184;
-				if (yych <= '&') goto yy188;
-				goto yy183;
+				if (yych <= '#') goto yy177;
+				if (yych <= '&') goto yy187;
+				goto yy191;
 			} else {
-				if (yych == '\\') goto yy190;
-				goto yy188;
+				if (yych == '\\') goto yy192;
+				goto yy187;
 			}
 		}
-yy194:
-		YYDEBUG(194, *YYCURSOR);
-		yyaccept = 0;
+yy189:
+		YYDEBUG(189, *YYCURSOR);
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(195, *YYCURSOR);
+		YYDEBUG(190, *YYCURSOR);
 		if (yych <= '"') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy172;
-				goto yy194;
+				if (yych <= 0x00) goto yy169;
+				goto yy189;
 			} else {
-				if (yych <= '\n') goto yy172;
-				if (yych <= '!') goto yy194;
-				goto yy211;
+				if (yych <= '\n') goto yy169;
+				if (yych <= '!') goto yy189;
+				goto yy194;
 			}
 		} else {
 			if (yych <= '\'') {
-				if (yych <= '#') goto yy207;
-				if (yych <= '&') goto yy194;
-				goto yy206;
+				if (yych <= '#') goto yy181;
+				if (yych <= '&') goto yy189;
+				goto yy186;
 			} else {
-				if (yych == '\\') goto yy212;
-				goto yy194;
+				if (yych == '\\') goto yy195;
+				goto yy189;
 			}
 		}
-yy196:
-		YYDEBUG(196, *YYCURSOR);
+yy191:
+		YYDEBUG(191, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(197, *YYCURSOR);
-		if (yybm[0+yych] & 64) {
-			goto yy196;
+		if (yybm[0+yych] & 128) {
+			goto yy197;
 		}
-		if (yych <= '\n') goto yy182;
-		if (yych <= '"') goto yy188;
-		if (yych <= '\'') goto yy194;
-yy198:
-		YYDEBUG(198, *YYCURSOR);
+		if (yych <= '\n') goto yy171;
+		if (yych <= '"') goto yy189;
+		if (yych <= '\'') goto yy177;
+		goto yy199;
+yy192:
+		YYDEBUG(192, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(199, *YYCURSOR);
-		if (yybm[0+yych] & 64) {
-			goto yy196;
+		YYDEBUG(193, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= 0x00) goto yy169;
+			if (yych == '\n') goto yy169;
+			goto yy187;
+		} else {
+			if (yych <= '\'') goto yy201;
+			if (yych == '\\') goto yy192;
+			goto yy187;
+		}
+yy194:
+		YYDEBUG(194, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy197;
+		}
+		if (yych <= '\n') goto yy171;
+		if (yych <= '"') goto yy181;
+		if (yych <= '\'') goto yy187;
+		goto yy199;
+yy195:
+		YYDEBUG(195, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(196, *YYCURSOR);
+		if (yych <= '!') {
+			if (yych <= 0x00) goto yy169;
+			if (yych == '\n') goto yy169;
+			goto yy189;
+		} else {
+			if (yych <= '"') goto yy202;
+			if (yych == '\\') goto yy195;
+			goto yy189;
+		}
+yy197:
+		YYDEBUG(197, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(198, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy197;
 		}
-		if (yych <= '\n') goto yy182;
-		if (yych >= '(') goto yy198;
-yy200:
+		if (yych <= '\n') goto yy171;
+		if (yych <= '"') goto yy189;
+		if (yych <= '\'') goto yy187;
+yy199:
+		YYDEBUG(199, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		YYDEBUG(200, *YYCURSOR);
-		yyaccept = 0;
+		if (yybm[0+yych] & 128) {
+			goto yy197;
+		}
+		if (yych <= '\n') goto yy171;
+		if (yych <= '\'') goto yy203;
+		goto yy199;
+yy201:
+		YYDEBUG(201, *YYCURSOR);
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(201, *YYCURSOR);
 		if (yych <= '"') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy172;
-				goto yy200;
-			} else {
-				if (yych <= '\n') goto yy172;
-				if (yych <= '!') goto yy200;
+				if (yych <= 0x00) goto yy169;
 				goto yy203;
+			} else {
+				if (yych <= '\n') goto yy169;
+				if (yych <= '!') goto yy203;
 			}
 		} else {
 			if (yych <= '\'') {
-				if (yych <= '#') goto yy196;
-				if (yych <= '&') goto yy200;
+				if (yych <= '#') goto yy197;
+				if (yych <= '&') goto yy203;
+				goto yy191;
 			} else {
-				if (yych == '\\') goto yy204;
-				goto yy200;
+				if (yych == '\\') goto yy205;
+				goto yy203;
 			}
 		}
 yy202:
 		YYDEBUG(202, *YYCURSOR);
-		yyaccept = 0;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yych <= '"') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy172;
-				goto yy200;
+				if (yych <= 0x00) goto yy169;
 			} else {
-				if (yych <= '\n') goto yy172;
-				if (yych <= '!') goto yy200;
+				if (yych <= '\n') goto yy169;
+				if (yych >= '"') goto yy194;
 			}
 		} else {
 			if (yych <= '\'') {
-				if (yych <= '#') goto yy196;
-				if (yych <= '&') goto yy200;
-				goto yy206;
+				if (yych <= '#') goto yy197;
+				if (yych >= '\'') goto yy201;
 			} else {
-				if (yych == '\\') goto yy204;
-				goto yy200;
+				if (yych == '\\') goto yy205;
 			}
 		}
 yy203:
 		YYDEBUG(203, *YYCURSOR);
-		yyaccept = 0;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych <= '"') {
-			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy172;
-				goto yy200;
-			} else {
-				if (yych <= '\n') goto yy172;
-				if (yych <= '!') goto yy200;
-				goto yy192;
-			}
-		} else {
-			if (yych <= '\'') {
-				if (yych <= '#') goto yy196;
-				if (yych <= '&') goto yy200;
-				goto yy202;
-			} else {
-				if (yych != '\\') goto yy200;
-			}
-		}
-yy204:
 		YYDEBUG(204, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		YYDEBUG(205, *YYCURSOR);
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy172;
-			if (yych <= '\t') goto yy200;
-			goto yy172;
-		} else {
-			if (yych == '\\') goto yy204;
-			goto yy200;
-		}
-yy206:
-		YYDEBUG(206, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		if (yybm[0+yych] & 64) {
-			goto yy196;
-		}
-		if (yych <= '\n') goto yy182;
-		if (yych <= '"') goto yy188;
-		if (yych >= '(') goto yy198;
-yy207:
-		YYDEBUG(207, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		YYDEBUG(208, *YYCURSOR);
-		if (yybm[0+yych] & 128) {
-			goto yy207;
-		}
-		if (yych <= '\n') goto yy182;
-		if (yych <= '"') goto yy177;
-yy209:
-		YYDEBUG(209, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		YYDEBUG(210, *YYCURSOR);
-		if (yybm[0+yych] & 128) {
-			goto yy207;
-		}
-		if (yych <= '\n') goto yy182;
-		if (yych <= '"') goto yy194;
-		goto yy209;
-yy211:
-		YYDEBUG(211, *YYCURSOR);
-		yyaccept = 0;
-		YYMARKER = ++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
 		if (yych <= '"') {
 			if (yych <= '\t') {
-				if (yych <= 0x00) goto yy172;
-				goto yy194;
+				if (yych <= 0x00) goto yy169;
+				goto yy203;
 			} else {
-				if (yych <= '\n') goto yy172;
-				if (yych <= '!') goto yy194;
-				goto yy181;
+				if (yych <= '\n') goto yy169;
+				if (yych <= '!') goto yy203;
+				goto yy202;
 			}
 		} else {
 			if (yych <= '\'') {
-				if (yych <= '#') goto yy207;
-				if (yych <= '&') goto yy194;
-				goto yy206;
+				if (yych <= '#') goto yy197;
+				if (yych <= '&') goto yy203;
+				goto yy201;
 			} else {
-				if (yych != '\\') goto yy194;
+				if (yych != '\\') goto yy203;
 			}
 		}
-yy212:
-		YYDEBUG(212, *YYCURSOR);
+yy205:
+		YYDEBUG(205, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(213, *YYCURSOR);
-		if (yych <= '&') {
-			if (yych <= 0x00) goto yy172;
-			if (yych == '\n') goto yy172;
-			goto yy194;
+		YYDEBUG(206, *YYCURSOR);
+		if (yych <= '\n') {
+			if (yych <= 0x00) goto yy169;
+			if (yych <= '\t') goto yy203;
+			goto yy169;
 		} else {
-			if (yych <= '\'') goto yy202;
-			if (yych == '\\') goto yy212;
-			goto yy194;
+			if (yych == '\\') goto yy205;
+			goto yy203;
 		}
 	}
 }
-- 
cgit v1.2.1