parsing error tests and changes

mkorpela · mkorpela · commit 7f2949f06a35 · 2020-10-20T16:22:30.000+03:00
diff --git a/atest/robot/parsing/invalid.robot b/atest/robot/parsing/invalid.robot
@@ -48,6 +48,18 @@ Directory Containing File With Invalid Encoding
     ...    UnicodeDecodeError: .*
     ...    ${PARSING}/invalid_encoding/invalid_encoding.robot
 
+If with else after else
+    Run tests and check parsing error
+    ...    ${PARSING}/if/else_after_else.robot
+    ...    .* Invalid second ELSE detected
+    ...    ${PARSING}/if/else_after_else.robot
+
+If with else if after else
+    Run tests and check parsing error
+    ...    ${PARSING}/if/else_if_after_else.robot
+    ...    .* Invalid ELSE IF detected after ELSE
+    ...    ${PARSING}/if/else_if_after_else.robot
+
 Multisource Containing File With Invalid Encoding
     Run tests and check parsing error
     ...    ${PARSING}/invalid_encoding/invalid_encoding.robot ${PARSING}/invalid_encoding/a_valid_file.robot
diff --git a/atest/testdata/parsing/if/else_after_else.robot b/atest/testdata/parsing/if/else_after_else.robot
@@ -0,0 +1,9 @@
+*** Test Cases ***
+Invalid else after else
+  IF  ${False}
+      Log   something
+  ELSE
+      Log   something
+  ELSE
+      Log   something
+  END
diff --git a/atest/testdata/parsing/if/else_if_after_else.robot b/atest/testdata/parsing/if/else_if_after_else.robot
@@ -0,0 +1,9 @@
+*** Test Cases ***
+Invalid else after else
+  IF  ${False}
+      Log   something
+  ELSE
+      Log   something
+  ELSE IF  ${True}
+      Log   something
+  END
diff --git a/src/robot/parsing/lexer/blocklexers.py b/src/robot/parsing/lexer/blocklexers.py
@@ -252,6 +252,8 @@ def input(self, statement):
             if self._else_seen:
                 raise DataError("line [%s] : Invalid second ELSE detected" % lexer.lineno)
             self._else_seen = True
+        if isinstance(lexer, ElseIfStatementLexer) and self._else_seen:
+            raise DataError("line [%s] : Invalid ELSE IF detected after ELSE" % lexer.lineno)
 
     def lexer_classes(self):
         return (IfStatementLexer, ElseIfStatementLexer, ElseLexer, ForLoopHeaderLexer, EndLexer, KeywordCallLexer)
diff --git a/src/robot/parsing/lexer/statementlexers.py b/src/robot/parsing/lexer/statementlexers.py
@@ -212,6 +212,10 @@ def lex(self):
         self.statement[0].type = Token.ELSE_IF
         self.statement[1].type = Token.ARGUMENT
 
+    @property
+    def lineno(self):
+        return self.statement[0].lineno
+
 
 class ElseLexer(StatementLexer):
 
