archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Implement zend_print_flat_zval_r() using smart_str

Browse source 
Use the same implementation approach as for the non-flat
zend_print_zval_r() function.
This commit is contained in:
Nikita Popov 2021-04-15 11:46:30 +02:00
parent 1215563288
commit 91b6895e79
1 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

55
Zend/zend.c
View file

@ -342,7 +342,9 @@ static void print_hash(smart_str *buf, HashTable *ht, int indent, bool is_object
}
/* }}} */
static void print_flat_hash(HashTable *ht) /* {{{ */
static void zend_print_flat_zval_r_to_buf(smart_str *buf, zval *expr);
static void print_flat_hash(smart_str *buf, HashTable *ht) /* {{{ */
{
zval *tmp;
zend_string *string_key;
@ -351,16 +353,16 @@ static void print_flat_hash(HashTable *ht) /* {{{ */
ZEND_HASH_FOREACH_KEY_VAL_IND(ht, num_key, string_key, tmp) {
if (i++ > 0) {
ZEND_PUTS(",");
smart_str_appendc(buf, ',');
}
ZEND_PUTS("[");
smart_str_appendc(buf, '[');
if (string_key) {
ZEND_WRITE(ZSTR_VAL(string_key), ZSTR_LEN(string_key));
smart_str_append(buf, string_key);
} else {
zend_printf(ZEND_ULONG_FMT, num_key);
smart_str_append_unsigned(buf, num_key);
}
ZEND_PUTS("] => ");
zend_print_flat_zval_r(tmp);
smart_str_appends(buf, "] => ");
zend_print_flat_zval_r_to_buf(buf, tmp);
} ZEND_HASH_FOREACH_END();
}
/* }}} */
@ -391,53 +393,70 @@ ZEND_API size_t zend_print_zval(zval *expr, int indent) /* {{{ */
}
/* }}} */
ZEND_API void zend_print_flat_zval_r(zval *expr) /* {{{ */
static void zend_print_flat_zval_r_to_buf(smart_str *buf, zval *expr) /* {{{ */
{
switch (Z_TYPE_P(expr)) {
case IS_ARRAY:
ZEND_PUTS("Array (");
smart_str_appends(buf, "Array (");
if (!(GC_FLAGS(Z_ARRVAL_P(expr)) & GC_IMMUTABLE)) {
if (GC_IS_RECURSIVE(Z_ARRVAL_P(expr))) {
ZEND_PUTS(" *RECURSION*");
smart_str_appends(buf, " *RECURSION*");
return;
}
GC_PROTECT_RECURSION(Z_ARRVAL_P(expr));
}
print_flat_hash(Z_ARRVAL_P(expr));
ZEND_PUTS(")");
print_flat_hash(buf, Z_ARRVAL_P(expr));
smart_str_appendc(buf, ')');
GC_TRY_UNPROTECT_RECURSION(Z_ARRVAL_P(expr));
break;
case IS_OBJECT:
{
HashTable *properties;
zend_string *class_name = Z_OBJ_HANDLER_P(expr, get_class_name)(Z_OBJ_P(expr));
zend_printf("%s Object (", ZSTR_VAL(class_name));
smart_str_append(buf, class_name);
smart_str_appends(buf, " Object (");
zend_string_release_ex(class_name, 0);
if (GC_IS_RECURSIVE(Z_COUNTED_P(expr))) {
ZEND_PUTS(" *RECURSION*");
smart_str_appends(buf, " *RECURSION*");
return;
}
properties = Z_OBJPROP_P(expr);
if (properties) {
GC_PROTECT_RECURSION(Z_OBJ_P(expr));
print_flat_hash(properties);
print_flat_hash(buf, properties);
GC_UNPROTECT_RECURSION(Z_OBJ_P(expr));
}
ZEND_PUTS(")");
smart_str_appendc(buf, ')');
break;
}
case IS_REFERENCE:
zend_print_flat_zval_r(Z_REFVAL_P(expr));
zend_print_flat_zval_r_to_buf(buf, Z_REFVAL_P(expr));
break;
case IS_STRING:
smart_str_append(buf, Z_STR_P(expr));
break;
default:
zend_print_zval(expr, 0);
{
zend_string *str = zval_get_string_func(expr);
smart_str_append(buf, str);
zend_string_release_ex(str, 0);
break;
}
}
}
/* }}} */
ZEND_API void zend_print_flat_zval_r(zval *expr)
{
smart_str buf = {0};
zend_print_flat_zval_r_to_buf(&buf, expr);
smart_str_0(&buf);
zend_write(ZSTR_VAL(buf.s), ZSTR_LEN(buf.s));
smart_str_free(&buf);
}
static void zend_print_zval_r_to_buf(smart_str *buf, zval *expr, int indent) /* {{{ */
{
switch (Z_TYPE_P(expr)) {