Changeset 473

Timestamp:

04/30/08 00:22:52 (16 years ago)

Author:

Nicholas Riley

Message:

Fix asymmetric parsing of single words wrapped in ambiguous delimiters. Strip trailing exclamation points like commas, semicolons, periods and commas.

Location:

trunk/ICeCoffEE/ICeCoffEE

Files:

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

trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEParser.m

@@ -74 +74 @@
     
     @try {
-        if ([[NSCharacterSet characterSetWithCharactersInString: @";,."] characterIsMember:
+        if ([[NSCharacterSet characterSetWithCharactersInString: @";,.!"] characterIsMember:
             [string characterAtIndex: selEnd - 1]]) {
             selEnd--;
         }
         NSCharacterSet *alphanumericCharacterSet = [NSCharacterSet alphanumericCharacterSet];
-        while (![alphanumericCharacterSet characterIsMember: [string characterAtIndex: selStart]]) {
+        unichar opening, closing;
+        while (![alphanumericCharacterSet characterIsMember:
+                 (opening = [string characterAtIndex: selStart])]) {
+            closing = [string characterAtIndex: selEnd - 1];
+            if ((opening == '(' && closing == ')') ||
+                (opening == '{' && closing == '}') ||
+                (opening == '[' && closing == ']')) {
+                selEnd--;
+            }
             selStart++;
             NSCAssert(selStart < selEnd, @"No URL is selected");

trunk/ICeCoffEE/ICeCoffEE/urls.plist

@@ -81 +81 @@
   
   {
+    uri = "foo";
+    text = "blah blah |(foo)| blah blah";
+  },
+
+  {
+    uri = "foo";
+    text = "blah blah |(foo)|! blah blah";
+  },
+  
+  {
     uri = "telnet:foo";
     text = "foo bar baz|[telnet:foo]|baz bar foo";