diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2017-12-01 15:38:08 +0200 | 
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2018-01-18 14:10:26 +0100 | 
| commit | 70db4d93c48565bebeade5845d5d8c55fbc19e7a (patch) | |
| tree | 14fe5802019b417f7415b642e5fb2483274c0af1 /tests | |
| parent | 080a503271592babe0957ff37300d02fddff1e8f (diff) | |
Update as per @DanielG comments
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GhcSession.hs | 56 | 
1 files changed, 28 insertions, 28 deletions
diff --git a/tests/GhcSession.hs b/tests/GhcSession.hs index 437e927..11b35ff 100644 --- a/tests/GhcSession.hs +++ b/tests/GhcSession.hs @@ -106,45 +106,45 @@ compileModule ep opts = do        defaultErrorHandler defaultFatalMessager defaultFlushOut $ do  #endif -        runGhc (Just libdir) $ do +      runGhc (Just libdir) $ do -          dflags0 <- getSessionDynFlags -          let dflags1 = dflags0 { -              ghcMode   = CompManager -            , ghcLink   = LinkInMemory -            , hscTarget = HscInterpreted -            , optLevel  = 0 -            } +      dflags0 <- getSessionDynFlags +      let dflags1 = dflags0 { +          ghcMode   = CompManager +        , ghcLink   = LinkInMemory +        , hscTarget = HscInterpreted +        , optLevel  = 0 +        } -          (dflags2, _, _) <- parseDynamicFlags dflags1 (map noLoc opts) -          _ <- setSessionDynFlags dflags2 +      (dflags2, _, _) <- parseDynamicFlags dflags1 (map noLoc opts) +      _ <- setSessionDynFlags dflags2 -          ts <- mapM (\t -> guessTarget t Nothing) $ -               case ep of -                 ChLibEntrypoint ms ms' -> map unChModuleName $ ms ++ ms' -                 ChExeEntrypoint m  ms  -> [m] ++ map unChModuleName ms -                 ChSetupEntrypoint      -> ["Setup.hs"] -          let ts' = map (\t -> t { targetAllowObjCode = False }) ts +      ts <- mapM (\t -> guessTarget t Nothing) $ +           case ep of +             ChLibEntrypoint ms ms' -> map unChModuleName $ ms ++ ms' +             ChExeEntrypoint m  ms  -> [m] ++ map unChModuleName ms +             ChSetupEntrypoint      -> ["Setup.hs"] +      let ts' = map (\t -> t { targetAllowObjCode = False }) ts -          setTargets ts' -          _ <- load LoadAllTargets +      setTargets ts' +      _ <- load LoadAllTargets  #if __GLASGOW_HASKELL__ >= 706 -          setContext $ case ep of -            ChLibEntrypoint ms ms' -> -                map (IIModule . mkModuleName . unChModuleName) $ ms ++ ms' -            ChExeEntrypoint _  ms  -> -                map (IIModule . mkModuleName . unChModuleName) $ ChModuleName "Main" : ms -            ChSetupEntrypoint      -> -                map (IIModule . mkModuleName) ["Main"] +      setContext $ case ep of +        ChLibEntrypoint ms ms' -> +            map (IIModule . mkModuleName . unChModuleName) $ ms ++ ms' +        ChExeEntrypoint _  ms  -> +            map (IIModule . mkModuleName . unChModuleName) $ ChModuleName "Main" : ms +        ChSetupEntrypoint      -> +            map (IIModule . mkModuleName) ["Main"]  #endif  #if __GLASGOW_HASKELL__ <= 706 -          GhcMonad.liftIO $ print ExitSuccess +      GhcMonad.liftIO $ print ExitSuccess  #else -          liftIO $ print ExitSuccess +      liftIO $ print ExitSuccess  #endif -          return True +      return True  unChModuleName :: ChModuleName -> String  unChModuleName (ChModuleName  mn) = mn  | 
