Skip to content

ghc 9.2 wip #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

ghc 9.2 wip #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 32 additions & 11 deletions plugin/Compat.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import GHC.Types.Basic
import GHC.Unit.Types
import GHC.Parser.Annotation
#endif
#if __GLASGOW_HASKELL__ > 901
import GHC.Types.SourceText
#endif
#if __GLASGOW_HASKELL__ < 810
import HsSyn as Compat
#else
Expand All @@ -22,8 +25,8 @@ import GHC.Hs as Compat
---------------------------------------------------------------------
-- UTILITIES

noL :: e -> GenLocated SrcSpan e
noL = noLoc
noL :: e -> GenLocated (SrcSpanAnn' (EpAnn AnnListItem)) e
noL = noLocA

#if __GLASGOW_HASKELL__ < 810
noE :: NoExt
Expand All @@ -41,10 +44,10 @@ realSrcLoc (RealSrcLoc x _) = Just x
#endif
realSrcLoc _ = Nothing

#if __GLASGOW_HASKELL__ >= 900
hsLTyVarBndrToType :: LHsTyVarBndr flag (GhcPass p) -> LHsType (GhcPass p)
hsLTyVarBndrToType x = noL $ HsTyVar noE NotPromoted $ noL $ hsLTyVarName x
#endif
-- #if __GLASGOW_HASKELL__ >= 900
-- hsLTyVarBndrToType :: LHsTyVarBndr flag (GhcPass p) -> LHsType (GhcPass p)
-- hsLTyVarBndrToType x = noL $ HsTyVar noAnn NotPromoted $ noL $ hsLTyVarName x
-- #endif

---------------------------------------------------------------------
-- COMMON SIGNATURES
Expand All @@ -58,20 +61,27 @@ type Module = HsModule
mkAppType :: LHsExpr GhcPs -> LHsType GhcPs -> LHsExpr GhcPs
mkTypeAnn :: LHsExpr GhcPs -> LHsType GhcPs -> LHsExpr GhcPs
mkFunTy :: LHsType GhcPs -> LHsType GhcPs -> LHsType GhcPs
newFunBind :: Located RdrName -> MatchGroup GhcPs (LHsExpr GhcPs) -> HsBind GhcPs
newFunBind :: LocatedN RdrName -> MatchGroup GhcPs (LHsExpr GhcPs) -> HsBind GhcPs

#if __GLASGOW_HASKELL__ < 807

-- GHC 8.6
mkAppType expr typ = noL $ HsAppType (HsWC noE typ) expr
mkTypeAnn expr typ = noL $ ExprWithTySig (HsWC noE (HsIB noE typ)) expr

#else
#elif __GLASGOW_HASKELL__ < 901

-- GHC 8.8+
mkAppType expr typ = noL $ HsAppType noE expr (HsWC noE typ)
mkTypeAnn expr typ = noL $ ExprWithTySig noE expr (HsWC noE (HsIB noE typ))

#else

-- GHC 9.2+
mkAppType expr typ = noL $ HsAppType noSrcSpan expr (HsWC noE typ)
mkTypeAnn expr typ = noL $ ExprWithTySig noAnn expr (hsTypeToHsSigWcType typ)
--mkTypeAnn expr typ = noL $ ExprWithTySig noE expr (HsWC noE (HsOuterExplicit noE typ))

#endif

#if __GLASGOW_HASKELL__ < 811
Expand All @@ -80,12 +90,18 @@ mkTypeAnn expr typ = noL $ ExprWithTySig noE expr (HsWC noE (HsIB noE typ))
mkFunTy a b = noL $ HsFunTy noE a b
newFunBind a b = FunBind noE a b WpHole []

#else
#elif __GLASGOW_HASKELL__ < 901

-- GHC 9.0
mkFunTy a b = noL $ HsFunTy noE (HsUnrestrictedArrow NormalSyntax) a b
newFunBind a b = FunBind noE a b []

#else

-- GHC 9.2
mkFunTy a b = noL $ HsFunTy noAnn (HsUnrestrictedArrow NormalSyntax) a b
newFunBind a b = FunBind noE a b []

#endif


Expand Down Expand Up @@ -117,17 +133,22 @@ qualifiedImplicitImport :: ModuleName -> LImportDecl GhcPs
-- GHC 8.8
qualifiedImplicitImport x = noL $ ImportDecl noE NoSourceText (noL x) Nothing False False
True {- qualified -} True {- implicit -} Nothing Nothing

#elif __GLASGOW_HASKELL__ < 811

-- GHC 8.10
qualifiedImplicitImport x = noL $ ImportDecl noE NoSourceText (noL x) Nothing False False
QualifiedPost {- qualified -} True {- implicit -} Nothing Nothing

#else
#elif __GLASGOW_HASKELL__ < 901

-- GHC 9.0
qualifiedImplicitImport x = noL $ ImportDecl noE NoSourceText (noL x) Nothing NotBoot False
QualifiedPost {- qualified -} True {- implicit -} Nothing Nothing

#else

-- GHC 9.2
qualifiedImplicitImport x = noL $ ImportDecl noAnn NoSourceText (noLoc x) Nothing NotBoot False
QualifiedPost {- qualified -} True {- implicit -} Nothing Nothing

#endif
4 changes: 4 additions & 0 deletions plugin/RecordDotPreprocessor.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ import SrcLoc
#else
import GHC.Data.Bag
import qualified GHC.Driver.Plugins as GHC
#if __GLASGOW_HASKELL__ < 901
import qualified GHC.Driver.Types as GHC
#else
import qualified GHC.Types.SourceText as GHC
#endif
import qualified GHC.Builtin.Names as GHC
import qualified GHC.Plugins as GHC
import GHC.Types.SrcLoc
Expand Down