codello/mathpad
Archived
1
Fork 0
Code Releases 1 Activity

Added Evaluation Context and Math Rules

Browse Source
This commit is contained in:
Kim Wittenburg
2014-09-15 15:58:35 +02:00
parent 6573cd1b5c
commit 3cf2006af7
6 changed files with 191 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MathPad/MPExpressionEvaluator.m
View File

@@ -11,6 +11,7 @@
#import "MPFunction.h"
#import "MPParsedFactor.h"
#import "MPFunction+MPParsedFactor.h"
#import "MPMathRules.h"
@interface MPExpressionEvaluator ()
@property (readwrite, nonatomic, strong) NSString *definedVariable;
@@ -87,8 +88,12 @@
} else {
if (!currentProduct) {
currentProduct = [[MPParsedProduct alloc] init];
} else if ([MPMathRules sharedRules].allowsImplicitMultiplication) {
[currentProduct addFactor:(MPFunction *)element];
} else {
*error = MPParseError(NSMakeRange(((MPFunction *)element).range.location, 0), @"Implicit Multiplication not allowed");
return nil;
}
[currentProduct addFactor:(MPFunction *)element];
}
}