cvs: ZendEngine2 / zend.c

dmitry Mon Aug 15 02:34:22 2005 EDT Modified files: /ZendEngine2 zend.c Log: Fixed print_r() in unicode mode. http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.313&r2=1.314&ty=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.313 ZendEngine2/zend.c:1.314 --- ZendEngine2/zend.c:1.313 Sun Aug 14 17:25:28 2005 +++ ZendEngine2/zend.c Mon Aug 15 02:34:20 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.313 2005/08/14 21:25:28 helly Exp $ */ +/* $Id: zend.c,v 1.314 2005/08/15 06:34:20 dmitry Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -242,6 +242,7 @@ ulong num_key; uint str_len; int i; + zend_uchar ztype; for (i=0; i<indent; i++) { ZEND_PUTS(" "); @@ -258,24 +259,30 @@ ZEND_PUTS("["); switch ((key_type = zend_hash_get_current_key_ex(ht, &string_key, &str_len, &num_key, 0, &iterator))) { case HASH_KEY_IS_STRING: + ztype = IS_STRING; + goto str_type; case HASH_KEY_IS_UNICODE: + ztype = IS_UNICODE; + goto str_type; case HASH_KEY_IS_BINARY: + ztype = IS_BINARY; +str_type: if (is_object) { char *prop_name, *class_name; - zend_u_unmangle_property_name(key_type==HASH_KEY_IS_UNICODE?IS_UNICODE:IS_STRING, string_key, &class_name, &prop_name); + zend_u_unmangle_property_name(ztype, string_key, &class_name, &prop_name); if (class_name) { if (class_name[0]=='*') { - zend_printf("%R:protected", key_type, prop_name); + zend_printf("%R:protected", ztype, prop_name); } else { - zend_printf("%R:%R:private", key_type, prop_name, key_type, class_name); + zend_printf("%R:%R:private", ztype, prop_name, key_type, class_name); } } else { - zend_printf("%R", key_type, prop_name); + zend_printf("%R", ztype, prop_name); } } else { - zend_printf("%R", key_type, string_key); + zend_printf("%R", ztype, string_key); } break; case HASH_KEY_IS_LONG: