redo tests (problem with expr parsers)

Author: raehik

fortran-src.cabal

@@ -201,18 +201,17 @@ test-suite spec
       Language.Fortran.AnalysisSpec
       Language.Fortran.AST.BozSpec
       Language.Fortran.AST.RealLitSpec
-      Language.Fortran.Lexer.FixedFormSpec
-      Language.Fortran.Lexer.FreeFormSpec
-      Language.Fortran.Parser.Fortran2003Spec
-      Language.Fortran.Parser.Fortran2008Spec
-      Language.Fortran.Parser.Fortran66Spec
-      Language.Fortran.Parser.Fortran77.IncludeSpec
-      Language.Fortran.Parser.Fortran77.ParserSpec
-      Language.Fortran.Parser.Fortran90Spec
-      Language.Fortran.Parser.Fortran95Spec
-      Language.Fortran.Parser.FreeFormCommon
-      Language.Fortran.Parser.UtilsSpec
-      Language.Fortran.ParserMonadSpec
+      Language.Fortran.Parser.CommonSpec
+      Language.Fortran.Parser.Fixed.Fortran66Spec
+      Language.Fortran.Parser.Fixed.Fortran77.IncludeSpec
+      Language.Fortran.Parser.Fixed.Fortran77.ParserSpec
+      Language.Fortran.Parser.Fixed.LexerSpec
+      Language.Fortran.Parser.Free.Common
+      Language.Fortran.Parser.Free.Fortran2003Spec
+      Language.Fortran.Parser.Free.Fortran2008Spec
+      Language.Fortran.Parser.Free.Fortran90Spec
+      Language.Fortran.Parser.Free.Fortran95Spec
+      Language.Fortran.Parser.Free.LexerSpec
       Language.Fortran.PrettyPrintSpec
       Language.Fortran.Rewriter.InternalSpec
       Language.Fortran.RewriterSpec

src/Language/Fortran/Parser.hs

@@ -22,8 +22,9 @@ module Language.Fortran.Parser
 
   -- * Various combinators
   , transformAs, defaultTransformation
-  , StateInit, ParserMaker, makeParser, makeParserFixed, makeParserFree
+  , Parser, StateInit, ParserMaker, makeParser, makeParserFixed, makeParserFree
   , initParseStateFixed, initParseStateFree
+  , parseUnsafe
 
   -- * F77 with inlined includes
   -- $f77includes
@@ -180,7 +181,13 @@ initParseStateFree fn fv bs = initParseStatePartial
   , psVersion = fv
   , psFilename = fn }
 
---------------------------------------------------------------------------------
+-- | Convenience wrapper to easily use a parser unsafely (e.g. for tests).
+parseUnsafe :: Parser a -> B.ByteString -> a
+parseUnsafe p bs =
+    case p "<unknown>" bs of
+      Left err -> error $  "Language.Fortran.Parser.parseUnsafe: parse error: "
+                        <> show err
+      Right a -> a
 
 -- | Helper for preparing initial parser state for the different lexers.
 initParseStatePartial :: ParseState a

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

@@ -9,6 +9,7 @@ module Language.Fortran.Parser.Fixed.Lexer
   -- * Exposed internals for testing
   , lexN
   , lexemeMatch
+  , lexer'
   ) where
 
 import Data.Word (Word8)

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

@@ -5,6 +5,9 @@
 
 module Language.Fortran.Parser.Free.Lexer
   ( lexer, Token(..), vanillaAlexInput, AlexInput, LexAction
+
+  -- * Exposed internals for testing
+  , lexer'
   ) where
 
 import Prelude hiding (span)

test/Language/Fortran/Analysis/BBlocksSpec.hs

@@ -2,8 +2,7 @@ module Language.Fortran.Analysis.BBlocksSpec where
 
 import Test.Hspec
 
-import Language.Fortran.Parser.Fortran77
-import Language.Fortran.ParserMonad (fromParseResultUnsafe)
+import qualified Language.Fortran.Parser as Parser
 import Language.Fortran.AST
 import Language.Fortran.Analysis
 import Language.Fortran.Analysis.BBlocks
@@ -15,8 +14,10 @@ import Data.Maybe
 import qualified Data.ByteString.Char8 as B
 
 pParser :: String -> ProgramFile (Analysis ())
