ghc-lib-parser-ex 8.10.0.19 → 8.10.0.20

raw patch · 21 files changed

+362/−132 lines, 21 filesdep ~ghcdep ~ghc-lib-parserPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: ghc, ghc-lib-parser

API changes (from Hackage documentation)

Files

• ChangeLog.md +29/−0
• README.md +1/−1
• cbits/ghclib_api.h +12/−5
• ghc-lib-parser-ex.cabal +7/−7
• src/Language/Haskell/GhclibParserEx/Dump.hs +7/−4
• src/Language/Haskell/GhclibParserEx/Fixity.hs +69/−18
• src/Language/Haskell/GhclibParserEx/GHC/Driver/Flags.hs +1/−1
• src/Language/Haskell/GhclibParserEx/GHC/Driver/Session.hs +2/−2
• src/Language/Haskell/GhclibParserEx/GHC/Hs.hs +2/−2
• src/Language/Haskell/GhclibParserEx/GHC/Hs/Binds.hs +1/−1
• src/Language/Haskell/GhclibParserEx/GHC/Hs/Decls.hs +2/−2
• src/Language/Haskell/GhclibParserEx/GHC/Hs/Expr.hs +39/−8
• src/Language/Haskell/GhclibParserEx/GHC/Hs/ExtendInstances.hs +5/−5
• src/Language/Haskell/GhclibParserEx/GHC/Hs/ImpExp.hs +1/−1
• src/Language/Haskell/GhclibParserEx/GHC/Hs/Pat.hs +40/−18
• src/Language/Haskell/GhclibParserEx/GHC/Hs/Types.hs +2/−2
• src/Language/Haskell/GhclibParserEx/GHC/Parser.hs +21/−11
• src/Language/Haskell/GhclibParserEx/GHC/Settings/Config.hs +15/−8
• src/Language/Haskell/GhclibParserEx/GHC/Types/Name/Reader.hs +23/−2
• src/Language/Haskell/GhclibParserEx/GHC/Utils/Outputable.hs +2/−2
• test/Test.hs +81/−32

@@ -1,5 +1,34 @@ # Changelog for ghc-lib-parser-ex +## 8.10.0.20 released 2021-06-06+- Update to `ghc-lib-8.10.5.20210606`++## 0.20210601 released 2021-06-01+- Update to `ghc-lib-parser-0.20210601`+- Update types in `GHC.Types.Name.Reader` for ghc-9.2.1, `Located` becomes `LocatedN`++## 0.20210501 released 2021-05-01+- Update to `ghc-lib-0.20210501`++## 0.20210331 released 2021-02-31+- Update to `ghc-lib-0.20210331`+- Upgrade to `ghc-lib-parser-9.0.1.20210324`++## 9.0.0.4 released 2021-03-11+- Bugfix for `GHC.Hs.Dump`++## 0.20210228 released 2021-02-28+- Update to `ghc-lib-0.20210228`++## 9.0.0.3 released 2021-02-08+- Cabal bugfix++## 9.0.0.2 released 2021-02-08+- Cabal bugfix++## 8.10.0.19 released 2021-02-08+- Cabal bugfix+ ## 8.10.0.18 released 2021-02-06 - Update to ghc-8.10.4. 

@@ -1,5 +1,5 @@ # ghc-lib-parser-ex [![License BSD3](https://img.shields.io/badge/license-BSD3-brightgreen.svg)](http://opensource.org/licenses/BSD-3-Clause) [![Hackage version](https://img.shields.io/hackage/v/ghc-lib-parser-ex.svg?label=Hackage)](https://hackage.haskell.org/package/ghc-lib-parser-ex) [![Stackage version](https://www.stackage.org/package/ghc-lib-parser-ex/badge/nightly?label=Stackage)](https://www.stackage.org/package/ghc-lib-parser-ex)  [![Build Status](https://shayne-fletcher.visualstudio.com/ghc-lib-parser-ex/_apis/build/status/shayne-fletcher.ghc-lib-parser-ex?branchName=master)](https://shayne-fletcher.visualstudio.com/ghc-lib-parser-ex/_build/latest?definitionId=1&branchName=master)-Copyright © 2020, Shayne Fletcher. All rights reserved.+Copyright © 2020-2021 Shayne Fletcher. All rights reserved. SPDX-License-Identifier: BSD-3-Clause  The `ghc-lib-parser-ex` package contains GHC API parse tree utilities. It works with or without [`ghc-lib-parser`](https://github.com/digital-asset/ghc-lib).

@@ -1,15 +1,21 @@ /*-Copyright (c) 2020, Shayne Fletcher. All rights-reserved. SPDX-License-Identifier: BSD-3-Clause.+Copyright (c) 2020, 2021 Shayne Fletcher. All rights reserved.+SPDX-License-Identifier: BSD-3-Clause.  */  #if !defined(GHCLIB_API_H) #  define GHCLIB_API_H -#  if !defined (GHCLIB_API_HEAD) && !defined (GHCLIB_API_900) && !defined (GHCLIB_API_810) && !defined (GHCLIB_API_808)+#  if !(defined (GHCLIB_API_HEAD)   \+     || defined (GHCLIB_API_902)    \+     || defined (GHCLIB_API_900)    \+     || defined (GHCLIB_API_810)    \+     || defined (GHCLIB_API_808)) #    if defined(MIN_VERSION_ghc_lib_parser) #       if !MIN_VERSION_ghc_lib_parser( 1,  0,  0) #         define GHCLIB_API_HEAD+#       elif MIN_VERSION_ghc_lib_parser(9,  2,  0)+#         define GHCLIB_API_902 #       elif MIN_VERSION_ghc_lib_parser(9,  0,  0) #         define GHCLIB_API_900 #       elif MIN_VERSION_ghc_lib_parser(8, 10,  0)@@ -20,8 +26,10 @@ #         error Unsupported GHC API version #      endif #    else-#      if __GLASGOW_HASKELL__   == 811+#      if __GLASGOW_HASKELL__   == 903 #        define GHCLIB_API_HEAD+#      elif __GLASGOW_HASKELL__ == 902+#        define GHCLIB_API_902 #      elif __GLASGOW_HASKELL__ == 900 #        define GHCLIB_API_900 #      elif __GLASGOW_HASKELL__ == 810@@ -33,5 +41,4 @@ #      endif #    endif #  endif- #endif

