Fundamental Redesign of Evaluation
This commit is contained in:
@@ -8,8 +8,8 @@
|
||||
|
||||
#import "MPFractionFunction.h"
|
||||
|
||||
#import "MPFractionTerm.h"
|
||||
#import "MPExpression.h"
|
||||
#import "MPExpressionTree.h"
|
||||
|
||||
@implementation MPFractionFunction
|
||||
|
||||
@@ -21,14 +21,9 @@ MPFunctionAccessorImplementation(DenominatorExpression, _denominatorExpression)
|
||||
return @[@"nominatorExpression", @"denominatorExpression"];
|
||||
}
|
||||
|
||||
- (BOOL)validate:(NSError *__autoreleasing *)error
|
||||
- (Class)functionTermClass
|
||||
{
|
||||
return [[self.nominatorExpression parse] validate:error] && [[self.denominatorExpression parse] validate:error];
|
||||
}
|
||||
|
||||
- (NSDecimalNumber *)evaluate
|
||||
{
|
||||
return [[[self.nominatorExpression parse] evaluate] decimalNumberByDividingBy:[[self.denominatorExpression parse] evaluate]];
|
||||
return [MPFractionTerm class];
|
||||
}
|
||||
|
||||
- (NSString *)description
|
||||
|
||||
Reference in New Issue
Block a user