Resolving functions as variables should result in the consultation of…

… the variable resolver
JanX2 · Jan 4, 2014 · 400517b · 400517b
1 parent b8d7a95
commit 400517b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/DDMathParser/DDMathEvaluator.m b/DDMathParser/DDMathEvaluator.m
@@ -109,6 +109,9 @@ - (DDExpression *)resolveFunction:(_DDFunctionExpression *)functionExpression va
         // see if we have a variable value with the same name as the function
         id variableValue = [variables objectForKey:functionName];
         NSNumber *n = [self _evaluateValue:variableValue withSubstitutions:variables error:error];
+        if (n == nil) {
+            n = [self variableWithName:functionName];
+        }
         if (n != nil) {
             e = [DDExpression numberExpressionWithNumber:n];
         }

diff --git a/Demo/DemoController.m b/Demo/DemoController.m
@@ -30,6 +30,7 @@ - (void)awakeFromNib {
 - (DDMathEvaluator *)evaluator {
     if (evaluator == nil) {
         evaluator = [[DDMathEvaluator alloc] init];
+        evaluator.resolvesFunctionsAsVariables = YES;
 
         __weak __typeof(self) weakSelf = self;
         [evaluator setVariableResolver:^(NSString *variable) {
@@ -39,17 +40,6 @@ - (DDMathEvaluator *)evaluator {
             }
             return @0;
         }];
-
-        [evaluator setFunctionResolver:^(NSString *functionName) {
-            return ^(NSArray *args, NSDictionary *vars, DDMathEvaluator *eval, NSError **error) {
-                __strong __typeof(weakSelf) strongSelf = weakSelf;
-                NSNumber *number = @0;
-                if (strongSelf) {
-                    number = [strongSelf->variables objectForKey:functionName];
-                }
-                return [DDExpression numberExpressionWithNumber:number];
-            };
-        }];
     }
 
     return evaluator;