mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-01 05:43:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Inheritance fixes

Browse Source
This commit is contained in:
Marcus Boerger 2003-05-07 00:54:38 +00:00
parent 451cd602f6
commit 764eaa5b8b
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Zend/zend_compile.c
View File

@ -1126,7 +1126,7 @@ void zend_do_end_function_declaration(znode *function_token TSRMLS_DC)
}
void zend_do_receive_arg(zend_uchar op, znode *var, znode *offset, znode *initialization, znode *class_type, zend_uchar pass_type TSRMLS_DC)
void zend_do_receive_arg(zend_uchar op, znode *var, znode *offset, znode *initialization, znode *type_hint, zend_uchar pass_type TSRMLS_DC)
{
zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
@ -1154,14 +1154,16 @@ void zend_do_receive_arg(zend_uchar op, znode *var, znode *offset, znode *initia
CG(active_op_array)->arg_types[0]=(unsigned char) offset->u.constant.value.lval;
CG(active_op_array)->arg_types[offset->u.constant.value.lval] = pass_type;
}
if (class_type->op_type != IS_UNUSED) {
if (type_hint->op_type != IS_UNUSED) {
znode passed_var = opline->result;
opline = get_next_op(CG(active_op_array) TSRMLS_CC);
opline->opcode = ZEND_VERIFY_INSTANCEOF;
opline->op1 = *class_type;
if (type_hint->op_type == IS_TYPE) {
opline->opcode = ZEND_VERIFY_TYPE;
} else {
opline->opcode = ZEND_VERIFY_INSTANCEOF;
}
opline->op1 = *type_hint;
opline->op2 = passed_var;
opline->extended_value = offset->u.constant.value.lval;
} else {
@ -1613,7 +1615,21 @@ static void do_inherit_parent_constructor(zend_class_entry *ce)
{
zend_function *function;
if (!ce->parent || ce->constructor) {
if (!ce->parent) {
return;
}
if (!ce->__get) {
ce->__get = ce->parent->__get;
}
if (!ce->__set) {
ce->__set = ce->parent->__set;
}
if (!ce->__call) {
ce->__call = ce->parent->__call;
}
ce->create_object = ce->parent->create_object;
if (ce->constructor) {
return;
}
@ -1632,16 +1648,6 @@ static void do_inherit_parent_constructor(zend_class_entry *ce)
}
}
ce->constructor = ce->parent->constructor;
if (!ce->__get) {
ce->__get = ce->parent->__get;
}
if (!ce->__set) {
ce->__set = ce->parent->__set;
}
if (!ce->__call) {
ce->__call = ce->parent->__call;
}
ce->create_object = ce->parent->create_object;
}