cvs: ZendEngine2 / zend_object_handlers.c zend_object_handlers.h

helly Fri Apr 8 07:35:14 2005 EDT Modified files: /ZendEngine2 zend_object_handlers.c zend_object_handlers.h Log: - Simplify getting property info and make it an api function http://cvs.php.net/diff.php/ZendEngine2/zend_object_handlers.c?r1=1.113&r2=1.114&ty=u Index: ZendEngine2/zend_object_handlers.c diff -u ZendEngine2/zend_object_handlers.c:1.113 ZendEngine2/zend_object_handlers.c:1.114 --- ZendEngine2/zend_object_handlers.c:1.113 Sat Mar 19 10:32:18 2005 +++ ZendEngine2/zend_object_handlers.c Fri Apr 8 07:35:11 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_object_handlers.c,v 1.113 2005/03/19 15:32:18 helly Exp $ */ +/* $Id: zend_object_handlers.c,v 1.114 2005/04/08 11:35:11 helly Exp $ */ #include "zend.h" #include "zend_globals.h" @@ -141,15 +141,15 @@ return 0; } -static inline zend_property_info *zend_get_property_info(zend_object *zobj, zval *member, int silent TSRMLS_DC) +ZEND_API struct _zend_property_info *zend_get_property_info(zend_class_entry *ce, zval *member, int silent TSRMLS_DC) { zend_property_info *property_info = NULL; zend_property_info *scope_property_info; zend_bool denied_access = 0; ulong h = zend_get_hash_value(Z_STRVAL_P(member), Z_STRLEN_P(member)+1); - if (zend_hash_quick_find(&zobj->ce->properties_info, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, h, (void **) &property_info)==SUCCESS) { - if (zend_verify_property_access(property_info, zobj->ce TSRMLS_CC)) { + if (zend_hash_quick_find(&ce->properties_info, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, h, (void **) &property_info)==SUCCESS) { + if (zend_verify_property_access(property_info, ce TSRMLS_CC)) { if (property_info->flags & ZEND_ACC_CHANGED && !(property_info->flags & ZEND_ACC_PRIVATE)) { /* We still need to make sure that we're not in a context @@ -164,8 +164,8 @@ denied_access = 1; } } - if (EG(scope) != zobj->ce - && is_derived_class(zobj->ce, EG(scope)) + if (EG(scope) != ce + && is_derived_class(ce, EG(scope)) && EG(scope) && zend_hash_quick_find(&EG(scope)->properties_info, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, h, (void **) &scope_property_info)==SUCCESS && scope_property_info->flags & ZEND_ACC_PRIVATE) { @@ -176,7 +176,7 @@ if (silent) { return NULL; } - zend_error(E_ERROR, "Cannot access %s property %s::$%s", zend_visibility_string(property_info->flags), zobj->ce->name, Z_STRVAL_P(member)); + zend_error(E_ERROR, "Cannot access %s property %s::$%s", zend_visibility_string(property_info->flags), ce->name, Z_STRVAL_P(member)); } else { /* fall through, return property_info... */ } @@ -199,7 +199,7 @@ zend_unmangle_property_name(prop_info_name, &class_name, &prop_name); ZVAL_STRING(&member, prop_name, 0); - property_info = zend_get_property_info(zobj, &member, 1 TSRMLS_CC); + property_info = zend_get_property_info(zobj->ce, &member, 1 TSRMLS_CC); if (!property_info) { return FAILURE; } @@ -236,7 +236,7 @@ #endif /* make zend_get_property_info silent if we have getter - we may want to use it */ - property_info = zend_get_property_info(zobj, member, use_get TSRMLS_CC); + property_info = zend_get_property_info(zobj->ce, member, use_get TSRMLS_CC); if (!property_info || zend_hash_quick_find(zobj->properties, property_info->name, property_info->name_length+1, property_info->h, (void **) &retval) == FAILURE) { if (use_get) { @@ -283,7 +283,7 @@ member = &tmp_member; } - property_info = zend_get_property_info(zobj, member, use_set TSRMLS_CC); + property_info = zend_get_property_info(zobj->ce, member, use_set TSRMLS_CC); if (property_info && zend_hash_quick_find(zobj->properties, property_info->name, property_info->name_length+1, property_info->h, (void **) &variable_ptr) == SUCCESS) { if (*variable_ptr == value) { @@ -425,7 +425,7 @@ fprintf(stderr, "Ptr object #%d property: %s\n", Z_OBJ_HANDLE_P(object), Z_STRVAL_P(member)); #endif - property_info = zend_get_property_info(zobj, member, 0 TSRMLS_CC); + property_info = zend_get_property_info(zobj->ce, member, 0 TSRMLS_CC); if (zend_hash_quick_find(zobj->properties, property_info->name, property_info->name_length+1, property_info->h, (void **) &retval) == FAILURE) { zval *new_zval; @@ -464,7 +464,7 @@ member = &tmp_member; } - property_info = zend_get_property_info(zobj, member, 0 TSRMLS_CC); + property_info = zend_get_property_info(zobj->ce, member, 0 TSRMLS_CC); zend_hash_del(zobj->properties, property_info->name, property_info->name_length+1); if (member == &tmp_member) { @@ -811,7 +811,7 @@ fprintf(stderr, "Read object #%d property: %s\n", Z_OBJ_HANDLE_P(object), Z_STRVAL_P(member)); #endif - property_info = zend_get_property_info(zobj, member, 0 TSRMLS_CC); + property_info = zend_get_property_info(zobj->ce, member, 0 TSRMLS_CC); if (zend_hash_find(zobj->properties, property_info->name, property_info->name_length+1, (void **) &value) == SUCCESS) { if (check_empty) { http://cvs.php.net/diff.php/ZendEngine2/zend_object_handlers.h?r1=1.42&r2=1.43&ty=u Index: ZendEngine2/zend_object_handlers.h diff -u ZendEngine2/zend_object_handlers.h:1.42 ZendEngine2/zend_object_handlers.h:1.43 --- ZendEngine2/zend_object_handlers.h:1.42 Sat Oct 30 15:11:37 2004 +++ ZendEngine2/zend_object_handlers.h Fri Apr 8 07:35:11 2005 @@ -17,12 +17,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_object_handlers.h,v 1.42 2004/10/30 19:11:37 helly Exp $ */ +/* $Id: zend_object_handlers.h,v 1.43 2005/04/08 11:35:11 helly Exp $ */ #ifndef ZEND_OBJECT_HANDLERS_H #define ZEND_OBJECT_HANDLERS_H union _zend_function; +struct _zend_property_info; /* The following rule applies to read_property() and read_dimension() implementations: If you return a zval which is not otherwise referenced by the extension or the engine's @@ -130,6 +131,7 @@ ZEND_API union _zend_function *zend_std_get_static_method(zend_class_entry *ce, char *function_name_strval, int function_name_strlen TSRMLS_DC); ZEND_API zval **zend_std_get_static_property(zend_class_entry *ce, char *property_name, int property_name_len, zend_bool silent TSRMLS_DC); ZEND_API zend_bool zend_std_unset_static_property(zend_class_entry *ce, char *property_name, int property_name_len TSRMLS_DC); +ZEND_API struct _zend_property_info *zend_get_property_info(zend_class_entry *ce, zval *member, int silent TSRMLS_DC); ZEND_API int zend_std_cast_object_tostring(zval *readobj, zval *writeobj, int type, int should_free TSRMLS_DC);