Minor bug fixes

davedelong · Sep 17, 2011 · 719a40e · 719a40e
1 parent 0a6c5ca
commit 719a40e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/DDMathParser/DDMathStringTokenizer.m b/DDMathParser/DDMathStringTokenizer.m
@@ -125,12 +125,12 @@ - (BOOL)_processToken:(DDMathStringToken *)token withError:(NSError **)error {
         return YES;
     }
 
-    //this adds support for implicit multiplication
-    (void)[self _processImplicitMultiplicationWithToken:token error:error];
-
     //this adds support for not adding parentheses to functions
     (void)[self _processArgumentlessFunctionWithToken:token error:error];
 
+    //this adds support for implicit multiplication
+    (void)[self _processImplicitMultiplicationWithToken:token error:error];
+
     [self appendToken:token];
     return YES;
 }

diff --git a/DDMathParser/_DDVariableExpression.m b/DDMathParser/_DDVariableExpression.m
@@ -57,11 +57,14 @@ - (NSNumber *) evaluateWithSubstitutions:(NSDictionary *)substitutions evaluator
 	if ([variableValue isKindOfClass:[DDExpression class]]) {
 		return [variableValue evaluateWithSubstitutions:substitutions evaluator:evaluator error:error];
 	}
+    if ([variableValue isKindOfClass:[NSString class]]) {
+        return [evaluator evaluateString:variableValue withSubstitutions:substitutions];
+    }
 	if ([variableValue isKindOfClass:[NSNumber class]]) {
 		return variableValue;
 	}
 	if (error != nil) {
-		*error = ERR_GENERIC(@"unable to evaluate expression: %@", self);
+		*error = ERR_GENERIC(@"unable to resolve variable expression: %@", self);
 	}
 	return nil;
 }

diff --git a/main.m b/main.m
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import "DDMathParser.h"
-#import "ConstantRecognizer.h"
+#import "DDMathStringTokenizer.h"
 
 NSString* readLine(void);
 void listFunctions(void);