Cleaned Code by Removing Location Tracking for Errors

MathPad/MPValueGroup.m

@@ -17,7 +17,6 @@
 
 @implementation MPValueGroup {
     NSMutableArray *_values;
-    NSRange _range;
 }
 
 - (id)init
@@ -34,7 +33,7 @@
     self = [self init];
     if (self) {
         [tokenStream beginIgnoringWhitespaceTokens];
-        MPTokenStreamRecordCurrentLocation(tokenStream); // This will also skip leading whitespaces
+        [tokenStream currentToken];  // This will skip leading whitespaces
         [tokenStream endIgnoringOrAcceptingWhitespaceTokens];
         [tokenStream beginAcceptingWhitespaceTokens];
         
@@ -57,6 +56,9 @@
                 case MPGenericFunctionToken:
                 {
                     currentValue = (id<MPValue>)tokenStream.currentToken;
+                    if ([currentValue isKindOfClass:[MPSuffixFunction class]]) {
+                        ((MPSuffixFunction *)currentValue).baseValue = nil;
+                    }
                     [tokenStream currentTokenConsumed];
                 }
                     break;
@@ -85,24 +87,19 @@
                 [_values addObject:[tokenStream consumeSuffixesForValue:currentValue]];
             }
         }
-
-        _range = MPTokenStreamRecordedRange(tokenStream);
         
         [tokenStream endIgnoringOrAcceptingWhitespaceTokens];
     }
     return self;
 }
 
-- (NSRange)range
-{
-    return _range;
-}
-
-- (BOOL)validate:(MPParseError *__autoreleasing *)error
+- (BOOL)validate:(NSError *__autoreleasing *)error
 {
     if (_values.count == 0) {
         if (error) {
-            *error = MPParseError(self.range, @"Expected Value");
+            *error = MPParseError(8,
+                                  NSLocalizedString(@"Expected Value.", @"Error message. This is displayed when a value was expected but none was found."),
+                                  nil);
         }
         return NO;
     }
@@ -131,42 +128,6 @@
     return result;
 }
 
-- (NSArray *)expressionElements
-{
-    NSMutableArray *elements = [[NSMutableArray alloc] init];
-    for (id<MPValue> value in _values) {
-        [elements addObjectsFromArray:value.expressionElements];
-    }
-    return elements;
-}
-
-- (void)appendValue:(id<MPValue>)value
-{
-    [_values addObject:value];
-}
-
-- (void)insertValue:(id<MPValue>)value
-            atIndex:(NSUInteger)index
-{
-    [_values insertObject:value
-                  atIndex:index];
-}
-
-- (void)removeValue:(id<MPValue>)value
-{
-    [_values removeObject:value];
-}
-
-- (void)removeValueAtIndex:(NSUInteger)index
-{
-    [_values removeObjectAtIndex:index];
-}
-
-- (id<MPValue>)valueAtIndex:(NSUInteger)index
-{
-    return [_values objectAtIndex:index];
-}
-
 @end