Changeset 375 for trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEParser.m

Timestamp:

02/10/08 06:02:25 (16 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE.[hm]: Restore ICCF_CheckRange, moved in [322], as we don't
want the range limited in TestParser.

ICeCoffEEParser.m: Remove ICCF_CheckRange. Comment out expandFront
URL/parens stuff; it's as yet untested. Handle {...} in URLs. Don't
assert when )/} is last character in string. Fix indentation.

ICeCoffEE.xcodeproj: Link TestParser to Cocoa normally. Remove
obsolete build settings.

TestParser.m: Stub out ICCF_CheckRange. Test beginning with
one-character ranges all the way through the string. Output summary
stats at end.

File:

• trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEParser.m (modified) (6 diffs)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEParser.m

@@ -9 +9 @@
 #import "ICeCoffEEParser.h"
 #import "ICeCoffEE.h"
-
-// RFC-ordained max URL length, just to avoid passing IC/LS multi-megabyte documents
-#if ICCF_DEBUG
-const long ICCF_MAX_URL_LEN = 120; // XXX change later
-#else
-const long ICCF_MAX_URL_LEN = 1024;
-#endif
-
-void ICCF_CheckRange(NSRange range) {
-    NSCAssert(range.length > 0, ICCF_LocalizedString(@"No URL is selected"));
-    NSCAssert1(range.length <= ICCF_MAX_URL_LEN, ICCF_LocalizedString(@"The potential URL is longer than %lu characters"), ICCF_MAX_URL_LEN);
-}
 
 void ICCF_Delimiters(NSCharacterSet **leftPtr, NSCharacterSet **rightPtr) {
@@ -136 +124 @@
     
 expandFront:
-        // XXX instead of 0, make this stop at the max URL length to prevent protracted searches
-        
-        // XXX here's how this is supposed to work:
-        // (http://web.sabi.net/) and <http://web.sabi.net/> should work if they are the entire document, even if clicking at the end/beginning of the document, not barfing with "no URL" (correct, as now) or selecting the final >, or ) (what would happen if we remove this "add 1" accommodation).  But how about "http://web.sabi.net/(foo)"?  That should work too, as long as it's not preceded by a (.
-        // Should probably backport to ICeCoffEETerminal, now I finally understand the method to this madness.
-        // add 1 to range to trap delimiters that are on the edge of the selection (i.e., <...)
-        delimiterRange = [s rangeOfCharacterFromSet: urlLeftDelimiters
-                                            options: NSLiteralSearch | NSBackwardsSearch
-                                              range: NSMakeRange(0, range.location + (range.location != [s length]))];
+    // XXX instead of 0, make this stop at the max URL length to prevent protracted searches
+    
+    // XXX here's how this is supposed to work:
+    // (http://web.sabi.net/) and <http://web.sabi.net/> should work if they are the entire document, even if clicking at the end/beginning of the document, not barfing with "no URL" (correct, as now) or selecting the final >, or ) (what would happen if we remove this "add 1" accommodation).  But how about "http://web.sabi.net/(foo)"?  That should work too, as long as it's not preceded by a (.
+    // Should probably backport to ICeCoffEETerminal, now I finally understand the method to this madness.
+    // add 1 to range to trap delimiters that are on the edge of the selection (i.e., <...)
+    delimiterRange = [s rangeOfCharacterFromSet: urlLeftDelimiters
+                                        options: NSLiteralSearch | NSBackwardsSearch
+                                          range: NSMakeRange(0, range.location + (range.location != [s length]))];
     if (delimiterRange.location == NSNotFound) {
         // extend to beginning of string
@@ -155 +143 @@
         
         // in url/(parens)stuff, handle clicking inside or after (parens).
-        if ([s characterAtIndex: delimiterRange.location] == '(' &&
-            range.location > 2 /* prevent wrapping, ordinarily not necessary */) {
+        /*if ([s characterAtIndex: delimiterRange.location] == '(' &&
+            range.location > 2) { // prevent wrapping, ordinarily not necessary
             if ([s rangeOfString: @")" options: NSLiteralSearch range: range].location != NSNotFound ||
                 [s rangeOfCharacterFromSet: [NSCharacterSet characterSetWithCharactersInString: @"/."]
@@ -165 +153 @@
                 goto expandFront;
             }
-        }        
+        } */       
     }
     
@@ -171 +159 @@
     
 expandBack:
-        // XXX instead of length of string, make this stop at the max URL length to prevent protracted searches
-        // add 1 to range to trap delimiters that are on the edge of the selection (i.e., ...>)
-        extraLen = [s length] - range.location - range.length;
+    // XXX instead of length of string, make this stop at the max URL length to prevent protracted searches
+    // add 1 to range to trap delimiters that are on the edge of the selection (i.e., ...>)
+    extraLen = [s length] - range.location - range.length;
     delimiterRange = [s rangeOfCharacterFromSet: urlRightDelimiters
                                         options: NSLiteralSearch
@@ -185 +173 @@
         range.length += delimiterRange.location - range.location - range.length;
         
-        // grow URL past closing paren if we've seen an open paren
-        if ([s characterAtIndex: delimiterRange.location] == ')' &&
-            [s rangeOfString: @"(" options: NSLiteralSearch range: range].location != NSNotFound) {
+        // grow URL past closing paren/brace if we've seen an open paren/brace
+        unichar closing = [s characterAtIndex: delimiterRange.location];
+        NSString *opening;
+        if (closing == ')') opening = @"(";
+        else if (closing == '}') opening = @"{";
+        else goto checkRange;
+        if ([s rangeOfString: opening options: NSLiteralSearch range: range].location == NSNotFound)
+            goto checkRange;
+        
+        if (extraLen == 0) {
+            range.length += 1;
+            ICLog(@"expanding past %c, now |%@|", closing, [s substringWithRange: range]);
+        } else {
             range.length += 2;
-            ICLog(@"expanding past ), now |%@|", [s substringWithRange: range]);
+            ICLog(@"expanding past %c, now |%@|", closing, [s substringWithRange: range]);
             goto expandBack;
         }
     }
     
+checkRange:
     ICCF_CheckRange(range);