Do Continue early

Author: mpkorstanje

python/gherkin-python.razor

@@ -202,7 +202,9 @@ class @(Model.ParserClassName):
         token = None
         queue = []
         match = False
-        while True:
+        # Effectively do-while
+        continue_lookahead = True
+        while continue_lookahead:
             token = self.read_token(context)
             token.detach()
             queue.append(token)
@@ -213,15 +215,15 @@ class @(Model.ParserClassName):
                 break</text>
             }
 
+
+            continue_lookahead = False
             @foreach(var tokenType in lookAheadHint.Skip) {
             <text>
             if self.@MatchToken(tokenType):
+                continue_lookahead = True
                 continue</text>
             }
-            @if(lookAheadHint.Skip.Length == 0) {
-            <text>
-            break</text>
-            }
+
 
         context.token_queue.extend(queue)
 

python/gherkin/parser.py

@@ -3341,7 +3341,9 @@ def lookahead_0(self, context: ParserContext, currentToken: Token) -> bool:
         token = None
         queue = []
         match = False
-        while True:
+        # Effectively do-while
+        continue_lookahead = True
+        while continue_lookahead:
             token = self.read_token(context)
             token.detach()
             queue.append(token)
@@ -3350,12 +3352,18 @@ def lookahead_0(self, context: ParserContext, currentToken: Token) -> bool:
                 match = True
                 break
 
+            continue_lookahead = False
+
             if self.match_Empty(context, token):
+                continue_lookahead = True
                 continue
             if self.match_Comment(context, token):
+                continue_lookahead = True
                 continue
             if self.match_TagLine(context, token):
+                continue_lookahead = True
                 continue
+
         context.token_queue.extend(queue)
 
         return match
@@ -3365,7 +3373,9 @@ def lookahead_1(self, context: ParserContext, currentToken: Token) -> bool:
         token = None
         queue = []
         match = False
-        while True:
+        # Effectively do-while
+        continue_lookahead = True
+        while continue_lookahead:
             token = self.read_token(context)
             token.detach()
             queue.append(token)
@@ -3374,12 +3384,18 @@ def lookahead_1(self, context: ParserContext, currentToken: Token) -> bool:
                 match = True
                 break
 
+            continue_lookahead = False
+
             if self.match_Empty(context, token):
+                continue_lookahead = True
                 continue
             if self.match_Comment(context, token):
+                continue_lookahead = True
                 continue
             if self.match_TagLine(context, token):
+                continue_lookahead = True
                 continue
+
         context.token_queue.extend(queue)
 
         return match