From 3362a73a22ad7a427b1b8dd13709c20f0220e15e Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 19 Sep 2011 02:00:52 +0000 Subject: [PATCH] even more work on betterComponentsSeparatedByCharactersInSet: --- macosx/NSStringAdditions.m | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/macosx/NSStringAdditions.m b/macosx/NSStringAdditions.m index d4e2f794a..84a6df2a8 100644 --- a/macosx/NSStringAdditions.m +++ b/macosx/NSStringAdditions.m @@ -193,16 +193,18 @@ if (range.location != i) { - NSUInteger length; - if (range.location == NSNotFound) - length = [self length] - i; - else - length = range.location - i; - [components addObject: [self substringWithRange: NSMakeRange(i, length)]]; - if (range.location == NSNotFound) + { + [components addObject: [self substringFromIndex: i]]; break; - i += length; + } + else + { + const NSUInteger length = range.location - i; + [components addObject: [self substringWithRange: NSMakeRange(i, length)]]; + + i += length; + } } i += range.length; } -- 2.40.0