* fix for literal token enum names that only differ by caps

itod · Apr 2, 2014 · 365718f · 365718f
1 parent ae0f94b
commit 365718f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 19 deletions.
diff --git a/ParserGenApp/PGDefinitionPhaseVisitor.m b/ParserGenApp/PGDefinitionPhaseVisitor.m
@@ -39,7 +39,7 @@ - (void)dealloc {
 
 - (NSString *)defaultDefNameForStringValue:(NSString *)strVal {
     NSString *defName = _defaultDefNameTab[strVal];
-    // not sure if we want this
+
     if (!defName) {
         NSArray *comps = [strVal componentsSeparatedByCharactersInSet:[[NSCharacterSet alphanumericCharacterSet] invertedSet]];
         if ([[comps lastObject] length]) {
@@ -51,7 +51,7 @@ - (NSString *)defaultDefNameForStringValue:(NSString *)strVal {
             }
         }
     }
-    // end
+
     if (!defName) {
         defName = [@(_fallbackDefNameCounter++) stringValue];
         _defaultDefNameTab[strVal] = defName;

diff --git a/ParserGenApp/PGTokenKindDescriptor.m b/ParserGenApp/PGTokenKindDescriptor.m
@@ -44,6 +44,20 @@ + (PGTokenKindDescriptor *)descriptorWithStringValue:(NSString *)s name:(NSStrin
     NSParameterAssert(name);
 
     PGTokenKindDescriptor *desc = sCache[name];
+
+    // This handles cases where the grammar has two literal tokens
+    // which differ only in capitalization like `Function` and `function`.
+    // This will ensure a unique token kind enum name for both.
+    if (desc && ![desc.stringValue isEqualToString:s]) {
+        NSString *uniqueName = name;
+        NSUInteger i = 0;
+        while (desc) {
+            ++i;
+            uniqueName = [NSString stringWithFormat:@"%@_%lu", name, i];
+            desc = sCache[uniqueName];
+        }
+        name = uniqueName;
+    }
 
     if (!desc) {
         desc = [[[PGTokenKindDescriptor alloc] init] autorelease];

diff --git a/test/DupeLiteralsParser.h b/test/DupeLiteralsParser.h
@@ -1,10 +1,10 @@
 #import <PEGKit/PKParser.h>
 
 enum {
-    DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE = 14,
-    DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE,
+    DUPELITERALS_TOKEN_KIND_NONE_1 = 14,
+    DUPELITERALS_TOKEN_KIND_NONE_2,
     DUPELITERALS_TOKEN_KIND_1,
-    DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE,
+    DUPELITERALS_TOKEN_KIND_NONE,
     DUPELITERALS_TOKEN_KIND_2,
 };
 

diff --git a/test/DupeLiteralsParser.m b/test/DupeLiteralsParser.m
@@ -13,16 +13,16 @@ - (id)initWithDelegate:(id)d {
     if (self) {
 
         self.startRuleName = @"start";
-        self.tokenKindTab[@"none"] = @(DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE);
-        self.tokenKindTab[@"none"] = @(DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE);
+        self.tokenKindTab[@"NONE"] = @(DUPELITERALS_TOKEN_KIND_NONE_1);
+        self.tokenKindTab[@"None"] = @(DUPELITERALS_TOKEN_KIND_NONE_2);
         self.tokenKindTab[@"?("] = @(DUPELITERALS_TOKEN_KIND_1);
-        self.tokenKindTab[@"none"] = @(DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE);
+        self.tokenKindTab[@"none"] = @(DUPELITERALS_TOKEN_KIND_NONE);
         self.tokenKindTab[@"):"] = @(DUPELITERALS_TOKEN_KIND_2);
 
-        self.tokenKindNameTab[DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE] = @"none";
-        self.tokenKindNameTab[DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE] = @"none";
+        self.tokenKindNameTab[DUPELITERALS_TOKEN_KIND_NONE_1] = @"NONE";
+        self.tokenKindNameTab[DUPELITERALS_TOKEN_KIND_NONE_2] = @"None";
         self.tokenKindNameTab[DUPELITERALS_TOKEN_KIND_1] = @"?(";
-        self.tokenKindNameTab[DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE] = @"none";
+        self.tokenKindNameTab[DUPELITERALS_TOKEN_KIND_NONE] = @"none";
         self.tokenKindNameTab[DUPELITERALS_TOKEN_KIND_2] = @"):";
 
     }
@@ -51,26 +51,26 @@ - (void)start {
 - (void)start_ {
 
     do {
-        if ([self predicts:DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE, 0]) {
+        if ([self predicts:DUPELITERALS_TOKEN_KIND_NONE, DUPELITERALS_TOKEN_KIND_NONE_1, DUPELITERALS_TOKEN_KIND_NONE_2, 0]) {
             [self none_]; 
         } else if ([self predicts:DUPELITERALS_TOKEN_KIND_1, DUPELITERALS_TOKEN_KIND_2, 0]) {
             [self weird_]; 
         } else {
             [self raise:@"No viable alternative found in rule 'start'."];
         }
-    } while ([self predicts:DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE, DUPELITERALS_TOKEN_KIND_1, DUPELITERALS_TOKEN_KIND_2, 0]);
+    } while ([self predicts:DUPELITERALS_TOKEN_KIND_1, DUPELITERALS_TOKEN_KIND_2, DUPELITERALS_TOKEN_KIND_NONE, DUPELITERALS_TOKEN_KIND_NONE_1, DUPELITERALS_TOKEN_KIND_NONE_2, 0]);
 
     [self fireDelegateSelector:@selector(parser:didMatchStart:)];
 }
 
 - (void)none_ {
 
-    if ([self speculate:^{ [self match:DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE discard:NO]; }]) {
-        [self match:DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE discard:NO]; 
-    } else if ([self speculate:^{ [self match:DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE discard:NO]; }]) {
-        [self match:DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE discard:NO]; 
-    } else if ([self speculate:^{ [self match:DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE discard:NO]; }]) {
-        [self match:DUPELITERALS_DUPELITERALS_DUPELITERALS_TOKEN_KIND_NONE discard:NO]; 
+    if ([self predicts:DUPELITERALS_TOKEN_KIND_NONE, 0]) {
+        [self match:DUPELITERALS_TOKEN_KIND_NONE discard:NO]; 
+    } else if ([self predicts:DUPELITERALS_TOKEN_KIND_NONE_1, 0]) {
+        [self match:DUPELITERALS_TOKEN_KIND_NONE_1 discard:NO]; 
+    } else if ([self predicts:DUPELITERALS_TOKEN_KIND_NONE_2, 0]) {
+        [self match:DUPELITERALS_TOKEN_KIND_NONE_2 discard:NO]; 
     } else {
         [self raise:@"No viable alternative found in rule 'none'."];
     }