@@ -1,6 +1,6 @@ cabal-version: >= 1.18 name:           ghc-lib-parser-ex-version:        8.10.0.19+version:        8.10.0.20 description:    Please see the README on GitHub at <https://github.com/shayne-fletcher/ghc-lib-parser-ex#readme> homepage:       https://github.com/shayne-fletcher/ghc-lib-parser-ex#readme bug-reports:    https://github.com/shayne-fletcher/ghc-lib-parser-ex/issues@@ -63,15 +63,15 @@       uniplate >= 1.5,       bytestring >= 0.10.8.2,       containers >= 0.5.8.1-  if flag(auto) && impl(ghc >= 8.10.0) && impl(ghc < 8.11.0)+  if flag(auto) && impl(ghc >= 9.0.0) && impl(ghc < 9.1.0)     build-depends:-      ghc == 8.10.*,+      ghc == 9.0.*,       ghc-boot-th,       ghc-boot   else     if flag(auto)       build-depends:-        ghc-lib-parser == 8.10.*+        ghc-lib-parser == 9.0.*     else       if flag(no-ghc-lib)         build-depends:@@ -107,15 +107,15 @@     , extra >=1.6     , uniplate >= 1.6.12     , ghc-lib-parser-ex-  if flag(auto) && impl(ghc >= 8.10.0) && impl(ghc < 8.11.1)+  if flag(auto) && impl(ghc >= 9.0.0) && impl(ghc < 9.1.0)     build-depends:-      ghc == 8.10.*,+      ghc == 9.0.*,       ghc-boot-th,       ghc-boot   else     if flag(auto)       build-depends:-        ghc-lib-parser+        ghc-lib-parser == 9.0.*     else       if flag(no-ghc-lib)         build-depends:

@@ -12,12 +12,15 @@ #include "ghclib_api.h" module Language.Haskell.GhclibParserEx.Dump(     showAstData-  , BlankSrcSpan(..),+  , BlankSrcSpan(..)+#if defined(GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+  , BlankEpAnnotations(..)+#endif ) where  #if !defined(MIN_VERSION_ghc_lib_parser) -- Using native ghc.-#  if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_810)+#  if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined(GHCLIB_API_900) || defined (GHCLIB_API_810) import GHC.Hs.Dump #  else import HsDumpAst@@ -25,7 +28,7 @@ #else -- Using ghc-lib-parser. Recent versions will include -- GHC.Hs.Dump (it got moved in from ghc-lib on 2020-02-05).-# if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+# if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) import GHC.Hs.Dump #  else -- For simplicity, just assume it's missing from 8.8 ghc-lib-parser@@ -40,7 +43,7 @@ import Name import DataCon import SrcLoc-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) import GHC.Hs #else import HsSyn

