From d634bee08649f15622db533e43128a6b58c07bcd Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Mon, 6 Nov 2006 23:19:46 +0000 Subject: [PATCH] Fix arginfo --- ext/spl/spl_directory.c | 9 +++++++-- ext/spl/spl_iterators.c | 21 +++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 210edc595f..ec9ce07454 100755 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -1327,18 +1327,23 @@ static zend_function_entry spl_DirectoryIterator_functions[] = { }; static -ZEND_BEGIN_ARG_INFO(arginfo_r_dir___construct, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_r_dir___construct, 0, 0, 1) ZEND_ARG_INFO(0, path) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +static +ZEND_BEGIN_ARG_INFO_EX(arginfo_r_dir_hasChildren, 0, 0, 0) + ZEND_ARG_INFO(0, allow_links) +ZEND_END_ARG_INFO() + static zend_function_entry spl_RecursiveDirectoryIterator_functions[] = { SPL_ME(RecursiveDirectoryIterator, __construct, arginfo_r_dir___construct, ZEND_ACC_PUBLIC) SPL_ME(RecursiveDirectoryIterator, rewind, NULL, ZEND_ACC_PUBLIC) SPL_ME(RecursiveDirectoryIterator, next, NULL, ZEND_ACC_PUBLIC) SPL_ME(RecursiveDirectoryIterator, key, NULL, ZEND_ACC_PUBLIC) SPL_ME(RecursiveDirectoryIterator, current, NULL, ZEND_ACC_PUBLIC) - SPL_ME(RecursiveDirectoryIterator, hasChildren, NULL, ZEND_ACC_PUBLIC) + SPL_ME(RecursiveDirectoryIterator, hasChildren, arginfo_r_dir_hasChildren, ZEND_ACC_PUBLIC) SPL_ME(RecursiveDirectoryIterator, getChildren, NULL, ZEND_ACC_PUBLIC) SPL_ME(RecursiveDirectoryIterator, getSubPath, NULL, ZEND_ACC_PUBLIC) SPL_ME(RecursiveDirectoryIterator, getSubPathname,NULL, ZEND_ACC_PUBLIC) diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 0b0d9f8d18..2d3f6bf24f 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -757,18 +757,19 @@ static zend_object_value spl_RecursiveIteratorIterator_new(zend_class_entry *cla /* }}} */ static -ZEND_BEGIN_ARG_INFO(arginfo_recursive_it___construct, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_it___construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Traversable, 0) ZEND_ARG_INFO(0, mode) + ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO(); static -ZEND_BEGIN_ARG_INFO(arginfo_recursive_it_getSubIterator, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_it_getSubIterator, 0, 0, 0) ZEND_ARG_INFO(0, level) ZEND_END_ARG_INFO(); static -ZEND_BEGIN_ARG_INFO(arginfo_recursive_it_setMaxDepth, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_recursive_it_setMaxDepth, 0, 0, 0) ZEND_ARG_INFO(0, max_depth) ZEND_END_ARG_INFO(); @@ -1553,7 +1554,7 @@ SPL_METHOD(RegexIterator, getPregFlags) } } /* }}} */ -/* {{{ proto bool RegexIterator::setFlags(int new_flags) +/* {{{ proto bool RegexIterator::setPregFlags(int new_flags) Set PREG flags */ SPL_METHOD(RegexIterator, setPregFlags) { @@ -1887,7 +1888,7 @@ static zend_function_entry spl_funcs_SeekableIterator[] = { }; static -ZEND_BEGIN_ARG_INFO(arginfo_limit_it___construct, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_limit_it___construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_ARG_INFO(0, offset) ZEND_ARG_INFO(0, count) @@ -2236,7 +2237,7 @@ SPL_METHOD(CachingIterator, getFlags) } /* }}} */ -/* {{{ proto void CachingIterator::setFlags() +/* {{{ proto void CachingIterator::setFlags(int flags) Set the internal flags */ SPL_METHOD(CachingIterator, setFlags) { @@ -2270,7 +2271,7 @@ SPL_METHOD(CachingIterator, setFlags) /* }}} */ static -ZEND_BEGIN_ARG_INFO(arginfo_caching_it___construct, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_it___construct, 0, 0, 1) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO(); @@ -2281,12 +2282,12 @@ ZEND_BEGIN_ARG_INFO(arginfo_caching_it_setFlags, 0) ZEND_END_ARG_INFO(); static -ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_it_offsetGet, 0, 0, 1) +ZEND_BEGIN_ARG_INFO(arginfo_caching_it_offsetGet, 0) ZEND_ARG_INFO(0, index) ZEND_END_ARG_INFO(); static -ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_it_offsetSet, 0, 0, 2) +ZEND_BEGIN_ARG_INFO(arginfo_caching_it_offsetSet, 0) ZEND_ARG_INFO(0, index) ZEND_ARG_INFO(0, newval) ZEND_END_ARG_INFO(); @@ -2345,7 +2346,7 @@ SPL_METHOD(RecursiveCachingIterator, getChildren) } /* }}} */ static -ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_rec_it___construct, 0, ZEND_RETURN_VALUE, 2) +ZEND_BEGIN_ARG_INFO_EX(arginfo_caching_rec_it___construct, 0, ZEND_RETURN_VALUE, 1) ZEND_ARG_OBJ_INFO(0, iterator, Iterator, 0) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO(); -- 2.50.1