Changes to try and improve the performance of the fixed to free conversion.

Author: rasmussn

fortran/syntax/FixedForm.rtg

@@ -1,38 +1,66 @@
+
 regular tree grammar
   start File
   productions
-    ListStarOfLine0 -> ListPlusOfLine0
-    ListStarOfLine0 -> <nil>()
-    ListStarOfLine0 -> <conc>(ListStarOfLine0,ListStarOfLine0)
-    ListPlusOfLine0 -> <conc>(ListStarOfLine0,ListPlusOfLine0)
-    ListPlusOfLine0 -> <conc>(ListPlusOfLine0,ListStarOfLine0)
-    ListPlusOfLine0 -> <conc>(ListPlusOfLine0,ListPlusOfLine0)
-    ListPlusOfLine0 -> <cons>(Line,ListStarOfLine0)
-    OptWS           -> no-ws()
-    OptWS           -> ws(WS)
-    StartChar       -> stchar(STARTCHAR)
-    PreChar         -> prechar(PRECHAR)
-    ContChar        -> conchar(CONTCHAR)
-    CommentChar     -> comchar(COMMENTCHAR)
-    BangChar        -> comchar(BANGCHAR)
-    Eol             -> eol(EOL)
-    Line            -> Continuation(START,ContChar,CHARS,Eol)
-    Line            -> LabeledStmt(LABEL,StartChar,CHARS,Eol)
-    Line            -> Stmt(START,StartChar,CHARS,Eol)
-    Line            -> FreeFormComment(WS,BangChar,CHARS,Eol)
-    Line            -> Comment(CommentChar,CHARS,Eol)
-    Line            -> Preprocess(PreChar,CHARS,Eol)
-    Line            -> BlankLine(OptWS,Eol)
-    File            -> File(ListStarOfLine0)
-    LABEL           -> <string>
-    START           -> <string>
-    CONTCHAR        -> <string>
-    STARTCHAR       -> <string>
-    COMMENTCHAR     -> <string>
-    PRECHAR         -> <string>
-    BANGCHAR        -> <string>
-    CHARS           -> <string>
-    LETTER          -> <string>
-    DIGIT           -> <string>
-    WS              -> <string>
-    EOL             -> <string>
+    ListStarOfFollowLine0     -> ListPlusOfFollowLine0
+    ListStarOfFollowLine0     -> <nil>()
+    ListStarOfFollowLine0     -> <conc>(ListStarOfFollowLine0,ListStarOfFollowLine0)
+    ListPlusOfFollowLine0     -> <conc>(ListStarOfFollowLine0,ListPlusOfFollowLine0)
+    ListPlusOfFollowLine0     -> <conc>(ListPlusOfFollowLine0,ListStarOfFollowLine0)
+    ListPlusOfFollowLine0     -> <conc>(ListPlusOfFollowLine0,ListPlusOfFollowLine0)
+    ListPlusOfFollowLine0     -> <cons>(FollowLine,ListStarOfFollowLine0)
+    ListStarOfStmtBlock0      -> ListPlusOfStmtBlock0
+    ListStarOfStmtBlock0      -> <nil>()
+    ListStarOfStmtBlock0      -> <conc>(ListStarOfStmtBlock0,ListStarOfStmtBlock0)
+    ListPlusOfStmtBlock0      -> <conc>(ListStarOfStmtBlock0,ListPlusOfStmtBlock0)
+    ListPlusOfStmtBlock0      -> <conc>(ListPlusOfStmtBlock0,ListStarOfStmtBlock0)
+    ListPlusOfStmtBlock0      -> <conc>(ListPlusOfStmtBlock0,ListPlusOfStmtBlock0)
+    ListPlusOfStmtBlock0      -> <cons>(StmtBlock,ListStarOfStmtBlock0)
+    ListStarOfInitialComment0 -> ListPlusOfInitialComment0
+    ListStarOfInitialComment0 -> <nil>()
+    ListStarOfInitialComment0 -> <conc>(ListStarOfInitialComment0,ListStarOfInitialComment0)
+    ListPlusOfInitialComment0 -> <conc>(ListStarOfInitialComment0,ListPlusOfInitialComment0)
+    ListPlusOfInitialComment0 -> <conc>(ListPlusOfInitialComment0,ListStarOfInitialComment0)
+    ListPlusOfInitialComment0 -> <conc>(ListPlusOfInitialComment0,ListPlusOfInitialComment0)
+    ListPlusOfInitialComment0 -> <cons>(InitialComment,ListStarOfInitialComment0)
+    OptWS                     -> no-ws()
+    OptWS                     -> ws(WS)
+    NoChar                    -> no-char()
+    StartChar                 -> stchar(STARTCHAR)
+    PreChar                   -> prechar(PRECHAR)
+    ContChar                  -> conchar(CONTCHAR)
+    CommentChar               -> comchar(COMMENTCHAR)
+    BangChar                  -> comchar(BANGCHAR)
+    Eol                       -> eol(EOL)
+    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)
+    Continuation              -> Continuation(START,ContChar,CHARS,Eol)
+    CommentLine               -> FreeFormComment(WS,BangChar,CHARS,Eol)
+    CommentLine               -> Comment(CommentChar,CHARS,Eol)
+    BlankLine                 -> BlankLine(OptWS,Eol)
+    PreprocessLine            -> Preprocess(PreChar,CHARS,Eol)
+    FollowLine                -> PreprocessLine
+    FollowLine                -> Continuation
+    FollowLine                -> CommentLine
+    FollowLine                -> BlankLine
+    InitialComment            -> PreprocessLine
+    InitialComment            -> CommentLine
+    InitialComment            -> BlankLine
+    File                      -> File(ListStarOfInitialComment0,ListStarOfStmtBlock0)
+    LABELTAB                  -> <string>
+    LABEL                     -> <string>
+    START                     -> <string>
+    TABSTART                  -> <string>
+    CONTCHAR                  -> <string>
+    STARTCHAR                 -> <string>
+    COMMENTCHAR               -> <string>
+    PRECHAR                   -> <string>
+    BANGCHAR                  -> <string>
+    CHARS                     -> <string>
+    LETTER                    -> <string>
+    DIGIT                     -> <string>
+    WS                        -> <string>
+    EOL                       -> <string>

