Changeset 384 for trunk/ICeCoffEE


Ignore:
Timestamp:
02/11/08 06:55:16 (12 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ICeCoffEE/ICeCoffEE/ICeCoffEEParser.m

    r383 r384  
    2626       
    2727        tmpSet = [[set mutableCopy] autorelease];
    28         [tmpSet formUnionWithCharacterSet: [NSCharacterSet characterSetWithCharactersInString: @"><(["]];
     28        [tmpSet formUnionWithCharacterSet: [NSCharacterSet characterSetWithCharactersInString: @"<(["]];
    2929        urlLeftDelimiters = [tmpSet copy]; // make immutable again - for efficiency
    3030       
    3131        tmpSet = [[set mutableCopy] autorelease];
    32         [tmpSet formUnionWithCharacterSet: [NSCharacterSet characterSetWithCharactersInString: @"><)]"]];
     32        [tmpSet formUnionWithCharacterSet: [NSCharacterSet characterSetWithCharactersInString: @">)]"]];
    3333        urlRightDelimiters = [tmpSet copy]; // make immutable again - for efficiency
    3434    }
     
    230230                                                  [s rangeOfString: @"]"].location - range.location)))
    231231         || !ICCF_IsLikelyURI(s, range))) {
    232         ICLog(@"expanding past %c, was |%@|", opening, [s substringWithRange: range]);
    233         ICLog(@"remaining: |%@|", [s substringWithRange: NSMakeRange(range.location, [s rangeOfString: [NSString stringWithCharacters: &closing length: 1]].location - range.location)]);
    234232        range.location -= 2;
    235233        range.length += 2;
  • trunk/ICeCoffEE/ICeCoffEE/urls.plist

    r382 r384  
    8989    text = "|<http://en.wikipedia.org/wiki/Paprika_(2006_film)>|foo";
    9090  },
     91
     92  {
     93    uri = "http://en.wikipedia.org/wiki/Paprika_(2006_film)";
     94    text = "   |<http://en.wikipedia.org/wiki/Paprika_(2006_film)^>^|
     95    ";
     96  },
    9197)
    9298
Note: See TracChangeset for help on using the changeset viewer.