Remove use of NSPredicate, more cached information

onecrayon · Oct 10, 2011 · 06a1c5f · 06a1c5f
1 parent 78f6ad5
commit 06a1c5f
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 4 deletions.
diff --git a/DDMathParser/DDMathStringToken.m b/DDMathParser/DDMathStringToken.m
@@ -31,8 +31,7 @@ - (id) initWithToken:(NSString *)t type:(DDTokenType)type {
 		operatorType = DDOperatorInvalid;
 
 		if (tokenType == DDTokenTypeOperator) {
-            NSArray *operators = [_DDOperatorInfo allOperators];
-            NSArray *matching = [operators filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"token = %@", t]];
+            NSArray *matching = [_DDOperatorInfo infosForOperatorToken:t];
             if ([matching count] == 0) {
                 DD_RELEASE(self);
                 return nil;
@@ -104,7 +103,7 @@ - (void)resolveToOperator:(DDOperator)operator {
     DD_RELEASE(operatorInfo);
     operatorInfo = nil;
 
-    NSArray *matching = [[_DDOperatorInfo allOperators] filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"operator = %d", operator]];
+    NSArray *matching = [_DDOperatorInfo infosForOperator:operator];
     if ([matching count] != 1) { return; }
 
     ambiguous = NO;

diff --git a/DDMathParser/_DDOperatorInfo.h b/DDMathParser/_DDOperatorInfo.h
@@ -27,5 +27,6 @@
 
 + (NSArray *)allOperators;
 + (NSArray *)infosForOperator:(DDOperator)operator;
++ (NSArray *)infosForOperatorToken:(NSString *)token;
 
 @end
diff --git a/DDMathParser/_DDOperatorInfo.m b/DDMathParser/_DDOperatorInfo.m
@@ -35,7 +35,45 @@ + (id)infoForOperator:(DDOperator)operator arity:(DDOperatorArity)arity preceden
 }
 
 + (NSArray *)infosForOperator:(DDOperator)operator {
-    return [[self allOperators] filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"operator = %d", operator]];
+    static dispatch_once_t onceToken;
+    static NSMutableDictionary *_operatorLookup = nil;
+    dispatch_once(&onceToken, ^{
+        _operatorLookup = [[NSMutableDictionary alloc] init];
+
+        NSArray *operators = [self allOperators];
+        for (_DDOperatorInfo *info in operators) {
+            DDOperator op = [info operator];
+            NSNumber *key = [NSNumber numberWithInt:op];
+
+            NSMutableArray *value = [_operatorLookup objectForKey:key];
+            if (value == nil) {
+                value = [NSMutableArray array];
+                [_operatorLookup setObject:value forKey:key];
+            }
+            [value addObject:info];
+        }
+    });
+    return [_operatorLookup objectForKey:[NSNumber numberWithInt:operator]];
+}
+
++ (NSArray *)infosForOperatorToken:(NSString *)token {
+    static dispatch_once_t onceToken;
+    static NSMutableDictionary *_operatorLookup = nil;
+    dispatch_once(&onceToken, ^{
+        _operatorLookup = [[NSMutableDictionary alloc] init];
+
+        NSArray *operators = [self allOperators];
+        for (_DDOperatorInfo *info in operators) {
+
+            NSMutableArray *value = [_operatorLookup objectForKey:[info token]];
+            if (value == nil) {
+                value = [NSMutableArray array];
+                [_operatorLookup setObject:value forKey:[info token]];
+            }
+            [value addObject:info];
+        }
+    });
+    return [_operatorLookup objectForKey:token];
 }
 
 #if !DD_HAS_ARC