archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- Inheritance applies to __clone() too.

Browse source 
- No need to add additional functions for the constructor.
  The handler uses the pointer as intended and doesn't look the the name.
This commit is contained in:
Marcus Boerger 2003-09-03 20:26:01 +00:00
parent 91ff8d67e7
commit 61b96d1fe2
1 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Zend/zend_compile.c
View file

@ -1587,6 +1587,11 @@ static void do_inherit_parent_constructor(zend_class_entry *ce)
if (!ce->parent) { if (!ce->parent) {
return; return;
} }
/* You cannot change create_object */
ce->create_object = ce->parent->create_object;
/* Inherit special functions if needed */
if (!ce->__get) { if (!ce->__get) {
ce->__get = ce->parent->__get; ce->__get = ce->parent->__get;
} }
@ -1596,29 +1601,16 @@ static void do_inherit_parent_constructor(zend_class_entry *ce)
if (!ce->__call) { if (!ce->__call) {
ce->__call = ce->parent->__call; ce->__call = ce->parent->__call;
} }
if (!ce->clone) {
ce->clone = ce->parent->clone;
}
if (!ce->destructor) { if (!ce->destructor) {
ce->destructor = ce->parent->destructor; ce->destructor = ce->parent->destructor;
} }
ce->create_object = ce->parent->create_object; if (!ce->constructor) {
if (ce->constructor) { ce->constructor = ce->parent->constructor;
return;
} }
if (zend_hash_find(&ce->parent->function_table, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME), (void **) &function)==SUCCESS) {
/* inherit parent's constructor */
zend_hash_update(&ce->function_table, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME), function, sizeof(zend_function), NULL);
function_add_ref(function);
} else {
/* don't inherit the old style constructor if we already have the new style cconstructor */
if (!zend_hash_exists(&ce->function_table, ce->name, ce->name_length+1)) {
if (zend_hash_find(&ce->parent->function_table, ce->parent->name, ce->parent->name_length+1, (void **) &function)==SUCCESS) {
/* inherit parent's constructor */
zend_hash_update(&ce->function_table, ce->name, ce->name_length+1, function, sizeof(zend_function), NULL);
function_add_ref(function);
}
}
}
ce->constructor = ce->parent->constructor;
} }