diff options
Diffstat (limited to 'compiler/GHC/Hs/Expr.hs')
| -rw-r--r-- | compiler/GHC/Hs/Expr.hs | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/compiler/GHC/Hs/Expr.hs b/compiler/GHC/Hs/Expr.hs index 0659c0f654..f9782756bd 100644 --- a/compiler/GHC/Hs/Expr.hs +++ b/compiler/GHC/Hs/Expr.hs @@ -206,13 +206,13 @@ could only do that if the extension field was strict (#18764) -- API Annotations types -data ApiAnnHsCase = ApiAnnHsCase +data EpAnnHsCase = EpAnnHsCase { hsCaseAnnCase :: AnnAnchor , hsCaseAnnOf :: AnnAnchor , hsCaseAnnsRest :: [AddEpAnn] } deriving Data -data ApiAnnUnboundVar = ApiAnnUnboundVar +data EpAnnUnboundVar = EpAnnUnboundVar { hsUnboundBackquotes :: (AnnAnchor, AnnAnchor) , hsUnboundHole :: AnnAnchor } deriving Data @@ -224,15 +224,15 @@ type instance XLam (GhcPass _) = NoExtField -- OverLabel not present in GhcTc pass; see GHC.Rename.Expr -- Note [Handling overloaded and rebindable constructs] -type instance XOverLabel GhcPs = ApiAnnCO -type instance XOverLabel GhcRn = ApiAnnCO +type instance XOverLabel GhcPs = EpAnnCO +type instance XOverLabel GhcRn = EpAnnCO type instance XOverLabel GhcTc = Void -- See Note [Constructor cannot occur] -- --------------------------------------------------------------------- type instance XVar (GhcPass _) = NoExtField -type instance XUnboundVar GhcPs = ApiAnn' ApiAnnUnboundVar +type instance XUnboundVar GhcPs = EpAnn' EpAnnUnboundVar type instance XUnboundVar GhcRn = NoExtField type instance XUnboundVar GhcTc = HoleExprRef -- We really don't need the whole HoleExprRef; just the IORef EvTerm @@ -242,14 +242,14 @@ type instance XUnboundVar GhcTc = HoleExprRef type instance XConLikeOut (GhcPass _) = NoExtField type instance XRecFld (GhcPass _) = NoExtField -type instance XIPVar (GhcPass _) = ApiAnnCO -type instance XOverLitE (GhcPass _) = ApiAnnCO -type instance XLitE (GhcPass _) = ApiAnnCO +type instance XIPVar (GhcPass _) = EpAnnCO +type instance XOverLitE (GhcPass _) = EpAnnCO +type instance XLitE (GhcPass _) = EpAnnCO type instance XLam (GhcPass _) = NoExtField -type instance XLamCase (GhcPass _) = ApiAnn -type instance XApp (GhcPass _) = ApiAnnCO +type instance XLamCase (GhcPass _) = EpAnn +type instance XApp (GhcPass _) = EpAnnCO type instance XAppTypeE GhcPs = SrcSpan -- Where the `@` lives type instance XAppTypeE GhcRn = NoExtField @@ -257,55 +257,55 @@ type instance XAppTypeE GhcTc = Type -- OpApp not present in GhcTc pass; see GHC.Rename.Expr -- Note [Handling overloaded and rebindable constructs] -type instance XOpApp GhcPs = ApiAnn +type instance XOpApp GhcPs = EpAnn type instance XOpApp GhcRn = Fixity type instance XOpApp GhcTc = Void -- See Note [Constructor cannot occur] -- SectionL, SectionR not present in GhcTc pass; see GHC.Rename.Expr -- Note [Handling overloaded and rebindable constructs] -type instance XSectionL GhcPs = ApiAnnCO -type instance XSectionR GhcPs = ApiAnnCO -type instance XSectionL GhcRn = ApiAnnCO -type instance XSectionR GhcRn = ApiAnnCO +type instance XSectionL GhcPs = EpAnnCO +type instance XSectionR GhcPs = EpAnnCO +type instance XSectionL GhcRn = EpAnnCO +type instance XSectionR GhcRn = EpAnnCO type instance XSectionL GhcTc = Void -- See Note [Constructor cannot occur] type instance XSectionR GhcTc = Void -- See Note [Constructor cannot occur] -type instance XNegApp GhcPs = ApiAnn +type instance XNegApp GhcPs = EpAnn type instance XNegApp GhcRn = NoExtField type instance XNegApp GhcTc = NoExtField -type instance XPar (GhcPass _) = ApiAnn' AnnParen +type instance XPar (GhcPass _) = EpAnn' AnnParen -type instance XExplicitTuple GhcPs = ApiAnn +type instance XExplicitTuple GhcPs = EpAnn type instance XExplicitTuple GhcRn = NoExtField type instance XExplicitTuple GhcTc = NoExtField -type instance XExplicitSum GhcPs = ApiAnn' AnnExplicitSum +type instance XExplicitSum GhcPs = EpAnn' AnnExplicitSum type instance XExplicitSum GhcRn = NoExtField type instance XExplicitSum GhcTc = [Type] -type instance XCase GhcPs = ApiAnn' ApiAnnHsCase +type instance XCase GhcPs = EpAnn' EpAnnHsCase type instance XCase GhcRn = NoExtField type instance XCase GhcTc = NoExtField -type instance XIf GhcPs = ApiAnn +type instance XIf GhcPs = EpAnn type instance XIf GhcRn = NoExtField type instance XIf GhcTc = NoExtField -type instance XMultiIf GhcPs = ApiAnn +type instance XMultiIf GhcPs = EpAnn type instance XMultiIf GhcRn = NoExtField type instance XMultiIf GhcTc = Type -type instance XLet GhcPs = ApiAnn' AnnsLet +type instance XLet GhcPs = EpAnn' AnnsLet type instance XLet GhcRn = NoExtField type instance XLet GhcTc = NoExtField -type instance XDo GhcPs = ApiAnn' AnnList +type instance XDo GhcPs = EpAnn' AnnList type instance XDo GhcRn = NoExtField type instance XDo GhcTc = Type -type instance XExplicitList GhcPs = ApiAnn' AnnList +type instance XExplicitList GhcPs = EpAnn' AnnList type instance XExplicitList GhcRn = NoExtField type instance XExplicitList GhcTc = Type -- GhcPs: ExplicitList includes all source-level @@ -316,43 +316,43 @@ type instance XExplicitList GhcTc = Type -- See Note [Handling overloaded and rebindable constructs] -- in GHC.Rename.Expr -type instance XRecordCon GhcPs = ApiAnn +type instance XRecordCon GhcPs = EpAnn type instance XRecordCon GhcRn = NoExtField type instance XRecordCon GhcTc = PostTcExpr -- Instantiated constructor function -type instance XRecordUpd GhcPs = ApiAnn +type instance XRecordUpd GhcPs = EpAnn type instance XRecordUpd GhcRn = NoExtField type instance XRecordUpd GhcTc = RecordUpdTc -type instance XGetField GhcPs = ApiAnnCO +type instance XGetField GhcPs = EpAnnCO type instance XGetField GhcRn = NoExtField type instance XGetField GhcTc = Void -- HsGetField is eliminated by the renamer. See [Handling overloaded -- and rebindable constructs]. -type instance XProjection GhcPs = ApiAnn' AnnProjection +type instance XProjection GhcPs = EpAnn' AnnProjection type instance XProjection GhcRn = NoExtField type instance XProjection GhcTc = Void -- HsProjection is eliminated by the renamer. See [Handling overloaded -- and rebindable constructs]. -type instance XExprWithTySig GhcPs = ApiAnn +type instance XExprWithTySig GhcPs = EpAnn type instance XExprWithTySig GhcRn = NoExtField type instance XExprWithTySig GhcTc = NoExtField -type instance XArithSeq GhcPs = ApiAnn +type instance XArithSeq GhcPs = EpAnn type instance XArithSeq GhcRn = NoExtField type instance XArithSeq GhcTc = PostTcExpr -type instance XBracket (GhcPass _) = ApiAnn +type instance XBracket (GhcPass _) = EpAnn type instance XRnBracketOut (GhcPass _) = NoExtField type instance XTcBracketOut (GhcPass _) = NoExtField -type instance XSpliceE (GhcPass _) = ApiAnnCO -type instance XProc (GhcPass _) = ApiAnn +type instance XSpliceE (GhcPass _) = EpAnnCO +type instance XProc (GhcPass _) = EpAnn -type instance XStatic GhcPs = ApiAnn +type instance XStatic GhcPs = EpAnn type instance XStatic GhcRn = NameSet type instance XStatic GhcTc = NameSet @@ -403,15 +403,15 @@ data AnnProjection -- --------------------------------------------------------------------- -type instance XSCC (GhcPass _) = ApiAnn' AnnPragma +type instance XSCC (GhcPass _) = EpAnn' AnnPragma type instance XXPragE (GhcPass _) = NoExtCon -type instance XCHsFieldLabel (GhcPass _) = ApiAnn' AnnFieldLabel +type instance XCHsFieldLabel (GhcPass _) = EpAnn' AnnFieldLabel type instance XXHsFieldLabel (GhcPass _) = NoExtCon -type instance XPresent (GhcPass _) = ApiAnn +type instance XPresent (GhcPass _) = EpAnn -type instance XMissing GhcPs = ApiAnn' AnnAnchor +type instance XMissing GhcPs = EpAnn' AnnAnchor type instance XMissing GhcRn = NoExtField type instance XMissing GhcTc = Scaled Type @@ -981,33 +981,33 @@ instance (Outputable a, Outputable b) => Outputable (HsExpansion a b) where ************************************************************************ -} -type instance XCmdArrApp GhcPs = ApiAnn' AddEpAnn +type instance XCmdArrApp GhcPs = EpAnn' AddEpAnn type instance XCmdArrApp GhcRn = NoExtField type instance XCmdArrApp GhcTc = Type -type instance XCmdArrForm GhcPs = ApiAnn' AnnList +type instance XCmdArrForm GhcPs = EpAnn' AnnList type instance XCmdArrForm GhcRn = NoExtField type instance XCmdArrForm GhcTc = NoExtField -type instance XCmdApp (GhcPass _) = ApiAnnCO +type instance XCmdApp (GhcPass _) = EpAnnCO type instance XCmdLam (GhcPass _) = NoExtField -type instance XCmdPar (GhcPass _) = ApiAnn' AnnParen +type instance XCmdPar (GhcPass _) = EpAnn' AnnParen -type instance XCmdCase GhcPs = ApiAnn' ApiAnnHsCase +type instance XCmdCase GhcPs = EpAnn' EpAnnHsCase type instance XCmdCase GhcRn = NoExtField type instance XCmdCase GhcTc = NoExtField -type instance XCmdLamCase (GhcPass _) = ApiAnn +type instance XCmdLamCase (GhcPass _) = EpAnn -type instance XCmdIf GhcPs = ApiAnn +type instance XCmdIf GhcPs = EpAnn type instance XCmdIf GhcRn = NoExtField type instance XCmdIf GhcTc = NoExtField -type instance XCmdLet GhcPs = ApiAnn' AnnsLet +type instance XCmdLet GhcPs = EpAnn' AnnsLet type instance XCmdLet GhcRn = NoExtField type instance XCmdLet GhcTc = NoExtField -type instance XCmdDo GhcPs = ApiAnn' AnnList +type instance XCmdDo GhcPs = EpAnn' AnnList type instance XCmdDo GhcRn = NoExtField type instance XCmdDo GhcTc = Type @@ -1152,7 +1152,7 @@ type instance XMG GhcTc b = MatchGroupTc type instance XXMatchGroup (GhcPass _) b = NoExtCon -type instance XCMatch (GhcPass _) b = ApiAnn +type instance XCMatch (GhcPass _) b = EpAnn type instance XXMatch (GhcPass _) b = NoExtCon instance (OutputableBndrId pr, Outputable body) @@ -1190,7 +1190,7 @@ data GrhsAnn ga_sep :: AddEpAnn -- ^ Match separator location } deriving (Data) -type instance XCGRHS (GhcPass _) _ = ApiAnn' GrhsAnn +type instance XCGRHS (GhcPass _) _ = EpAnn' GrhsAnn -- Location of matchSeparator -- TODO:AZ does this belong on the GRHS, or GRHSs? @@ -1304,7 +1304,7 @@ data RecStmtTc = type instance XLastStmt (GhcPass _) (GhcPass _) b = NoExtField -type instance XBindStmt (GhcPass _) GhcPs b = ApiAnn +type instance XBindStmt (GhcPass _) GhcPs b = EpAnn type instance XBindStmt (GhcPass _) GhcRn b = XBindStmtRn type instance XBindStmt (GhcPass _) GhcTc b = XBindStmtTc @@ -1328,17 +1328,17 @@ type instance XBodyStmt (GhcPass _) GhcPs b = NoExtField type instance XBodyStmt (GhcPass _) GhcRn b = NoExtField type instance XBodyStmt (GhcPass _) GhcTc b = Type -type instance XLetStmt (GhcPass _) (GhcPass _) b = ApiAnn +type instance XLetStmt (GhcPass _) (GhcPass _) b = EpAnn type instance XParStmt (GhcPass _) GhcPs b = NoExtField type instance XParStmt (GhcPass _) GhcRn b = NoExtField type instance XParStmt (GhcPass _) GhcTc b = Type -type instance XTransStmt (GhcPass _) GhcPs b = ApiAnn +type instance XTransStmt (GhcPass _) GhcPs b = EpAnn type instance XTransStmt (GhcPass _) GhcRn b = NoExtField type instance XTransStmt (GhcPass _) GhcTc b = Type -type instance XRecStmt (GhcPass _) GhcPs b = ApiAnn' AnnList +type instance XRecStmt (GhcPass _) GhcPs b = EpAnn' AnnList type instance XRecStmt (GhcPass _) GhcRn b = NoExtField type instance XRecStmt (GhcPass _) GhcTc b = RecStmtTc @@ -1523,8 +1523,8 @@ pprQuals quals = interpp'SP quals newtype HsSplicedT = HsSplicedT DelayedSplice deriving (Data) -type instance XTypedSplice (GhcPass _) = ApiAnn -type instance XUntypedSplice (GhcPass _) = ApiAnn +type instance XTypedSplice (GhcPass _) = EpAnn +type instance XUntypedSplice (GhcPass _) = EpAnn type instance XQuasiQuote (GhcPass _) = NoExtField type instance XSpliced (GhcPass _) = NoExtField type instance XXSplice GhcPs = NoExtCon @@ -1838,6 +1838,6 @@ type instance Anno (HsSplice (GhcPass p)) = SrcSpanAnnA type instance Anno [LocatedA (StmtLR (GhcPass pl) (GhcPass pr) (LocatedA (HsExpr (GhcPass pr))))] = SrcSpanAnnL type instance Anno [LocatedA (StmtLR (GhcPass pl) (GhcPass pr) (LocatedA (HsCmd (GhcPass pr))))] = SrcSpanAnnL -instance (Anno a ~ SrcSpanAnn' (ApiAnn' an)) +instance (Anno a ~ SrcSpanAnn' (EpAnn' an)) => WrapXRec (GhcPass p) a where wrapXRec = noLocA |