Changeset 373 for trunk/ICeCoffEE/ICeCoffEE/TestParser.m

Timestamp:

02/10/08 04:47:50 (16 years ago)

Author:

Nicholas Riley

Message:

TestParser.m: Define ICCF_ErrString to permit linking; log
exceptions; print only if parsing fails.

ICeCoffEE.xcodeproj: Update to Xcode 2.4 format (with Xcode 3.0); make
TestParser compile.

English.lproj/APEInfo.rtfd: Update release notes.

English.lproj/Localizable.strings: Fix a reference to the "APE
Manager" preference pane.

File:

• trunk/ICeCoffEE/ICeCoffEE/TestParser.m (modified) (3 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 ps(NSString *format, ...) {
@@ -37 +41 @@
     ICCF_StartIC();
     
+    unsigned pass = 0, fail = 0;
+    
     NSEnumerator *e = [a objectEnumerator];
     NSDictionary *d;
     while ( (d = [e nextObject]) != nil) {
+        ps(@"");
+
         NSString *uri = [d objectForKey: @"uri"];
         NSString *text = [d objectForKey: @"text"];
@@ -65 +73 @@
         // XXX figure XFAIL-type error checking
         
-        // XXX figure out a way to plot a range underneath a string, like:
-        // foo(https://www-s.acm.uiuc.edu/wiki/space/usermloar2)bar
-        //   >--------------------------------------------------<
+        NSRange enclosingRange;
+        NSString *parsedURI = nil;
+        NSException *parseException = nil;
+        @try {
+            enclosingRange = ICCF_URLEnclosingRange(text, delimitedURIRange);
+            parsedURI = [text substringWithRange: enclosingRange];
+        } @catch (NSException *e) {
+            parseException = e;
+        }
+
+        if ([uri isEqualToString: parsedURI]) {
+            ++pass;
+            continue;
+        }
+            
         ps(@"Text       %@", text);
         pr(@"Available ", delimitedURIRange);
         pr(@"Starting  ", initialSelectionRange);
-        
-        NSRange enclosingRange = ICCF_URLEnclosingRange(text, delimitedURIRange);
+
+        if (parseException != nil) {
+            ps(@"Exception  %@", parseException);
+            continue;
+        }
+
         pr(@"Parsed    ", enclosingRange);
-        
-        ps(@"Parsed     %@", [text substringWithRange: enclosingRange]);
+        ps(@"Parsed     %@", parsedURI);
         ps(@"Desired    %@", uri);
-        ps(@"");
+        ++fail;
     }