for loop inside of if

mkorpela · mkorpela · commit 8679cb55cc08 · 2020-10-20T16:22:29.000+03:00
diff --git a/atest/testdata/running/if/complex_if.robot b/atest/testdata/running/if/complex_if.robot
@@ -39,7 +39,7 @@ For loop inside if
         FOR  ${var}  IN  1  2  3
             ${value}=   Set Variable  ${var}
         END
-   ELSE IF 'ei tanne'
+   ELSE IF  'ei tanne'
         ${value}=  Set Variable  123
    END
    Should be equal  ${value}  3
diff --git a/src/robot/parsing/lexer/blocklexers.py b/src/robot/parsing/lexer/blocklexers.py
@@ -250,4 +250,4 @@ def input(self, statement):
             self._else_seen = True
 
     def lexer_classes(self):
-        return (IfStatementLexer, ElseIfStatementLexer, ElseLexer, EndLexer, KeywordCallLexer)
+        return (IfStatementLexer, ElseIfStatementLexer, ElseLexer, EndLexer, ForLoopLexer, KeywordCallLexer)
diff --git a/src/robot/running/builder/transformers.py b/src/robot/running/builder/transformers.py
@@ -300,4 +300,11 @@ def visit_Else(self, node):
     def visit_IfBlock(self, node):
         ifblock = IfExpression(node.value, node.lineno, node._header, node._end)
         IfExpressionBuilder(ifblock).build(node)
-        self.ifblock.add_ifblock(ifblock)
+        self.ifblock.add_inner_block(ifblock)
+
+    def visit_ForLoop(self, node):
+        # Header and end used only for deprecation purposes. Remove in RF 3.3!
+        loop = ForLoop(node.variables, node.values, node.flavor, node.lineno,
+                       node._header, node._end)
+        ForLoopBuilder(loop).visit(node)
+        self.ifblock.add_inner_block(loop)
diff --git a/src/robot/running/model.py b/src/robot/running/model.py
@@ -119,8 +119,8 @@ def __init__(self, value, lineno=None, _header='IF', _end='END'):
     def create_keyword(self, name='', args=(), assign=(), lineno=None):
         self.bodies[-1][1].create(name=name, args=args, assign=assign, lineno=lineno)
 
-    def add_ifblock(self, ifblock):
-        self.bodies[-1][1].append(ifblock)
+    def add_inner_block(self, inner_block):
+        self.bodies[-1][1].append(inner_block)
 
     def create_elseif(self, value):
         self.bodies.append((value, Keywords(self.keyword_class, self, None)))
