Fixed some compilation errors in the Demo

davedelong · Mar 3, 2012 · f44b6c0 · f44b6c0
1 parent b132b37
commit f44b6c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Demo/DemoController.h b/Demo/DemoController.h
@@ -8,6 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+@class DDMathEvaluator;
 
 @interface DemoController : NSObject <NSTableViewDelegate, NSTableViewDataSource> {
 	NSTextField * inputField;
@@ -17,6 +18,7 @@
 
 	NSArray * orderedVariables;
 	NSMutableDictionary * variables;
+    DDMathEvaluator *evaluator;
 }
 
 @property (nonatomic, retain) NSArray * orderedVariables;

diff --git a/Demo/DemoController.m b/Demo/DemoController.m
@@ -42,11 +42,10 @@ - (void) awakeFromNib {
 
 - (DDMathEvaluator *)evaluator {
     if (evaluator == nil) {
-        NSDictionary *parameters = nil;
         __block DemoController *blockSelf = self;
 
-        DDMathEvaluator *evaluator = [[DDMathEvaluator alloc] init];
+        evaluator = [[DDMathEvaluator alloc] init];
-        [evaluator setFunctionResolver:^(NSString *name) {
+        [evaluator setFunctionResolver:^DDMathFunction(NSString *name) {
             NSLog(@"resolving function: %@", name);
 
             DDMathFunction resolved = ^DDExpression* (NSArray *args, NSDictionary *substitutions, DDMathEvaluator *evaluator, NSError **error) {