diff options
| author | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2022-06-23 11:50:37 +0300 |
|---|---|---|
| committer | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2022-10-23 00:11:50 +0300 |
| commit | 11fe42d89d37539bd90f31ca47547922b3fc84ae (patch) | |
| tree | 52aaeb001808eeeafb4b7bad6d19d7d5e658581c /utils | |
| parent | 1937016b7834338eef12be19caefc8e37a90cd29 (diff) | |
| download | haskell-11fe42d89d37539bd90f31ca47547922b3fc84ae.tar.gz | |
Class layout info (#19623)
Updates the haddock submodule.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/check-exact/ExactPrint.hs | 21 | ||||
| -rw-r--r-- | utils/check-ppr/Main.hs | 2 | ||||
| m--------- | utils/haddock | 0 |
3 files changed, 13 insertions, 10 deletions
diff --git a/utils/check-exact/ExactPrint.hs b/utils/check-exact/ExactPrint.hs index cfa50a9e3b..d2005c6733 100644 --- a/utils/check-exact/ExactPrint.hs +++ b/utils/check-exact/ExactPrint.hs @@ -3417,17 +3417,17 @@ exactTransStmt an by using GroupForm = do -- --------------------------------------------------------------------- instance ExactPrint (TyClDecl GhcPs) where - getAnnotationEntry (FamDecl { }) = NoEntryVal - getAnnotationEntry (SynDecl { tcdSExt = an }) = fromAnn an - getAnnotationEntry (DataDecl { tcdDExt = an }) = fromAnn an - getAnnotationEntry (ClassDecl { tcdCExt = (an, _, _) }) = fromAnn an + getAnnotationEntry (FamDecl { }) = NoEntryVal + getAnnotationEntry (SynDecl { tcdSExt = an }) = fromAnn an + getAnnotationEntry (DataDecl { tcdDExt = an }) = fromAnn an + getAnnotationEntry (ClassDecl { tcdCExt = (an, _) }) = fromAnn an setAnnotationAnchor a@FamDecl{} _ _s = a setAnnotationAnchor x@SynDecl{} anc cs = x { tcdSExt = setAnchorEpa (tcdSExt x) anc cs } setAnnotationAnchor x@DataDecl{} anc cs = x { tcdDExt = setAnchorEpa (tcdDExt x) anc cs } - setAnnotationAnchor x@ClassDecl{} anc cs = x { tcdCExt = (setAnchorEpa an anc cs, a, b) } + setAnnotationAnchor x@ClassDecl{} anc cs = x { tcdCExt = (setAnchorEpa an anc cs, a) } where - (an,a,b) = tcdCExt x + (an,a) = tcdCExt x exact (FamDecl a decl) = do decl' <- markAnnotated decl @@ -3459,7 +3459,8 @@ instance ExactPrint (TyClDecl GhcPs) where -- ----------------------------------- - exact (ClassDecl {tcdCExt = (an, sortKey, lo), + exact (ClassDecl {tcdCExt = (an, sortKey), + tcdLayout = lo, tcdCtxt = context, tcdLName = lclas, tcdTyVars = tyvars, tcdFixity = fixity, tcdFDs = fds, @@ -3472,7 +3473,8 @@ instance ExactPrint (TyClDecl GhcPs) where (an0, fds', lclas', tyvars',context') <- top_matter an1 <- markEpAnnL an0 lidl AnnOpenC an2 <- markEpAnnL an1 lidl AnnCloseC - return (ClassDecl {tcdCExt = (an2, sortKey, lo), + return (ClassDecl {tcdCExt = (an2, sortKey), + tcdLayout = lo, tcdCtxt = context', tcdLName = lclas', tcdTyVars = tyvars', tcdFixity = fixity, tcdFDs = fds', @@ -3498,7 +3500,8 @@ instance ExactPrint (TyClDecl GhcPs) where methods' = listToBag $ undynamic ds ats' = undynamic ds at_defs' = undynamic ds - return (ClassDecl {tcdCExt = (an3, sortKey, lo), + return (ClassDecl {tcdCExt = (an3, sortKey), + tcdLayout = lo, tcdCtxt = context', tcdLName = lclas', tcdTyVars = tyvars', tcdFixity = fixity, tcdFDs = fds', diff --git a/utils/check-ppr/Main.hs b/utils/check-ppr/Main.hs index 9758889052..29505817b6 100644 --- a/utils/check-ppr/Main.hs +++ b/utils/check-ppr/Main.hs @@ -110,7 +110,7 @@ eraseLayoutInfo = everywhere go where go :: forall a. Typeable a => a -> a go x = - case eqT @a @LayoutInfo of + case eqT @a @(LayoutInfo GhcPs) of Nothing -> x Just Refl -> NoLayoutInfo diff --git a/utils/haddock b/utils/haddock -Subproject 57b7493ba60bc4f4cf6b57b900b0c46fe8d8666 +Subproject 9bede9364033d6167212d86c800bf8e6cc4f579 |