Differences From Artifact [0b123dda77]:
- File src/OFString_UTF8.m — part of check-in [3b97fc3cd9] at 2014-01-04 00:24:08 on branch trunk — Update copyright. (user: js, size: 27867) [annotate] [blame] [check-ins using]
To Artifact [26025dccab]:
- File
src/OFString_UTF8.m
— part of check-in
[9da9b2b64c]
at
2014-04-14 00:45:58
on branch trunk
— Coding style
No functional change intended. (user: js, size: 27919) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
173 174 175 176 177 178 179 |
length: (size_t)UTF8StringLength
storage: (char*)storage
{
self = [super init];
@try {
if (UTF8StringLength >= 3 &&
| | | 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 |
length: (size_t)UTF8StringLength
storage: (char*)storage
{
self = [super init];
@try {
if (UTF8StringLength >= 3 &&
memcmp(UTF8String, "\xEF\xBB\xBF", 3) == 0) {
UTF8String += 3;
UTF8StringLength -= 3;
}
_s = &_storage;
_s->cString = storage;
|
| ︙ | ︙ | |||
213 214 215 216 217 218 219 |
self = [super init];
@try {
size_t i, j;
const of_char16_t *table;
if (encoding == OF_STRING_ENCODING_UTF_8 &&
| | > | 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 |
self = [super init];
@try {
size_t i, j;
const of_char16_t *table;
if (encoding == OF_STRING_ENCODING_UTF_8 &&
cStringLength >= 3 &&
memcmp(cString, "\xEF\xBB\xBF", 3) == 0) {
cString += 3;
cStringLength -= 3;
}
_s = &_storage;
_s->cString = [self allocMemoryWithSize: cStringLength + 1];
|
| ︙ | ︙ | |||
342 343 344 345 346 347 348 |
{
self = [super init];
@try {
size_t UTF8StringLength = strlen(UTF8String);
if (UTF8StringLength >= 3 &&
| | | 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 |
{
self = [super init];
@try {
size_t UTF8StringLength = strlen(UTF8String);
if (UTF8StringLength >= 3 &&
memcmp(UTF8String, "\xEF\xBB\xBF", 3) == 0) {
UTF8String += 3;
UTF8StringLength -= 3;
}
_s = &_storage;
_s->cString = (char*)UTF8String;
|
| ︙ | ︙ | |||
728 729 730 731 732 733 734 | if (([otherString isKindOfClass: [OFString_UTF8 class]] || [otherString isKindOfClass: [OFMutableString_UTF8 class]]) && _s->hashed && otherString->_s->hashed && _s->hash != otherString->_s->hash) return false; | | | 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 |
if (([otherString isKindOfClass: [OFString_UTF8 class]] ||
[otherString isKindOfClass: [OFMutableString_UTF8 class]]) &&
_s->hashed && otherString->_s->hashed &&
_s->hash != otherString->_s->hash)
return false;
if (strcmp(_s->cString, [otherString UTF8String]) != 0)
return false;
return true;
}
- (of_comparison_result_t)compare: (id <OFComparing>)object
{
|
| ︙ | ︙ | |||
948 949 950 951 952 953 954 |
return of_range(0, 0);
if (cStringLength > rangeLength)
return of_range(OF_NOT_FOUND, 0);
if (options & OF_STRING_SEARCH_BACKWARDS) {
for (i = rangeLength - cStringLength;; i--) {
| | | | | | 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 |
return of_range(0, 0);
if (cStringLength > rangeLength)
return of_range(OF_NOT_FOUND, 0);
if (options & OF_STRING_SEARCH_BACKWARDS) {
for (i = rangeLength - cStringLength;; i--) {
if (memcmp(_s->cString + rangeLocation + i, cString,
cStringLength) == 0) {
range.location += of_string_utf8_get_index(
_s->cString + rangeLocation, i);
range.length = [string length];
return range;
}
/* Did not match and we're at the last char */
if (i == 0)
return of_range(OF_NOT_FOUND, 0);
}
} else {
for (i = 0; i <= rangeLength - cStringLength; i++) {
if (memcmp(_s->cString + rangeLocation + i, cString,
cStringLength) == 0) {
range.location += of_string_utf8_get_index(
_s->cString + rangeLocation, i);
range.length = [string length];
return range;
}
}
|
| ︙ | ︙ | |||
989 990 991 992 993 994 995 | if (cStringLength == 0) return true; if (cStringLength > _s->cStringLength) return false; for (i = 0; i <= _s->cStringLength - cStringLength; i++) | | | 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 |
if (cStringLength == 0)
return true;
if (cStringLength > _s->cStringLength)
return false;
for (i = 0; i <= _s->cStringLength - cStringLength; i++)
if (memcmp(_s->cString + i, cString, cStringLength) == 0)
return true;
return false;
}
- (OFString*)substringWithRange: (of_range_t)range
{
|
| ︙ | ︙ | |||
1021 1022 1023 1024 1025 1026 1027 |
- (bool)hasPrefix: (OFString*)prefix
{
size_t cStringLength = [prefix UTF8StringLength];
if (cStringLength > _s->cStringLength)
return false;
| | | | | 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 |
- (bool)hasPrefix: (OFString*)prefix
{
size_t cStringLength = [prefix UTF8StringLength];
if (cStringLength > _s->cStringLength)
return false;
return (memcmp(_s->cString, [prefix UTF8String], cStringLength) == 0);
}
- (bool)hasSuffix: (OFString*)suffix
{
size_t cStringLength = [suffix UTF8StringLength];
if (cStringLength > _s->cStringLength)
return false;
return (memcmp(_s->cString + (_s->cStringLength - cStringLength),
[suffix UTF8String], cStringLength) == 0);
}
- (OFArray*)componentsSeparatedByString: (OFString*)delimiter
options: (int)options
{
void *pool;
OFMutableArray *array;
|
| ︙ | ︙ | |||
1057 1058 1059 1060 1061 1062 1063 |
[array addObject: [[self copy] autorelease]];
objc_autoreleasePoolPop(pool);
return array;
}
for (i = 0, last = 0; i <= _s->cStringLength - cStringLength; i++) {
| | | 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 |
[array addObject: [[self copy] autorelease]];
objc_autoreleasePoolPop(pool);
return array;
}
for (i = 0, last = 0; i <= _s->cStringLength - cStringLength; i++) {
if (memcmp(_s->cString + i, cString, cStringLength) != 0)
continue;
component = [OFString stringWithUTF8String: _s->cString + last
length: i - last];
if (!skipEmpty || [component length] > 0)
[array addObject: component];
|
| ︙ | ︙ |