cvs: php-src(PHP_5_2) /ext/spl spl_array.c spl_array.h spl_iterators.c spl_iterators.h

helly Thu Feb 8 22:17:40 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/spl spl_array.c spl_array.h spl_iterators.c spl_iterators.h Log: - MFH Rearrange code: mode Countable from spl_array.c to spl_iterator.c http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.7&r2=1.71.2.17.2.8&diff_format=u Index: php-src/ext/spl/spl_array.c diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.7 php-src/ext/spl/spl_array.c:1.71.2.17.2.8 --- php-src/ext/spl/spl_array.c:1.71.2.17.2.7 Sun Jan 7 03:52:44 2007 +++ php-src/ext/spl/spl_array.c Thu Feb 8 22:17:40 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.c,v 1.71.2.17.2.7 2007/01/07 03:52:44 iliaa Exp $ */ +/* $Id: spl_array.c,v 1.71.2.17.2.8 2007/02/08 22:17:40 helly Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -42,8 +42,6 @@ PHPAPI zend_class_entry *spl_ce_ArrayIterator; PHPAPI zend_class_entry *spl_ce_RecursiveArrayIterator; -PHPAPI zend_class_entry *spl_ce_Countable; - #define SPL_ARRAY_STD_PROP_LIST 0x00000001 #define SPL_ARRAY_ARRAY_AS_PROPS 0x00000002 #define SPL_ARRAY_OVERLOADED_REWIND 0x00010000 @@ -1495,11 +1493,6 @@ {NULL, NULL, NULL} }; -static zend_function_entry spl_funcs_Countable[] = { - SPL_ABSTRACT_ME(Countable, count, NULL) - {NULL, NULL, NULL} -}; - /* {{{ PHP_MINIT_FUNCTION(spl_array) */ PHP_MINIT_FUNCTION(spl_array) { @@ -1533,8 +1526,6 @@ REGISTER_SPL_IMPLEMENTS(RecursiveArrayIterator, RecursiveIterator); spl_ce_RecursiveArrayIterator->get_iterator = spl_array_get_iterator; - REGISTER_SPL_INTERFACE(Countable); - REGISTER_SPL_IMPLEMENTS(ArrayObject, Countable); REGISTER_SPL_IMPLEMENTS(ArrayIterator, Countable); http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.h?r1=1.13.2.2.2.2&r2=1.13.2.2.2.3&diff_format=u Index: php-src/ext/spl/spl_array.h diff -u php-src/ext/spl/spl_array.h:1.13.2.2.2.2 php-src/ext/spl/spl_array.h:1.13.2.2.2.3 --- php-src/ext/spl/spl_array.h:1.13.2.2.2.2 Mon Jan 1 09:36:07 2007 +++ php-src/ext/spl/spl_array.h Thu Feb 8 22:17:40 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_array.h,v 1.13.2.2.2.2 2007/01/01 09:36:07 sebastian Exp $ */ +/* $Id: spl_array.h,v 1.13.2.2.2.3 2007/02/08 22:17:40 helly Exp $ */ #ifndef SPL_ARRAY_H #define SPL_ARRAY_H @@ -27,7 +27,6 @@ extern PHPAPI zend_class_entry *spl_ce_ArrayObject; extern PHPAPI zend_class_entry *spl_ce_ArrayIterator; extern PHPAPI zend_class_entry *spl_ce_RecursiveArrayIterator; -extern PHPAPI zend_class_entry *spl_ce_Countable; PHP_MINIT_FUNCTION(spl_array); http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.22&r2=1.73.2.30.2.23&diff_format=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.22 php-src/ext/spl/spl_iterators.c:1.73.2.30.2.23 --- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.22 Mon Jan 1 09:36:07 2007 +++ php-src/ext/spl/spl_iterators.c Thu Feb 8 22:17:40 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.c,v 1.73.2.30.2.22 2007/01/01 09:36:07 sebastian Exp $ */ +/* $Id: spl_iterators.c,v 1.73.2.30.2.23 2007/02/08 22:17:40 helly Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -57,6 +57,7 @@ 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_Countable; zend_function_entry spl_funcs_RecursiveIterator[] = { SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, NULL) @@ -2844,6 +2845,11 @@ {NULL, NULL, NULL} }; +static zend_function_entry spl_funcs_Countable[] = { + SPL_ABSTRACT_ME(Countable, count, NULL) + {NULL, NULL, NULL} +}; + /* {{{ PHP_MINIT_FUNCTION(spl_iterators) */ PHP_MINIT_FUNCTION(spl_iterators) @@ -2886,6 +2892,7 @@ REGISTER_SPL_SUB_CLASS_EX(ParentIterator, RecursiveFilterIterator, spl_dual_it_new, spl_funcs_ParentIterator); + REGISTER_SPL_INTERFACE(Countable); REGISTER_SPL_INTERFACE(SeekableIterator); REGISTER_SPL_ITERATOR(SeekableIterator); http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.h?r1=1.18.2.7.2.10&r2=1.18.2.7.2.11&diff_format=u Index: php-src/ext/spl/spl_iterators.h diff -u php-src/ext/spl/spl_iterators.h:1.18.2.7.2.10 php-src/ext/spl/spl_iterators.h:1.18.2.7.2.11 --- php-src/ext/spl/spl_iterators.h:1.18.2.7.2.10 Mon Jan 1 09:36:07 2007 +++ php-src/ext/spl/spl_iterators.h Thu Feb 8 22:17:40 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_iterators.h,v 1.18.2.7.2.10 2007/01/01 09:36:07 sebastian Exp $ */ +/* $Id: spl_iterators.h,v 1.18.2.7.2.11 2007/02/08 22:17:40 helly Exp $ */ #ifndef SPL_ITERATORS_H #define SPL_ITERATORS_H @@ -50,6 +50,7 @@ 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_Countable; PHP_MINIT_FUNCTION(spl_iterators);