diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-23 16:20:20 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-10-23 16:22:16 +0200 |
| commit | 1362d8e103f181faab3d909a413344729593a712 (patch) | |
| tree | 38528f9abb9045279c0856534d8e1342c2a89f71 /sapi/phpdbg/phpdbg_parser.y | |
| parent | e3688c21803d4e882859431c989a35bbad3a0da0 (diff) | |
| download | php-git-1362d8e103f181faab3d909a413344729593a712.tar.gz | |
Fix conflicts in phpdbg parser
Diffstat (limited to 'sapi/phpdbg/phpdbg_parser.y')
| -rw-r--r-- | sapi/phpdbg/phpdbg_parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_parser.y b/sapi/phpdbg/phpdbg_parser.y index b61c9c0a26..9d969fffd0 100644 --- a/sapi/phpdbg/phpdbg_parser.y +++ b/sapi/phpdbg/phpdbg_parser.y @@ -79,7 +79,7 @@ command parameters : parameter { phpdbg_stack_push(PHPDBG_G(parser_stack), &$1); $$.top = PHPDBG_G(parser_stack)->top; } | parameters parameter { phpdbg_stack_push(PHPDBG_G(parser_stack), &$2); $$.top = PHPDBG_G(parser_stack)->top; } - | parameters req_id { $$ = $1; } + | parameters T_REQ_ID { $$ = $1; PHPDBG_G(req_id) = $2.num; } ; parameter |