andrei Thu Apr 6 21:16:28 2006 UTC Modified files: /ZendEngine2 zend_arg_defs.c zend_modules.h /php-src/ext/pcre TODO php_pcre.c Log: MFB http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_arg_defs.c?r1=1.4&r2=1.5&diff_format=u Index: ZendEngine2/zend_arg_defs.c diff -u ZendEngine2/zend_arg_defs.c:1.4 ZendEngine2/zend_arg_defs.c:1.5 --- ZendEngine2/zend_arg_defs.c:1.4 Tue Feb 21 08:00:38 2006 +++ ZendEngine2/zend_arg_defs.c Thu Apr 6 21:16:28 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_arg_defs.c,v 1.4 2006/02/21 08:00:38 dmitry Exp $ */ +/* $Id: zend_arg_defs.c,v 1.5 2006/04/06 21:16:28 andrei Exp $ */ ZEND_BEGIN_ARG_INFO(first_arg_force_ref, 0) ZEND_ARG_PASS_INFO(1) @@ -40,5 +40,13 @@ ZEND_ARG_PASS_INFO(1) ZEND_END_ARG_INFO(); +ZEND_BEGIN_ARG_INFO(fifth_arg_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) +ZEND_END_ARG_INFO(); + ZEND_BEGIN_ARG_INFO(all_args_by_ref, 1) ZEND_END_ARG_INFO(); http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_modules.h?r1=1.71&r2=1.72&diff_format=u Index: ZendEngine2/zend_modules.h diff -u ZendEngine2/zend_modules.h:1.71 ZendEngine2/zend_modules.h:1.72 --- ZendEngine2/zend_modules.h:1.71 Tue Feb 21 08:00:39 2006 +++ ZendEngine2/zend_modules.h Thu Apr 6 21:16:28 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_modules.h,v 1.71 2006/02/21 08:00:39 dmitry Exp $ */ +/* $Id: zend_modules.h,v 1.72 2006/04/06 21:16:28 andrei Exp $ */ #ifndef MODULES_H #define MODULES_H @@ -36,6 +36,7 @@ extern struct _zend_arg_info second_arg_force_ref[3]; extern struct _zend_arg_info third_arg_force_ref[4]; extern struct _zend_arg_info fourth_arg_force_ref[5]; +extern struct _zend_arg_info fifth_arg_force_ref[6]; extern struct _zend_arg_info all_args_by_ref[1]; #define ZEND_MODULE_API_NO 20050922 http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/TODO?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/pcre/TODO diff -u /dev/null php-src/ext/pcre/TODO:1.2 --- /dev/null Thu Apr 6 21:16:28 2006 +++ php-src/ext/pcre/TODO Thu Apr 6 21:16:28 2006 @@ -0,0 +1,21 @@ +- Allow NULL for $matches argument (helps when using preg_match only for + match condition) - might not be possible + +- http://bugs.php.net/bug.php?id=36975 + +- I'd love to see a pattern modifer which says "don't fill $matches except + for the overall match and any specific named captures". This would allow + (?: ...) to be avoided in a lot of cases. + + This could make for non-trivial speed enhancements with regexes that have + a lot of parens when working on long strings, since you'd not have to + copy them multiple times to the $matches array. + + Also, it makes $matches much cleaner after a match where you've named the + captures you're interested in. + + (Note that this would not involve the use of PCRE_NO_AUTO_CAPTURE, as + that would change the semantics of backreferences) + + + http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/php_pcre.c?r1=1.178&r2=1.179&diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.178 php-src/ext/pcre/php_pcre.c:1.179 --- php-src/ext/pcre/php_pcre.c:1.178 Tue Feb 21 20:12:42 2006 +++ php-src/ext/pcre/php_pcre.c Thu Apr 6 21:16:28 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.178 2006/02/21 20:12:42 dmitry Exp $ */ +/* $Id: php_pcre.c,v 1.179 2006/04/06 21:16:28 andrei Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1626,8 +1626,8 @@ 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, NULL) - PHP_FE(preg_replace_callback, NULL) + 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 CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php