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

(try commenting out) 

(run into Brittany.Internal.Types, & commenting that _probably_ won't work)
mxxun/ghc-9.2
mrkun 2022-01-28 21:51:13 +03:00
parent 0046199306
commit 3d12add3d8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/library/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs
View File

@ -37,7 +37,7 @@ parseModule
:: [String] :: [String]
-> System.IO.FilePath -> System.IO.FilePath
-> (GHC.DynFlags -> IO (Either String a)) -> (GHC.DynFlags -> IO (Either String a))
-> IO (Either String (ExactPrint.Anns, GHC.ParsedSource, a)) -> IO (Either String (GHC.ParsedSource, a))
parseModule args fp dynCheck = do parseModule args fp dynCheck = do
str <- System.IO.readFile fp str <- System.IO.readFile fp
parseModuleFromString args fp dynCheck str parseModuleFromString args fp dynCheck str
@ -47,10 +47,10 @@ parseModuleFromString
-> System.IO.FilePath -> System.IO.FilePath
-> (GHC.DynFlags -> IO (Either String a)) -> (GHC.DynFlags -> IO (Either String a))
-> String -> String
-> IO (Either String (ExactPrint.Anns, GHC.ParsedSource, a)) -> IO (Either String (GHC.ParsedSource, a))
parseModuleFromString = ParseModule.parseModule parseModuleFromString = ParseModule.parseModule
{-
commentAnnFixTransformGlob :: SYB.Data ast => ast -> ExactPrint.Transform () commentAnnFixTransformGlob :: SYB.Data ast => ast -> ExactPrint.Transform ()
commentAnnFixTransformGlob ast = do commentAnnFixTransformGlob ast = do
let let
@ -115,7 +115,7 @@ commentAnnFixTransformGlob ast = do
, ExactPrint.annsDP = assocs' , ExactPrint.annsDP = assocs'
} }
ExactPrint.modifyAnnsT $ \anns -> Map.insert annKey1 ann1' anns ExactPrint.modifyAnnsT $ \anns -> Map.insert annKey1 ann1' anns
-}
-- TODO: this is unused by now, but it contains one detail that -- TODO: this is unused by now, but it contains one detail that
-- commentAnnFixTransformGlob does not include: Moving of comments for -- commentAnnFixTransformGlob does not include: Moving of comments for
@ -181,6 +181,8 @@ commentAnnFixTransformGlob ast = do
-- ExactPrint.modifyAnnsT moveComments -- ExactPrint.modifyAnnsT moveComments
{--
-- | split a set of annotations in a module into a map from top-level module -- | split a set of annotations in a module into a map from top-level module
-- elements to the relevant annotations. Avoids quadratic behaviour a trivial -- elements to the relevant annotations. Avoids quadratic behaviour a trivial
-- implementation would have. -- implementation would have.
@ -229,7 +231,8 @@ foldedAnnKeys ast = SYB.everything
ast ast
where locTyCon = SYB.typeRepTyCon (SYB.typeOf (L () ())) where locTyCon = SYB.typeRepTyCon (SYB.typeOf (L () ()))
-}
{-
withTransformedAnns withTransformedAnns
:: Data ast :: Data ast
=> ast => ast
@ -248,7 +251,7 @@ withTransformedAnns ast m = MultiRWSS.mGetRawR >>= \case
((), (annsBalanced, _), _) = ((), (annsBalanced, _), _) =
ExactPrint.runTransform anns (commentAnnFixTransformGlob ast) ExactPrint.runTransform anns (commentAnnFixTransformGlob ast)
in annsBalanced in annsBalanced
-}
warnExtractorCompat :: GHC.Warn -> String warnExtractorCompat :: GHC.Warn -> String
warnExtractorCompat (GHC.Warn _ (L _ s)) = s warnExtractorCompat (GHC.Warn _ (L _ s)) = s

2
source/library/Language/Haskell/Brittany/Internal/LayouterBasics.hs
View File

@ -31,7 +31,7 @@ import Language.Haskell.Brittany.Internal.PreludeUtils
import Language.Haskell.Brittany.Internal.Types import Language.Haskell.Brittany.Internal.Types
import Language.Haskell.Brittany.Internal.Utils import Language.Haskell.Brittany.Internal.Utils
import qualified Language.Haskell.GHC.ExactPrint as ExactPrint import qualified Language.Haskell.GHC.ExactPrint as ExactPrint
import qualified Language.Haskell.GHC.ExactPrint.Annotate as ExactPrint.Annotate -- import qualified Language.Haskell.GHC.ExactPrint.Annotate as ExactPrint.Annotate
import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint.Types import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint.Types
import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint
import Language.Haskell.GHC.ExactPrint.Types (AnnKey, Annotation) import Language.Haskell.GHC.ExactPrint.Types (AnnKey, Annotation)