From 0afc04b91394a2b8d3d33531810ee0256088408d Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Wed, 26 Nov 2014 18:38:36 +0100 Subject: go back with phpdbg to the state of 5.6.3, reverting the controversial commits(remote debugging/xml protocol) --- sapi/phpdbg/phpdbg_parser.y | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) (limited to 'sapi/phpdbg/phpdbg_parser.y') diff --git a/sapi/phpdbg/phpdbg_parser.y b/sapi/phpdbg/phpdbg_parser.y index e4353976f3..702bf78455 100644 --- a/sapi/phpdbg/phpdbg_parser.y +++ b/sapi/phpdbg/phpdbg_parser.y @@ -59,7 +59,6 @@ typedef void* yyscan_t; %token T_ID "identifier (command or function name)" %token T_INPUT "input (input string or data)" %token T_UNEXPECTED "input" -%token T_REQ_ID "request id (-r %d)" %% /* Rules */ @@ -72,7 +71,6 @@ input parameters : parameter { phpdbg_stack_push(PHPDBG_G(parser_stack), &$1); } | parameters parameter { phpdbg_stack_push(PHPDBG_G(parser_stack), &$2); } - | parameters req_id { $$ = $1; } ; parameter @@ -137,37 +135,32 @@ parameter | T_ID { $$ = $1; } ; -req_id - : T_REQ_ID { PHPDBG_G(req_id) = $1.num; } - | /* empty */ -; - full_expression - : T_EVAL req_id T_INPUT { + : T_EVAL T_INPUT { $$.type = EVAL_PARAM; - $$.str = $3.str; - $$.len = $3.len; + $$.str = $2.str; + $$.len = $2.len; } - | T_SHELL req_id T_INPUT { + | T_SHELL T_INPUT { $$.type = SHELL_PARAM; - $$.str = $3.str; - $$.len = $3.len; + $$.str = $2.str; + $$.len = $2.len; } - | T_RUN req_id { + | T_RUN { $$.type = RUN_PARAM; $$.len = 0; } - | T_RUN req_id T_INPUT { + | T_RUN T_INPUT { $$.type = RUN_PARAM; - $$.str = $3.str; - $$.len = $3.len; + $$.str = $2.str; + $$.len = $2.len; } ; %% static int yyerror(void ***tsrm_ls, const char *msg) { - phpdbg_error("command", "type=\"parseerror\" msg=\"%s\"", "Parse Error: %s", msg); + phpdbg_error("Parse Error: %s", msg); { const phpdbg_param_t *top = PHPDBG_G(parser_stack); -- cgit v1.2.1