[Git][ghc/ghc][wip/T18462] Missing renames
Sjoerd Visscher (@trac-sjoerd_visscher)
gitlab at gitlab.haskell.org
Thu Feb 20 18:58:23 UTC 2025
Sjoerd Visscher pushed to branch wip/T18462 at Glasgow Haskell Compiler / GHC
Commits:
1a7c9239 by Sjoerd Visscher at 2025-02-20T19:58:12+01:00
Missing renames
- - - - -
5 changed files:
- compiler/GHC/Hs/Type.hs
- compiler/Language/Haskell/Syntax/Type.hs
- utils/check-exact/ExactPrint.hs
- utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs
- utils/haddock/haddock-api/src/Haddock/Types.hs
Changes:
=====================================
compiler/GHC/Hs/Type.hs
=====================================
@@ -548,7 +548,7 @@ type instance XExplicitMult _ GhcPs = (EpToken "%", EpArrowOrColon)
type instance XExplicitMult _ GhcRn = NoExtField
type instance XExplicitMult _ GhcTc = Mult
-type instance XXMultAnnOn _ (GhcPass _) = DataConCantHappen
+type instance XXMultAnnOf _ (GhcPass _) = DataConCantHappen
hsNoMultAnn :: HsMultAnnOnWhat -> HsMultAnnOf (LHsType GhcPs) GhcPs
hsNoMultAnn OnArrow = HsUnannotated OnArrow (EpArrow noAnn)
=====================================
compiler/Language/Haskell/Syntax/Type.hs
=====================================
@@ -24,7 +24,7 @@ GHC.Hs.Type: Abstract syntax: user-defined types
module Language.Haskell.Syntax.Type (
HsArrow, HsArrowOf, HsMultAnn, HsMultAnnOf(..), HsMultAnnOnWhat(..),
pattern HsUnrestrictedArrow,
- XUnannotated, XLinearAnn, XExplicitMult, XXMultAnnOn,
+ XUnannotated, XLinearAnn, XExplicitMult, XXMultAnnOf,
HsType(..), LHsType, HsKind, LHsKind,
HsBndrVis(..), XBndrRequired, XBndrInvisible, XXBndrVis,
@@ -943,12 +943,12 @@ data HsMultAnnOf mult pass
-- `HsType` so as to preserve the syntax as written in the
-- program.
- | XMultAnnOn !(XXMultAnnOn mult pass)
+ | XMultAnnOf !(XXMultAnnOf mult pass)
type family XUnannotated mult p
type family XLinearAnn mult p
type family XExplicitMult mult p
-type family XXMultAnnOn mult p
+type family XXMultAnnOf mult p
{-
Note [Unit tuples]
@@ -1121,7 +1121,7 @@ data HsConDeclField pass
* GADT-style declarations with record syntax
e.g. data T3 a where MkT :: { x :: Maybe a, y :: !Int } -> T3 a
-These argument types are decorated with any user-defined
+Each argument type is decorated with any user-defined
a) UNPACK pragma `cdf_unpack`
b) strictness annotation `cdf_bang`
c) multiplicity annotation `cdf_multiplicity`
=====================================
utils/check-exact/ExactPrint.hs
=====================================
@@ -2319,7 +2319,7 @@ instance ExactPrint (HsBind GhcPs) where
return (FunBind x fun_id' matches')
exact (PatBind x pat q grhss) = do
- (q', pat') <- markMultAnnOn q (markAnnotated pat)
+ (q', pat') <- markMultAnnOf q (markAnnotated pat)
grhss' <- markAnnotated grhss
return (PatBind x pat' q' grhss')
exact (PatSynBind x bind) = do
@@ -3132,7 +3132,7 @@ instance ExactPrint (HsExpr GhcPs) where
return (HsEmbTy toktype' t')
exact (HsFunArr _ mult arg res) = do
- (mult', arg') <- markMultAnnOn mult (markAnnotated arg)
+ (mult', arg') <- markMultAnnOf mult (markAnnotated arg)
res' <- markAnnotated res
return (HsFunArr noExtField mult' arg' res')
@@ -3940,7 +3940,7 @@ instance ExactPrint (HsType GhcPs) where
ki' <- markAnnotated ki
return (HsAppKindTy at' ty' ki')
exact (HsFunTy an mult ty1 ty2) = do
- (mult', ty1') <- markMultAnnOn mult (markAnnotated ty1)
+ (mult', ty1') <- markMultAnnOf mult (markAnnotated ty1)
ty2' <- markAnnotated ty2
return (HsFunTy an mult' ty1' ty2')
exact (HsListTy an tys) = do
@@ -4380,21 +4380,21 @@ instance ExactPrint (HsConDeclField GhcPs) where
getAnnotationEntry = const NoEntryVal
setAnnotationAnchor a _ _ _ = a
exact cdf@(CDF { cdf_ext, cdf_bang, cdf_multiplicity, cdf_type }) = do
- (mult, (an, t)) <- markMultAnnOn cdf_multiplicity ((,) <$> exactBang cdf_ext cdf_bang <*> markAnnotated cdf_type)
+ (mult, (an, t)) <- markMultAnnOf cdf_multiplicity ((,) <$> exactBang cdf_ext cdf_bang <*> markAnnotated cdf_type)
return (cdf { cdf_ext = an, cdf_multiplicity = mult, cdf_type = t })
-markMultAnnOn :: (Monad m, Monoid w, ExactPrint a) => HsMultAnnOf a GhcPs -> EP w m b -> EP w m (HsMultAnnOf a GhcPs, b)
-markMultAnnOn (HsUnannotated on arrOrCol) tyM = do
+markMultAnnOf :: (Monad m, Monoid w, ExactPrint a) => HsMultAnnOf a GhcPs -> EP w m b -> EP w m (HsMultAnnOf a GhcPs, b)
+markMultAnnOf (HsUnannotated on arrOrCol) tyM = do
((), arrOrCol', ty') <- markArrOrCol (pure ()) arrOrCol tyM
return (HsUnannotated on arrOrCol', ty')
-markMultAnnOn (HsLinearAnn (EpPct1 pct1 arrOrCol)) tyM = do
+markMultAnnOf (HsLinearAnn (EpPct1 pct1 arrOrCol)) tyM = do
(pct1', arrOrCol', ty') <- markArrOrCol (markEpToken pct1) arrOrCol tyM
return (HsLinearAnn (EpPct1 pct1' arrOrCol'), ty')
-markMultAnnOn (HsLinearAnn (EpLolly arr)) tyM = do
+markMultAnnOf (HsLinearAnn (EpLolly arr)) tyM = do
ty' <- tyM
arr' <- markEpToken arr
return (HsLinearAnn (EpLolly arr'), ty')
-markMultAnnOn (HsExplicitMult (pct, arrOrCol) t) tyM = do
+markMultAnnOf (HsExplicitMult (pct, arrOrCol) t) tyM = do
((pct', t'), arrOrCol', ty') <- markArrOrCol ((,) <$> markEpToken pct <*> markAnnotated t) arrOrCol tyM
return (HsExplicitMult (pct', arrOrCol') t', ty')
=====================================
utils/haddock/haddock-api/src/Haddock/Interface/Rename.hs
=====================================
@@ -340,10 +340,10 @@ renameMaybeInjectivityAnn
-> RnM (Maybe (LInjectivityAnn DocNameI))
renameMaybeInjectivityAnn = traverse renameInjectivityAnn
-renameMultAnnOn :: HsMultAnn GhcRn -> RnM (HsMultAnn DocNameI)
-renameMultAnnOn (HsUnannotated on _) = return (HsUnannotated on noExtField)
-renameMultAnnOn (HsLinearAnn _) = return (HsLinearAnn noExtField)
-renameMultAnnOn (HsExplicitMult _ p) = HsExplicitMult noExtField <$> renameLType p
+renameMultAnn :: HsMultAnn GhcRn -> RnM (HsMultAnn DocNameI)
+renameMultAnn (HsUnannotated on _) = return (HsUnannotated on noExtField)
+renameMultAnn (HsLinearAnn _) = return (HsLinearAnn noExtField)
+renameMultAnn (HsExplicitMult _ p) = HsExplicitMult noExtField <$> renameLType p
renameType :: HsType GhcRn -> RnM (HsType DocNameI)
renameType t = case t of
@@ -374,7 +374,7 @@ renameType t = case t of
HsFunTy _ w a b -> do
a' <- renameLType a
b' <- renameLType b
- w' <- renameMultAnnOn w
+ w' <- renameMultAnn w
return (HsFunTy noAnn w' a' b')
HsListTy _ ty -> return . (HsListTy noAnn) =<< renameLType ty
HsIParamTy _ n ty -> liftM (HsIParamTy noAnn n) (renameLType ty)
@@ -720,7 +720,7 @@ renameHsConDeclField
:: HsConDeclField GhcRn
-> RnM (HsConDeclField DocNameI)
renameHsConDeclField cdf = do
- w <- renameMultAnnOn (cdf_multiplicity cdf)
+ w <- renameMultAnn (cdf_multiplicity cdf)
ty <- renameLType (cdf_type cdf)
doc <- mapM renameLDocHsSyn (cdf_doc cdf)
return
=====================================
utils/haddock/haddock-api/src/Haddock/Types.hs
=====================================
@@ -842,7 +842,7 @@ type instance XXBndrVis DocNameI = DataConCantHappen
type instance XUnannotated _ DocNameI = NoExtField
type instance XLinearAnn _ DocNameI = NoExtField
type instance XExplicitMult _ DocNameI = NoExtField
-type instance XXMultAnnOn _ DocNameI = DataConCantHappen
+type instance XXMultAnnOf _ DocNameI = DataConCantHappen
type instance XForAllTy DocNameI = EpAnn NoEpAnns
type instance XQualTy DocNameI = EpAnn NoEpAnns
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1a7c923935fbc85fd43d8caf4a54a12bcc1db853
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1a7c923935fbc85fd43d8caf4a54a12bcc1db853
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20250220/10615fae/attachment-0001.html>
More information about the ghc-commits
mailing list