colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-11 21:27:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Exception raising in componentsSeparatedByCharactersInSet: when separator parameter is nil

Browse Source 
- Added support for edge cases (string is empty or string doesn't contain characters from separator set).
This commit is contained in:
Arkadiusz Młynarczyk
2010-09-10 18:58:10 -04:00
committed by Alexander Ljungberg
parent 8eefb90944
commit 009683ddd4
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Foundation/CPString.j
+24 -11
View File
@@ -280,23 +280,36 @@ var CPStringRegexSpecialCharacters = [
@param A character set containing the characters to use to split the receiver. Must not be nil.
@return An CPArray object containing substrings from the receiver that have been divided by characters in separator.
*/
- (CPArray)componentsSeparatedByCharactersInSet:(CPCharacterSet)separator
{
CPMutableArray components = [CPMutableArray array];
/*
TODO Write some tests for cases with [CPCharacterSet whitespaceCharacterSet]
"Baku baku to jest skład." ["Baku", "baku", "to", "jest", "", "skład."]
"Abradab" - ["Abradab"]
"" - [""]
" Test " - check what is returned by NSString here, probably ["", "Test"];
*/
- (CPArray)componentsSeparatedByCharactersInSet:(CPCharacterSet)separator {
if (!separator)
[CPException raise:CPInvalidArgumentException
reason:"componentsSeparatedByCharactersInSet: the separator can't be 'nil'"];
if (separator && self.length)
{
CPRange componentRange = CPMakeRange(0, 0);
CPMutableArray components = [CPMutableArray array];
CPRange componentRange = CPMakeRange(0, 0);
if (self.length) {
for (var i=0; i < self.length; i++) {
if ([separator characterIsMember:self.charAt(i)]) {
componentRange.length = i - componentRange.location;
[components addObject:[self substringWithRange:componentRange]];
componentRange.location += componentRange.length;
componentRange.location += componentRange.length + 1;
}
};
}
return components;
}
if (componentRange.location < self.length ) {
componentRange.length = self.length - componentRange.location;
[components addObject:[self substringWithRange:componentRange]];
}
} else {
[components addObject:[NSString stringWithString:self]];
}
return components;
}
/*!