helly Thu Apr 8 18:46:43 2004 EDT
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
Fix toString() issue again
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.29&r2=1.30&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.29 php-src/ext/spl/spl_iterators.c:1.30
--- php-src/ext/spl/spl_iterators.c:1.29 Sun Mar 28 12:04:11 2004
+++ php-src/ext/spl/spl_iterators.c Thu Apr 8 18:46:43 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.29 2004/03/28 17:04:11 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.30 2004/04/08 22:46:43 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1054,46 +1054,46 @@
zval_ptr_dtor(&retval);
}
if (intern->u.caching.flags & CIT_CALL_TOSTRING) {
-#if MBO_0
- /* This version requires zend_make_printable_zval() being able
to
- * call __toString().
- */
- int use_copy;
- zval expr_copy;
- ALLOC_ZVAL(intern->u.caching.zstr);
- *intern->u.caching.zstr = *intern->current.data;
- zend_make_printable_zval(intern->u.caching.zstr, &expr_copy,
&use_copy);
- if (use_copy) {
- *intern->u.caching.zstr = expr_copy;
- INIT_PZVAL(intern->u.caching.zstr);
- zval_copy_ctor(intern->u.caching.zstr);
- zval_dtor(&expr_copy);
+ if (Z_TYPE_P(intern->current.data) == IS_OBJECT) {
+ zval expr_copy;
+ if
(intern->current.data->value.obj.handlers->cast_object &&
+
intern->current.data->value.obj.handlers->cast_object(intern->current.data,
&expr_copy, IS_STRING, 0 TSRMLS_CC) == SUCCESS)
+ {
+ ALLOC_ZVAL(intern->u.caching.zstr);
+ *intern->u.caching.zstr = expr_copy;
+ INIT_PZVAL(intern->u.caching.zstr);
+ zval_copy_ctor(intern->u.caching.zstr);
+ zval_dtor(&expr_copy);
+ } else {
+ zend_class_entry *ce_data =
spl_get_class_entry(intern->current.data TSRMLS_CC);
+ if (ce_data &&
zend_hash_exists(&ce_data->function_table, "__tostring", sizeof("__tostring"))) {
+
zend_call_method_with_0_params(&intern->current.data, ce_data, NULL, "__tostring",
&intern->u.caching.zstr);
+ } else {
+ ALLOC_ZVAL(intern->u.caching.zstr);
+ *intern->u.caching.zstr =
*intern->current.data;
+ zval_copy_ctor(intern->u.caching.zstr);
+ INIT_PZVAL(intern->u.caching.zstr);
+
convert_to_string(intern->u.caching.zstr);
+ }
+ }
} else {
- zval_copy_ctor(intern->u.caching.zstr);
- }
-#else
- zval expr_copy;
- if (intern->current.data->value.obj.handlers->cast_object &&
-
intern->current.data->value.obj.handlers->cast_object(intern->current.data,
&expr_copy, IS_STRING, 0 TSRMLS_CC) == SUCCESS)
- {
+ /* This version requires zend_make_printable_zval()
being able to
+ * call __toString().
+ */
+ int use_copy;
+ zval expr_copy;
ALLOC_ZVAL(intern->u.caching.zstr);
- *intern->u.caching.zstr = expr_copy;
- INIT_PZVAL(intern->u.caching.zstr);
- zval_copy_ctor(intern->u.caching.zstr);
- zval_dtor(&expr_copy);
- } else {
- zend_class_entry *ce_data =
spl_get_class_entry(intern->current.data TSRMLS_CC);
- if (ce_data &&
zend_hash_exists(&ce_data->function_table, "__tostring", sizeof("__tostring"))) {
-
zend_call_method_with_0_params(&intern->current.data, ce_data, NULL, "__tostring",
&intern->u.caching.zstr);
+ *intern->u.caching.zstr = *intern->current.data;
+ zend_make_printable_zval(intern->u.caching.zstr,
&expr_copy, &use_copy);
+ if (use_copy) {
+ *intern->u.caching.zstr = expr_copy;
+ INIT_PZVAL(intern->u.caching.zstr);
+ zval_copy_ctor(intern->u.caching.zstr);
+ zval_dtor(&expr_copy);
} else {
- ALLOC_ZVAL(intern->u.caching.zstr);
- *intern->u.caching.zstr =
*intern->current.data;
zval_copy_ctor(intern->u.caching.zstr);
- INIT_PZVAL(intern->u.caching.zstr);
- convert_to_string(intern->u.caching.zstr);
}
}
-#endif
}
spl_dual_it_next(intern, 0 TSRMLS_CC);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
