Skip to content

Commit

Permalink
Rename _DDOperatorInfo in preparation of adding an API
Browse files Browse the repository at this point in the history
  • Loading branch information
@davedelong
davedelong committed Jan 4, 2014
1 parent b421c65 commit ef81979
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 36 deletions.
20 changes: 10 additions & 10 deletions DDMathParser.xcodeproj/project.pbxproj
View file
Expand Up @@ -42,9 +42,9 @@
5537E36F12AB21140000CFED /* Demo.m in Sources */ = {isa = PBXBuildFile; fileRef = 5537E36E12AB21140000CFED /* Demo.m */; };
5537E37312AB214D0000CFED /* DemoController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5537E37212AB214D0000CFED /* DemoController.m */; };
5537E37512AB229C0000CFED /* Demo.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5537E37412AB229C0000CFED /* Demo.xib */; };
554243571437654800BA293D /* _DDOperatorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 554243561437654800BA293D /* _DDOperatorInfo.m */; };
554243581437654800BA293D /* _DDOperatorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 554243561437654800BA293D /* _DDOperatorInfo.m */; };
554243591437654800BA293D /* _DDOperatorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 554243561437654800BA293D /* _DDOperatorInfo.m */; };
554243571437654800BA293D /* DDMathOperator.m in Sources */ = {isa = PBXBuildFile; fileRef = 554243561437654800BA293D /* DDMathOperator.m */; };
554243581437654800BA293D /* DDMathOperator.m in Sources */ = {isa = PBXBuildFile; fileRef = 554243561437654800BA293D /* DDMathOperator.m */; };
554243591437654800BA293D /* DDMathOperator.m in Sources */ = {isa = PBXBuildFile; fileRef = 554243561437654800BA293D /* DDMathOperator.m */; };
554DA12B12985DAE00433840 /* DDExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F7963612934A1400EF2716 /* DDExpression.m */; };
554DA12E12985DB500433840 /* _DDFunctionExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9EFEA1295AF3D00F4A9FD /* _DDFunctionExpression.m */; };
554DA12F12985DB500433840 /* _DDNumberExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9EFED1295AF7500F4A9FD /* _DDNumberExpression.m */; };
Expand Down Expand Up @@ -115,8 +115,8 @@
5537E37112AB214D0000CFED /* DemoController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoController.h; sourceTree = "<group>"; };
5537E37212AB214D0000CFED /* DemoController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DemoController.m; sourceTree = "<group>"; };
5537E37412AB229C0000CFED /* Demo.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Demo.xib; sourceTree = "<group>"; };
554243551437654800BA293D /* _DDOperatorInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _DDOperatorInfo.h; sourceTree = "<group>"; };
554243561437654800BA293D /* _DDOperatorInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _DDOperatorInfo.m; sourceTree = "<group>"; };
554243551437654800BA293D /* DDMathOperator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDMathOperator.h; sourceTree = "<group>"; };
554243561437654800BA293D /* DDMathOperator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDMathOperator.m; sourceTree = "<group>"; };
5554D58912944AFD00A62529 /* DDMathEvaluator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DDMathEvaluator.h; sourceTree = "<group>"; };
5554D58A12944AFD00A62529 /* DDMathEvaluator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DDMathEvaluator.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
5554D5EF129478E800A62529 /* DDMathEvaluator+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DDMathEvaluator+Private.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -242,8 +242,8 @@
children = (
55E2FCB5129DC90400CD6023 /* DDParser.h */,
55E2FCB6129DC90400CD6023 /* DDParser.m */,
554243551437654800BA293D /* _DDOperatorInfo.h */,
554243561437654800BA293D /* _DDOperatorInfo.m */,
554243551437654800BA293D /* DDMathOperator.h */,
554243561437654800BA293D /* DDMathOperator.m */,
5565122613CAB1D7004B7C67 /* Terms */,
);
name = "Precedence Parser";
Expand Down Expand Up @@ -530,7 +530,7 @@
5514EF171347EBA20010B9D8 /* DDTypes.m in Sources */,
550C416A13BA8BCA00A041BC /* DDMathStringTokenizer.m in Sources */,
55F99B301434FA9A00817F7A /* _DDRewriteRule.m in Sources */,
554243591437654800BA293D /* _DDOperatorInfo.m in Sources */,
554243591437654800BA293D /* DDMathOperator.m in Sources */,
556E126C149D2D4F00859AD8 /* DDParserTypes.m in Sources */,
55F3918C1633349500AB28B1 /* _DDPrecisionFunctionEvaluator.m in Sources */,
55F391911634AAB100AB28B1 /* _DDDecimalFunctions.m in Sources */,
Expand Down Expand Up @@ -561,7 +561,7 @@
5514EF161347EBA10010B9D8 /* DDTypes.m in Sources */,
550C416913BA8BCA00A041BC /* DDMathStringTokenizer.m in Sources */,
55F99B2F1434FA9900817F7A /* _DDRewriteRule.m in Sources */,
554243581437654800BA293D /* _DDOperatorInfo.m in Sources */,
554243581437654800BA293D /* DDMathOperator.m in Sources */,
556E126D149D2D5000859AD8 /* DDParserTypes.m in Sources */,
558A285714A2EEE9000FBE0C /* UnitTestMacros.m in Sources */,
55F3918B1633349100AB28B1 /* _DDPrecisionFunctionEvaluator.m in Sources */,
Expand Down Expand Up @@ -592,7 +592,7 @@
556C294013CD42FF005203F1 /* _DDVariableTerm.m in Sources */,
551EA4B813CD657400302C67 /* _DDOperatorTerm.m in Sources */,
55ABBAAB142ECB1300BDF29A /* _DDRewriteRule.m in Sources */,
554243571437654800BA293D /* _DDOperatorInfo.m in Sources */,
554243571437654800BA293D /* DDMathOperator.m in Sources */,
551C8C4A144E5CFC00520BDA /* DDParserTypes.m in Sources */,
55F3918A1632FF8900AB28B1 /* _DDPrecisionFunctionEvaluator.m in Sources */,
55F3918F1634AAB100AB28B1 /* _DDDecimalFunctions.m in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion DDMathParser/_DDOperatorInfo.h → DDMathParser/DDMathOperator.h
View file
Expand Up @@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
#import "DDMathParser.h"

@interface _DDOperatorInfo : NSObject
@interface DDMathOperator : NSObject

@property (nonatomic, readonly, strong) NSString *function;
@property (nonatomic, readonly, strong) NSArray *tokens;
Expand Down
8 changes: 4 additions & 4 deletions DDMathParser/_DDOperatorInfo.m → DDMathParser/DDMathOperator.m
View file
Expand Up @@ -6,13 +6,13 @@
// Copyright (c) 2011 __MyCompanyName__. All rights reserved.
//

#import "_DDOperatorInfo.h"
#import "DDMathOperator.h"

static NSArray *_allOperators;
static NSDictionary *_operatorsByFunction;
static NSDictionary *_infosByToken;

@implementation _DDOperatorInfo
@implementation DDMathOperator

- (id)initWithOperatorFunction:(NSString *)function tokens:(NSArray *)tokens arity:(DDOperatorArity)arity precedence:(NSInteger)precedence associativity:(DDOperatorAssociativity)associativity {
self = [super init];
Expand All @@ -27,7 +27,7 @@ - (id)initWithOperatorFunction:(NSString *)function tokens:(NSArray *)tokens ari
}

+ (id)infoForOperatorFunction:(NSString *)function tokens:(NSArray *)tokens arity:(DDOperatorArity)arity precedence:(NSInteger)precedence associativity:(DDOperatorAssociativity)associativity {
return [[_DDOperatorInfo alloc] initWithOperatorFunction:function tokens:tokens arity:arity precedence:precedence associativity:associativity];
return [[DDMathOperator alloc] initWithOperatorFunction:function tokens:tokens arity:arity precedence:precedence associativity:associativity];
}

+ (instancetype)infoForOperatorFunction:(NSString *)function {
Expand Down Expand Up @@ -168,7 +168,7 @@ + (void)_buildOperators {
#endif

NSMutableDictionary *lookupByToken = [NSMutableDictionary dictionary];
for (_DDOperatorInfo *info in _allOperators) {
for (DDMathOperator *info in _allOperators) {
NSArray *tokens = [info tokens];
for (NSString *token in tokens) {
NSMutableArray *infosForThisToken = [lookupByToken objectForKey:token];
Expand Down
2 changes: 1 addition & 1 deletion DDMathParser/DDMathStringToken.h
View file
Expand Up @@ -16,7 +16,7 @@ typedef enum {
DDTokenTypeVariable = 3
} DDTokenType;

@class _DDOperatorInfo;
@class DDMathOperator;

@interface DDMathStringToken : NSObject

Expand Down
8 changes: 4 additions & 4 deletions DDMathParser/DDMathStringToken.m
View file
Expand Up @@ -8,11 +8,11 @@

#import "DDMathParser.h"
#import "DDMathStringToken.h"
#import "_DDOperatorInfo.h"
#import "DDMathOperator.h"

@implementation DDMathStringToken {
DDTokenType _tokenType;
_DDOperatorInfo *_operatorInfo;
DDMathOperator *_operatorInfo;
BOOL _ambiguous;
}

Expand All @@ -23,7 +23,7 @@ - (id)initWithToken:(NSString *)t type:(DDTokenType)type {
_tokenType = type;

if (_tokenType == DDTokenTypeOperator) {
NSArray *matching = [_DDOperatorInfo infosForOperatorToken:t];
NSArray *matching = [DDMathOperator infosForOperatorToken:t];
if ([matching count] == 0) {
return nil;
} else if ([matching count] == 1) {
Expand Down Expand Up @@ -104,7 +104,7 @@ - (DDOperatorAssociativity)operatorAssociativity {
}

- (void)resolveToOperator:(NSString *)operator {
_operatorInfo = [_DDOperatorInfo infoForOperatorFunction:operator];
_operatorInfo = [DDMathOperator infoForOperatorFunction:operator];
_ambiguous = (_operatorInfo == nil);
}

Expand Down
18 changes: 9 additions & 9 deletions DDMathParser/DDMathStringTokenizer.m
View file
Expand Up @@ -10,7 +10,7 @@
#import "DDMathStringTokenizer.h"
#import "DDMathParserMacros.h"
#import "DDMathStringToken.h"
#import "_DDOperatorInfo.h"
#import "DDMathOperator.h"

#define DD_IS_DIGIT(_c) ((_c) >= '0' && (_c) <= '9')
#define DD_IS_HEX(_c) (((_c) >= '0' && (_c) <= '9') || ((_c) >= 'a' && (_c) <= 'f') || ((_c) >= 'A' && (_c) <= 'F'))
Expand Down Expand Up @@ -67,7 +67,7 @@ + (NSCharacterSet *)_operatorCharacterSet {
static dispatch_once_t onceToken;
static NSCharacterSet *_operatorSet = nil;
dispatch_once(&onceToken, ^{
NSArray *allOperators = [_DDOperatorInfo allOperators];
NSArray *allOperators = [DDMathOperator allOperators];
NSArray *operatorTokens = [allOperators valueForKeyPath:@"@distinctUnionOfArrays.tokens"];
NSString *operatorString = [operatorTokens componentsJoinedByString:@""];
_operatorSet = [NSCharacterSet characterSetWithCharactersInString:operatorString];
Expand Down Expand Up @@ -181,18 +181,18 @@ - (BOOL)_processUnknownOperatorToken:(DDMathStringToken *)token withError:(NSErr
}

if (shouldBeUnary) {
NSArray *potentialOperators = @[[_DDOperatorInfo infoForOperatorFunction:DDOperatorUnaryPlus],
[_DDOperatorInfo infoForOperatorFunction:DDOperatorUnaryMinus]];
for (_DDOperatorInfo *info in potentialOperators) {
NSArray *potentialOperators = @[[DDMathOperator infoForOperatorFunction:DDOperatorUnaryPlus],
[DDMathOperator infoForOperatorFunction:DDOperatorUnaryMinus]];
for (DDMathOperator *info in potentialOperators) {
if ([info.tokens containsObject:token.token]) {
resolvedOperator = info.function;
break;
}
}
} else {
NSArray *potentialOperators = @[[_DDOperatorInfo infoForOperatorFunction:DDOperatorAdd],
[_DDOperatorInfo infoForOperatorFunction:DDOperatorMinus]];
for (_DDOperatorInfo *info in potentialOperators) {
NSArray *potentialOperators = @[[DDMathOperator infoForOperatorFunction:DDOperatorAdd],
[DDMathOperator infoForOperatorFunction:DDOperatorMinus]];
for (DDMathOperator *info in potentialOperators) {
if ([info.tokens containsObject:token.token]) {
resolvedOperator = info.function;
break;
Expand Down Expand Up @@ -557,7 +557,7 @@ - (DDMathStringToken *)_parseOperatorWithError:(NSError **)error {

while ([operatorCharacters characterIsMember:character]) {
NSString *tmp = [NSString stringWithCharacters:(_caseInsensitiveCharacters+start) length:length];
NSArray *operators = [_DDOperatorInfo infosForOperatorToken:tmp];
NSArray *operators = [DDMathOperator infosForOperatorToken:tmp];
if ([operators count] > 0) {
lastGood = tmp;
lastGoodLength = length;
Expand Down
6 changes: 3 additions & 3 deletions DDMathParser/DDParser.m
View file
Expand Up @@ -15,15 +15,15 @@
#import "DDMathStringTokenizer.h"
#import "DDMathStringToken.h"
#import "DDExpression.h"
#import "_DDOperatorInfo.h"
#import "DDMathOperator.h"

static inline void DDOperatorSetAssociativity(NSString *o, DDOperatorAssociativity a) {
_DDOperatorInfo *info = [_DDOperatorInfo infoForOperatorFunction:o];
DDMathOperator *info = [DDMathOperator infoForOperatorFunction:o];
info.defaultAssociativity = a;
}

static inline DDOperatorAssociativity DDOperatorGetAssociativity(NSString *o) {
_DDOperatorInfo *info = [_DDOperatorInfo infoForOperatorFunction:o];
DDMathOperator *info = [DDMathOperator infoForOperatorFunction:o];
return info.defaultAssociativity;
}

Expand Down
4 changes: 2 additions & 2 deletions DDMathParser/_DDFunctionEvaluator.m
View file
Expand Up @@ -11,7 +11,7 @@
#import "DDExpression.h"
#import "DDMathParserMacros.h"
#import "DDMathEvaluator+Private.h"
#import "_DDOperatorInfo.h"
#import "DDMathOperator.h"
#import <objc/runtime.h>


Expand Down Expand Up @@ -477,7 +477,7 @@ - (DDExpression *)percent:(NSArray *)arguments variables:(NSDictionary *)variabl
DDExpression *percentContext = [percentExpression parentExpression];

NSString *parentFunction = [percentContext function];
_DDOperatorInfo *operatorInfo = [_DDOperatorInfo infoForOperatorFunction:parentFunction];
DDMathOperator *operatorInfo = [DDMathOperator infoForOperatorFunction:parentFunction];

NSNumber *context = @1;

Expand Down
4 changes: 2 additions & 2 deletions DDMathParser/_DDPrecisionFunctionEvaluator.m
View file
Expand Up @@ -9,7 +9,7 @@
#import "_DDPrecisionFunctionEvaluator.h"
#import "DDExpression.h"
#import "DDMathEvaluator+Private.h"
#import "_DDOperatorInfo.h"
#import "DDMathOperator.h"
#import "_DDDecimalFunctions.h"

@implementation _DDPrecisionFunctionEvaluator
Expand Down Expand Up @@ -314,7 +314,7 @@ - (DDExpression *)percent:(NSArray *)arguments variables:(NSDictionary *)variabl
DDExpression *percentContext = [percentExpression parentExpression];

NSString *parentFunction = [percentContext function];
_DDOperatorInfo *operatorInfo = [_DDOperatorInfo infoForOperatorFunction:parentFunction];
DDMathOperator *operatorInfo = [DDMathOperator infoForOperatorFunction:parentFunction];

NSNumber *context = @1;

Expand Down

0 comments on commit ef81979

Please sign in to comment.