diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-01-09 17:36:44 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-01-09 17:36:44 +0400 |
| commit | 625000ab442dd4c1bfc6975a4a979f2c5f60a78d (patch) | |
| tree | e5704937076cc2290eb21f7ed1f9ae03638b7632 /Zend/zend_language_parser.y | |
| parent | f9e8678dd3a41ed8a100d8201153a41d6fd25f2e (diff) | |
| parent | d4650c5d69ffb49d476a2969c6200879bd424caf (diff) | |
| download | php-git-625000ab442dd4c1bfc6975a4a979f2c5f60a78d.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed compilator bug that might cause jump depended on unitialized value
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index b37822903b..1f5d73296f 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -375,13 +375,13 @@ unticked_class_declaration_statement: implements_list '{' class_statement_list - '}' { zend_do_end_class_declaration(&$1, &$2 TSRMLS_CC); } + '}' { zend_do_end_class_declaration(&$1, &$3 TSRMLS_CC); } | interface_entry T_STRING { zend_do_begin_class_declaration(&$1, &$2, NULL TSRMLS_CC); } interface_extends_list '{' class_statement_list - '}' { zend_do_end_class_declaration(&$1, &$2 TSRMLS_CC); } + '}' { zend_do_end_class_declaration(&$1, NULL TSRMLS_CC); } ; |