@@ -16,9 +16,9 @@   , infixr_, infixl_, infix_, fixity   ) where -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Hs-#if defined (GHCLIB_API_HEAD)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) import GHC.Types.Fixity import GHC.Types.SourceText #else@@ -44,7 +44,7 @@ import Data.Data hiding (Fixity) import Data.Generics.Uniplate.Data -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_900) || defined (GHCLIB_API_810) noExt :: NoExtField noExt = noExtField #endif@@ -64,7 +64,7 @@ -- LPat and Pat have gone through a lot of churn. See -- https://gitlab.haskell.org/ghc/ghc/merge_requests/1925 for details. patFix :: [(String, Fixity)] -> LPat GhcPs -> LPat GhcPs-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) patFix fixities (L loc (ConPat _ op (InfixCon pat1 pat2))) =   L loc (mkConOpPat (getFixities fixities) op (findFixity' (getFixities fixities) op) pat1 pat2) #elif defined (GHCLIB_API_810)@@ -78,29 +78,40 @@  mkConOpPat ::   [(String, Fixity)]-  -> Located RdrName -> Fixity+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+  -> LocatedN RdrName+#else+  -> Located RdrName+#endif+  -> Fixity   -> LPat GhcPs -> LPat GhcPs   -> Pat GhcPs-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) mkConOpPat fs op2 fix2 p1@(L loc (ConPat _ op1 (InfixCon p11 p12))) p2 #elif defined (GHCLIB_API_810) mkConOpPat fs op2 fix2 p1@(L loc (ConPatIn op1 (InfixCon p11 p12))) p2 #else mkConOpPat fs op2 fix2 p1@(dL->L loc (ConPatIn op1 (InfixCon p11 p12))) p2 #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+  | nofix_error = ConPat noAnn op2 (InfixCon p1 p2)+#elif defined (GHCLIB_API_900)   | nofix_error = ConPat noExtField op2 (InfixCon p1 p2) #else   | nofix_error = ConPatIn op2 (InfixCon p1 p2) #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+  | associate_right = ConPat noAnn op1 (InfixCon p11 (L loc (mkConOpPat fs op2 fix2 p12 p2)))+#elif defined (GHCLIB_API_900)   | associate_right = ConPat noExtField op1 (InfixCon p11 (L loc (mkConOpPat fs op2 fix2 p12 p2))) #elif defined (GHCLIB_API_810)   | associate_right = ConPatIn op1 (InfixCon p11 (L loc (mkConOpPat fs op2 fix2 p12 p2))) #else   | associate_right = ConPatIn op1 (InfixCon p11 (cL loc (mkConOpPat fs op2 fix2 p12 p2))) #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+  | otherwise = ConPat noAnn op2 (InfixCon p1 p2)+#elif defined (GHCLIB_API_900)   | otherwise = ConPat noExtField op2 (InfixCon p1 p2) #else   | otherwise = ConPatIn op2 (InfixCon p1 p2)@@ -108,41 +119,75 @@   where     fix1 = findFixity' fs op1     (nofix_error, associate_right) = compareFixity fix1 fix2-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+mkConOpPat _ op _ p1 p2 = ConPat noAnn op (InfixCon p1 p2)+#elif defined (GHCLIB_API_900) mkConOpPat _ op _ p1 p2 = ConPat noExtField op (InfixCon p1 p2) #else mkConOpPat _ op _ p1 p2 = ConPatIn op (InfixCon p1 p2) #endif  mkOpApp ::-  [(String, Fixity)]-  -> SrcSpan-  -> LHsExpr GhcPs -- Left operand; already rearrange.-  -> LHsExpr GhcPs -> Fixity -- Operator and fixity.-  -> LHsExpr GhcPs -- Right operand (not an OpApp, but might be a NegApp).-  -> LHsExpr GhcPs+   [(String, Fixity)]+#if defined(GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+   -> SrcSpanAnnA+#else+   -> SrcSpan+#endif+   -> LHsExpr GhcPs -- Left operand; already rearrange.+   -> LHsExpr GhcPs -> Fixity -- Operator and fixity.+   -> LHsExpr GhcPs -- Right operand (not an OpApp, but might be a NegApp).+   -> LHsExpr GhcPs --      (e11 `op1` e12) `op2` e2 mkOpApp fs loc e1@(L _ (OpApp x1 e11 op1 e12)) op2 fix2 e2+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+  | nofix_error = L loc (OpApp noAnn e1 op2 e2)+#else   | nofix_error = L loc (OpApp noExt e1 op2 e2)+#endif   | associate_right = L loc (OpApp x1 e11 op1 (mkOpApp fs loc' e12 op2 fix2 e2 ))   where+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+    loc'= combineLocsA e12 e2+#else     loc'= combineLocs e12 e2+#endif     fix1 = findFixity fs op1     (nofix_error, associate_right) = compareFixity fix1 fix2 --      (- neg_arg) `op` e2 mkOpApp fs loc e1@(L _ (NegApp _ neg_arg neg_name)) op2 fix2 e2+#if defined(GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+  | nofix_error = L loc (OpApp noAnn e1 op2 e2)+#else   | nofix_error = L loc (OpApp noExt e1 op2 e2)+#endif+#if defined(GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+  | associate_right = L loc (NegApp noAnn (mkOpApp fs loc' neg_arg op2 fix2 e2) neg_name)+#else   | associate_right = L loc (NegApp noExt (mkOpApp fs loc' neg_arg op2 fix2 e2) neg_name)+#endif   where+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+    loc' = combineLocsA neg_arg e2+#else     loc' = combineLocs neg_arg e2+#endif     (nofix_error, associate_right) = compareFixity negateFixity fix2 --      e1 `op` - neg_arg mkOpApp _ loc e1 op1 fix1 e2@(L _ NegApp {}) -- NegApp can occur on the right.+#if defined(GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+  | not associate_right  = L loc (OpApp noAnn e1 op1 e2)-- We *want* right association.+#else   | not associate_right  = L loc (OpApp noExt e1 op1 e2)-- We *want* right association.+#endif   where     (_, associate_right) = compareFixity fix1 negateFixity  --     Default case, no rearrangment.+#if defined(GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+mkOpApp _ loc e1 op _fix e2 = L loc (OpApp noAnn e1 op e2)+#else mkOpApp _ loc e1 op _fix e2 = L loc (OpApp noExt e1 op e2)+#endif  getIdent :: LHsExpr GhcPs -> String getIdent (unLoc -> HsVar _ (L _ n)) = occNameString . rdrNameOcc $ n@@ -155,7 +200,11 @@ findFixity :: [(String, Fixity)] -> LHsExpr GhcPs -> Fixity findFixity fs r = askFix fs (getIdent r) -- Expressions. +#if defined(GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+findFixity' :: [(String, Fixity)] -> LocatedN RdrName -> Fixity+#else findFixity' :: [(String, Fixity)] -> Located RdrName -> Fixity+#endif findFixity' fs r = askFix fs (occNameString . rdrNameOcc . unLoc $ r) -- Patterns.  askFix :: [(String, Fixity)] -> String -> Fixity@@ -213,12 +262,14 @@ fixity :: FixityDirection -> Int -> [String] -> [(String, Fixity)] fixity a p = map (,Fixity (SourceText "") p a) -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) fixitiesFromModule :: Located HsModule -> [(String, Fixity)] #else fixitiesFromModule :: Located (HsModule GhcPs) -> [(String, Fixity)] #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+fixitiesFromModule (L _ (HsModule _ _ _ _ _ decls _ _)) = concatMap f decls+#elif defined (GHCLIB_API_900) fixitiesFromModule (L _ (HsModule _ _ _ _ decls _ _)) = concatMap f decls #else fixitiesFromModule (L _ (HsModule _ _ _ decls _ _)) = concatMap f decls

@@ -3,7 +3,7 @@ #include "ghclib_api.h" module Language.Haskell.GhclibParserEx.GHC.Driver.Flags () where -#if !defined (GHCLIB_API_HEAD) && !defined (GHCLIB_API_900)+#if !(defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900)) import DynFlags #endif 

@@ -17,12 +17,12 @@ #if defined (GHCLIB_API_808) || defined (GHCLIB_API_810) import qualified GHC.LanguageExtensions as LangExt #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Utils.Panic import GHC.Parser.Header import GHC.Data.StringBuffer import GHC.Driver.Session-#if defined (GHCLIB_API_HEAD)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) import GHC.Types.SourceError #else import GHC.Driver.Types

@@ -9,7 +9,7 @@  ) where -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Hs import GHC.Unit.Module import GHC.Types.SrcLoc@@ -23,7 +23,7 @@ import SrcLoc #endif -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) || defined (GHCLIB_API_900) modName :: Located HsModule -> String #else modName :: Located (HsModule GhcPs) -> String

@@ -7,7 +7,7 @@   ) where -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) import GHC.Hs.Binds import GHC.Hs.Extension #else

@@ -7,12 +7,12 @@     isNewType, isForD, isDerivD, isClsDefSig   ) where -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) import GHC.Hs #else import HsSyn #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Types.SrcLoc #else import SrcLoc

