Added Text portion to statements in order to disambiguate statements from blank lines.

Author: rasmussn

fortran/syntax/FixedForm.rtg

@@ -32,11 +32,12 @@ regular tree grammar
     CommentChar               -> comchar(COMMENTCHAR)
     BangChar                  -> comchar(BANGCHAR)
     Eol                       -> eol(EOL)
+    Text                      -> CHARS
     StmtBlock                 -> StmtBlock(Stmt,ListStarOfFollowLine0)
-    Stmt                      -> LabeledStmt(LABELTAB,NoChar,CHARS,Eol)
-    Stmt                      -> LabeledStmt(LABEL,StartChar,CHARS,Eol)
-    Stmt                      -> Stmt(TABSTART,NoChar,CHARS,Eol)
-    Stmt                      -> Stmt(START,StartChar,CHARS,Eol)
+    Stmt                      -> LabeledStmt(LABELTAB,NoChar,Text,Eol)
+    Stmt                      -> LabeledStmt(LABEL,StartChar,Text,Eol)
+    Stmt                      -> Stmt(TABSTART,NoChar,Text,Eol)
+    Stmt                      -> Stmt(START,StartChar,Text,Eol)
     Continuation              -> Continuation(START,ContChar,CHARS,Eol)
     CommentLine               -> FreeFormComment(WS,BangChar,CHARS,Eol)
     CommentLine               -> Comment(CommentChar,CHARS,Eol)

fortran/syntax/FixedForm.sdf

@@ -9,7 +9,7 @@ exports
     STARTCHAR CONTCHAR COMMENTCHAR BANGCHAR PRECHAR
     StartChar ContChar CommentChar BangChar PreChar NoChar Eol OptWS
     BlankLine CommentLine Continuation FollowLine PreprocessLine Stmt
-    InitialComment StmtBlock File
+    InitialComment StmtBlock File Text
 
   context-free start-symbols
 
@@ -106,15 +106,19 @@ exports
 
     START  ContChar CHARS   Eol -> Continuation   {cons("Continuation")}
 
-    START StartChar CHARS   Eol -> Stmt           {cons("Stmt")}
-    TABSTART NoChar CHARS   Eol -> Stmt           {cons("Stmt")}
+    START StartChar Text    Eol -> Stmt           {cons("Stmt")}
+    TABSTART NoChar Text    Eol -> Stmt           {cons("Stmt")}
 
-    LABEL StartChar CHARS   Eol -> Stmt           {cons("LabeledStmt")}
-    LABELTAB NoChar CHARS   Eol -> Stmt           {cons("LabeledStmt")}
+    LABEL StartChar Text    Eol -> Stmt           {cons("LabeledStmt")}
+    LABELTAB NoChar Text    Eol -> Stmt           {cons("LabeledStmt")}
 
     Stmt FollowLine*            -> StmtBlock      {cons("StmtBlock")}
 
 
+    CHARS                       -> Text
+    WS                          -> Text        {reject}
+    % empty %                   -> Text        {reject}
+
     EOL                         -> Eol         {cons("eol")}
 
     BANGCHAR                    -> BangChar    {cons("comchar")}

fortran/syntax/FixedForm.str

@@ -11,11 +11,12 @@ signature
     comchar         : COMMENTCHAR -> CommentChar
     comchar         : BANGCHAR -> BangChar
     eol             : EOL -> Eol
+                    : CHARS -> Text
     StmtBlock       : Stmt * List(FollowLine) -> StmtBlock
-    LabeledStmt     : LABELTAB * NoChar * CHARS * Eol -> Stmt
-    LabeledStmt     : LABEL * StartChar * CHARS * Eol -> Stmt
-    Stmt            : TABSTART * NoChar * CHARS * Eol -> Stmt
-    Stmt            : START * StartChar * CHARS * Eol -> Stmt
+    LabeledStmt     : LABELTAB * NoChar * Text * Eol -> Stmt
+    LabeledStmt     : LABEL * StartChar * Text * Eol -> Stmt
+    Stmt            : TABSTART * NoChar * Text * Eol -> Stmt
+    Stmt            : START * StartChar * Text * Eol -> Stmt
     Continuation    : START * ContChar * CHARS * Eol -> Continuation
     FreeFormComment : WS * BangChar * CHARS * Eol -> CommentLine
     Comment         : CommentChar * CHARS * Eol -> CommentLine