diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,11 @@ # Revision history for brittany +## 0.13.0.0 -- December 2020 + +* #324: Added support for GHC 8.10. + * Dropped support for GHC 8.4, 8.2, and 8.0. + * Thanks @jneira, @bubba, @infinity0, and @expipiplus1! + ## 0.12.2.0 -- November 2020 * #207: Fix newtype indent in associated type family. diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# brittany [![Hackage version](https://img.shields.io/hackage/v/brittany.svg?label=Hackage)](https://hackage.haskell.org/package/brittany) [![Stackage version](https://www.stackage.org/package/brittany/badge/lts?label=Stackage)](https://www.stackage.org/package/brittany) [![Build Status](https://secure.travis-ci.org/lspitzner/brittany.svg?branch=master)](http://travis-ci.org/lspitzner/brittany) +# brittany [![Hackage version](https://img.shields.io/hackage/v/brittany.svg?label=Hackage)](https://hackage.haskell.org/package/brittany) [![Stackage version](https://www.stackage.org/package/brittany/badge/lts?label=Stackage)](https://www.stackage.org/package/brittany) [![Build Status](https://secure.travis-ci.org/lspitzner/brittany.svg?branch=master)](http://travis-ci.org/lspitzner/brittany) haskell source code formatter ![Output sample](https://github.com/lspitzner/brittany/raw/master/brittany-sample.gif) @@ -31,7 +31,7 @@ other module elements (data-decls, classes, instances, etc.) are not transformed in any way; this extends to e.g. **bindings inside class instance definitions** - they **won't be touched** (yet). -- By using `ghc-exactprint` as the parser, brittany supports full GHC +- By using `ghc-exactprint` as the parser, brittany supports full GHC including extensions, but **some of the less common syntactic elements (even of 2010 haskell) are not handled**. - **There are some known issues regarding handling of in-source comments.** @@ -48,7 +48,7 @@ # Other usage notes -- Supports GHC versions `8.0`, `8.2`, `8.4`, `8.6`, `8.8`. +- Supports GHC versions `8.6`, `8.8`, `8.10`. - included in stackage with lts>=10.0 (or nightlies dating to >=2017-11-15) - config (file) documentation is lacking. - some config values can not be configured via commandline yet. @@ -127,13 +127,13 @@ - Default mode of operation: Transform a single module, from `stdin` to `stdout`. Can pass one or multiple files as input, and there is a flag to override them in place instead of using `stdout` (since 0.9.0.0). So: - + ~~~~ .sh brittany # stdin -> stdout brittany mysource.hs # ./mysource.hs -> stdout brittany --write-mode=inplace *.hs # apply formatting to all ./*.hs inplace ~~~~ - + - For stdin/stdout usage it makes sense to enable certain syntactic extensions by default, i.e. to add something like this to your `~/.config/brittany/config.yaml` (execute `brittany` once to create default): diff --git a/brittany.cabal b/brittany.cabal --- a/brittany.cabal +++ b/brittany.cabal @@ -1,5 +1,5 @@ name: brittany -version: 0.12.2.0 +version: 0.13.0.0 synopsis: Haskell source code formatter description: { See . @@ -91,10 +91,10 @@ -fno-warn-redundant-constraints } build-depends: - { base >=4.9 && <4.14 - , ghc >=8.0.1 && <8.9 + { base >=4.12 && <4.15 + , ghc >=8.6.1 && <8.11 , ghc-paths >=0.1.0.9 && <0.2 - , ghc-exactprint >=0.5.8 && <0.6.3 + , ghc-exactprint >=0.5.8 && <0.6.4 , transformers >=0.5.2.0 && <0.6 , containers >=0.5.7.1 && <0.7 , mtl >=2.2.1 && <2.3 @@ -110,7 +110,7 @@ , aeson >=1.0.1.0 && <1.6 , extra >=1.4.10 && <1.8 , uniplate >=1.6.12 && <1.7 - , strict >=0.3.2 && <0.4 + , strict >=0.3.2 && <0.5 , monad-memo >=0.4.1 && <0.6 , unsafe >=0.0 && <0.1 , safe >=0.3.9 && <0.4 @@ -118,7 +118,7 @@ , semigroups >=0.18.2 && <0.20 , cmdargs >=0.10.14 && <0.11 , czipwith >=1.0.1.0 && <1.1 - , ghc-boot-th >=8.0.1 && <8.9 + , ghc-boot-th >=8.6.1 && <8.11 , filepath >=1.4.1.0 && <1.5 , random >= 1.1 && <1.2 } diff --git a/src-literatetests/15-regressions.blt b/src-literatetests/15-regressions.blt --- a/src-literatetests/15-regressions.blt +++ b/src-literatetests/15-regressions.blt @@ -473,13 +473,6 @@ bar n = case n of (-2, -2) -> (-2, -2) -#test issue 48 a - -foo = - let a = b@1 - cccc = () - in foo - #test issue 48 b {-# LANGUAGE TypeApplications #-} diff --git a/src-literatetests/30-tests-context-free.blt b/src-literatetests/30-tests-context-free.blt --- a/src-literatetests/30-tests-context-free.blt +++ b/src-literatetests/30-tests-context-free.blt @@ -1409,14 +1409,6 @@ bar n = case n of (-2, -2) -> (-2, -2) -#test issue 48 a - -foo = - let - a = b@1 - cccc = () - in foo - #test issue 48 b {-# LANGUAGE TypeApplications #-} diff --git a/src/Language/Haskell/Brittany/Internal.hs b/src/Language/Haskell/Brittany/Internal.hs --- a/src/Language/Haskell/Brittany/Internal.hs +++ b/src/Language/Haskell/Brittany/Internal.hs @@ -61,7 +61,12 @@ ) import RdrName ( RdrName(..) ) import SrcLoc ( SrcSpan ) +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +import Bag +#else import HsSyn +#endif import qualified DynFlags as GHC import qualified GHC.LanguageExtensions.Type as GHC @@ -380,7 +385,11 @@ let inputStr = Text.unpack input parseResult <- ExactPrint.Parsers.parseModuleFromString filename inputStr case parseResult of +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ + Left err -> return $ Left $ "parsing error: " ++ show (bagToList (show <$> err)) +#else Left (_ , s ) -> return $ Left $ "parsing error: " ++ s +#endif Right (anns, parsedModule) -> runExceptT $ do (inlineConf, perItemConf) <- case extractCommentConfigs anns (getTopLevelDeclNameMap parsedModule) of @@ -509,17 +518,10 @@ _ -> return () getDeclBindingNames :: LHsDecl GhcPs -> [String] -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ getDeclBindingNames (L _ decl) = case decl of SigD _ (TypeSig _ ns _) -> ns <&> \(L _ n) -> Text.unpack (rdrNameToText n) ValD _ (FunBind _ (L _ n) _ _ _) -> [Text.unpack $ rdrNameToText n] _ -> [] -#else -getDeclBindingNames (L _ decl) = case decl of - SigD (TypeSig ns _) -> ns <&> \(L _ n) -> Text.unpack (rdrNameToText n) - ValD (FunBind (L _ n) _ _ _ _) -> [Text.unpack $ rdrNameToText n] - _ -> [] -#endif -- Prints the information associated with the module annotation @@ -577,26 +579,15 @@ _sigHead :: Sig GhcPs -> String _sigHead = \case -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ TypeSig _ names _ -> -#else - TypeSig names _ -> -#endif "TypeSig " ++ intercalate "," (Text.unpack . lrdrNameToText <$> names) _ -> "unknown sig" _bindHead :: HsBind GhcPs -> String -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ _bindHead = \case FunBind _ fId _ _ [] -> "FunBind " ++ (Text.unpack $ lrdrNameToText $ fId) PatBind _ _pat _ ([], []) -> "PatBind smth" _ -> "unknown bind" -#else -_bindHead = \case - FunBind fId _ _ _ [] -> "FunBind " ++ (Text.unpack $ lrdrNameToText $ fId) - PatBind _pat _ _ _ ([], []) -> "PatBind smth" - _ -> "unknown bind" -#endif diff --git a/src/Language/Haskell/Brittany/Internal/Config/Types.hs b/src/Language/Haskell/Brittany/Internal/Config/Types.hs --- a/src/Language/Haskell/Brittany/Internal/Config/Types.hs +++ b/src/Language/Haskell/Brittany/Internal/Config/Types.hs @@ -229,15 +229,12 @@ deriving instance Data (CPreProcessorConfig Identity) deriving instance Data (CConfig Identity) -#if MIN_VERSION_ghc(8,2,0) --- these instances break on earlier ghcs deriving instance Data (CDebugConfig Option) deriving instance Data (CLayoutConfig Option) deriving instance Data (CErrorHandlingConfig Option) deriving instance Data (CForwardOptions Option) deriving instance Data (CPreProcessorConfig Option) deriving instance Data (CConfig Option) -#endif instance Semigroup.Semigroup (CDebugConfig Option) where (<>) = gmappend @@ -356,4 +353,3 @@ deriveCZipWith ''CForwardOptions deriveCZipWith ''CPreProcessorConfig deriveCZipWith ''CConfig - diff --git a/src/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs b/src/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs --- a/src/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs +++ b/src/Language/Haskell/Brittany/Internal/ExactPrintUtils.hs @@ -33,7 +33,14 @@ import qualified StringBuffer as GHC import qualified Outputable as GHC import qualified CmdLineParser as GHC + +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +import Bag +#else import HsSyn +#endif + import SrcLoc ( SrcSpan, Located ) @@ -90,7 +97,11 @@ ++ show (warnings <&> warnExtractorCompat) x <- ExceptT.ExceptT $ liftIO $ dynCheck dflags2 res <- lift $ ExactPrint.parseModuleApiAnnsWithCppInternal cpp dflags2 fp +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ + either (\err -> ExceptT.throwE $ "transform error: " ++ show (bagToList (show <$> err))) +#else either (\(span, err) -> ExceptT.throwE $ show span ++ ": " ++ err) +#endif (\(a, m) -> pure (a, m, x)) $ ExactPrint.postParseTransform res opts @@ -123,7 +134,11 @@ dynCheckRes <- ExceptT.ExceptT $ liftIO $ dynCheck dflags1 let res = ExactPrint.parseModuleFromStringInternal dflags1 fp str case res of +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ + Left err -> ExceptT.throwE $ "parse error: " ++ show (bagToList (show <$> err)) +#else Left (span, err) -> ExceptT.throwE $ showOutputable span ++ ": " ++ err +#endif Right (a , m ) -> pure (a, m, dynCheckRes) @@ -187,9 +202,9 @@ , ExactPrint.annsDP = assocs' } ExactPrint.modifyAnnsT $ \anns -> Map.insert annKey1 ann1' anns - + commentAnnFixTransform :: GHC.ParsedSource -> ExactPrint.Transform () commentAnnFixTransform modul = SYB.everything (>>) genF modul where @@ -197,17 +212,9 @@ genF = (\_ -> return ()) `SYB.extQ` exprF exprF :: Located (HsExpr GhcPs) -> ExactPrint.Transform () exprF lexpr@(L _ expr) = case expr of -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ RecordCon _ _ (HsRecFields fs@(_:_) Nothing) -> -#else - RecordCon _ _ _ (HsRecFields fs@(_:_) Nothing) -> -#endif moveTrailingComments lexpr (List.last fs) -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ RecordUpd _ _e fs@(_:_) -> -#else - RecordUpd _e fs@(_:_) _cons _ _ _ -> -#endif moveTrailingComments lexpr (List.last fs) _ -> return () @@ -305,10 +312,5 @@ in annsBalanced -#if MIN_VERSION_ghc(8,4,0) /* ghc-8.4 */ warnExtractorCompat :: GHC.Warn -> String warnExtractorCompat (GHC.Warn _ (L _ s)) = s -#else /* ghc-8.0 && ghc-8.2 */ -warnExtractorCompat :: GenLocated l String -> String -warnExtractorCompat (L _ s) = s -#endif diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/DataDecl.hs b/src/Language/Haskell/Brittany/Internal/Layouters/DataDecl.hs --- a/src/Language/Haskell/Brittany/Internal/Layouters/DataDecl.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/DataDecl.hs @@ -19,7 +19,11 @@ import RdrName ( RdrName(..) ) import GHC ( Located, runGhc, GenLocated(L), moduleNameString ) import qualified GHC +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +#else import HsSyn +#endif import Name import BasicTypes import Language.Haskell.GHC.ExactPrint.Types ( mkAnnKey ) @@ -40,20 +44,11 @@ -> LHsQTyVars GhcPs -> HsDataDefn GhcPs -> ToBriDocM BriDocNumbered -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ layoutDataDecl _ _ (XLHsQTyVars ext) _ = absurdExt ext layoutDataDecl ltycl name (HsQTvs _ bndrs) defn = case defn of -#else -layoutDataDecl ltycl name (HsQTvs _ bndrs _) defn = case defn of -#endif -- newtype MyType a b = MyType .. -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsDataDefn _ext NewType (L _ []) _ctype Nothing [cons] mDerivs -> case cons of (L _ (ConDeclH98 _ext consName (L _ False) _qvars (Just (L _ [])) details _conDoc)) -> -#else - HsDataDefn NewType (L _ []) _ctype Nothing [cons] mDerivs -> case cons of - (L _ (ConDeclH98 consName Nothing (Just (L _ [])) details _conDoc)) -> -#endif docWrapNode ltycl $ do nameStr <- lrdrNameToTextAnn name consNameStr <- lrdrNameToTextAnn consName @@ -78,11 +73,7 @@ -- data MyData a b -- (zero constructors) -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsDataDefn _ext DataType (L _ lhsContext) _ctype Nothing [] mDerivs -> -#else - HsDataDefn DataType (L _ lhsContext) _ctype Nothing [] mDerivs -> -#endif docWrapNode ltycl $ do lhsContextDoc <- docSharedWrapper createContextDoc lhsContext nameStr <- lrdrNameToTextAnn name @@ -96,17 +87,9 @@ -- data MyData = MyData .. -- data MyData = MyData { .. } -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsDataDefn _ext DataType (L _ lhsContext) _ctype Nothing [cons] mDerivs -> -#else - HsDataDefn DataType (L _ lhsContext) _ctype Nothing [cons] mDerivs -> -#endif case cons of -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ (L _ (ConDeclH98 _ext consName (L _ _hasExt) qvars mRhsContext details _conDoc)) -> -#else - (L _ (ConDeclH98 consName (Just (HsQTvs _ qvars _)) mRhsContext details _conDoc)) -> -#endif docWrapNode ltycl $ do lhsContextDoc <- docSharedWrapper createContextDoc lhsContext nameStr <- lrdrNameToTextAnn name @@ -262,18 +245,11 @@ createBndrDoc :: [LHsTyVarBndr GhcPs] -> ToBriDocM BriDocNumbered createBndrDoc bs = do tyVarDocs <- bs `forM` \case -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ (L _ (UserTyVar _ext vname)) -> return $ (lrdrNameToText vname, Nothing) (L _ (KindedTyVar _ext lrdrName kind)) -> do -#else - (L _ (UserTyVar vname)) -> return $ (lrdrNameToText vname, Nothing) - (L _ (KindedTyVar lrdrName kind)) -> do -#endif d <- docSharedWrapper layoutType kind return $ (lrdrNameToText lrdrName, Just $ d) -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ (L _ (XTyVarBndr ext)) -> absurdExt ext -#endif docSeq $ List.intersperse docSeparator $ tyVarDocs @@ -293,7 +269,6 @@ :: HsDeriving GhcPs -> ToBriDocM BriDocNumbered -> ToBriDocM BriDocNumbered createDerivingPar derivs mainDoc = do case derivs of -#if MIN_VERSION_ghc(8,2,0) /* ghc-8.2 */ (L _ []) -> mainDoc (L _ types) -> docPar mainDoc @@ -302,38 +277,17 @@ $ docWrapNode derivs $ derivingClauseDoc <$> types -#else - Nothing -> mainDoc - Just types -> - docPar mainDoc - $ docEnsureIndent BrIndentRegular - $ derivingClauseDoc types -#endif -#if MIN_VERSION_ghc(8,2,0) /* ghc-8.2 */ derivingClauseDoc :: LHsDerivingClause GhcPs -> ToBriDocM BriDocNumbered -#else -derivingClauseDoc :: Located [LHsSigType GhcPs] -> ToBriDocM BriDocNumbered -#endif -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ derivingClauseDoc (L _ (XHsDerivingClause ext)) = absurdExt ext derivingClauseDoc (L _ (HsDerivingClause _ext mStrategy types)) = case types of -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.2 */ -derivingClauseDoc (L _ (HsDerivingClause mStrategy types)) = case types of -#else -derivingClauseDoc types = case types of -#endif (L _ []) -> docSeq [] (L _ ts) -> let tsLength = length ts whenMoreThan1Type val = if tsLength > 1 then docLitS val else docLitS "" -#if MIN_VERSION_ghc(8,2,0) /* ghc-8.2 */ (lhsStrategy, rhsStrategy) = maybe (docEmpty, docEmpty) strategyLeftRight mStrategy -#else - (lhsStrategy, rhsStrategy) = (docEmpty, docEmpty) -#endif in docSeq [ docDeriving @@ -344,24 +298,16 @@ $ docSeq $ List.intersperse docCommaSep $ ts <&> \case -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsIB _ t -> layoutType t XHsImplicitBndrs x -> absurdExt x -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.2 */ - HsIB _ t _ -> layoutType t -#else - HsIB _ t -> layoutType t -#endif , whenMoreThan1Type ")" , rhsStrategy ] -#if MIN_VERSION_ghc(8,2,0) /* ghc-8.6 */ where strategyLeftRight = \case (L _ StockStrategy ) -> (docLitS " stock", docEmpty) (L _ AnyclassStrategy ) -> (docLitS " anyclass", docEmpty) (L _ NewtypeStrategy ) -> (docLitS " newtype", docEmpty) -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ lVia@(L _ (ViaStrategy viaTypes) ) -> ( docEmpty , case viaTypes of @@ -372,8 +318,6 @@ ] XHsImplicitBndrs ext -> absurdExt ext ) -#endif -#endif docDeriving :: ToBriDocM BriDocNumbered docDeriving = docLitS "deriving" @@ -491,12 +435,8 @@ :: [LConDeclField GhcPs] -> [(ToBriDocM BriDocNumbered, ToBriDocM BriDocNumbered)] mkFieldDocs = fmap $ \lField -> case lField of -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ L _ (ConDeclField _ext names t _) -> createNamesAndTypeDoc lField names t L _ (XConDeclField x) -> absurdExt x -#else - L _ (ConDeclField names t _) -> createNamesAndTypeDoc lField names t -#endif createForallDoc :: [LHsTyVarBndr GhcPs] -> Maybe (ToBriDocM BriDocNumbered) createForallDoc [] = Nothing @@ -515,12 +455,8 @@ $ List.intersperse docCommaSep $ names <&> \case -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ L _ (XFieldOcc x) -> absurdExt x L _ (FieldOcc _ fieldName) -> -#else - L _ (FieldOcc fieldName _) -> -#endif docLit =<< lrdrNameToTextAnn fieldName ] , docWrapNodeRest lField $ layoutType t diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Decl.hs b/src/Language/Haskell/Brittany/Internal/Layouters/Decl.hs --- a/src/Language/Haskell/Brittany/Internal/Layouters/Decl.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Decl.hs @@ -37,8 +37,11 @@ ) import SrcLoc ( SrcSpan, noSrcSpan, Located , getLoc, unLoc ) import qualified FastString +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +import GHC.Hs.Extension (NoExtField (..)) +#else import HsSyn -#if MIN_VERSION_ghc(8,6,0) import HsExtension (NoExt (..)) #endif import Name @@ -46,9 +49,7 @@ , Activation(..) , InlineSpec(..) , RuleMatchInfo(..) -#if MIN_VERSION_ghc(8,2,0) , LexicalFixity(..) -#endif ) import Language.Haskell.GHC.ExactPrint.Types ( mkAnnKey ) @@ -64,7 +65,6 @@ layoutDecl :: ToBriDoc HsDecl -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ layoutDecl d@(L loc decl) = case decl of SigD _ sig -> withTransformedAnns d $ layoutSig (L loc sig) ValD _ bind -> withTransformedAnns d $ layoutBind (L loc bind) >>= \case @@ -76,18 +76,6 @@ InstD _ (ClsInstD _ inst) -> withTransformedAnns d $ layoutClsInst (L loc inst) _ -> briDocByExactNoComment d -#else -layoutDecl d@(L loc decl) = case decl of - SigD sig -> withTransformedAnns d $ layoutSig (L loc sig) - ValD bind -> withTransformedAnns d $ layoutBind (L loc bind) >>= \case - Left ns -> docLines $ return <$> ns - Right n -> return n - TyClD tycl -> withTransformedAnns d $ layoutTyCl (L loc tycl) - InstD (TyFamInstD tfid) -> - withTransformedAnns d $ layoutTyFamInstDecl False d tfid - InstD (ClsInstD inst) -> withTransformedAnns d $ layoutClsInst (L loc inst) - _ -> briDocByExactNoComment d -#endif -------------------------------------------------------------------------------- -- Sig @@ -95,18 +83,8 @@ layoutSig :: ToBriDoc Sig layoutSig lsig@(L _loc sig) = case sig of -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ TypeSig _ names (HsWC _ (HsIB _ typ)) -> layoutNamesAndType Nothing names typ -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.2 8.4 */ - TypeSig names (HsWC _ (HsIB _ typ _)) -> layoutNamesAndType Nothing names typ -#else /* ghc-8.0 */ - TypeSig names (HsIB _ (HsWC _ _ typ)) -> layoutNamesAndType Nothing names typ -#endif -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ InlineSig _ name (InlinePragma _ spec _arity phaseAct conlike) -> -#else - InlineSig name (InlinePragma _ spec _arity phaseAct conlike) -> -#endif docWrapNode lsig $ do nameStr <- lrdrNameToTextAnn name specStr <- specStringCompat lsig spec @@ -123,20 +101,8 @@ $ Text.pack ("{-# " ++ specStr ++ conlikeStr ++ phaseStr) <> nameStr <> Text.pack " #-}" -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ ClassOpSig _ False names (HsIB _ typ) -> layoutNamesAndType Nothing names typ -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.2 8.4 */ - ClassOpSig False names (HsIB _ typ _) -> layoutNamesAndType Nothing names typ -#else /* ghc-8.0 */ - ClassOpSig False names (HsIB _ typ) -> layoutNamesAndType Nothing names typ -#endif -#if MIN_VERSION_ghc(8,6,0) PatSynSig _ names (HsIB _ typ) -> layoutNamesAndType (Just "pattern") names typ -#elif MIN_VERSION_ghc(8,2,0) - PatSynSig names (HsIB _ typ _) -> layoutNamesAndType (Just "pattern") names typ -#else - PatSynSig name (HsIB _ typ) -> layoutNamesAndType (Just "pattern") [name] typ -#endif _ -> briDocByExactNoComment lsig -- TODO where layoutNamesAndType mKeyword names typ = docWrapNode lsig $ do @@ -170,32 +136,16 @@ specStringCompat :: MonadMultiWriter [BrittanyError] m => LSig GhcPs -> InlineSpec -> m String -#if MIN_VERSION_ghc(8,4,0) specStringCompat ast = \case NoUserInline -> mTell [ErrorUnknownNode "NoUserInline" ast] $> "" Inline -> pure "INLINE " Inlinable -> pure "INLINABLE " NoInline -> pure "NOINLINE " -#else -specStringCompat _ = \case - Inline -> pure "INLINE " - Inlinable -> pure "INLINABLE " - NoInline -> pure "NOINLINE " - EmptyInlineSpec -> pure "" -#endif layoutGuardLStmt :: ToBriDoc' (Stmt GhcPs (LHsExpr GhcPs)) layoutGuardLStmt lgstmt@(L _ stmtLR) = docWrapNode lgstmt $ case stmtLR of -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ BodyStmt _ body _ _ -> layoutExpr body -#else - BodyStmt body _ _ _ -> layoutExpr body -#endif -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ BindStmt _ lPat expr _ _ -> do -#else - BindStmt lPat expr _ _ _ -> do -#endif patDoc <- docSharedWrapper layoutPat lPat expDoc <- docSharedWrapper layoutExpr expr docCols ColBindStmt @@ -214,11 +164,7 @@ (HsBindLR GhcPs GhcPs) (Either [BriDocNumbered] BriDocNumbered) layoutBind lbind@(L _ bind) = case bind of -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ FunBind _ fId (MG _ lmatches@(L _ matches) _) _ [] -> do -#else - FunBind fId (MG lmatches@(L _ matches) _ _ _) _ _ [] -> do -#endif idStr <- lrdrNameToTextAnn fId binderDoc <- docLit $ Text.pack "=" funcPatDocs <- @@ -227,11 +173,7 @@ $ layoutPatternBind (Just idStr) binderDoc `mapM` matches return $ Left $ funcPatDocs -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ PatBind _ pat (GRHSs _ grhss whereBinds) ([], []) -> do -#else - PatBind pat (GRHSs grhss whereBinds) _ _ ([], []) -> do -#endif patDocs <- colsWrapPat =<< layoutPat pat clauseDocs <- layoutGrhs `mapM` grhss mWhereDocs <- layoutLocalBinds whereBinds @@ -246,10 +188,8 @@ hasComments #if MIN_VERSION_ghc(8,8,0) PatSynBind _ (PSB _ patID lpat rpat dir) -> do -#elif MIN_VERSION_ghc(8,6,0) - PatSynBind _ (PSB _ patID lpat rpat dir) -> do #else - PatSynBind (PSB patID _ lpat rpat dir) -> do + PatSynBind _ (PSB _ patID lpat rpat dir) -> do #endif fmap Right $ docWrapNode lbind $ layoutPatSynBind patID lpat @@ -258,14 +198,9 @@ _ -> Right <$> unknownNodeError "" lbind layoutIPBind :: ToBriDoc IPBind layoutIPBind lipbind@(L _ bind) = case bind of -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ XIPBind{} -> unknownNodeError "XIPBind" lipbind IPBind _ (Right _) _ -> error "brittany internal error: IPBind Right" IPBind _ (Left (L _ (HsIPName name))) expr -> do -#else - IPBind (Right _) _ -> error "brittany internal error: IPBind Right" - IPBind (Left (L _ (HsIPName name))) expr -> do -#endif ipName <- docLit $ Text.pack $ '?' : FastString.unpackFS name binderDoc <- docLit $ Text.pack "=" exprDoc <- layoutExpr expr @@ -287,11 +222,7 @@ -- Just . (>>= either id return) . Data.Foldable.toList <$> mapBagM layoutBind lhsBindsLR -- TODO: fix ordering -- x@(HsValBinds (ValBindsIn{})) -> -- Just . (:[]) <$> unknownNodeError "HsValBinds (ValBindsIn _ (_:_))" x -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsValBinds _ (ValBinds _ bindlrs sigs) -> do -#else - HsValBinds (ValBindsIn bindlrs sigs) -> do -#endif let unordered = [ BagBind b | b <- Data.Foldable.toList bindlrs ] ++ [ BagSig s | s <- sigs ] @@ -300,23 +231,12 @@ BagBind b -> either id return <$> layoutBind b BagSig s -> return <$> layoutSig s return $ Just $ docs -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ -- x@(HsValBinds (ValBindsOut _binds _lsigs)) -> HsValBinds _ (XValBindsLR{}) -> error "brittany internal error: XValBindsLR" XHsLocalBindsLR{} -> error "brittany internal error: XHsLocalBindsLR" -#else - x@(HsValBinds (ValBindsOut _binds _lsigs)) -> - -- i _think_ this case never occurs in non-processed ast - Just . (: []) <$> unknownNodeError "HsValBinds ValBindsOut{}" - (L noSrcSpan x) -#endif -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ x@(HsIPBinds _ XHsIPBinds{}) -> Just . (: []) <$> unknownNodeError "XHsIPBinds" (L noSrcSpan x) HsIPBinds _ (IPBinds _ bb) -> -#else - HsIPBinds (IPBinds bb _) -> -#endif Just <$> mapM layoutIPBind bb EmptyLocalBinds{} -> return $ Nothing @@ -325,17 +245,11 @@ layoutGrhs :: LGRHS GhcPs (LHsExpr GhcPs) -> ToBriDocM ([BriDocNumbered], BriDocNumbered, LHsExpr GhcPs) -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ layoutGrhs lgrhs@(L _ (GRHS _ guards body)) = do -#else -layoutGrhs lgrhs@(L _ (GRHS guards body)) = do -#endif guardDocs <- docWrapNode lgrhs $ layoutStmt `mapM` guards bodyDoc <- layoutExpr body return (guardDocs, bodyDoc, body) -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ layoutGrhs (L _ (XGRHS{})) = error "brittany internal error: XGRHS" -#endif layoutPatternBind :: Maybe Text @@ -344,23 +258,11 @@ -> ToBriDocM BriDocNumbered layoutPatternBind funId binderDoc lmatch@(L _ match) = do let pats = m_pats match -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ let (GRHSs _ grhss whereBinds) = m_grhss match -#else - let (GRHSs grhss whereBinds) = m_grhss match -#endif patDocs <- pats `forM` \p -> fmap return $ colsWrapPat =<< layoutPat p let isInfix = isInfixMatch match mIdStr <- case match of -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ Match _ (FunRhs matchId _ _) _ _ -> Just <$> lrdrNameToTextAnn matchId -#elif MIN_VERSION_ghc(8,4,0) /* ghc-8.4 */ - Match (FunRhs matchId _ _) _ _ -> Just <$> lrdrNameToTextAnn matchId -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.4 */ - Match (FunRhs matchId _ _) _ _ _ -> Just <$> lrdrNameToTextAnn matchId -#else - Match (FunBindMatch matchId _) _ _ _ -> Just <$> lrdrNameToTextAnn matchId -#endif _ -> pure Nothing let mIdStr' = fixPatternBindIdentifier match <$> mIdStr patDoc <- docWrapNodePrior lmatch $ case (mIdStr', patDocs) of @@ -403,7 +305,6 @@ mWhereArg hasComments -#if MIN_VERSION_ghc(8,2,0) /* ghc-8.2 && ghc-8.4 */ fixPatternBindIdentifier :: Match GhcPs (LHsExpr GhcPs) -> Text -> Text fixPatternBindIdentifier match idStr = go $ m_ctxt match @@ -421,10 +322,6 @@ (ParStmtCtxt ctx1) -> goInner ctx1 (TransStmtCtxt ctx1) -> goInner ctx1 _ -> idStr -#else /* ghc-8.0 */ -fixPatternBindIdentifier :: Match GhcPs (LHsExpr GhcPs) -> Text -> Text -fixPatternBindIdentifier _ x = x -#endif layoutPatternBindFinal :: Maybe Text @@ -786,28 +683,16 @@ :: Located (IdP GhcPs) -> HsPatSynDetails (Located (IdP GhcPs)) -> ToBriDocM BriDocNumbered -#if MIN_VERSION_ghc(8,4,0) layoutLPatSyn name (PrefixCon vars) = do -#else -layoutLPatSyn name (PrefixPatSyn vars) = do -#endif docName <- lrdrNameToTextAnn name names <- mapM lrdrNameToTextAnn vars docSeq . fmap appSep $ docLit docName : (docLit <$> names) -#if MIN_VERSION_ghc(8,4,0) layoutLPatSyn name (InfixCon left right) = do -#else -layoutLPatSyn name (InfixPatSyn left right) = do -#endif leftDoc <- lrdrNameToTextAnn left docName <- lrdrNameToTextAnn name rightDoc <- lrdrNameToTextAnn right docSeq . fmap (appSep . docLit) $ [leftDoc, docName, rightDoc] -#if MIN_VERSION_ghc(8,4,0) layoutLPatSyn name (RecCon recArgs) = do -#else -layoutLPatSyn name (RecordPatSyn recArgs) = do -#endif docName <- lrdrNameToTextAnn name args <- mapM (lrdrNameToTextAnn . recordPatSynSelectorId) recArgs docSeq . fmap docLit @@ -819,11 +704,7 @@ -- pattern synonyms layoutPatSynWhere :: HsPatSynDir GhcPs -> ToBriDocM (Maybe [ToBriDocM BriDocNumbered]) layoutPatSynWhere hs = case hs of -#if MIN_VERSION_ghc(8,6,0) ExplicitBidirectional (MG _ (L _ lbinds) _) -> do -#else - ExplicitBidirectional (MG (L _ lbinds) _ _ _) -> do -#endif binderDoc <- docLit $ Text.pack "=" Just <$> mapM (docSharedWrapper $ layoutPatternBind Nothing binderDoc) lbinds _ -> pure Nothing @@ -834,24 +715,10 @@ layoutTyCl :: ToBriDoc TyClDecl layoutTyCl ltycl@(L _loc tycl) = case tycl of -#if MIN_VERSION_ghc(8,6,0) SynDecl _ name vars fixity typ -> do let isInfix = case fixity of Prefix -> False Infix -> True -#elif MIN_VERSION_ghc(8,2,0) - SynDecl name vars fixity typ _ -> do - let isInfix = case fixity of - Prefix -> False - Infix -> True -#else - SynDecl name vars typ _ -> do - nameStr <- lrdrNameToTextAnn name - let isInfixTypeOp = case Text.uncons nameStr of - Nothing -> False - Just (c, _) -> not (c == '(' || isUpper c) - isInfix <- (isInfixTypeOp ||) <$> hasAnnKeyword name AnnBackquote -#endif -- hasTrailingParen <- hasAnnKeywordComment ltycl AnnCloseP -- let parenWrapper = if hasTrailingParen -- then appSep . docWrapNodeRest ltycl @@ -859,13 +726,7 @@ let wrapNodeRest = docWrapNodeRest ltycl docWrapNodePrior ltycl $ layoutSynDecl isInfix wrapNodeRest name (hsq_explicit vars) typ -#if MIN_VERSION_ghc(8,6,0) DataDecl _ext name tyVars _ dataDefn -> -#elif MIN_VERSION_ghc(8,2,0) - DataDecl name tyVars _ dataDefn _ _ -> -#else - DataDecl name tyVars dataDefn _ _ -> -#endif layoutDataDecl ltycl name tyVars dataDefn _ -> briDocByExactNoComment ltycl @@ -913,19 +774,11 @@ layoutTyVarBndr :: Bool -> ToBriDoc HsTyVarBndr layoutTyVarBndr needsSep lbndr@(L _ bndr) = do docWrapNodePrior lbndr $ case bndr of -#if MIN_VERSION_ghc(8,6,0) /* 8.6 */ XTyVarBndr{} -> error "brittany internal error: XTyVarBndr" UserTyVar _ name -> do -#else /* 8.0 8.2 8.4 */ - UserTyVar name -> do -#endif nameStr <- lrdrNameToTextAnn name docSeq $ [docSeparator | needsSep] ++ [docLit nameStr] -#if MIN_VERSION_ghc(8,6,0) /* 8.6 */ KindedTyVar _ name kind -> do -#else /* 8.0 8.2 8.4 */ - KindedTyVar name kind -> do -#endif nameStr <- lrdrNameToTextAnn name docSeq $ [ docSeparator | needsSep ] @@ -956,22 +809,10 @@ -- bndrsMay isJust e.g. with -- type instance forall a . MyType (Maybe a) = Either () a innerNode = outerNode -#elif MIN_VERSION_ghc(8,6,0) +#else FamEqn _ name pats _fixity typ = hsib_body $ tfid_eqn tfid bndrsMay = Nothing innerNode = outerNode -#elif MIN_VERSION_ghc(8,4,0) - FamEqn name pats _fixity typ = hsib_body $ tfid_eqn tfid - bndrsMay = Nothing - innerNode = outerNode -#elif MIN_VERSION_ghc(8,2,0) - innerNode@(L _ (TyFamEqn name boundPats _fixity typ)) = tfid_eqn tfid - bndrsMay = Nothing - pats = hsib_body boundPats -#else - innerNode@(L _ (TyFamEqn name boundPats typ)) = tfid_eqn tfid - bndrsMay = Nothing - pats = hsib_body boundPats #endif docWrapNodePrior outerNode $ do nameStr <- lrdrNameToTextAnn name @@ -1040,18 +881,18 @@ ] where layoutInstanceHead :: ToBriDocM BriDocNumbered -#if MIN_VERSION_ghc(8,6,0) /* 8.6 */ +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ layoutInstanceHead = briDocByExactNoComment - $ InstD NoExt - . ClsInstD NoExt + $ InstD NoExtField + . ClsInstD NoExtField . removeChildren <$> lcid #else layoutInstanceHead = briDocByExactNoComment - $ InstD - . ClsInstD + $ InstD NoExt + . ClsInstD NoExt . removeChildren <$> lcid #endif diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs b/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs --- a/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs @@ -19,7 +19,11 @@ import qualified Language.Haskell.GHC.ExactPrint.Types as ExactPrint.Types import GHC ( runGhc, GenLocated(L), SrcSpan, moduleNameString, AnnKeywordId(..), RdrName(..) ) +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +#else import HsSyn +#endif import Name import qualified FastString import BasicTypes @@ -40,67 +44,29 @@ .> confUnpack let allowFreeIndent = indentPolicy == IndentPolicyFree docWrapNode lexpr $ case expr of -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsVar _ vname -> do -#else - HsVar vname -> do -#endif docLit =<< lrdrNameToTextAnn vname -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsUnboundVar _ var -> case var of -#else - HsUnboundVar var -> case var of -#endif OutOfScope oname _ -> docLit $ Text.pack $ occNameString oname TrueExprHole oname -> docLit $ Text.pack $ occNameString oname HsRecFld{} -> do -- TODO briDocByExactInlineOnly "HsRecFld" lexpr -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsOverLabel _ext _reboundFromLabel name -> -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.2 8.4 */ - HsOverLabel _reboundFromLabel name -> -#else /* ghc-8.0 */ - HsOverLabel name -> -#endif let label = FastString.unpackFS name in docLit . Text.pack $ '#' : label -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsIPVar _ext (HsIPName name) -> -#else - HsIPVar (HsIPName name) -> -#endif let label = FastString.unpackFS name in docLit . Text.pack $ '?' : label -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsOverLit _ olit -> do -#else - HsOverLit olit -> do -#endif allocateNode $ overLitValBriDoc $ ol_val olit -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsLit _ lit -> do -#else - HsLit lit -> do -#endif allocateNode $ litBriDoc lit -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsLam _ (MG _ (L _ [lmatch@(L _ match)]) _) -#else - HsLam (MG (L _ [lmatch@(L _ match)]) _ _ _) -#endif | pats <- m_pats match -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ , GRHSs _ [lgrhs] llocals <- m_grhss match -#else - , GRHSs [lgrhs] llocals <- m_grhss match -#endif , L _ EmptyLocalBinds {} <- llocals -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ , L _ (GRHS _ [] body) <- lgrhs -#else - , L _ (GRHS [] body) <- lgrhs -#endif -> do patDocs <- zip (True : repeat False) pats `forM` \(isFirst, p) -> fmap return $ do @@ -166,52 +132,26 @@ ] HsLam{} -> unknownNodeError "HsLam too complex" lexpr -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsLamCase _ XMatchGroup{} -> error "brittany internal error: HsLamCase XMatchGroup" -#endif -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsLamCase _ (MG _ (L _ []) _) -> do -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.2 8.4*/ - HsLamCase (MG (L _ []) _ _ _) -> do -#else /* ghc-8.0 */ - HsLamCase _ (MG (L _ []) _ _ _) -> do -#endif docSetParSpacing $ docAddBaseY BrIndentRegular $ (docLit $ Text.pack "\\case {}") -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsLamCase _ (MG _ lmatches@(L _ matches) _) -> do -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.2 8.4*/ - HsLamCase (MG lmatches@(L _ matches) _ _ _) -> do -#else /* ghc-8.0 */ - HsLamCase _ (MG lmatches@(L _ matches) _ _ _) -> do -#endif binderDoc <- docLit $ Text.pack "->" funcPatDocs <- docWrapNode lmatches $ layoutPatternBind Nothing binderDoc `mapM` matches docSetParSpacing $ docAddBaseY BrIndentRegular $ docPar (docLit $ Text.pack "\\case") (docSetBaseAndIndent $ docNonBottomSpacing $ docLines $ return <$> funcPatDocs) -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsApp _ exp1@(L _ HsApp{}) exp2 -> do -#else - HsApp exp1@(L _ HsApp{}) exp2 -> do -#endif let gather :: [LHsExpr GhcPs] -> LHsExpr GhcPs -> (LHsExpr GhcPs, [LHsExpr GhcPs]) gather list = \case -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ L _ (HsApp _ l r) -> gather (r:list) l -#else - L _ (HsApp l r) -> gather (r:list) l -#endif x -> (x, list) let (headE, paramEs) = gather [exp2] exp1 let colsOrSequence = case headE of -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ L _ (HsVar _ (L _ (Unqual occname))) -> -#else - L _ (HsVar (L _ (Unqual occname))) -> -#endif docCols (ColApp $ Text.pack $ occNameString occname) _ -> docSeq headDoc <- docSharedWrapper layoutExpr headE @@ -257,11 +197,7 @@ ( docNonBottomSpacing $ docLines paramDocs ) -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsApp _ exp1 exp2 -> do -#else - HsApp exp1 exp2 -> do -#endif -- TODO: if expDoc1 is some literal, we may want to create a docCols here. expDoc1 <- docSharedWrapper layoutExpr exp1 expDoc2 <- docSharedWrapper layoutExpr exp2 @@ -303,14 +239,10 @@ HsAppType _ _ XHsWildCardBndrs{} -> error "brittany internal error: HsAppType XHsWildCardBndrs" HsAppType _ exp1 (HsWC _ ty1) -> do -#elif MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ +#else HsAppType XHsWildCardBndrs{} _ -> error "brittany internal error: HsAppType XHsWildCardBndrs" HsAppType (HsWC _ ty1) exp1 -> do -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.2 8.4 */ - HsAppType exp1 (HsWC _ ty1) -> do -#else /* ghc-8.0 */ - HsAppType exp1 (HsWC _ _ ty1) -> do #endif t <- docSharedWrapper layoutType ty1 e <- docSharedWrapper layoutExpr exp1 @@ -325,23 +257,10 @@ e (docSeq [docLit $ Text.pack "@", t ]) ] -#if !MIN_VERSION_ghc(8,6,0) /* ghc-8.0 8.2 8.4 */ - HsAppTypeOut{} -> do - -- TODO - briDocByExactInlineOnly "HsAppTypeOut{}" lexpr -#endif -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ OpApp _ expLeft@(L _ OpApp{}) expOp expRight -> do -#else - OpApp expLeft@(L _ OpApp{}) expOp _ expRight -> do -#endif let gather :: [(LHsExpr GhcPs, LHsExpr GhcPs)] -> LHsExpr GhcPs -> (LHsExpr GhcPs, [(LHsExpr GhcPs, LHsExpr GhcPs)]) gather opExprList = \case -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ (L _ (OpApp _ l1 op1 r1)) -> gather ((op1, r1): opExprList) l1 -#else - (L _ (OpApp l1 op1 _ r1)) -> gather ((op1, r1): opExprList) l1 -#endif final -> (final, opExprList) (leftOperand, appList) = gather [] expLeft leftOperandDoc <- docSharedWrapper layoutExpr leftOperand @@ -355,19 +274,11 @@ hasComLeft <- hasAnyCommentsConnected expLeft hasComOp <- hasAnyCommentsConnected expOp pure $ not hasComLeft && not hasComOp -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ let allowPar = case (expOp, expRight) of (L _ (HsVar _ (L _ (Unqual occname))), _) | occNameString occname == "$" -> True (_, L _ (HsApp _ _ (L _ HsVar{}))) -> False _ -> True -#else - let allowPar = case (expOp, expRight) of - (L _ (HsVar (L _ (Unqual occname))), _) - | occNameString occname == "$" -> True - (_, L _ (HsApp _ (L _ HsVar{}))) -> False - _ -> True -#endif runFilteredAlternative $ do -- > one + two + three -- or @@ -405,27 +316,15 @@ $ (appListDocs <&> \(od, ed) -> docCols ColOpPrefix [appSep od, docSetBaseY ed]) ++ [docCols ColOpPrefix [appSep opLastDoc, docSetBaseY expLastDoc]] ) -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ OpApp _ expLeft expOp expRight -> do -#else - OpApp expLeft expOp _ expRight -> do -#endif expDocLeft <- docSharedWrapper layoutExpr expLeft expDocOp <- docSharedWrapper layoutExpr expOp expDocRight <- docSharedWrapper layoutExpr expRight -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ let allowPar = case (expOp, expRight) of (L _ (HsVar _ (L _ (Unqual occname))), _) | occNameString occname == "$" -> True (_, L _ (HsApp _ _ (L _ HsVar{}))) -> False _ -> True -#else - let allowPar = case (expOp, expRight) of - (L _ (HsVar (L _ (Unqual occname))), _) - | occNameString occname == "$" -> True - (_, L _ (HsApp _ (L _ HsVar{}))) -> False - _ -> True -#endif let leftIsDoBlock = case expLeft of L _ HsDo{} -> True _ -> False @@ -471,20 +370,12 @@ then docLines [expDocLeft, expDocOpAndRight] else docAddBaseY BrIndentRegular $ docPar expDocLeft expDocOpAndRight -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ NegApp _ op _ -> do -#else - NegApp op _ -> do -#endif opDoc <- docSharedWrapper layoutExpr op docSeq [ docLit $ Text.pack "-" , opDoc ] -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsPar _ innerExp -> do -#else - HsPar innerExp -> do -#endif innerExpDoc <- docSharedWrapper (docWrapNode lexpr . layoutExpr) innerExp docAlt [ docSeq @@ -500,36 +391,25 @@ , docLit $ Text.pack ")" ] ] -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ SectionL _ left op -> do -- TODO: add to testsuite -#else - SectionL left op -> do -- TODO: add to testsuite -#endif leftDoc <- docSharedWrapper layoutExpr left opDoc <- docSharedWrapper layoutExpr op docSeq [leftDoc, docSeparator, opDoc] -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ SectionR _ op right -> do -- TODO: add to testsuite -#else - SectionR op right -> do -- TODO: add to testsuite -#endif opDoc <- docSharedWrapper layoutExpr op rightDoc <- docSharedWrapper layoutExpr right docSeq [opDoc, docSeparator, rightDoc] -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ ExplicitTuple _ args boxity -> do -#else - ExplicitTuple args boxity -> do -#endif -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ let argExprs = args <&> \arg -> case arg of (L _ (Present _ e)) -> (arg, Just e); - (L _ (Missing NoExt)) -> (arg, Nothing) + (L _ (Missing NoExtField)) -> (arg, Nothing) (L _ XTupArg{}) -> error "brittany internal error: XTupArg" #else let argExprs = args <&> \arg -> case arg of - (L _ (Present e)) -> (arg, Just e); - (L _ (Missing PlaceHolder)) -> (arg, Nothing) + (L _ (Present _ e)) -> (arg, Just e); + (L _ (Missing NoExt)) -> (arg, Nothing) + (L _ XTupArg{}) -> error "brittany internal error: XTupArg" #endif argDocs <- forM argExprs $ docSharedWrapper @@ -575,15 +455,9 @@ lineN = docCols ColTuples [docCommaSep, docNodeAnnKW lexpr (Just AnnOpenP) eN] end = closeLit in docSetBaseY $ docLines $ [start] ++ linesM ++ [lineN, end] -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsCase _ _ XMatchGroup{} -> error "brittany internal error: HsCase XMatchGroup" -#endif -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsCase _ cExp (MG _ (L _ []) _) -> do -#else - HsCase cExp (MG (L _ []) _ _ _) -> do -#endif cExpDoc <- docSharedWrapper layoutExpr cExp docAlt [ docAddBaseY BrIndentRegular @@ -598,11 +472,7 @@ ) (docLit $ Text.pack "of {}") ] -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsCase _ cExp (MG _ lmatches@(L _ matches) _) -> do -#else - HsCase cExp (MG lmatches@(L _ matches) _ _ _) -> do -#endif cExpDoc <- docSharedWrapper layoutExpr cExp binderDoc <- docLit $ Text.pack "->" funcPatDocs <- docWrapNode lmatches @@ -626,11 +496,7 @@ (docSetBaseAndIndent $ docNonBottomSpacing $ docLines $ return <$> funcPatDocs) ) ] -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsIf _ _ ifExpr thenExpr elseExpr -> do -#else - HsIf _ ifExpr thenExpr elseExpr -> do -#endif ifExprDoc <- docSharedWrapper layoutExpr ifExpr thenExprDoc <- docSharedWrapper layoutExpr thenExpr elseExprDoc <- docSharedWrapper layoutExpr elseExpr @@ -750,11 +616,7 @@ docSetParSpacing $ docAddBaseY BrIndentRegular $ docPar (docLit $ Text.pack "if") (layoutPatternBindFinal Nothing binderDoc Nothing clauseDocs Nothing hasComments) -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsLet _ binds exp1 -> do -#else - HsLet binds exp1 -> do -#endif expDoc1 <- docSharedWrapper layoutExpr exp1 -- We jump through some ugly hoops here to ensure proper sharing. hasComments <- hasAnyCommentsBelow lexpr @@ -860,11 +722,7 @@ ] _ -> docSeq [appSep $ docLit $ Text.pack "let in", expDoc1] -- docSeq [appSep $ docLit "let in", expDoc1] -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsDo _ stmtCtx (L _ stmts) -> case stmtCtx of -#else - HsDo stmtCtx (L _ stmts) _ -> case stmtCtx of -#endif DoExpr -> do stmtDocs <- docSharedWrapper layoutStmt `mapM` stmts docSetParSpacing @@ -959,53 +817,40 @@ in docSetBaseY $ docLines $ [start] ++ linesM ++ [lineN] ++ [end] ExplicitList _ _ [] -> docLit $ Text.pack "[]" -#if !MIN_VERSION_ghc(8,6,0) /* ghc-8.0 8.2 8.4 */ - ExplicitPArr{} -> do - -- TODO - briDocByExactInlineOnly "ExplicitPArr{}" lexpr -#endif -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ RecordCon _ lname fields -> -#else - RecordCon lname _ _ fields -> -#endif case fields of HsRecFields fs Nothing -> do let nameDoc = docWrapNode lname $ docLit $ lrdrNameToText lname rFs <- fs `forM` \lfield@(L _ (HsRecField (L _ fieldOcc) rFExpr pun)) -> do -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ let FieldOcc _ lnameF = fieldOcc -#else - let FieldOcc lnameF _ = fieldOcc -#endif rFExpDoc <- if pun then return Nothing else Just <$> docSharedWrapper layoutExpr rFExpr return $ (lfield, lrdrNameToText lnameF, rFExpDoc) recordExpression False indentPolicy lexpr nameDoc rFs +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ + HsRecFields [] (Just (L _ 0)) -> do +#else HsRecFields [] (Just 0) -> do +#endif let t = lrdrNameToText lname docWrapNode lname $ docLit $ t <> Text.pack " { .. }" +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ + HsRecFields fs@(_:_) (Just (L _ dotdoti)) | dotdoti == length fs -> do +#else HsRecFields fs@(_:_) (Just dotdoti) | dotdoti == length fs -> do +#endif let nameDoc = docWrapNode lname $ docLit $ lrdrNameToText lname fieldDocs <- fs `forM` \fieldl@(L _ (HsRecField (L _ fieldOcc) fExpr pun)) -> do -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ let FieldOcc _ lnameF = fieldOcc -#else - let FieldOcc lnameF _ = fieldOcc -#endif fExpDoc <- if pun then return Nothing else Just <$> docSharedWrapper layoutExpr fExpr return (fieldl, lrdrNameToText lnameF, fExpDoc) recordExpression True indentPolicy lexpr nameDoc fieldDocs _ -> unknownNodeError "RecordCon with puns" lexpr -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ RecordUpd _ rExpr fields -> do -#else - RecordUpd rExpr fields _ _ _ _ -> do -#endif rExprDoc <- docSharedWrapper layoutExpr rExpr rFs <- fields `forM` \lfield@(L _ (HsRecField (L _ ambName) rFExpr pun)) -> do @@ -1013,15 +858,10 @@ then return Nothing else Just <$> docSharedWrapper layoutExpr rFExpr return $ case ambName of -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ Unambiguous _ n -> (lfield, lrdrNameToText n, rFExpDoc) Ambiguous _ n -> (lfield, lrdrNameToText n, rFExpDoc) XAmbiguousFieldOcc{} -> error "brittany internal error: XAmbiguousFieldOcc" -#else - Unambiguous n _ -> (lfield, lrdrNameToText n, rFExpDoc) - Ambiguous n _ -> (lfield, lrdrNameToText n, rFExpDoc) -#endif recordExpression False indentPolicy lexpr rExprDoc rFs #if MIN_VERSION_ghc(8,8,0) /* ghc-8.6 */ ExprWithTySig _ _ (HsWC _ XHsImplicitBndrs{}) -> @@ -1029,16 +869,12 @@ ExprWithTySig _ _ XHsWildCardBndrs{} -> error "brittany internal error: ExprWithTySig XHsWildCardBndrs" ExprWithTySig _ exp1 (HsWC _ (HsIB _ typ1)) -> do -#elif MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ +#else ExprWithTySig (HsWC _ XHsImplicitBndrs{}) _ -> error "brittany internal error: ExprWithTySig HsWC XHsImplicitBndrs" ExprWithTySig XHsWildCardBndrs{} _ -> error "brittany internal error: ExprWithTySig XHsWildCardBndrs" ExprWithTySig (HsWC _ (HsIB _ typ1)) exp1 -> do -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.2 8,4 */ - ExprWithTySig exp1 (HsWC _ (HsIB _ typ1 _)) -> do -#else /* ghc-8.0 */ - ExprWithTySig exp1 (HsIB _ (HsWC _ _ typ1)) -> do #endif expDoc <- docSharedWrapper layoutExpr exp1 typDoc <- docSharedWrapper layoutType typ1 @@ -1047,11 +883,6 @@ , appSep $ docLit $ Text.pack "::" , typDoc ] -#if !MIN_VERSION_ghc(8,6,0) /* ghc-8.0 8.2 8.4 */ - ExprWithTySigOut{} -> do - -- TODO - briDocByExactInlineOnly "ExprWithTySigOut{}" lexpr -#endif ArithSeq _ Nothing info -> case info of From e1 -> do @@ -1096,11 +927,6 @@ ] ArithSeq{} -> briDocByExactInlineOnly "ArithSeq" lexpr -#if !MIN_VERSION_ghc(8,6,0) /* ghc-8.0 8.2 8.4 */ - PArrSeq{} -> do - -- TODO - briDocByExactInlineOnly "PArrSeq{}" lexpr -#endif HsSCC{} -> do -- TODO briDocByExactInlineOnly "HsSCC{}" lexpr @@ -1116,11 +942,7 @@ HsTcBracketOut{} -> do -- TODO briDocByExactInlineOnly "HsTcBracketOut{}" lexpr -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsSpliceE _ (HsQuasiQuote _ _ quoter _loc content) -> do -#else - HsSpliceE (HsQuasiQuote _ quoter _loc content) -> do -#endif allocateNode $ BDFPlain (Text.pack $ "[" @@ -1137,12 +959,15 @@ HsStatic{} -> do -- TODO briDocByExactInlineOnly "HsStatic{}" lexpr +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +#else HsArrApp{} -> do -- TODO briDocByExactInlineOnly "HsArrApp{}" lexpr HsArrForm{} -> do -- TODO briDocByExactInlineOnly "HsArrForm{}" lexpr +#endif HsTick{} -> do -- TODO briDocByExactInlineOnly "HsTick{}" lexpr @@ -1152,13 +977,11 @@ HsTickPragma{} -> do -- TODO briDocByExactInlineOnly "HsTickPragma{}" lexpr +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +#else EWildPat{} -> do docLit $ Text.pack "_" -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ EAsPat _ asName asExpr -> do -#else - EAsPat asName asExpr -> do -#endif docSeq [ docLit $ lrdrNameToText asName <> Text.pack "@" , layoutExpr asExpr @@ -1169,20 +992,17 @@ ELazyPat{} -> do -- TODO briDocByExactInlineOnly "ELazyPat{}" lexpr +#endif HsWrap{} -> do -- TODO briDocByExactInlineOnly "HsWrap{}" lexpr -#if MIN_VERSION_ghc(8,2,0) /* ghc-8.2 */ HsConLikeOut{} -> do -- TODO briDocByExactInlineOnly "HsWrap{}" lexpr ExplicitSum{} -> do -- TODO briDocByExactInlineOnly "ExplicitSum{}" lexpr -#endif -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ XExpr{} -> error "brittany internal error: XExpr" -#endif recordExpression :: (Data.Data.Data lExpr, Data.Data.Data name) @@ -1320,7 +1140,6 @@ in [line1] ++ lineR ++ [dotdotLine, lineN] ) -#if MIN_VERSION_ghc(8,4,0) /* ghc-8.4 */ litBriDoc :: HsLit GhcPs -> BriDocFInt litBriDoc = \case HsChar (SourceText t) _c -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ ['\'', c, '\''] @@ -1344,50 +1163,3 @@ HsFractional (FL (SourceText t) _ _) -> BDFLit $ Text.pack t HsIsString (SourceText t) _ -> BDFLit $ Text.pack t _ -> error "overLitValBriDoc: literal with no SourceText" -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.2 */ -litBriDoc :: HsLit -> BriDocFInt -litBriDoc = \case - HsChar (SourceText t) _c -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ ['\'', c, '\''] - HsCharPrim (SourceText t) _c -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ ['\'', c, '\''] - HsString (SourceText t) _fastString -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ FastString.unpackFS fastString - HsStringPrim (SourceText t) _byteString -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ Data.ByteString.Char8.unpack byteString - HsInt (SourceText t) _i -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ show i - HsIntPrim (SourceText t) _i -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ show i - HsWordPrim (SourceText t) _i -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ show i - HsInt64Prim (SourceText t) _i -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ show i - HsWord64Prim (SourceText t) _i -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ show i - HsInteger (SourceText t) _i _type -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ show i - HsRat (FL t _) _type -> BDFLit $ Text.pack t - HsFloatPrim (FL t _) -> BDFLit $ Text.pack t - HsDoublePrim (FL t _) -> BDFLit $ Text.pack t - _ -> error "litBriDoc: literal with no SourceText" - -overLitValBriDoc :: OverLitVal -> BriDocFInt -overLitValBriDoc = \case - HsIntegral (SourceText t) _ -> BDFLit $ Text.pack t - HsFractional (FL t _) -> BDFLit $ Text.pack t - HsIsString (SourceText t) _ -> BDFLit $ Text.pack t - _ -> error "overLitValBriDoc: literal with no SourceText" -#else /* ghc-8.0 */ -litBriDoc :: HsLit -> BriDocFInt -litBriDoc = \case - HsChar t _c -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ ['\'', c, '\''] - HsCharPrim t _c -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ ['\'', c, '\''] - HsString t _fastString -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ FastString.unpackFS fastString - HsStringPrim t _byteString -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ Data.ByteString.Char8.unpack byteString - HsInt t _i -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ show i - HsIntPrim t _i -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ show i - HsWordPrim t _i -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ show i - HsInt64Prim t _i -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ show i - HsWord64Prim t _i -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ show i - HsInteger t _i _type -> BDFLit $ Text.pack t -- BDFLit $ Text.pack $ show i - HsRat (FL t _) _type -> BDFLit $ Text.pack t - HsFloatPrim (FL t _) -> BDFLit $ Text.pack t - HsDoublePrim (FL t _) -> BDFLit $ Text.pack t - -overLitValBriDoc :: OverLitVal -> BriDocFInt -overLitValBriDoc = \case - HsIntegral t _ -> BDFLit $ Text.pack t - HsFractional (FL t _) -> BDFLit $ Text.pack t - HsIsString t _ -> BDFLit $ Text.pack t -#endif diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs-boot b/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs-boot --- a/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs-boot +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs-boot @@ -15,7 +15,11 @@ import Language.Haskell.Brittany.Internal.LayouterBasics import GHC ( runGhc, GenLocated(L), moduleNameString ) +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +#else import HsSyn +#endif import Name @@ -24,10 +28,6 @@ -- layoutStmt :: ToBriDoc' (StmtLR GhcPs GhcPs (LHsExpr GhcPs)) -#if MIN_VERSION_ghc(8,4,0) /* ghc-8.4 */ litBriDoc :: HsLit GhcPs -> BriDocFInt -#else /* ghc-8.0 && ghc-8.2 */ -litBriDoc :: HsLit -> BriDocFInt -#endif overLitValBriDoc :: OverLitVal -> BriDocFInt diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/IE.hs b/src/Language/Haskell/Brittany/Internal/Layouters/IE.hs --- a/src/Language/Haskell/Brittany/Internal/Layouters/IE.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/IE.hs @@ -18,9 +18,14 @@ , AnnKeywordId(..) , Located ) +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +import GHC.Hs.ImpExp +#else import HsSyn -import Name import HsImpExp +#endif +import Name import FieldLabel import qualified FastString import BasicTypes @@ -29,42 +34,17 @@ -#if MIN_VERSION_ghc(8,2,0) prepareName :: LIEWrappedName name -> Located name prepareName = ieLWrappedName -#else -prepareName :: Located name -> Located name -prepareName = id -#endif layoutIE :: ToBriDoc IE layoutIE lie@(L _ ie) = docWrapNode lie $ case ie of -#if MIN_VERSION_ghc(8,6,0) IEVar _ x -> layoutWrapped lie x -#else - IEVar x -> layoutWrapped lie x -#endif -#if MIN_VERSION_ghc(8,6,0) IEThingAbs _ x -> layoutWrapped lie x -#else - IEThingAbs x -> layoutWrapped lie x -#endif -#if MIN_VERSION_ghc(8,6,0) IEThingAll _ x -> docSeq [layoutWrapped lie x, docLit $ Text.pack "(..)"] -#else - IEThingAll x -> docSeq [layoutWrapped lie x, docLit $ Text.pack "(..)"] -#endif -#if MIN_VERSION_ghc(8,6,0) IEThingWith _ x (IEWildcard _) _ _ -> -#else - IEThingWith x (IEWildcard _) _ _ -> -#endif docSeq [layoutWrapped lie x, docLit $ Text.pack "(..)"] -#if MIN_VERSION_ghc(8,6,0) IEThingWith _ x _ ns _ -> do -#else - IEThingWith x _ ns _ -> do -#endif hasComments <- orM ( hasCommentsBetween lie AnnOpenP AnnCloseP : hasAnyCommentsBelow x @@ -95,18 +75,13 @@ $ [docSeq [docParenLSep, docWrapNode n1 $ nameDoc n1]] ++ map layoutItem nMs ++ [docSeq [docCommaSep, docNodeAnnKW lie (Just AnnOpenP) $ nameDoc nN], docParenR] -#if MIN_VERSION_ghc(8,6,0) IEModuleContents _ n -> docSeq -#else - IEModuleContents n -> docSeq -#endif [ docLit $ Text.pack "module" , docSeparator , docLit . Text.pack . moduleNameString $ unLoc n ] _ -> docEmpty where -#if MIN_VERSION_ghc(8,2,0) /* ghc-8.2, 8.4, .. */ layoutWrapped _ = \case L _ (IEName n) -> docLit =<< lrdrNameToTextAnn n L _ (IEPattern n) -> do @@ -115,16 +90,6 @@ L _ (IEType n) -> do name <- lrdrNameToTextAnn n docLit $ Text.pack "type " <> name -#else /* ghc-8.0 */ - layoutWrapped outer n = do - name <- lrdrNameToTextAnn n - hasType <- hasAnnKeyword n AnnType - hasPattern <- hasAnnKeyword outer AnnPattern - docLit $ if - | hasType -> Text.pack "type (" <> name <> Text.pack ")" - | hasPattern -> Text.pack "pattern " <> name - | otherwise -> name -#endif -- Helper function to deal with Located lists of LIEs. -- In particular this will also associate documentation diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Import.hs b/src/Language/Haskell/Brittany/Internal/Layouters/Import.hs --- a/src/Language/Haskell/Brittany/Internal/Layouters/Import.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Import.hs @@ -12,7 +12,11 @@ , moduleNameString , Located ) +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +#else import HsSyn +#endif import Name import FieldLabel import qualified FastString @@ -22,32 +26,18 @@ -#if MIN_VERSION_ghc(8,2,0) prepPkg :: SourceText -> String prepPkg rawN = case rawN of SourceText n -> n -- This would be odd to encounter and the -- result will most certainly be wrong NoSourceText -> "" -#else -prepPkg :: String -> String -prepPkg = id -#endif -#if MIN_VERSION_ghc(8,2,0) prepModName :: Located e -> e prepModName = unLoc -#else -prepModName :: e -> e -prepModName = id -#endif layoutImport :: ToBriDoc ImportDecl layoutImport limportD@(L _ importD) = docWrapNode limportD $ case importD of -#if MIN_VERSION_ghc(8,6,0) ImportDecl _ _ (L _ modName) pkg src safe q False mas mllies -> do -#else - ImportDecl _ (L _ modName) pkg src safe q False mas mllies -> do -#endif importCol <- mAsk <&> _conf_layout .> _lconfig_importColumn .> confUnpack importAsCol <- mAsk <&> _conf_layout .> _lconfig_importAsColumn .> confUnpack indentPolicy <- mAsk <&> _conf_layout .> _lconfig_indentPolicy .> confUnpack @@ -59,7 +49,11 @@ hiding = maybe False fst mllies minQLength = length "import qualified " qLengthReal = +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ + let qualifiedPart = if q /= NotQualified then length "qualified " else 0 +#else let qualifiedPart = if q then length "qualified " else 0 +#endif safePart = if safe then length "safe " else 0 pkgPart = maybe 0 ((+ 1) . Text.length) pkgNameT srcPart = if src then length "{-# SOURCE #-} " else 0 @@ -73,7 +67,11 @@ [ appSep $ docLit $ Text.pack "import" , if src then appSep $ docLit $ Text.pack "{-# SOURCE #-}" else docEmpty , if safe then appSep $ docLit $ Text.pack "safe" else docEmpty +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ + , if q /= NotQualified then appSep $ docLit $ Text.pack "qualified" else docEmpty +#else , if q then appSep $ docLit $ Text.pack "qualified" else docEmpty +#endif , maybe docEmpty (appSep . docLit) pkgNameT ] indentName = diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Module.hs b/src/Language/Haskell/Brittany/Internal/Layouters/Module.hs --- a/src/Language/Haskell/Brittany/Internal/Layouters/Module.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Module.hs @@ -9,9 +9,14 @@ import Language.Haskell.Brittany.Internal.Config.Types import GHC (unLoc, runGhc, GenLocated(L), moduleNameString, AnnKeywordId(..)) +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +import GHC.Hs.ImpExp +#else import HsSyn -import Name import HsImpExp +#endif +import Name import FieldLabel import qualified FastString import BasicTypes diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Pattern.hs b/src/Language/Haskell/Brittany/Internal/Layouters/Pattern.hs --- a/src/Language/Haskell/Brittany/Internal/Layouters/Pattern.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Pattern.hs @@ -21,7 +21,11 @@ , ol_val ) import qualified GHC +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +#else import HsSyn +#endif import Name import BasicTypes @@ -44,26 +48,16 @@ layoutPat (ghcDL -> lpat@(L _ pat)) = docWrapNode lpat $ case pat of WildPat _ -> fmap Seq.singleton $ docLit $ Text.pack "_" -- _ -> expr -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ VarPat _ n -> -#else /* ghc-8.0 8.2 8.4 */ - VarPat n -> -#endif fmap Seq.singleton $ docLit $ lrdrNameToText n -- abc -> expr -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ LitPat _ lit -> -#else /* ghc-8.0 8.2 8.4 */ - LitPat lit -> -#endif fmap Seq.singleton $ allocateNode $ litBriDoc lit -- 0 -> expr #if MIN_VERSION_ghc(8,8,0) /* ghc-8.8 */ ParPat _ inner -> do -#elif MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ +#else ParPat _ inner -> do -#else /* ghc-8.0 8.2 8.4 */ - ParPat inner -> do #endif -- (nestedpat) -> expr left <- docLit $ Text.pack "(" @@ -113,11 +107,7 @@ -- Abc { a, b, c } -> expr2 let t = lrdrNameToText lname fds <- fs `forM` \(L _ (HsRecField (L _ fieldOcc) fPat pun)) -> do -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ let FieldOcc _ lnameF = fieldOcc -#else - let FieldOcc lnameF _ = fieldOcc -#endif fExpDoc <- if pun then return Nothing else Just <$> docSharedWrapper layoutPat fPat @@ -136,22 +126,26 @@ , docSeparator , docLit $ Text.pack "}" ] +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ + ConPatIn lname (RecCon (HsRecFields [] (Just (L _ 0)))) -> do +#else ConPatIn lname (RecCon (HsRecFields [] (Just 0))) -> do +#endif -- Abc { .. } -> expr let t = lrdrNameToText lname Seq.singleton <$> docSeq [ appSep $ docLit t , docLit $ Text.pack "{..}" ] +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ + ConPatIn lname (RecCon (HsRecFields fs@(_:_) (Just (L _ dotdoti)))) | dotdoti == length fs -> do +#else ConPatIn lname (RecCon (HsRecFields fs@(_:_) (Just dotdoti))) | dotdoti == length fs -> do +#endif -- Abc { a = locA, .. } let t = lrdrNameToText lname fds <- fs `forM` \(L _ (HsRecField (L _ fieldOcc) fPat pun)) -> do -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ let FieldOcc _ lnameF = fieldOcc -#else - let FieldOcc lnameF _ = fieldOcc -#endif fExpDoc <- if pun then return Nothing else Just <$> docSharedWrapper layoutPat fPat @@ -169,31 +163,19 @@ (fieldName, Nothing) -> [docLit fieldName, docCommaSep] , docLit $ Text.pack "..}" ] -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ TuplePat _ args boxity -> do -#else - TuplePat args boxity _ -> do -#endif -- (nestedpat1, nestedpat2, nestedpat3) -> expr -- (#nestedpat1, nestedpat2, nestedpat3#) -> expr case boxity of Boxed -> wrapPatListy args "()" docParenL docParenR Unboxed -> wrapPatListy args "(##)" docParenHashLSep docParenHashRSep -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ AsPat _ asName asPat -> do -#else - AsPat asName asPat -> do -#endif -- bind@nestedpat -> expr wrapPatPrepend asPat (docLit $ lrdrNameToText asName <> Text.pack "@") #if MIN_VERSION_ghc(8,8,0) /* ghc-8.8 */ SigPat _ pat1 (HsWC _ (HsIB _ ty1)) -> do -#elif MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ +#else SigPat (HsWC _ (HsIB _ ty1)) pat1 -> do -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.2 8.4 */ - SigPatIn pat1 (HsWC _ (HsIB _ ty1 _)) -> do -#else /* ghc-8.0 */ - SigPatIn pat1 (HsIB _ (HsWC _ _ ty1)) -> do #endif -- i :: Int -> expr patDocs <- layoutPat pat1 @@ -214,33 +196,17 @@ , docForceSingleline tyDoc ] return $ xR Seq.|> xN' -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ ListPat _ elems -> -#else - ListPat elems _ _ -> -#endif -- [] -> expr1 -- [nestedpat1, nestedpat2, nestedpat3] -> expr2 wrapPatListy elems "[]" docBracketL docBracketR -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ BangPat _ pat1 -> do -#else - BangPat pat1 -> do -#endif -- !nestedpat -> expr wrapPatPrepend pat1 (docLit $ Text.pack "!") -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ LazyPat _ pat1 -> do -#else - LazyPat pat1 -> do -#endif -- ~nestedpat -> expr wrapPatPrepend pat1 (docLit $ Text.pack "~") -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ NPat _ llit@(L _ ol) mNegative _ -> do -#else - NPat llit@(L _ ol) mNegative _ _ -> do -#endif -- -13 -> expr litDoc <- docWrapNode llit $ allocateNode $ overLitValBriDoc $ GHC.ol_val ol negDoc <- docLit $ Text.pack "-" @@ -248,11 +214,6 @@ Just{} -> Seq.fromList [negDoc, litDoc] Nothing -> Seq.singleton litDoc --- if MIN_VERSION_ghc(8,0,0) --- VarPat n -> return $ stringLayouter lpat $ lrdrNameToText n --- else --- VarPat n -> return $ stringLayouter lpat $ rdrNameToText n --- endif _ -> return <$> briDocByExactInlineOnly "some unknown pattern" (ghcDL lpat) colsWrapPat :: Seq BriDocNumbered -> ToBriDocM BriDocNumbered diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs b/src/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs --- a/src/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs @@ -17,7 +17,11 @@ , GenLocated(L) , moduleNameString ) +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +#else import HsSyn +#endif import Name import qualified FastString import BasicTypes @@ -34,17 +38,9 @@ indentAmount :: Int <- mAsk <&> _conf_layout .> _lconfig_indentAmount .> confUnpack docWrapNode lstmt $ case stmt of -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ LastStmt _ body False _ -> do -#else - LastStmt body False _ -> do -#endif layoutExpr body -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ BindStmt _ lPat expr _ _ -> do -#else - BindStmt lPat expr _ _ _ -> do -#endif patDoc <- fmap return $ colsWrapPat =<< layoutPat lPat expDoc <- docSharedWrapper layoutExpr expr docAlt @@ -63,11 +59,7 @@ $ docPar (docLit $ Text.pack "<-") (expDoc) ] ] -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ LetStmt _ binds -> do -#else - LetStmt binds -> do -#endif let isFree = indentPolicy == IndentPolicyFree let indentFourPlus = indentAmount >= 4 layoutLocalBinds binds >>= \case @@ -112,11 +104,7 @@ $ docAddBaseY BrIndentRegular $ docPar (docLit $ Text.pack "let") (docSetBaseAndIndent $ docLines $ return <$> bindDocs) -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ RecStmt _ stmts _ _ _ _ _ -> runFilteredAlternative $ do -#else - RecStmt stmts _ _ _ _ _ _ _ _ _ -> runFilteredAlternative $ do -#endif -- rec stmt1 -- stmt2 -- stmt3 @@ -132,11 +120,7 @@ addAlternative $ docAddBaseY BrIndentRegular $ docPar (docLit (Text.pack "rec")) (docLines $ layoutStmt <$> stmts) -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ BodyStmt _ expr _ _ -> do -#else - BodyStmt expr _ _ _ -> do -#endif expDoc <- docSharedWrapper layoutExpr expr docAddBaseY BrIndentRegular $ expDoc _ -> briDocByExactInlineOnly "some unknown statement" lstmt diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs-boot b/src/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs-boot --- a/src/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs-boot +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Stmt.hs-boot @@ -13,7 +13,11 @@ import Language.Haskell.Brittany.Internal.LayouterBasics import GHC ( runGhc, GenLocated(L), moduleNameString ) +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +#else import HsSyn +#endif import Name import qualified FastString import BasicTypes diff --git a/src/Language/Haskell/Brittany/Internal/Layouters/Type.hs b/src/Language/Haskell/Brittany/Internal/Layouters/Type.hs --- a/src/Language/Haskell/Brittany/Internal/Layouters/Type.hs +++ b/src/Language/Haskell/Brittany/Internal/Layouters/Type.hs @@ -25,7 +25,11 @@ , AnnKeywordId (..) ) import Language.Haskell.GHC.ExactPrint.Types ( mkAnnKey ) +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs +#else import HsSyn +#endif import Name import Outputable ( ftext, showSDocUnsafe ) import BasicTypes @@ -38,17 +42,12 @@ layoutType :: ToBriDoc HsType layoutType ltype@(L _ typ) = docWrapNode ltype $ case typ of -- _ | traceShow (ExactPrint.Types.mkAnnKey ltype) False -> error "impossible" -#if MIN_VERSION_ghc(8,2,0) -#if MIN_VERSION_ghc(8,6,0) HsTyVar _ promoted name -> do -#else /* ghc-8.2 ghc-8.4 */ - HsTyVar promoted name -> do -#endif t <- lrdrNameToTextAnnTypeEqualityIsSpecial name case promoted of #if MIN_VERSION_ghc(8,8,0) IsPromoted -> docSeq -#else /* ghc-8.2 8.4 8.6 */ +#else /* ghc-8.6 */ Promoted -> docSeq #endif [ docSeparator @@ -56,15 +55,10 @@ , docWrapNode name $ docLit t ] NotPromoted -> docWrapNode name $ docLit t -#else /* ghc-8.0 */ - HsTyVar name -> do - t <- lrdrNameToTextAnnTypeEqualityIsSpecial name - docWrapNode name $ docLit t -#endif -#if MIN_VERSION_ghc(8,6,0) - HsForAllTy _ bndrs (L _ (HsQualTy _ (L _ cntxts) typ2)) -> do +#if MIN_VERSION_ghc(8,10,1) + HsForAllTy _ _ bndrs (L _ (HsQualTy _ (L _ cntxts) typ2)) -> do #else - HsForAllTy bndrs (L _ (HsQualTy (L _ cntxts) typ2)) -> do + HsForAllTy _ bndrs (L _ (HsQualTy _ (L _ cntxts) typ2)) -> do #endif typeDoc <- docSharedWrapper layoutType typ2 tyVarDocs <- layoutTyVarBndrs bndrs @@ -151,10 +145,10 @@ ] ) ] -#if MIN_VERSION_ghc(8,6,0) - HsForAllTy _ bndrs typ2 -> do +#if MIN_VERSION_ghc(8,10,1) + HsForAllTy _ _ bndrs typ2 -> do #else - HsForAllTy bndrs typ2 -> do + HsForAllTy _ bndrs typ2 -> do #endif typeDoc <- layoutType typ2 tyVarDocs <- layoutTyVarBndrs bndrs @@ -210,11 +204,7 @@ ] ) ] -#if MIN_VERSION_ghc(8,6,0) HsQualTy _ lcntxts@(L _ cntxts) typ1 -> do -#else - HsQualTy lcntxts@(L _ cntxts) typ1 -> do -#endif typeDoc <- docSharedWrapper layoutType typ1 cntxtDocs <- cntxts `forM` docSharedWrapper layoutType let @@ -264,11 +254,7 @@ ] ) ] -#if MIN_VERSION_ghc(8,6,0) HsFunTy _ typ1 typ2 -> do -#else - HsFunTy typ1 typ2 -> do -#endif typeDoc1 <- docSharedWrapper layoutType typ1 typeDoc2 <- docSharedWrapper layoutType typ2 let maybeForceML = case typ2 of @@ -292,11 +278,7 @@ ] ) ] -#if MIN_VERSION_ghc(8,6,0) HsParTy _ typ1 -> do -#else - HsParTy typ1 -> do -#endif typeDoc1 <- docSharedWrapper layoutType typ1 docAlt [ docSeq @@ -311,7 +293,6 @@ ]) (docLit $ Text.pack ")") ] -#if MIN_VERSION_ghc(8,6,0) HsAppTy _ typ1@(L _ HsAppTy{}) typ2 -> do let gather :: [LHsType GhcPs] -> LHsType GhcPs -> (LHsType GhcPs, [LHsType GhcPs]) gather list = \case @@ -339,65 +320,7 @@ typeDoc1 (docEnsureIndent BrIndentRegular typeDoc2) ] -#else - HsAppTy typ1 typ2 -> do - typeDoc1 <- docSharedWrapper layoutType typ1 - typeDoc2 <- docSharedWrapper layoutType typ2 - docAlt - [ docSeq - [ docForceSingleline typeDoc1 - , docSeparator - , docForceSingleline typeDoc2 - ] - , docPar - typeDoc1 - (docEnsureIndent BrIndentRegular typeDoc2) - ] - HsAppsTy [] -> error "HsAppsTy []" - HsAppsTy [L _ (HsAppPrefix typ1)] -> do - typeDoc1 <- docSharedWrapper layoutType typ1 - typeDoc1 - HsAppsTy [lname@(L _ (HsAppInfix name))] -> do - -- this redirection is somewhat hacky, but whatever. - -- TODO: a general problem when doing deep inspections on - -- the type (and this is not the only instance) - -- is that we potentially omit annotations on some of - -- the middle constructors. i have no idea under which - -- circumstances exactly important annotations (comments) - -- would be assigned to such constructors. - typeDoc1 <- -- docSharedWrapper layoutType $ (L l $ HsTyVar name) - lrdrNameToTextAnnTypeEqualityIsSpecialAndRespectTick lname name - docLit typeDoc1 - HsAppsTy (L _ (HsAppPrefix typHead):typRestA) - | Just typRest <- mapM (\case L _ (HsAppPrefix t) -> Just t - _ -> Nothing) typRestA -> do - docHead <- docSharedWrapper layoutType typHead - docRest <- docSharedWrapper layoutType `mapM` typRest - docAlt - [ docSeq - $ docForceSingleline docHead : (docRest >>= \d -> - [ docSeparator, docForceSingleline d ]) - , docPar docHead (docLines $ docEnsureIndent BrIndentRegular <$> docRest) - ] - HsAppsTy (typHead:typRest) -> do - docHead <- docSharedWrapper layoutAppType typHead - docRest <- docSharedWrapper layoutAppType `mapM` typRest - docAlt - [ docSeq - $ docForceSingleline docHead : (docRest >>= \d -> - [ docSeparator, docForceSingleline d ]) - , docPar docHead (docLines $ docEnsureIndent BrIndentRegular <$> docRest) - ] - where - layoutAppType (L _ (HsAppPrefix t)) = layoutType t - layoutAppType lt@(L _ (HsAppInfix t)) = - docLit =<< lrdrNameToTextAnnTypeEqualityIsSpecialAndRespectTick lt t -#endif -#if MIN_VERSION_ghc(8,6,0) HsListTy _ typ1 -> do -#else - HsListTy typ1 -> do -#endif typeDoc1 <- docSharedWrapper layoutType typ1 docAlt [ docSeq @@ -412,29 +335,7 @@ ]) (docLit $ Text.pack "]") ] -#if MIN_VERSION_ghc(8,6,0) -#else - HsPArrTy typ1 -> do - typeDoc1 <- docSharedWrapper layoutType typ1 - docAlt - [ docSeq - [ docWrapNodeRest ltype $ docLit $ Text.pack "[:" - , docForceSingleline typeDoc1 - , docLit $ Text.pack ":]" - ] - , docPar - ( docCols ColTyOpPrefix - [ docWrapNodeRest ltype $ docLit $ Text.pack "[:" - , docAddBaseY (BrIndentSpecial 2) $ typeDoc1 - ]) - (docLit $ Text.pack ":]") - ] -#endif -#if MIN_VERSION_ghc(8,6,0) HsTupleTy _ tupleSort typs -> case tupleSort of -#else - HsTupleTy tupleSort typs -> case tupleSort of -#endif HsUnboxedTuple -> unboxed HsBoxedTuple -> simple HsConstraintTuple -> simple @@ -537,13 +438,7 @@ -- } -- , _layouter_ast = ltype -- } -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ HsIParamTy _ (L _ (HsIPName ipName)) typ1 -> do -#elif MIN_VERSION_ghc(8,2,0) /* ghc-8.2 8.4 */ - HsIParamTy (L _ (HsIPName ipName)) typ1 -> do -#else /* ghc-8.0 */ - HsIParamTy (HsIPName ipName) typ1 -> do -#endif typeDoc1 <- docSharedWrapper layoutType typ1 docAlt [ docSeq @@ -562,33 +457,8 @@ , docAddBaseY (BrIndentSpecial 2) typeDoc1 ]) ] -#if MIN_VERSION_ghc(8,6,0) -#else - HsEqTy typ1 typ2 -> do - typeDoc1 <- docSharedWrapper layoutType typ1 - typeDoc2 <- docSharedWrapper layoutType typ2 - docAlt - [ docSeq - [ docForceSingleline typeDoc1 - , docWrapNodeRest ltype - $ docLit $ Text.pack " ~ " - , docForceSingleline typeDoc2 - ] - , docPar - typeDoc1 - ( docCols ColTyOpPrefix - [ docWrapNodeRest ltype - $ docLit $ Text.pack "~ " - , docAddBaseY (BrIndentSpecial 2) typeDoc2 - ]) - ] -#endif -- TODO: test KindSig -#if MIN_VERSION_ghc(8,6,0) HsKindSig _ typ1 kind1 -> do -#else - HsKindSig typ1 kind1 -> do -#endif typeDoc1 <- docSharedWrapper layoutType typ1 kindDoc1 <- docSharedWrapper layoutType kind1 hasParens <- hasAnnKeyword ltype AnnOpenP @@ -691,11 +561,7 @@ briDocByExactInlineOnly "HsDocTy{}" ltype HsRecTy{} -> -- TODO briDocByExactInlineOnly "HsRecTy{}" ltype -#if MIN_VERSION_ghc(8,2,0) /* ghc-8.2 */ HsExplicitListTy _ _ typs -> do -#else /* ghc-8.0 */ - HsExplicitListTy _ typs -> do -#endif typDocs <- docSharedWrapper layoutType `mapM` typs hasComments <- hasAnyCommentsBelow ltype let specialCommaSep = appSep $ docLit $ Text.pack " ," @@ -742,39 +608,22 @@ ] HsExplicitTupleTy{} -> -- TODO briDocByExactInlineOnly "HsExplicitTupleTy{}" ltype -#if MIN_VERSION_ghc(8,6,0) HsTyLit _ lit -> case lit of -#else - HsTyLit lit -> case lit of -#endif -#if MIN_VERSION_ghc(8,2,0) /* ghc-8.2 */ HsNumTy (SourceText srctext) _ -> docLit $ Text.pack srctext HsNumTy NoSourceText _ -> error "overLitValBriDoc: literal with no SourceText" HsStrTy (SourceText srctext) _ -> docLit $ Text.pack srctext HsStrTy NoSourceText _ -> error "overLitValBriDoc: literal with no SourceText" -#else /* ghc-8.0 */ - HsNumTy srctext _ -> docLit $ Text.pack srctext - HsStrTy srctext _ -> docLit $ Text.pack srctext -#endif -#if !MIN_VERSION_ghc(8,6,0) - HsCoreTy{} -> -- TODO - briDocByExactInlineOnly "HsCoreTy{}" ltype -#endif HsWildCardTy _ -> docLit $ Text.pack "_" -#if MIN_VERSION_ghc(8,2,0) /* ghc-8.2 */ HsSumTy{} -> -- TODO briDocByExactInlineOnly "HsSumTy{}" ltype -#endif -#if MIN_VERSION_ghc(8,6,0) HsStarTy _ isUnicode -> do if isUnicode then docLit $ Text.pack "\x2605" -- Unicode star else docLit $ Text.pack "*" XHsType{} -> error "brittany internal error: XHsType" -#endif #if MIN_VERSION_ghc(8,8,0) HsAppKindTy _ ty kind -> do t <- docSharedWrapper layoutType ty @@ -796,18 +645,11 @@ :: [LHsTyVarBndr GhcPs] -> ToBriDocM [(Text, Maybe (ToBriDocM BriDocNumbered))] layoutTyVarBndrs = mapM $ \case -#if MIN_VERSION_ghc(8,6,0) (L _ (UserTyVar _ name)) -> return $ (lrdrNameToText name, Nothing) (L _ (KindedTyVar _ lrdrName kind)) -> do d <- docSharedWrapper layoutType kind return $ (lrdrNameToText lrdrName, Just $ d) (L _ (XTyVarBndr{})) -> error "brittany internal error: XTyVarBndr" -#else - (L _ (UserTyVar name)) -> return $ (lrdrNameToText name, Nothing) - (L _ (KindedTyVar lrdrName kind)) -> do - d <- docSharedWrapper layoutType kind - return $ (lrdrNameToText lrdrName, Just $ d) -#endif -- there is no specific reason this returns a list instead of a single -- BriDoc node. diff --git a/src/Language/Haskell/Brittany/Internal/Prelude.hs b/src/Language/Haskell/Brittany/Internal/Prelude.hs --- a/src/Language/Haskell/Brittany/Internal/Prelude.hs +++ b/src/Language/Haskell/Brittany/Internal/Prelude.hs @@ -1,8 +1,3 @@ -#if !MIN_VERSION_ghc(8,4,0) /* ghc-8.0, ghc-8.2 */ -{-# LANGUAGE TypeFamilies #-} -#endif - - module Language.Haskell.Brittany.Internal.Prelude ( module E , module Language.Haskell.Brittany.Internal.Prelude @@ -13,9 +8,11 @@ -- rather project-specific stuff: --------------------------------- -#if MIN_VERSION_ghc(8,4,0) /* ghc-8.4 */ +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import GHC.Hs.Extension as E ( GhcPs ) +#else import HsExtension as E ( GhcPs ) -#endif +#endif /* ghc-8.10.1 */ import RdrName as E ( RdrName ) #if MIN_VERSION_ghc(8,8,0) @@ -407,18 +404,10 @@ todo = error "todo" -#if !MIN_VERSION_ghc(8,4,0) /* ghc-8.0, ghc-8.2 */ -type family IdP p -type instance IdP GhcPs = RdrName - -type GhcPs = RdrName -#endif - - #if MIN_VERSION_ghc(8,8,0) ghcDL :: GHC.HasSrcSpan a => a -> GHC.Located (GHC.SrcSpanLess a) ghcDL = GHC.dL -#else /* ghc-8.0 8.2 8.4 8.6 */ +#else /* ghc-8.6 */ ghcDL :: GHC.Located a -> GHC.Located a ghcDL x = x #endif diff --git a/src/Language/Haskell/Brittany/Internal/Types.hs b/src/Language/Haskell/Brittany/Internal/Types.hs --- a/src/Language/Haskell/Brittany/Internal/Types.hs +++ b/src/Language/Haskell/Brittany/Internal/Types.hs @@ -32,9 +32,7 @@ { _icd_perBinding :: Map String (CConfig Option) , _icd_perKey :: Map ExactPrint.Types.AnnKey (CConfig Option) } -#if MIN_VERSION_ghc(8,2,0) deriving Data.Data.Data -#endif type PPM = MultiRWSS.MultiRWS '[Map ExactPrint.AnnKey ExactPrint.Anns, PerItemConfig, Config, ExactPrint.Anns] diff --git a/src/Language/Haskell/Brittany/Internal/Utils.hs b/src/Language/Haskell/Brittany/Internal/Utils.hs --- a/src/Language/Haskell/Brittany/Internal/Utils.hs +++ b/src/Language/Haskell/Brittany/Internal/Utils.hs @@ -59,9 +59,11 @@ import Language.Haskell.Brittany.Internal.Types import qualified Data.Generics.Uniplate.Direct as Uniplate -#if MIN_VERSION_ghc(8,4,0) /* ghc-8.4 */ +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +import qualified GHC.Hs.Extension as HsExtension +#else import qualified HsExtension -#endif +#endif /* ghc-8.10.1 */ @@ -299,11 +301,11 @@ (s1, [_]) -> [s1, ""] (s1, (_:r)) -> s1 : lines' r -#if MIN_VERSION_ghc(8,6,0) /* ghc-8.6 */ +#if MIN_VERSION_ghc(8,10,1) /* ghc-8.10.1 */ +absurdExt :: HsExtension.NoExtCon -> a +absurdExt = HsExtension.noExtCon +#else -- | A method to dismiss NoExt patterns for total matches absurdExt :: HsExtension.NoExt -> a absurdExt = error "cannot construct NoExt" -#else -absurdExt :: () -absurdExt = () #endif