archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/intl: further fast ZPP usage. (#14419)

Browse source
This commit is contained in:
David CARLIER 2024-06-01 20:48:55 +01:00 • committed by GitHub
parent 2f9de8b9e6
commit bc6f3334d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 57 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ext/intl/dateformat/dateformat_format_object.cpp
View file

@ -66,7 +66,7 @@ U_CFUNC PHP_FUNCTION(datefmt_format_object)
{ {
zval *object, zval *object,
*format = NULL; *format = NULL;
const char *locale_str = NULL; char *locale_str = NULL;
size_t locale_len; size_t locale_len;
bool pattern = false; bool pattern = false;
UDate date; UDate date;
@ -77,13 +77,15 @@ U_CFUNC PHP_FUNCTION(datefmt_format_object)
DateFormat::EStyle dateStyle = DateFormat::kDefault, DateFormat::EStyle dateStyle = DateFormat::kDefault,
timeStyle = DateFormat::kDefault; timeStyle = DateFormat::kDefault;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "o|zs!", ZEND_PARSE_PARAMETERS_START(1, 3)
&object, &format, &locale_str, &locale_len) == FAILURE) { Z_PARAM_OBJECT(object)
RETURN_THROWS(); Z_PARAM_OPTIONAL
} Z_PARAM_ZVAL(format)
Z_PARAM_STRING_OR_NULL(locale_str, locale_len)
ZEND_PARSE_PARAMETERS_END();
if (!locale_str) { if (!locale_str) {
locale_str = intl_locale_get_default(); locale_str = (char *)intl_locale_get_default();
} }
if (format == NULL || Z_TYPE_P(format) == IS_NULL) { if (format == NULL || Z_TYPE_P(format) == IS_NULL) {

75
ext/intl/grapheme/grapheme_string.c
View file

@ -39,9 +39,9 @@ PHP_FUNCTION(grapheme_strlen)
zend_long ret_len; zend_long ret_len;
UErrorCode status; UErrorCode status;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &string, &string_len) == FAILURE) { ZEND_PARSE_PARAMETERS_START(1, 1)
RETURN_THROWS(); Z_PARAM_STRING(string, string_len)
} ZEND_PARSE_PARAMETERS_END();
ret_len = grapheme_ascii_check((unsigned char *)string, string_len); ret_len = grapheme_ascii_check((unsigned char *)string, string_len);
@ -89,9 +89,12 @@ PHP_FUNCTION(grapheme_strpos)
size_t noffset = 0; size_t noffset = 0;
zend_long ret_pos; zend_long ret_pos;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &haystack, &haystack_len, &needle, &needle_len, &loffset) == FAILURE) { ZEND_PARSE_PARAMETERS_START(2, 3)
RETURN_THROWS(); Z_PARAM_STRING(haystack, haystack_len)
} Z_PARAM_STRING(needle, needle_len)
Z_PARAM_OPTIONAL
Z_PARAM_LONG(loffset)
ZEND_PARSE_PARAMETERS_END();
if ( OUTSIDE_STRING(loffset, haystack_len) ) { if ( OUTSIDE_STRING(loffset, haystack_len) ) {
zend_argument_value_error(3, "must be contained in argument #1 ($haystack)"); zend_argument_value_error(3, "must be contained in argument #1 ($haystack)");
@ -139,9 +142,12 @@ PHP_FUNCTION(grapheme_stripos)
zend_long ret_pos; zend_long ret_pos;
int is_ascii; int is_ascii;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &haystack, &haystack_len, &needle, &needle_len, &loffset) == FAILURE) { ZEND_PARSE_PARAMETERS_START(2, 3)
RETURN_THROWS(); Z_PARAM_STRING(haystack, haystack_len)
} Z_PARAM_STRING(needle, needle_len)
Z_PARAM_OPTIONAL
Z_PARAM_LONG(loffset)
ZEND_PARSE_PARAMETERS_END();
if ( OUTSIDE_STRING(loffset, haystack_len) ) { if ( OUTSIDE_STRING(loffset, haystack_len) ) {
zend_argument_value_error(3, "must be contained in argument #1 ($haystack)"); zend_argument_value_error(3, "must be contained in argument #1 ($haystack)");
@ -200,9 +206,12 @@ PHP_FUNCTION(grapheme_strrpos)
zend_long ret_pos; zend_long ret_pos;
int is_ascii; int is_ascii;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &haystack, &haystack_len, &needle, &needle_len, &loffset) == FAILURE) { ZEND_PARSE_PARAMETERS_START(2, 3)
RETURN_THROWS(); Z_PARAM_STRING(haystack, haystack_len)
} Z_PARAM_STRING(needle, needle_len)
Z_PARAM_OPTIONAL
Z_PARAM_LONG(loffset)
ZEND_PARSE_PARAMETERS_END();
if ( OUTSIDE_STRING(loffset, haystack_len) ) { if ( OUTSIDE_STRING(loffset, haystack_len) ) {
zend_argument_value_error(3, "must be contained in argument #1 ($haystack)"); zend_argument_value_error(3, "must be contained in argument #1 ($haystack)");
@ -255,9 +264,12 @@ PHP_FUNCTION(grapheme_strripos)
zend_long ret_pos; zend_long ret_pos;
int is_ascii; int is_ascii;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|l", &haystack, &haystack_len, &needle, &needle_len, &loffset) == FAILURE) { ZEND_PARSE_PARAMETERS_START(2, 3)
RETURN_THROWS(); Z_PARAM_STRING(haystack, haystack_len)
} Z_PARAM_STRING(needle, needle_len)
Z_PARAM_OPTIONAL
Z_PARAM_LONG(loffset)
ZEND_PARSE_PARAMETERS_END();
if ( OUTSIDE_STRING(loffset, haystack_len) ) { if ( OUTSIDE_STRING(loffset, haystack_len) ) {
zend_argument_value_error(3, "must be contained in argument #1 ($haystack)"); zend_argument_value_error(3, "must be contained in argument #1 ($haystack)");
@ -325,11 +337,14 @@ PHP_FUNCTION(grapheme_substr)
UBreakIterator* bi = NULL; UBreakIterator* bi = NULL;
int sub_str_start_pos, sub_str_end_pos; int sub_str_start_pos, sub_str_end_pos;
int32_t (*iter_func)(UBreakIterator *); int32_t (*iter_func)(UBreakIterator *);
bool no_length = 1; bool no_length = true;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl|l!", &str, &str_len, &lstart, &length, &no_length) == FAILURE) { ZEND_PARSE_PARAMETERS_START(2, 3)
RETURN_THROWS(); Z_PARAM_STRING(str, str_len)
} Z_PARAM_LONG(lstart)
Z_PARAM_OPTIONAL
Z_PARAM_LONG_OR_NULL(length, no_length)
ZEND_PARSE_PARAMETERS_END();
if (lstart < INT32_MIN || lstart > INT32_MAX) { if (lstart < INT32_MIN || lstart > INT32_MAX) {
zend_argument_value_error(2, "is too large"); zend_argument_value_error(2, "is too large");
@ -526,11 +541,14 @@ static void strstr_common_handler(INTERNAL_FUNCTION_PARAMETERS, int f_ignore_cas
const char *found; const char *found;
size_t haystack_len, needle_len; size_t haystack_len, needle_len;
int32_t ret_pos, uchar_pos; int32_t ret_pos, uchar_pos;
bool part = 0; bool part = false;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|b", &haystack, &haystack_len, &needle, &needle_len, &part) == FAILURE) { ZEND_PARSE_PARAMETERS_START(2, 3)
RETURN_THROWS(); Z_PARAM_STRING(haystack, haystack_len)
} Z_PARAM_STRING(needle, needle_len)
Z_PARAM_OPTIONAL
Z_PARAM_BOOL(part)
ZEND_PARSE_PARAMETERS_END();
if ( !f_ignore_case ) { if ( !f_ignore_case ) {
@ -702,9 +720,14 @@ PHP_FUNCTION(grapheme_extract)
int ret_pos; int ret_pos;
zval *next = NULL; /* return offset of next part of the string */ zval *next = NULL; /* return offset of next part of the string */
if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl|llz", &str, &str_len, &size, &extract_type, &lstart, &next) == FAILURE) { ZEND_PARSE_PARAMETERS_START(2, 5)
RETURN_THROWS(); Z_PARAM_STRING(str, str_len)
} Z_PARAM_LONG(size)
Z_PARAM_OPTIONAL
Z_PARAM_LONG(extract_type)
Z_PARAM_LONG(lstart)
Z_PARAM_ZVAL(next)
ZEND_PARSE_PARAMETERS_END();
if (lstart < 0) { if (lstart < 0) {
lstart += str_len; lstart += str_len;