Changeset 3548

Timestamp:

01/08/07 23:10:31 (2 years ago)

Author:

timothy

Message:

Some optimizations to our NSString additions.

Files:

• trunk/Additions/NSStringAdditions.m (modified) (9 diffs)

trunk/Additions/NSStringAdditions.m

@@ -238 +238 @@
-
-- (NSString *) stringByEncodingXMLSpecialCharactersAsEntities {
+        NSCharacterSet *special = [NSCharacterSet characterSetWithCharactersInString:@"&<>\"'"];
+        NSRange range = [self rangeOfCharacterFromSet:special options:NSLiteralSearch];
+        if( range.location == NSNotFound )
+                return self;
+
-        NSMutableString *result = [self mutableCopyWithZone:nil];
-        [result encodeXMLSpecialCharactersAsEntities];
@@ -244 +249 @@
-
-- (NSString *) stringByDecodingXMLSpecialCharacterEntities {
+        NSRange range = [self rangeOfString:@"&" options:NSLiteralSearch];
+        if( range.location == NSNotFound )
+                return self;
+
-        NSMutableString *result = [self mutableCopyWithZone:nil];
-        [result decodeXMLSpecialCharacterEntities];
@@ -252 +261 @@
-
-- (NSString *) stringByEscapingCharactersInSet:(NSCharacterSet *) set {
+        NSRange range = [self rangeOfCharacterFromSet:set];
+        if( range.location == NSNotFound )
+                return self;
+
-        NSMutableString *result = [self mutableCopyWithZone:nil];
-        [result escapeCharactersInSet:set];
@@ -270 +283 @@
-
-- (NSString *) stringByStrippingIllegalXMLCharacters {
+        NSMutableCharacterSet *illegalSet = [[NSCharacterSet characterSetWithRange:NSMakeRange( 0, 0x1f )] mutableCopyWithZone:nil];
+        [illegalSet addCharactersInRange:NSMakeRange( 0x7f, 1 )];
+        [illegalSet addCharactersInRange:NSMakeRange( 0xfffe, 1 )];
+        [illegalSet addCharactersInRange:NSMakeRange( 0xffff, 1 )];
+
+        NSRange range = [self rangeOfCharacterFromSet:illegalSet];
+        [illegalSet release];
+
+        if( range.location == NSNotFound )
+                return self;
+
-        NSMutableString *result = [self mutableCopyWithZone:nil];
-        [result stripIllegalXMLCharacters];
@@ -297 +321 @@
-@implementation NSMutableString (NSMutableStringAdditions)
-- (void) encodeXMLSpecialCharactersAsEntities {
+        NSCharacterSet *special = [NSCharacterSet characterSetWithCharactersInString:@"&<>\"'"];
+        NSRange range = [self rangeOfCharacterFromSet:special options:NSLiteralSearch];
+        if( range.location == NSNotFound )
+                return;
+
-        [self replaceOccurrencesOfString:@"&" withString:@"&amp;" options:NSLiteralSearch range:NSMakeRange( 0, [self length] )];
-        [self replaceOccurrencesOfString:@"<" withString:@"&lt;" options:NSLiteralSearch range:NSMakeRange( 0, [self length] )];
@@ -305 +334 @@
-
-- (void) decodeXMLSpecialCharacterEntities {
+        NSRange range = [self rangeOfString:@"&" options:NSLiteralSearch];
+        if( range.location == NSNotFound )
+                return;
+
-        [self replaceOccurrencesOfString:@"&lt;" withString:@"<" options:NSLiteralSearch range:NSMakeRange( 0, [self length] )];
-        [self replaceOccurrencesOfString:@"&gt;" withString:@">" options:NSLiteralSearch range:NSMakeRange( 0, [self length] )];
@@ -315 +348 @@
-
-- (void) escapeCharactersInSet:(NSCharacterSet *) set {
+        NSRange range = [self rangeOfCharacterFromSet:set];
+        if( range.location == NSNotFound )
+                return;
+
-        NSScanner *scanner = [[NSScanner allocWithZone:nil] initWithString:self];
-
@@ -342 +379 @@
-
-- (void) stripIllegalXMLCharacters {
-[NSCharacterSet characterSetWithRange:NSMakeRange( 0, 0x1f )] mutableCopyWithZone:nil] autorelease
+NSCharacterSet characterSetWithRange:NSMakeRange( 0, 0x1f )] mutableCopyWithZone:nil
-        [illegalSet addCharactersInRange:NSMakeRange( 0x7f, 1 )];
-        [illegalSet addCharactersInRange:NSMakeRange( 0xfffe, 1 )];
@@ -352 +389 @@
-                range = [self rangeOfCharacterFromSet:illegalSet];
-        }
+
+        [illegalSet release];
-}
-@end