cvs: ZendEngine2 / zend.c

helly Sun Aug 14 17:25:30 2005 EDT Modified files: /ZendEngine2 zend.c Log: - Simplify and make work in all modes http://cvs.php.net/diff.php/ZendEngine2/zend.c?r1=1.312&r2=1.313&ty=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.312 ZendEngine2/zend.c:1.313 --- ZendEngine2/zend.c:1.312 Sun Aug 14 11:19:45 2005 +++ ZendEngine2/zend.c Sun Aug 14 17:25:28 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.312 2005/08/14 15:19:45 helly Exp $ */ +/* $Id: zend.c,v 1.313 2005/08/14 21:25:28 helly Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -264,24 +264,18 @@ 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); - if (key_type == HASH_KEY_IS_UNICODE) { - zend_printf("%r", prop_name); - } else { - ZEND_PUTS(prop_name); - } + if (class_name) { if (class_name[0]=='*') { - ZEND_PUTS(":protected"); + zend_printf("%R:protected", key_type, prop_name); } else { - zend_printf(":%r:private", class_name); + zend_printf("%R:%R:private", key_type, prop_name, key_type, class_name); } - } - } else { - if (key_type == HASH_KEY_IS_UNICODE) { - zend_printf("%r", string_key); } else { - ZEND_WRITE(string_key, str_len-1); + zend_printf("%R", key_type, prop_name); } + } else { + zend_printf("%R", key_type, string_key); } break; case HASH_KEY_IS_LONG: