Add proper escape sequences and reading stdin from file in phpdbg run command

1 files changed, 435 insertions, 86 deletions

diff --git a/sapi/phpdbg/phpdbg_lexer.c b/sapi/phpdbg/phpdbg_lexer.c
index 10af103fb0..281f882b62 100644
--- a/sapi/phpdbg/phpdbg_lexer.c
+++ b/sapi/phpdbg/phpdbg_lexer.c
@@ -534,7 +534,7 @@ yy39:
 #line 161 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	phpdbg_init_param(yylval, STR_PARAM);
-	yylval->str = estrndup(yytext, yyleng - unescape_string(yytext));
+	yylval->str = estrndup(yytext + (*yytext == '\'' || *yytext == '\"'), yyleng - unescape_string(yytext));
 	yylval->len = yyleng;
 	return T_ID;
 }
@@ -1655,56 +1655,61 @@ yy165:
 yyc_RAW:
 	{
 		static const unsigned char yybm[] = {
-			  0, 224, 224, 224, 224, 224, 224, 224, 
-			224, 240,   0, 224, 224, 240, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			240, 224,  64, 192, 224, 224, 224, 128, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224,  32, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
-			224, 224, 224, 224, 224, 224, 224, 224, 
+			  0, 232, 232, 232, 232, 232, 232, 232, 
+			232, 236,   0, 232, 232, 236, 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,  64, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232,  16, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
+			232, 232, 232, 232, 232, 232, 232, 232, 
 		};
 		YYDEBUG(168, *YYCURSOR);
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yybm[0+yych] & 16) {
+		if (yybm[0+yych] & 4) {
 			goto yy170;
 		}
-		if (yych <= '!') {
-			if (yych <= 0x00) goto yy175;
-			if (yych <= 0x08) goto yy177;
-			if (yych <= '\n') goto yy175;
-			goto yy177;
+		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 yy179;
-				goto yy173;
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy173;
+				if (yych <= '&') goto yy177;
+				goto yy183;
 			} else {
-				if (yych == '\'') goto yy181;
+				if (yych == '\\') goto yy179;
 				goto yy177;
 			}
 		}
@@ -1715,18 +1720,24 @@ yy170:
 		YYFILL(1);
 		yych = *YYCURSOR;
 		YYDEBUG(171, *YYCURSOR);
-		if (yybm[0+yych] & 16) {
+		if (yybm[0+yych] & 4) {
 			goto yy170;
 		}
-		if (yych <= '!') {
-			if (yych <= 0x00) goto yy172;
-			if (yych <= 0x08) goto yy177;
-			if (yych >= '\v') goto yy177;
+		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 yy179;
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy172;
+				if (yych <= '&') goto yy177;
+				goto yy183;
 			} else {
-				if (yych == '\'') goto yy181;
+				if (yych == '\\') goto yy179;
 				goto yy177;
 			}
 		}
@@ -1736,11 +1747,11 @@ yy172:
 #line 168 "sapi/phpdbg/phpdbg_lexer.l"
 		{
 	phpdbg_init_param(yylval, STR_PARAM);
-	yylval->str = estrndup(yytext, yyleng - unescape_string(yytext));
+	yylval->str = estrdup(yytext);
 	yylval->len = yyleng;
 	return T_INPUT;
 }
-#line 1744 "sapi/phpdbg/phpdbg_lexer.c"
+#line 1755 "sapi/phpdbg/phpdbg_lexer.c"
 yy173:
 		YYDEBUG(173, *YYCURSOR);
 		++YYCURSOR;
@@ -1751,7 +1762,7 @@ yy173:
 	YYSETCONDITION(INITIAL);
 	return T_SEPARATOR;
 }
-#line 1755 "sapi/phpdbg/phpdbg_lexer.c"
+#line 1766 "sapi/phpdbg/phpdbg_lexer.c"
 yy175:
 		YYDEBUG(175, *YYCURSOR);
 		++YYCURSOR;
@@ -1761,7 +1772,7 @@ yy175:
 		{
 	return 0;
 }
-#line 1765 "sapi/phpdbg/phpdbg_lexer.c"
+#line 1776 "sapi/phpdbg/phpdbg_lexer.c"
 yy177:
 		YYDEBUG(177, *YYCURSOR);
 		yyaccept = 0;
@@ -1769,74 +1780,412 @@ yy177:
 		YYFILL(1);
 		yych = *YYCURSOR;
 		YYDEBUG(178, *YYCURSOR);
-		if (yybm[0+yych] & 32) {
+		if (yybm[0+yych] & 8) {
 			goto yy177;
 		}
 		if (yych <= '\n') goto yy172;
-		if (yych <= '"') goto yy179;
+		if (yych <= '"') goto yy181;
 		if (yych <= '#') goto yy172;
-		goto yy181;
+		if (yych <= '\'') goto yy183;
 yy179:
 		YYDEBUG(179, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yybm[0+yych] & 128) {
-			goto yy185;
-		}
-		if (yych >= '#') goto yy187;
-yy180:
 		YYDEBUG(180, *YYCURSOR);
-		YYCURSOR = YYMARKER;
-		goto yy172;
+		if (yybm[0+yych] & 8) {
+			goto yy177;
+		}
+		if (yych <= '\n') goto yy172;
+		if (yych <= '"') goto yy190;
+		if (yych <= '#') goto yy172;
+		if (yych <= '\'') goto yy191;
+		goto yy179;
 yy181:
 		YYDEBUG(181, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
 		if (yybm[0+yych] & 64) {
-			goto yy182;
+			goto yy187;
 		}
-		if (yych <= '\'') goto yy180;
-		goto yy184;
+		if (yych >= '#') goto yy189;
 yy182:
 		YYDEBUG(182, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy172;
+yy183:
+		YYDEBUG(183, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		YYDEBUG(183, *YYCURSOR);
-		if (yybm[0+yych] & 64) {
-			goto yy182;
+		if (yybm[0+yych] & 32) {
+			goto yy184;
 		}
-		if (yych <= '\n') goto yy180;
-		if (yych <= '\'') goto yy177;
+		if (yych <= '\'') goto yy182;
+		goto yy186;
 yy184:
 		YYDEBUG(184, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych == '\'') goto yy182;
-		if (yych == '\\') goto yy182;
-		goto yy180;
-yy185:
 		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(186, *YYCURSOR);
-		if (yybm[0+yych] & 128) {
-			goto yy185;
-		}
-		if (yych <= '\n') goto yy180;
-		if (yych <= '"') goto yy177;
+		if (yych == '\'') goto yy184;
+		if (yych == '\\') goto yy184;
+		goto yy182;
 yy187:
 		YYDEBUG(187, *YYCURSOR);
 		++YYCURSOR;
 		YYFILL(1);
 		yych = *YYCURSOR;
-		if (yych == '"') goto yy185;
-		if (yych == '\\') goto yy185;
-		goto yy180;
+		YYDEBUG(188, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy187;
+		}
+		if (yych <= '\n') goto yy182;
+		if (yych <= '"') goto yy177;
+yy189:
+		YYDEBUG(189, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych == '"') goto yy187;
+		if (yych == '\\') goto yy187;
+		goto yy182;
+yy190:
+		YYDEBUG(190, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '"') {
+			if (yych <= '\t') {
+				if (yych <= 0x00) goto yy172;
+				goto yy205;
+			} else {
+				if (yych <= '\n') goto yy172;
+				if (yych <= '!') goto yy205;
+				goto yy181;
+			}
+		} else {
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy187;
+				if (yych <= '&') goto yy205;
+				goto yy207;
+			} else {
+				if (yych == '\\') goto yy208;
+				goto yy205;
+			}
+		}
+yy191:
+		YYDEBUG(191, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '"') {
+			if (yych <= '\t') {
+				if (yych <= 0x00) goto yy172;
+			} else {
+				if (yych <= '\n') goto yy172;
+				if (yych >= '"') goto yy194;
+			}
+		} else {
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy184;
+				if (yych >= '\'') goto yy183;
+			} else {
+				if (yych == '\\') goto yy195;
+			}
+		}
+yy192:
+		YYDEBUG(192, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(193, *YYCURSOR);
+		if (yych <= '"') {
+			if (yych <= '\t') {
+				if (yych <= 0x00) goto yy172;
+				goto yy192;
+			} else {
+				if (yych <= '\n') goto yy172;
+				if (yych <= '!') goto yy192;
+			}
+		} else {
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy184;
+				if (yych <= '&') goto yy192;
+				goto yy191;
+			} else {
+				if (yych == '\\') goto yy195;
+				goto yy192;
+			}
+		}
+yy194:
+		YYDEBUG(194, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy200;
+		}
+		if (yych <= '\n') goto yy182;
+		if (yych <= '"') goto yy184;
+		if (yych <= '\'') goto yy205;
+		goto yy210;
+yy195:
+		YYDEBUG(195, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 8) {
+			goto yy177;
+		}
+		if (yych <= '\n') goto yy172;
+		if (yych <= '"') goto yy190;
+		if (yych <= '#') goto yy172;
+		if (yych <= '\'') goto yy192;
+		YYDEBUG(196, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '"') {
+			if (yych <= '\t') {
+				if (yych <= 0x00) goto yy172;
+				goto yy192;
+			} else {
+				if (yych <= '\n') goto yy172;
+				if (yych <= '!') goto yy192;
+			}
+		} else {
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy184;
+				if (yych <= '&') goto yy192;
+				goto yy191;
+			} else {
+				if (yych == '\\') goto yy195;
+				goto yy192;
+			}
+		}
+yy197:
+		YYDEBUG(197, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '"') {
+			if (yych <= '\t') {
+				if (yych <= 0x00) goto yy172;
+			} else {
+				if (yych <= '\n') goto yy172;
+				if (yych >= '"') goto yy194;
+			}
+		} else {
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy200;
+				if (yych >= '\'') goto yy202;
+			} else {
+				if (yych == '\\') goto yy203;
+			}
+		}
+yy198:
+		YYDEBUG(198, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(199, *YYCURSOR);
+		if (yych <= '"') {
+			if (yych <= '\t') {
+				if (yych <= 0x00) goto yy172;
+				goto yy198;
+			} else {
+				if (yych <= '\n') goto yy172;
+				if (yych <= '!') goto yy198;
+				goto yy197;
+			}
+		} else {
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy200;
+				if (yych <= '&') goto yy198;
+				goto yy202;
+			} else {
+				if (yych == '\\') goto yy203;
+				goto yy198;
+			}
+		}
+yy200:
+		YYDEBUG(200, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(201, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy200;
+		}
+		if (yych <= '\n') goto yy182;
+		if (yych <= '"') goto yy192;
+		if (yych <= '\'') goto yy205;
+		goto yy210;
+yy202:
+		YYDEBUG(202, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '"') {
+			if (yych <= '\t') {
+				if (yych <= 0x00) goto yy172;
+				goto yy198;
+			} else {
+				if (yych <= '\n') goto yy172;
+				if (yych <= '!') goto yy198;
+				goto yy197;
+			}
+		} else {
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy200;
+				if (yych <= '&') goto yy198;
+				goto yy207;
+			} else {
+				if (yych != '\\') goto yy198;
+			}
+		}
+yy203:
+		YYDEBUG(203, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 8) {
+			goto yy177;
+		}
+		if (yych <= '\n') goto yy172;
+		if (yych <= '"') goto yy205;
+		if (yych <= '#') goto yy172;
+		if (yych <= '\'') goto yy192;
+		YYDEBUG(204, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '"') {
+			if (yych <= '\t') {
+				if (yych <= 0x00) goto yy172;
+				goto yy198;
+			} else {
+				if (yych <= '\n') goto yy172;
+				if (yych <= '!') goto yy198;
+				goto yy197;
+			}
+		} else {
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy200;
+				if (yych <= '&') goto yy198;
+				goto yy202;
+			} else {
+				if (yych == '\\') goto yy203;
+				goto yy198;
+			}
+		}
+yy205:
+		YYDEBUG(205, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(206, *YYCURSOR);
+		if (yych <= '"') {
+			if (yych <= '\t') {
+				if (yych <= 0x00) goto yy172;
+				goto yy205;
+			} else {
+				if (yych <= '\n') goto yy172;
+				if (yych <= '!') goto yy205;
+				goto yy190;
+			}
+		} else {
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy187;
+				if (yych <= '&') goto yy205;
+			} else {
+				if (yych == '\\') goto yy208;
+				goto yy205;
+			}
+		}
+yy207:
+		YYDEBUG(207, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy200;
+		}
+		if (yych <= '\n') goto yy182;
+		if (yych <= '"') goto yy192;
+		if (yych <= '\'') goto yy187;
+		goto yy210;
+yy208:
+		YYDEBUG(208, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 8) {
+			goto yy177;
+		}
+		if (yych <= '\n') goto yy172;
+		if (yych <= '"') goto yy205;
+		if (yych <= '#') goto yy172;
+		if (yych <= '\'') goto yy191;
+		YYDEBUG(209, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '"') {
+			if (yych <= '\t') {
+				if (yych <= 0x00) goto yy172;
+				goto yy205;
+			} else {
+				if (yych <= '\n') goto yy172;
+				if (yych <= '!') goto yy205;
+				goto yy190;
+			}
+		} else {
+			if (yych <= '\'') {
+				if (yych <= '#') goto yy187;
+				if (yych <= '&') goto yy205;
+				goto yy202;
+			} else {
+				if (yych == '\\') goto yy208;
+				goto yy205;
+			}
+		}
+yy210:
+		YYDEBUG(210, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '&') {
+			if (yych == '"') goto yy187;
+			goto yy182;
+		} else {
+			if (yych <= '\'') goto yy184;
+			if (yych == '\\') goto yy200;
+			goto yy182;
+		}
 	}
 }
 #line 213 "sapi/phpdbg/phpdbg_lexer.l"