helly Wed May 10 00:03:38 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/spl spl_array.c spl_array.h spl_exceptions.c
spl_iterators.c spl_iterators.h
Log:
- Update after api changes
- MFH
. ArrayIterator/ArrayObject: function lookup caches and array functions
. Added RegExIterator, RecursiveRegExIterator
. Added (full) caching support for CachingIterator
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17&r2=1.71.2.17.2.1&diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17
php-src/ext/spl/spl_array.c:1.71.2.17.2.1
--- php-src/ext/spl/spl_array.c:1.71.2.17 Fri Apr 7 22:53:23 2006
+++ php-src/ext/spl/spl_array.c Wed May 10 00:03:38 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.c,v 1.71.2.17 2006/04/07 22:53:23 tony2001 Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.1 2006/05/10 00:03:38 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -46,10 +46,15 @@
#define SPL_ARRAY_STD_PROP_LIST 0x00000001
#define SPL_ARRAY_ARRAY_AS_PROPS 0x00000002
+#define SPL_ARRAY_OVERLOADED_REWIND 0x00010000
+#define SPL_ARRAY_OVERLOADED_VALID 0x00020000
+#define SPL_ARRAY_OVERLOADED_KEY 0x00040000
+#define SPL_ARRAY_OVERLOADED_CURRENT 0x00080000
+#define SPL_ARRAY_OVERLOADED_NEXT 0x00100000
#define SPL_ARRAY_IS_REF 0x01000000
#define SPL_ARRAY_IS_SELF 0x02000000
#define SPL_ARRAY_USE_OTHER 0x04000000
-#define SPL_ARRAY_INT_MASK 0xFF000000
+#define SPL_ARRAY_INT_MASK 0xFFFF0000
#define SPL_ARRAY_CLONE_MASK 0x03000007
typedef struct _spl_array_object {
@@ -114,7 +119,7 @@
}
/* }}} */
-zend_object_iterator *spl_array_get_iterator(zend_class_entry *ce, zval
*object TSRMLS_DC);
+zend_object_iterator *spl_array_get_iterator(zend_class_entry *ce, zval
*object, int by_ref TSRMLS_DC);
/* {{{ spl_array_object_new */
static zend_object_value spl_array_object_new_ex(zend_class_entry *class_type,
spl_array_object **obj, zval *orig, int clone_orig TSRMLS_DC)
@@ -166,6 +171,7 @@
while (parent) {
if (parent == spl_ce_ArrayIterator || parent ==
spl_ce_RecursiveArrayIterator) {
retval.handlers = &spl_handler_ArrayIterator;
+ class_type->get_iterator = spl_array_get_iterator;
break;
} else if (parent == spl_ce_ArrayObject) {
retval.handlers = &spl_handler_ArrayObject;
@@ -195,7 +201,25 @@
intern->fptr_offset_del = NULL;
}
}
- intern->ce_get_iterator = spl_ce_ArrayIterator;
+ /* Cache iterator functions if ArrayIterator or derived. Check
current's */
+ /* cache since only current is always required */
+ if (retval.handlers == &spl_handler_ArrayIterator) {
+ if (!class_type->iterator_funcs.zf_current) {
+ zend_hash_find(&class_type->function_table, "rewind",
sizeof("rewind"), (void **) &class_type->iterator_funcs.zf_rewind);
+ zend_hash_find(&class_type->function_table, "valid",
sizeof("valid"), (void **) &class_type->iterator_funcs.zf_valid);
+ zend_hash_find(&class_type->function_table, "key",
sizeof("key"), (void **) &class_type->iterator_funcs.zf_key);
+ zend_hash_find(&class_type->function_table, "current",
sizeof("current"), (void **) &class_type->iterator_funcs.zf_current);
+ zend_hash_find(&class_type->function_table, "next",
sizeof("next"), (void **) &class_type->iterator_funcs.zf_next);
+ }
+ if (inherited) {
+ if (class_type->iterator_funcs.zf_rewind->common.scope
!= parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_REWIND;
+ if (class_type->iterator_funcs.zf_valid->common.scope
!= parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_VALID;
+ if (class_type->iterator_funcs.zf_key->common.scope
!= parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_KEY;
+ if (class_type->iterator_funcs.zf_current->common.scope
!= parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_CURRENT;
+ if (class_type->iterator_funcs.zf_next->common.scope
!= parent) intern->ar_flags |= SPL_ARRAY_OVERLOADED_NEXT;
+ }
+ }
+
zend_hash_internal_pointer_reset_ex(spl_array_get_hash_table(intern, 0
TSRMLS_CC), &intern->pos);
return retval;
}
@@ -659,7 +683,7 @@
/* define an overloaded iterator structure */
typedef struct {
- zend_object_iterator intern;
+ zend_user_iterator intern;
spl_array_object *object;
} spl_array_it;
@@ -667,7 +691,8 @@
{
spl_array_it *iterator = (spl_array_it *)iter;
- zval_ptr_dtor((zval**)&iterator->intern.data);
+ zend_user_it_invalidate_current(iter TSRMLS_CC);
+ zval_ptr_dtor((zval**)&iterator->intern.it.data);
efree(iterator);
}
@@ -679,16 +704,20 @@
spl_array_object *object = iterator->object;
HashTable *aht = spl_array_get_hash_table(object, 0
TSRMLS_CC);
- if (!aht) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"ArrayIterator::valid(): Array was modified outside object and is no longer an
array");
- return FAILURE;
- }
-
- if (object->pos && (object->ar_flags & SPL_ARRAY_IS_REF) &&
spl_hash_verify_pos(object TSRMLS_CC) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"ArrayIterator::valid(): Array was modified outside object and internal
position is no longer valid");
- return FAILURE;
+ if (object->ar_flags & SPL_ARRAY_OVERLOADED_VALID) {
+ return zend_user_it_valid(iter TSRMLS_CC);
} else {
- return zend_hash_has_more_elements_ex(aht, &object->pos);
+ if (!aht) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"ArrayIterator::valid(): Array was modified outside object and is no longer an
array");
+ return FAILURE;
+ }
+
+ if (object->pos && (object->ar_flags & SPL_ARRAY_IS_REF) &&
spl_hash_verify_pos(object TSRMLS_CC) == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"ArrayIterator::valid(): Array was modified outside object and internal
position is no longer valid");
+ return FAILURE;
+ } else {
+ return zend_hash_has_more_elements_ex(aht,
&object->pos);
+ }
}
}
/* }}} */
@@ -698,9 +727,13 @@
spl_array_it *iterator = (spl_array_it *)iter;
spl_array_object *object = iterator->object;
HashTable *aht = spl_array_get_hash_table(object, 0
TSRMLS_CC);
-
- if (zend_hash_get_current_data_ex(aht, (void**)data, &object->pos) ==
FAILURE) {
- *data = NULL;
+
+ if (object->ar_flags & SPL_ARRAY_OVERLOADED_CURRENT) {
+ zend_user_it_get_current_data(iter, data TSRMLS_CC);
+ } else {
+ if (zend_hash_get_current_data_ex(aht, (void**)data,
&object->pos) == FAILURE) {
+ *data = NULL;
+ }
}
}
/* }}} */
@@ -711,17 +744,21 @@
spl_array_object *object = iterator->object;
HashTable *aht = spl_array_get_hash_table(object, 0
TSRMLS_CC);
- if (!aht) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"ArrayIterator::current(): Array was modified outside object and is no longer
an array");
- return HASH_KEY_NON_EXISTANT;
- }
-
- if ((object->ar_flags & SPL_ARRAY_IS_REF) && spl_hash_verify_pos(object
TSRMLS_CC) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"ArrayIterator::current(): Array was modified outside object and internal
position is no longer valid");
- return HASH_KEY_NON_EXISTANT;
+ if (object->ar_flags & SPL_ARRAY_OVERLOADED_KEY) {
+ return zend_user_it_get_current_key(iter, str_key, str_key_len,
int_key TSRMLS_CC);
+ } else {
+ if (!aht) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"ArrayIterator::current(): Array was modified outside object and is no longer
an array");
+ return HASH_KEY_NON_EXISTANT;
+ }
+
+ if ((object->ar_flags & SPL_ARRAY_IS_REF) &&
spl_hash_verify_pos(object TSRMLS_CC) == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"ArrayIterator::current(): Array was modified outside object and internal
position is no longer valid");
+ return HASH_KEY_NON_EXISTANT;
+ }
+
+ return zend_hash_get_current_key_ex(aht, str_key, str_key_len,
int_key, 1, &object->pos);
}
-
- return zend_hash_get_current_key_ex(aht, str_key, str_key_len, int_key,
1, &object->pos);
}
/* }}} */
@@ -731,15 +768,20 @@
spl_array_object *object = iterator->object;
HashTable *aht = spl_array_get_hash_table(object, 0
TSRMLS_CC);
- if (!aht) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"ArrayIterator::current(): Array was modified outside object and is no longer
an array");
- return;
- }
-
- if ((object->ar_flags & SPL_ARRAY_IS_REF) && spl_hash_verify_pos(object
TSRMLS_CC) == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"ArrayIterator::next(): Array was modified outside object and internal position
is no longer valid");
+ if (object->ar_flags & SPL_ARRAY_OVERLOADED_NEXT) {
+ zend_user_it_move_forward(iter TSRMLS_CC);
} else {
- spl_array_next(object TSRMLS_CC);
+ zend_user_it_invalidate_current(iter TSRMLS_CC);
+ if (!aht) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"ArrayIterator::current(): Array was modified outside object and is no longer
an array");
+ return;
+ }
+
+ if ((object->ar_flags & SPL_ARRAY_IS_REF) &&
spl_hash_verify_pos(object TSRMLS_CC) == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE,
"ArrayIterator::next(): Array was modified outside object and internal position
is no longer valid");
+ } else {
+ spl_array_next(object TSRMLS_CC);
+ }
}
}
/* }}} */
@@ -763,7 +805,12 @@
spl_array_it *iterator = (spl_array_it *)iter;
spl_array_object *object = iterator->object;
- spl_array_rewind(object TSRMLS_CC);
+ if (object->ar_flags & SPL_ARRAY_OVERLOADED_REWIND) {
+ zend_user_it_rewind(iter TSRMLS_CC);
+ } else {
+ zend_user_it_invalidate_current(iter TSRMLS_CC);
+ spl_array_rewind(object TSRMLS_CC);
+ }
}
/* }}} */
@@ -777,14 +824,22 @@
spl_array_it_rewind
};
-zend_object_iterator *spl_array_get_iterator(zend_class_entry *ce, zval
*object TSRMLS_DC) /* {{{ */
+zend_object_iterator *spl_array_get_iterator(zend_class_entry *ce, zval
*object, int by_ref TSRMLS_DC) /* {{{ */
{
- spl_array_it *iterator = emalloc(sizeof(spl_array_it));
+ spl_array_it *iterator;
spl_array_object *array_object =
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
+ if (by_ref && (array_object->ar_flags & SPL_ARRAY_OVERLOADED_CURRENT)) {
+ zend_error(E_ERROR, "An iterator cannot be used with foreach by
reference");
+ }
+
+ iterator = emalloc(sizeof(spl_array_it));
+
object->refcount++;
- iterator->intern.data = (void*)object;
- iterator->intern.funcs = &spl_array_it_funcs;
+ iterator->intern.it.data = (void*)object;
+ iterator->intern.it.funcs = &spl_array_it_funcs;
+ iterator->intern.ce = ce;
+ iterator->intern.value = NULL;
iterator->object = array_object;
return (zend_object_iterator*)iterator;
@@ -1077,6 +1132,63 @@
RETURN_LONG(count);
} /* }}} */
+static void spl_array_method(INTERNAL_FUNCTION_PARAMETERS, char *fname, int
fname_len, int use_arg)
+{
+ spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
+ HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
+ zval tmp, *arg;
+
+ INIT_PZVAL(&tmp);
+ Z_TYPE(tmp) = IS_ARRAY;
+ Z_ARRVAL(tmp) = aht;
+
+ if (use_arg) {
+ if (ZEND_NUM_ARGS() != 1 ||
zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
"z", &arg) == FAILURE) {
+ zend_throw_exception(spl_ce_BadMethodCallException,
"Function expects exactly one argument", 0 TSRMLS_CC);
+ return;
+ }
+ zend_call_method(NULL, NULL, NULL, fname, fname_len,
&return_value, 2, &tmp, arg TSRMLS_CC);
+ } else {
+ zend_call_method(NULL, NULL, NULL, fname, fname_len,
&return_value, 1, &tmp, NULL TSRMLS_CC);
+ }
+}
+
+#define SPL_ARRAY_METHOD(cname, fname, use_arg) \
+SPL_METHOD(cname, fname) \
+{ \
+ spl_array_method(INTERNAL_FUNCTION_PARAM_PASSTHRU, #fname,
sizeof(#fname)-1, use_arg); \
+}
+
+/* {{{ proto int ArrayObject::asort()
+ proto int ArrayIterator::asort()
+ Sort the entries by values. */
+SPL_ARRAY_METHOD(Array, asort, 0)
+
+/* {{{ proto int ArrayObject::ksort()
+ proto int ArrayIterator::ksort()
+ Sort the entries by key. */
+SPL_ARRAY_METHOD(Array, ksort, 0)
+
+/* {{{ proto int ArrayObject::uasort(callback cmp_function)
+ proto int ArrayIterator::uasort(callback cmp_function)
+ Sort the entries by values user defined function. */
+SPL_ARRAY_METHOD(Array, uasort, 1)
+
+/* {{{ proto int ArrayObject::uksort(callback cmp_function)
+ proto int ArrayIterator::uksort(callback cmp_function)
+ Sort the entries by key using user defined function. */
+SPL_ARRAY_METHOD(Array, uksort, 1)
+
+/* {{{ proto int ArrayObject::natsort()
+ proto int ArrayIterator::natsort()
+ Sort the entries by values using "natural order" algorithm. */
+SPL_ARRAY_METHOD(Array, natsort, 0)
+
+/* {{{ proto int ArrayObject::natcasesort()
+ proto int ArrayIterator::natcasesort()
+ Sort the entries by key using case insensitive "natural order" algorithm. */
+SPL_ARRAY_METHOD(Array, natcasesort, 0)
+
/* {{{ proto mixed|NULL ArrayIterator::current()
Return current array entry */
SPL_METHOD(Array, current)
@@ -1107,7 +1219,11 @@
Return current array key */
SPL_METHOD(Array, key)
{
- zval *object = getThis();
+ spl_array_iterator_key(getThis(), return_value TSRMLS_CC);
+}
+
+void spl_array_iterator_key(zval *object, zval *return_value TSRMLS_DC) /* {{{
*/
+{
spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
char *string_key;
uint string_length;
@@ -1273,17 +1389,28 @@
ZEND_ARG_INFO(0, iteratorClass)
ZEND_END_ARG_INFO()
+static
+ZEND_BEGIN_ARG_INFO(arginfo_array_uXsort, 0)
+ ZEND_ARG_INFO(0, cmp_function )
+ZEND_END_ARG_INFO();
+
static zend_function_entry spl_funcs_ArrayObject[] = {
- SPL_ME(Array, __construct, arginfo_array___construct, ZEND_ACC_PUBLIC)
- SPL_ME(Array, offsetExists, arginfo_array_offsetGet, ZEND_ACC_PUBLIC)
- SPL_ME(Array, offsetGet, arginfo_array_offsetGet, ZEND_ACC_PUBLIC)
- SPL_ME(Array, offsetSet, arginfo_array_offsetSet, ZEND_ACC_PUBLIC)
- SPL_ME(Array, offsetUnset, arginfo_array_offsetGet, ZEND_ACC_PUBLIC)
- SPL_ME(Array, append, arginfo_array_append, ZEND_ACC_PUBLIC)
- SPL_ME(Array, getArrayCopy, NULL, ZEND_ACC_PUBLIC)
- SPL_ME(Array, count, NULL, ZEND_ACC_PUBLIC)
- SPL_ME(Array, getFlags, NULL, ZEND_ACC_PUBLIC)
- SPL_ME(Array, setFlags, arginfo_array_setFlags, ZEND_ACC_PUBLIC)
+ SPL_ME(Array, __construct, arginfo_array___construct,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, offsetExists, arginfo_array_offsetGet,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, offsetGet, arginfo_array_offsetGet,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, offsetSet, arginfo_array_offsetSet,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, offsetUnset, arginfo_array_offsetGet,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, append, arginfo_array_append,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, getArrayCopy, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, count, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, getFlags, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, setFlags, arginfo_array_setFlags,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, asort, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, ksort, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, uasort, arginfo_array_uXsort,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, uksort, arginfo_array_uXsort,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, natsort, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, natcasesort, NULL,
ZEND_ACC_PUBLIC)
/* ArrayObject specific */
SPL_ME(Array, getIterator, NULL,
ZEND_ACC_PUBLIC)
SPL_ME(Array, exchangeArray, arginfo_array_exchangeArray,
ZEND_ACC_PUBLIC)
@@ -1293,23 +1420,29 @@
};
static zend_function_entry spl_funcs_ArrayIterator[] = {
- SPL_ME(Array, __construct, arginfo_array___construct, ZEND_ACC_PUBLIC)
- SPL_ME(Array, offsetExists, arginfo_array_offsetGet, ZEND_ACC_PUBLIC)
- SPL_ME(Array, offsetGet, arginfo_array_offsetGet, ZEND_ACC_PUBLIC)
- SPL_ME(Array, offsetSet, arginfo_array_offsetSet, ZEND_ACC_PUBLIC)
- SPL_ME(Array, offsetUnset, arginfo_array_offsetGet, ZEND_ACC_PUBLIC)
- SPL_ME(Array, append, arginfo_array_append, ZEND_ACC_PUBLIC)
- SPL_ME(Array, getArrayCopy, NULL, ZEND_ACC_PUBLIC)
- SPL_ME(Array, count, NULL, ZEND_ACC_PUBLIC)
- SPL_ME(Array, getFlags, NULL, ZEND_ACC_PUBLIC)
- SPL_ME(Array, setFlags, arginfo_array_setFlags, ZEND_ACC_PUBLIC)
+ SPL_ME(Array, __construct, arginfo_array___construct,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, offsetExists, arginfo_array_offsetGet,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, offsetGet, arginfo_array_offsetGet,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, offsetSet, arginfo_array_offsetSet,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, offsetUnset, arginfo_array_offsetGet,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, append, arginfo_array_append,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, getArrayCopy, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, count, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, getFlags, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, setFlags, arginfo_array_setFlags,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, asort, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, ksort, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, uasort, arginfo_array_uXsort,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, uksort, arginfo_array_uXsort,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, natsort, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, natcasesort, NULL,
ZEND_ACC_PUBLIC)
/* ArrayIterator specific */
- SPL_ME(Array, rewind, NULL, ZEND_ACC_PUBLIC)
- SPL_ME(Array, current, NULL, ZEND_ACC_PUBLIC)
- SPL_ME(Array, key, NULL, ZEND_ACC_PUBLIC)
- SPL_ME(Array, next, NULL, ZEND_ACC_PUBLIC)
- SPL_ME(Array, valid, NULL, ZEND_ACC_PUBLIC)
- SPL_ME(Array, seek, arginfo_array_seek, ZEND_ACC_PUBLIC)
+ SPL_ME(Array, rewind, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, current, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, key, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, next, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, valid, NULL,
ZEND_ACC_PUBLIC)
+ SPL_ME(Array, seek, arginfo_array_seek,
ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
@@ -1355,6 +1488,7 @@
REGISTER_SPL_SUB_CLASS_EX(RecursiveArrayIterator, ArrayIterator,
spl_array_object_new, spl_funcs_RecursiveArrayIterator);
REGISTER_SPL_IMPLEMENTS(RecursiveArrayIterator, RecursiveIterator);
+ spl_ce_RecursiveArrayIterator->get_iterator = spl_array_get_iterator;
REGISTER_SPL_INTERFACE(Countable);
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.h?r1=1.13.2.2&r2=1.13.2.2.2.1&diff_format=u
Index: php-src/ext/spl/spl_array.h
diff -u php-src/ext/spl/spl_array.h:1.13.2.2
php-src/ext/spl/spl_array.h:1.13.2.2.2.1
--- php-src/ext/spl/spl_array.h:1.13.2.2 Sun Jan 1 12:50:13 2006
+++ php-src/ext/spl/spl_array.h Wed May 10 00:03:38 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_array.h,v 1.13.2.2 2006/01/01 12:50:13 sniper Exp $ */
+/* $Id: spl_array.h,v 1.13.2.2.2.1 2006/05/10 00:03:38 helly Exp $ */
#ifndef SPL_ARRAY_H
#define SPL_ARRAY_H
@@ -32,6 +32,7 @@
PHP_MINIT_FUNCTION(spl_array);
extern void spl_array_iterator_append(zval *object, zval *append_value
TSRMLS_DC);
+extern void spl_array_iterator_key(zval *object, zval *return_value TSRMLS_DC);
#endif /* SPL_ARRAY_H */
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_exceptions.c?r1=1.6.2.1&r2=1.6.2.1.2.1&diff_format=u
Index: php-src/ext/spl/spl_exceptions.c
diff -u php-src/ext/spl/spl_exceptions.c:1.6.2.1
php-src/ext/spl/spl_exceptions.c:1.6.2.1.2.1
--- php-src/ext/spl/spl_exceptions.c:1.6.2.1 Sun Jan 1 12:50:13 2006
+++ php-src/ext/spl/spl_exceptions.c Wed May 10 00:03:38 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_exceptions.c,v 1.6.2.1 2006/01/01 12:50:13 sniper Exp $ */
+/* $Id: spl_exceptions.c,v 1.6.2.1.2.1 2006/05/10 00:03:38 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -47,7 +47,7 @@
PHPAPI zend_class_entry *spl_ce_UnderflowException;
PHPAPI zend_class_entry *spl_ce_UnexpectedValueException;
-#define spl_ce_Exception zend_exception_get_default()
+#define spl_ce_Exception zend_exception_get_default(TSRMLS_C)
/* {{{ PHP_MINIT_FUNCTION(spl_exceptions) */
PHP_MINIT_FUNCTION(spl_exceptions)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30&r2=1.73.2.30.2.1&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.1
--- php-src/ext/spl/spl_iterators.c:1.73.2.30 Thu Apr 13 13:21:43 2006
+++ php-src/ext/spl/spl_iterators.c Wed May 10 00:03:38 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30 2006/04/13 13:21:43 tony2001 Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.1 2006/05/10 00:03:38 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -55,6 +55,8 @@
PHPAPI zend_class_entry *spl_ce_InfiniteIterator;
PHPAPI zend_class_entry *spl_ce_EmptyIterator;
PHPAPI zend_class_entry *spl_ce_AppendIterator;
+PHPAPI zend_class_entry *spl_ce_RegExIterator;
+PHPAPI zend_class_entry *spl_ce_RecursiveRegExIterator;
zend_function_entry spl_funcs_RecursiveIterator[] = {
SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, NULL)
@@ -280,7 +282,7 @@
object->iterators[object->level].state
= RS_NEXT;
}
object->iterators = erealloc(object->iterators,
sizeof(spl_sub_iterator) * (++object->level+1));
- sub_iter = ce->get_iterator(ce, child
TSRMLS_CC);
+ sub_iter = ce->get_iterator(ce, child, 0
TSRMLS_CC);
object->iterators[object->level].iterator =
sub_iter;
object->iterators[object->level].zobject =
child;
object->iterators[object->level].ce = ce;
@@ -342,10 +344,16 @@
spl_recursive_it_rewind_ex((spl_recursive_it_object*)iter->data,
((spl_recursive_it_iterator*)iter)->zobject TSRMLS_CC);
}
-static zend_object_iterator *spl_recursive_it_get_iterator(zend_class_entry
*ce, zval *zobject TSRMLS_DC)
+static zend_object_iterator *spl_recursive_it_get_iterator(zend_class_entry
*ce, zval *zobject, int by_ref TSRMLS_DC)
{
- spl_recursive_it_iterator *iterator =
emalloc(sizeof(spl_recursive_it_iterator));
- spl_recursive_it_object *object =
(spl_recursive_it_object*)zend_object_store_get_object(zobject TSRMLS_CC);
+ spl_recursive_it_iterator *iterator;
+ spl_recursive_it_object *object;
+
+ if (by_ref) {
+ zend_error(E_ERROR, "An iterator cannot be used with foreach by
reference");
+ }
+ iterator = emalloc(sizeof(spl_recursive_it_iterator));
+ object =
(spl_recursive_it_object*)zend_object_store_get_object(zobject TSRMLS_CC);
zobject->refcount++;
iterator->intern.data = (void*)object;
@@ -432,7 +440,7 @@
intern->nextElement = NULL;
}
ce_iterator = Z_OBJCE_P(iterator); /* respect inheritance, don't use
spl_ce_RecursiveIterator */
- intern->iterators[0].iterator = ce_iterator->get_iterator(ce_iterator,
iterator TSRMLS_CC);
+ intern->iterators[0].iterator = ce_iterator->get_iterator(ce_iterator,
iterator, 0 TSRMLS_CC);
if (inc_refcount) {
iterator->refcount++;
}
@@ -818,7 +826,7 @@
#define SPL_CHECK_CTOR(intern, classname) \
if (intern->dit_type == DIT_Unknown) { \
- zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "Classes derived from %s must call %s::__construct()", \
+ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "Classes derived from %v must call %v::__construct()", \
(spl_ce_##classname)->name,
(spl_ce_##classname)->name); \
return; \
}
@@ -837,7 +845,7 @@
intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
if (intern->dit_type != DIT_Unknown) {
- zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "%s::getIterator() must be called exactly once per instance",
ce_base->name);
+ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "%v::getIterator() must be called exactly once per instance",
ce_base->name);
return NULL;
}
@@ -878,6 +886,8 @@
return NULL;
}
intern->u.caching.flags |= flags & CIT_PUBLIC;
+ MAKE_STD_ZVAL(intern->u.caching.zcache);
+ array_init(intern->u.caching.zcache);
break;
}
case DIT_IteratorIterator: {
@@ -905,7 +915,7 @@
if (instanceof_function(ce, zend_ce_aggregate
TSRMLS_CC)) {
zend_call_method_with_0_params(&zobject, ce,
&ce->iterator_funcs.zf_new_iterator, "getiterator", &retval);
if (!retval || Z_TYPE_P(retval) !=
IS_OBJECT || !instanceof_function(Z_OBJCE_P(retval), zend_ce_traversable
TSRMLS_CC)) {
-
zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "%s::getIterator()
must return an object that implememnts Traversable", ce->name);
+
zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "%v::getIterator()
must return an object that implememnts Traversable", ce->name);
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
return NULL;
}
@@ -919,9 +929,26 @@
case DIT_AppendIterator:
spl_instantiate(spl_ce_ArrayIterator,
&intern->u.append.zarrayit, 1 TSRMLS_CC);
zend_call_method_with_0_params(&intern->u.append.zarrayit,
spl_ce_ArrayIterator, &spl_ce_ArrayIterator->constructor, "__construct", NULL);
- intern->u.append.iterator =
spl_ce_ArrayIterator->get_iterator(spl_ce_ArrayIterator,
intern->u.append.zarrayit TSRMLS_CC);
+ intern->u.append.iterator =
spl_ce_ArrayIterator->get_iterator(spl_ce_ArrayIterator,
intern->u.append.zarrayit, 0 TSRMLS_CC);
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
return intern;
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+ case DIT_RegExIterator:
+ case DIT_RecursiveRegExIterator: {
+ char *regex;
+ int len, poptions, coptions;
+ pcre_extra *extra = NULL;
+
+ intern->u.regex.flags = 0;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"Os|l", &zobject, ce_inner, ®ex, &len, &intern->u.regex.flags) == FAILURE) {
+ php_set_error_handling(EH_NORMAL, NULL
TSRMLS_CC);
+ return NULL;
+ }
+ intern->u.regex.pce =
pcre_get_compiled_regex_cache(regex, len, &extra, &poptions, &coptions
TSRMLS_CC);
+ intern->u.regex.pce->refcount++;
+ break;;
+ }
+#endif
default:
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"O", &zobject, ce_inner) == FAILURE) {
php_set_error_handling(EH_NORMAL, NULL
TSRMLS_CC);
@@ -930,7 +957,7 @@
break;
}
- php_set_error_handling(EH_THROW, zend_exception_get_default()
TSRMLS_CC);
+ php_set_error_handling(EH_THROW, zend_exception_get_default(TSRMLS_C)
TSRMLS_CC);
if (inc_refcount) {
zobject->refcount++;
@@ -938,7 +965,7 @@
intern->inner.zobject = zobject;
intern->inner.ce = dit_type == DIT_IteratorIterator ? ce :
Z_OBJCE_P(zobject);
intern->inner.object = zend_object_store_get_object(zobject TSRMLS_CC);
- intern->inner.iterator =
intern->inner.ce->get_iterator(intern->inner.ce, zobject TSRMLS_CC);
+ intern->inner.iterator =
intern->inner.ce->get_iterator(intern->inner.ce, zobject, 0 TSRMLS_CC);
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
return intern;
@@ -1252,6 +1279,65 @@
zval_ptr_dtor(&retval);
} /* }}} */
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+/* {{{ proto void RegExIterator::__construct(Iterator it, string $regex [, int
$flags])
+ Create an RegExIterator from another iterator and a regular expression */
+SPL_METHOD(RegExIterator, __construct)
+{
+ spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_RegExIterator, zend_ce_iterator, DIT_RegExIterator);
+} /* }}} */
+
+/* {{{ proto bool RegExIterator::accept()
+ Match (string)current() against regular expression */
+SPL_METHOD(RegExIterator, accept)
+{
+ spl_dual_it_object *intern;
+ int count;
+ char *subject, tmp[32];
+ int subject_len, use_copy = 0;
+ zval subject_copy;
+ pcre_extra *extra;
+
+ intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+
+ if (intern->u.regex.flags & REGIT_USE_KEY) {
+ if (intern->current.key_type == HASH_KEY_IS_LONG) {
+ subject_len = snprintf(tmp, sizeof(tmp), "%ld",
intern->current.int_key);
+ subject = &tmp[0];
+ } else {
+ subject_len = intern->current.str_key_len;
+ /* FIXME: Unicode support??? */
+ subject = intern->current.str_key;
+ }
+ } else {
+ zend_make_printable_zval(intern->current.data, &subject_copy,
&use_copy);
+ if (use_copy) {
+ subject = Z_STRVAL(subject_copy);
+ subject_len = Z_STRLEN(subject_copy);
+ } else {
+ subject = Z_STRVAL_P(intern->current.data);
+ subject_len = Z_STRLEN_P(intern->current.data);
+ }
+ }
+
+ extra = intern->u.regex.pce->extra;
+ count = pcre_exec(intern->u.regex.pce->re, extra, subject, subject_len,
0, 0, NULL, 0);
+
+ if (use_copy) {
+ zval_dtor(&subject_copy);
+ }
+
+ RETURN_BOOL(count >= 0);
+} /* }}} */
+
+/* {{{ proto void RecursiveRegExIterator::__construct(RecursiveIterator it,
string $regex [, int $flags])
+ Create an RecursiveRegExIterator from another recursive iterator and a
regular expression */
+SPL_METHOD(RecursiveRegExIterator, __construct)
+{
+ spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_RecursiveRegExIterator, spl_ce_RecursiveIterator,
DIT_RecursiveRegExIterator);
+} /* }}} */
+#endif
+
/* {{{ spl_dual_it_free_storage */
static inline void spl_dual_it_free_storage(void *_object TSRMLS_DC)
{
@@ -1269,9 +1355,26 @@
if (object->dit_type == DIT_AppendIterator) {
object->u.append.iterator->funcs->dtor(object->u.append.iterator TSRMLS_CC);
- zval_ptr_dtor(&object->u.append.zarrayit);
+ if (object->u.append.zarrayit) {
+ zval_ptr_dtor(&object->u.append.zarrayit);
+ }
}
+ if (object->dit_type == DIT_CachingIterator || object->dit_type ==
DIT_RecursiveCachingIterator) {
+ if (object->u.caching.zcache) {
+ zval_ptr_dtor(&object->u.caching.zcache);
+ object->u.caching.zcache = NULL;
+ }
+ }
+
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+ if (object->dit_type == DIT_RegExIterator || object->dit_type ==
DIT_RecursiveRegExIterator) {
+ if (object->u.regex.pce) {
+ object->u.regex.pce->refcount--;
+ }
+ }
+#endif
+
zend_object_std_dtor(&object->std TSRMLS_CC);
efree(object);
@@ -1337,6 +1440,35 @@
{NULL, NULL, NULL}
};
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_regex_it___construct, 0, 0, 2)
+ ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
+ ZEND_ARG_INFO(0, regex)
+ ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
+
+static zend_function_entry spl_funcs_RegExIterator[] = {
+ SPL_ME(RegExIterator, __construct, arginfo_regex_it___construct,
ZEND_ACC_PUBLIC)
+ SPL_ME(RegExIterator, accept, NULL, ZEND_ACC_PUBLIC)
+ {NULL, NULL, NULL}
+};
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_rec_regex_it___construct, 0, 0, 2)
+ ZEND_ARG_OBJ_INFO(0, iterator, RecursiveIterator, 0)
+ ZEND_ARG_INFO(0, regex)
+ ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
+
+static zend_function_entry spl_funcs_RecursiveRegExIterator[] = {
+ SPL_ME(RecursiveRegExIterator, __construct,
arginfo_rec_regex_it___construct, ZEND_ACC_PUBLIC)
+ SPL_ME(ParentIterator, hasChildren, NULL, ZEND_ACC_PUBLIC)
+ SPL_ME(ParentIterator, getChildren, NULL, ZEND_ACC_PUBLIC)
+ {NULL, NULL, NULL}
+};
+#endif
+
static inline int spl_limit_it_valid(spl_dual_it_object *intern TSRMLS_DC)
{
/* FAILURE / SUCCESS */
@@ -1503,6 +1635,19 @@
{
if (spl_dual_it_fetch(intern, 1 TSRMLS_CC) == SUCCESS) {
intern->u.caching.flags |= CIT_VALID;
+ /* Full cache ? */
+ if (intern->u.caching.flags & CIT_FULL_CACHE) {
+ zval *zcacheval;
+
+ MAKE_STD_ZVAL(zcacheval);
+ ZVAL_ZVAL(zcacheval, intern->current.data, 1, 0);
+ if (intern->current.key_type == HASH_KEY_IS_LONG) {
+ add_index_zval(intern->u.caching.zcache,
intern->current.int_key, zcacheval);
+ } else {
+
zend_symtable_update(HASH_OF(intern->u.caching.zcache),
intern->current.str_key, intern->current.str_key_len, &zcacheval,
sizeof(void*), NULL);
+ }
+ }
+ /* Recursion ? */
if (intern->dit_type == DIT_RecursiveCachingIterator) {
zval *retval, *zchildren, zflags;
zend_call_method_with_0_params(&intern->inner.zobject,
intern->inner.ce, NULL, "haschildren", &retval);
@@ -1526,7 +1671,7 @@
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)
+
intern->current.data->value.obj.handlers->cast_object(intern->current.data,
&expr_copy, IS_STRING TSRMLS_CC) == SUCCESS)
{
ALLOC_ZVAL(intern->u.caching.zstr);
*intern->u.caching.zstr = expr_copy;
@@ -1574,6 +1719,7 @@
static inline void spl_caching_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
{
spl_dual_it_rewind(intern TSRMLS_CC);
+ zend_hash_clean(HASH_OF(intern->u.caching.zcache));
spl_caching_it_next(intern TSRMLS_CC);
}
@@ -1637,7 +1783,7 @@
intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
if (!(intern->u.caching.flags &
(CIT_CALL_TOSTRING|CIT_TOSTRING_USE_KEY|CIT_TOSTRING_USE_CURRENT))) {
- zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "%s does not fetch string value (see CachingIterator::__construct)",
Z_OBJCE_P(getThis())->name);
+ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "%v does not fetch string value (see CachingIterator::__construct)",
Z_OBJCE_P(getThis())->name);
}
if (intern->u.caching.flags & CIT_TOSTRING_USE_KEY) {
if (intern->current.key_type == HASH_KEY_IS_STRING) {
@@ -1659,12 +1805,167 @@
}
} /* }}} */
+/* {{{ proto void CachingIterator::offsetSet(mixed index, mixed newval)
+ Set given index in cache */
+SPL_METHOD(CachingIterator, offsetSet)
+{
+ spl_dual_it_object *intern;
+ char *arKey;
+ uint nKeyLength;
+ zend_uchar type;
+ zval *value;
+
+ intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+
+ if (!(intern->u.caching.flags & CIT_FULL_CACHE)) {
+ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "%v does not use a full cache (see CachingIterator::__construct)",
Z_OBJCE_P(getThis())->name);
+ }
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Tz", &arKey,
&nKeyLength, &type, &value) == FAILURE) {
+ return;
+ }
+
+ value->refcount++;
+ zend_symtable_update(HASH_OF(intern->u.caching.zcache), arKey,
nKeyLength+1, &value, sizeof(value), NULL);
+}
+/* }}} */
+
+/* {{{ proto string CachingIterator::offsetGet(mixed index)
+ Return the internal cache if used */
+SPL_METHOD(CachingIterator, offsetGet)
+{
+ spl_dual_it_object *intern;
+ char *arKey;
+ uint nKeyLength;
+ zval **value;
+
+ intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+
+ if (!(intern->u.caching.flags & CIT_FULL_CACHE)) {
+ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "%v does not use a full cache (see CachingIterator::__construct)",
Z_OBJCE_P(getThis())->name);
+ }
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arKey,
&nKeyLength) == FAILURE) {
+ return;
+ }
+
+ if (zend_symtable_find(HASH_OF(intern->u.caching.zcache), arKey,
nKeyLength+1, (void**)&value) == FAILURE) {
+ zend_error(E_NOTICE, "Undefined index: %s", arKey);
+ return;
+ }
+
+ RETURN_ZVAL(*value, 1, 0);
+}
+/* }}} */
+
+/* {{{ proto void CachingIterator::offsetUnset(mixed index)
+ Unset given index in cache */
+SPL_METHOD(CachingIterator, offsetUnset)
+{
+ spl_dual_it_object *intern;
+ char *arKey;
+ uint nKeyLength;
+
+ intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+
+ if (!(intern->u.caching.flags & CIT_FULL_CACHE)) {
+ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "%v does not use a full cache (see CachingIterator::__construct)",
Z_OBJCE_P(getThis())->name);
+ }
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arKey,
&nKeyLength) == FAILURE) {
+ return;
+ }
+
+ zend_symtable_del(HASH_OF(intern->u.caching.zcache), arKey,
nKeyLength+1);
+}
+/* }}} */
+
+/* {{{ proto bool CachingIterator::offsetExists(mixed index)
+ Return whether the requested index exists */
+SPL_METHOD(CachingIterator, offsetExists)
+{
+ spl_dual_it_object *intern;
+ char *arKey;
+ uint nKeyLength;
+
+ intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+
+ if (!(intern->u.caching.flags & CIT_FULL_CACHE)) {
+ zend_throw_exception_ex(spl_ce_BadMethodCallException, 0
TSRMLS_CC, "%v does not use a full cache (see CachingIterator::__construct)",
Z_OBJCE_P(getThis())->name);
+ }
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arKey,
&nKeyLength) == FAILURE) {
+ return;
+ }
+
+ RETURN_BOOL(zend_symtable_exists(HASH_OF(intern->u.caching.zcache),
arKey, nKeyLength+1));
+}
+/* }}} */
+
+/* {{{ proto int CachingIterator::getFlags()
+ Return the internal flags */
+SPL_METHOD(CachingIterator, getFlags)
+{
+ spl_dual_it_object *intern;
+
+ intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+
+ RETURN_LONG(intern->u.caching.flags);
+}
+/* }}} */
+
+/* {{{ proto void CachingIterator::setFlags()
+ Set the internal flags */
+SPL_METHOD(CachingIterator, setFlags)
+{
+ spl_dual_it_object *intern;
+ long flags;
+
+ intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &flags) ==
FAILURE) {
+ return;
+ }
+
+ if (((flags & CIT_CALL_TOSTRING) && (flags &
(CIT_TOSTRING_USE_KEY|CIT_TOSTRING_USE_CURRENT)))
+ || ((flags & (CIT_TOSTRING_USE_KEY|CIT_TOSTRING_USE_CURRENT)) ==
(CIT_TOSTRING_USE_KEY|CIT_TOSTRING_USE_CURRENT))) {
+ zend_throw_exception(spl_ce_InvalidArgumentException , "Flags
must contain only one of CIT_CALL_TOSTRING, CIT_TOSTRING_USE_KEY,
CIT_TOSTRING_USE_CURRENT", 0 TSRMLS_CC);
+ return;
+ }
+ if ((intern->u.caching.flags & CIT_CALL_TOSTRING) != 0 && (flags &
~CIT_CALL_TOSTRING) == 0) {
+ zend_throw_exception(spl_ce_InvalidArgumentException,
"Unsetting flag CALL_TO_STRING is not possible", 0 TSRMLS_CC);
+ return;
+ }
+ if ((flags && CIT_FULL_CACHE) != 0 && (intern->u.caching.flags &
CIT_FULL_CACHE) == 0) {
+ /* clear on (re)enable */
+ zend_hash_clean(HASH_OF(intern->u.caching.zcache));
+ }
+ intern->u.caching.flags = (intern->u.caching.flags & ~CIT_PUBLIC) |
(flags & CIT_PUBLIC);
+}
+/* }}} */
+
static
ZEND_BEGIN_ARG_INFO(arginfo_caching_it___construct, 0)
ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
ZEND_ARG_INFO(0, flags)
ZEND_END_ARG_INFO();
+static
+ZEND_BEGIN_ARG_INFO(arginfo_caching_it_setFlags, 0)
+ ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_it_offsetGet, 0, 0, 1)
+ ZEND_ARG_INFO(0, index)
+ZEND_END_ARG_INFO();
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_it_offsetSet, 0, 0, 2)
+ ZEND_ARG_INFO(0, index)
+ ZEND_ARG_INFO(0, newval)
+ZEND_END_ARG_INFO();
+
static zend_function_entry spl_funcs_CachingIterator[] = {
SPL_ME(CachingIterator, __construct,
arginfo_caching_it___construct, ZEND_ACC_PUBLIC)
SPL_ME(CachingIterator, rewind, NULL, ZEND_ACC_PUBLIC)
@@ -1675,6 +1976,12 @@
SPL_ME(CachingIterator, hasNext, NULL, ZEND_ACC_PUBLIC)
SPL_ME(CachingIterator, __toString, NULL, ZEND_ACC_PUBLIC)
SPL_ME(dual_it, getInnerIterator, NULL, ZEND_ACC_PUBLIC)
+ SPL_ME(CachingIterator, getFlags, NULL, ZEND_ACC_PUBLIC)
+ SPL_ME(CachingIterator, setFlags, arginfo_caching_it_setFlags,
ZEND_ACC_PUBLIC)
+ SPL_ME(CachingIterator, offsetGet, arginfo_caching_it_offsetGet,
ZEND_ACC_PUBLIC)
+ SPL_ME(CachingIterator, offsetSet, arginfo_caching_it_offsetSet,
ZEND_ACC_PUBLIC)
+ SPL_ME(CachingIterator, offsetUnset, arginfo_caching_it_offsetGet,
ZEND_ACC_PUBLIC)
+ SPL_ME(CachingIterator, offsetExists, arginfo_caching_it_offsetGet,
ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
@@ -1927,7 +2234,7 @@
intern->inner.zobject = *it;
intern->inner.ce = Z_OBJCE_PP(it);
intern->inner.object = zend_object_store_get_object(*it
TSRMLS_CC);
- intern->inner.iterator =
intern->inner.ce->get_iterator(intern->inner.ce, *it TSRMLS_CC);
+ intern->inner.iterator =
intern->inner.ce->get_iterator(intern->inner.ce, *it, 0 TSRMLS_CC);
spl_dual_it_rewind(intern TSRMLS_CC);
return SUCCESS;
} else {
@@ -2024,6 +2331,30 @@
spl_append_it_next(intern TSRMLS_CC);
} /* }}} */
+/* {{{ proto int AppendIterator::getIteratorIndex()
+ Get index of iterator */
+SPL_METHOD(AppendIterator, getIteratorIndex)
+{
+ spl_dual_it_object *intern;
+
+ intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+
+ APPENDIT_CHECK_CTOR(intern);
+ spl_array_iterator_key(intern->u.append.zarrayit, return_value
TSRMLS_CC);
+} /* }}} */
+
+/* {{{ proto ArrayIterator AppendIterator::getArrayIterator()
+ Get access to inner ArrayIterator */
+SPL_METHOD(AppendIterator, getArrayIterator)
+{
+ spl_dual_it_object *intern;
+
+ intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+
+ APPENDIT_CHECK_CTOR(intern);
+ RETURN_ZVAL(intern->u.append.zarrayit, 1, 0);
+} /* }}} */
+
static
ZEND_BEGIN_ARG_INFO(arginfo_append_it_append, 0)
ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
@@ -2038,6 +2369,8 @@
SPL_ME(dual_it, current, NULL, ZEND_ACC_PUBLIC)
SPL_ME(AppendIterator, next, NULL, ZEND_ACC_PUBLIC)
SPL_ME(dual_it, getInnerIterator, NULL, ZEND_ACC_PUBLIC)
+ SPL_ME(AppendIterator, getIteratorIndex, NULL, ZEND_ACC_PUBLIC)
+ SPL_ME(AppendIterator, getArrayIterator, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
@@ -2058,7 +2391,7 @@
array_init(return_value);
- iter = Z_OBJCE_P(obj)->get_iterator(Z_OBJCE_P(obj), obj TSRMLS_CC);
+ iter = Z_OBJCE_P(obj)->get_iterator(Z_OBJCE_P(obj), obj, 0 TSRMLS_CC);
if (iter->funcs->rewind) {
iter->funcs->rewind(iter TSRMLS_CC);
@@ -2098,7 +2431,7 @@
RETURN_FALSE;
}
- iter = Z_OBJCE_P(obj)->get_iterator(Z_OBJCE_P(obj), obj TSRMLS_CC);
+ iter = Z_OBJCE_P(obj)->get_iterator(Z_OBJCE_P(obj), obj, 0 TSRMLS_CC);
if (iter->funcs->rewind) {
iter->funcs->rewind(iter TSRMLS_CC);
@@ -2165,11 +2498,13 @@
REGISTER_SPL_SUB_CLASS_EX(LimitIterator, IteratorIterator,
spl_dual_it_new, spl_funcs_LimitIterator);
REGISTER_SPL_SUB_CLASS_EX(CachingIterator, IteratorIterator,
spl_dual_it_new, spl_funcs_CachingIterator);
+ REGISTER_SPL_IMPLEMENTS(CachingIterator, ArrayAccess);
REGISTER_SPL_CLASS_CONST_LONG(CachingIterator, "CALL_TOSTRING",
CIT_CALL_TOSTRING);
REGISTER_SPL_CLASS_CONST_LONG(CachingIterator, "CATCH_GET_CHILD",
CIT_CATCH_GET_CHILD);
REGISTER_SPL_CLASS_CONST_LONG(CachingIterator, "TOSTRING_USE_KEY",
CIT_TOSTRING_USE_KEY);
REGISTER_SPL_CLASS_CONST_LONG(CachingIterator, "TOSTRING_USE_CURRENT",
CIT_TOSTRING_USE_CURRENT);
+ REGISTER_SPL_CLASS_CONST_LONG(CachingIterator, "FULL_CACHE",
CIT_FULL_CACHE);
REGISTER_SPL_SUB_CLASS_EX(RecursiveCachingIterator, CachingIterator,
spl_dual_it_new, spl_funcs_RecursiveCachingIterator);
REGISTER_SPL_IMPLEMENTS(RecursiveCachingIterator, RecursiveIterator);
@@ -2179,8 +2514,18 @@
REGISTER_SPL_SUB_CLASS_EX(AppendIterator, IteratorIterator,
spl_dual_it_new, spl_funcs_AppendIterator);
REGISTER_SPL_IMPLEMENTS(RecursiveIteratorIterator, OuterIterator);
+
REGISTER_SPL_SUB_CLASS_EX(InfiniteIterator, IteratorIterator,
spl_dual_it_new, spl_funcs_InfiniteIterator);
-
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+ REGISTER_SPL_SUB_CLASS_EX(RegExIterator, FilterIterator,
spl_dual_it_new, spl_funcs_RegExIterator);
+ REGISTER_SPL_CLASS_CONST_LONG(RegExIterator, "USE_KEY", REGIT_USE_KEY);
+ REGISTER_SPL_SUB_CLASS_EX(RecursiveRegExIterator, RegExIterator,
spl_dual_it_new, spl_funcs_RecursiveRegExIterator);
+ REGISTER_SPL_IMPLEMENTS(RecursiveRegExIterator, RecursiveIterator);
+#else
+ spl_ce_RegExIterator = NULL;
+ spl_ce_RecursiveRegExIterator = NULL;
+#endif
+
REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator);
REGISTER_SPL_ITERATOR(EmptyIterator);
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.h?r1=1.18.2.7&r2=1.18.2.7.2.1&diff_format=u
Index: php-src/ext/spl/spl_iterators.h
diff -u php-src/ext/spl/spl_iterators.h:1.18.2.7
php-src/ext/spl/spl_iterators.h:1.18.2.7.2.1
--- php-src/ext/spl/spl_iterators.h:1.18.2.7 Sun Mar 5 17:39:49 2006
+++ php-src/ext/spl/spl_iterators.h Wed May 10 00:03:38 2006
@@ -16,13 +16,16 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.h,v 1.18.2.7 2006/03/05 17:39:49 helly Exp $ */
+/* $Id: spl_iterators.h,v 1.18.2.7.2.1 2006/05/10 00:03:38 helly Exp $ */
#ifndef SPL_ITERATORS_H
#define SPL_ITERATORS_H
#include "php.h"
#include "php_spl.h"
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+#include "ext/pcre/php_pcre.h"
+#endif
#define spl_ce_Traversable zend_ce_traversable
#define spl_ce_Iterator zend_ce_iterator
@@ -45,6 +48,8 @@
extern PHPAPI zend_class_entry *spl_ce_InfiniteIterator;
extern PHPAPI zend_class_entry *spl_ce_EmptyIterator;
extern PHPAPI zend_class_entry *spl_ce_AppendIterator;
+extern PHPAPI zend_class_entry *spl_ce_RegExIterator;
+extern PHPAPI zend_class_entry *spl_ce_RecursiveRegExIterator;
PHP_MINIT_FUNCTION(spl_iterators);
@@ -63,6 +68,10 @@
DIT_NoRewindIterator,
DIT_InfiniteIterator,
DIT_AppendIterator,
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+ DIT_RegExIterator,
+ DIT_RecursiveRegExIterator,
+#endif
DIT_Unknown = ~0
} dual_it_type;
@@ -72,12 +81,18 @@
CIT_CATCH_GET_CHILD = 0x00000002,
CIT_TOSTRING_USE_KEY = 0x00000010,
CIT_TOSTRING_USE_CURRENT = 0x00000020,
+ CIT_FULL_CACHE = 0x00000100,
CIT_PUBLIC = 0x0000FFFF,
/* private */
CIT_VALID = 0x00010000,
CIT_HAS_CHILDREN = 0x00020000
};
+enum {
+ /* public */
+ REGIT_USE_KEY = 0x00000001,
+};
+
typedef struct _spl_dual_it_object {
zend_object std;
struct {
@@ -104,11 +119,18 @@
int flags; /* CIT_* */
zval *zstr;
zval *zchildren;
+ zval *zcache;
} caching;
struct {
zval *zarrayit;
zend_object_iterator *iterator;
} append;
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+ struct {
+ int flags;
+ pcre_cache_entry *pce;
+ } regex;
+#endif
} u;
} spl_dual_it_object;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
