Changeset 14045 for trunk/macosx/NSStringAdditions.m

Timestamp:

Mar 7, 2013, 11:55:31 PM (9 years ago)

Author:

livings124

Message:

Simplify betterComponentsSeparatedByCharactersInSet:

File:

• trunk/macosx/NSStringAdditions.m (modified) (1 diff)

trunk/macosx/NSStringAdditions.m

@@ -210 +210 @@
 }
 
-- (NSArray *) betterComponentsSeparatedByCharactersInSet: (NSCharacterSet *) separator
+- (NSArray *) betterComponentsSeparatedByCharactersInSet: (NSCharacterSet *) separators
 {
     NSMutableArray * components = [NSMutableArray array];
     
-    NSUInteger i = 0;
-    while (i < [self length])
-    {
-        const NSRange range = [self rangeOfCharacterFromSet: separator options: 0 range: NSMakeRange(i, [self length]-i)];
-        
-        if (range.location == NSNotFound)
+    NSCharacterSet * includededCharSet = [separators invertedSet];
+    NSUInteger index = 0;
+    const NSUInteger fullLength = [self length];
+    do
+    {
+        const NSUInteger start = [self rangeOfCharacterFromSet: includededCharSet options: 0 range: NSMakeRange(index, fullLength - index)].location;
+        if (start == NSNotFound)
+            break;
+        
+        const NSRange endRange = [self rangeOfCharacterFromSet: separators options: 0 range: NSMakeRange(start, fullLength - start)];
+        if (endRange.location == NSNotFound)
         {
-            [components addObject: [self substringFromIndex: i]];
+            [components addObject: [self substringFromIndex: start]];
             break;
         }
-        else if (range.location != i)
-        {
-            const NSUInteger length = range.location - i;
-            [components addObject: [self substringWithRange: NSMakeRange(i, length)]];
-            
-            i += length;
-        }
-        
-        i += range.length;
-    }
+        
+        [components addObject: [self substringWithRange: NSMakeRange(start, endRange.location - start)]];
+        
+        index = NSMaxRange(endRange);
+    }
+    while (YES);
     
     return components;