Changeset 2

Timestamp:

12/ 7/06 10:45:42 PM (2 years ago)

Author:

aaron

Message:

--

Files:

• trunk/CocoaICU.xcodeproj/project.pbxproj (modified) (16 diffs)
• trunk/ICUMatcher.h (added)
• trunk/ICUMatcher.m (added)
• trunk/source/CocoaICU.m (modified) (5 diffs)
• trunk/source/ICUPattern.h (modified) (2 diffs)
• trunk/source/ICUPattern.m (modified) (4 diffs)
• trunk/source/ICUTest.m (modified) (2 diffs)
• trunk/source/NSStringICUAdditions.h (modified) (1 diff)
• trunk/source/NSStringICUAdditions.m (modified) (2 diffs)

trunk/CocoaICU.xcodeproj/project.pbxproj

@@ -8 +8 @@
-
-/* Begin PBXBuildFile section */
-
-
+
-                93E2C0720B18BF5E001193AC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; };
-                93E2C0730B18BF5E001193AC /* libicucore.A.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9389EF6B0B10EDAA000ECD6C /* libicucore.A.dylib */; };
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-/* End PBXBuildFile section */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-/* Begin PBXFileReference section */
-                08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-                32A70AAB03705E1F00C91783 /* CocoaICU_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoaICU_Prefix.pch; sourceTree = "<group>"; };
-                8DD76FA10486AA7600D96B5E /* CocoaICU */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CocoaICU; sourceTree = BUILT_PRODUCTS_DIR; };
-                9389EF6B0B10EDAA000ECD6C /* libicucore.A.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.A.dylib; path = /usr/lib/libicucore.A.dylib; sourceTree = "<absolute>"; };
+                939322570B1E6AD000DD0AF0 /* ICUMatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICUMatcher.h; sourceTree = "<group>"; };
+                939322580B1E6AD000DD0AF0 /* ICUMatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICUMatcher.m; sourceTree = "<group>"; };
-                93E2BFE50B18BEC4001193AC /* CocoaICU Unit Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "CocoaICU Unit Tests.octest"; sourceTree = BUILT_PRODUCTS_DIR; };
-path = "CocoaICU Unit Tests-Info.plist"; sourceTree = "<group>"
+name = "CocoaICU Unit Tests-Info.plist"; path = "resources/CocoaICU Unit Tests-Info.plist"; sourceTree = SOURCE_ROOT
-                93E2C0CE0B18D142001193AC /* CocoaICU.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CocoaICU.m; path = source/CocoaICU.m; sourceTree = "<group>"; };
-                93E2C0CF0B18D142001193AC /* ICUPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ICUPattern.h; path = source/ICUPattern.h; sourceTree = "<group>"; };
@@ -49 +46 @@
-                93E2C0D30B18D142001193AC /* NSStringICUAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSStringICUAdditions.h; path = source/NSStringICUAdditions.h; sourceTree = "<group>"; };
-                93E2C0D40B18D142001193AC /* NSStringICUAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NSStringICUAdditions.m; path = source/NSStringICUAdditions.m; sourceTree = "<group>"; };
+                93E2C4F00B1A53F0001193AC /* CocoaICU */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CocoaICU; sourceTree = BUILT_PRODUCTS_DIR; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-                8DD76F9B0486AA7600D96B5E /* Frameworks */ = {
-                        isa = PBXFrameworksBuildPhase;
-                        buildActionMask = 2147483647;
-                        files = (
-                                8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */,
-                                9389EF6C0B10EDAA000ECD6C /* libicucore.A.dylib in Frameworks */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
-                };
-                93E2BFE20B18BEC4001193AC /* Frameworks */ = {
-                        isa = PBXFrameworksBuildPhase;
@@ -70 +59 @@
-                        runOnlyForDeploymentPostprocessing = 0;
-                };
+                93E2C4EE0B1A53F0001193AC /* Frameworks */ = {
+                        isa = PBXFrameworksBuildPhase;
+                        buildActionMask = 2147483647;
+                        files = (
+                                93E2C5120B1A5495001193AC /* libicucore.A.dylib in Frameworks */,
+                                93E2C50F0B1A5495001193AC /* Foundation.framework in Frameworks */,
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                };
-/* End PBXFrameworksBuildPhase section */
-
@@ -77 +75 @@
-                        children = (
-                                93E2C0DE0B18D17D001193AC /* Other */,
-
+Cases 
-                                08FB7795FE84155DC02AAC07 /* Source */,
-                                08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */,
@@ -91 +89 @@
-                                93E2C0CF0B18D142001193AC /* ICUPattern.h */,
-                                93E2C0D00B18D142001193AC /* ICUPattern.m */,
+                                939322570B1E6AD000DD0AF0 /* ICUMatcher.h */,
+                                939322580B1E6AD000DD0AF0 /* ICUMatcher.m */,
-                                93E2C0D30B18D142001193AC /* NSStringICUAdditions.h */,
-                                93E2C0D40B18D142001193AC /* NSStringICUAdditions.m */,
@@ -109 +109 @@
-                        isa = PBXGroup;
-                        children = (
-                                8DD76FA10486AA7600D96B5E /* CocoaICU */,
-                                93E2BFE50B18BEC4001193AC /* CocoaICU Unit Tests.octest */,
+                                93E2C4F00B1A53F0001193AC /* CocoaICU */,
-                        );
-                        name = Products;
-                        sourceTree = "<group>";
-                };
-
+Cases 
-                        isa = PBXGroup;
-                        children = (
@@ -121 +121 @@
-                                93E2C0D20B18D142001193AC /* ICUTest.m */,
-                        );
-Test
+"Test Cases"
-                        sourceTree = "<group>";
-                };
@@ -136 +136 @@
-
-/* Begin PBXNativeTarget section */
-                8DD76F960486AA7600D96B5E /* CocoaICU */ = {
-                        isa = PBXNativeTarget;
-                        buildConfigurationList = 1DEB927408733DD40010E9CD /* Build configuration list for PBXNativeTarget "CocoaICU" */;
-                        buildPhases = (
-                                8DD76F990486AA7600D96B5E /* Sources */,
-                                8DD76F9B0486AA7600D96B5E /* Frameworks */,
-                                8DD76F9E0486AA7600D96B5E /* CopyFiles */,
-                        );
-                        buildRules = (
-                        );
-                        dependencies = (
-                        );
-                        name = CocoaICU;
-                        productInstallPath = "$(HOME)/bin";
-                        productName = CocoaICU;
-                        productReference = 8DD76FA10486AA7600D96B5E /* CocoaICU */;
-                        productType = "com.apple.product-type.tool";
-                };
-                93E2BFE40B18BEC4001193AC /* CocoaICU Unit Tests */ = {
-                        isa = PBXNativeTarget;
@@ -172 +154 @@
-                        productType = "com.apple.product-type.bundle";
-                };
+                93E2C4EF0B1A53F0001193AC /* CocoaICU */ = {
+                        isa = PBXNativeTarget;
+                        buildConfigurationList = 93E2C5010B1A5403001193AC /* Build configuration list for PBXNativeTarget "CocoaICU" */;
+                        buildPhases = (
+                                93E2C4ED0B1A53F0001193AC /* Sources */,
+                                93E2C4EE0B1A53F0001193AC /* Frameworks */,
+                        );
+                        buildRules = (
+                        );
+                        dependencies = (
+                                93E2C57D0B1A6A77001193AC /* PBXTargetDependency */,
+                        );
+                        name = CocoaICU;
+                        productName = CocoaICU;
+                        productReference = 93E2C4F00B1A53F0001193AC /* CocoaICU */;
+                        productType = "com.apple.product-type.tool";
+                };
-/* End PBXNativeTarget section */
-
@@ -182 +181 @@
-                        projectDirPath = "";
-                        targets = (
-                                8DD76F960486AA7600D96B5E /* CocoaICU */,
-                                93E2BFE40B18BEC4001193AC /* CocoaICU Unit Tests */,
+                                93E2C4EF0B1A53F0001193AC /* CocoaICU */,
-                        );
-                };
@@ -215 +214 @@
-
-/* Begin PBXSourcesBuildPhase section */
-                8DD76F990486AA7600D96B5E /* Sources */ = {
-                        isa = PBXSourcesBuildPhase;
-                        buildActionMask = 2147483647;
-                        files = (
-                                93E2C0D50B18D142001193AC /* CocoaICU.m in Sources */,
-                                93E2C0D70B18D142001193AC /* ICUPattern.m in Sources */,
-                                93E2C0DB0B18D142001193AC /* NSStringICUAdditions.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
-                };
-                93E2BFE10B18BEC4001193AC /* Sources */ = {
-                        isa = PBXSourcesBuildPhase;
-                        buildActionMask = 2147483647;
-                        files = (
+                                93E2C5070B1A5465001193AC /* ICUTest.m in Sources */,
+                                93E2C5080B1A5465001193AC /* ICUPattern.m in Sources */,
+                                93E2C5090B1A5465001193AC /* NSStringICUAdditions.m in Sources */,
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                };
+                93E2C4ED0B1A53F0001193AC /* Sources */ = {
+                        isa = PBXSourcesBuildPhase;
+                        buildActionMask = 2147483647;
+                        files = (
+                                93E2C5320B1A59FC001193AC /* CocoaICU.m in Sources */,
+                                93E2C5100B1A5495001193AC /* ICUPattern.m in Sources */,
+                                93E2C5130B1A5495001193AC /* NSStringICUAdditions.m in Sources */,
+                                939322590B1E6AD000DD0AF0 /* ICUMatcher.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -234 +237 @@
-/* End PBXSourcesBuildPhase section */
-
+/* Begin PBXTargetDependency section */
+                93E2C57D0B1A6A77001193AC /* PBXTargetDependency */ = {
+                        isa = PBXTargetDependency;
+                        target = 93E2BFE40B18BEC4001193AC /* CocoaICU Unit Tests */;
+                        targetProxy = 93E2C57C0B1A6A77001193AC /* PBXContainerItemProxy */;
+                };
+/* End PBXTargetDependency section */
+
-/* Begin XCBuildConfiguration section */
-                1DEB927508733DD40010E9CD /* Debug */ = {
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                COPY_PHASE_STRIP = NO;
-                                GCC_DYNAMIC_NO_PIC = NO;
-                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_OPTIMIZATION_LEVEL = 0;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = CocoaICU_Prefix.pch;
-                                INSTALL_PATH = "$(HOME)/bin";
-                                PRODUCT_NAME = CocoaICU;
-                                ZERO_LINK = YES;
-                        };
-                        name = Debug;
-                };
-                1DEB927608733DD40010E9CD /* Release */ = {
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-                                ARCHS = (
-                                        ppc,
-                                        i386,
-                                );
-                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                                GCC_MODEL_TUNING = G5;
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = CocoaICU_Prefix.pch;
-                                INSTALL_PATH = "$(HOME)/bin";
-                                PRODUCT_NAME = CocoaICU;
-                        };
-                        name = Release;
-                };
-                1DEB927908733DD40010E9CD /* Debug */ = {
-                        isa = XCBuildConfiguration;
@@ -303 +282 @@
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
-
+resources/
-                                INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
-                                OTHER_LDFLAGS = (
@@ -328 +307 @@
-                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                                GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
-
+resources/
-                                INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
-                                OTHER_LDFLAGS = (
@@ -343 +322 @@
-                        name = Release;
-                };
+                93E2C5020B1A5403001193AC /* Debug */ = {
+                        isa = XCBuildConfiguration;
+                        buildSettings = {
+                                COPY_PHASE_STRIP = NO;
+                                GCC_DYNAMIC_NO_PIC = NO;
+                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
+                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+                                GCC_MODEL_TUNING = G5;
+                                GCC_OPTIMIZATION_LEVEL = 0;
+                                INSTALL_PATH = "$(HOME)/bin";
+                                PREBINDING = NO;
+                                PRODUCT_NAME = CocoaICU;
+                                ZERO_LINK = YES;
+                        };
+                        name = Debug;
+                };
+                93E2C5030B1A5403001193AC /* Release */ = {
+                        isa = XCBuildConfiguration;
+                        buildSettings = {
+                                COPY_PHASE_STRIP = YES;
+                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+                                GCC_MODEL_TUNING = G5;
+                                INSTALL_PATH = "$(HOME)/bin";
+                                PREBINDING = NO;
+                                PRODUCT_NAME = CocoaICU;
+                                ZERO_LINK = NO;
+                        };
+                        name = Release;
+                };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-                1DEB927408733DD40010E9CD /* Build configuration list for PBXNativeTarget "CocoaICU" */ = {
-                        isa = XCConfigurationList;
-                        buildConfigurations = (
-                                1DEB927508733DD40010E9CD /* Debug */,
-                                1DEB927608733DD40010E9CD /* Release */,
-                        );
-                        defaultConfigurationIsVisible = 0;
-                        defaultConfigurationName = Release;
-                };
-                1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "CocoaICU" */ = {
-                        isa = XCConfigurationList;
@@ -373 +373 @@
-                        defaultConfigurationName = Release;
-                };
+                93E2C5010B1A5403001193AC /* Build configuration list for PBXNativeTarget "CocoaICU" */ = {
+                        isa = XCConfigurationList;
+                        buildConfigurations = (
+                                93E2C5020B1A5403001193AC /* Debug */,
+                                93E2C5030B1A5403001193AC /* Release */,
+                        );
+                        defaultConfigurationIsVisible = 0;
+                        defaultConfigurationName = Release;
+                };
-/* End XCConfigurationList section */
-        };

trunk/source/CocoaICU.m

@@ -2 +2 @@
-#import "ICUPattern.h"
-#import "NSStringICUAdditions.h"
+
-
-void doSpeedComparison();
@@ -11 +12 @@
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-
-
-
-
-
+
+
+
+
+
-        
-        [pool release];
@@ -39 +41 @@
-
-void doSpeedComparison() {
-resources/tmp
+trunk/resources/cocoa
-        NSData *stringData = [NSData dataWithContentsOfMappedFile:pathToSomeFile];
-        NSString *fileContents = [[NSString alloc] initWithData:stringData encoding:NSASCIIStringEncoding];
@@ -48 +50 @@
-
-//      /* do foundation find and replace */
+        NSAutoreleasePool *innerPool = [[NSAutoreleasePool alloc] init];
-        NSCalendarDate *preCocoaFindAndReplaceTime = [NSCalendarDate date];
-        NSMutableString *stringToSearch = [NSMutableString stringWithString:fileContents];
-        [stringToSearch replaceOccurrencesOfString:searchTerm withString:replacementTerm options:0 range:NSMakeRange(0, [stringToSearch length])];
-NSString stringWithString:stringToSearch
+[NSString stringWithString:stringToSearch] retain
-        NSLog(@"Foundation find/replace took %.3f seconds", [[NSDate date] timeIntervalSinceDate:preCocoaFindAndReplaceTime]);
+        [innerPool release];
-
+        innerPool = [[NSAutoreleasePool alloc] init];
-        /* do icu find and replace */
-        NSCalendarDate *preICUFindAndReplaceTime = [NSCalendarDate date];
@@ -60 +65 @@
-        NSLog(@"done");
-        
-//
-//
-//
-//
+
+
+
+
-        
-
+[innerPool release];
-}

trunk/source/ICUPattern.h

@@ -9 +9 @@
-#import <Cocoa/Cocoa.h>
-
+@class ICUMatcher;
+
-/**
-..
+ see http://icu.sourceforge.net/apiref/icu4c/uregex_8h.html#874989dfec4cbeb6baf4d1a51cb529ae
- */
-extern unsigned CaseInsensitiveMatching;
@@ -24 +26 @@
-}
-
+// XOR flags (defaults to 0 when no flags are given)
-+(ICUPattern *)patternWithString:(NSString *)aPattern flags:(unsigned)flags;
-+(ICUPattern *)patternWithString:(NSString *)aPattern;
--(id)initWithString:(NSString *)aPattern;
--(id)initWithString:(NSString *)aPattern flags:(unsigned)flags;
+
++(ICUMatcher *)matcherForString:(NSString *)stringToSearchOver;
+
--(void *)pattern;
+
+/* no retain done.  the life of the text is given by the caller */
--(void)setTextToSearch:(NSString *)s;
--(void *)textToSearch;
+
+
--(void)reset;
+
-@end

trunk/source/ICUPattern.m

@@ -1 +1 @@
-//
-RE
+ICU
-//  CocoaICU
-//
@@ -6 +6 @@
-//  Copyright 2006 Aaron Evans. All rights reserved.
-//
+// more info: http://icu.sourceforge.net/apiref/icu4c/uregex_8h.html
-
-#import "ICUPattern.h"
@@ -77 +78 @@
-        if(pattern != NULL)
-                free(pattern);
-
+
-        [super dealloc];
-}
@@ -144 +145 @@
-
--(NSString *)description {
-
+
-        if([self pattern] != NULL) {
-                UChar *p = NULL;

trunk/source/ICUTest.m

@@ -9 +9 @@
-
-#import "ICUTest.h"
+#import "NSStringICUAdditions.h"
+#import "ICUPattern.h"
-
-@implementation ICUTest
@@ -22 +24 @@
-}
-
+-(void)testUTF16String
+{
+        NSString *inputString = @"this is a test to see if this works or doesn\\'t work";
+        uint16_t *result = [inputString UTF16String];
+        int len = 0;
+        while(result[len++] != 0);
+
+        STAssertTrue( (len - 1) == [inputString length], @"UTF16String returned a different length string than input");
+}
+
+-(void)testFind
+{
+        NSString *searchString = @"bbdfdbbababababaklsdjfababababab";
+        NSString *patternString = @".*([ab]+).*";
+        NSArray *results = [searchString findPatternString:patternString];
+        
+        STAssertTrue([results count] == 2, @"Unexpected find results"); 
+}
+
-- (void)testSpeed
-{

trunk/source/NSStringICUAdditions.h

@@ -16 +16 @@
-
--(NSString *)findPattern:(ICUPattern *)p replaceAllWith:(NSString *)replacementString;
+
--(BOOL)matchesPattern:(ICUPattern *)p;
--(BOOL)matchesPatternString:(NSString *)anExpression;
+
+-(BOOL)findNext;
+-(NSRange *)rangeOfCurrentMatch;
+
--(NSArray *)componentsSeparatedByPattern:(ICUPattern *)p;
+-(NSArray *)componentsSeparatedByPatternString:(NSString *)s;
+
--(void *)UTF16String;
-

trunk/source/NSStringICUAdditions.m

@@ -41 +41 @@
--(NSArray *)findPattern:(ICUPattern *)p {
-        [p setTextToSearch:self];
-
+
-        UErrorCode status = 0;
-        int32_t numberOfGroups = uregex_groupCount((URegularExpression *)[p pattern], &status);
@@ -121 +121 @@
-        free(destString);
-        return result;
+}
+
+-(BOOL)findNext
+{
+        UErrorCode status = 0;
+        BOOL r = uregex_findNext([
+}
+
+-(NSRange *)rangeOfCurrentMatch
+{
+        
+}
+
+-(NSArray *)componentsSeparatedByPatternString:(NSString *)s
+{
+        return [self componentsSeparatedByPattern:[ICUPattern patternWithString:s]];
-}
-