summaryrefslogtreecommitdiff
path: root/Zend/zend_compile.c
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2002-07-17 18:36:29 +0000
committerAndi Gutmans <andi@php.net>2002-07-17 18:36:29 +0000
commit9c52e883f0896bb6ebda1ff838d04dedec6a1707 (patch)
treeaaa89f1b758f5c68b851d910aa451c806ab22fe7 /Zend/zend_compile.c
parenta85f813b6c8d87abbe772b09bfe1792e06d1ff80 (diff)
downloadphp-git-9c52e883f0896bb6ebda1ff838d04dedec6a1707.tar.gz
- Rejuggle some code.
Diffstat (limited to 'Zend/zend_compile.c')
-rw-r--r--Zend/zend_compile.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index dd35df6bb0..21c606f7f4 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -918,6 +918,9 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n
op_array.scope = CG(active_class_entry);
if (is_method) {
+ char *foo;
+
+ foo = CG(active_class_entry)->name;
zend_hash_update(&CG(active_class_entry)->function_table, name, name_len+1, &op_array, sizeof(zend_op_array), (void **) &CG(active_op_array));
if ((CG(active_class_entry)->name_length == (uint) name_len) && (!memcmp(CG(active_class_entry)->name, name, name_len))) {
CG(active_class_entry)->constructor = (zend_function *) CG(active_op_array);
@@ -2046,7 +2049,7 @@ void zend_do_begin_class_declaration(znode *class_token, znode *class_name, znod
new_class_entry->handle_property_get = NULL;
/* code for inheritance from parent class */
- if (parent_class_name) {
+ if (parent_class_name->op_type == IS_CONST) {
zend_class_entry *parent_class, **parent_class_p;
zend_function tmp_zend_function;
zval *tmp;