cvs: ZendEngine2 / zend_language_parser.y
| From: | Andi Gutmans | Date: | Tue, 01 Oct 2002 20:00:46 +0000 |
| Subject: | cvs: ZendEngine2 / zend_language_parser.y | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-467@lists.php.net to get a copy of this message | ||
andi Tue Oct 1 16:00:46 2002 EDT
Modified files:
/ZendEngine2 zend_language_parser.y
Log:
- Fix problem when crashing on illegal tokens in class name during class
- definition.
Index: ZendEngine2/zend_language_parser.y
diff -u ZendEngine2/zend_language_parser.y:1.70 ZendEngine2/zend_language_parser.y:1.71
--- ZendEngine2/zend_language_parser.y:1.70 Thu Sep 26 14:56:11 2002
+++ ZendEngine2/zend_language_parser.y Tue Oct 1 16:00:45 2002
@@ -281,7 +281,7 @@
;
unticked_class_declaration_statement:
- T_CLASS declaration_class_name extends_from { zend_do_begin_class_declaration(&$1, &$2,
&$3 TSRMLS_CC); } '{' class_statement_list '}' {
zend_do_end_class_declaration(&$1 TSRMLS_CC); }
+ T_CLASS declaration_class_name extends_from '{' {
zend_do_begin_class_declaration(&$1, &$2, &$3 TSRMLS_CC); } class_statement_list
'}' { zend_do_end_class_declaration(&$1 TSRMLS_CC); }
;
extends_from:
@@ -445,7 +445,7 @@
parameter_list ')' '{' inner_statement_list '}' {
zend_do_end_function_declaration(&$1 TSRMLS_CC); }
| T_OLD_FUNCTION { $1.u.opline_num = CG(zend_lineno); } is_reference T_STRING {
zend_do_begin_function_declaration(&$1, &$4, 1, $3.op_type TSRMLS_CC); }
parameter_list '(' inner_statement_list ')' ';' {
zend_do_end_function_declaration(&$1 TSRMLS_CC); }
- | T_CLASS T_STRING extends_from { zend_do_begin_class_declaration(&$1, &$2, &$3
TSRMLS_CC); } '{' class_statement_list '}' {
zend_do_end_class_declaration(&$1 TSRMLS_CC); }
+ | T_CLASS T_STRING extends_from '{' { zend_do_begin_class_declaration(&$1, &$2,
&$3 TSRMLS_CC); } class_statement_list '}' { zend_do_end_class_declaration(&$1
TSRMLS_CC); }
;
is_reference: