helly Mon Oct 10 19:58:42 2005 EDT
Added files:
/php-src/ext/spl/tests iterator_029.phpt
Modified files:
/php-src/ext/spl php_spl.c spl_iterators.c spl_iterators.h
Log:
- Add (Recursive)RegExIterator
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.68&r2=1.69&ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.68 php-src/ext/spl/php_spl.c:1.69
--- php-src/ext/spl/php_spl.c:1.68 Mon Oct 10 17:45:09 2005
+++ php-src/ext/spl/php_spl.c Mon Oct 10 19:58:40 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.68 2005/10/10 21:45:09 helly Exp $ */
+/* $Id: php_spl.c,v 1.69 2005/10/10 23:58:40 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -178,6 +178,8 @@
SPL_ADD_CLASS(RecursiveFilterIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(RecursiveIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(RecursiveIteratorIterator, z_list, sub, allow, ce_flags);
\
+ SPL_ADD_CLASS(RecursiveRegExIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(RegExIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(RuntimeException, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SeekableIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SimpleXMLIterator, z_list, sub, allow, ce_flags); \
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.89&r2=1.90&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.89
php-src/ext/spl/spl_iterators.c:1.90
--- php-src/ext/spl/spl_iterators.c:1.89 Wed Oct 5 17:57:45 2005
+++ php-src/ext/spl/spl_iterators.c Mon Oct 10 19:58:40 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.89 2005/10/05 21:57:45 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.90 2005/10/10 23:58:40 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -53,6 +53,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;
function_entry spl_funcs_RecursiveIterator[] = {
SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, NULL)
@@ -897,6 +899,23 @@
intern->u.append.iterator =
U_CLASS_ENTRY(spl_ce_ArrayIterator)->get_iterator(U_CLASS_ENTRY(spl_ce_ArrayIterator),
intern->u.append.zarrayit 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;
+
+ 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.extra = NULL;
+ intern->u.regex.options = 0;
+ intern->u.regex.re = pcre_get_compiled_regex(regex,
&intern->u.regex.extra, &intern->u.regex.options TSRMLS_CC);
+ 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);
@@ -1229,6 +1248,62 @@
zval_ptr_dtor(&retval);
} /* }}} */
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+/* {{{ proto 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,
U_CLASS_ENTRY(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;
+
+ intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
+
+ if (intern->u.regex.flags) {
+ 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;
+ 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);
+ }
+ }
+
+ count = pcre_exec(intern->u.regex.re, intern->u.regex.extra, subject,
subject_len, 0, 0, NULL, 0);
+
+ if (use_copy) {
+ zval_dtor(&subject_copy);
+ }
+
+ RETURN_BOOL(count >= 0);
+} /* }}} */
+
+/* {{{ proto 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,
U_CLASS_ENTRY(spl_ce_RecursiveIterator), DIT_RecursiveRegExIterator);
+} /* }}} */
+#endif
+
/* {{{ spl_dual_it_free_storage */
static INLINE void spl_dual_it_free_storage(void *_object TSRMLS_DC)
{
@@ -1256,6 +1331,14 @@
}
}
+#if MBO_0
+ if (object->dit_type == DIT_RegExIterator || object->dit_type ==
DIT_RecursiveRegExIterator) {
+ if (object->u.regex.re) {
+ /* actually there's no way to get rid of this early */
+ }
+ }
+#endif
+
zend_hash_destroy(object->std.properties);
FREE_HASHTABLE(object->std.properties);
@@ -1323,6 +1406,27 @@
{NULL, NULL, NULL}
};
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+static
+ZEND_BEGIN_ARG_INFO(arginfo_regex_it___construct, 0)
+ ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0)
+ ZEND_ARG_INFO(0, regex)
+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_function_entry spl_funcs_RecursiveRegExIterator[] = {
+ SPL_ME(RecursiveRegExIterator, __construct,
arginfo_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 */
@@ -2328,7 +2432,15 @@
REGISTER_SPL_IMPLEMENTS(AppendIterator, 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_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/diff.php/php-src/ext/spl/spl_iterators.h?r1=1.24&r2=1.25&ty=u
Index: php-src/ext/spl/spl_iterators.h
diff -u php-src/ext/spl/spl_iterators.h:1.24
php-src/ext/spl/spl_iterators.h:1.25
--- php-src/ext/spl/spl_iterators.h:1.24 Sat Oct 8 14:57:16 2005
+++ php-src/ext/spl/spl_iterators.h Mon Oct 10 19:58:40 2005
@@ -16,13 +16,17 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.h,v 1.24 2005/10/08 18:57:16 helly Exp $ */
+/* $Id: spl_iterators.h,v 1.25 2005/10/10 23:58:40 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 +49,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);
@@ -60,6 +66,10 @@
DIT_NoRewindIterator,
DIT_InfiniteIterator,
DIT_AppendIterator,
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+ DIT_RegExIterator,
+ DIT_RecursiveRegExIterator,
+#endif
} dual_it_type;
enum {
@@ -107,6 +117,14 @@
zval *zarrayit;
zend_object_iterator *iterator;
} append;
+#if HAVE_PCRE || HAVE_BUNDLED_PCRE
+ struct {
+ int flags;
+ pcre *re;
+ pcre_extra *extra;
+ int options;
+ } regex;
+#endif
} u;
} spl_dual_it_object;
http://cvs.php.net/co.php/php-src/ext/spl/tests/iterator_029.phpt?r=1.1&p=1
Index: php-src/ext/spl/tests/iterator_029.phpt
+++ php-src/ext/spl/tests/iterator_029.phpt
--TEST--
SPL: RegExIterator
--FILE--
<?php
$ar = array(0, "123", 123, 22 => "abc", "a2b", 22, "a2d" => 7, 42);
foreach(new RegExIterator(new ArrayIterator($ar), "/2/", 0) as $k => $v)
{
echo "$k=>$v\n";
}
?>
===KEY===
<?php
foreach(new RegExIterator(new ArrayIterator($ar), "/2/", 0) as $k => $v)
{
echo "$k=>$v\n";
}
?>
===DONE===
<?php exit(0); ?>
--EXPECT--
1=>123
2=>123
23=>a2b
24=>22
25=>42
===KEY===
1=>123
2=>123
23=>a2b
24=>22
25=>42
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
