bjori Sun Jun 1 18:50:00 2008 UTC
Modified files:
/php-src/ext/pcre php_pcre.c
Log:
MFB5.3: arginfo & fix protos
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.233&r2=1.234&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.233 php-src/ext/pcre/php_pcre.c:1.234
--- php-src/ext/pcre/php_pcre.c:1.233 Sat Mar 8 13:14:02 2008
+++ php-src/ext/pcre/php_pcre.c Sun Jun 1 18:50:00 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.233 2008/03/08 13:14:02 nlopess Exp $ */
+/* $Id: php_pcre.c,v 1.234 2008/06/01 18:50:00 bjori Exp $ */
/* TODO
* php_pcre_replace_impl():
@@ -882,7 +882,7 @@
}
/* }}} */
-/* {{{ proto int preg_match(string pattern, string subject [, array
subpatterns [, int flags [, int offset]]]) U
+/* {{{ proto int preg_match(string pattern, string subject [, array
&subpatterns [, int flags [, int offset]]]) U
Perform a Perl-style regular expression match */
static PHP_FUNCTION(preg_match)
{
@@ -890,7 +890,7 @@
}
/* }}} */
-/* {{{ proto int preg_match_all(string pattern, string subject, array
subpatterns [, int flags [, int offset]]) U
+/* {{{ proto int preg_match_all(string pattern, string subject, array
&subpatterns [, int flags [, int offset]]) U
Perform a Perl-style global regular expression match */
static PHP_FUNCTION(preg_match_all)
{
@@ -1545,7 +1545,7 @@
}
/* }}} */
-/* {{{ proto string preg_replace(mixed regex, mixed replace, mixed subject [,
int limit [, count]]) U
+/* {{{ proto string preg_replace(mixed regex, mixed replace, mixed subject [,
int limit [, int &count]]) U
Perform Perl-style regular expression replacement. */
static PHP_FUNCTION(preg_replace)
{
@@ -1553,7 +1553,7 @@
}
/* }}} */
-/* {{{ proto string preg_replace_callback(mixed regex, mixed callback, mixed
subject [, int limit [, count]]) U
+/* {{{ proto string preg_replace_callback(mixed regex, mixed callback, mixed
subject [, int limit [, int &count]]) U
Perform Perl-style regular expression replacement using replacement
callback. */
static PHP_FUNCTION(preg_replace_callback)
{
@@ -2048,15 +2048,78 @@
/* {{{ module definition structures */
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match, 0, 0, 2)
+ ZEND_ARG_INFO(0, pattern)
+ ZEND_ARG_INFO(0, subject)
+ ZEND_ARG_INFO(1, subpatterns) /* array */
+ ZEND_ARG_INFO(0, flags)
+ ZEND_ARG_INFO(0, offset)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match_all, 0, 0, 3)
+ ZEND_ARG_INFO(0, pattern)
+ ZEND_ARG_INFO(0, subject)
+ ZEND_ARG_INFO(1, subpatterns) /* array */
+ ZEND_ARG_INFO(0, flags)
+ ZEND_ARG_INFO(0, offset)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 2)
+ ZEND_ARG_INFO(0, regex)
+ ZEND_ARG_INFO(0, replace)
+ ZEND_ARG_INFO(0, subject)
+ ZEND_ARG_INFO(0, limit)
+ ZEND_ARG_INFO(1, count)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace_callback, 0, 0, 3)
+ ZEND_ARG_INFO(0, regex)
+ ZEND_ARG_INFO(0, callback)
+ ZEND_ARG_INFO(0, subject)
+ ZEND_ARG_INFO(0, limit)
+ ZEND_ARG_INFO(1, count)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_split, 0, 0, 2)
+ ZEND_ARG_INFO(0, pattern)
+ ZEND_ARG_INFO(0, subject)
+ ZEND_ARG_INFO(0, limit)
+ ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_quote, 0, 0, 1)
+ ZEND_ARG_INFO(0, str)
+ ZEND_ARG_INFO(0, delim_char)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_grep, 0, 0, 2)
+ ZEND_ARG_INFO(0, regex)
+ ZEND_ARG_INFO(0, input) /* array */
+ ZEND_ARG_INFO(0, flags)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO(arginfo_preg_last_error, 0)
+ZEND_END_ARG_INFO()
+/* }}} */
+
static const zend_function_entry pcre_functions[] = {
- PHP_FE(preg_match, third_arg_force_ref)
- PHP_FE(preg_match_all, third_arg_force_ref)
- PHP_FE(preg_replace, fifth_arg_force_ref)
- PHP_FE(preg_replace_callback, fifth_arg_force_ref)
- PHP_FE(preg_split, NULL)
- PHP_FE(preg_quote, NULL)
- PHP_FE(preg_grep, NULL)
- PHP_FE(preg_last_error, NULL)
+ PHP_FE(preg_match, arginfo_preg_match)
+ PHP_FE(preg_match_all, arginfo_preg_match_all)
+ PHP_FE(preg_replace, arginfo_preg_replace)
+ PHP_FE(preg_replace_callback, arginfo_preg_replace_callback)
+ PHP_FE(preg_split, arginfo_preg_split)
+ PHP_FE(preg_quote, arginfo_preg_quote)
+ PHP_FE(preg_grep, arginfo_preg_grep)
+ PHP_FE(preg_last_error, arginfo_preg_last_error)
{NULL, NULL, NULL}
};
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
