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

Timestamp:

02/10/08 06:02:25 (16 years ago)

Author:

Nicholas Riley

Message:

ICeCoffEE.[hm]: Restore ICCF_CheckRange, moved in [322], as we don't
want the range limited in TestParser.

ICeCoffEEParser.m: Remove ICCF_CheckRange. Comment out expandFront
URL/parens stuff; it's as yet untested. Handle {...} in URLs. Don't
assert when )/} is last character in string. Fix indentation.

ICeCoffEE.xcodeproj: Link TestParser to Cocoa normally. Remove
obsolete build settings.

TestParser.m: Stub out ICCF_CheckRange. Test beginning with
one-character ranges all the way through the string. Output summary
stats at end.

File:

• trunk/ICeCoffEE/ICeCoffEE/TestParser.m (modified) (2 diffs)

trunk/ICeCoffEE/ICeCoffEE/TestParser.m

@@ -15 +15 @@
     return [NSString stringWithFormat: @"%@ (%d)", context, (int)err];
 }
+
+void ICCF_CheckRange(NSRange range) {}
 
 void ps(NSString *format, ...) {
@@ -65 +67 @@
         }
         
-        // XXX can't yet select by word, so just try a middle-ish character
-        NSRange initialSelectionRange = {
-            delimitedURIRange.location + (delimitedURIRange.length / 2),
-            delimitedURIRange.length != 0
-        };
-        
-        // XXX figure XFAIL-type error checking
-        
-        NSRange enclosingRange;
-        NSString *parsedURI = nil;
-        NSException *parseException = nil;
-        @try {
-            enclosingRange = ICCF_URLEnclosingRange(text, delimitedURIRange);
-            parsedURI = [text substringWithRange: enclosingRange];
-        } @catch (NSException *e) {
-            parseException = e;
+        for (unsigned startOffset = 0 ; startOffset < delimitedURIRange.length ; ++startOffset) {
+            NSRange initialSelectionRange = {
+                delimitedURIRange.location + startOffset,
+                delimitedURIRange.length != 0
+            };
+            
+            // XXX figure XFAIL-type error checking
+            
+            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);
+            
+            if (parseException != nil) {
+                ps(@"Exception  %@", parseException);
+            } else {
+                pr(@"Parsed    ", enclosingRange);
+                ps(@"Parsed     %@", parsedURI);
+                ps(@"Desired    %@", uri);
+            }
+            ++fail;
+            goto summary;
         }
-
-        if ([uri isEqualToString: parsedURI]) {
-            ++pass;
-            continue;
-        }
-            
-        ps(@"Text       %@", text);
-        pr(@"Available ", delimitedURIRange);
-        pr(@"Starting  ", initialSelectionRange);
-
-        if (parseException != nil) {
-            ps(@"Exception  %@", parseException);
-            continue;
-        }
-
-        pr(@"Parsed    ", enclosingRange);
-        ps(@"Parsed     %@", parsedURI);
-        ps(@"Desired    %@", uri);
-        ++fail;
     }
+    
+summary:
+    ps(@"PASS %d FAIL %d", pass, fail);
     
     ICCF_StopIC();