cvs: php-src /ext/standard basic_functions.c php_string.h string.c /ext/unicode locale.c php_unicode.h unicode.c

derick Wed Mar 22 10:20:20 2006 UTC Modified files: /php-src/ext/standard basic_functions.c php_string.h string.c /php-src/ext/unicode locale.c php_unicode.h unicode.c Log: - Moved strtotitle to ext/standard and implemented the fallback case to non-unicode with ucwords. There is also an implementation for unicode ucwords but that returns different results then strtotitle as it uppercases the first character of every word, and doesn't *titlecase* a word. The test case shows that.

http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.765&r2=1.766&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.765 php-src/ext/standard/basic_functions.c:1.766 --- php-src/ext/standard/basic_functions.c:1.765 Mon Mar 20 23:33:07 2006 +++ php-src/ext/standard/basic_functions.c Wed Mar 22 10:20:20 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.765 2006/03/20 23:33:07 tony2001 Exp $ */ +/* $Id: basic_functions.c,v 1.766 2006/03/22 10:20:20 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -214,6 +214,7 @@ PHP_FE(strtok, NULL) PHP_FE(strtoupper, NULL) PHP_FE(strtolower, NULL) + PHP_FE(strtotitle, NULL) PHP_FE(strpos, NULL) PHP_FE(stripos, NULL) PHP_FE(strrpos, NULL) http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/php_string.h?r1=1.96&r2=1.97&diff_format=u Index: php-src/ext/standard/php_string.h diff -u php-src/ext/standard/php_string.h:1.96 php-src/ext/standard/php_string.h:1.97 --- php-src/ext/standard/php_string.h:1.96 Thu Mar 2 13:12:45 2006 +++ php-src/ext/standard/php_string.h Wed Mar 22 10:20:20 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_string.h,v 1.96 2006/03/02 13:12:45 dmitry Exp $ */ +/* $Id: php_string.h,v 1.97 2006/03/22 10:20:20 derick Exp $ */ /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */ @@ -41,6 +41,7 @@ PHP_FUNCTION(strtok); PHP_FUNCTION(strtoupper); PHP_FUNCTION(strtolower); +PHP_FUNCTION(strtotitle); PHP_FUNCTION(basename); PHP_FUNCTION(dirname); PHP_FUNCTION(pathinfo); http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/string.c?r1=1.532&r2=1.533&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.532 php-src/ext/standard/string.c:1.533 --- php-src/ext/standard/string.c:1.532 Fri Mar 17 23:14:55 2006 +++ php-src/ext/standard/string.c Wed Mar 22 10:20:20 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.532 2006/03/17 23:14:55 helly Exp $ */ +/* $Id: string.c,v 1.533 2006/03/22 10:20:20 derick Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -54,6 +54,7 @@ #endif #include "unicode/uchar.h" +#include "unicode/ubrk.h" #define STR_PAD_LEFT 0 #define STR_PAD_RIGHT 1 @@ -104,6 +105,7 @@ /* }}} */ int php_tag_find(char *tag, int len, char *set); +static void php_ucwords(zval *str); /* this is read-only, so it's ok */ static char hexconvtab[] = "0123456789abcdef"; @@ -1609,6 +1611,79 @@ } /* }}} */ +/* {{{ php_strtotitle + */ +PHPAPI char *php_strtotitle(char *s, size_t len) +{ + s[0] = toupper(s[0]); + return s; +} +/* }}} */ + +/* {{{ php_u_strtotitle + */ +PHPAPI UChar* php_u_strtotitle(UChar **s, int32_t *len, const char* locale) +{ + UChar *dest = NULL; + int32_t dest_len; + UErrorCode status = U_ZERO_ERROR; + UBreakIterator *brkiter; + + dest_len = *len; + brkiter = ubrk_open(UBRK_WORD, locale, *s, *len, &status); + while (1) { + status = U_ZERO_ERROR; + dest = eurealloc(dest, dest_len+1); + dest_len = u_strToTitle(dest, dest_len, *s, *len, NULL, locale, &status); + if (status != U_BUFFER_OVERFLOW_ERROR) { + break; + } + } + ubrk_close(brkiter); + + if (U_SUCCESS(status)) { + efree(*s); + dest[dest_len] = 0; + *s = dest; + *len = dest_len; + } else { + efree(dest); + } + + return *s; +} +/* }}} */ + + +/* {{{ proto string strtotitle(string str) + Makes a string titlecase */ +PHP_FUNCTION(strtotitle) +{ + zval **str; + + if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str)) { + WRONG_PARAM_COUNT; + } + if (Z_TYPE_PP(str) != IS_STRING && Z_TYPE_PP(str) != IS_UNICODE) { + convert_to_text_ex(str); + } + + if (Z_TYPE_PP(str) == IS_UNICODE && !Z_USTRLEN_PP(str)) { + RETURN_EMPTY_UNICODE(); + } else if (!Z_STRLEN_PP(str)) { + RETURN_EMPTY_STRING(); + } + + if (Z_TYPE_PP(str) == IS_UNICODE) { + RETVAL_ZVAL(*str, 1, 0); + php_u_strtotitle(&Z_USTRVAL_P(return_value), &Z_USTRLEN_P(return_value), UG(default_locale)); + } else { + ZVAL_STRINGL(return_value, Z_STRVAL_PP(str), Z_STRLEN_PP(str), 1); + php_ucwords(return_value); + } +} +/* }}} */ + /* {{{ php_basename */ PHPAPI void php_basename(char *s, size_t len, char *suffix, size_t sufflen, char **p_ret, size_t *p_len TSRMLS_DC) @@ -3311,6 +3386,22 @@ } /* }}} */ +/* {{{ php_ucwords() + Uppercase the first character of every word in a native string */ +static void php_ucwords(zval *str) +{ + register char *r, *r_end; + + r = Z_STRVAL_P(str); + *r = toupper((unsigned char) *r); + for (r_end = r + Z_STRLEN_P(str) - 1; r < r_end; ) { + if (isspace((int) *(unsigned char *)r++)) { + *r = toupper((unsigned char) *r); + } + } +} +/* }}} */ + /* {{{ php_u_ucwords() U Uppercase the first character of every word in an Unicode string */ static void php_u_ucwords(zval *ustr, zval *retval TSRMLS_DC) @@ -3369,7 +3460,6 @@ PHP_FUNCTION(ucwords) { zval **str; - register char *r, *r_end; if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &str) == FAILURE) { WRONG_PARAM_COUNT; @@ -3390,14 +3480,7 @@ php_u_ucwords(*str, return_value TSRMLS_CC); } else { ZVAL_STRINGL(return_value, Z_STRVAL_PP(str), Z_STRLEN_PP(str), 1); - - r = Z_STRVAL_P(return_value); - *r = toupper((unsigned char) *r); - for (r_end = r + Z_STRLEN_P(return_value) - 1; r < r_end; ) { - if (isspace((int) *(unsigned char *)r++)) { - *r = toupper((unsigned char) *r); - } - } + php_ucwords(return_value); } } /* }}} */ http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/locale.c?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/unicode/locale.c diff -u php-src/ext/unicode/locale.c:1.6 php-src/ext/unicode/locale.c:1.7 --- php-src/ext/unicode/locale.c:1.6 Thu Mar 2 20:40:45 2006 +++ php-src/ext/unicode/locale.c Wed Mar 22 10:20:20 2006 @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: locale.c,v 1.6 2006/03/02 20:40:45 andrei Exp $ */ +/* $Id: locale.c,v 1.7 2006/03/22 10:20:20 derick Exp $ */ #include "php_unicode.h" @@ -79,68 +79,6 @@ zend_reset_locale_deps(TSRMLS_C); RETURN_TRUE; } - -/* {{{ php_strtotitle - */ -PHPAPI char *php_strtotitle(char *s, size_t len) -{ - s[0] = toupper(s[0]); - return s; -} -/* }}} */ - -/* {{{ php_u_strtotitle - */ -PHPAPI UChar* php_u_strtotitle(UChar **s, int32_t *len, const char* locale) -{ - UChar *dest = NULL; - int32_t dest_len; - UErrorCode status = U_ZERO_ERROR; - UBreakIterator *brkiter; - - dest_len = *len; - brkiter = ubrk_open(UBRK_WORD, locale, *s, *len, &status); - while (1) { - status = U_ZERO_ERROR; - dest = eurealloc(dest, dest_len+1); - dest_len = u_strToTitle(dest, dest_len, *s, *len, NULL, locale, &status); - if (status != U_BUFFER_OVERFLOW_ERROR) { - break; - } - } - ubrk_close(brkiter); - - if (U_SUCCESS(status)) { - efree(*s); - dest[dest_len] = 0; - *s = dest; - *len = dest_len; - } else { - efree(dest); - } - - return *s; -} -/* }}} */ - - -/* {{{ proto string strtoupper(string str) - Makes a string uppercase */ -PHP_FUNCTION(i18n_strtotitle) -{ - zval **arg; - - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg)) { - WRONG_PARAM_COUNT; - } - if (Z_TYPE_PP(arg) != IS_STRING && Z_TYPE_PP(arg) != IS_UNICODE) { - convert_to_text_ex(arg); - } - - RETVAL_ZVAL(*arg, 1, 0); - php_u_strtotitle(&Z_USTRVAL_P(return_value), &Z_USTRLEN_P(return_value), UG(default_locale)); -} -/* }}} */ #endif /* HAVE_UNICODE */ http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/php_unicode.h?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/unicode/php_unicode.h diff -u php-src/ext/unicode/php_unicode.h:1.4 php-src/ext/unicode/php_unicode.h:1.5 --- php-src/ext/unicode/php_unicode.h:1.4 Sun Jan 1 13:09:56 2006 +++ php-src/ext/unicode/php_unicode.h Wed Mar 22 10:20:20 2006 @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_unicode.h,v 1.4 2006/01/01 13:09:56 sniper Exp $ */ +/* $Id: php_unicode.h,v 1.5 2006/03/22 10:20:20 derick Exp $ */ #ifndef PHP_UNICODE_H #define PHP_UNICODE_H @@ -57,7 +57,6 @@ PHP_FUNCTION(i18n_loc_get_default); PHP_FUNCTION(i18n_loc_set_default); -PHP_FUNCTION(i18n_strtotitle); extern php_stream_filter_factory php_unicode_filter_factory; http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/unicode.c?r1=1.11&r2=1.12&diff_format=u Index: php-src/ext/unicode/unicode.c diff -u php-src/ext/unicode/unicode.c:1.11 php-src/ext/unicode/unicode.c:1.12 --- php-src/ext/unicode/unicode.c:1.11 Thu Mar 2 13:12:45 2006 +++ php-src/ext/unicode/unicode.c Wed Mar 22 10:20:20 2006 @@ -15,7 +15,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: unicode.c,v 1.11 2006/03/02 13:12:45 dmitry Exp $ */ +/* $Id: unicode.c,v 1.12 2006/03/22 10:20:20 derick Exp $ */ #include "php_unicode.h" #if HAVE_UNICODE @@ -119,7 +119,6 @@ PHP_FE(unicode_decode, NULL) PHP_FE(unicode_semantics, NULL) PHP_FE(unicode_encode, NULL) - PHP_FE(i18n_strtotitle, NULL) { NULL, NULL, NULL } }; /* }}} */