Merge branch 'upstream-experimental' into upstream-sid

1 files changed, 40 insertions, 52 deletions

diff --git a/ext/mbstring/php_mbregex.h b/ext/mbstring/php_mbregex.h
index d7a12ea9f..c9201df3f 100644
--- a/ext/mbstring/php_mbregex.h
+++ b/ext/mbstring/php_mbregex.h
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_mbregex.h 272374 2008-12-31 11:17:49Z sebastian $ */
+/* $Id: php_mbregex.h 272370 2008-12-31 11:15:49Z sebastian $ */
  
 #ifndef _PHP_MBREGEX_H
 #define _PHP_MBREGEX_H
@@ -25,68 +25,56 @@
 
 #include "php.h"
 #include "zend.h"
-#include "oniguruma/oniguruma.h"
-
-/* {{{ PHP_MBREGEX_GLOBALS */
-#define PHP_MBREGEX_GLOBALS \
-	OnigEncoding default_mbctype; \
-	OnigEncoding current_mbctype; \
-	HashTable ht_rc; \
-	zval *search_str; \
-	zval *search_str_val; \
-	unsigned int search_pos; \
-	php_mb_regex_t *search_re; \
-	OnigRegion *search_regs; \
-	OnigOptionType regex_default_options; \
-	OnigSyntaxType *regex_default_syntax;
-/* }}} */
 
 /* {{{ PHP_MBREGEX_FUNCTION_ENTRIES */
 #define PHP_MBREGEX_FUNCTION_ENTRIES \
-	PHP_FE(mb_regex_encoding,	NULL) \
-	PHP_FE(mb_regex_set_options,	NULL) \
-	PHP_FE(mb_ereg,			third_arg_force_ref) \
-	PHP_FE(mb_eregi,			third_arg_force_ref) \
-	PHP_FE(mb_ereg_replace,			NULL) \
-	PHP_FE(mb_eregi_replace,			NULL) \
-	PHP_FE(mb_split,					NULL) \
-	PHP_FE(mb_ereg_match,			NULL) \
-	PHP_FE(mb_ereg_search,			NULL) \
-	PHP_FE(mb_ereg_search_pos,		NULL) \
-	PHP_FE(mb_ereg_search_regs,		NULL) \
-	PHP_FE(mb_ereg_search_init,		NULL) \
-	PHP_FE(mb_ereg_search_getregs,	NULL) \
-	PHP_FE(mb_ereg_search_getpos,	NULL) \
-	PHP_FE(mb_ereg_search_setpos,	NULL) \
-	PHP_FALIAS(mbregex_encoding,	mb_regex_encoding,	NULL) \
-	PHP_FALIAS(mbereg,	mb_ereg,	NULL) \
-	PHP_FALIAS(mberegi,	mb_eregi,	NULL) \
-	PHP_FALIAS(mbereg_replace,	mb_ereg_replace,	NULL) \
-	PHP_FALIAS(mberegi_replace,	mb_eregi_replace,	NULL) \
-	PHP_FALIAS(mbsplit,	mb_split,	NULL) \
-	PHP_FALIAS(mbereg_match,	mb_ereg_match,	NULL) \
-	PHP_FALIAS(mbereg_search,	mb_ereg_search,	NULL) \
-	PHP_FALIAS(mbereg_search_pos,	mb_ereg_search_pos,	NULL) \
-	PHP_FALIAS(mbereg_search_regs,	mb_ereg_search_regs,	NULL) \
-	PHP_FALIAS(mbereg_search_init,	mb_ereg_search_init,	NULL) \
-	PHP_FALIAS(mbereg_search_getregs,	mb_ereg_search_getregs,	NULL) \
-	PHP_FALIAS(mbereg_search_getpos,	mb_ereg_search_getpos,	NULL) \
-	PHP_FALIAS(mbereg_search_setpos,	mb_ereg_search_setpos,	NULL)
+	PHP_FE(mb_regex_encoding,	arginfo_mb_regex_encoding) \
+	PHP_FE(mb_regex_set_options,	arginfo_mb_regex_set_options) \
+	PHP_FE(mb_ereg,			arginfo_mb_ereg) \
+	PHP_FE(mb_eregi,			arginfo_mb_eregi) \
+	PHP_FE(mb_ereg_replace,			arginfo_mb_ereg_replace) \
+	PHP_FE(mb_eregi_replace,			arginfo_mb_eregi_replace) \
+	PHP_FE(mb_split,					arginfo_mb_split) \
+	PHP_FE(mb_ereg_match,			arginfo_mb_ereg_match) \
+	PHP_FE(mb_ereg_search,			arginfo_mb_ereg_search) \
+	PHP_FE(mb_ereg_search_pos,		arginfo_mb_ereg_search_pos) \
+	PHP_FE(mb_ereg_search_regs,		arginfo_mb_ereg_search_regs) \
+	PHP_FE(mb_ereg_search_init,		arginfo_mb_ereg_search_init) \
+	PHP_FE(mb_ereg_search_getregs,	arginfo_mb_ereg_search_getregs) \
+	PHP_FE(mb_ereg_search_getpos,	arginfo_mb_ereg_search_getpos) \
+	PHP_FE(mb_ereg_search_setpos,	arginfo_mb_ereg_search_setpos) \
+	PHP_FALIAS(mbregex_encoding,	mb_regex_encoding,	arginfo_mb_regex_encoding) \
+	PHP_FALIAS(mbereg,	mb_ereg,	arginfo_mb_ereg) \
+	PHP_FALIAS(mberegi,	mb_eregi,	arginfo_mb_eregi) \
+	PHP_FALIAS(mbereg_replace,	mb_ereg_replace,	arginfo_mb_ereg_replace) \
+	PHP_FALIAS(mberegi_replace,	mb_eregi_replace,	arginfo_mb_eregi_replace) \
+	PHP_FALIAS(mbsplit,	mb_split,	arginfo_mb_split) \
+	PHP_FALIAS(mbereg_match,	mb_ereg_match,	arginfo_mb_ereg_match) \
+	PHP_FALIAS(mbereg_search,	mb_ereg_search,	arginfo_mb_ereg_search) \
+	PHP_FALIAS(mbereg_search_pos,	mb_ereg_search_pos,	arginfo_mb_ereg_search_pos) \
+	PHP_FALIAS(mbereg_search_regs,	mb_ereg_search_regs,	arginfo_mb_ereg_search_regs) \
+	PHP_FALIAS(mbereg_search_init,	mb_ereg_search_init,	arginfo_mb_ereg_search_init) \
+	PHP_FALIAS(mbereg_search_getregs,	mb_ereg_search_getregs,	arginfo_mb_ereg_search_getregs) \
+	PHP_FALIAS(mbereg_search_getpos,	mb_ereg_search_getpos,	arginfo_mb_ereg_search_getpos) \
+	PHP_FALIAS(mbereg_search_setpos,	mb_ereg_search_setpos,	arginfo_mb_ereg_search_setpos)
 /* }}} */
 
