[maccode] r282 commited - Remove explicit locking completely in AH....

[codesite...@google.com]

Revision: 282
Author: stephen.holt
Date: Sun Jul 26 10:38:19 2009
Log: Remove explicit locking completely in AH.

Rather than check and lock in -(id)init, just set these in +(void)initalize.

http://code.google.com/p/maccode/source/detail?r=282

Modified:
/trunk/Utilities/AutoHyperlinks Framework/Source/AHHyperlinkScanner.h
/trunk/Utilities/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m

=======================================
--- /trunk/Utilities/AutoHyperlinks Framework/Source/AHHyperlinkScanner.h
Wed Sep 3 19:22:12 2008
+++ /trunk/Utilities/AutoHyperlinks Framework/Source/AHHyperlinkScanner.h
Sun Jul 26 10:38:19 2009
@@ -52,6 +52,7 @@
unsigned long m_scanStringLength;
}

++ (void)initialize;

/*!
* @brief Allocs and inits a new lax AHHyperlinkScanner with the given
NSString
=======================================
--- /trunk/Utilities/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m
Wed Sep 3 19:22:12 2008
+++ /trunk/Utilities/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m
Sun Jul 26 10:38:19 2009
@@ -51,6 +51,33 @@
static NSArray *enclosureStopArray = nil;
static NSArray *encKeys = nil;

+#pragma mark runtime initialization
++ (void)initialize
+{
+ NSMutableCharacterSet *mutableSkipSet = [[NSMutableCharacterSet alloc]
init];
+ [mutableSkipSet formUnionWithCharacterSet:[NSCharacterSet
whitespaceAndNewlineCharacterSet]];
+ [mutableSkipSet formUnionWithCharacterSet:[NSCharacterSet
illegalCharacterSet]];
+ [mutableSkipSet formUnionWithCharacterSet:[NSCharacterSet
controlCharacterSet]];
+ [mutableSkipSet formUnionWithCharacterSet:[NSCharacterSet
characterSetWithCharactersInString:@"<>"]];
+ skipSet = [[NSCharacterSet
characterSetWithBitmapRepresentation:[mutableSkipSet bitmapRepresentation]]
retain];
+ [mutableSkipSet release];
+
+ endSet = [[NSCharacterSet
characterSetWithCharactersInString:@"\"',:;>)]}.?!@"] retain];
+
+ NSMutableCharacterSet *mutableStartSet = [[NSMutableCharacterSet alloc]
init];
+ [mutableStartSet formUnionWithCharacterSet:[NSCharacterSet
whitespaceAndNewlineCharacterSet]];
+ [mutableStartSet formUnionWithCharacterSet:[NSCharacterSet
characterSetWithCharactersInString:@"\"'.,:;<?!-@"]];
+ startSet = [[NSCharacterSet
characterSetWithBitmapRepresentation:[mutableStartSet
bitmapRepresentation]] retain];
+ [mutableStartSet release];
+
+ puncSet = [[NSCharacterSet
characterSetWithCharactersInString:@"\"'.,:;<?!"] retain];
+ hostnameComponentSeparatorSet = [[NSCharacterSet
characterSetWithCharactersInString:@"./"] retain];
+ enclosureStartArray = [[NSArray arrayWithObjects:@"(",@"[",@"{",nil]
retain];
+ enclosureSet = [[NSCharacterSet
characterSetWithCharactersInString:@"()[]{}"] retain];
+ enclosureStopArray = [[NSArray arrayWithObjects:@")",@"]",@"}",nil]
retain];
+ encKeys = [[NSArray arrayWithObjects:ENC_INDEX_KEY, ENC_CHAR_KEY, nil]
retain];
+}
+
#pragma mark Class Methods
+ (id)hyperlinkScannerWithString:(NSString *)inString
{
@@ -77,7 +104,7 @@

- (id)initWithString:(NSString *)inString usingStrictChecking:(BOOL)flag
{
- if((self = [self init])){
+ if((self = [super init])){
m_scanString = [inString retain];
m_scanAttrString = nil;
m_urlSchemes = [[NSDictionary alloc] initWithObjectsAndKeys:
@@ -92,7 +119,7 @@

- (id)initWithAttributedString:(NSAttributedString *)inString
usingStrictChecking:(BOOL)flag
{
- if((self = [self init])){
+ if((self = [super init])){
m_scanString = [[inString string] retain];
m_scanAttrString = [inString retain];
m_urlSchemes = [[NSDictionary alloc] initWithObjectsAndKeys:
@@ -104,65 +131,6 @@
}
return self;
}
-
-- (id)init
-{
- static BOOL s_allSet = NO;
- static NSLock *s_initLock = nil;
- if((self = [super init]) && !s_allSet) {
- if(!s_initLock) s_initLock = [[NSLock alloc] init];
- [s_initLock lock];
- if (!skipSet) {
- NSMutableCharacterSet *mutableSkipSet = [[NSMutableCharacterSet alloc]
init];
- [mutableSkipSet formUnionWithCharacterSet:[NSCharacterSet
whitespaceAndNewlineCharacterSet]];
- [mutableSkipSet formUnionWithCharacterSet:[NSCharacterSet
illegalCharacterSet]];
- [mutableSkipSet formUnionWithCharacterSet:[NSCharacterSet
controlCharacterSet]];
- [mutableSkipSet formUnionWithCharacterSet:[NSCharacterSet
characterSetWithCharactersInString:@"<>"]];
- skipSet = [[NSCharacterSet
characterSetWithBitmapRepresentation:[mutableSkipSet bitmapRepresentation]]
retain];
- [mutableSkipSet release];
- }
-
- if (!endSet) {
- endSet = [[NSCharacterSet
characterSetWithCharactersInString:@"\"',:;>)]}.?!@"] retain];
- }
-
- if (!startSet) {
- NSMutableCharacterSet *mutableStartSet = [[NSMutableCharacterSet alloc]
init];
- [mutableStartSet formUnionWithCharacterSet:[NSCharacterSet
whitespaceAndNewlineCharacterSet]];
- [mutableStartSet formUnionWithCharacterSet:[NSCharacterSet
characterSetWithCharactersInString:@"\"'.,:;<?!-@"]];
- startSet = [[NSCharacterSet
characterSetWithBitmapRepresentation:[mutableStartSet
bitmapRepresentation]] retain];
- [mutableStartSet release];
- }
-
- if (!puncSet) {
- puncSet = [[NSCharacterSet
characterSetWithCharactersInString:@"\"'.,:;<?!"] retain];
- }
-
- if (!hostnameComponentSeparatorSet) {
- hostnameComponentSeparatorSet = [[NSCharacterSet
characterSetWithCharactersInString:@"./"] retain];
- }
-
- if(!enclosureStartArray){
- enclosureStartArray = [[NSArray arrayWithObjects:@"(",@"[",@"{",nil]
retain];
- }
-
- if(!enclosureSet){
- enclosureSet = [[NSCharacterSet
characterSetWithCharactersInString:@"()[]{}"] retain];
- }
-
- if(!enclosureStopArray){
- enclosureStopArray = [[NSArray arrayWithObjects:@")",@"]",@"}",nil]
retain];
- }
-
- if(!encKeys){
- encKeys = [[NSArray arrayWithObjects:ENC_INDEX_KEY, ENC_CHAR_KEY, nil]
retain];
- }
- s_allSet = YES;
- [s_initLock unlock];
- }
-
- return self;
-}

- (void)dealloc
{