Changeset 384

Timestamp:

02/11/08 06:55:16 (17 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEEParser.m: No longer need left/right delimiter sets to both
include >< because the parser handles it properly. Remove an
unnecessary debug log and one which generated exceptions on an
otherwise correct URL parse.

urls.plist: Test < not at beginning of string; failed before above
change to delimiter sets.

Location:

trunk/ICeCoffEE/ICeCoffEE

Files:

• ICeCoffEEParser.m (modified) (2 diffs)
• urls.plist (modified) (1 diff)

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEParser.m

@@ -26 +26 @@
         
         tmpSet = [[set mutableCopy] autorelease];
-        [tmpSet formUnionWithCharacterSet: [NSCharacterSet characterSetWithCharactersInString: @"><(["]];
+        [tmpSet formUnionWithCharacterSet: [NSCharacterSet characterSetWithCharactersInString: @"<(["]];
         urlLeftDelimiters = [tmpSet copy]; // make immutable again - for efficiency
         
         tmpSet = [[set mutableCopy] autorelease];
-        [tmpSet formUnionWithCharacterSet: [NSCharacterSet characterSetWithCharactersInString: @"><)]"]];
+        [tmpSet formUnionWithCharacterSet: [NSCharacterSet characterSetWithCharactersInString: @">)]"]];
         urlRightDelimiters = [tmpSet copy]; // make immutable again - for efficiency
     }
@@ -230 +230 @@
                                                   [s rangeOfString: @"]"].location - range.location)))
          || !ICCF_IsLikelyURI(s, range))) {
-        ICLog(@"expanding past %c, was |%@|", opening, [s substringWithRange: range]);
-        ICLog(@"remaining: |%@|", [s substringWithRange: NSMakeRange(range.location, [s rangeOfString: [NSString stringWithCharacters: &closing length: 1]].location - range.location)]);
         range.location -= 2;
         range.length += 2;

trunk/ICeCoffEE/ICeCoffEE/urls.plist

@@ -89 +89 @@
     text = "|<http://en.wikipedia.org/wiki/Paprika_(2006_film)>|foo";
   },
+
+  {
+    uri = "http://en.wikipedia.org/wiki/Paprika_(2006_film)";
+    text = "   |<http://en.wikipedia.org/wiki/Paprika_(2006_film)^>^|
+    ";
+  },
 )