andrei Mon Aug 14 21:09:30 2006 UTC
Modified files:
/ZendEngine2 zend_builtin_functions.c
Log:
Remove UTODO's -- this is handled during name mangling/unmangling.
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.322&r2=1.323&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.322
ZendEngine2/zend_builtin_functions.c:1.323
--- ZendEngine2/zend_builtin_functions.c:1.322 Thu Jul 27 08:20:52 2006
+++ ZendEngine2/zend_builtin_functions.c Mon Aug 14 21:09:30 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_builtin_functions.c,v 1.322 2006/07/27 08:20:52 dmitry Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.323 2006/08/14 21:09:30 andrei Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -770,7 +770,6 @@
zend_hash_move_forward_ex(properties, &pos);
zend_u_unmangle_property_name(key_type, key, key_len-1,
&class_name, &prop_name);
if (class_name.v) {
- /* UTODO: Fix this to support Unicode */
if (class_name.s[0] != '*' &&
strcmp(class_name.s, ce->name.s)) {
/* filter privates from base classes */
continue;
@@ -799,7 +798,7 @@
/* }}} */
-/* {{{ proto array get_class_vars(string class_name)
+/* {{{ proto array get_class_vars(string class_name) U
Returns an array of default properties of the class. */
ZEND_FUNCTION(get_class_vars)
{
@@ -824,7 +823,7 @@
/* }}} */
-/* {{{ proto array get_object_vars(object obj)
+/* {{{ proto array get_object_vars(object obj) U
Returns an array of object properties */
ZEND_FUNCTION(get_object_vars)
{
@@ -868,7 +867,6 @@
(*value)->refcount++;
add_u_assoc_zval_ex(return_value,
UG(unicode)?IS_UNICODE:IS_STRING, key, key_len, *value);
} else if (instanceof) {
- /* UTODO: Fix this to support Unicode*/
if (class_name.s[0] == '*' ||
(Z_OBJCE_P(EG(This)) == Z_OBJCE_PP(obj) &&
UG(unicode)?!u_strcmp(Z_OBJCE_P(EG(This))->name.u,
class_name.u):!strcmp(Z_OBJCE_P(EG(This))->name.s, class_name.s))) {
@@ -986,7 +984,7 @@
}
/* }}} */
-/* {{{ proto bool property_exists(mixed object_or_class, string property_name)
+/* {{{ proto bool property_exists(mixed object_or_class, string property_name)
U
Checks if the object or class has a property */
ZEND_FUNCTION(property_exists)
{
@@ -1028,7 +1026,6 @@
RETURN_TRUE;
}
zend_u_unmangle_property_name(Z_TYPE_PP(property),
property_info->name, property_info->name_length, &class_name, &prop_name);
- /* UTODO: Fix this??? */
if (class_name.s[0] == '*') {
if (instanceof_function(EG(scope), ce TSRMLS_CC)) {
RETURN_TRUE;
--
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
