Changeset 6

Timestamp:

12/10/06 10:11:31 PM (2 years ago)

Author:

aaron

Message:

- added matches method to Matcher
- added NSString category methods

Files:

• trunk/source/CocoaICU.m (modified) (1 diff)
• trunk/source/ICUMatcher.h (modified) (1 diff)
• trunk/source/ICUMatcher.m (modified) (1 diff)
• trunk/source/ICUPattern.m (modified) (2 diffs)
• trunk/source/NSStringICUAdditions.h (modified) (1 diff)
• trunk/source/NSStringICUAdditions.m (modified) (2 diffs)

trunk/source/CocoaICU.m

@@ -1 +1 @@
-#import <Foundation/Foundation.h>
-#import "ICUPattern.h"
+#import "ICUMatcher.h"
-#import "NSStringICUAdditions.h"
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-int main (int argc, const char * argv[]) {
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-
-
-
-
-
+
+
+
+
+
+
+
+
-        [pool release];
-    return 0;
-}
+
+void simpleFind() {
+        NSString *searchString = @"bbdfdbbababababaklsdjfababababab";
+        NSString *patternString = @"([ab]+)";
+        ICUPattern *p = [ICUPattern patternWithString:patternString];
+        ICUMatcher *matcher = [ICUMatcher matcherWithPattern:p overString:searchString];
+        
+        while([matcher findNext]) {
+                NSRange r = [matcher rangeOfMatch];
+                NSLog(@"match = %@", [searchString substringWithRange:r]);
+        }
+}
+
+void findAndReplaceFirst(){
+        NSString *searchString = @"bbdfdbbababababaklsdjfababababab";
+        NSString *patternString = @"([ab]+)";
+        ICUPattern *p = [ICUPattern patternWithString:patternString];
+        ICUMatcher *matcher = [ICUMatcher matcherWithPattern:p overString:searchString];
+        NSString *result = [matcher replaceFirstWithString:@"replacement"];
+        NSLog(@"result = %@", result);
+}
+
+void findAndReplaceAll() {
+        NSString *searchString = @"bbdfdbbababababaklsdjfababababab";
+        NSString *patternString = @"([ab]+)";
+        ICUPattern *p = [ICUPattern patternWithString:patternString];
+        ICUMatcher *matcher = [ICUMatcher matcherWithPattern:p overString:searchString];
+        NSString *result = [matcher replaceAllWithString:@"replacement"];
+        NSLog(@"result = %@", result);
+}
+
+void split() {
+        NSString *searchString = @"bbdfdbbababababaklsdjfababababab";
+        NSString *patternString = @"[ab]+";
+        ICUPattern *p = [ICUPattern patternWithString:patternString];
+        NSArray *r = [p componentsSplitFromString:searchString];
+        NSLog(@"result = %@", r);
+}
+
+void unicodeFind() {
+        NSString *searchString = [NSString stringWithUTF8String:"❾➈➈➈➈➈➈â
+“â
+“ŊŘÀÀÀÀÀŔŔĚĚĚÀÀÀŞŞŞËËËËà à à à ÀÀÀÀÀ"];
+        NSString *patternString = [NSString stringWithUTF8String:"À+"];
+        ICUPattern *p = [ICUPattern patternWithString:patternString];
+        ICUMatcher *matcher = [ICUMatcher matcherWithPattern:p overString:searchString];
+        while([matcher findNext]) {
+                NSLog(@"match = %@", [searchString substringWithRange:[matcher rangeOfMatch]]);
+        }
+}
+
+void groupFindAndReplace() {
+        NSString *searchString = @"ababcdcdababcdcdabefghiabbababbacdcdccdcd";
+        NSString *patternString = @"([ab]+)([cd]+)";
+        ICUPattern *p = [ICUPattern patternWithString:patternString];
+        ICUMatcher *matcher = [ICUMatcher matcherWithPattern:p overString:searchString];
+        while([matcher findNext]) {
+                int i;
+                for(i=0;i<=[matcher numberOfGroups];i++) {
+                        NSLog(@"group %i : %@", i, [matcher groupAtIndex:i]);
+                }
+        }
+}
+
+void advancedFindAndReplace() {
+        NSString *searchString = @"aabbcc";
+        NSString *patternString = @"(a+)..(c+)";
+        NSString *replacedText = [searchString replaceOccurrencesOfPattern:patternString withString:@" $2  $1"];
+        NSLog(@"%@", replacedText);
+}
+

trunk/source/ICUMatcher.h

@@ -24 +24 @@
--(BOOL)lookingAt:(unsigned)index;
--(ICUPattern *)pattern;
+-(BOOL)matches;
--(void)setPattern:(ICUPattern *)p;
--(NSString *)replaceAllWithString:(NSString *)aReplacementString;

trunk/source/ICUMatcher.m

@@ -64 +64 @@
-        pattern = [p retain];
-}
+
+-(BOOL)matches {
+        URegularExpression *re = [[self pattern] re];
+        
+        UErrorCode status = 0;
+        BOOL matches = uregex_matches(re, 0, &status);
+        CheckStatus(status);
+
+        return matches;
+}
+
-
-/*

trunk/source/ICUPattern.m

@@ -187 +187 @@
-
-        NSMutableArray *results = [NSMutableArray array];
-2
+16
-        size_t destCapacity = u_strlen([self textToSearch]);
-
@@ -236 +236 @@
--(BOOL)matchesString:(NSString *)stringToMatchAgainst
-{
-
-
-
-
-
-
-
-
-
-
+
+
-}
-

trunk/source/NSStringICUAdditions.h

@@ -15 +15 @@
--(void *)UTF16String;
-
+-(NSArray *)findPattern:(NSString *)aRegex;
+-(NSArray *)componentsSeparatedByPattern:(NSString *)aRegex;
+-(NSString *)replaceOccurrencesOfPattern:(NSString *)aPattern withString:(NSString *)replacementText;
+-(BOOL)matchesPattern:(NSString *)aRegex;
+-(NSArray *)findPattern:(NSString *)aRegex;
+
-@end

trunk/source/NSStringICUAdditions.m

@@ -9 +9 @@
-#import "NSStringICUAdditions.h"
-#import "ICUPattern.h"
+#import "ICUMatcher.h"
-
-struct URegularExpression;
@@ -22 +23 @@
-#import <unicode/uregex.h>
-
-
-
-@interface NSString (NSStringICUPrivateAdditions)
-@end
-
-@implementation NSString (NSStringICUAdditions)//
-//
-//-(NSArray *)findPattern:(ICUPattern *)p {
-//      [p setStringToSearch:self];
-//
-//      UErrorCode status = 0;
-//      int32_t numberOfGroups = uregex_groupCount((URegularExpression *)[p pattern], &status);
-//      
-//      if(U_FAILURE(status)) {
-//              [NSException raise:@"Find Exception"
-//                                      format:@"%s", u_errorName(status)];
-//      }
-//
-//      BOOL match = uregex_matches([p pattern], 0, &status);
-//      if(U_FAILURE(status)) {
-//              [NSException raise:@"Find Exception"
-//                                      format:@"%s", u_errorName(status)];
-//      }
-//
-//      if(!match)
-//              return [NSArray array];
-//
-//      NSMutableArray *results = [NSMutableArray array];
-//      int i;
-//
-//      size_t groupSize = InitialGroupSize;
-//      for(i=0; i<numberOfGroups+1; i++) {
-//              status = 0;
-//              UChar *dest = calloc(groupSize, sizeof(UChar));
-//              int32_t buffSize = uregex_group([p pattern], i, dest, groupSize, &status);
-//              
-//              if(U_BUFFER_OVERFLOW_ERROR == status) {
-//                      groupSize *= 2;
-//                      free(dest);
-//                      i--;
-//                      continue;
-//              }
-//              else if(U_FAILURE(status)) {
-//                      [NSException raise:@"Find Exception"
-//                                              format:@"%s", u_errorName(status)];
-//              }
-//
-//              groupSize = InitialGroupSize; // reset to default
-//              [results addObject:[[[NSString alloc] initWithBytes:dest length:buffSize*sizeof(UChar) encoding:CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingUTF16)] autorelease]];
-//              free(dest);
-//      }
-//
-//      return [NSArray arrayWithArray:results];
-//}
-
+-(NSString *)replaceOccurrencesOfPattern:(NSString *)aPattern withString:(NSString *)replacementText {
+        ICUPattern *p = [ICUPattern patternWithString:aPattern];
+        ICUMatcher *m = [ICUMatcher matcherWithPattern:p overString:self];
+        return [m replaceAllWithString:replacementText];
+}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return [[[NSString alloc] initWithBytes:utf16EncodedString 
-                                                                         length:u_strlen(utf16EncodedString)*sizeof(UChar)