summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2004-01-12 07:15:55 +0000
committerAndi Gutmans <andi@php.net>2004-01-12 07:15:55 +0000
commit92eb129bd9566e45702b74d4372a13baffa92c46 (patch)
tree005b287b524c9c08264208b4a27f8e12512f6bd9
parent3fb99f62e085e162698248a5692f3f996f4cbbe7 (diff)
downloadphp-git-92eb129bd9566e45702b74d4372a13baffa92c46.tar.gz
- Return the PHP 4 behavior of not allowing class declerations within
- class declerations. This happened when declaring a class within a - method. class A { function foo() { class B { } } }
-rw-r--r--Zend/zend_compile.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index afce4f0084..bec6dee9f3 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2317,6 +2317,11 @@ void zend_do_begin_class_declaration(znode *class_token, znode *class_name, znod
zend_class_entry *new_class_entry = emalloc(sizeof(zend_class_entry));
char *lcname = zend_str_tolower_dup(class_name->u.constant.value.str.val, class_name->u.constant.value.str.len);
+ if (CG(active_class_entry)) {
+ zend_error(E_COMPILE_ERROR, "Class declarations may not be nested");
+ return;
+ }
+
if (!(strcmp(lcname, "self") && strcmp(lcname, "parent"))) {
efree(lcname);
zend_error(E_COMPILE_ERROR, "Cannot use '%s' as class name as it is reserved", class_name->u.constant.value.str.val);