3a3976b · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Better pretty printing of case blocks

They should be bracketed as if they are an application. Also display names as '_' if they are machine generated (e.g. bindings in do blocks)

commit3a3976bece0c4241edee857b5dee35917ca89fa8 authorEdwin Brady <ecb10@st-andrews.ac.uk> dateThu 28 Jul 2016, 13:06 (10 years ago) parentc0e0d8f

1 file changed+4−2

unifiedsplit

src/Idris/AbsSyntaxTree.hs+4−2

@@ -1994,8 +1994,9 @@ pprintPTerm ppo bnd docArgs infixes = prettySe (ppopt_depth ppo) startPrec bnd

19941994 else fp <+> align (vsep (map (prettyArgS d bnd) shownArgs))

19951995 prettySe d p bnd (PWithApp _ f a) = prettySe d p bnd f <+> text "|" <+> prettySe d p bnd a

19961996 prettySe d p bnd (PCase _ scr cases) =

1997− align $ kwd "case" <+> prettySe (decD d) startPrec bnd scr <+> kwd "of" <$>

1998− depth d (indent 2 (vsep (map ppcase cases)))

1997+ bracket p funcAppPrec $

1998+ align $ kwd "case" <+> prettySe (decD d) startPrec bnd scr <+> kwd "of" <$>

1999+ depth d (indent 2 (vsep (map ppcase cases)))

19992000 where

20002001 ppcase (l, r) = let prettyCase = prettySe (decD d) startPrec

20012002 ([(n, False) | n <- vars l] ++ bnd)

@@ -2255,6 +2256,7 @@ prettyName :: Bool -- ^ whether the name should be parenthesised if it

22552256 -> Doc OutputAnnotation

22562257prettyName infixParen showNS bnd n

22572258 | (MN _ s) <- n, isPrefixOf "_" $ T.unpack s = text "_"

2259+ | (UN n') <- n, isPrefixOf "__" $ T.unpack n' = text "_"

22582260 | (UN n') <- n, T.unpack n' == "_" = text "_"

22592261 | Just imp <- lookup n bnd = annotate (AnnBoundName n imp) fullName

22602262 | otherwise = annotate (AnnName n Nothing Nothing Nothing) fullName