-pParser source = rename . analyseBBlocks . analyseRenames . initAnalysis . fromParseResultUnsafe
-               $ extended77Parser (B.pack source) "<unknown>"
+pParser source =
+    case Parser.f77e "<unknown>" (B.pack source) of
+      Left err -> error $ show err
+      Right pf -> rename . analyseBBlocks . analyseRenames . initAnalysis $ pf
 
 spec :: Spec
 spec =

test/Language/Fortran/Analysis/DataFlowSpec.hs

@@ -6,14 +6,13 @@ import TestUtil
 import Test.Hspec.QuickCheck
 import Test.QuickCheck (Positive(..))
 
-import Language.Fortran.Parser.Fortran77
-import qualified Language.Fortran.Parser.Fortran90 as F90
-import Language.Fortran.ParserMonad (fromParseResultUnsafe)
 import Language.Fortran.AST
 import Language.Fortran.Analysis
 import Language.Fortran.Analysis.Renaming
 import Language.Fortran.Analysis.BBlocks
 import Language.Fortran.Analysis.DataFlow
+import qualified Language.Fortran.Parser as Parser
+
 import qualified Data.Map as M
 import qualified Data.Set as S
 import qualified Data.IntMap as IM
@@ -26,24 +25,22 @@ import Data.Generics.Uniplate.Operations
 import qualified Data.ByteString.Char8 as B
 import Control.Arrow ((&&&))
 
