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

Fix inlineconfig additions for ghc-8.4 + compat 

The semigroup changes are a bit confusing when aiming
for backwards-compat.
pull/136/head
Lennart Spitzner 2018-04-17 20:34:11 +02:00
parent 1fc007591c
commit 17fb271694
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Language/Haskell/Brittany/Internal.hs
View File

@ -432,7 +432,7 @@ parsePrintModuleTests conf filename input = do
toLocal :: Config -> ExactPrint.Anns -> PPMLocal a -> PPM a toLocal :: Config -> ExactPrint.Anns -> PPMLocal a -> PPM a
toLocal conf anns m = do toLocal conf anns m = do
(x, write) <- lift $ MultiRWSS.runMultiRWSTAW (conf :+: anns :+: HNil) HNil $ m (x, write) <- lift $ MultiRWSS.runMultiRWSTAW (conf :+: anns :+: HNil) HNil $ m
MultiRWSS.mGetRawW >>= \w -> MultiRWSS.mPutRawW (w <> write) MultiRWSS.mGetRawW >>= \w -> MultiRWSS.mPutRawW (w `mappend` write)
pure x pure x
ppModule :: GenLocated SrcSpan (HsModule GhcPs) -> PPM () ppModule :: GenLocated SrcSpan (HsModule GhcPs) -> PPM ()
@ -495,7 +495,7 @@ withTransformedAnns ast m = do
in annsBalanced in annsBalanced
getDeclBindingNames :: LHsDecl RdrName -> [String] getDeclBindingNames :: LHsDecl GhcPs -> [String]
getDeclBindingNames (L _ decl) = case decl of getDeclBindingNames (L _ decl) = case decl of
SigD (TypeSig ns _) -> ns <&> \(L _ n) -> Text.unpack (rdrNameToText n) SigD (TypeSig ns _) -> ns <&> \(L _ n) -> Text.unpack (rdrNameToText n)
ValD (FunBind (L _ n) _ _ _ _) -> [Text.unpack $ rdrNameToText n] ValD (FunBind (L _ n) _ _ _ _) -> [Text.unpack $ rdrNameToText n]

2
stack-8.0.2.yaml
View File

@ -3,7 +3,7 @@ resolver: lts-9.0
extra-deps: extra-deps:
- monad-memo-0.4.1 - monad-memo-0.4.1
- czipwith-1.0.1.0 - czipwith-1.0.1.0
- butcher-1.3.1.0 - butcher-1.3.1.1
- data-tree-print-0.1.0.0 - data-tree-print-0.1.0.0
- deque-0.2 - deque-0.2
- ghc-exactprint-0.5.6.0 - ghc-exactprint-0.5.6.0

2
stack-8.2.2.yaml
View File

@ -2,7 +2,7 @@ resolver: lts-11.1
extra-deps: extra-deps:
- czipwith-1.0.1.0 - czipwith-1.0.1.0
- butcher-1.3.1.0 - butcher-1.3.1.1
packages: packages:
- . - .

2
stack.yaml
View File

@ -2,7 +2,7 @@ resolver: lts-11.1
extra-deps: extra-deps:
- czipwith-1.0.1.0 - czipwith-1.0.1.0
- butcher-1.3.1.0 - butcher-1.3.1.1
packages: packages:
- . - .