begin defining main exposed parsers

Author: raehik

src/Language/Fortran/Parser.hs

@@ -21,34 +21,55 @@ import qualified Language.Fortran.Parser.Free.Fortran95   as F95
 import qualified Language.Fortran.Parser.Free.Fortran2003 as F2003
 import qualified Language.Fortran.Parser.Fixed.Lexer as Fixed
 import qualified Language.Fortran.Parser.Free.Lexer  as Free
+import Language.Fortran.Version
+import Language.Fortran.Util.Position
 
 import qualified Data.ByteString.Char8 as B
 
 -- | Our common Fortran parser type takes a filename and input, and returns
 --   either a normalized error (tokens are printed) or an untransformed
 --   'ProgramFile'.
-type Parser = String -> B.ByteString -> Either ParseErrorSimple (ProgramFile A0)
-
-{-
-
-f66ProgramFile :: Parser
-f66ProgramFile fn bs = fromParseResult . (F66.programParser :: _)
-
---fpr = fromParseResult
-
-initParseState :: B.ByteString -> FortranVersion -> String -> ParseState AlexInput
-initParseState srcBytes fortranVersion filename =
-  _vanillaParseState { psAlexInput = _vanillaAlexInput }
-  where
-    _vanillaParseState = ParseState
-      { psAlexInput = undefined
-      , psVersion = fortranVersion
-      , psFilename = filename
-      , psParanthesesCount = ParanthesesCount 0 False
-      , psContext = [ ConStart ] }
-    _vanillaAlexInput = vanillaAlexInput
-      { aiSourceBytes = srcBytes
-      , aiEndOffset   = B.length srcBytes
-      , aiPosition    = initPosition {filePath = filename} }
+type Parser a = String -> B.ByteString -> Either ParseErrorSimple a
+type StateInit s = String -> FortranVersion -> B.ByteString -> ParseState s
 
--}
+f66ProgramFile :: Parser (ProgramFile A0)
+f66ProgramFile = makeParserFixed F66.programParser Fortran66
+
+f66Statement :: Parser (Statement A0)
+f66Statement = makeParserFixed F66.statementParser Fortran66
+
+makeParser
+    :: (Loc s, LastToken s a, Show a)
+    => StateInit s -> Parse s a b -> FortranVersion -> Parser b
+makeParser fInitState p fv fn bs = fromParseResult $ runParse p $ fInitState fn fv bs
+
+makeParserFixed
+    :: Parse Fixed.AlexInput Fixed.Token b -> FortranVersion -> Parser b
+makeParserFixed = makeParser initParseStateFixed
+
+makeParserFree
+    :: Parse Free.AlexInput Free.Token b -> FortranVersion -> Parser b
+makeParserFree = makeParser initParseStateFree
+
+initParseStateFixed :: StateInit Fixed.AlexInput
+initParseStateFixed fn fv bs = initParseStatePartial
+  { psAlexInput = Fixed.vanillaAlexInput fn fv bs
+  , psVersion = fv
+  , psFilename = fn }
+
+initParseStateFree :: StateInit Free.AlexInput
+initParseStateFree fn fv bs = initParseStatePartial
+  { psAlexInput = Free.vanillaAlexInput fn bs
+  , psVersion = fv
+  , psFilename = fn }
+
+--------------------------------------------------------------------------------
+
+-- | Helper for preparing initial parser state for the different lexers.
+initParseStatePartial :: ParseState a
+initParseStatePartial = ParseState
+  { psAlexInput = undefined
+  , psVersion = undefined
+  , psFilename = undefined
+  , psParanthesesCount = ParanthesesCount 0 False
+  , psContext = [ ConStart ] }

src/Language/Fortran/Parser/Fixed/Lexer.x

@@ -887,8 +887,8 @@ instance LastToken AlexInput Token where
 
 type LexAction a = Parse AlexInput Token a
 
-vanillaAlexInput :: B.ByteString -> FortranVersion -> String -> AlexInput
-vanillaAlexInput bs fv fn = AlexInput
+vanillaAlexInput :: String -> FortranVersion -> B.ByteString -> AlexInput
+vanillaAlexInput fn fv bs = AlexInput
   { aiSourceBytes = bs
   , aiEndOffset = B.length bs
   , aiPosition = initPosition { filePath = fn }

src/Language/Fortran/Parser/Free/Lexer.x

@@ -10,7 +10,7 @@
 {-# LANGUAGE DeriveGeneric #-}
 
 module Language.Fortran.Parser.Free.Lexer
-  ( lexer
+  ( lexer, Token(..), vanillaAlexInput, AlexInput, LexAction
   ) where
 
 import Prelude hiding (span)
@@ -888,8 +888,8 @@ instance LastToken AlexInput Token where
 
 type LexAction a = Parse AlexInput Token a
 
-vanillaAlexInput :: B.ByteString -> FortranVersion -> String -> AlexInput
-vanillaAlexInput bs fv fn = AlexInput
+vanillaAlexInput :: String -> B.ByteString -> AlexInput
+vanillaAlexInput fn bs = AlexInput
   { aiSourceBytes          = bs
   , aiPosition             = initPosition { filePath = fn }
   , aiEndOffset            = B.length bs