archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Slightly clean up reflection constant printing

Browse source 
The basic formatting is always the same, the only thing that
differs is how the value is printed, so don't duplicate the rest.
This commit is contained in:
Nikita Popov 2021-07-06 16:25:05 +02:00
parent 5502910ed8
commit f43a19ee94
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ext/reflection/php_reflection.c
View file

@ -560,30 +560,25 @@ static void _const_string(smart_str *str, char *name, zval *value, char *indent)
/* {{{ _class_const_string */ /* {{{ _class_const_string */
static void _class_const_string(smart_str *str, char *name, zend_class_constant *c, char *indent) static void _class_const_string(smart_str *str, char *name, zend_class_constant *c, char *indent)
{ {
char *visibility = zend_visibility_string(ZEND_CLASS_CONST_FLAGS(c));
const char *type;
if (zval_update_constant_ex(&c->value, c->ce) == FAILURE) { if (zval_update_constant_ex(&c->value, c->ce) == FAILURE) {
return; return;
} }
type = zend_zval_type_name(&c->value); const char *visibility = zend_visibility_string(ZEND_CLASS_CONST_FLAGS(c));
const char *type = zend_zval_type_name(&c->value);
smart_str_append_printf(str, "%sConstant [ %s %s %s ] { ",
indent, visibility, type, name);
if (Z_TYPE(c->value) == IS_ARRAY) { if (Z_TYPE(c->value) == IS_ARRAY) {
smart_str_append_printf(str, "%sConstant [ %s %s %s ] { Array }\n", smart_str_appends(str, "Array");
indent, visibility, type, name);
} else if (Z_TYPE(c->value) == IS_OBJECT) { } else if (Z_TYPE(c->value) == IS_OBJECT) {
smart_str_append_printf(str, "%sConstant [ %s %s %s ] { Object }\n", smart_str_appends(str, "Object");
indent, visibility, type, name);
} else { } else {
zend_string *tmp_value_str; zend_string *tmp_value_str;
zend_string *value_str = zval_get_tmp_string(&c->value, &tmp_value_str); zend_string *value_str = zval_get_tmp_string(&c->value, &tmp_value_str);
smart_str_append(str, value_str);
smart_str_append_printf(str, "%sConstant [ %s %s %s ] { %s }\n",
indent, visibility, type, name, ZSTR_VAL(value_str));
zend_tmp_string_release(tmp_value_str); zend_tmp_string_release(tmp_value_str);
} }
smart_str_appends(str, " }\n");
} }
/* }}} */ /* }}} */