Changeset 24380

Timestamp:

07/16/2008 04:31:13 PM (6 months ago)

Author:

sholt

Message:

Cleaning up the code a bit.

• Removed a few more unnecessary local variables
  
• Abstracted out the balanced enclosure finding code to a private method for future cleanup.
  

Files:

• trunk/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m (modified) (6 diffs)

trunk/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m

@@ -35 +35 @@
-
-@interface AHHyperlinkScanner (PRIVATE)
+- (NSRange)_longestBalancedEnclosureInRange:(NSRange)inRange;
-- (BOOL)_scanString:(NSString *)inString upToCharactersFromSet:(NSCharacterSet *)inCharSet intoRange:(NSRange *)outRangeRef fromIndex:(unsigned long *)idx;
-- (BOOL)_scanString:(NSString *)inString charactersFromSet:(NSCharacterSet *)inCharSet intoRange:(NSRange *)outRangeRef fromIndex:(unsigned long *)idx;
@@ -244 +245 @@
-{
-        NSRange scannedRange;
+        unsigned long scannedLocation = m_scanLocation;
+        
-    // scan upto the next whitespace char so that we don't unnecessarity confuse flex
-    // otherwise we end up validating urls that look like this "http://www.adiumx.com/ <--cool"
-        unsigned long scannedLocation = m_scanLocation;
-        [self _scanString:m_scanString charactersFromSet:startSet intoRange:nil fromIndex:&scannedLocation];
+        
+        // main scanning loop
-        while([self _scanString:m_scanString upToCharactersFromSet:skipSet intoRange:&scannedRange fromIndex:&scannedLocation]) {
+        
-                unsigned long _scanLoc = scannedLocation;
+                
+                // Check for and filter  enclosures.  We can't add (, [, etc. to the skipSet as they may be in a URI
-                if([enclosureSet characterIsMember:[m_scanString characterAtIndex:scannedRange.location]]){
-                        unsigned long encIdx = [enclosureStartArray indexOfObject:[m_scanString substringWithRange:NSMakeRange(scannedRange.location, 1)]];
@@ -262 +269 @@
-                }
-                if(!scannedRange.length) break;
-
-
-
-
+
-                // Find balanced enclosure chars
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                                scannedRange.length--;
-                                finalStringLen--;
-                        }else break;
-                }
@@ -317 +283 @@
-                AH_URI_VERIFICATION_STATUS       validStatus;
-                NSString                                        *_scanString = [m_scanString substringWithRange:scannedRange];
-(finalStringLen > 0)
+_scanString
-            AHMarkedHyperlink   *markedLink;
-                        
@@ -365 +331 @@
-                                m_scanLocation--;
-                }else{
-finalStringLen
+scannedRange.length
-                        if(m_scanLocation > m_scanStringLength)
-                                m_scanLocation--;
@@ -436 +402 @@
-
-#pragma mark Below Here There Be Private Methods
+
+- (NSRange)_longestBalancedEnclosureInRange:(NSRange)inRange
+{
+        NSMutableArray  *enclosureStack = nil, *enclosureArray = nil;
+        NSString  *matchChar = nil;
+        NSDictionary *encDict;
+        unsigned long encScanLocation = inRange.location;
+        
+        while(encScanLocation < inRange.length + inRange.location) {
+                [self _scanString:m_scanString upToCharactersFromSet:enclosureSet intoRange:nil fromIndex:&encScanLocation];
+                        
+                if(encScanLocation >= (inRange.location + inRange.length)) break;
+                        
+                matchChar = [m_scanString substringWithRange:NSMakeRange(encScanLocation, 1)];
+                        
+                if([enclosureStartArray containsObject:matchChar]) {
+                        encDict = [NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:[NSNumber numberWithUnsignedLong:encScanLocation], matchChar, nil]
+                                                                                                forKeys:encKeys];
+                        if(!enclosureStack) enclosureStack = [NSMutableArray arrayWithCapacity:1];
+                        [enclosureStack addObject:encDict];
+                }else if([enclosureStopArray containsObject:matchChar]) {
+                        NSEnumerator *encEnumerator = [enclosureStack objectEnumerator];
+                        while ((encDict = [encEnumerator nextObject])) {
+                                unsigned long encTagIndex = [(NSNumber *)[encDict objectForKey:ENC_INDEX_KEY] unsignedLongValue];
+                                unsigned long encStartIndex = [enclosureStartArray indexOfObjectIdenticalTo:[encDict objectForKey:ENC_CHAR_KEY]];
+                                if([enclosureStopArray indexOfObjectIdenticalTo:matchChar] == encStartIndex) {
+                                        NSRange encRange = NSMakeRange(encTagIndex, encScanLocation - encTagIndex + 1);
+                                        if(!enclosureStack) enclosureStack = [NSMutableArray arrayWithCapacity:1];
+                                        if(!enclosureArray) enclosureArray = [NSMutableArray arrayWithCapacity:1];
+                                        [enclosureStack removeObject:encDict];
+                                        [enclosureArray addObject:NSStringFromRange(encRange)];
+                                        break;
+                                }
+                        }
+                }
+                if(encScanLocation < inRange.length + inRange.location)
+                        encScanLocation++;
+        }
+        return (enclosureArray && [enclosureArray count])? NSRangeFromString([enclosureArray lastObject]) : NSMakeRange(0, 0);
+}
+
-// functional replacement for -[NSScanner scanUpToCharactersFromSet:intoString:]
-- (BOOL)_scanString:(NSString *)inString upToCharactersFromSet:(NSCharacterSet *)inCharSet intoRange:(NSRange *)outRangeRef fromIndex:(unsigned long *)idx