Add # delimiter to phpdbg commands

1 files changed, 716 insertions, 654 deletions

diff --git a/sapi/phpdbg/phpdbg_lexer.c b/sapi/phpdbg/phpdbg_lexer.c
index 05b6cc9e8c..0b954252e3 100644
--- a/sapi/phpdbg/phpdbg_lexer.c
+++ b/sapi/phpdbg/phpdbg_lexer.c
@@ -103,222 +103,235 @@ yyc_INITIAL:
 		YYDEBUG(0, *YYCURSOR);
 		YYFILL(4);
 		yych = *YYCURSOR;
-		if (yych <= 'D') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy4;
-				if (yych <= 0x08) goto yy11;
-				if (yych >= '\n') goto yy5;
+		if (yych <= '#') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) {
+					if (yych <= 0x00) goto yy8;
+					goto yy13;
+				} else {
+					if (yych <= '\t') goto yy2;
+					if (yych <= '\n') goto yy8;
+					goto yy13;
+				}
 			} else {
-				if (yych <= '\r') {
-					if (yych <= '\f') goto yy11;
+				if (yych <= 0x1F) {
+					if (yych >= 0x0E) goto yy13;
 				} else {
-					if (yych != ' ') goto yy11;
+					if (yych <= ' ') goto yy4;
+					if (yych <= '"') goto yy13;
+					goto yy7;
 				}
 			}
 		} else {
-			if (yych <= 'd') {
-				if (yych <= 'Q') {
-					if (yych <= 'E') goto yy7;
-					goto yy11;
+			if (yych <= 'S') {
+				if (yych <= 'E') {
+					if (yych <= 'D') goto yy13;
+					goto yy9;
 				} else {
-					if (yych <= 'R') goto yy10;
-					if (yych <= 'S') goto yy8;
-					goto yy11;
+					if (yych <= 'Q') goto yy13;
+					if (yych <= 'R') goto yy12;
+					goto yy10;
 				}
 			} else {
 				if (yych <= 'q') {
-					if (yych <= 'e') goto yy7;
-					goto yy11;
+					if (yych == 'e') goto yy9;
+					goto yy13;
 				} else {
-					if (yych <= 'r') goto yy9;
-					if (yych <= 's') goto yy8;
-					goto yy11;
+					if (yych <= 'r') goto yy11;
+					if (yych <= 's') goto yy10;
+					goto yy13;
 				}
 			}
 		}
+yy2:
 		YYDEBUG(2, *YYCURSOR);
 		++YYCURSOR;
-		if ((yych = *YYCURSOR) <= '\f') {
-			if (yych == '\t') goto yy26;
-		} else {
-			if (yych <= '\r') goto yy26;
-			if (yych == ' ') goto yy26;
+		if (yybm[0+(yych = *YYCURSOR)] & 128) {
+			goto yy4;
 		}
 yy3:
 		YYDEBUG(3, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 178 "sapi/phpdbg/phpdbg_lexer.l"
+#line 187 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	YYSETCONDITION(NORMAL);
 
 	YYCURSOR = LEX(text);
 	goto restart;
 }
-#line 158 "sapi/phpdbg/phpdbg_lexer.c"
+#line 163 "sapi/phpdbg/phpdbg_lexer.c"
 yy4:
 		YYDEBUG(4, *YYCURSOR);
-		yych = *++YYCURSOR;
-		goto yy3;
-yy5:
-		YYDEBUG(5, *YYCURSOR);
 		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(5, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy4;
+		}
 		YYDEBUG(6, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 70 "sapi/phpdbg/phpdbg_lexer.l"
+#line 156 "sapi/phpdbg/phpdbg_lexer.l"
 		{
-	return 0;
+	/* ignore whitespace */
+
+	goto restart;
 }
-#line 172 "sapi/phpdbg/phpdbg_lexer.c"
+#line 181 "sapi/phpdbg/phpdbg_lexer.c"
 yy7:
 		YYDEBUG(7, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'V') goto yy22;
-		if (yych == 'v') goto yy22;
+		yych = *++YYCURSOR;
 		goto yy3;
 yy8:
 		YYDEBUG(8, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'H') goto yy18;
-		if (yych == 'h') goto yy18;
+		yych = *++YYCURSOR;
 		goto yy3;
 yy9:
 		YYDEBUG(9, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yybm[0+yych] & 128) {
-			goto yy15;
-		}
-		if (yych == 'U') goto yy12;
-		if (yych == 'u') goto yy12;
+		if (yych == 'V') goto yy24;
+		if (yych == 'v') goto yy24;
 		goto yy3;
 yy10:
 		YYDEBUG(10, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'U') goto yy12;
-		if (yych == 'u') goto yy12;
+		if (yych == 'H') goto yy20;
+		if (yych == 'h') goto yy20;
 		goto yy3;
 yy11:
 		YYDEBUG(11, *YYCURSOR);
-		yych = *++YYCURSOR;
-		goto yy3;
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych <= '\t') {
+				if (yych <= 0x08) goto yy3;
+				goto yy17;
+			} else {
+				if (yych == '\r') goto yy17;
+				goto yy3;
+			}
+		} else {
+			if (yych <= 'U') {
+				if (yych <= ' ') goto yy17;
+				if (yych <= 'T') goto yy3;
+				goto yy14;
+			} else {
+				if (yych == 'u') goto yy14;
+				goto yy3;
+			}
+		}
 yy12:
 		YYDEBUG(12, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == 'N') goto yy14;
-		if (yych == 'n') goto yy14;
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy14;
+		if (yych == 'u') goto yy14;
+		goto yy3;
 yy13:
 		YYDEBUG(13, *YYCURSOR);
-		YYCURSOR = YYMARKER;
+		yych = *++YYCURSOR;
 		goto yy3;
 yy14:
 		YYDEBUG(14, *YYCURSOR);
 		yych = *++YYCURSOR;
-		if (yybm[0+yych] & 128) {
-			goto yy15;
-		}
-		goto yy13;
+		if (yych == 'N') goto yy16;
+		if (yych == 'n') goto yy16;
 yy15:
 		YYDEBUG(15, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy3;
+yy16:
+		YYDEBUG(16, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych != '\t') goto yy15;
+		} else {
+			if (yych <= '\r') goto yy17;
+			if (yych != ' ') goto yy15;
+		}
+yy17:
+		YYDEBUG(17, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(16, *YYCURSOR);
-		if (yybm[0+yych] & 128) {
-			goto yy15;
+		YYDEBUG(18, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy17;
+		} else {
+			if (yych <= '\r') goto yy17;
+			if (yych == ' ') goto yy17;
 		}
-		YYDEBUG(17, *YYCURSOR);
+		YYDEBUG(19, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 165 "sapi/phpdbg/phpdbg_lexer.l"
+#line 174 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_RUN;
 }
-#line 241 "sapi/phpdbg/phpdbg_lexer.c"
-yy18:
-		YYDEBUG(18, *YYCURSOR);
+#line 275 "sapi/phpdbg/phpdbg_lexer.c"
+yy20:
+		YYDEBUG(20, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\f') {
-			if (yych != '\t') goto yy13;
+			if (yych != '\t') goto yy15;
 		} else {
-			if (yych <= '\r') goto yy19;
-			if (yych != ' ') goto yy13;
+			if (yych <= '\r') goto yy21;
+			if (yych != ' ') goto yy15;
 		}
-yy19:
-		YYDEBUG(19, *YYCURSOR);
+yy21:
+		YYDEBUG(21, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(20, *YYCURSOR);
+		YYDEBUG(22, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy19;
+			if (yych == '\t') goto yy21;
 		} else {
-			if (yych <= '\r') goto yy19;
-			if (yych == ' ') goto yy19;
+			if (yych <= '\r') goto yy21;
+			if (yych == ' ') goto yy21;
 		}
-		YYDEBUG(21, *YYCURSOR);
+		YYDEBUG(23, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 160 "sapi/phpdbg/phpdbg_lexer.l"
+#line 168 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_SHELL;
 }
-#line 271 "sapi/phpdbg/phpdbg_lexer.c"
-yy22:
-		YYDEBUG(22, *YYCURSOR);
+#line 305 "sapi/phpdbg/phpdbg_lexer.c"
+yy24:
+		YYDEBUG(24, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yych <= '\f') {
-			if (yych != '\t') goto yy13;
+			if (yych != '\t') goto yy15;
 		} else {
-			if (yych <= '\r') goto yy23;
-			if (yych != ' ') goto yy13;
+			if (yych <= '\r') goto yy25;
+			if (yych != ' ') goto yy15;
 		}
-yy23:
-		YYDEBUG(23, *YYCURSOR);
+yy25:
+		YYDEBUG(25, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(24, *YYCURSOR);
+		YYDEBUG(26, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy23;
+			if (yych == '\t') goto yy25;
 		} else {
-			if (yych <= '\r') goto yy23;
-			if (yych == ' ') goto yy23;
+			if (yych <= '\r') goto yy25;
+			if (yych == ' ') goto yy25;
 		}
-		YYDEBUG(25, *YYCURSOR);
+		YYDEBUG(27, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 155 "sapi/phpdbg/phpdbg_lexer.l"
+#line 162 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_EVAL;
 }
-#line 301 "sapi/phpdbg/phpdbg_lexer.c"
-yy26:
-		YYDEBUG(26, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		YYDEBUG(27, *YYCURSOR);
-		if (yych <= '\f') {
-			if (yych == '\t') goto yy26;
-		} else {
-			if (yych <= '\r') goto yy26;
-			if (yych == ' ') goto yy26;
-		}
-		YYDEBUG(28, *YYCURSOR);
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 149 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	/* ignore whitespace */
-
-	goto restart;
-}
-#line 322 "sapi/phpdbg/phpdbg_lexer.c"
+#line 335 "sapi/phpdbg/phpdbg_lexer.c"
 	}
 /* *********************************** */
 yyc_NORMAL:
@@ -357,51 +370,51 @@ yyc_NORMAL:
 			 16,  16,  16,  16,  16,  16,  16,  16, 
 			 16,  16,  16,  16,  16,  16,  16,  16, 
 		};
-		YYDEBUG(29, *YYCURSOR);
+		YYDEBUG(28, *YYCURSOR);
 		YYFILL(11);
 		yych = *YYCURSOR;
 		if (yybm[0+yych] & 8) {
-			goto yy31;
+			goto yy30;
 		}
 		if (yych <= 'N') {
 			if (yych <= '0') {
 				if (yych <= '#') {
 					if (yych <= '\t') {
-						if (yych <= 0x00) goto yy34;
-						goto yy42;
+						if (yych <= 0x00) goto yy35;
+						goto yy41;
 					} else {
-						if (yych <= '\n') goto yy34;
-						if (yych <= '"') goto yy42;
-						goto yy39;
+						if (yych <= '\n') goto yy35;
+						if (yych <= '"') goto yy41;
+						goto yy33;
 					}
 				} else {
 					if (yych <= '-') {
-						if (yych <= ',') goto yy42;
-						goto yy36;
+						if (yych <= ',') goto yy41;
+						goto yy37;
 					} else {
-						if (yych <= '.') goto yy44;
-						if (yych <= '/') goto yy42;
-						goto yy47;
+						if (yych <= '.') goto yy43;
+						if (yych <= '/') goto yy41;
+						goto yy46;
 					}
 				}
 			} else {
 				if (yych <= 'E') {
 					if (yych <= ':') {
-						if (yych <= '9') goto yy44;
-						goto yy41;
+						if (yych <= '9') goto yy43;
+						goto yy40;
 					} else {
-						if (yych <= 'C') goto yy42;
-						if (yych <= 'D') goto yy48;
-						goto yy49;
+						if (yych <= 'C') goto yy41;
+						if (yych <= 'D') goto yy47;
+						goto yy48;
 					}
 				} else {
 					if (yych <= 'H') {
-						if (yych <= 'F') goto yy50;
-						goto yy42;
+						if (yych <= 'F') goto yy49;
+						goto yy41;
 					} else {
-						if (yych <= 'I') goto yy38;
-						if (yych <= 'M') goto yy42;
-						goto yy51;
+						if (yych <= 'I') goto yy39;
+						if (yych <= 'M') goto yy41;
+						goto yy50;
 					}
 				}
 			}
@@ -409,671 +422,687 @@ yyc_NORMAL:
 			if (yych <= 'f') {
 				if (yych <= 'Y') {
 					if (yych <= 'S') {
-						if (yych <= 'O') goto yy52;
-						goto yy42;
+						if (yych <= 'O') goto yy51;
+						goto yy41;
 					} else {
-						if (yych <= 'T') goto yy53;
-						if (yych <= 'X') goto yy42;
-						goto yy54;
+						if (yych <= 'T') goto yy52;
+						if (yych <= 'X') goto yy41;
+						goto yy53;
 					}
 				} else {
 					if (yych <= 'c') {
-						if (yych <= 'Z') goto yy55;
-						goto yy42;
+						if (yych <= 'Z') goto yy54;
+						goto yy41;
 					} else {
-						if (yych <= 'd') goto yy48;
-						if (yych <= 'e') goto yy49;
-						goto yy50;
+						if (yych <= 'd') goto yy47;
+						if (yych <= 'e') goto yy48;
+						goto yy49;
 					}
 				}
 			} else {
 				if (yych <= 'o') {
 					if (yych <= 'i') {
-						if (yych <= 'h') goto yy42;
-						goto yy38;
+						if (yych <= 'h') goto yy41;
+						goto yy39;
 					} else {
-						if (yych <= 'm') goto yy42;
-						if (yych <= 'n') goto yy51;
-						goto yy52;
+						if (yych <= 'm') goto yy41;
+						if (yych <= 'n') goto yy50;
+						goto yy51;
 					}
 				} else {
 					if (yych <= 'x') {
-						if (yych == 't') goto yy53;
-						goto yy42;
+						if (yych == 't') goto yy52;
+						goto yy41;
 					} else {
-						if (yych <= 'y') goto yy54;
-						if (yych <= 'z') goto yy56;
-						goto yy42;
+						if (yych <= 'y') goto yy53;
+						if (yych <= 'z') goto yy55;
+						goto yy41;
 					}
 				}
 			}
 		}
-yy31:
-		YYDEBUG(31, *YYCURSOR);
+yy30:
+		YYDEBUG(30, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(32, *YYCURSOR);
+		YYDEBUG(31, *YYCURSOR);
 		if (yybm[0+yych] & 8) {
-			goto yy31;
+			goto yy30;
 		}
-		YYDEBUG(33, *YYCURSOR);
+		YYDEBUG(32, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 149 "sapi/phpdbg/phpdbg_lexer.l"
+#line 156 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	/* ignore whitespace */
 
 	goto restart;
 }
-#line 469 "sapi/phpdbg/phpdbg_lexer.c"
+#line 482 "sapi/phpdbg/phpdbg_lexer.c"
+yy33:
+		YYDEBUG(33, *YYCURSOR);
+		YYCTXMARKER = YYCURSOR + 1;
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '.') {
+			if (yych <= ',') goto yy34;
+			if (yych <= '-') goto yy122;
+			goto yy123;
+		} else {
+			if (yych <= '/') goto yy34;
+			if (yych <= '9') goto yy123;
+		}
 yy34:
 		YYDEBUG(34, *YYCURSOR);
-		++YYCURSOR;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 91 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	YYSETCONDITION(INITIAL);
+	return T_SEPARATOR;
+}
+#line 504 "sapi/phpdbg/phpdbg_lexer.c"
+yy35:
 		YYDEBUG(35, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(36, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 70 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	return 0;
 }
-#line 479 "sapi/phpdbg/phpdbg_lexer.c"
-yy36:
-		YYDEBUG(36, *YYCURSOR);
-		yyaccept = 0;
+#line 514 "sapi/phpdbg/phpdbg_lexer.c"
+yy37:
+		YYDEBUG(37, *YYCURSOR);
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm[0+yych] & 32) {
-			goto yy44;
+			goto yy43;
 		}
-		if (yych == 'r') goto yy113;
-		goto yy43;
-yy37:
-		YYDEBUG(37, *YYCURSOR);
+		if (yych == 'r') goto yy112;
+		goto yy42;
+yy38:
+		YYDEBUG(38, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 135 "sapi/phpdbg/phpdbg_lexer.l"
+#line 142 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	phpdbg_init_param(yylval, STR_PARAM);
 	yylval->str = estrndup(yytext, yyleng);
 	yylval->len = yyleng;
 	return T_ID;
 }
-#line 499 "sapi/phpdbg/phpdbg_lexer.c"
-yy38:
-		YYDEBUG(38, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'F') goto yy109;
-		if (yych == 'f') goto yy109;
-		goto yy43;
+#line 534 "sapi/phpdbg/phpdbg_lexer.c"
 yy39:
 		YYDEBUG(39, *YYCURSOR);
-		++YYCURSOR;
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy108;
+		if (yych == 'f') goto yy108;
+		goto yy42;
+yy40:
 		YYDEBUG(40, *YYCURSOR);
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 87 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	return T_POUND;
-}
-#line 516 "sapi/phpdbg/phpdbg_lexer.c"
-yy41:
-		YYDEBUG(41, *YYCURSOR);
 		YYCTXMARKER = YYCURSOR + 1;
 		yych = *++YYCURSOR;
-		if (yych == ':') goto yy107;
-		if (yych == '\\') goto yy61;
-		goto yy105;
-yy42:
-		YYDEBUG(42, *YYCURSOR);
-		yyaccept = 0;
+		if (yych == ':') goto yy106;
+		if (yych == '\\') goto yy60;
+		goto yy104;
+yy41:
+		YYDEBUG(41, *YYCURSOR);
+		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-yy43:
-		YYDEBUG(43, *YYCURSOR);
+yy42:
+		YYDEBUG(42, *YYCURSOR);
 		if (yybm[0+yych] & 16) {
-			goto yy42;
+			goto yy41;
 		}
-		if (yych <= '9') goto yy37;
-		goto yy58;
-yy44:
-		YYDEBUG(44, *YYCURSOR);
-		yyaccept = 1;
+		if (yych <= '9') goto yy38;
+		goto yy57;
+yy43:
+		YYDEBUG(43, *YYCURSOR);
+		yyaccept = 2;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(45, *YYCURSOR);
+		YYDEBUG(44, *YYCURSOR);
 		if (yybm[0+yych] & 32) {
-			goto yy44;
+			goto yy43;
 		}
 		if (yych <= 0x1F) {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy46;
-				if (yych <= 0x08) goto yy42;
+				if (yych <= 0x00) goto yy45;
+				if (yych <= 0x08) goto yy41;
 			} else {
-				if (yych != '\r') goto yy42;
+				if (yych != '\r') goto yy41;
 			}
 		} else {
 			if (yych <= '#') {
-				if (yych <= ' ') goto yy46;
-				if (yych <= '"') goto yy42;
+				if (yych <= ' ') goto yy45;
+				if (yych <= '"') goto yy41;
 			} else {
-				if (yych == ':') goto yy58;
-				goto yy42;
+				if (yych == ':') goto yy57;
+				goto yy41;
 			}
 		}
-yy46:
-		YYDEBUG(46, *YYCURSOR);
+yy45:
+		YYDEBUG(45, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 116 "sapi/phpdbg/phpdbg_lexer.l"
+#line 123 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	phpdbg_init_param(yylval, NUMERIC_PARAM);
 	yylval->num = atoi(yytext);
 	return T_DIGITS;
 }
-#line 572 "sapi/phpdbg/phpdbg_lexer.c"
-yy47:
-		YYDEBUG(47, *YYCURSOR);
-		yyaccept = 1;
+#line 597 "sapi/phpdbg/phpdbg_lexer.c"
+yy46:
+		YYDEBUG(46, *YYCURSOR);
+		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm[0+yych] & 32) {
-			goto yy44;
+			goto yy43;
 		}
 		if (yych <= 0x1F) {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy46;
-				if (yych <= 0x08) goto yy43;
-				goto yy46;
+				if (yych <= 0x00) goto yy45;
+				if (yych <= 0x08) goto yy42;
+				goto yy45;
 			} else {
-				if (yych == '\r') goto yy46;
-				goto yy43;
+				if (yych == '\r') goto yy45;
+				goto yy42;
 			}
 		} else {
 			if (yych <= '#') {
-				if (yych <= ' ') goto yy46;
-				if (yych <= '"') goto yy43;
-				goto yy46;
+				if (yych <= ' ') goto yy45;
+				if (yych <= '"') goto yy42;
+				goto yy45;
 			} else {
-				if (yych == 'x') goto yy101;
-				goto yy43;
+				if (yych == 'x') goto yy100;
+				goto yy42;
 			}
 		}
