Use dispatch_once to make the newline charset initialisation thread s…

…afe.
beelsebob · Oct 17, 2012 · 529e14e · 529e14e
1 parent 4556cf8
commit 529e14e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/CoreParse/Tokenisation/CPTokeniser.m b/CoreParse/Tokenisation/CPTokeniser.m
@@ -212,10 +212,11 @@ - (void)addToken:(CPToken *)tok toStream:(CPTokenStream *)stream
 
 - (void)advanceLineNumber:(NSUInteger *)ln columnNumber:(NSUInteger *)cn withInput:(NSString *)input range:(CFRange)range
 {
-    if (newlineCharset == nil)
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^
     {
         newlineCharset = (CFCharacterSetRef)[[NSCharacterSet characterSetWithCharactersInString:@"\n\r"] retain];
-    }
+    });
 
     CFRange searchRange = range;
     NSUInteger rangeEnd = range.location + range.length;

diff --git a/CoreParseTests/CPTestWhiteSpaceIgnoringDelegate.m b/CoreParseTests/CPTestWhiteSpaceIgnoringDelegate.m
@@ -15,13 +15,12 @@ - (BOOL)tokeniser:(CPTokeniser *)tokeniser shouldConsumeToken:(CPToken *)token
     return YES;
 }
 
-- (NSArray *)tokeniser:(CPTokeniser *)tokeniser willProduceToken:(CPToken *)token
+- (void)tokeniser:(CPTokeniser *)tokeniser requestsToken:(CPToken *)token pushedOntoStream:(CPTokenStream *)stream
 {
-    if ([token isWhiteSpaceToken] || [[token name] isEqualToString:@"Comment"])
+    if (![token isWhiteSpaceToken])
     {
-        return [NSArray array];
+        [stream pushToken:token];
     }
-    return [NSArray arrayWithObject:token];
 }
 
 - (NSUInteger)tokeniser:(CPTokeniser *)tokeniser didNotFindTokenOnInput:(NSString *)input position:(NSUInteger)position error:(NSString **)errorMessage