mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-20 10:43:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use appropriate function for property name unmangling.

Browse Source 
# Make Andrey happy
This commit is contained in:
Marcus Boerger 2003-09-02 14:46:02 +00:00
parent 7148cb9e73
commit 560d3ab36a
2 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Zend/zend_reflection_api.c
View File

@ -429,6 +429,8 @@ static void _function_string(string *str, zend_function *fptr, char* indent TSRM
static void _property_string(string *str, zend_property_info *prop, char* indent TSRMLS_DC)
{
char *class_name, *prop_name;
string_printf(str, "%sProperty [ %s", indent,
(prop->flags & ZEND_ACC_IMPLICIT_PUBLIC) ? "<implicit> " : "<default> ");
@ -447,15 +449,9 @@ static void _property_string(string *str, zend_property_info *prop, char* indent
if(prop->flags & ZEND_ACC_STATIC) {
string_printf(str, "static ");
}
/* Unmangle the property name if necessary */
string_printf(str, "$");
if (prop->name[0] != 0) {
string_write(str, prop->name, prop->name_length);
} else {
char* tmp;
tmp= prop->name + 1;
string_printf(str, tmp + strlen(tmp) + 1);
}
unmangle_property_name(prop->name, &class_name, &prop_name);
string_printf(str, "$%s", prop_name);
string_printf(str, " ]\n");
}
@ -579,18 +575,13 @@ void reflection_property_factory(zend_class_entry *ce, zend_property_info *prop,
zval *name;
zval *classname;
property_reference *reference;
char *class_name, *prop_name;
unmangle_property_name(prop->name, &class_name, &prop_name);
MAKE_STD_ZVAL(name);
ZVAL_STRING(name, prop_name, 1);
/* Unmangle the property name if necessary */
if (prop->name[0] != 0) {
ZVAL_STRINGL(name, prop->name, prop->name_length, 1);
} else {
char* tmp;
tmp= prop->name + 1;
ZVAL_STRING(name, tmp + strlen(tmp) + 1, 1);
}
MAKE_STD_ZVAL(classname);
ZVAL_STRINGL(classname, ce->name, ce->name_length, 1);
reflection_instanciate(reflection_property_ptr, object TSRMLS_CC);

27
ext/reflection/php_reflection.c
View File

@ -429,6 +429,8 @@ static void _function_string(string *str, zend_function *fptr, char* indent TSRM
static void _property_string(string *str, zend_property_info *prop, char* indent TSRMLS_DC)
{
char *class_name, *prop_name;
string_printf(str, "%sProperty [ %s", indent,
(prop->flags & ZEND_ACC_IMPLICIT_PUBLIC) ? "<implicit> " : "<default> ");
@ -447,15 +449,9 @@ static void _property_string(string *str, zend_property_info *prop, char* indent
if(prop->flags & ZEND_ACC_STATIC) {
string_printf(str, "static ");
}
/* Unmangle the property name if necessary */
string_printf(str, "$");
if (prop->name[0] != 0) {
string_write(str, prop->name, prop->name_length);
} else {
char* tmp;
tmp= prop->name + 1;
string_printf(str, tmp + strlen(tmp) + 1);
}
unmangle_property_name(prop->name, &class_name, &prop_name);
string_printf(str, "$%s", prop_name);
string_printf(str, " ]\n");
}
@ -579,18 +575,13 @@ void reflection_property_factory(zend_class_entry *ce, zend_property_info *prop,
zval *name;
zval *classname;
property_reference *reference;
char *class_name, *prop_name;
unmangle_property_name(prop->name, &class_name, &prop_name);
MAKE_STD_ZVAL(name);
ZVAL_STRING(name, prop_name, 1);
/* Unmangle the property name if necessary */
if (prop->name[0] != 0) {
ZVAL_STRINGL(name, prop->name, prop->name_length, 1);
} else {
char* tmp;
tmp= prop->name + 1;
ZVAL_STRING(name, tmp + strlen(tmp) + 1, 1);
}
MAKE_STD_ZVAL(classname);
ZVAL_STRINGL(classname, ce->name, ce->name_length, 1);
reflection_instanciate(reflection_property_ptr, object TSRMLS_CC);