+yy47:
+		YYDEBUG(47, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy94;
+		if (yych == 'i') goto yy94;
+		goto yy42;
 yy48:
 		YYDEBUG(48, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'I') goto yy95;
-		if (yych == 'i') goto yy95;
-		goto yy43;
+		if (yych == 'N') goto yy89;
+		if (yych == 'n') goto yy89;
+		goto yy42;
 yy49:
 		YYDEBUG(49, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'N') goto yy90;
-		if (yych == 'n') goto yy90;
-		goto yy43;
+		if (yych == 'A') goto yy86;
+		if (yych == 'a') goto yy86;
+		goto yy42;
 yy50:
 		YYDEBUG(50, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy87;
-		if (yych == 'a') goto yy87;
-		goto yy43;
+		if (yych == 'O') goto yy82;
+		if (yych == 'o') goto yy82;
+		goto yy42;
 yy51:
 		YYDEBUG(51, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'O') goto yy83;
-		if (yych == 'o') goto yy83;
-		goto yy43;
-yy52:
-		YYDEBUG(52, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'N') {
-			if (yych == 'F') goto yy82;
-			if (yych <= 'M') goto yy43;
-			goto yy76;
+			if (yych == 'F') goto yy81;
+			if (yych <= 'M') goto yy42;
+			goto yy75;
 		} else {
 			if (yych <= 'f') {
-				if (yych <= 'e') goto yy43;
-				goto yy82;
+				if (yych <= 'e') goto yy42;
+				goto yy81;
 			} else {
-				if (yych == 'n') goto yy76;
-				goto yy43;
+				if (yych == 'n') goto yy75;
+				goto yy42;
 			}
 		}
+yy52:
+		YYDEBUG(52, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy79;
+		if (yych == 'r') goto yy79;
+		goto yy42;
 yy53:
 		YYDEBUG(53, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'R') goto yy80;
-		if (yych == 'r') goto yy80;
-		goto yy43;
+		if (yych == 'E') goto yy74;
+		if (yych == 'e') goto yy74;
+		goto yy42;
 yy54:
 		YYDEBUG(54, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy75;
-		if (yych == 'e') goto yy75;
-		goto yy43;
+		if (yych == 'E') goto yy71;
+		goto yy42;
 yy55:
 		YYDEBUG(55, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy72;
-		goto yy43;
-yy56:
+		if (yych != 'e') goto yy42;
 		YYDEBUG(56, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych != 'e') goto yy43;
+		if (yych == 'n') goto yy65;
+		goto yy42;
+yy57:
 		YYDEBUG(57, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'n') goto yy66;
-		goto yy43;
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy59;
+		if (yych == '\\') goto yy60;
 yy58:
 		YYDEBUG(58, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '/') goto yy60;
-		if (yych == '\\') goto yy61;
-yy59:
-		YYDEBUG(59, *YYCURSOR);
 		YYCURSOR = YYMARKER;
 		if (yyaccept <= 2) {
 			if (yyaccept <= 1) {
 				if (yyaccept <= 0) {
-					goto yy37;
+					goto yy34;
 				} else {
-					goto yy46;
+					goto yy38;
 				}
 			} else {
-				goto yy71;
+				goto yy45;
 			}
 		} else {
-			if (yyaccept <= 3) {
-				goto yy104;
+			if (yyaccept <= 4) {
+				if (yyaccept <= 3) {
+					goto yy70;
+				} else {
+					goto yy103;
+				}
 			} else {
-				goto yy119;
+				goto yy118;
 			}
 		}
+yy59:
+		YYDEBUG(59, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy63;
+		goto yy58;
 yy60:
 		YYDEBUG(60, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '/') goto yy64;
-		goto yy59;
-yy61:
-		YYDEBUG(61, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(62, *YYCURSOR);
+		YYDEBUG(61, *YYCURSOR);
 		if (yych <= 0x1F) {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy37;
-				if (yych <= 0x08) goto yy61;
-				goto yy37;
+				if (yych <= 0x00) goto yy38;
+				if (yych <= 0x08) goto yy60;
+				goto yy38;
 			} else {
-				if (yych == '\r') goto yy37;
-				goto yy61;
+				if (yych == '\r') goto yy38;
+				goto yy60;
 			}
 		} else {
 			if (yych <= '#') {
-				if (yych <= ' ') goto yy37;
-				if (yych <= '"') goto yy61;
-				goto yy37;
+				if (yych <= ' ') goto yy38;
+				if (yych <= '"') goto yy60;
+				goto yy38;
 			} else {
-				if (yych != ':') goto yy61;
+				if (yych != ':') goto yy60;
 			}
 		}
-		YYDEBUG(63, *YYCURSOR);
+		YYDEBUG(62, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych == '\\') goto yy61;
-		goto yy59;
-yy64:
-		YYDEBUG(64, *YYCURSOR);
+		if (yych == '\\') goto yy60;
+		goto yy58;
+yy63:
+		YYDEBUG(63, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(65, *YYCURSOR);
+		YYDEBUG(64, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 97 "sapi/phpdbg/phpdbg_lexer.l"
+#line 104 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	phpdbg_init_param(yylval, STR_PARAM);
 	yylval->str = estrndup(yytext, yyleng);
 	yylval->len = yyleng;
 	return T_PROTO;
 }
-#line 747 "sapi/phpdbg/phpdbg_lexer.c"
-yy66:
+#line 776 "sapi/phpdbg/phpdbg_lexer.c"
+yy65:
+		YYDEBUG(65, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych != 'd') goto yy42;
 		YYDEBUG(66, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych != 'd') goto yy43;
+		if (yych != '_') goto yy42;
+yy67:
 		YYDEBUG(67, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych != '_') goto yy43;
-yy68:
-		YYDEBUG(68, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm[0+yych] & 64) {
-			goto yy69;
+			goto yy68;
 		}
-		goto yy43;
-yy69:
-		YYDEBUG(69, *YYCURSOR);
-		yyaccept = 2;
+		goto yy42;
+yy68:
+		YYDEBUG(68, *YYCURSOR);
+		yyaccept = 3;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(70, *YYCURSOR);
+		YYDEBUG(69, *YYCURSOR);
 		if (yybm[0+yych] & 64) {
-			goto yy69;
+			goto yy68;
 		}
 		if (yych <= 0x1F) {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy71;
-				if (yych <= 0x08) goto yy42;
+				if (yych <= 0x00) goto yy70;
+				if (yych <= 0x08) goto yy41;
 			} else {
-				if (yych != '\r') goto yy42;
+				if (yych != '\r') goto yy41;
 			}
 		} else {
 			if (yych <= '#') {
-				if (yych <= ' ') goto yy71;
-				if (yych <= '"') goto yy42;
+				if (yych <= ' ') goto yy70;
+				if (yych <= '"') goto yy41;
 			} else {
-				if (yych == ':') goto yy58;
-				goto yy42;
+				if (yych == ':') goto yy57;
+				goto yy41;
 			}
 		}
-yy71:
-		YYDEBUG(71, *YYCURSOR);
+yy70:
+		YYDEBUG(70, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 128 "sapi/phpdbg/phpdbg_lexer.l"
+#line 135 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	phpdbg_init_param(yylval, OP_PARAM);
 	yylval->str = estrndup(yytext, yyleng);
 	yylval->len = yyleng;
 	return T_OPCODE;
 }
-#line 801 "sapi/phpdbg/phpdbg_lexer.c"
-yy72:
+#line 830 "sapi/phpdbg/phpdbg_lexer.c"
+yy71:
+		YYDEBUG(71, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych != 'N') goto yy42;
 		YYDEBUG(72, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych != 'N') goto yy43;
+		if (yych != 'D') goto yy42;
 		YYDEBUG(73, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych != 'D') goto yy43;
+		if (yych == '_') goto yy67;
+		goto yy42;
+yy74:
 		YYDEBUG(74, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '_') goto yy68;
-		goto yy43;
+		if (yych == 'S') goto yy75;
+		if (yych != 's') goto yy42;
 yy75:
 		YYDEBUG(75, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy76;
-		if (yych != 's') goto yy43;
-yy76:
-		YYDEBUG(76, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\f') {
-			if (yych != '\t') goto yy43;
+			if (yych != '\t') goto yy42;
 		} else {
-			if (yych <= '\r') goto yy77;
-			if (yych != ' ') goto yy43;
+			if (yych <= '\r') goto yy76;
+			if (yych != ' ') goto yy42;
 		}
-yy77:
-		YYDEBUG(77, *YYCURSOR);
+yy76:
+		YYDEBUG(76, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(78, *YYCURSOR);
+		YYDEBUG(77, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy77;
+			if (yych == '\t') goto yy76;
 		} else {
-			if (yych <= '\r') goto yy77;
-			if (yych == ' ') goto yy77;
+			if (yych <= '\r') goto yy76;
+			if (yych == ' ') goto yy76;
 		}
-		YYDEBUG(79, *YYCURSOR);
+		YYDEBUG(78, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 104 "sapi/phpdbg/phpdbg_lexer.l"
+#line 111 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	phpdbg_init_param(yylval, NUMERIC_PARAM);
 	yylval->num = 1;
 	return T_TRUTHY;
 }
-#line 852 "sapi/phpdbg/phpdbg_lexer.c"
+#line 881 "sapi/phpdbg/phpdbg_lexer.c"
+yy79:
+		YYDEBUG(79, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy80;
+		if (yych != 'u') goto yy42;
 yy80:
 		YYDEBUG(80, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'U') goto yy81;
-		if (yych != 'u') goto yy43;
+		if (yych == 'E') goto yy75;
+		if (yych == 'e') goto yy75;
+		goto yy42;
 yy81:
 		YYDEBUG(81, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy76;
-		if (yych == 'e') goto yy76;
-		goto yy43;
+		if (yych == 'F') goto yy82;
+		if (yych != 'f') goto yy42;
 yy82:
 		YYDEBUG(82, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'F') goto yy83;
-		if (yych != 'f') goto yy43;
-yy83:
-		YYDEBUG(83, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\f') {
-			if (yych != '\t') goto yy43;
+			if (yych != '\t') goto yy42;
 		} else {
-			if (yych <= '\r') goto yy84;
-			if (yych != ' ') goto yy43;
+			if (yych <= '\r') goto yy83;
+			if (yych != ' ') goto yy42;
 		}
-yy84:
-		YYDEBUG(84, *YYCURSOR);
+yy83:
+		YYDEBUG(83, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(85, *YYCURSOR);
+		YYDEBUG(84, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy84;
+			if (yych == '\t') goto yy83;
 		} else {
-			if (yych <= '\r') goto yy84;
-			if (yych == ' ') goto yy84;
+			if (yych <= '\r') goto yy83;
+			if (yych == ' ') goto yy83;
 		}
-		YYDEBUG(86, *YYCURSOR);
+		YYDEBUG(85, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 110 "sapi/phpdbg/phpdbg_lexer.l"
+#line 117 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	phpdbg_init_param(yylval, NUMERIC_PARAM);
 	yylval->num = 0;
 	return T_FALSY;
 }
-#line 902 "sapi/phpdbg/phpdbg_lexer.c"
+#line 931 "sapi/phpdbg/phpdbg_lexer.c"
+yy86:
+		YYDEBUG(86, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy87;
+		if (yych != 'l') goto yy42;
 yy87:
 		YYDEBUG(87, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy88;
-		if (yych != 'l') goto yy43;
+		if (yych == 'S') goto yy88;
+		if (yych != 's') goto yy42;
 yy88:
 		YYDEBUG(88, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy89;
-		if (yych != 's') goto yy43;
+		if (yych == 'E') goto yy82;
+		if (yych == 'e') goto yy82;
+		goto yy42;
 yy89:
 		YYDEBUG(89, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy83;
-		if (yych == 'e') goto yy83;
-		goto yy43;
+		if (yych == 'A') goto yy90;
+		if (yych != 'a') goto yy42;
 yy90:
 		YYDEBUG(90, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy91;
-		if (yych != 'a') goto yy43;
+		if (yych == 'B') goto yy91;
+		if (yych != 'b') goto yy42;
 yy91:
 		YYDEBUG(91, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'B') goto yy92;
-		if (yych != 'b') goto yy43;
+		if (yych == 'L') goto yy92;
+		if (yych != 'l') goto yy42;
 yy92:
 		YYDEBUG(92, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy93;
-		if (yych != 'l') goto yy43;
+		if (yych == 'E') goto yy93;
+		if (yych != 'e') goto yy42;
 yy93:
 		YYDEBUG(93, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy94;
-		if (yych != 'e') goto yy43;
+		if (yych == 'D') goto yy75;
+		if (yych == 'd') goto yy75;
+		goto yy42;
 yy94:
 		YYDEBUG(94, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy76;
-		if (yych == 'd') goto yy76;
-		goto yy43;
+		if (yych == 'S') goto yy95;
+		if (yych != 's') goto yy42;
 yy95:
 		YYDEBUG(95, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'S') goto yy96;
-		if (yych != 's') goto yy43;
+		if (yych == 'A') goto yy96;
+		if (yych != 'a') goto yy42;
 yy96:
 		YYDEBUG(96, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'A') goto yy97;
-		if (yych != 'a') goto yy43;
+		if (yych == 'B') goto yy97;
+		if (yych != 'b') goto yy42;
 yy97:
 		YYDEBUG(97, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'B') goto yy98;
-		if (yych != 'b') goto yy43;
+		if (yych == 'L') goto yy98;
+		if (yych != 'l') goto yy42;
 yy98:
 		YYDEBUG(98, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'L') goto yy99;
-		if (yych != 'l') goto yy43;
+		if (yych == 'E') goto yy99;
+		if (yych != 'e') goto yy42;
 yy99:
 		YYDEBUG(99, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'E') goto yy100;
-		if (yych != 'e') goto yy43;
+		if (yych == 'D') goto yy82;
+		if (yych == 'd') goto yy82;
+		goto yy42;
 yy100:
 		YYDEBUG(100, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'D') goto yy83;
-		if (yych == 'd') goto yy83;
-		goto yy43;
-yy101:
-		YYDEBUG(101, *YYCURSOR);
-		yyaccept = 0;
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yybm[0+yych] & 128) {
-			goto yy102;
+			goto yy101;
 		}
-		goto yy43;
-yy102:
-		YYDEBUG(102, *YYCURSOR);
-		yyaccept = 3;
+		goto yy42;
+yy101:
+		YYDEBUG(101, *YYCURSOR);
+		yyaccept = 4;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(103, *YYCURSOR);
+		YYDEBUG(102, *YYCURSOR);
 		if (yybm[0+yych] & 128) {
-			goto yy102;
+			goto yy101;
 		}
 		if (yych <= 0x1F) {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy104;
-				if (yych <= 0x08) goto yy42;
+				if (yych <= 0x00) goto yy103;
+				if (yych <= 0x08) goto yy41;
 			} else {
-				if (yych != '\r') goto yy42;
+				if (yych != '\r') goto yy41;
 			}
 		} else {
 			if (yych <= '#') {
-				if (yych <= ' ') goto yy104;
-				if (yych <= '"') goto yy42;
+				if (yych <= ' ') goto yy103;
+				if (yych <= '"') goto yy41;
 			} else {
-				if (yych == ':') goto yy58;
-				goto yy42;
+				if (yych == ':') goto yy57;
+				goto yy41;
 			}
 		}
-yy104:
-		YYDEBUG(104, *YYCURSOR);
+yy103:
+		YYDEBUG(103, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 122 "sapi/phpdbg/phpdbg_lexer.l"
+#line 129 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	phpdbg_init_param(yylval, ADDR_PARAM);
 	yylval->addr = strtoul(yytext, 0, 16);
 	return T_ADDR;
 }
-#line 1033 "sapi/phpdbg/phpdbg_lexer.c"
-yy105:
-		YYDEBUG(105, *YYCURSOR);
+#line 1062 "sapi/phpdbg/phpdbg_lexer.c"
+yy104:
+		YYDEBUG(104, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(106, *YYCURSOR);
+		YYDEBUG(105, *YYCURSOR);
 		YYCURSOR = YYCTXMARKER;
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 93 "sapi/phpdbg/phpdbg_lexer.l"
+#line 100 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	return T_COLON;
 }
-#line 1044 "sapi/phpdbg/phpdbg_lexer.c"
-yy107:
-		YYDEBUG(107, *YYCURSOR);
+#line 1073 "sapi/phpdbg/phpdbg_lexer.c"
+yy106:
+		YYDEBUG(106, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(108, *YYCURSOR);
+		YYDEBUG(107, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 90 "sapi/phpdbg/phpdbg_lexer.l"
+#line 96 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	return T_DCOLON;
 }
-#line 1054 "sapi/phpdbg/phpdbg_lexer.c"
-yy109:
-		YYDEBUG(109, *YYCURSOR);
-		yyaccept = 0;
+#line 1083 "sapi/phpdbg/phpdbg_lexer.c"
+yy108:
+		YYDEBUG(108, *YYCURSOR);
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= '\f') {
-			if (yych != '\t') goto yy43;
+			if (yych != '\t') goto yy42;
 		} else {
-			if (yych <= '\r') goto yy110;
-			if (yych != ' ') goto yy43;
+			if (yych <= '\r') goto yy109;
+			if (yych != ' ') goto yy42;
 		}
-yy110:
-		YYDEBUG(110, *YYCURSOR);
+yy109:
+		YYDEBUG(109, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(111, *YYCURSOR);
+		YYDEBUG(110, *YYCURSOR);
 		if (yych <= '\f') {
-			if (yych == '\t') goto yy110;
+			if (yych == '\t') goto yy109;
 		} else {
-			if (yych <= '\r') goto yy110;
-			if (yych == ' ') goto yy110;
+			if (yych <= '\r') goto yy109;
+			if (yych == ' ') goto yy109;
 		}
-		YYDEBUG(112, *YYCURSOR);
+		YYDEBUG(111, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 81 "sapi/phpdbg/phpdbg_lexer.l"
 		{
@@ -1081,91 +1110,91 @@ yy110:
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_IF;
 }
-#line 1085 "sapi/phpdbg/phpdbg_lexer.c"
-yy113:
-		YYDEBUG(113, *YYCURSOR);
-		yyaccept = 0;
+#line 1114 "sapi/phpdbg/phpdbg_lexer.c"
+yy112:
+		YYDEBUG(112, *YYCURSOR);
+		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= ' ') {
 			if (yych <= '\f') {
-				if (yych != '\t') goto yy43;
+				if (yych != '\t') goto yy42;
 			} else {
-				if (yych <= '\r') goto yy114;
-				if (yych <= 0x1F) goto yy43;
+				if (yych <= '\r') goto yy113;
+				if (yych <= 0x1F) goto yy42;
 			}
 		} else {
 			if (yych <= '.') {
-				if (yych <= ',') goto yy43;
-				if (yych <= '-') goto yy116;
-				goto yy117;
+				if (yych <= ',') goto yy42;
+				if (yych <= '-') goto yy115;
+				goto yy116;
 			} else {
-				if (yych <= '/') goto yy43;
-				if (yych <= '9') goto yy117;
-				goto yy43;
+				if (yych <= '/') goto yy42;
+				if (yych <= '9') goto yy116;
+				goto yy42;
 			}
 		}
-yy114:
-		YYDEBUG(114, *YYCURSOR);
+yy113:
+		YYDEBUG(113, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(115, *YYCURSOR);
+		YYDEBUG(114, *YYCURSOR);
 		if (yych <= ' ') {
 			if (yych <= '\f') {
-				if (yych == '\t') goto yy114;
-				goto yy59;
+				if (yych == '\t') goto yy113;
+				goto yy58;
 			} else {
-				if (yych <= '\r') goto yy114;
-				if (yych <= 0x1F) goto yy59;
-				goto yy114;
+				if (yych <= '\r') goto yy113;
+				if (yych <= 0x1F) goto yy58;
+				goto yy113;
 			}
 		} else {
 			if (yych <= '.') {
-				if (yych <= ',') goto yy59;
-				if (yych <= '-') goto yy120;
-				goto yy121;
+				if (yych <= ',') goto yy58;
+				if (yych <= '-') goto yy119;
+				goto yy120;
 			} else {
-				if (yych <= '/') goto yy59;
-				if (yych <= '9') goto yy121;
-				goto yy59;
+				if (yych <= '/') goto yy58;
+				if (yych <= '9') goto yy120;
+				goto yy58;
 			}
 		}
+yy115:
+		YYDEBUG(115, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '.') goto yy116;
+		if (yych <= '/') goto yy42;
+		if (yych >= ':') goto yy42;
 yy116:
 		YYDEBUG(116, *YYCURSOR);
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '.') goto yy117;
-		if (yych <= '/') goto yy43;
-		if (yych >= ':') goto yy43;
-yy117:
-		YYDEBUG(117, *YYCURSOR);
-		yyaccept = 4;
+		yyaccept = 5;
 		YYMARKER = ++YYCURSOR;
 		YYFILL(3);
 		yych = *YYCURSOR;
-		YYDEBUG(118, *YYCURSOR);
+		YYDEBUG(117, *YYCURSOR);
 		if (yych <= ' ') {
 			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy119;
-				if (yych <= 0x08) goto yy42;
+				if (yych <= 0x00) goto yy118;
+				if (yych <= 0x08) goto yy41;
 			} else {
-				if (yych == '\r') goto yy119;
-				if (yych <= 0x1F) goto yy42;
+				if (yych == '\r') goto yy118;
+				if (yych <= 0x1F) goto yy41;
 			}
 		} else {
 			if (yych <= '.') {
-				if (yych == '#') goto yy119;
-				if (yych <= '-') goto yy42;
-				goto yy117;
+				if (yych == '#') goto yy118;
+				if (yych <= '-') goto yy41;
+				goto yy116;
 			} else {
-				if (yych <= '/') goto yy42;
-				if (yych <= '9') goto yy117;
-				if (yych <= ':') goto yy58;
-				goto yy42;
+				if (yych <= '/') goto yy41;
+				if (yych <= '9') goto yy116;
+				if (yych <= ':') goto yy57;
+				goto yy41;
 			}
 		}
-yy119:
-		YYDEBUG(119, *YYCURSOR);
+yy118:
+		YYDEBUG(118, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 74 "sapi/phpdbg/phpdbg_lexer.l"
 		{
@@ -1174,23 +1203,47 @@ yy119:
 	yylval->num = atoi(text);
 	return T_REQ_ID;
 }
-#line 1178 "sapi/phpdbg/phpdbg_lexer.c"
+#line 1207 "sapi/phpdbg/phpdbg_lexer.c"
+yy119:
+		YYDEBUG(119, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy120;
+		if (yych <= '/') goto yy58;
+		if (yych >= ':') goto yy58;
 yy120:
 		YYDEBUG(120, *YYCURSOR);
-		yych = *++YYCURSOR;
-		if (yych == '.') goto yy121;
-		if (yych <= '/') goto yy59;
-		if (yych >= ':') goto yy59;
-yy121:
-		YYDEBUG(121, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
+		YYDEBUG(121, *YYCURSOR);
+		if (yych == '.') goto yy120;
+		if (yych <= '/') goto yy118;
+		if (yych <= '9') goto yy120;
+		goto yy118;
+yy122:
 		YYDEBUG(122, *YYCURSOR);
-		if (yych == '.') goto yy121;
-		if (yych <= '/') goto yy119;
-		if (yych <= '9') goto yy121;
-		goto yy119;
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy123;
+		if (yych <= '/') goto yy58;
+		if (yych >= ':') goto yy58;
+yy123:
+		YYDEBUG(123, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(124, *YYCURSOR);
+		if (yych == '.') goto yy123;
+		if (yych <= '/') goto yy125;
+		if (yych <= '9') goto yy123;
+yy125:
+		YYDEBUG(125, *YYCURSOR);
+		YYCURSOR = YYCTXMARKER;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 87 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	return T_POUND;
+}
+#line 1247 "sapi/phpdbg/phpdbg_lexer.c"
 	}
 /* *********************************** */
 yyc_PRE_RAW:
@@ -1229,109 +1282,119 @@ yyc_PRE_RAW:
 			  0,   0,   0,   0,   0,   0,   0,   0, 
 			  0,   0,   0,   0,   0,   0,   0,   0, 
 		};
-		YYDEBUG(123, *YYCURSOR);
+		YYDEBUG(126, *YYCURSOR);
 		YYFILL(2);
 		yych = *YYCURSOR;
-		if (yych <= '\f') {
-			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy127;
-				goto yy131;
+		if (yych <= '\r') {
+			if (yych <= '\t') {
+				if (yych <= 0x00) goto yy134;
+				if (yych <= 0x08) goto yy136;
 			} else {
-				if (yych <= '\t') goto yy125;
-				if (yych <= '\n') goto yy128;
-				goto yy131;
+				if (yych <= '\n') goto yy134;
+				if (yych <= '\f') goto yy136;
 			}
 		} else {
-			if (yych <= ' ') {
-				if (yych <= '\r') goto yy125;
-				if (yych <= 0x1F) goto yy131;
+			if (yych <= '"') {
+				if (yych == ' ') goto yy130;
+				goto yy136;
 			} else {
-				if (yych == '-') goto yy130;
-				goto yy131;
+				if (yych <= '#') goto yy133;
+				if (yych == '-') goto yy135;
+				goto yy136;
 			}
 		}
-yy125:
-		YYDEBUG(125, *YYCURSOR);
+		YYDEBUG(128, *YYCURSOR);
 		++YYCURSOR;
-		if ((yych = *YYCURSOR) <= '\f') {
-			if (yych == '\t') goto yy139;
-		} else {
-			if (yych <= '\r') goto yy139;
-			if (yych == ' ') goto yy139;
+		if (yybm[0+(yych = *YYCURSOR)] & 64) {
+			goto yy130;
 		}
-yy126:
-		YYDEBUG(126, *YYCURSOR);
+yy129:
+		YYDEBUG(129, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 171 "sapi/phpdbg/phpdbg_lexer.l"
+#line 180 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	YYSETCONDITION(RAW);
 
 	YYCURSOR = LEX(text);
 	goto restart;
 }
-#line 1273 "sapi/phpdbg/phpdbg_lexer.c"
-yy127:
-		YYDEBUG(127, *YYCURSOR);
-		yych = *++YYCURSOR;
-		goto yy126;
-yy128:
-		YYDEBUG(128, *YYCURSOR);
+#line 1322 "sapi/phpdbg/phpdbg_lexer.c"
+yy130:
+		YYDEBUG(130, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(129, *YYCURSOR);
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(131, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy130;
+		}
+		YYDEBUG(132, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 70 "sapi/phpdbg/phpdbg_lexer.l"
+#line 156 "sapi/phpdbg/phpdbg_lexer.l"
 		{
-	return 0;
+	/* ignore whitespace */
+
+	goto restart;
 }
-#line 1287 "sapi/phpdbg/phpdbg_lexer.c"
-yy130:
-		YYDEBUG(130, *YYCURSOR);
+#line 1340 "sapi/phpdbg/phpdbg_lexer.c"
+yy133:
+		YYDEBUG(133, *YYCURSOR);
+		yych = *++YYCURSOR;
+		goto yy129;
+yy134:
+		YYDEBUG(134, *YYCURSOR);
+		yych = *++YYCURSOR;
+		goto yy129;
+yy135:
+		YYDEBUG(135, *YYCURSOR);
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'r') goto yy132;
-		goto yy126;
-yy131:
-		YYDEBUG(131, *YYCURSOR);
+		if (yych == 'r') goto yy137;
+		goto yy129;
+yy136:
+		YYDEBUG(136, *YYCURSOR);
 		yych = *++YYCURSOR;
-		goto yy126;
-yy132:
-		YYDEBUG(132, *YYCURSOR);
+		goto yy129;
+yy137:
+		YYDEBUG(137, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(2);
 		yych = *YYCURSOR;
-		YYDEBUG(133, *YYCURSOR);
-		if (yybm[0+yych] & 64) {
-			goto yy132;
+		YYDEBUG(138, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy141;
 		}
-		if (yych <= '.') {
-			if (yych <= ',') goto yy134;
-			if (yych <= '-') goto yy135;
-			goto yy136;
+		if (yych <= '\r') {
+			if (yych == '\t') goto yy137;
+			if (yych >= '\r') goto yy137;
 		} else {
-			if (yych <= '/') goto yy134;
-			if (yych <= '9') goto yy136;
+			if (yych <= ' ') {
+				if (yych >= ' ') goto yy137;
+			} else {
+				if (yych == '-') goto yy140;
+			}
 		}
-yy134:
-		YYDEBUG(134, *YYCURSOR);
+yy139:
+		YYDEBUG(139, *YYCURSOR);
 		YYCURSOR = YYMARKER;
-		goto yy126;
-yy135:
-		YYDEBUG(135, *YYCURSOR);
+		goto yy129;
+yy140:
+		YYDEBUG(140, *YYCURSOR);
 		yych = *++YYCURSOR;
 		if (yybm[0+yych] & 128) {
-			goto yy136;
+			goto yy141;
 		}
-		goto yy134;
-yy136:
-		YYDEBUG(136, *YYCURSOR);
+		goto yy139;
+yy141:
+		YYDEBUG(141, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(137, *YYCURSOR);
+		YYDEBUG(142, *YYCURSOR);
 		if (yybm[0+yych] & 128) {
-			goto yy136;
+			goto yy141;
 		}
-		YYDEBUG(138, *YYCURSOR);
+		YYDEBUG(143, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 74 "sapi/phpdbg/phpdbg_lexer.l"
 		{
@@ -1340,28 +1403,7 @@ yy136:
 	yylval->num = atoi(text);
 	return T_REQ_ID;
 }
-#line 1344 "sapi/phpdbg/phpdbg_lexer.c"
-yy139:
-		YYDEBUG(139, *YYCURSOR);
-		++YYCURSOR;
-		YYFILL(1);
-		yych = *YYCURSOR;
-		YYDEBUG(140, *YYCURSOR);
-		if (yych <= '\f') {
-			if (yych == '\t') goto yy139;
-		} else {
-			if (yych <= '\r') goto yy139;
-			if (yych == ' ') goto yy139;
-		}
-		YYDEBUG(141, *YYCURSOR);
-		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 149 "sapi/phpdbg/phpdbg_lexer.l"
-		{
-	/* ignore whitespace */
-
-	goto restart;
-}
-#line 1365 "sapi/phpdbg/phpdbg_lexer.c"
+#line 1407 "sapi/phpdbg/phpdbg_lexer.c"
 	}
 /* *********************************** */
 yyc_RAW:
@@ -1371,7 +1413,7 @@ yyc_RAW:
 			128, 192,   0, 128, 128, 192, 128, 128, 
 			128, 128, 128, 128, 128, 128, 128, 128, 
 			128, 128, 128, 128, 128, 128, 128, 128, 
-			192, 128, 128, 128, 128, 128, 128, 128, 
+			192, 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, 
@@ -1400,59 +1442,79 @@ yyc_RAW:
 			128, 128, 128, 128, 128, 128, 128, 128, 
 			128, 128, 128, 128, 128, 128, 128, 128, 
 		};
-		YYDEBUG(142, *YYCURSOR);
+		YYDEBUG(144, *YYCURSOR);
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm[0+yych] & 64) {
-			goto yy144;
+			goto yy146;
 		}
-		if (yych <= 0x00) goto yy147;
-		if (yych == '\n') goto yy147;
-		goto yy149;
-yy144:
-		YYDEBUG(144, *YYCURSOR);
+		if (yych <= '\n') {
+			if (yych <= 0x00) goto yy151;
+			if (yych <= '\t') goto yy153;
+			goto yy151;
+		} else {
+			if (yych == '#') goto yy149;
+			goto yy153;
+		}
+yy146:
+		YYDEBUG(146, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(145, *YYCURSOR);
+		YYDEBUG(147, *YYCURSOR);
 		if (yybm[0+yych] & 64) {
-			goto yy144;
+			goto yy146;
 		}
-		if (yych <= 0x00) goto yy146;
-		if (yych != '\n') goto yy149;
-yy146:
-		YYDEBUG(146, *YYCURSOR);
+		if (yych <= '\n') {
+			if (yych <= 0x00) goto yy148;
+			if (yych <= '\t') goto yy153;
+		} else {
+			if (yych != '#') goto yy153;
+		}
+yy148:
+		YYDEBUG(148, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 142 "sapi/phpdbg/phpdbg_lexer.l"
+#line 149 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	phpdbg_init_param(yylval, STR_PARAM);
 	yylval->str = estrndup(yytext, yyleng);
 	yylval->len = yyleng;
 	return T_INPUT;
 }
-#line 1434 "sapi/phpdbg/phpdbg_lexer.c"
-yy147:
-		YYDEBUG(147, *YYCURSOR);
+#line 1485 "sapi/phpdbg/phpdbg_lexer.c"
+yy149:
+		YYDEBUG(149, *YYCURSOR);
 		++YYCURSOR;
-		YYDEBUG(148, *YYCURSOR);
+		YYDEBUG(150, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 91 "sapi/phpdbg/phpdbg_lexer.l"
+		{
+	YYSETCONDITION(INITIAL);
+	return T_SEPARATOR;
+}
+#line 1496 "sapi/phpdbg/phpdbg_lexer.c"
+yy151:
+		YYDEBUG(151, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(152, *YYCURSOR);
 		yyleng = (size_t) YYCURSOR - (size_t) yytext;
 #line 70 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	return 0;
 }
-#line 1444 "sapi/phpdbg/phpdbg_lexer.c"
-yy149:
-		YYDEBUG(149, *YYCURSOR);
+#line 1506 "sapi/phpdbg/phpdbg_lexer.c"
+yy153:
+		YYDEBUG(153, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(150, *YYCURSOR);
+		YYDEBUG(154, *YYCURSOR);
 		if (yybm[0+yych] & 128) {
-			goto yy149;
+			goto yy153;
 		}
-		goto yy146;
+		goto yy148;
 	}
 }
-#line 185 "sapi/phpdbg/phpdbg_lexer.l"
+#line 194 "sapi/phpdbg/phpdbg_lexer.l"
 
 }