@@ -16,13 +16,13 @@   fromChar   ) where -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) import GHC.Hs #else import HsSyn #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)-#if defined (GHCLIB_API_HEAD)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) import GHC.Types.SourceText #endif import GHC.Types.SrcLoc@@ -69,7 +69,11 @@   (L _ HsLam{}) -> True   (L _ ExplicitTuple{}) -> True   (L _ ExplicitList{}) -> True+#if defined (GHCLIB_API_HEAD)+  (L _ (HsPar _ _ x _)) -> isWHNF x+#else   (L _ (HsPar _ x)) -> isWHNF x+#endif   (L _ (ExprWithTySig _ x _)) -> isWHNF x   -- Other (unknown) constructors may have bang patterns in them, so   -- approximate.@@ -78,7 +82,7 @@   _ -> False isLCase = \case (L _ HsLamCase{}) -> True; _ -> False -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_901)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_901) isStrictMatch :: HsMatchContext GhcPs -> Bool #else isStrictMatch :: HsMatchContext RdrName -> Bool@@ -86,13 +90,22 @@ isStrictMatch = \case FunRhs{mc_strictness=SrcStrict} -> True; _ -> False  -- Field is punned e.g. '{foo}'.+#if defined (GHCLIB_API_HEAD)+isFieldPun :: LHsFieldBind GhcPs (LFieldOcc GhcPs) (LHsExpr GhcPs) -> Bool+isFieldPun = \case (L _ HsFieldBind {hfbPun=True}) -> True; _ -> False+#else isFieldPun :: LHsRecField GhcPs (LHsExpr GhcPs) -> Bool isFieldPun = \case (L _ HsRecField {hsRecPun=True}) -> True; _ -> False-+#endif -- Field puns in updates have a different type to field puns in -- constructions.+#if defined (GHCLIB_API_HEAD)+isFieldPunUpdate :: HsFieldBind (FieldOcc GhcPs) (LHsExpr GhcPs) -> Bool+isFieldPunUpdate = \case HsFieldBind {hfbPun=True} -> True; _ -> False+#else isFieldPunUpdate :: HsRecField' (AmbiguousFieldOcc GhcPs) (LHsExpr GhcPs) -> Bool isFieldPunUpdate = \case HsRecField {hsRecPun=True} -> True; _ -> False+#endif  -- Contains a '..' as in 'Foo{..}' hasFieldsDotDot :: HsRecFields GhcPs (LHsExpr GhcPs) -> Bool@@ -104,7 +117,7 @@ isParComp :: StmtLR GhcPs GhcPs (LHsExpr GhcPs) -> Bool isParComp = \case ParStmt{} -> True; _ -> False -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) isMDo :: HsStmtContext GhcRn -> Bool isMDo = \case MDoExpr _ -> True; _ -> False #else@@ -143,24 +156,40 @@ isTransStmt = \case TransStmt{} -> True; _ -> False  -- Field has a '_' as in '{foo=_} or is punned e.g. '{foo}'.+#if defined (GHCLIB_API_HEAD)+isFieldWildcard :: LHsFieldBind GhcPs (LFieldOcc GhcPs) (LHsExpr GhcPs) -> Bool+#else isFieldWildcard :: LHsRecField GhcPs (LHsExpr GhcPs) -> Bool+#endif isFieldWildcard = \case-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD)+  (L _ HsFieldBind {hfbRHS=(L _ (HsUnboundVar _ s))}) -> occNameString s == "_"+#elif defined(GHCLIB_API_902) || defined (GHCLIB_API_900)   (L _ HsRecField {hsRecFieldArg=(L _ (HsUnboundVar _ s))}) -> occNameString s == "_" #elif defined (GHCLIB_API_810)   (L _ HsRecField {hsRecFieldArg=(L _ (HsUnboundVar _ _))}) -> True #else   (L _ HsRecField {hsRecFieldArg=(L _ (EWildPat _))}) -> True #endif+#if defined (GHCLIB_API_HEAD)+  (L _ HsFieldBind {hfbPun=True}) -> True+  (L _ HsFieldBind {}) -> False+#else   (L _ HsRecField {hsRecPun=True}) -> True   (L _ HsRecField {}) -> False+#endif  isUnboxed :: Boxity -> Bool isUnboxed = \case Unboxed -> True; _ -> False  isWholeFrac :: HsExpr GhcPs -> Bool+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+isWholeFrac (HsLit _ (HsRat _ fl@FL{} _)) = denominator (rationalFromFractionalLit fl) == 1+isWholeFrac (HsOverLit _ (OverLit _ (HsFractional fl@FL {}) _)) = denominator (rationalFromFractionalLit fl) == 1+#else isWholeFrac (HsLit _ (HsRat _ (FL _ _ v) _)) = denominator v == 1 isWholeFrac (HsOverLit _ (OverLit _ (HsFractional (FL _ _ v)) _)) = denominator v == 1+#endif isWholeFrac _ = False  varToStr :: LHsExpr GhcPs -> String@@ -172,7 +201,9 @@ varToStr _ = ""  strToVar :: String -> LHsExpr GhcPs-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+strToVar x = noLocA $ HsVar noExtField (noLocA $ mkRdrUnqual (mkVarOcc x))+#elif defined (GHCLIB_API_900) || defined (GHCLIB_API_810) strToVar x = noLoc $ HsVar noExtField (noLoc $ mkRdrUnqual (mkVarOcc x)) #else strToVar x = noLoc $ HsVar noExt (noLoc $ mkRdrUnqual (mkVarOcc x))

@@ -18,9 +18,9 @@ -- representations rather than the terms themselves, leads to -- identical results. -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Utils.Outputable-#  if !defined(GHCLIB_API_900)+#  if !defined(GHCLIB_API_HEAD) && !defined(GHCLIB_API_900) import GHC.Driver.Ppr #  endif #else@@ -42,8 +42,8 @@ -- string representations. toStr :: Data a => HsExtendInstances a -> String toStr (HsExtendInstances e) =-#if defined(GHCLIB_API_HEAD)-  showPprUnsafe $ showAstData BlankSrcSpan e+#if defined(GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+  showPprUnsafe $ showAstData BlankSrcSpan BlankEpAnnotations e #else   showSDocUnsafe $ showAstData BlankSrcSpan e #endif@@ -60,7 +60,7 @@ -- Use 'ppr' for 'Show'. instance Outputable a => Show (HsExtendInstances a) where   show (HsExtendInstances e) =-#if defined(GHCLIB_API_HEAD)+#if defined(GHCLIB_API_HEAD) || defined(GHCLIB_API_902)     showPprUnsafe $ ppr e #else     showSDocUnsafe $ ppr e

