Changeset 382 for trunk

Timestamp:

02/11/08 06:29:28 (17 years ago)

Author:

Nicholas Riley

Message:

TestParser.m: Don't permit empty strings to pass through; they break
ICCF_ParseURL. Print invalid range in ICCF_CheckRange. Support
delimiters in 'uri' or 'text' for initialSelectionRange; can be used
in addition to | |, which as before tries every single-character
starting range.

urls.plist: A few more tests, for IPv6 address recognition, delimited
expansion and multiple ending delimiters.

Location:

trunk/ICeCoffEE/ICeCoffEE

Files:

• TestParser.m (modified) (3 diffs)
• urls.plist (modified) (2 diffs)

trunk/ICeCoffEE/ICeCoffEE/TestParser.m

@@ -11 +11 @@
 
 #include <stdarg.h>
-
-NSString *ICCF_ErrString(OSStatus err, NSString *context) {    
-    return [NSString stringWithFormat: @"%@ (%d)", context, (int)err];
-}
-
-void ICCF_CheckRange(NSRange range) {}
 
 static void ps(NSString *format, ...) {
@@ -32 +26 @@
         [@"" stringByPaddingToLength: r.length withString: @"-" startingAtIndex: 0]]);
 }
+
+NSString *ICCF_ErrString(OSStatus err, NSString *context) {    
+    return [NSString stringWithFormat: @"%@ (%d)", context, (int)err];
+}
+
+void ICCF_CheckRange(NSRange range) {
+    if (range.length > 0)
+        return;
+    
+    pr(@"Invalid   ", range);
+    @throw([NSException exceptionWithName: NSRangeException
+                                   reason: @"No URL is selected"
+                                 userInfo: nil]);
+}
+
 
 static BOOL check_parse(NSString *uri, NSString *text,
@@ -97 +106 @@
             delimitedURIRange.location = 0;
             delimitedURIRange.length = [uri length];
-        } // XXX add ^ ^ to indicate initialSelectionRange?
+        }
+        
+        NSArray *bits = [text componentsSeparatedByString: @"^"];
+        if ([bits count] == 3) {
+            NSString *joined = [bits componentsJoinedByString: @""];
+            NSRange initialSelectionRange = {
+                [(NSString *)[bits objectAtIndex: 0] length],
+                [(NSString *)[bits objectAtIndex: 1] length]
+            };
+            delimitedURIRange.length -= 2; // remove ^^
+            if (check_parse(uri == text ? joined : uri, joined,
+                            delimitedURIRange, initialSelectionRange)) {
+                pass++;
+            } else {
+                fail++;
+                goto summary;
+            }
+            if (uri == text)
+                continue;
+            text = joined;
+        }
         
         for (unsigned startOffset = 0 ; startOffset < delimitedURIRange.length ; ++startOffset) {

trunk/ICeCoffEE/ICeCoffEE/urls.plist

@@ -9 +9 @@
   },
   
+  { /* Start with caret-delimited selection */
+    uri = "https://www-s.acm.uiuc.edu/wiki/space/^(user)^mloar2";
+  },
+
+  {
+    uri = "https://www-s.acm.uiuc.edu/wiki/space/(u^ser)m^loar2";
+  },
+
+  {
+    uri = "https://www-s.acm.uiuc.edu/wiki/space/mloar2^(user)^";
+  },
+
   {
     uri = "https://www-s.acm.uiuc.edu/wiki/space/usermloar2";
-    text = "|<https://www-s.acm.uiuc.edu/wiki/space/usermloar2>| foo";
+    text = "|<https://www-s.acm.uiuc.edu/wiki/space/usermloar2>|foo";
   },
   
@@ -68 +80 @@
   },
   
+  {
+    uri = "telnet:foo";
+    text = "foo bar baz|[telnet:foo]|baz bar foo";
+  },
+
+  {
+    uri = "http://en.wikipedia.org/wiki/Paprika_(2006_film)";
+    text = "|<http://en.wikipedia.org/wiki/Paprika_(2006_film)>|foo";
+  },
 )