Overview
| Comment: | Add -[OFString componentsSeparatedByString:skipEmpty:]. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
c007c0d4f769d828b7b1135c8b41b240 |
| User & Date: | js on 2012-02-27 12:25:40 |
| Other Links: | manifest | tags |
Context
|
2012-02-27
| ||
| 12:53 | Update ChangeLog. check-in: 0d852ab58b user: js tags: trunk | |
| 12:25 | Add -[OFString componentsSeparatedByString:skipEmpty:]. check-in: c007c0d4f7 user: js tags: trunk | |
| 12:16 | Update buildsys. check-in: b6fcca5a67 user: js tags: trunk | |
Changes
Modified src/OFString.h from [3d66e4ea15] to [ce6af38102].
| ︙ | ︙ | |||
726 727 728 729 730 731 732 733 734 735 736 737 738 739 | * \brief Splits an OFString into an OFArray of OFStrings. * * \param delimiter The delimiter for splitting * \return An autoreleased OFArray with the split string */ - (OFArray*)componentsSeparatedByString: (OFString*)delimiter; /** * \brief Returns the components of the path. * * \return The components of the path */ - (OFArray*)pathComponents; | > > > > > > > > > > | 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 | * \brief Splits an OFString into an OFArray of OFStrings. * * \param delimiter The delimiter for splitting * \return An autoreleased OFArray with the split string */ - (OFArray*)componentsSeparatedByString: (OFString*)delimiter; /** * \brief Splits an OFString into an OFArray of OFStrings. * * \param delimiter The delimiter for splitting * \param skipEmpty Whether empty components should be skipped * \return An autoreleased OFArray with the split string */ - (OFArray*)componentsSeparatedByString: (OFString*)delimiter skipEmpty: (BOOL)skipEmpty; /** * \brief Returns the components of the path. * * \return The components of the path */ - (OFArray*)pathComponents; |
| ︙ | ︙ |
Modified src/OFString.m from [793d434ba8] to [eb65ec8863].
| ︙ | ︙ | |||
1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 |
[pool release];
return !compare;
}
- (OFArray*)componentsSeparatedByString: (OFString*)delimiter
{
OFAutoreleasePool *pool;
OFMutableArray *array = [OFMutableArray array];
const of_unichar_t *string, *delimiterString;
size_t length = [self length];
size_t delimiterLength = [delimiter length];
size_t i, last;
pool = [[OFAutoreleasePool alloc] init];
string = [self unicodeString];
delimiterString = [delimiter unicodeString];
if (delimiterLength > length) {
[array addObject: [[self copy] autorelease]];
[array makeImmutable];
[pool release];
return array;
}
for (i = 0, last = 0; i <= length - delimiterLength; i++) {
if (memcmp(string + i, delimiterString,
delimiterLength * sizeof(of_unichar_t)))
continue;
| > > > > > > > > > > | < > > | < | 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 |
[pool release];
return !compare;
}
- (OFArray*)componentsSeparatedByString: (OFString*)delimiter
{
return [self componentsSeparatedByString: delimiter
skipEmpty: NO];
}
- (OFArray*)componentsSeparatedByString: (OFString*)delimiter
skipEmpty: (BOOL)skipEmpty
{
OFAutoreleasePool *pool;
OFMutableArray *array = [OFMutableArray array];
const of_unichar_t *string, *delimiterString;
size_t length = [self length];
size_t delimiterLength = [delimiter length];
size_t i, last;
OFString *component;
pool = [[OFAutoreleasePool alloc] init];
string = [self unicodeString];
delimiterString = [delimiter unicodeString];
if (delimiterLength > length) {
[array addObject: [[self copy] autorelease]];
[array makeImmutable];
[pool release];
return array;
}
for (i = 0, last = 0; i <= length - delimiterLength; i++) {
if (memcmp(string + i, delimiterString,
delimiterLength * sizeof(of_unichar_t)))
continue;
component = [self substringWithRange: of_range(last, i - last)];
if (!skipEmpty || ![component isEqual: @""])
[array addObject: component];
i += delimiterLength - 1;
last = i + 1;
}
component = [self substringWithRange: of_range(last, length - last)];
if (!skipEmpty || ![component isEqual: @""])
[array addObject: component];
[array makeImmutable];
[pool release];
return array;
}
|
| ︙ | ︙ |
Modified src/OFString_UTF8.m from [2b9e572a06] to [c9c969d32c].
| ︙ | ︙ | |||
886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 |
return NO;
return !memcmp(s->cString + (s->cStringLength - cStringLength),
[suffix UTF8String], cStringLength);
}
- (OFArray*)componentsSeparatedByString: (OFString*)delimiter
{
OFAutoreleasePool *pool;
OFMutableArray *array;
const char *cString = [delimiter UTF8String];
size_t cStringLength = [delimiter UTF8StringLength];
size_t i, last;
array = [OFMutableArray array];
pool = [[OFAutoreleasePool alloc] init];
if (cStringLength > s->cStringLength) {
[array addObject: [[self copy] autorelease]];
[pool release];
return array;
}
for (i = 0, last = 0; i <= s->cStringLength - cStringLength; i++) {
if (memcmp(s->cString + i, cString, cStringLength))
continue;
| > > < | | > > > | > > | 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 |
return NO;
return !memcmp(s->cString + (s->cStringLength - cStringLength),
[suffix UTF8String], cStringLength);
}
- (OFArray*)componentsSeparatedByString: (OFString*)delimiter
skipEmpty: (BOOL)skipEmpty
{
OFAutoreleasePool *pool;
OFMutableArray *array;
const char *cString = [delimiter UTF8String];
size_t cStringLength = [delimiter UTF8StringLength];
size_t i, last;
OFString *component;
array = [OFMutableArray array];
pool = [[OFAutoreleasePool alloc] init];
if (cStringLength > s->cStringLength) {
[array addObject: [[self copy] autorelease]];
[pool release];
return array;
}
for (i = 0, last = 0; i <= s->cStringLength - cStringLength; i++) {
if (memcmp(s->cString + i, cString, cStringLength))
continue;
component = [OFString stringWithUTF8String: s->cString + last
length: i - last];
if (!skipEmpty || ![component isEqual: @""])
[array addObject: component];
i += cStringLength - 1;
last = i + 1;
}
component = [OFString stringWithUTF8String: s->cString + last];
if (!skipEmpty || ![component isEqual: @""])
[array addObject: component];
[array makeImmutable];
[pool release];
return array;
}
|
| ︙ | ︙ |
Modified tests/OFStringTests.m from [3cd3c8ef1d] to [662f8e8a22].
| ︙ | ︙ | |||
245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 | TEST(@"-[hasSuffix:]", [@"foobar" hasSuffix: @"bar"] && ![@"foobar" hasSuffix: @"foobar0"]) i = 0; TEST(@"-[componentsSeparatedByString:]", (a = [@"fooXXbarXXXXbazXXXX" componentsSeparatedByString: @"XX"]) && [[a objectAtIndex: i++] isEqual: @"foo"] && [[a objectAtIndex: i++] isEqual: @"bar"] && [[a objectAtIndex: i++] isEqual: @""] && [[a objectAtIndex: i++] isEqual: @"baz"] && [[a objectAtIndex: i++] isEqual: @""] && [[a objectAtIndex: i++] isEqual: @""]) TEST(@"+[stringWithPath:]", (s[0] = [OFString stringWithPath: @"foo", @"bar", @"baz", nil]) && #ifndef _WIN32 [s[0] isEqual: @"foo/bar/baz"] && #else [s[0] isEqual: @"foo\\bar\\baz"] && #endif | > > > > > > > > > > | 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | TEST(@"-[hasSuffix:]", [@"foobar" hasSuffix: @"bar"] && ![@"foobar" hasSuffix: @"foobar0"]) i = 0; TEST(@"-[componentsSeparatedByString:]", (a = [@"fooXXbarXXXXbazXXXX" componentsSeparatedByString: @"XX"]) && [a count] == 6 && [[a objectAtIndex: i++] isEqual: @"foo"] && [[a objectAtIndex: i++] isEqual: @"bar"] && [[a objectAtIndex: i++] isEqual: @""] && [[a objectAtIndex: i++] isEqual: @"baz"] && [[a objectAtIndex: i++] isEqual: @""] && [[a objectAtIndex: i++] isEqual: @""]) i = 0; TEST(@"-[componentsSeparatedByString:skipEmpty:]", (a = [@"fooXXbarXXXXbazXXXX" componentsSeparatedByString: @"XX" skipEmpty: YES]) && [a count] == 3 && [[a objectAtIndex: i++] isEqual: @"foo"] && [[a objectAtIndex: i++] isEqual: @"bar"] && [[a objectAtIndex: i++] isEqual: @"baz"]) TEST(@"+[stringWithPath:]", (s[0] = [OFString stringWithPath: @"foo", @"bar", @"baz", nil]) && #ifndef _WIN32 [s[0] isEqual: @"foo/bar/baz"] && #else [s[0] isEqual: @"foo\\bar\\baz"] && #endif |
| ︙ | ︙ |