Display nested lambdas together
This commit is contained in:
parent
7d0d513735
commit
72083325ce
1 changed files with 11 additions and 8 deletions
|
|
@ -7,7 +7,7 @@ module Props.Lambda.Display
|
|||
, displayTerm
|
||||
) where
|
||||
|
||||
import Data.Maybe
|
||||
import Data.Maybe
|
||||
import Numeric.Natural
|
||||
|
||||
import qualified Data.Text as T
|
||||
|
|
@ -39,8 +39,8 @@ displayTerm :: (e -> T.Text) -> Term e Name Name -> T.Text
|
|||
displayTerm f = dTerm f []
|
||||
|
||||
nth :: [a] -> Natural -> Maybe a
|
||||
nth [] _ = Nothing
|
||||
nth (x:_) 0 = Just x
|
||||
nth [] _ = Nothing
|
||||
nth (x:_) 0 = Just x
|
||||
nth (_:xs) n = nth xs $ n - 1
|
||||
|
||||
varName :: [Name] -> Natural -> Name
|
||||
|
|
@ -51,12 +51,15 @@ varName vs i = fromMaybe e $ nth vs i
|
|||
dTerm :: (e -> T.Text) -> [Name] -> Term e Name Name -> T.Text
|
||||
dTerm _ vs (Var i) = varName vs i
|
||||
dTerm _ _ (Const c) = c
|
||||
dTerm f vs (Lambda v t) = "λ" <> v <> ". " <> dTerm f (v:vs) t
|
||||
dTerm f _ (Ext e) = f e
|
||||
dTerm f vs (Lambda v t) = "λ" <> v <> dLambda (v:vs) t
|
||||
where
|
||||
dLambda ws (Lambda w u) = " " <> w <> dLambda (w:ws) u
|
||||
dLambda ws u = ". " <> dTerm f ws u
|
||||
dTerm f vs (App l r) = dLeft l <> " " <> dRight r
|
||||
where
|
||||
dLeft t@(Lambda _ _) = "(" <> dTerm f vs t <> ")"
|
||||
dLeft t = dTerm f vs t
|
||||
dLeft t = dTerm f vs t
|
||||
dRight t@(Lambda _ _) = "(" <> dTerm f vs t <> ")"
|
||||
dRight t@(App _ _) = "(" <> dTerm f vs t <> ")"
|
||||
dRight t = dTerm f vs t
|
||||
dRight t@(App _ _) = "(" <> dTerm f vs t <> ")"
|
||||
dRight t = dTerm f vs t
|
||||
dTerm f _ (Ext e) = f e
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue