diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-01-17 12:18:53 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-01-17 12:18:53 +0000 |
| commit | 227295a4f1df63b8740aa2bdd8cdca61be738268 (patch) | |
| tree | efb1f210d045f33372e694d6835ff8c8fa7151ff /Zend/zend_builtin_functions.c | |
| parent | 465b131c2f15f5816f7db02b0dd69907a1d0dd3d (diff) | |
| download | php-git-227295a4f1df63b8740aa2bdd8cdca61be738268.tar.gz | |
Unicode stuff is changed according to decision maden on PDM.
Now IS_BINRAY data type is removed and IS_STRING starts behave as IS_BINARY in unicode mode. IS_STRING is incompatible with IS_UNICODE, so ALL functions should be improved to support unicode mode.
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 41ee1e25e4..39f6d76b64 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -287,7 +287,6 @@ ZEND_NAMED_FUNCTION(zend_if_strlen) break; case IS_STRING: - case IS_BINARY: RETVAL_LONG(Z_STRLEN_PP(str)); break; @@ -431,9 +430,6 @@ ZEND_FUNCTION(each) case HASH_KEY_IS_STRING: add_get_index_stringl(return_value, 0, string_key, string_key_len-1, (void **) &inserted_pointer, 0); break; - case HASH_KEY_IS_BINARY: - add_get_index_binaryl(return_value, 0, string_key, string_key_len-1, (void **) &inserted_pointer, 0); - break; case HASH_KEY_IS_UNICODE: add_get_index_unicodel(return_value, 0, (UChar*)string_key, string_key_len-1, (void **) &inserted_pointer, 0); break; @@ -511,7 +507,6 @@ ZEND_FUNCTION(define) case IS_LONG: case IS_DOUBLE: case IS_STRING: - case IS_BINARY: case IS_UNICODE: case IS_BOOL: case IS_RESOURCE: @@ -1398,7 +1393,6 @@ static int copy_function_name(zend_function *func, int num_args, va_list args, z *user_ar = va_arg(args, zval *); if (hash_key->nKeyLength == 0 || - hash_key->type == IS_BINARY || (hash_key->type == IS_UNICODE && hash_key->u.unicode[0] == 0) || (hash_key->type == IS_STRING && hash_key->u.unicode[0] == 0)) { return 0; @@ -1407,16 +1401,12 @@ static int copy_function_name(zend_function *func, int num_args, va_list args, z if (func->type == ZEND_INTERNAL_FUNCTION) { if (hash_key->type == IS_STRING) { add_next_index_stringl(internal_ar, hash_key->u.string, hash_key->nKeyLength-1, 1); - } else if (hash_key->type == IS_BINARY) { - add_next_index_binaryl(internal_ar, hash_key->u.string, hash_key->nKeyLength-1, 1); } else { add_next_index_unicodel(internal_ar, hash_key->u.unicode, hash_key->nKeyLength-1, 1); } } else if (func->type == ZEND_USER_FUNCTION) { if (hash_key->type == IS_STRING) { add_next_index_stringl(user_ar, hash_key->u.string, hash_key->nKeyLength-1, 1); - } else if (hash_key->type == IS_BINARY) { - add_next_index_binaryl(user_ar, hash_key->u.string, hash_key->nKeyLength-1, 1); } else { add_next_index_unicodel(user_ar, hash_key->u.unicode, hash_key->nKeyLength-1, 1); } |