Skip to content
This repository was archived by the owner on Aug 3, 2024. It is now read-only.

LaTeX: fix printing of type variable bindings #1545

Merged
merged 1 commit into from
Dec 11, 2022
Merged

LaTeX: fix printing of type variable bindings #1545

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
18 changes: 9 additions & 9 deletions haddock-api/src/Haddock/Backends/LaTeX.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,21 +533,21 @@ ppTypeSig nms ty unicode =
<+> dcolon unicode
<+> ppSigType unicode ty

ppHsOuterTyVarBndrs :: HsOuterTyVarBndrs flag DocNameI -> Bool -> LaTeX
ppHsOuterTyVarBndrs :: RenderableBndrFlag flag => HsOuterTyVarBndrs flag DocNameI -> Bool -> LaTeX
ppHsOuterTyVarBndrs (HsOuterImplicit{}) _ = empty
ppHsOuterTyVarBndrs (HsOuterExplicit{hso_bndrs = bndrs}) unicode =
hsep (forallSymbol unicode : ppTyVars bndrs) <> dot
hsep (forallSymbol unicode : ppTyVars unicode bndrs) <> dot

ppHsForAllTelescope :: HsForAllTelescope DocNameI -> Bool -> LaTeX
ppHsForAllTelescope tele unicode = case tele of
HsForAllVis { hsf_vis_bndrs = bndrs } ->
hsep (forallSymbol unicode : ppTyVars bndrs) <> text "\\" <> arrow unicode
hsep (forallSymbol unicode : ppTyVars unicode bndrs) <> text "\\" <> arrow unicode
HsForAllInvis { hsf_invis_bndrs = bndrs } ->
hsep (forallSymbol unicode : ppTyVars bndrs) <> dot
hsep (forallSymbol unicode : ppTyVars unicode bndrs) <> dot


ppTyVars :: [LHsTyVarBndr flag DocNameI] -> [LaTeX]
ppTyVars = map (ppSymName . getName . hsLTyVarNameI)
ppTyVars :: RenderableBndrFlag flag => Bool -> [LHsTyVarBndr flag DocNameI] -> [LaTeX]
ppTyVars unicode tvs = map (ppHsTyVarBndr unicode . unLoc) tvs


tyvarNames :: LHsQTyVars DocNameI -> [Name]
Expand Down Expand Up @@ -1069,15 +1069,15 @@ class RenderableBndrFlag flag where
instance RenderableBndrFlag () where
ppHsTyVarBndr _ (UserTyVar _ _ (L _ name)) = ppDocName name
ppHsTyVarBndr unicode (KindedTyVar _ _ (L _ name) kind) =
parens (ppDocName name) <+> dcolon unicode <+> ppLKind unicode kind
parens (ppDocName name <+> dcolon unicode <+> ppLKind unicode kind)

instance RenderableBndrFlag Specificity where
ppHsTyVarBndr _ (UserTyVar _ SpecifiedSpec (L _ name)) = ppDocName name
ppHsTyVarBndr _ (UserTyVar _ InferredSpec (L _ name)) = braces $ ppDocName name
ppHsTyVarBndr unicode (KindedTyVar _ SpecifiedSpec (L _ name) kind) =
parens (ppDocName name) <+> dcolon unicode <+> ppLKind unicode kind
parens (ppDocName name <+> dcolon unicode <+> ppLKind unicode kind)
ppHsTyVarBndr unicode (KindedTyVar _ InferredSpec (L _ name) kind) =
braces (ppDocName name) <+> dcolon unicode <+> ppLKind unicode kind
braces (ppDocName name <+> dcolon unicode <+> ppLKind unicode kind)

ppLKind :: Bool -> LHsKind DocNameI -> LaTeX
ppLKind unicode y = ppKind unicode (unLoc y)
Expand Down