Merged with upstream

Author: Tammo Freese

Core/Source/DTLocalizableStringAggregator.m

@@ -22,7 +22,6 @@ - (void)addEntryToTables:(DTLocalizableStringEntry *)entry;
 @implementation DTLocalizableStringAggregator
 {
     NSDictionary *_validMacros;
-    NSRegularExpression *_validMacrosRegex;
     NSMutableDictionary *_stringTables;
 
     NSOperationQueue *_processingQueue;
@@ -109,30 +108,13 @@ - (NSDictionary *)validMacros
     return _validMacros;
 }
 
-- (NSRegularExpression *)validMacrosRegex
-{
-    if (!_validMacrosRegex) 
-    {
-        NSDictionary *validMacros = [self validMacros];
-        
-        NSString *innerPatternPart = [[validMacros allKeys] componentsJoinedByString:@"|"];
-        NSString *pattern = [NSString stringWithFormat:@"\\b(?:%@)\\b", innerPatternPart];
-        _validMacrosRegex = [NSRegularExpression regularExpressionWithPattern:pattern options:0 error:NULL];
-    }
-    
-    return _validMacrosRegex;
-}
-
-
 #define QUOTE @"\""
 
 - (void)beginProcessingFile:(NSURL *)fileURL
 {
-    
     NSDictionary *validMacros = [self validMacros];
-    NSRegularExpression *validMacrosRegex = [self validMacrosRegex];
 
-    DTLocalizableStringScanner *scanner = [[DTLocalizableStringScanner alloc] initWithContentsOfURL:fileURL encoding:_inputEncoding validMacros:validMacros validMacroRegex:validMacrosRegex];
+    DTLocalizableStringScanner *scanner = [[DTLocalizableStringScanner alloc] initWithContentsOfURL:fileURL encoding:_inputEncoding validMacros:validMacros];
 
     [scanner setEntryFoundCallback:^(DTLocalizableStringEntry *entry) 
     {

Core/Source/DTLocalizableStringEntry.m

@@ -14,6 +14,7 @@ @implementation DTLocalizableStringEntry
 	NSMutableSet *_comments;
 
 	NSArray *_sortedCommentsCache;
+    NSString *_cleanedKey;
 }
 
 @synthesize rawKey=_rawKey;
@@ -147,9 +148,19 @@ - (NSArray *)sortedComments
 	return _sortedCommentsCache;
 }
 
+- (void) setRawKey:(NSString *)rawKey {
+    if (rawKey != _rawKey) {
+        _rawKey = rawKey;
+        _cleanedKey = nil;
+    }
+}
+
 - (NSString *)cleanedKey 
 {
-    return [[self rawKey] stringByReplacingSlashEscapes];
+    if (_cleanedKey == nil && _rawKey != nil) {
+        _cleanedKey = [_rawKey stringByReplacingSlashEscapes];
+    }
+    return _cleanedKey;
 }
 
 - (NSString *)cleanedValue 

Core/Source/DTLocalizableStringScanner.h

@@ -14,7 +14,7 @@ typedef void(^DTLocalizableStringEntryFoundCallback)(DTLocalizableStringEntry *)
 
 @interface DTLocalizableStringScanner : NSOperation
 
-- (id)initWithContentsOfURL:(NSURL *)url encoding:(NSStringEncoding)encoding validMacros:(NSDictionary *)validMacros validMacroRegex:(NSRegularExpression *)validMacroRegex;
+- (id)initWithContentsOfURL:(NSURL *)url encoding:(NSStringEncoding)encoding validMacros:(NSDictionary *)validMacros;
 
 @property (nonatomic, copy) DTLocalizableStringEntryFoundCallback entryFoundCallback;