-{-# ANN module "HLint: ignore Reduce duplication" #-}
-
 data F77 = F77
 data F90 = F90
 
 class Parser t where
-    parser :: t -> String -> String -> ProgramFile A0
+    parser :: t -> String -> ProgramFile A0
 instance Parser F77 where
-    parser F77 src file = fromParseResultUnsafe $ extended77Parser (B.pack src) file
+    parser F77 = Parser.parseUnsafe Parser.f77e . B.pack
 instance Parser F90 where
-    parser F90 src file = fromParseResultUnsafe $ F90.fortran90Parser (B.pack src) file
+    parser F90 = Parser.parseUnsafe Parser.f90 . B.pack
 
 pParser :: Parser t => t -> String -> ProgramFile (Analysis ())
 pParser version source = rename . analyseBBlocks . analyseRenames . initAnalysis
-                                . resetSrcSpan $ parser version source "<unknown>"
+                                . resetSrcSpan $ parser version source
 
 withParse :: Data a => Parser t => t -> String -> (ProgramFile (Analysis A0) -> a) -> a
-withParse version source f = underRenaming (f . analyseBBlocks) (parser version source "<unknown>")
+withParse version source f = underRenaming (f . analyseBBlocks) (parser version source)
 
 testGraph :: Parser t => t -> String -> String -> BBGr (Analysis A0)
 testGraph version f p = fromJust . M.lookup (Named f) . withParse version p $ genBBlockMap

test/Language/Fortran/Analysis/RenamingSpec.hs

@@ -7,11 +7,10 @@ import Data.Map (elems)
 --import Data.Data (Data)
 import qualified Data.Map as M
 
-import Language.Fortran.ParserMonad
 import Language.Fortran.AST
-import qualified Language.Fortran.Parser.Fortran90 as F90
 import Language.Fortran.Analysis
 import Language.Fortran.Analysis.Renaming
+import qualified Language.Fortran.Parser as Parser
 import Data.Generics.Uniplate.Data
 import qualified Data.ByteString.Char8 as B
 
@@ -34,8 +33,8 @@ countUnrenamed e = length [ () | ExpValue Analysis { uniqueName = Nothing } _ Va
   where uniE_PF :: ProgramFile (Analysis ()) -> [Expression (Analysis ())]
         uniE_PF = universeBi
 
-fortran90Parser :: String -> String -> ProgramFile A0
-fortran90Parser src file = fromParseResultUnsafe $ F90.fortran90Parser (B.pack src) file
+fortran90Parser :: String -> ProgramFile A0
+fortran90Parser = Parser.parseUnsafe Parser.f90 . B.pack
 
 spec :: Spec
 spec = do
@@ -112,7 +111,7 @@ spec = do
 
     -- GitHub issue #190 https://github.com/camfort/fortran-src/issues/190
     it "doesn't generate same unique name in edge case" $ do
-      let ex = resetSrcSpan . flip fortran90Parser "" $ unlines
+      let ex = resetSrcSpan . fortran90Parser $ unlines
                  [ "program p1"
                  , "  implicit none"
                  , "  integer x, int1, a1, a2, a3, a4, a5, a6, a7, a8, a9"
@@ -239,10 +238,10 @@ ex6pu2pu1 :: ProgramUnit ()
 ex6pu2pu1 = PUFunction () u (Just $ TypeSpec () u TypeInteger Nothing) emptyPrefixSuffix "f1" (Just $ AList () u [ varGen "x"]) Nothing [ BlStatement () u Nothing (StExpressionAssign () u (varGen "f1") (ExpFunctionCall () u (ExpValue () u (ValVariable "f1")) (Just $ AList () u [Argument () u Nothing (varGen "x")]))) ] (Just [ex5pu2pu1])
 
 --parseF90 :: [String] -> ProgramFile A0
---parseF90 = resetSrcSpan . flip fortran90Parser "" . unlines
+--parseF90 = resetSrcSpan . fortran90Parser . unlines
 
 ex8 :: ProgramFile A0
-ex8 = resetSrcSpan . flip fortran90Parser "" $ unlines [
+ex8 = resetSrcSpan . fortran90Parser $ unlines [
     "module m1"
   , "  implicit none"
   , "contains"
@@ -277,7 +276,7 @@ ex8 = resetSrcSpan . flip fortran90Parser "" $ unlines [
   ]
 
 ex9 :: ProgramFile A0
-ex9 = resetSrcSpan . flip fortran90Parser "" $ unlines [
+ex9 = resetSrcSpan . fortran90Parser $ unlines [
     "module m1"
   , "  implicit none"
   , "  integer :: x"
@@ -313,7 +312,7 @@ ex11pu1bs =
   , BlStatement () u Nothing (StEntry () u (ExpValue () u (ValVariable "e3")) Nothing (Just (varGen "r2"))) ]
 
 ex12 :: ProgramFile A0
-ex12 = resetSrcSpan . flip fortran90Parser "" $ unlines [
+ex12 = resetSrcSpan . fortran90Parser $ unlines [
     "module m1"
   , "  implicit none"
   , "  integer :: z"
@@ -350,7 +349,7 @@ ex12 = resetSrcSpan . flip fortran90Parser "" $ unlines [
   ]
 
 ex13Renames :: ProgramFile A0
-ex13Renames = resetSrcSpan . flip fortran90Parser "" $ unlines [
+ex13Renames = resetSrcSpan . fortran90Parser $ unlines [
     "module m1"
   , "  implicit none"
   , "  integer :: z"
@@ -388,7 +387,7 @@ ex13Renames = resetSrcSpan . flip fortran90Parser "" $ unlines [
 
 
 exScope1 :: ProgramFile A0
-exScope1 = resetSrcSpan . flip fortran90Parser "" $ unlines [
+exScope1 = resetSrcSpan . fortran90Parser $ unlines [
     "program scope1"
   -- local variables cannot take on the name of subprogram, therefore
   -- this declaration must be simply redeclaring the function x.
@@ -404,7 +403,7 @@ exScope1 = resetSrcSpan . flip fortran90Parser "" $ unlines [
   ]
 
 exScope2 :: ProgramFile A0
-exScope2 = resetSrcSpan . flip fortran90Parser "" $ unlines [
+exScope2 = resetSrcSpan . fortran90Parser $ unlines [
     "module scope2"
   , "  integer :: x"
   , "contains"
@@ -434,7 +433,7 @@ exScope2 = resetSrcSpan . flip fortran90Parser "" $ unlines [
   ]
 
 exScope3 :: ProgramFile A0
-exScope3 = resetSrcSpan . flip fortran90Parser "" $ unlines [
+exScope3 = resetSrcSpan . fortran90Parser $ unlines [
     "module m1"
   , "  implicit none"
   , "  integer :: x"
@@ -471,7 +470,7 @@ exScope3 = resetSrcSpan . flip fortran90Parser "" $ unlines [
   ]
 
 common1 :: ProgramFile A0
-common1 = resetSrcSpan . flip fortran90Parser "" $ unlines [
+common1 = resetSrcSpan . fortran90Parser $ unlines [
     "program p1"
   , "  implicit none"
   , "  integer :: x, y"

test/Language/Fortran/Analysis/TypesSpec.hs

@@ -12,9 +12,7 @@ import Language.Fortran.Analysis
 import Language.Fortran.Analysis.Types
 import Language.Fortran.Analysis.SemanticTypes
 import Language.Fortran.Analysis.Renaming
-import qualified Language.Fortran.Parser.Fortran77 as F77
-import qualified Language.Fortran.Parser.Fortran90 as F90
-import Language.Fortran.ParserMonad
+import qualified Language.Fortran.Parser as Parser
 import qualified Data.ByteString.Char8 as B
 
 inferTable :: Data a => ProgramFile a -> TypeEnv
@@ -23,11 +21,11 @@ inferTable = underRenaming (snd . analyseTypes)
 typedProgramFile :: Data a => ProgramFile a -> ProgramFile (Analysis a)
 typedProgramFile = fst . analyseTypes . analyseRenames . initAnalysis
 
-legacy77Parser :: String -> String -> ProgramFile A0
-legacy77Parser src file = fromParseResultUnsafe $ F77.legacy77Parser (B.pack src) file
+legacy77Parser :: String -> ProgramFile A0
+legacy77Parser = Parser.parseUnsafe Parser.f77l . B.pack
 
-fortran90Parser :: String -> String -> ProgramFile A0
-fortran90Parser src file = fromParseResultUnsafe $ F90.fortran90Parser (B.pack src) file
+fortran90Parser :: String -> ProgramFile A0
+fortran90Parser = Parser.parseUnsafe Parser.f90 . B.pack
 
 uniExpr :: ProgramFile (Analysis A0) -> [Expression (Analysis A0)]
 uniExpr = universeBi
@@ -386,11 +384,11 @@ fProgStr progContents = unlines prog
 
 -- | Parse a string as an F90 program with initialized 'SrcSpan's.
 parseStrF90 :: String -> ProgramFile A0
-parseStrF90 = resetSrcSpan . flip fortran90Parser ""
+parseStrF90 = resetSrcSpan . fortran90Parser
 
 commonTransform :: [String] -> String -> [String] -> Bool -> ProgramFile A0
 commonTransform front cdecl back common =
-  resetSrcSpan . flip legacy77Parser "" . unlines . (++) front $
+  resetSrcSpan . legacy77Parser . unlines . (++) front $
     if common then cdecl : back else back
 
 structArray :: Bool -> ProgramFile A0

test/Language/Fortran/AnalysisSpec.hs

@@ -3,16 +3,14 @@ module Language.Fortran.AnalysisSpec where
 import Test.Hspec
 import TestUtil
 
-import Language.Fortran.Parser.Fortran77
-import Language.Fortran.ParserMonad (fromParseResultUnsafe)
-import Language.Fortran.AST
 import Language.Fortran.Analysis
+import Language.Fortran.AST
+import qualified Language.Fortran.Parser as Parser
+
 import qualified Data.ByteString.Char8 as B
 
-pParser :: String -> ProgramFile (Analysis ())
-pParser source = initAnalysis
-               . fromParseResultUnsafe
-               $ extended77Parser (B.pack source) "<unknown>"
+pParser :: String -> ProgramFile (Analysis A0)
+pParser = initAnalysis . Parser.parseUnsafe Parser.f77e . B.pack
 
 spec :: Spec
 spec =

test/Language/Fortran/ParserMonadSpec.hs renamed to test/Language/Fortran/Parser/CommonSpec.hs

@@ -1,10 +1,11 @@
 {-# OPTIONS_GHC -Wno-orphans #-}
 
-module Language.Fortran.ParserMonadSpec where
+module Language.Fortran.Parser.CommonSpec where
 
 import Test.Hspec
 
-import Language.Fortran.ParserMonad
+import Language.Fortran.Parser.Common
+import Language.Fortran.Version
 import Language.Fortran.Util.Position
 
 vanillaParseState :: ParseState String