archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Updated implode() impl as per Andrei's comments

Browse source 
[http://news.php.net/php.cvs/33457]
This commit is contained in:
Rolland Santimano 2005-08-17 07:14:12 +00:00
parent 63c6feaff7
commit 616089e772
1 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

52
ext/standard/string.c
View file

@ -1144,14 +1144,11 @@ PHP_FUNCTION(explode)
PHPAPI void php_implode(zval *delim, zval *arr, zval *retval) PHPAPI void php_implode(zval *delim, zval *arr, zval *retval)
{ {
zend_uchar return_type; zend_uchar return_type;
int numelems, i; int numelems, i=0;
HashPosition pos; HashPosition pos;
zval **tmp; zval **tmp;
TSRMLS_FETCH(); TSRMLS_FETCH();
if (Z_TYPE_P(delim) != IS_UNICODE && Z_TYPE_P(delim) != IS_BINARY) {
convert_to_string_ex(&delim);
}
Z_TYPE_P(retval) = return_type = Z_TYPE_P(delim); /* ... to start off */ Z_TYPE_P(retval) = return_type = Z_TYPE_P(delim); /* ... to start off */
/* Setup return value */ /* Setup return value */
@ -1169,18 +1166,14 @@ PHPAPI void php_implode(zval *delim, zval *arr, zval *retval)
} }
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(arr), &pos); zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(arr), &pos);
for (i = 1 ; i <= numelems ; i++) { while (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), (void **)&tmp, &pos) == SUCCESS) {
if (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), (void **)&tmp, &pos) != SUCCESS) {
/* Shouldn't happen ? */
return;
}
zend_hash_move_forward_ex(Z_ARRVAL_P(arr), &pos);
if (Z_TYPE_PP(tmp) != return_type) { if (Z_TYPE_PP(tmp) != return_type) {
/* Convert to common type, if possible */ /* Convert to common type, if possible */
if (return_type == IS_UNICODE) { if (return_type == IS_UNICODE) {
if (Z_TYPE_PP(tmp) == IS_BINARY) { if (Z_TYPE_PP(tmp) == IS_BINARY) {
/* ERROR */ /* ERROR */
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Mixed string types"); php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Cannot mix binary strings with other string types");
efree(Z_USTRVAL_P(retval)); efree(Z_USTRVAL_P(retval));
ZVAL_FALSE(retval); ZVAL_FALSE(retval);
return; return;
@ -1191,7 +1184,8 @@ PHPAPI void php_implode(zval *delim, zval *arr, zval *retval)
} else if (return_type == IS_BINARY) { } else if (return_type == IS_BINARY) {
if (Z_TYPE_PP(tmp) == IS_UNICODE || Z_TYPE_PP(tmp) == IS_STRING) { if (Z_TYPE_PP(tmp) == IS_UNICODE || Z_TYPE_PP(tmp) == IS_STRING) {
/* ERROR */ /* ERROR */
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Mixed string types"); php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Cannot mix binary strings with other string types");
efree(Z_BINVAL_P(retval)); efree(Z_BINVAL_P(retval));
ZVAL_FALSE(retval); ZVAL_FALSE(retval);
return; return;
@ -1207,7 +1201,8 @@ PHPAPI void php_implode(zval *delim, zval *arr, zval *retval)
Z_TYPE_P(retval) = return_type = IS_UNICODE; Z_TYPE_P(retval) = return_type = IS_UNICODE;
} else if (Z_TYPE_PP(tmp) == IS_BINARY) { } else if (Z_TYPE_PP(tmp) == IS_BINARY) {
/* ERROR */ /* ERROR */
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Mixed string types"); php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Cannot mix binary strings with other string types");
efree(Z_STRVAL_P(retval)); efree(Z_STRVAL_P(retval));
ZVAL_FALSE(retval); ZVAL_FALSE(retval);
return; return;
@ -1222,30 +1217,30 @@ PHPAPI void php_implode(zval *delim, zval *arr, zval *retval)
if (return_type == IS_UNICODE) { if (return_type == IS_UNICODE) {
Z_USTRVAL_P(retval) = eurealloc(Z_USTRVAL_P(retval), Z_USTRVAL_P(retval) = eurealloc(Z_USTRVAL_P(retval),
Z_USTRLEN_P(retval)+Z_USTRLEN_PP(tmp)); Z_USTRLEN_P(retval)+Z_USTRLEN_PP(tmp));
memcpy(Z_USTRVAL_P(retval)+Z_USTRLEN_P(retval), memcpy(Z_USTRVAL_P(retval)+Z_USTRLEN_P(retval), Z_USTRVAL_PP(tmp),
Z_USTRVAL_PP(tmp), Z_USTRLEN_PP(tmp)*sizeof(UChar)); UBYTES(Z_USTRLEN_PP(tmp)));
Z_USTRLEN_P(retval) += Z_USTRLEN_PP(tmp); Z_USTRLEN_P(retval) += Z_USTRLEN_PP(tmp);
if (i < numelems) { /* Append delim */ if (++i < numelems) { /* Append delim */
Z_USTRVAL_P(retval) = eurealloc(Z_USTRVAL_P(retval), Z_USTRVAL_P(retval) = eurealloc(Z_USTRVAL_P(retval),
Z_USTRLEN_P(retval)+Z_USTRLEN_P(delim)); Z_USTRLEN_P(retval)+Z_USTRLEN_P(delim));
memcpy(Z_USTRVAL_P(retval)+Z_USTRLEN_P(retval), memcpy(Z_USTRVAL_P(retval)+Z_USTRLEN_P(retval), Z_USTRVAL_P(delim),
Z_USTRVAL_P(delim), Z_USTRLEN_P(delim)*sizeof(UChar)); UBYTES(Z_USTRLEN_P(delim)));
Z_USTRLEN_P(retval) += Z_USTRLEN_P(delim); Z_USTRLEN_P(retval) += Z_USTRLEN_P(delim);
} }
} else { } else {
Z_STRVAL_P(retval) = (char *)erealloc(Z_STRVAL_P(retval), Z_STRVAL_P(retval) = (char *)erealloc(Z_STRVAL_P(retval),
Z_STRLEN_P(retval)+Z_STRLEN_PP(tmp)); Z_STRLEN_P(retval)+Z_STRLEN_PP(tmp));
memcpy(Z_STRVAL_P(retval)+Z_STRLEN_P(retval), memcpy(Z_STRVAL_P(retval)+Z_STRLEN_P(retval), Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
Z_STRLEN_P(retval) += Z_STRLEN_PP(tmp); Z_STRLEN_P(retval) += Z_STRLEN_PP(tmp);
if (i < numelems) { /* Append delim */ if (++i < numelems) { /* Append delim */
Z_STRVAL_P(retval) = (char *)erealloc(Z_STRVAL_P(retval), Z_STRVAL_P(retval) = (char *)erealloc(Z_STRVAL_P(retval),
Z_STRLEN_P(retval)+Z_STRLEN_P(delim)); Z_STRLEN_P(retval)+Z_STRLEN_P(delim));
memcpy(Z_STRVAL_P(retval)+Z_STRLEN_P(retval), memcpy(Z_STRVAL_P(retval)+Z_STRLEN_P(retval), Z_STRVAL_P(delim), Z_STRLEN_P(delim));
Z_STRVAL_P(delim), Z_STRLEN_P(delim));
Z_STRLEN_P(retval) += Z_STRLEN_P(delim); Z_STRLEN_P(retval) += Z_STRLEN_P(delim);
} }
} }
zend_hash_move_forward_ex(Z_ARRVAL_P(arr), &pos);
} }
return; return;
@ -1272,10 +1267,14 @@ PHP_FUNCTION(implode)
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument to implode must be an array."); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument to implode must be an array.");
RETURN_FALSE; RETURN_FALSE;
} else { } else {
MAKE_STD_ZVAL(delim);
ZVAL_STRINGL(delim, "", sizeof("")-1, 0);
SEPARATE_ZVAL(arg1); SEPARATE_ZVAL(arg1);
arr = *arg1; arr = *arg1;
MAKE_STD_ZVAL(delim);
if (UG(unicode)) {
ZVAL_UNICODEL(delim, USTR_MAKE(""), sizeof("")-1, 0);
} else {
ZVAL_STRINGL(delim, "", sizeof("")-1, 0);
}
} }
} else { } else {
if (Z_TYPE_PP(arg1) == IS_ARRAY) { if (Z_TYPE_PP(arg1) == IS_ARRAY) {
@ -1291,6 +1290,9 @@ PHP_FUNCTION(implode)
RETURN_FALSE; RETURN_FALSE;
} }
SEPARATE_ZVAL(&delim); SEPARATE_ZVAL(&delim);
if (Z_TYPE_P(delim) != IS_BINARY) {
convert_to_text_ex(&delim);
}
} }
php_implode(delim, arr, return_value); php_implode(delim, arr, return_value);