Razor files fixed for objective-c (parser was outdated, so not regene…

…rated)
cucumber · May 19, 2021 · f6a18ce · f6a18ce
1 parent ab09086
commit f6a18ce
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/objective-c/gherkin-objective-c-header.razor b/objective-c/gherkin-objective-c-header.razor
@@ -13,15 +13,15 @@ typedef enum    GHTokenType
 {
     GHTokenTypeNone,
     @foreach(var rule in Model.RuleSet.TokenRules)
-    {<text>        GHTokenType@(rule.Name.Replace("#", "")),
+    {<text>        GHTokenType</text>@rule.Name.Replace("#", "")<text>,
     </text>}
 }               GHTokenType;
 
 typedef enum    GHRuleType
 {
     GHRuleTypeNone,
     @foreach(var rule in Model.RuleSet.Where(r => !r.TempRule))
-    {<text>        GHRuleType@(rule.Name.Replace("#", "_")), // @rule.ToString(true)
+    {<text>        GHRuleType</text>@rule.Name.Replace("#", "_")<text>, // @rule.ToString(true)
     </text>}
 }               GHRuleType;
 
@@ -48,7 +48,8 @@ typedef enum    GHRuleType
 
 @foreach(var rule in Model.RuleSet.TokenRules)
 {
-@:- (BOOL)match@(rule.Name.Replace("#", ""))WithToken:(GHToken *)theToken;
+<text>- (BOOL)match</text>@rule.Name.Replace("#", "")<text>WithToken:(GHToken *)theToken;
+</text>
 }
 - (void)reset;
 
@@ -67,7 +68,7 @@ typedef enum    GHRuleType
 
 @@end
 
-@@interface GH@(Model.ParserClassName) : NSObject
+@@interface @{ Write("GH"); }@Model.ParserClassName : NSObject
 
 @@property (nonatomic, assign) BOOL  stopAtFirstError;
 

diff --git a/objective-c/gherkin-objective-c-implementation.razor b/objective-c/gherkin-objective-c-implementation.razor
@@ -117,12 +117,12 @@
         @@throw [[GHCompositeParserException alloc] initWithErrors: [theContext errors]];
 }
 
-- (void)handleAstErrorWithContext:(GHParserContext *)theContext actionBlock:(void (^)())theActionBlock
+- (void)handleAstErrorWithContext:(GHParserContext *)theContext actionBlock:(void (^)(void))theActionBlock
 {
     [self handleExternalErrorWithContext: theContext actionBlock: ^() { theActionBlock(); return YES; } defaultValue: NO];
 }
 
-- (BOOL)handleExternalErrorWithContext:(GHParserContext *)theContext actionBlock:(BOOL (^)())theActionBlock defaultValue:(BOOL)theDefaultValue
+- (BOOL)handleExternalErrorWithContext:(GHParserContext *)theContext actionBlock:(BOOL (^)(void))theActionBlock defaultValue:(BOOL)theDefaultValue
 {
     if (stopAtFirstError)
     {
@@ -149,17 +149,17 @@
 
 - (void)buildWithContext:(GHParserContext *)theContext token:(GHToken *)theToken
 {
-    [self handleAstErrorWithContext: theContext actionBlock: ^() { [astBuilder buildWithToken: theToken]; }];
+    [self handleAstErrorWithContext: theContext actionBlock: ^() { [self->astBuilder buildWithToken: theToken]; }];
 }
 
 - (void)startRuleWithContext:(GHParserContext *)theContext ruleType:(GHRuleType)theRuleType
 {
-    [self handleAstErrorWithContext: theContext actionBlock: ^() { [astBuilder startRuleWithType: theRuleType]; }];
+    [self handleAstErrorWithContext: theContext actionBlock: ^() { [self->astBuilder startRuleWithType: theRuleType]; }];
 }
 
 - (void)endRuleWithContext:(GHParserContext *)theContext ruleType:(GHRuleType)theRuleType
 {
-    [self handleAstErrorWithContext: theContext actionBlock: ^() { [astBuilder endRuleWithType: theRuleType]; }];
+    [self handleAstErrorWithContext: theContext actionBlock: ^() { [self->astBuilder endRuleWithType: theRuleType]; }];
 }
 
 - (id)resultWithContext:(GHParserContext *)theContext