cvs: php-src /ext/reflection php_reflection.c

andrei Mon Oct 23 20:00:40 2006 UTC Modified files: /php-src/ext/reflection php_reflection.c Log: Fix remaining Unicode issues. http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.263&r2=1.264&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.263 php-src/ext/reflection/php_reflection.c:1.264 --- php-src/ext/reflection/php_reflection.c:1.263 Wed Oct 18 16:34:25 2006 +++ php-src/ext/reflection/php_reflection.c Mon Oct 23 20:00:40 2006 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_reflection.c,v 1.263 2006/10/18 16:34:25 johannes Exp $ */ +/* $Id: php_reflection.c,v 1.264 2006/10/23 20:00:40 andrei Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2170,26 +2170,33 @@ zend_class_entry *ce; zend_function *mptr; zstr name_str; - char *tmp; + zstr tmp; int name_len, tmp_len; zval ztmp; zend_uchar type; - /* FIXME: Unicode support??? */ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "zt", &classname, &name_str, &name_len, &type) == FAILURE) { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name_str, &name_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t", &name_str, &name_len, &type) == FAILURE) { return; } - if ((tmp = strstr(name_str.s, "::")) == NULL) { - zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Invalid method name %s", name_str); + if ((type == IS_UNICODE && (tmp.u = u_strstr(name_str.u, u_doublecolon)) == NULL) || + (type == IS_STRING && (tmp.s = strstr(name_str.s, "::")) == NULL)) { + zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Invalid method name %R", type, name_str); return; } - type = IS_STRING; classname = &ztmp; - tmp_len = tmp - name_str.s; - ZVAL_STRINGL(classname, name_str.s, tmp_len, 1); + if (type == IS_UNICODE) { + tmp_len = tmp.u - name_str.u; + } else { + tmp_len = tmp.s - name_str.s; + } + ZVAL_ZSTRL(classname, name_str, tmp_len, type, 1); name_len = name_len - (tmp_len + 2); - name_str.s = tmp + 2; + if (type == IS_UNICODE) { + name_str.u = tmp.u + 2; + } else { + name_str.s = tmp.s + 2; + } } object = getThis(); @@ -3121,8 +3128,8 @@ zend_class_entry *ce, **pce; zend_property_info *property_info; zstr name, classname; - char *tmp; - int name_len, classname_len; + zstr tmp; + int name_len, classname_len, tmp_len; zend_uchar name_type; METHOD_NOTSTATIC(reflection_class_ptr); @@ -3131,17 +3138,28 @@ } GET_REFLECTION_OBJECT_PTR(ce); - if (zend_u_hash_find(&ce->properties_info, name_type, name, name_len + 1, (void**) &property_info) == SUCCESS && (property_info->flags & ZEND_ACC_SHADOW) == 0) { - reflection_property_factory(ce, property_info, return_value TSRMLS_CC); + if (zend_u_hash_find(&ce->properties_info, name_type, name, name_len + 1, (void**) &property_info) == SUCCESS) { + if ((property_info->flags & ZEND_ACC_SHADOW) == 0) { + reflection_property_factory(ce, property_info, return_value TSRMLS_CC); + } return; } - /* FIXME: Unicode support??? */ - if ((tmp = strstr(name.s, "::")) != NULL) { - classname_len = tmp - name.s; - classname.s = zend_str_tolower_dup(name.s, classname_len); - classname.s[classname_len] = '\0'; + if ((name_type == IS_UNICODE && (tmp.u = u_strstr(name.u, u_doublecolon)) != NULL) || + (name_type == IS_STRING && (tmp.s = strstr(name.s, "::")) != NULL)) { + + if (name_type == IS_UNICODE) { + classname_len = tmp.u - name.u; + } else { + classname_len = tmp.s - name.s; + } + classname = zend_u_str_case_fold(name_type, name, classname_len, 1, &tmp_len); + classname_len = tmp_len; name_len = name_len - (classname_len + 2); - name.s = tmp + 2; + if (name_type == IS_UNICODE) { + name.u = tmp.u + 2; + } else { + name.s = tmp.s + 2; + } if (zend_u_lookup_class(name_type, classname, classname_len, &pce TSRMLS_CC) == FAILURE) { if (!EG(exception)) { @@ -4930,7 +4948,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.263 2006/10/18 16:34:25 johannes Exp $"); + php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.264 2006/10/23 20:00:40 andrei Exp $"); php_info_print_table_end(); } /* }}} */