725587f · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Fixed testing failures I accidentally introduced when showing a better naming for machine generated names (so that I could better debug)

commit725587fa80350a67596a81a652d7b7e06f4ebbdd authorAhmad Salim Al-Sibahi <asal@itu.dk> dateWed 27 Nov 2013, 18:12 (13 years ago) parent9a89a8d

2 files changed+4−4

unifiedsplit

src/Core/TT.hs+2−2

@@ -253,14 +253,14 @@ instance Sized Name where

253253instance Pretty Name where

254254 pretty (UN n) = text n

255255 pretty (NS n s) = pretty n

256− pretty (MN i s) = text "«" <+> text s <+> (text . show $ i) <+> text "»"

256+ pretty (MN i s) = lbrace <+> text s <+> (text . show $ i) <+> rbrace

257257 pretty (SN s) = text (show s)

258258

259259instance Show Name where

260260 show (UN n) = n

261261 show (NS n s) = showSep "." (reverse s) ++ "." ++ show n

262262 show (MN _ "underscore") = "_"

263− show (MN i s) = "«" ++ s ++ show i ++ "»"

263+ show (MN i s) = "{" ++ s ++ show i ++ "}"

264264 show (SN s) = show s

265265 show NErased = "_"

266266

src/Idris/AbsSyntaxTree.hs+2−2

@@ -940,7 +940,7 @@ prettyImp impl = prettySe 10

940940 prettyBasic n

941941 where

942942 prettyBasic n@(UN _) = pretty n

943− prettyBasic n@(MN _ _) = pretty n

943+ prettyBasic (MN _ s) = text s

944944 prettyBasic (NS n s) = (foldr (<>) empty (intersperse (text ".") (map text $ reverse s))) <> prettyBasic n

945945 prettyBasic (SN sn) = text (show sn)

946946 prettySe p (PLam n ty sc) =

@@ -1126,7 +1126,7 @@ showName ist bnd impl colour n = case ist of

11261126 Nothing -> showbasic n

11271127 where name = if impl then show n else showbasic n

11281128 showbasic n@(UN _) = show n

1129− showbasic n@(MN _ _) = show n

1129+ showbasic (MN _ s) = s

11301130 showbasic (NS n s) = showSep "." (reverse s) ++ "." ++ showbasic n

11311131 showbasic (SN s) = show s

11321132 fst3 (x, _, _) = x