mirror of
https://github.com/php/php-src.git
synced 2024-09-23 10:57:26 +00:00
71ba533640
Three issues are addressed: - RecursiveRegexIterator::accept() should accept non-empty arrays without applying any regular expression and RegexIterator::accept() should not accept an array. - RegexIterator::accept() should not accept an atom that fails to match anything, even when PREG_PATTERN_ORDER is used (which would return an array of empty arrays). - RecursiveRegexIterator::getChildren() should pass all constructor arguments to its child iterator instead of just the regular expression.
97 lines
3.1 KiB
C
97 lines
3.1 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| PHP Version 5 |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 1997-2014 The PHP Group |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Marcus Boerger <helly@php.net> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
/* $Id$ */
|
|
|
|
#ifndef SPL_ENGINE_H
|
|
#define SPL_ENGINE_H
|
|
|
|
#include "php.h"
|
|
#include "php_spl.h"
|
|
#include "zend_interfaces.h"
|
|
|
|
PHPAPI void spl_instantiate(zend_class_entry *pce, zval **object, int alloc TSRMLS_DC);
|
|
|
|
PHPAPI long spl_offset_convert_to_long(zval *offset TSRMLS_DC);
|
|
|
|
/* {{{ spl_instantiate_arg_ex1 */
|
|
static inline int spl_instantiate_arg_ex1(zend_class_entry *pce, zval **retval, int alloc, zval *arg1 TSRMLS_DC)
|
|
{
|
|
spl_instantiate(pce, retval, alloc TSRMLS_CC);
|
|
|
|
zend_call_method(retval, pce, &pce->constructor, pce->constructor->common.function_name, strlen(pce->constructor->common.function_name), NULL, 1, arg1, NULL TSRMLS_CC);
|
|
return 0;
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ spl_instantiate_arg_ex2 */
|
|
static inline int spl_instantiate_arg_ex2(zend_class_entry *pce, zval **retval, int alloc, zval *arg1, zval *arg2 TSRMLS_DC)
|
|
{
|
|
spl_instantiate(pce, retval, alloc TSRMLS_CC);
|
|
|
|
zend_call_method(retval, pce, &pce->constructor, pce->constructor->common.function_name, strlen(pce->constructor->common.function_name), NULL, 2, arg1, arg2 TSRMLS_CC);
|
|
return 0;
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ spl_instantiate_arg_n */
|
|
static inline void spl_instantiate_arg_n(zend_class_entry *pce, zval **retval, int argc, zval ***argv TSRMLS_DC)
|
|
{
|
|
zend_function *func = pce->constructor;
|
|
zend_fcall_info fci;
|
|
zend_fcall_info_cache fcc;
|
|
zval *dummy;
|
|
zval z_name;
|
|
|
|
spl_instantiate(pce, retval, 0 TSRMLS_CC);
|
|
|
|
ZVAL_STRING(&z_name, func->common.function_name, 0);
|
|
|
|
fci.size = sizeof(zend_fcall_info);
|
|
fci.function_table = &pce->function_table;
|
|
fci.function_name = &z_name;
|
|
fci.object_ptr = *retval;
|
|
fci.symbol_table = NULL;
|
|
fci.retval_ptr_ptr = &dummy;
|
|
fci.param_count = argc;
|
|
fci.params = argv;
|
|
fci.no_separation = 1;
|
|
|
|
fcc.initialized = 1;
|
|
fcc.function_handler = func;
|
|
fcc.calling_scope = EG(scope);
|
|
fcc.called_scope = pce;
|
|
fcc.object_ptr = *retval;
|
|
|
|
zend_call_function(&fci, &fcc TSRMLS_CC);
|
|
|
|
zval_ptr_dtor(&dummy);
|
|
}
|
|
/* }}} */
|
|
|
|
#endif /* SPL_ENGINE_H */
|
|
|
|
/*
|
|
* Local Variables:
|
|
* c-basic-offset: 4
|
|
* tab-width: 4
|
|
* End:
|
|
* vim600: fdm=marker
|
|
* vim: noet sw=4 ts=4
|
|
*/
|