Rakarake/churf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix redundant print paren

Browse source
This commit is contained in:
Martin Fredin 2023-04-08 13:38:30 +02:00
parent 21b1ba7b1f
commit 9cb4a620bb
1 changed files with 17 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/TypeChecker/TypeCheckerIr.hs
View file

@ -71,17 +71,15 @@ instance Print Ident where
prt _ (Ident s) = doc $ showString s prt _ (Ident s) = doc $ showString s
instance Print t => Print (Program' t) where instance Print t => Print (Program' t) where
prt i (Program sc) = prPrec i 0 $ prt 0 sc prt i (Program sc) = prt i sc
instance Print t => Print (Bind' t) where instance Print t => Print (Bind' t) where
prt i (Bind sig@(name, _) parms rhs) = prt i (Bind sig@(name, _) parms rhs) = concatD
prPrec i 0 $
concatD
[ prtSig sig [ prtSig sig
, prt 0 name , prt i name
, prtIdPs 0 parms , prt i parms
, doc $ showString "=" , doc $ showString "="
, prt 0 rhs , prt i rhs
] ]
prtSig :: Print t => Id' t -> Doc prtSig :: Print t => Id' t -> Doc
@ -98,18 +96,15 @@ instance Print t => Print (ExpT' t) where
concatD concatD
[ doc $ showString "(" [ doc $ showString "("
, prt i e , prt i e
, doc $ showString "," , doc $ showString ":"
, prt i t , prt 0 t
, doc $ showString ")" , doc $ showString ")"
] ]
instance Print t => Print [Bind' t] where instance Print t => Print [Bind' t] where
prt _ [] = concatD [] prt _ [] = concatD []
prt _ [x] = concatD [prt 0 x] prt i [x] = concatD [prt i x]
prt _ (x : xs) = concatD [prt 0 x, doc (showString ";"), prt 0 xs] prt i (x : xs) = concatD [prt i x, doc (showString ";"), prt i xs]
prtIdPs :: Print t => Int -> [Id' t] -> Doc
prtIdPs i = prPrec i 0 . concatD . map (prt i)
instance Print t => Print (Id' t) where instance Print t => Print (Id' t) where
prt i (name, t) = prt i (name, t) =
@ -123,48 +118,14 @@ instance Print t => Print (Id' t) where
instance Print t => Print (Exp' t) where instance Print t => Print (Exp' t) where
prt i = \case prt i = \case
EVar name -> prPrec i 3 $ prt 0 name EVar lident -> prPrec i 3 (concatD [prt 0 lident])
EInj name -> prPrec i 3 $ prt 0 name EInj uident -> prPrec i 3 (concatD [prt 0 uident])
ELit lit -> prPrec i 3 $ prt 0 lit ELit lit -> prPrec i 3 (concatD [prt 0 lit])
ELet b e -> EApp exp1 exp2 -> prPrec i 2 (concatD [prt 2 exp1, prt 3 exp2])
prPrec i 3 $ EAdd exp1 exp2 -> prPrec i 1 (concatD [prt 1 exp1, doc (showString "+"), prt 2 exp2])
concatD ELet bind exp -> prPrec i 0 (concatD [doc (showString "let"), prt 0 bind, doc (showString "in"), prt 0 exp])
[ doc $ showString "let" EAbs lident exp -> prPrec i 0 (concatD [doc (showString "\\"), prt 0 lident, doc (showString "."), prt 0 exp])
, prt 0 b ECase exp branchs -> prPrec i 0 (concatD [doc (showString "case"), prt 0 exp, doc (showString "of"), doc (showString "{"), prt 0 branchs, doc (showString "}")])
, doc $ showString "in"
, prt 0 e
]
EApp e1 e2 ->
prPrec i 2 $
concatD
[ prt 2 e1
, prt 3 e2
]
EAdd e1 e2 ->
prPrec i 1 $
concatD
[ prt 1 e1
, doc $ showString "+"
, prt 2 e2
]
EAbs v e ->
prPrec i 0 $
concatD
[ doc $ showString "\\"
, prt 0 v
, doc $ showString "."
, prt 0 e
]
ECase e branches ->
prPrec i 0 $
concatD
[ doc $ showString "case"
, prt 0 e
, doc $ showString "of"
, doc $ showString "{"
, prt 0 branches
, doc $ showString "}"
]
instance Print t => Print (Branch' t) where instance Print t => Print (Branch' t) where
prt i (Branch (pattern_, t) exp) = prPrec i 0 (concatD [doc (showString "("), prt 0 pattern_, doc (showString " : "), prt 0 t, doc (showString ")"), doc (showString "=>"), prt 0 exp]) prt i (Branch (pattern_, t) exp) = prPrec i 0 (concatD [doc (showString "("), prt 0 pattern_, doc (showString " : "), prt 0 t, doc (showString ")"), doc (showString "=>"), prt 0 exp])