diff options
| author | Ondřej Surý <ondrej@sury.org> | 2014-07-02 13:10:19 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2014-07-02 13:10:19 +0200 |
| commit | 09ed144817606a3a835391b12455e6d9cb3a0ae2 (patch) | |
| tree | 1284c43d38c82704eada3d721265b96ae8b4aee3 /sapi/phpdbg/phpdbg_parser.y | |
| parent | 60d44b592c4c4fdcbbf92db2882a97a9cc54713c (diff) | |
| download | php-09ed144817606a3a835391b12455e6d9cb3a0ae2.tar.gz | |
New upstream version 5.6.0~rc2+dfsgupstream/5.6.0_rc2+dfsg
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 fd81edfc2..702bf7845 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; |
