* dupe symbol literals in grammar

itod · Apr 13, 2014 · f5cde50 · f5cde50
1 parent b660137
commit f5cde50
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/res/dupe_literals.grammar b/res/dupe_literals.grammar
@@ -4,6 +4,7 @@
     [t setTokenizerState:t.symbolState from:'"' to:'"'];
 }
 
-start = none+;
+start = (none | quote | block)+;
 none = 'none' | 'NONE' | 'None';
-quote = '"'! Word '"'!;
+quote = '"'! Word '"'!;
+block = '|' Word '|';
diff --git a/test/DupeLiteralsParser.h b/test/DupeLiteralsParser.h
@@ -3,6 +3,7 @@
 enum {
     DUPELITERALS_TOKEN_KIND_NONE_1 = 14,
     DUPELITERALS_TOKEN_KIND_NONE_2,
+    DUPELITERALS_TOKEN_KIND_PIPE,
     DUPELITERALS_TOKEN_KIND_NONE,
     DUPELITERALS_TOKEN_KIND_QUOTE,
 };

diff --git a/test/DupeLiteralsParser.m b/test/DupeLiteralsParser.m
@@ -15,11 +15,13 @@ - (id)initWithDelegate:(id)d {
         self.startRuleName = @"start";
         self.tokenKindTab[@"NONE"] = @(DUPELITERALS_TOKEN_KIND_NONE_1);
         self.tokenKindTab[@"None"] = @(DUPELITERALS_TOKEN_KIND_NONE_2);
+        self.tokenKindTab[@"|"] = @(DUPELITERALS_TOKEN_KIND_PIPE);
         self.tokenKindTab[@"none"] = @(DUPELITERALS_TOKEN_KIND_NONE);
         self.tokenKindTab[@"\""] = @(DUPELITERALS_TOKEN_KIND_QUOTE);
 
         self.tokenKindNameTab[DUPELITERALS_TOKEN_KIND_NONE_1] = @"NONE";
         self.tokenKindNameTab[DUPELITERALS_TOKEN_KIND_NONE_2] = @"None";
+        self.tokenKindNameTab[DUPELITERALS_TOKEN_KIND_PIPE] = @"|";
         self.tokenKindNameTab[DUPELITERALS_TOKEN_KIND_NONE] = @"none";
         self.tokenKindNameTab[DUPELITERALS_TOKEN_KIND_QUOTE] = @"\"";
 
@@ -50,8 +52,16 @@ - (void)start {
 - (void)start_ {
 
     do {
-        [self none_]; 
-    } while ([self predicts:DUPELITERALS_TOKEN_KIND_NONE, DUPELITERALS_TOKEN_KIND_NONE_1, DUPELITERALS_TOKEN_KIND_NONE_2, 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_QUOTE, 0]) {
+            [self quote_]; 
+        } else if ([self predicts:DUPELITERALS_TOKEN_KIND_PIPE, 0]) {
+            [self block_]; 
+        } else {
+            [self raise:@"No viable alternative found in rule 'start'."];
+        }
+    } while ([self speculate:^{ 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_QUOTE, 0]) {[self quote_]; } else if ([self predicts:DUPELITERALS_TOKEN_KIND_PIPE, 0]) {[self block_]; } else {[self raise:@"No viable alternative found in rule 'start'."];}}]);
 
     [self fireDelegateSelector:@selector(parser:didMatchStart:)];
 }
@@ -80,4 +90,13 @@ - (void)quote_ {
     [self fireDelegateSelector:@selector(parser:didMatchQuote:)];
 }
 
+- (void)block_ {
+
+    [self match:DUPELITERALS_TOKEN_KIND_PIPE discard:NO]; 
+    [self matchWord:NO]; 
+    [self match:DUPELITERALS_TOKEN_KIND_PIPE discard:NO]; 
+
+    [self fireDelegateSelector:@selector(parser:didMatchBlock:)];
+}
+
 @end