Improved Evaluation

MathPad/MPFunction.h

@@ -9,11 +9,14 @@
 @import Foundation;
 #import "MPExpressionElement.h"
 #import "MPParseError.h"
+#import "MPTerm.h"
 
 @class MPFunction, MPExpression, MPRangePath;
 
 @interface MPFunction : NSObject <NSCoding, NSCopying, MPExpressionElement>
 
++ (NSString *)localizedFunctionName; // Override
+
 #pragma mark Creation Methods
 
 - (instancetype)init;
@@ -38,7 +41,8 @@
 - (id)elementAtIndexPath:(NSIndexPath *)indexPath;
 
 #pragma mark Evaluating Functions
-- (NSDecimalNumber *)evaluateWithError:(MPParseError *__autoreleasing *)error;
+
+- (MPTerm *)parseWithError:(MPParseError *__autoreleasing *)error; // Override
 
 #pragma mark Messages
 - (void)didChangeElementsInRangePath:(MPRangePath *)rangePath
@@ -52,4 +56,6 @@
 - (NSString *)description; // Should be overridden
 - (NSUInteger)hash;// Override
 
+- (id)copyWithZone:(NSZone *)zone; // Override
+
 @end