Fix ev/run/sh parsing

diff --git a/phpdbg_parser.c b/phpdbg_parser.c
index b50ab12f246610b0db4c2f8e0bc02e1136a35e4f..c7668683699209b3a60d7215485ee5aa96357c84 100644 (file)
--- 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 3af4552538d4e8ec5ce767cdc0b4a02ed7145962..e4353976f3e26d675d2e8bbe1afcefcca76f77e6 100644 (file)
--- 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;
        }
        ;