Pull all fake types to a single module

mxxun/ghc-9.2
mrkun 2022-01-30 23:32:34 +03:00
parent a0157b6cfc
commit 1fa45be586
5 changed files with 18 additions and 11 deletions

View File

@ -0,0 +1,13 @@
module Language.Haskell.Brittany.Internal.EPCompat where
import Data.Map (Map)
type DeltaPos = ()
type Comment = ()
type Annotation = ()
type Anns = Map AnnKey ()
type AnnKey = ()
type EPAnns = ()

View File

@ -37,7 +37,7 @@ 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)
import qualified Language.Haskell.GHC.ExactPrint.Utils as ExactPrint.Utils import qualified Language.Haskell.GHC.ExactPrint.Utils as ExactPrint.Utils
import Language.Haskell.Brittany.Internal.EPCompat
processDefault processDefault
:: ( :: (
@ -294,9 +294,6 @@ hasAnyRegularCommentsConnected ast =
-- isRegularComment :: (ExactPrint.Comment, ExactPrint.DeltaPos) -> Bool -- isRegularComment :: (ExactPrint.Comment, ExactPrint.DeltaPos) -> Bool
-- isRegularComment = (== Nothing) . ExactPrint.Types.commentOrigin . fst -- isRegularComment = (== Nothing) . ExactPrint.Types.commentOrigin . fst
type DeltaPos = ()
type Comment = ()
astConnectedComments astConnectedComments
:: Data ast :: Data ast
=> GHC.LocatedAn an ast => GHC.LocatedAn an ast
@ -344,8 +341,6 @@ hasAnnKeyword ast annKeyword = {-astAnn-} astAnn' ast <&> \case
-- astAnn' :: Functor f => Located a -> f (Maybe b) -- astAnn' :: Functor f => Located a -> f (Maybe b)
astAnn' = undefined astAnn' = undefined
type Annotation = ()
-- astAnn -- astAnn
-- :: (Data ast, MonadMultiReader (Map AnnKey Annotation) m) -- :: (Data ast, MonadMultiReader (Map AnnKey Annotation) m)
-- => GHC.Located ast -- => GHC.Located ast

View File

@ -18,8 +18,9 @@ import Language.Haskell.Brittany.Internal.PreludeUtils
import Language.Haskell.Brittany.Internal.Types import Language.Haskell.Brittany.Internal.Types
import Language.Haskell.GHC.ExactPrint as ExactPrint import Language.Haskell.GHC.ExactPrint as ExactPrint
import Language.Haskell.GHC.ExactPrint.Types import Language.Haskell.GHC.ExactPrint.Types
(DeltaPos(..), commentContents, deltaRow) (commentContents)
import Language.Haskell.Brittany.Internal.EPCompat (Annotation)
layoutModule :: ToBriDoc' HsModule layoutModule :: ToBriDoc' HsModule

View File

@ -27,8 +27,7 @@ import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint.Types
-- import Language.Haskell.GHC.ExactPrint.Types (Anns) -- import Language.Haskell.GHC.ExactPrint.Types (Anns)
import qualified Safe import qualified Safe
type Anns = Map AnnKey () import Language.Haskell.Brittany.Internal.EPCompat
type AnnKey = ()
data PerItemConfig = PerItemConfig data PerItemConfig = PerItemConfig
{ _icd_perBinding :: Map String (CConfig Maybe) { _icd_perBinding :: Map String (CConfig Maybe)

View File

@ -32,6 +32,7 @@ import qualified Language.Haskell.GHC.ExactPrint.Utils as ExactPrint.Utils
import qualified Language.Haskell.Syntax.Extension as HsExtension import qualified Language.Haskell.Syntax.Extension as HsExtension
import qualified Text.PrettyPrint as PP import qualified Text.PrettyPrint as PP
import Language.Haskell.Brittany.Internal.EPCompat
parDoc :: String -> PP.Doc parDoc :: String -> PP.Doc
@ -74,8 +75,6 @@ instance Show ShowIsId where
data A x = A ShowIsId x data A x = A ShowIsId x
deriving Data deriving Data
type EPAnns = ()
customLayouterF :: LayouterF customLayouterF :: LayouterF
customLayouterF layoutF = customLayouterF layoutF =
DataToLayouter DataToLayouter