(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

View File

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

View File

@ -31,7 +31,7 @@ import Language.Haskell.Brittany.Internal.PreludeUtils
import Language.Haskell.Brittany.Internal.Types
import Language.Haskell.Brittany.Internal.Utils
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
import Language.Haskell.GHC.ExactPrint.Types (AnnKey, Annotation)