@@ -14,7 +14,7 @@   ) where -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Hs.ImpExp import GHC.Types.Name.Reader #elif defined (GHCLIB_API_810)

@@ -11,12 +11,12 @@   , isPFieldWildcard, isPWildcard, isPFieldPun, isPatTypeSig, isPBangPat, isPViewPat  ) where -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) import GHC.Hs #else import HsSyn #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Types.SrcLoc import GHC.Builtin.Types import GHC.Types.Name.Reader@@ -31,7 +31,7 @@ #endif  patToStr :: LPat GhcPs -> String-#if defined (GHCLIB_API_HEAD)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) patToStr (L _ (ConPat _ (L _ x) (PrefixCon [] []))) | occNameString (rdrNameOcc x) == "True" = "True" patToStr (L _ (ConPat _ (L _ x) (PrefixCon [] []))) | occNameString (rdrNameOcc x) == "False" = "False" patToStr (L _ (ConPat _ (L _ x) (PrefixCon [] []))) | occNameString (rdrNameOcc x) == "[]" = "[]"@@ -56,47 +56,55 @@ strToPat :: String -> LPat GhcPs strToPat z   | z == "True"  =-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+  noLocA $+#elif defined (GHCLIB_API_900) || defined (GHCLIB_API_810)   noLoc $ #endif-#if defined (GHCLIB_API_HEAD)-    ConPat noExtField (noLoc true_RDR) (PrefixCon [] [])+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+    ConPat noAnn (noLocA true_RDR) (PrefixCon [] []) #elif defined (GHCLIB_API_900)     ConPat noExtField (noLoc true_RDR) (PrefixCon []) #else     ConPatIn (noLoc true_RDR) (PrefixCon []) #endif   | z == "False" =-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+  noLocA $+#elif defined (GHCLIB_API_900) || defined (GHCLIB_API_810)   noLoc $ #endif-#if defined (GHCLIB_API_HEAD)-    ConPat noExtField (noLoc false_RDR) (PrefixCon [] [])+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+    ConPat noAnn (noLocA false_RDR) (PrefixCon [] []) #elif defined (GHCLIB_API_900)     ConPat noExtField (noLoc false_RDR) (PrefixCon []) #else     ConPatIn (noLoc false_RDR) (PrefixCon []) #endif   | z == "[]"    =-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+  noLocA $+#elif defined (GHCLIB_API_900) || defined (GHCLIB_API_810)   noLoc $ #endif-#if defined (GHCLIB_API_HEAD)-    ConPat noExtField (noLoc $ nameRdrName nilDataConName) (PrefixCon [] [])+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+    ConPat noAnn (noLocA $ nameRdrName nilDataConName) (PrefixCon [] []) #elif defined (GHCLIB_API_900)     ConPat noExtField (noLoc $ nameRdrName nilDataConName) (PrefixCon []) #else     ConPatIn (noLoc $ nameRdrName nilDataConName) (PrefixCon []) #endif   | otherwise =-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+      noLocA $ VarPat noExtField (noLocA $ mkVarUnqual (fsLit z))+#elif defined (GHCLIB_API_900) || defined (GHCLIB_API_810)       noLoc $ VarPat noExtField (noLoc $ mkVarUnqual (fsLit z)) #else       VarPat noExt (noLoc $ mkVarUnqual (fsLit z)) #endif  fromPChar :: LPat GhcPs -> Maybe Char-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) fromPChar (L _ (LitPat _ (HsChar _ x))) = Just x #else fromPChar (dL -> L _ (LitPat _ (HsChar _ x))) = Just x@@ -109,8 +117,16 @@ hasPFieldsDotDot _ = False  -- Field has a '_' as in '{foo=_} or is punned e.g. '{foo}'.+#if defined (GHCLIB_API_HEAD)+isPFieldWildcard :: LHsFieldBind GhcPs (LFieldOcc GhcPs) (LPat GhcPs) -> Bool+#else isPFieldWildcard :: LHsRecField GhcPs (LPat GhcPs) -> Bool-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#endif+#if defined (GHCLIB_API_HEAD)+isPFieldWildcard (L _ HsFieldBind {hfbRHS=L _ WildPat {}}) = True+isPFieldWildcard (L _ HsFieldBind {hfbPun=True}) = True+isPFieldWildcard (L _ HsFieldBind {}) = False+#elif defined (GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) isPFieldWildcard (L _ HsRecField {hsRecFieldArg=L _ WildPat {}}) = True isPFieldWildcard (L _ HsRecField {hsRecPun=True}) = True isPFieldWildcard (L _ HsRecField {}) = False@@ -121,15 +137,21 @@ #endif  isPWildcard :: LPat GhcPs -> Bool-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) isPWildcard (L _ (WildPat _)) = True #else isPWildcard (dL -> L _ (WildPat _)) = True #endif isPWildcard _ = False +#if defined (GHCLIB_API_HEAD)+isPFieldPun :: LHsFieldBind GhcPs (LFieldOcc GhcPs) (LPat GhcPs) -> Bool+#else isPFieldPun :: LHsRecField GhcPs (LPat GhcPs) -> Bool-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#endif+#if defined (GHCLIB_API_HEAD)+isPFieldPun (L _ HsFieldBind {hfbPun=True}) = True+#elif defined (GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) isPFieldPun (L _ HsRecField {hsRecPun=True}) = True #else isPFieldPun (dL -> L _ HsRecField {hsRecPun=True}) = True@@ -137,7 +159,7 @@ isPFieldPun _ = False  isPatTypeSig, isPBangPat, isPViewPat :: LPat GhcPs -> Bool-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) isPatTypeSig (L _ SigPat{}) = True; isPatTypeSig _ = False isPBangPat (L _ BangPat{}) = True; isPBangPat _ = False isPViewPat (L _ ViewPat{}) = True; isPViewPat _ = False

