hexagoxel
/
brittany
1
0
Fork 0
Code Issues 117 Pull Requests 5 Packages Projects Releases 5 Wiki Activity

Prevent package environment file GHC API stupidities 

This fixes the code-path for the commandline interface
(unfortunately not covered by our testsuite).
The other code-path should be covered by the changes in
https://github.com/alanz/ghc-exactprint/pull/68.
remotes/felixonmars/no-app-parspacing
Lennart Spitzner 2018-08-20 21:19:10 +02:00
parent 33a4039751
commit 8c5cce5070
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs
View File

@ -70,8 +70,14 @@ parseModuleWithCpp
parseModuleWithCpp cpp opts args fp dynCheck = parseModuleWithCpp cpp opts args fp dynCheck =
ExactPrint.ghcWrapper $ ExceptT.runExceptT $ do ExactPrint.ghcWrapper $ ExceptT.runExceptT $ do
dflags0 <- lift $ GHC.getSessionDynFlags dflags0 <- lift $ GHC.getSessionDynFlags
(dflags1, leftover, warnings) <- lift (dflags1, leftover, warnings) <- lift $ GHC.parseDynamicFlagsCmdLine
$ GHC.parseDynamicFlagsCmdLine dflags0 (GHC.noLoc <$> args) dflags0
(GHC.noLoc <$> ("-hide-all-packages" : args))
-- that we pass -hide-all-packages here is a duplication, because
-- ExactPrint.initDynFlags also does it, but necessary because of
-- stupid and careless GHC API design. We explicitly want to pass
-- our args before calling that, so this is what we do. Should be
-- harmless. See commit 1b7576dcd1823e1c685a44927b1fcaade1319063.
void $ lift $ GHC.setSessionDynFlags dflags1 void $ lift $ GHC.setSessionDynFlags dflags1
dflags2 <- lift $ ExactPrint.initDynFlags fp dflags2 <- lift $ ExactPrint.initDynFlags fp
when (not $ null leftover) when (not $ null leftover)