fortran/syntax/FixedForm.str

@@ -4,22 +4,35 @@ signature
   constructors
     no-ws           : OptWS
     ws              : WS -> OptWS
+    no-char         : NoChar
     stchar          : STARTCHAR -> StartChar
     prechar         : PRECHAR -> PreChar
     conchar         : CONTCHAR -> ContChar
     comchar         : COMMENTCHAR -> CommentChar
     comchar         : BANGCHAR -> BangChar
     eol             : EOL -> Eol
-    Continuation    : START * ContChar * CHARS * Eol -> Line
-    LabeledStmt     : LABEL * StartChar * CHARS * Eol -> Line
-    Stmt            : START * StartChar * CHARS * Eol -> Line
-    FreeFormComment : WS * BangChar * CHARS * Eol -> Line
-    Comment         : CommentChar * CHARS * Eol -> Line
-    Preprocess      : PreChar * CHARS * Eol -> Line
-    BlankLine       : OptWS * Eol -> Line
-    File            : List(Line) -> File
+    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
+    Continuation    : START * ContChar * CHARS * Eol -> Continuation
+    FreeFormComment : WS * BangChar * CHARS * Eol -> CommentLine
+    Comment         : CommentChar * CHARS * Eol -> CommentLine
+    BlankLine       : OptWS * Eol -> BlankLine
+    Preprocess      : PreChar * CHARS * Eol -> PreprocessLine
+                    : PreprocessLine -> FollowLine
+                    : Continuation -> FollowLine
+                    : CommentLine -> FollowLine
+                    : BlankLine -> FollowLine
+                    : PreprocessLine -> InitialComment
+                    : CommentLine -> InitialComment
+                    : BlankLine -> InitialComment
+    File            : List(InitialComment) * List(StmtBlock) -> File
+                    : String -> LABELTAB
                     : String -> LABEL
                     : String -> START
+                    : String -> TABSTART
                     : String -> CONTCHAR
                     : String -> STARTCHAR
                     : String -> COMMENTCHAR