* Change Action blocks to have void return

itod · Mar 29, 2014 · 08b6053 · 08b6053
1 parent 3137372
commit 08b6053
Show file tree

Hide file tree

Showing 21 changed files with 51 additions and 53 deletions.
diff --git a/include/PEGKit/PKParser.h b/include/PEGKit/PKParser.h
@@ -27,7 +27,7 @@
 @class PKToken;
 @class PKAssembly;
 
-typedef id   (^PKSActionBlock)   (void);
+typedef void (^PKSActionBlock)   (void);
 typedef void (^PKSSpeculateBlock)(void);
 typedef BOOL (^PKSPredicateBlock)(void);
 typedef void (^PKSRecoverBlock)   (void);
@@ -105,7 +105,7 @@ enum {
 - (void)testAndThrow:(PKSPredicateBlock)block;
 
 // actions
-- (id)execute:(PKSActionBlock)block;
+- (void)execute:(PKSActionBlock)block;
 
 // delegate callbacks
 - (void)fireDelegateSelector:(SEL)sel;

diff --git a/res/PGActionTemplate.txt b/res/PGActionTemplate.txt
@@ -1,3 +1,3 @@
-{%for 1 to depth %}    {%/for%}[self execute:(id)^{
+{%for 1 to depth %}    {%/for%}[self execute:^{
 {%for 1 to depth %}    {%/for%}{{actionBody}}
 {%for 1 to depth %}    {%/for%}}];
diff --git a/src/PKParser.m b/src/PKParser.m
@@ -683,13 +683,11 @@ - (BOOL)speculate:(PKSSpeculateBlock)block {
 }
 
 
-- (id)execute:(PKSActionBlock)block {
+- (void)execute:(PKSActionBlock)block {
     NSParameterAssert(block);
-    if (self.isSpeculating || !_enableActions) return nil;
+    if (self.isSpeculating || !_enableActions) return;
 
-    id result = nil;
-    if (block) result = block();
-    return result;
+    if (block) block();
 }
 
 

diff --git a/test/CSSParser.m b/test/CSSParser.m
@@ -281,7 +281,7 @@ - (void)start {
 
 - (void)__stylesheet {
 
-    [self execute:(id)^{
+    [self execute:^{
 
     PKTokenizer *t = self.tokenizer;
 

diff --git a/test/CreateTableStmtParser.m b/test/CreateTableStmtParser.m
@@ -108,7 +108,7 @@ - (void)createTableStmt_ {
     [self existsOpt_]; 
     [self databaseName_]; 
     [self match:CREATETABLESTMT_TOKEN_KIND_SEMI_COLON discard:YES]; 
-    [self execute:(id)^{
+    [self execute:^{
 
 	// NSString *dbName = POP();
 	// BOOL ifNotExists = POP_BOOL();
@@ -125,7 +125,7 @@ - (void)createTableStmt_ {
 - (void)databaseName_ {
 
     [self matchQuotedString:NO]; 
-    [self execute:(id)^{
+    [self execute:^{
 
 	// pop the string value of the `PKToken` on the top of the stack
 	NSString *dbName = POP_STR();
@@ -149,12 +149,12 @@ - (void)tempOpt_ {
         } else {
             [self raise:@"No viable alternative found in rule 'tempOpt'."];
         }
-        [self execute:(id)^{
+        [self execute:^{
          PUSH(@YES); 
         }];
     } else {
         [self matchEmpty:NO]; 
-        [self execute:(id)^{
+        [self execute:^{
          PUSH(@NO); 
         }];
     }
@@ -168,12 +168,12 @@ - (void)existsOpt_ {
         [self match:CREATETABLESTMT_TOKEN_KIND_IF discard:YES]; 
         [self match:CREATETABLESTMT_TOKEN_KIND_NOT_UPPER discard:YES]; 
         [self match:CREATETABLESTMT_TOKEN_KIND_EXISTS discard:YES]; 
-        [self execute:(id)^{
+        [self execute:^{
          PUSH(@YES); 
         }];
     } else {
         [self matchEmpty:NO]; 
-        [self execute:(id)^{
+        [self execute:^{
          PUSH(@NO); 
         }];
     }

diff --git a/test/CrockfordParser.m b/test/CrockfordParser.m
@@ -188,7 +188,7 @@ - (void)start {
 
 - (void)program_ {
 
-    [self execute:(id)^{
+    [self execute:^{
 
         PKTokenizer *t = self.tokenizer;
 

diff --git a/test/CurlyActionParser.m b/test/CurlyActionParser.m
@@ -89,7 +89,7 @@ - (void)start_ {
     do {
         [self matchWord:NO]; 
     } while ([self predicts:TOKEN_KIND_BUILTIN_WORD, 0]);
-    [self execute:(id)^{
+    [self execute:^{
 
     id word = nil;
     while (!EMPTY()) {

diff --git a/test/DelimitedParser.m b/test/DelimitedParser.m
@@ -99,7 +99,7 @@ - (void)start {
 
 - (void)__start {
 
-    [self execute:(id)^{
+    [self execute:^{
 
     PKTokenizer *t = self.tokenizer;
 

diff --git a/test/ExpressionActionsParser.m b/test/ExpressionActionsParser.m
@@ -189,7 +189,7 @@ - (void)start {
 
 - (void)__expr {
 
-    [self execute:(id)^{
+    [self execute:^{
 
     PKTokenizer *t = self.tokenizer;
     [t.symbolState add:@"!="];
@@ -224,7 +224,7 @@ - (void)__orTerm {
 
     [self match:EXPRESSIONACTIONS_TOKEN_KIND_OR discard:YES]; 
     [self andExpr_]; 
-    [self execute:(id)^{
+    [self execute:^{
 
 	BOOL rhs = POP_BOOL();
 	BOOL lhs = POP_BOOL();
@@ -257,7 +257,7 @@ - (void)__andTerm {
 
     [self match:EXPRESSIONACTIONS_TOKEN_KIND_AND discard:YES]; 
     [self relExpr_]; 
-    [self execute:(id)^{
+    [self execute:^{
 
 	BOOL rhs = POP_BOOL();
 	BOOL lhs = POP_BOOL();
@@ -315,7 +315,7 @@ - (void)__relOpTerm {
 
     [self relOp_]; 
     [self callExpr_]; 
-    [self execute:(id)^{
+    [self execute:^{
 
 	NSInteger rhs = POP_INT();
 	NSString  *op = POP_STR();
@@ -448,17 +448,17 @@ - (void)__literal {
     if ([self predicts:EXPRESSIONACTIONS_TOKEN_KIND_NO, EXPRESSIONACTIONS_TOKEN_KIND_NO_UPPER, EXPRESSIONACTIONS_TOKEN_KIND_YES, EXPRESSIONACTIONS_TOKEN_KIND_YES_UPPER, 0]) {
         [self testAndThrow:(id)^{ return LA(1) != EXPRESSIONACTIONS_TOKEN_KIND_YES_UPPER; }]; 
         [self bool_]; 
-        [self execute:(id)^{
+        [self execute:^{
          PUSH_BOOL(EQ_IGNORE_CASE(POP_STR(), @"yes")); 
         }];
     } else if ([self predicts:TOKEN_KIND_BUILTIN_NUMBER, 0]) {
         [self matchNumber:NO]; 
-        [self execute:(id)^{
+        [self execute:^{
          PUSH_DOUBLE(POP_DOUBLE()); 
         }];
     } else if ([self predicts:TOKEN_KIND_BUILTIN_QUOTEDSTRING, 0]) {
         [self matchQuotedString:NO]; 
-        [self execute:(id)^{
+        [self execute:^{
          PUSH(POP_STR()); 
         }];
     } else {

diff --git a/test/ExpressionParser.m b/test/ExpressionParser.m
@@ -237,7 +237,7 @@ - (void)start {
 
 - (void)__expr {
 
-    [self execute:(id)^{
+    [self execute:^{
 
     PKTokenizer *t = self.tokenizer;
     [t.symbolState add:@"!="];

diff --git a/test/GrammarActionsParser.m b/test/GrammarActionsParser.m
@@ -97,7 +97,7 @@ - (void)start {
 
 - (void)start_ {
 
-    [self execute:(id)^{
+    [self execute:^{
 
     NSAssert([self.foo isEqualToString:@"hello world"], @"");
     NSAssert([_foo isEqualToString:@"hello world"], @"");

diff --git a/test/HTMLParser.m b/test/HTMLParser.m
@@ -217,7 +217,7 @@ - (void)start {
 
 - (void)__start {
 
-    [self execute:(id)^{
+    [self execute:^{
 
     PKTokenizer *t = self.tokenizer;
 

diff --git a/test/JSONParser.m b/test/JSONParser.m
@@ -104,7 +104,7 @@ - (void)start {
 
 - (void)start_ {
 
-    [self execute:(id)^{
+    [self execute:^{
 
 	PKTokenizer *t = self.tokenizer;
 

diff --git a/test/JavaScriptParser.m b/test/JavaScriptParser.m
@@ -230,7 +230,7 @@ - (void)start {
 
 - (void)program_ {
 
-    [self execute:(id)^{
+    [self execute:^{
 
         PKTokenizer *t = self.tokenizer;
 

diff --git a/test/JavaScriptWhitespaceParser.m b/test/JavaScriptWhitespaceParser.m
@@ -210,7 +210,7 @@ - (void)start {
 
 - (void)program_ {
 
-    [self execute:(id)^{
+    [self execute:^{
 
         PKTokenizer *t = self.tokenizer;
 

diff --git a/test/MiniMath2Parser.m b/test/MiniMath2Parser.m
@@ -104,7 +104,7 @@ - (void)addExpr_ {
     while ([self speculate:^{ [self match:MINIMATH2_TOKEN_KIND_PLUS discard:YES]; [self multExpr_]; }]) {
         [self match:MINIMATH2_TOKEN_KIND_PLUS discard:YES]; 
         [self multExpr_]; 
-        [self execute:(id)^{
+        [self execute:^{
 
     PUSH_DOUBLE(POP_DOUBLE() + POP_DOUBLE());
 
@@ -119,7 +119,7 @@ - (void)multExpr_ {
     while ([self speculate:^{ [self match:MINIMATH2_TOKEN_KIND_STAR discard:YES]; [self primary_]; }]) {
         [self match:MINIMATH2_TOKEN_KIND_STAR discard:YES]; 
         [self primary_]; 
-        [self execute:(id)^{
+        [self execute:^{
 
     PUSH_DOUBLE(POP_DOUBLE() * POP_DOUBLE());
 
@@ -145,7 +145,7 @@ - (void)primary_ {
 - (void)atom_ {
 
     [self matchNumber:NO]; 
-    [self execute:(id)^{
+    [self execute:^{
 
     PUSH_DOUBLE(POP_DOUBLE()); 
 

diff --git a/test/MiniMathParser.m b/test/MiniMathParser.m
@@ -115,7 +115,7 @@ - (void)__expr {
     while ([self speculate:^{ [self match:MINIMATH_TOKEN_KIND_PLUS discard:YES]; [self mult_]; }]) {
         [self match:MINIMATH_TOKEN_KIND_PLUS discard:YES]; 
         [self mult_]; 
-        [self execute:(id)^{
+        [self execute:^{
          PUSH_DOUBLE(POP_DOUBLE()+POP_DOUBLE()); 
         }];
     }
@@ -133,7 +133,7 @@ - (void)__mult {
     while ([self speculate:^{ [self match:MINIMATH_TOKEN_KIND_STAR discard:YES]; [self pow_]; }]) {
         [self match:MINIMATH_TOKEN_KIND_STAR discard:YES]; 
         [self pow_]; 
-        [self execute:(id)^{
+        [self execute:^{
          PUSH_DOUBLE(POP_DOUBLE()*POP_DOUBLE()); 
         }];
     }
@@ -151,7 +151,7 @@ - (void)__pow {
     if ([self speculate:^{ [self match:MINIMATH_TOKEN_KIND_CARET discard:YES]; [self pow_]; }]) {
         [self match:MINIMATH_TOKEN_KIND_CARET discard:YES]; 
         [self pow_]; 
-        [self execute:(id)^{
+        [self execute:^{
 
 		double exp = POP_DOUBLE();
 		double base = POP_DOUBLE();
@@ -173,7 +173,7 @@ - (void)pow_ {
 - (void)__atom {
 
     [self matchNumber:NO]; 
-    [self execute:(id)^{
+    [self execute:^{
     PUSH_DOUBLE(POP_DOUBLE());
     }];
 

diff --git a/test/NamedActionParser.m b/test/NamedActionParser.m
@@ -117,11 +117,11 @@ - (void)start_ {
 
 - (void)__a {
 
-    [self execute:(id)^{
+    [self execute:^{
     PUSH(@"foo");
     }];
     [self match:NAMEDACTION_TOKEN_KIND_A discard:NO]; 
-    [self execute:(id)^{
+    [self execute:^{
     PUSH(@"bar");
     }];
 

diff --git a/test/TDNSPredicateParser.m b/test/TDNSPredicateParser.m
@@ -401,7 +401,7 @@ - (void)start {
 
 - (void)__start {
 
-    [self execute:(id)^{
+    [self execute:^{
 
 	PKTokenizer *t = self.tokenizer;
 	[t setTokenizerState:t.wordState from:'#' to:'#'];

diff --git a/test/TableIndexParser.m b/test/TableIndexParser.m
@@ -96,7 +96,7 @@ - (void)qualifiedTableName_ {
 
     [self name_]; 
     [self indexOpt_]; 
-    [self execute:(id)^{
+    [self execute:^{
 
     // now stack contains 3 `NSString`s. 
     // ["mydb", "mytable", "foo"]
@@ -138,7 +138,7 @@ - (void)name_ {
         [self match:TABLEINDEX_TOKEN_KIND_DOT discard:YES]; 
     }
     [self tableName_]; 
-    [self execute:(id)^{
+    [self execute:^{
 
     // now stack contains 2 `PKToken`s of type Word
     // [<Word «mydb»>, <Word «mytable»>]
@@ -159,7 +159,7 @@ - (void)indexOpt_ {
         [self index_]; 
     } else {
         [self matchEmpty:NO]; 
-        [self execute:(id)^{
+        [self execute:^{
          PUSH(@""); 
         }];
     }
@@ -173,7 +173,7 @@ - (void)index_ {
         [self match:TABLEINDEX_TOKEN_KIND_INDEXED discard:YES]; 
         [self match:TABLEINDEX_TOKEN_KIND_BY discard:YES]; 
         [self indexName_]; 
-        [self execute:(id)^{
+        [self execute:^{
 
         // now top of stack will be a Quoted String `PKToken`
         // […, <Quoted String «"foo"»>]
@@ -188,7 +188,7 @@ - (void)index_ {
     } else if ([self predicts:TABLEINDEX_TOKEN_KIND_NOT_UPPER, 0]) {
         [self match:TABLEINDEX_TOKEN_KIND_NOT_UPPER discard:YES]; 
         [self match:TABLEINDEX_TOKEN_KIND_INDEXED discard:YES]; 
-        [self execute:(id)^{
+        [self execute:^{
          PUSH(@""); 
         }];
     } else {