helly Fri Jul 21 21:09:49 2006 UTC
Modified files:
/php-src/ext/spl spl_iterators.c
/php-src/ext/spl/internal recursiveregexiterator.inc
Log:
- Match code with docu
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.146&r2=1.147&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.146
php-src/ext/spl/spl_iterators.c:1.147
--- php-src/ext/spl/spl_iterators.c:1.146 Fri Jul 21 19:57:36 2006
+++ php-src/ext/spl/spl_iterators.c Fri Jul 21 21:09:49 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.146 2006/07/21 19:57:36 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.147 2006/07/21 21:09:49 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1739,7 +1739,9 @@
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, mode)
ZEND_ARG_INFO(0, flags)
+ ZEND_ARG_INFO(0, preg_flags)
ZEND_END_ARG_INFO();
static zend_function_entry spl_funcs_RecursiveRegexIterator[] = {
@@ -2904,6 +2906,7 @@
REGISTER_SPL_STD_CLASS_EX(IteratorIterator, spl_dual_it_new,
spl_funcs_IteratorIterator);
REGISTER_SPL_ITERATOR(IteratorIterator);
+ REGISTER_SPL_IMPLEMENTS(IteratorIterator, OuterIterator);
REGISTER_SPL_SUB_CLASS_EX(FilterIterator, IteratorIterator,
spl_dual_it_new, spl_funcs_FilterIterator);
spl_ce_FilterIterator->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/internal/recursiveregexiterator.inc?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/internal/recursiveregexiterator.inc
diff -u php-src/ext/spl/internal/recursiveregexiterator.inc:1.2
php-src/ext/spl/internal/recursiveregexiterator.inc:1.3
--- php-src/ext/spl/internal/recursiveregexiterator.inc:1.2 Sun Jul 16
23:45:29 2006
+++ php-src/ext/spl/internal/recursiveregexiterator.inc Fri Jul 21 21:09:49 2006
@@ -25,14 +25,14 @@
*
* @param it inner iterator
* @param regex the regular expression to match
- * @param flags special flags (self::USE_KEY)
* @param mode operation mode (one of self::MATCH,
self::GET_MATCH,
* self::ALL_MATCHES, self::SPLIT)
+ * @param flags special flags (self::USE_KEY)
* @param preg_flags global PREG_* flags, see preg_match(),
* preg_match_all(), preg_split()
*/
- function __construct(RecursiveIterator $it, $regex, $flags = 0, $mode =
0, $preg_flags = 0) {
- parent::__construct($it, $regex, $flags, $mode, $preg_flags);
+ function __construct(RecursiveIterator $it, $regex, $mode = 0, $flags =
0, $preg_flags = 0) {
+ parent::__construct($it, $regex, $mode, $flags, $preg_flags);
}
/** @return whether the current element has children
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