@@ -8,12 +8,12 @@   , isTyQuasiQuote, isUnboxedTuple   ) where -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) import GHC.Hs #else import HsSyn #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Types.SrcLoc #else import SrcLoc

@@ -22,15 +22,15 @@   )   where -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) import GHC.Hs #else import HsSyn #endif-#if defined (GHCLIB_API_HEAD)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) import GHC.Driver.Config #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Parser.PostProcess import GHC.Driver.Session import GHC.Data.StringBuffer@@ -64,19 +64,19 @@     location = mkRealSrcLoc (mkFastString "<string>") 1 1     buffer = stringToStringBuffer str     parseState =-#if defined (GHCLIB_API_HEAD)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)       initParserState (initParserOpts flags) buffer location #else       mkPState flags buffer location #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) parseModule :: String -> DynFlags -> ParseResult (Located HsModule) #else parseModule :: String -> DynFlags -> ParseResult (Located (HsModule GhcPs)) #endif parseModule = parse Parser.parseModule -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) parseSignature :: String -> DynFlags -> ParseResult (Located HsModule) #else parseSignature :: String -> DynFlags -> ParseResult (Located (HsModule GhcPs))@@ -96,10 +96,16 @@ parseDeclaration = parse Parser.parseDeclaration  parseExpression :: String -> DynFlags -> ParseResult (LHsExpr GhcPs)-#if defined (GHCLIB_API_HEAD)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) parseExpression s flags =+  -- The need for annotations here came about first manifested with+  -- ghc-9.0.1   case parse Parser.parseExpression s flags of-    POk s e -> unP (runPV . unECP $ e) s+    POk state e ->+      let e' = e :: ECP+          parser_validator = unECP e' :: PV (LHsExpr GhcPs)+          parser = runPV parser_validator :: P (LHsExpr GhcPs)+      in unP parser state :: ParseResult (LHsExpr GhcPs)     PFailed ps -> PFailed ps #elif defined (GHCLIB_API_810) || defined (GHCLIB_API_900) parseExpression s flags =@@ -119,20 +125,24 @@ parseStmt :: String -> DynFlags -> ParseResult (Maybe (LStmt GhcPs (LHsExpr GhcPs))) parseStmt = parse Parser.parseStmt +#if defined(GHCLIB_API_HEAD) || defined(GHCLIB_API_902)+parseIdentifier :: String -> DynFlags -> ParseResult (LocatedN RdrName)+#else parseIdentifier :: String -> DynFlags -> ParseResult (Located RdrName)+#endif parseIdentifier = parse Parser.parseIdentifier  parseType :: String -> DynFlags -> ParseResult (LHsType GhcPs) parseType = parse Parser.parseType -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) parseHeader :: String -> DynFlags -> ParseResult (Located HsModule) #else parseHeader :: String -> DynFlags -> ParseResult (Located (HsModule GhcPs)) #endif parseHeader = parse Parser.parseHeader -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) parseFile :: String           -> DynFlags           -> String@@ -149,7 +159,7 @@     location = mkRealSrcLoc (mkFastString filename) 1 1     buffer = stringToStringBuffer str     parseState =-#if defined (GHCLIB_API_HEAD)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)       initParserState (initParserOpts flags) buffer location #else       mkPState flags buffer location

@@ -11,7 +11,7 @@   ) where -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Settings.Config import GHC.Driver.Session import GHC.Utils.Fingerprint@@ -32,12 +32,14 @@  fakeSettings :: Settings fakeSettings = Settings-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)|| defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900)|| defined (GHCLIB_API_810)   { sGhcNameVersion=ghcNameVersion   , sFileSettings=fileSettings   , sTargetPlatform=platform   , sPlatformMisc=platformMisc+#  if !defined(GHCLIB_API_HEAD)   , sPlatformConstants=platformConstants+#  endif   , sToolSettings=toolSettings   } #else@@ -49,7 +51,7 @@   } #endif   where-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)|| defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900)|| defined (GHCLIB_API_810)     toolSettings = ToolSettings {       toolSettings_opt_P_fingerprint=fingerprint0       }@@ -62,7 +64,7 @@ #endif     platform =       Platform{-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900)     -- It doesn't matter what values we write here as these fields are     -- not referenced for our purposes. However the fields are strict     -- so we must say something.@@ -73,12 +75,15 @@       , platformIsCrossCompiling=False       , platformLeadingUnderscore=False       , platformTablesNextToCode=False-#  if !defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD)+      , platform_constants = Nothing+#endif+#if !defined(GHCLIB_API_HEAD) && !defined (GHCLIB_API_900)       , platformConstants=platformConstants-#  endif+#endif       , #endif-#if defined (GHCLIB_API_HEAD)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902)         platformWordSize=PW8       , platformArchOS=ArchOS {archOS_arch=ArchUnknown, archOS_OS=OSUnknown} #elif defined (GHCLIB_API_810) || defined (GHCLIB_API_900)@@ -90,10 +95,12 @@ #endif       , platformUnregisterised=True       }+#if !defined(GHCLIB_API_HEAD)     platformConstants =       PlatformConstants{pc_DYNAMIC_BY_DEFAULT=False,pc_WORD_SIZE=8}+#endif -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)|| defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900)|| defined (GHCLIB_API_810) fakeLlvmConfig :: LlvmConfig fakeLlvmConfig = LlvmConfig [] [] #else

@@ -9,7 +9,11 @@  ) where -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+import GHC.Parser.Annotation+#endif++#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Types.SrcLoc import GHC.Types.Name import GHC.Types.Name.Reader@@ -23,21 +27,38 @@ -- These names may not seem natural here but they work out in -- practice. The use of thse two functions is thoroughly ubiquitous. occNameStr :: RdrName -> String; occNameStr = occNameString . rdrNameOcc-rdrNameStr :: Located RdrName -> String; rdrNameStr = occNameStr . unLoc+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+rdrNameStr :: GHC.Parser.Annotation.LocatedN RdrName -> String+#else+rdrNameStr :: Located RdrName -> String+#endif+rdrNameStr = occNameStr . unLoc  -- Builtin type or data constructors.+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+isSpecial :: LocatedN RdrName -> Bool+#else isSpecial :: Located RdrName -> Bool+#endif isSpecial (L _ (Exact n)) = isDataConName n || isTyConName n isSpecial _ = False  -- Coerce qualified names to unqualified (by discarding the -- qualifier).+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+unqual :: LocatedN RdrName -> LocatedN RdrName+#else unqual :: Located RdrName -> Located RdrName+#endif unqual (L loc (Qual _ n)) = L loc $ mkRdrUnqual n unqual x = x  -- Extract the occ name from a qualified/unqualified reader name.+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+fromQual :: LocatedN RdrName -> Maybe OccName+#else fromQual :: Located RdrName -> Maybe OccName+#endif fromQual (L _ (Qual _ x)) = Just x fromQual (L _ (Unqual x)) = Just x fromQual _ = Nothing

