From: Andi Gutmans <andi@php.net>
Date: Tue, 1 Oct 2002 20:00:45 +0000 (+0000)
Subject: - Fix problem when crashing on illegal tokens in class name during class
X-Git-Tag: MODERN_SYMMETRIC_SESSION_BEHAVIOUR_20021003~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa7bffeec6fe191c696ce86238a6a5d405e2e5ce;p=php

- Fix problem when crashing on illegal tokens in class name during class
- definition.
---

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 9fceaadbd5..d63736438d 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -281,7 +281,7 @@ unticked_function_declaration_statement:
 ;
 
 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 @@ class_statement:
 			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: