com php-src: Fix ev/run/sh parsing: phpdbg_parser.c phpdb g_parser.y

From: Date: Thu, 09 Oct 2014 12:54:08 +0000
Subject: com php-src: Fix ev/run/sh parsing: phpdbg_parser.c phpdb g_parser.y
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-82568@lists.php.net to get a copy of this message
Commit: f4f9e39faaef3227e13a57d7c4392e95d0e1caba Author: Bob Weinand <bobwei9@hotmail.com> Thu, 9 Oct 2014 14:54:08 +0200 Parents: a54de936d028033304f385947fd67d69ae813fc5 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f4f9e39faaef3227e13a57d7c4392e95d0e1caba Log: Fix ev/run/sh parsing Changed paths: M phpdbg_parser.c M phpdbg_parser.y Diff: diff --git a/phpdbg_parser.c b/phpdbg_parser.c index b50ab12..c766868 100644 --- a/phpdbg_parser.c +++ b/phpdbg_parser.c @@ -1651,8 +1651,8 @@ yyreduce: #line 146 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y" { (yyval).type = EVAL_PARAM; - (yyval).str = (yyvsp[(2) - (3)]).str; - (yyval).len = (yyvsp[(2) - (3)]).len; + (yyval).str = (yyvsp[(3) - (3)]).str; + (yyval).len = (yyvsp[(3) - (3)]).len; } break; @@ -1662,8 +1662,8 @@ yyreduce: #line 151 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser..y" { (yyval).type = SHELL_PARAM; - (yyval).str = (yyvsp[(2) - (3)]).str; - (yyval).len = (yyvsp[(2) - (3)]).len; + (yyval).str = (yyvsp[(3) - (3)]).str; + (yyval).len = (yyvsp[(3) - (3)]).len; } break; @@ -1683,8 +1683,8 @@ yyreduce: #line 160 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y" { (yyval).type = RUN_PARAM; - (yyval).str = (yyvsp[(2) - (3)]).str; - (yyval).len = (yyvsp[(2) - (3)]).len; + (yyval).str = (yyvsp[(3) - (3)]).str; + (yyval)..len = (yyvsp[(3) - (3)]).len; } break; diff --git a/phpdbg_parser.y b/phpdbg_parser.y index 3af4552..e435397 100644 --- a/phpdbg_parser.y +++ b/phpdbg_parser.y @@ -145,13 +145,13 @@ req_id full_expression : T_EVAL req_id T_INPUT { $$.type = EVAL_PARAM; - $$.str = $2.str; - $$.len = $2.len; + $$.str = $3.str; + $$.len = $3.len; } | T_SHELL req_id T_INPUT { $$.type = SHELL_PARAM; - $$.str = $2.str; - $$.len = $2.len; + $$.str = $3.str; + $$.len = $3.len; } | T_RUN req_id { $$.type = RUN_PARAM; @@ -159,8 +159,8 @@ full_expression } | T_RUN req_id T_INPUT { $$.type = RUN_PARAM; - $$.str = $2.str; - $$.len = $2.len; + $$.str = $3.str; + $$.len = $3.len; } ;

« previous php.cvs (#82568) next »