php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 20:22:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Nicer handling of protected/private members in print_r()

Browse Source
This commit is contained in:
Zeev Suraski
2003-06-08 18:53:58 +00:00
parent faefdb7bdd
commit d329ce93f2
3 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Zend/zend.c
View File

@@ -112,7 +112,7 @@ static uint zend_version_info_length;
#define PRINT_ZVAL_INDENT 4
static void print_hash(HashTable *ht, int indent TSRMLS_DC)
static void print_hash(HashTable *ht, int indent, zend_bool is_object TSRMLS_DC)
{
zval **tmp;
char *string_key;
@@ -134,7 +134,21 @@ static void print_hash(HashTable *ht, int indent TSRMLS_DC)
ZEND_PUTS("[");
switch (zend_hash_get_current_key_ex(ht, &string_key, &str_len, &num_key, 0, &iterator)) {
case HASH_KEY_IS_STRING:
ZEND_PUTS(string_key);
if (is_object) {
char *prop_name, *class_name;
unmangle_property_name(string_key, &class_name, &prop_name);
ZEND_PUTS(prop_name);
if (class_name) {
if (class_name[0]=='*') {
ZEND_PUTS(":protected");
} else {
ZEND_PUTS(":private");
}
}
} else {
ZEND_PUTS(string_key);
}
break;
case HASH_KEY_IS_LONG:
zend_printf("%ld", num_key);
@@ -331,7 +345,7 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int
expr->value.ht->nApplyCount--;
return;
}
print_hash(expr->value.ht, indent TSRMLS_CC);
print_hash(expr->value.ht, indent, 0 TSRMLS_CC);
expr->value.ht->nApplyCount--;
break;
case IS_OBJECT:
@@ -356,7 +370,7 @@ ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int
properties->nApplyCount--;
return;
}
print_hash(properties, indent TSRMLS_CC);
print_hash(properties, indent, 1 TSRMLS_CC);
properties->nApplyCount--;
}
break;

13
Zend/zend_compile.c
View File

@@ -2357,6 +2357,19 @@ void mangle_property_name(char **dest, int *dest_length, char *src1, int src1_le
}
void unmangle_property_name(char *mangled_property, char **class_name, char **prop_name)
{
*prop_name = *class_name = NULL;
if (mangled_property[0]!=0) {
*prop_name = mangled_property;
return;
}
*class_name = mangled_property+1;
*prop_name = (*class_name)+strlen(*class_name)+1;
}
void zend_do_declare_property(znode *var_name, znode *value, zend_uint access_type TSRMLS_DC)
{
zval *property;

1
Zend/zend_compile.h
View File

@@ -455,6 +455,7 @@ ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC);
ZEND_API void destroy_zend_class(zend_class_entry **pce);
void zend_class_add_ref(zend_class_entry **ce);
void unmangle_property_name(char *mangled_property, char **prop_name, char **class_name);
void zend_duplicate_property_info(zend_property_info *property_info);
void zend_destroy_property_info(zend_property_info *property_info);