add a handful of record selectors

Author: raehik

src/Language/Fortran/AST.hs

@@ -197,8 +197,10 @@ data MetaInfo = MetaInfo { miVersion :: FortranVersion, miFilename :: String }
   deriving (Eq, Show, Data, Typeable, Generic)
 
 -- Program structure definition
-data ProgramFile a = ProgramFile MetaInfo [ ProgramUnit a ]
-  deriving (Eq, Show, Data, Typeable, Generic, Functor)
+data ProgramFile a = ProgramFile
+  { programFileMeta :: MetaInfo
+  , programFileProgramUnits :: [ ProgramUnit a ]
+  } deriving (Eq, Show, Data, Typeable, Generic, Functor)
 
 pfSetFilename :: String -> ProgramFile a -> ProgramFile a
 pfSetFilename fn (ProgramFile mi pus) = ProgramFile (mi { miFilename = fn }) pus

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

@@ -888,7 +888,7 @@ vanillaAlexInput :: String -> FortranVersion -> B.ByteString -> AlexInput
 vanillaAlexInput fn fv bs = AlexInput
   { aiSourceBytes = bs
   , aiEndOffset = B.length bs
-  , aiPosition = initPosition { filePath = fn }
+  , aiPosition = initPosition { posFilePath = fn }
   , aiBytes = []
   , aiPreviousChar = '\n'
   , aiLexeme = initLexeme

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

@@ -893,7 +893,7 @@ type LexAction a = Parse AlexInput Token a
 vanillaAlexInput :: String -> B.ByteString -> AlexInput
 vanillaAlexInput fn bs = AlexInput
   { aiSourceBytes          = bs
-  , aiPosition             = initPosition { filePath = fn }
+  , aiPosition             = initPosition { posFilePath = fn }
   , aiEndOffset            = B.length bs
   , aiPreviousChar         = '\n'
   , aiLexeme               = initLexeme

src/Language/Fortran/Util/Position.hs

@@ -17,7 +17,7 @@ data Position = Position
   { posAbsoluteOffset   :: Int
   , posColumn           :: Int
   , posLine             :: Int
-  , filePath            :: String
+  , posFilePath         :: String
   , posPragmaOffset     :: Maybe (Int, String)  -- ^ line-offset and filename as given by a pragma.
   } deriving (Eq, Ord, Data, Typeable, Generic)
 
@@ -32,7 +32,7 @@ initPosition = Position
   { posAbsoluteOffset = 0
   , posColumn = 1
   , posLine = 1
-  , filePath = ""
+  , posFilePath = ""
   , posPragmaOffset = Nothing
   }
 
@@ -47,9 +47,12 @@ apparentLineCol (Position _ c l _ _)             = (l, c)
 -- | Path of file taking into account any specified line pragmas.
 apparentFilePath :: Position -> String
 apparentFilePath p | Just (_, f) <- posPragmaOffset p = f
-                   | otherwise                        = filePath p
+                   | otherwise                        = posFilePath p
 
-data SrcSpan = SrcSpan Position Position deriving (Eq, Ord, Typeable, Data, Generic)
+data SrcSpan = SrcSpan
+  { ssFrom :: Position
+  , ssTo   :: Position
+  } deriving (Eq, Ord, Typeable, Data, Generic)
 
 instance Binary SrcSpan
 instance NFData SrcSpan