Deleted Added
full compact
zend_compile.c (6bc32139) zend_compile.c (345e0255)
1/*
2 +----------------------------------------------------------------------+
3 | Zend Engine |
4 +----------------------------------------------------------------------+
5 | Copyright (c) 1998-2004 Zend Technologies Ltd. (http://www.zend.com) |
6 +----------------------------------------------------------------------+
7 | This source file is subject to version 2.00 of the Zend license, |
8 | that is bundled with this package in the file LICENSE, and is |

--- 1105 unchanged lines hidden (view full) ---

1114 } else if ((name_len == sizeof(ZEND_CLONE_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME)))) {
1115 CG(active_class_entry)->clone = (zend_function *) CG(active_op_array);
1116 } else if ((name_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)))) {
1117 CG(active_class_entry)->__call = (zend_function *) CG(active_op_array);
1118 } else if ((name_len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)))) {
1119 CG(active_class_entry)->__get = (zend_function *) CG(active_op_array);
1120 } else if ((name_len == sizeof(ZEND_SET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)))) {
1121 CG(active_class_entry)->__set = (zend_function *) CG(active_op_array);
1/*
2 +----------------------------------------------------------------------+
3 | Zend Engine |
4 +----------------------------------------------------------------------+
5 | Copyright (c) 1998-2004 Zend Technologies Ltd. (http://www.zend.com) |
6 +----------------------------------------------------------------------+
7 | This source file is subject to version 2.00 of the Zend license, |
8 | that is bundled with this package in the file LICENSE, and is |

--- 1105 unchanged lines hidden (view full) ---

1114 } else if ((name_len == sizeof(ZEND_CLONE_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME)))) {
1115 CG(active_class_entry)->clone = (zend_function *) CG(active_op_array);
1116 } else if ((name_len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)))) {
1117 CG(active_class_entry)->__call = (zend_function *) CG(active_op_array);
1118 } else if ((name_len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)))) {
1119 CG(active_class_entry)->__get = (zend_function *) CG(active_op_array);
1120 } else if ((name_len == sizeof(ZEND_SET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_SET_FUNC_NAME, sizeof(ZEND_SET_FUNC_NAME)))) {
1121 CG(active_class_entry)->__set = (zend_function *) CG(active_op_array);
1122 } else if ((name_len == sizeof(ZEND_UNSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_UNSET_FUNC_NAME, sizeof(ZEND_UNSET_FUNC_NAME)))) {
1123 CG(active_class_entry)->__unset = (zend_function *) CG(active_op_array);
1124 } else if ((name_len == sizeof(ZEND_ISSET_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_ISSET_FUNC_NAME, sizeof(ZEND_ISSET_FUNC_NAME)))) {
1125 CG(active_class_entry)->__isset = (zend_function *) CG(active_op_array);
1122 } else if (!(fn_flags & ZEND_ACC_STATIC)) {
1123 CG(active_op_array)->fn_flags |= ZEND_ACC_ALLOW_STATIC;
1124 }
1125 free_alloca(short_class_name);
1126 }
1127
1128 efree(lcname);
1129 } else {

--- 627 unchanged lines hidden (view full) ---

1757 ce->iterator_funcs.funcs = ce->parent->iterator_funcs.funcs;
1758 }
1759 if (!ce->__get) {
1760 ce->__get = ce->parent->__get;
1761 }
1762 if (!ce->__set) {
1763 ce->__set = ce->parent->__set;
1764 }
1126 } else if (!(fn_flags & ZEND_ACC_STATIC)) {
1127 CG(active_op_array)->fn_flags |= ZEND_ACC_ALLOW_STATIC;
1128 }
1129 free_alloca(short_class_name);
1130 }
1131
1132 efree(lcname);
1133 } else {

--- 627 unchanged lines hidden (view full) ---

1761 ce->iterator_funcs.funcs = ce->parent->iterator_funcs.funcs;
1762 }
1763 if (!ce->__get) {
1764 ce->__get = ce->parent->__get;
1765 }
1766 if (!ce->__set) {
1767 ce->__set = ce->parent->__set;
1768 }
1769 if (!ce->__unset) {
1770 ce->__unset = ce->parent->__unset;
1771 }
1772 if (!ce->__isset) {
1773 ce->__isset = ce->parent->__isset;
1774 }
1765 if (!ce->__call) {
1766 ce->__call = ce->parent->__call;
1767 }
1768 if (!ce->clone) {
1769 ce->clone = ce->parent->clone;
1770 }
1771 if(!ce->serialize) {
1772 ce->serialize = ce->parent->serialize;

--- 2154 unchanged lines hidden (view full) ---

3927 zend_hash_init_ex(&ce->function_table, 0, NULL, ZEND_FUNCTION_DTOR, persistent_hashes, 0);
3928
3929 if (nullify_handlers) {
3930 ce->constructor = NULL;
3931 ce->destructor = NULL;
3932 ce->clone = NULL;
3933 ce->__get = NULL;
3934 ce->__set = NULL;
1775 if (!ce->__call) {
1776 ce->__call = ce->parent->__call;
1777 }
1778 if (!ce->clone) {
1779 ce->clone = ce->parent->clone;
1780 }
1781 if(!ce->serialize) {
1782 ce->serialize = ce->parent->serialize;

--- 2154 unchanged lines hidden (view full) ---

3937 zend_hash_init_ex(&ce->function_table, 0, NULL, ZEND_FUNCTION_DTOR, persistent_hashes, 0);
3938
3939 if (nullify_handlers) {
3940 ce->constructor = NULL;
3941 ce->destructor = NULL;
3942 ce->clone = NULL;
3943 ce->__get = NULL;
3944 ce->__set = NULL;
3945 ce->__unset = NULL;
3946 ce->__isset = NULL;
3935 ce->__call = NULL;
3936 ce->create_object = NULL;
3937 ce->get_iterator = NULL;
3938 ce->iterator_funcs.funcs = NULL;
3939 ce->interface_gets_implemented = NULL;
3940 ce->parent = NULL;
3941 ce->num_interfaces = 0;
3942 ce->interfaces = NULL;

--- 37 unchanged lines hidden ---
3947 ce->__call = NULL;
3948 ce->create_object = NULL;
3949 ce->get_iterator = NULL;
3950 ce->iterator_funcs.funcs = NULL;
3951 ce->interface_gets_implemented = NULL;
3952 ce->parent = NULL;
3953 ce->num_interfaces = 0;
3954 ce->interfaces = NULL;

--- 37 unchanged lines hidden ---