andrei Wed May 10 16:51:18 2006 UTC
Modified files:
/php-src/ext/spl spl_iterators.c spl_iterators.h
/php-src/ext/spl/tests iterator_029.phpt
Log:
MFB
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.124&r2=1.125&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.124
php-src/ext/spl/spl_iterators.c:1.125
--- php-src/ext/spl/spl_iterators.c:1.124 Thu Apr 13 13:21:59 2006
+++ php-src/ext/spl/spl_iterators.c Wed May 10 16:51:18 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.124 2006/04/13 13:21:59 tony2001 Exp $ */
+/* $Id: spl_iterators.c,v 1.125 2006/05/10 16:51:18 andrei Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -55,8 +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;
+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)
@@ -942,8 +942,8 @@
php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC);
return intern;
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
- case DIT_RegExIterator:
- case DIT_RecursiveRegExIterator: {
+ case DIT_RegexIterator:
+ case DIT_RecursiveRegexIterator: {
char *regex;
int len, poptions, coptions;
pcre_extra *extra = NULL;
@@ -1291,16 +1291,16 @@
} /* }}} */
#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)
+/* {{{ 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);
+ spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_RegexIterator, zend_ce_iterator, DIT_RegexIterator);
} /* }}} */
-/* {{{ proto bool RegExIterator::accept()
+/* {{{ proto bool RegexIterator::accept()
Match (string)current() against regular expression */
-SPL_METHOD(RegExIterator, accept)
+SPL_METHOD(RegexIterator, accept)
{
spl_dual_it_object *intern;
int count;
@@ -1341,11 +1341,11 @@
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)
+/* {{{ 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);
+ spl_dual_it_construct(INTERNAL_FUNCTION_PARAM_PASSTHRU,
spl_ce_RecursiveRegexIterator, spl_ce_RecursiveIterator,
DIT_RecursiveRegexIterator);
} /* }}} */
#endif
@@ -1379,7 +1379,7 @@
}
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
- if (object->dit_type == DIT_RegExIterator || object->dit_type ==
DIT_RecursiveRegExIterator) {
+ if (object->dit_type == DIT_RegexIterator || object->dit_type ==
DIT_RecursiveRegexIterator) {
if (object->u.regex.pce) {
object->u.regex.pce->refcount--;
}
@@ -1459,9 +1459,9 @@
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)
+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}
};
@@ -1472,8 +1472,8 @@
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)
+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}
@@ -2525,13 +2525,13 @@
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);
+ 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;
+ spl_ce_RegexIterator = NULL;
+ spl_ce_RecursiveRegexIterator = NULL;
#endif
REGISTER_SPL_STD_CLASS_EX(EmptyIterator, NULL, spl_funcs_EmptyIterator);
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.h?r1=1.31&r2=1.32&diff_format=u
Index: php-src/ext/spl/spl_iterators.h
diff -u php-src/ext/spl/spl_iterators.h:1.31
php-src/ext/spl/spl_iterators.h:1.32
--- php-src/ext/spl/spl_iterators.h:1.31 Tue May 9 22:15:16 2006
+++ php-src/ext/spl/spl_iterators.h Wed May 10 16:51:18 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.h,v 1.31 2006/05/09 22:15:16 helly Exp $ */
+/* $Id: spl_iterators.h,v 1.32 2006/05/10 16:51:18 andrei Exp $ */
#ifndef SPL_ITERATORS_H
#define SPL_ITERATORS_H
@@ -48,8 +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;
+extern PHPAPI zend_class_entry *spl_ce_RegexIterator;
+extern PHPAPI zend_class_entry *spl_ce_RecursiveRegexIterator;
PHP_MINIT_FUNCTION(spl_iterators);
@@ -69,8 +69,8 @@
DIT_InfiniteIterator,
DIT_AppendIterator,
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
- DIT_RegExIterator,
- DIT_RecursiveRegExIterator,
+ DIT_RegexIterator,
+ DIT_RecursiveRegexIterator,
#endif
DIT_Unknown = ~0
} dual_it_type;
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/tests/iterator_029.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/spl/tests/iterator_029.phpt
diff -u php-src/ext/spl/tests/iterator_029.phpt:1.3
php-src/ext/spl/tests/iterator_029.phpt:1.4
--- php-src/ext/spl/tests/iterator_029.phpt:1.3 Wed Dec 21 22:21:54 2005
+++ php-src/ext/spl/tests/iterator_029.phpt Wed May 10 16:51:18 2006
@@ -1,5 +1,5 @@
--TEST--
-SPL: RegExIterator
+SPL: RegexIterator
--SKIPIF--
<?php if (!extension_loaded("spl")) print "skip"; ?>
--FILE--
@@ -7,7 +7,7 @@
$ar = array(0, "123", 123, 22 => "abc", "a2b", 22, "a2d" => 7, 42);
-foreach(new RegExIterator(new ArrayIterator($ar), "/2/") as $k => $v)
+foreach(new RegexIterator(new ArrayIterator($ar), "/2/") as $k => $v)
{
echo "$k=>$v\n";
}
@@ -16,7 +16,7 @@
===KEY===
<?php
-foreach(new RegExIterator(new ArrayIterator($ar), "/2/",
RegExIterator::USE_KEY) as $k => $v)
+foreach(new RegexIterator(new ArrayIterator($ar), "/2/",
RegexIterator::USE_KEY) as $k => $v)
{
echo "$k=>$v\n";
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
