diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-06-29 12:49:10 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-06-29 12:49:10 +0200 |
| commit | 1dd3bab1dfd3fc9b62e4f1e8b5bea347ff3f995b (patch) | |
| tree | 1ba5e2b40a3d5b779e624254e6433f1a73d033df /sapi/phpdbg/phpdbg_parser.y | |
| parent | 959a006d6149b60278cd76a5289a6ecda925ed03 (diff) | |
| parent | 58c69746e585312f73163d749bd5613cd21c9a1b (diff) | |
| download | php-git-1dd3bab1dfd3fc9b62e4f1e8b5bea347ff3f995b.tar.gz | |
Merge sapi/phpdbg into PHP-5.6
Diffstat (limited to 'sapi/phpdbg/phpdbg_parser.y')
| -rw-r--r-- | sapi/phpdbg/phpdbg_parser.y | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sapi/phpdbg/phpdbg_parser.y b/sapi/phpdbg/phpdbg_parser.y index fd81edfc29..702bf78455 100644 --- a/sapi/phpdbg/phpdbg_parser.y +++ b/sapi/phpdbg/phpdbg_parser.y @@ -121,6 +121,11 @@ parameter $$.len = $1.len; $$.num = $3.num; } + | T_IF T_INPUT { + $$.type = COND_PARAM; + $$.str = $2.str; + $$.len = $2.len; + } | T_OPCODE { $$ = $1; } | T_ADDR { $$ = $1; } | T_LITERAL { $$ = $1; } @@ -131,12 +136,7 @@ parameter ; full_expression - : T_IF T_INPUT { - $$.type = COND_PARAM; - $$.str = $2.str; - $$.len = $2.len; - } - | T_EVAL T_INPUT { + : T_EVAL T_INPUT { $$.type = EVAL_PARAM; $$.str = $2.str; $$.len = $2.len; |