Browse Source

- Fix bug #27283 - Exceptions where the last catch() statement was sometimes

- skipped.
PHP-5.0
Andi Gutmans 23 years ago
parent
commit
173782b73e
  1. 9
      Zend/zend_language_parser.y

9
Zend/zend_language_parser.y

@ -229,8 +229,13 @@ additional_catches:
; ;
non_empty_additional_catches: non_empty_additional_catches:
non_empty_additional_catches T_CATCH '(' fully_qualified_class_name { $$.u.opline_num = get_next_op_number(CG(active_op_array)); } T_VARIABLE ')' { zend_do_begin_catch(&$2, &$4, &$6, 0 TSRMLS_CC); } '{' inner_statement_list '}' { zend_do_end_catch(&$2 TSRMLS_CC); }
| T_CATCH '(' fully_qualified_class_name { $$.u.opline_num = get_next_op_number(CG(active_op_array)); } T_VARIABLE ')' { zend_do_begin_catch(&$1, &$3, &$5, 0 TSRMLS_CC); } '{' inner_statement_list '}' { zend_do_end_catch(&$1 TSRMLS_CC); }
additional_catch { $$ = $1; }
| non_empty_additional_catches additional_catch { $$ = $2; }
;
additional_catch:
T_CATCH '(' fully_qualified_class_name { $$.u.opline_num = get_next_op_number(CG(active_op_array)); } T_VARIABLE ')' { zend_do_begin_catch(&$1, &$3, &$5, 0 TSRMLS_CC); } '{' inner_statement_list '}' { zend_do_end_catch(&$1 TSRMLS_CC); }
; ;

Loading…
Cancel
Save