added parsing for RECURSIVE TYPE and TYPE RECURSIVE; improved fixed-form relexing

3 files changed, 28 insertions, 1 deletions

diff --git a/test/Parser/assignedGoto.f95 b/test/Parser/assignedGoto.f95
index a2ca1d9664..0ae6c66006 100644
--- a/test/Parser/assignedGoto.f95
+++ b/test/Parser/assignedGoto.f95
@@ -9,7 +9,7 @@ PROGRAM gototest
     ASSIGN 10 TO DEST
 
     ASSIGN TO DEST ! expected-error {{expected statement label after 'ASSIGN'}}
-    ASSIGN 10 DEST ! expected-error {{expected 'TO'}}
+    ASSIGN 10 DEST ! expected-error {{expected 'to'}}
     ASSIGN 10 TO 2 ! expected-error {{expected identifier}}
 
     GO TO DEST
diff --git a/test/Parser/recursive.f b/test/Parser/recursive.f
index 0f6f648e25..7e488388e2 100644
--- a/test/Parser/recursive.f
+++ b/test/Parser/recursive.f
@@ -4,3 +4,19 @@ C RUN: %flang -fsyntax-only %s
        END
        RECU RSIV E FUNCTIO N F OO()
        END
+
+       RECU RSIVE INTE GER FU NCTION FUNC()
+         FUNC = 1
+       END
+
+       INTEGER RECURS IVE FU NCTION FUNC2()
+         FUNC2 = 2
+       END
+
+       INTEGER(8) RECURS IVE FU NCTION FUNC3()
+         FUNC3 = 2
+       END
+
+       RECU RSIVE INTE GER (2) FU NCTION FUNC4()
+         FUNC4 = 1
+       END
diff --git a/test/Parser/recursive.f95 b/test/Parser/recursive.f95
index 02dc821990..864ae1d3fb 100644
--- a/test/Parser/recursive.f95
+++ b/test/Parser/recursive.f95
@@ -6,5 +6,16 @@ END
 RECURSIVE FUNCTION FOO()
 END
 
+RECURSIVE INTEGER FUNCTION FUNC()
+  FUNC = 1
+END
+
+INTEGER RECURSIVE FUNCTION FUNC2()
+  FUNC2 = 2
+END
+
+RECURSIVE INTEGER RECURSIVE FUNCTION M() ! expected-error {{expected 'function'}}
+END
+
 RECURSIVE PROGRAM main ! expected-error {{expected 'function' or 'subroutine' after 'recursive'}}
 END