codello/mathpad
Archived
1
Fork 0
Code Releases 1 Activity

Cleaned Code by Removing Location Tracking for Errors

Browse Source
This commit is contained in:
Kim Wittenburg
2014-11-07 19:50:28 +01:00
parent 91e7dbe9f2
commit 139a75f816
59 changed files with 355 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
MathPad/MPFunctionValue.m
View File

@@ -29,7 +29,7 @@ double defaultFunction(double value) {return value;};
switch (tokenStream.currentToken.tokenType) {
case MPSinToken:
[tokenStream currentTokenConsumed];
self.functionName = @"sin";
_functionName = @"sin";
return [self initWithTokenStream:tokenStream
function:&sin
takesArcValue:YES
@@ -37,7 +37,7 @@ double defaultFunction(double value) {return value;};
case MPCosToken:
[tokenStream currentTokenConsumed];
self.functionName = @"cos";
_functionName = @"cos";
return [self initWithTokenStream:tokenStream
function:&cos
takesArcValue:YES
@@ -45,7 +45,7 @@ double defaultFunction(double value) {return value;};
case MPTanToken:
[tokenStream currentTokenConsumed];
self.functionName = @"tan";
_functionName = @"tan";
return [self initWithTokenStream:tokenStream
function:&tan
takesArcValue:YES
@@ -53,7 +53,7 @@ double defaultFunction(double value) {return value;};
case MPASinToken:
[tokenStream currentTokenConsumed];
self.functionName = @"asin";
_functionName = @"asin";
return [self initWithTokenStream:tokenStream
function:&asin
takesArcValue:YES
@@ -61,7 +61,7 @@ double defaultFunction(double value) {return value;};
case MPACosToken:
[tokenStream currentTokenConsumed];
self.functionName = @"acos";
_functionName = @"acos";
return [self initWithTokenStream:tokenStream
function:&acos
takesArcValue:YES
@@ -69,14 +69,16 @@ double defaultFunction(double value) {return value;};
case MPATanToken:
[tokenStream currentTokenConsumed];
self.functionName = @"atan";
_functionName = @"atan";
return [self initWithTokenStream:tokenStream
function:&atan
takesArcValue:YES
returnsArcValue:NO];
default:
@throw [NSException exceptionWithName:NSInternalInconsistencyException reason:@"Expected Function" userInfo:nil];
@throw [NSException exceptionWithName:NSInternalInconsistencyException
reason:@"Expected Function"
userInfo:nil];
break;
}
return self;
@@ -125,12 +127,7 @@ double defaultFunction(double value) {return value;};
}
}
- (NSRange)range
{
return NSMakeRange(0, 0);
}
- (BOOL)validate:(MPParseError *__autoreleasing *)error
- (BOOL)validate:(NSError *__autoreleasing *)error
{
return [self.valueGroup validate:error];
}
@@ -140,12 +137,4 @@ double defaultFunction(double value) {return value;};
return _function([self.valueGroup evaluate]);
}
- (NSArray *)expressionElements
{
NSMutableArray *elements = [[NSMutableArray alloc] init];
[elements addObject:self.functionName];
[elements addObjectsFromArray:self.valueGroup.expressionElements];
return elements;
}
@end