Changeset 23065

Timestamp:

04/03/2008 05:34:07 PM (8 months ago)

Author:

evands

Message:

Properly trim the whole set of invalid characters, not just a subset of them. Fixes #7267, and all tests now pass.

Files:

• trunk/Frameworks/AIHyperlinks Framework/Source/SHHyperlinkScanner.m (modified) (1 diff)

trunk/Frameworks/AIHyperlinks Framework/Source/SHHyperlinkScanner.m

@@ -125 +125 @@
-    }
-
+        static NSCharacterSet *endSet = nil;
+    if (!endSet) {
+#define INVALID_URL_EDGE_CHARACTERS @"\"'-,:;<>()[]{}.?!"
+        endSet = [[NSCharacterSet characterSetWithCharactersInString:INVALID_URL_EDGE_CHARACTERS] retain];
+    }
+        
-        static NSCharacterSet *startSet = nil;
-    if (!startSet) {
-        NSMutableCharacterSet *mutableStartSet = [[NSMutableCharacterSet alloc] init];
-        [mutableStartSet formUnionWithCharacterSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
-
+
+
-                startSet = [[NSCharacterSet characterSetWithBitmapRepresentation:[mutableStartSet bitmapRepresentation]] retain];
-                [mutableStartSet release];
-    }
-
-        static NSCharacterSet *endSet = nil;
-    if (!endSet) {
-        endSet = [[NSCharacterSet characterSetWithCharactersInString:@"\"',;>)]}.?!"] retain];
-    }
-