@@ -8,9 +8,9 @@ ) where -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined(GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Utils.Outputable-#if !defined (GHCLIB_API_900)+#if !defined(GHCLIB_API_HEAD) && !defined (GHCLIB_API_900) import GHC.Driver.Ppr #endif #else

@@ -17,6 +17,12 @@ import Data.List.Extra import Data.Maybe import Data.Generics.Uniplate.Data+#if defined (GHCLIB_API_HEAD)+import GHC.Data.Bag+import GHC.Driver.Errors.Types+import GHC.Types.Error hiding (getMessages)+import qualified GHC.Types.Error (getMessages)+#endif  import Language.Haskell.GhclibParserEx.Dump import Language.Haskell.GhclibParserEx.Fixity@@ -39,19 +45,23 @@ import Language.Haskell.GhclibParserEx.GHC.Driver.Session import Language.Haskell.GhclibParserEx.GHC.Types.Name.Reader -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) import GHC.Hs #else import HsSyn #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) || defined (GHCLIB_API_900) import GHC.Types.SrcLoc import GHC.Driver.Session import GHC.Parser.Lexer+# if !(defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)) import GHC.Utils.Outputable+#endif #  if !defined (GHCLIB_API_900) import GHC.Driver.Ppr+#    if !defined (GHCLIB_API_HEAD) import GHC.Parser.Errors.Ppr+#    endif #  endif import GHC.Utils.Error import GHC.Types.Name.Reader@@ -70,11 +80,6 @@ import Bag #endif -#if defined (GHCLIB_API_HEAD)-showSDocUnsafe :: SDoc -> String-showSDocUnsafe = showPprUnsafe-#endif- main :: IO () main = do   setEnv "TASTY_NUM_THREADS" "1"@@ -98,70 +103,89 @@     writeFile relPath contents     return relPath +#if defined (GHCLIB_API_HEAD)+chkParseResult :: (DynFlags -> Bag (MsgEnvelope GhcMessage)  -> String) -> DynFlags -> ParseResult a -> IO ()+#else chkParseResult :: (DynFlags -> WarningMessages -> String) -> DynFlags -> ParseResult a -> IO ()+#endif chkParseResult report flags = \case     POk s _ -> do-#if defined (GHCLIB_API_HEAD)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)       let (wrns, errs) = getMessages s #else       let (wrns, errs) = getMessages s flags #endif       when (not (null errs) || not (null wrns)) $ #if defined (GHCLIB_API_HEAD)+        assertFailure (+          report flags (GHC.Types.Error.getMessages (GhcPsMessage <$> wrns)) +++          report flags (GHC.Types.Error.getMessages (GhcPsMessage <$> errs))+        )++#elif defined (GHCLIB_API_902)         assertFailure (report flags (fmap pprWarning wrns) ++ report flags (fmap pprError errs)) #else         assertFailure (report flags wrns ++ report flags errs) #endif-#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900) || defined (GHCLIB_API_810) #if defined (GHCLIB_API_HEAD)+    PFailed s -> assertFailure (report flags $ GHC.Types.Error.getMessages (GhcPsMessage <$> snd (getMessages s)))+#elif defined (GHCLIB_API_902)     PFailed s -> assertFailure (report flags $ fmap pprError (snd (getMessages s)))-#else+#elif defined (GHCLIB_API_900) || defined (GHCLIB_API_810)     PFailed s -> assertFailure (report flags $ snd (getMessages s flags))-#endif #else     PFailed _ loc err -> assertFailure (report flags $ unitBag $ mkPlainErrMsg flags loc err) #endif  parseTests :: TestTree parseTests = testGroup "Parse tests"-  [ testCase "Module" $-      chkParseResult report flags $+  [+    testCase "Module" $+      chkParseResult report flags (         parseModule (unlines           [ "module Foo (readMany) where"           , "import Data.List"           , "import Data.Maybe"           , "readMany = unfoldr $ listToMaybe . concatMap reads . tails"-          ]) flags+          ]) flags)+  , testCase "Module" $+      chkParseResult report flags (+        parseModule (unlines+          [ "module Foo (readMany) where"+          , "import Data.List"+          , "import Data.Maybe"+          , "readMany = unfoldr $ listToMaybe . concatMap reads . tails"+          ]) flags)   , testCase "Signature" $-      chkParseResult report flags $+      chkParseResult report flags (         parseSignature (unlines           [ "signature Str where"           , "data Str"           , "empty :: Str"           , "append :: Str -> Str -> Str"-          ]) flags+          ]) flags)   , testCase "Import" $-      chkParseResult report flags $-        parseImport "import qualified \"foo-lib\" Foo as Bar hiding ((<.>))" flags+      chkParseResult report flags (+        parseImport "import qualified \"foo-lib\" Foo as Bar hiding ((<.>))" flags)   , testCase "Statement" $-      chkParseResult report flags $-        parseStatement "Foo foo <- bar" flags+      chkParseResult report flags (+        parseStatement "Foo foo <- bar" flags)   , testCase "Backpack" $-      chkParseResult report flags $+      chkParseResult report flags (         parseBackpack (unlines           [ "unit main where"           , "  module Main where"           , "    main = putStrLn \"Hello world!\""-          ]) flags+          ]) flags)   , testCase "Expression" $-      chkParseResult report flags $-        parseExpression "unfoldr $ listToMaybe . concatMap reads . tails" flags+      chkParseResult report flags (+        parseExpression "unfoldr $ listToMaybe . concatMap reads . tails" flags)   , testCase "Declaration (1)" $-      chkParseResult report flags $-        parseDeclaration "fact n = if n <= 1 then 1 else n * fact (n - 1)" flags+      chkParseResult report flags (+        parseDeclaration "fact n = if n <= 1 then 1 else n * fact (n - 1)" flags)   , testCase "Declaration (2)" $ -- Example from https://github.com/ndmitchell/hlint/issues/842.-      chkParseResult report flags $-        parseDeclaration "infixr 4 <%@~" flags+      chkParseResult report flags (+        parseDeclaration "infixr 4 <%@~" flags)   , testCase "File" $ withTempDir $ \tmpDir -> do       foo <- makeFile (tmpDir </> "Foo.hs") $ unlines         ["{-# LANGUAGE ScopedTypeVariables #-}"@@ -173,13 +197,17 @@       s <- readFile' foo       parsePragmasIntoDynFlags flags ([], []) foo s >>= \case         Left msg -> assertFailure msg-        Right flags -> chkParseResult report flags $ parseFile foo flags s+        Right flags -> chkParseResult report flags (parseFile foo flags s)   ]   where     flags = defaultDynFlags fakeSettings fakeLlvmConfig+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+    report flags msgs = concat [ showSDoc flags msg | msg <- pprMsgEnvelopeBagWithLoc msgs ]+#else     report flags msgs = concat [ showSDoc flags msg | msg <- pprErrMsgBagWithLoc msgs ]+#endif -#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_900)+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902) || defined (GHCLIB_API_900) moduleTest :: String -> DynFlags -> (Located HsModule -> IO ()) -> IO () #else moduleTest :: String -> DynFlags -> (Located (HsModule GhcPs) -> IO ()) -> IO ()@@ -207,15 +235,25 @@       exprTest "1 + 2 * 3" flags         (\e ->             assertBool "parse tree not affected" $+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+              showSDocUnsafe (showAstData BlankSrcSpan BlankEpAnnotations e) /=+              showSDocUnsafe (showAstData BlankSrcSpan BlankEpAnnotations (applyFixities [] e))+#else               showSDocUnsafe (showAstData BlankSrcSpan e) /=               showSDocUnsafe (showAstData BlankSrcSpan (applyFixities [] e))+#endif         )   , testCase "Pattern" $       case parseDeclaration "f (1 : 2 :[]) = 1" flags of         POk _ d ->           assertBool "parse tree not affected" $+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+          showSDocUnsafe (showAstData BlankSrcSpan BlankEpAnnotations d) /=+          showSDocUnsafe (showAstData BlankSrcSpan BlankEpAnnotations (applyFixities [] d))+#else           showSDocUnsafe (showAstData BlankSrcSpan d) /=           showSDocUnsafe (showAstData BlankSrcSpan (applyFixities [] d))+#endif         PFailed{} -> assertFailure "parse error"   , testCase "fixitiesFromModule" $       case parseModule "infixl 4 <*!" flags of@@ -253,8 +291,16 @@   , testCase "isDot" $ test "f . g" $ \case L _ (OpApp _ _ op _) -> assert' $ isDot op; _ -> assertFailure "unexpected"   , testCase "isReturn" $ test "return x" $ \case L _ (HsApp _ f _) -> assert' $ isReturn f; _ -> assertFailure "unexpected"   , testCase "isReturn" $ test "pure x" $ \case L _ (HsApp _ f _) -> assert' $ isReturn f; _ -> assertFailure "unexpected"+#if defined (GHCLIB_API_HEAD)+  , testCase "isSection" $ test "(1 +)" $ \case L _ (HsPar _ _ x _) -> assert' $ isSection x; _ -> assertFailure "unexpected"+#else   , testCase "isSection" $ test "(1 +)" $ \case L _ (HsPar _ x) -> assert' $ isSection x; _ -> assertFailure "unexpected"+#endif+#if defined (GHCLIB_API_HEAD)+  , testCase "isSection" $ test "(+ 1)" $ \case L _ (HsPar _ _ x _) -> assert' $ isSection x; _ -> assertFailure "unexpected"+#else   , testCase "isSection" $ test "(+ 1)" $ \case L _ (HsPar _ x) -> assert' $ isSection x; _ -> assertFailure "unexpected"+#endif   , testCase "isRecConstr" $ test "Foo {bar=1}" $ assert' . isRecConstr   , testCase "isRecUpdate" $ test "foo {bar=1}" $ assert' . isRecUpdate   , testCase "isVar" $ test "foo" $ assert' . isVar@@ -365,7 +411,7 @@       -- https://github.com/ndmitchell/hlint/issues/971).       parsePragmasIntoDynFlags flags ([StarIsType], []) foo s >>= \case         Left msg -> assertFailure msg-        Right flags -> chkParseResult report flags $ parseFile foo flags s+        Right flags -> chkParseResult report flags (parseFile foo flags s) #if defined (MIN_VERSION_ghc_lib_parser) #  if !MIN_VERSION_ghc_lib_parser(1,  0,  0) || MIN_VERSION_ghc_lib_parser(8, 10, 0)   , testCase "ImportQualifiedPost" $ do@@ -382,8 +428,11 @@   ]   where     flags = defaultDynFlags fakeSettings fakeLlvmConfig+#if defined (GHCLIB_API_HEAD) || defined (GHCLIB_API_902)+    report flags msgs = concat [ showSDoc flags msg | msg <- pprMsgEnvelopeBagWithLoc msgs ]+#else     report flags msgs = concat [ showSDoc flags msg | msg <- pprErrMsgBagWithLoc msgs ]-+#endif nameTests :: TestTree nameTests = testGroup "Name tests"   [ testCase "modName (1)" $