Skip to content

Bug with excess element in array for enum with comma after last element #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndrikFin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bug with excess element in array for enum with comma after last element #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 29 additions & 27 deletions ReflectableEnum/ReflectableEnum.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,34 +100,36 @@ - (void)setupWithEnumDefinition:(NSString *)enumDefinition
NSMutableDictionary *mutableDictionary = [NSMutableDictionary new];

for (NSString *member in [enumDefinition componentsSeparatedByString:@","]) {
NSArray *parts = [[member componentsSeparatedByString:@"="] ine_map:^NSString *(NSString *element) {
return [element stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
}];
NSCAssert(parts.count == 1 || parts.count == 2, @"Illegal member definition");

NSString *name = [parts firstObject];
if (parts.count == 2) {
NSString *valueString = [parts lastObject];
NSNumber *number = [numberFormatter numberFromString:valueString];

if (!number) {
NSArray *matchingKeys = [mutableDictionary allKeysForObject:valueString];
_containsDuplicates = YES;
number = matchingKeys.firstObject;
NSCAssert(number, @"Parsing should lead to a number");
} else {
NSString *matchingObject = [mutableDictionary objectForKey:number];
if (matchingObject) {
_containsDuplicates = YES;
}
if (member.length) {
NSArray *parts = [[member componentsSeparatedByString:@"="] ine_map:^NSString *(NSString *element) {
return [element stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
}];
NSCAssert(parts.count == 1 || parts.count == 2, @"Illegal member definition");

NSString *name = [parts firstObject];
if (parts.count == 2) {
NSString *valueString = [parts lastObject];
NSNumber *number = [numberFormatter numberFromString:valueString];

if (!number) {
NSArray *matchingKeys = [mutableDictionary allKeysForObject:valueString];
_containsDuplicates = YES;
number = matchingKeys.firstObject;
NSCAssert(number, @"Parsing should lead to a number");
} else {
NSString *matchingObject = [mutableDictionary objectForKey:number];
if (matchingObject) {
_containsDuplicates = YES;
}
}

currentIndex = [number longLongValue];
} else {
currentIndex++;
}

mutableDictionary[@(currentIndex)] = name;
}

currentIndex = [number longLongValue];
} else {
currentIndex++;
}

mutableDictionary[@(currentIndex)] = name;
}

_mapFromValueToString = [mutableDictionary copy];
Expand Down