Do Continue early

Author: mpkorstanje

python/gherkin-python.razor

@@ -206,19 +206,22 @@ class @(Model.ParserClassName):
             token = self.read_token(context)
             token.detach()
             queue.append(token)
-
-            if @foreach(var tokenType in lookAheadHint.ExpectedTokens) {<text>self.@MatchToken(tokenType)</text>}:
+            @foreach(var tokenType in lookAheadHint.ExpectedTokens) {
+            <text>
+            if self.@MatchToken(tokenType):
                 match = True
-                break
-
-            if not any(
-                (@foreach(var tokenType in lookAheadHint.Skip) {
-                        <text>
-                    self.@MatchToken(tokenType),</text>}
+                break</text>
+            }
 
-                )
-            ):
-                break
+            @foreach(var tokenType in lookAheadHint.Skip) {
+            <text>
+            if self.@MatchToken(tokenType):
+                continue</text>
+            }
+            @if(lookAheadHint.Skip.Length == 0) {
+            <text>
+            break</text>
+            }
 
         context.token_queue.extend(queue)
 

python/gherkin/parser.py

@@ -3350,15 +3350,12 @@ def lookahead_0(self, context: ParserContext, currentToken: Token) -> bool:
                 match = True
                 break
 
-            if not any(
-                (
-                    self.match_Empty(context, token),
-                    self.match_Comment(context, token),
-                    self.match_TagLine(context, token),
-                )
-            ):
-                break
-
+            if self.match_Empty(context, token):
+                continue
+            if self.match_Comment(context, token):
+                continue
+            if self.match_TagLine(context, token):
+                continue
         context.token_queue.extend(queue)
 
         return match
@@ -3377,15 +3374,12 @@ def lookahead_1(self, context: ParserContext, currentToken: Token) -> bool:
                 match = True
                 break
 
-            if not any(
-                (
-                    self.match_Empty(context, token),
-                    self.match_Comment(context, token),
-                    self.match_TagLine(context, token),
-                )
-            ):
-                break
-
+            if self.match_Empty(context, token):
+                continue
+            if self.match_Comment(context, token):
+                continue
+            if self.match_TagLine(context, token):
+                continue
         context.token_queue.extend(queue)
 
         return match