-typedef struct _zend_mbstring_globals * zend_mbstring_globals_ptr;
-
 #define PHP_MBREGEX_MAXCACHE 50
 
 PHP_MINIT_FUNCTION(mb_regex);
 PHP_MSHUTDOWN_FUNCTION(mb_regex);
 PHP_RINIT_FUNCTION(mb_regex);
 PHP_RSHUTDOWN_FUNCTION(mb_regex);
-void _php_mb_regex_globals_ctor(zend_mbstring_globals_ptr pglobals TSRMLS_DC);
-void php_mb_regex_set_options(OnigOptionType options, OnigSyntaxType *syntax, OnigOptionType *prev_options, OnigSyntaxType **prev_syntax TSRMLS_DC);
-void _php_mb_regex_globals_dtor(zend_mbstring_globals_ptr pglobals TSRMLS_DC);
-OnigEncoding php_mb_regex_name2mbctype(const char *pname);
-const char *php_mb_regex_mbctype2name(OnigEncoding mbctype);
+PHP_MINFO_FUNCTION(mb_regex);
+
+typedef struct _zend_mb_regex_globals zend_mb_regex_globals;
+
+zend_mb_regex_globals *php_mb_regex_globals_alloc(TSRMLS_D);
+void php_mb_regex_globals_free(zend_mb_regex_globals *pglobals TSRMLS_DC);
+int php_mb_regex_set_mbctype(const char *enc TSRMLS_DC);
+int php_mb_regex_set_default_mbctype(const char *encname TSRMLS_DC);
+const char *php_mb_regex_get_mbctype(TSRMLS_D);
+const char *php_mb_regex_get_default_mbctype(TSRMLS_D);
 
 PHP_FUNCTION(mb_regex_encoding);
 PHP_FUNCTION(mb_ereg);