From: Simon Huber Date: Thu, 19 Mar 2015 10:40:47 +0000 (+0100) Subject: time to wake up X-Git-Url: https://git.ak3n.com/?a=commitdiff_plain;h=7b046c4c012e00a11876b130648c210234d361da;p=cubicaltt.git time to wake up --- diff --git a/CTT.hs b/CTT.hs index ed9f56b..e806311 100644 --- a/CTT.hs +++ b/CTT.hs @@ -154,15 +154,17 @@ mapEnv f g e = case e of valAndFormulaOfEnv :: Env -> ([Val],[Formula]) valAndFormulaOfEnv rho = case rho of Empty -> ([],[]) - Pair rho (_,u) -> let (us,phis) in (u:us,phis) - Sub rho (_,phi) -> let (us,phis) in (us,phi:phis) + Pair rho (_,u) -> let (us,phis) = valAndFormulaOfEnv rho + in (u:us,phis) + Sub rho (_,phi) -> let (us,phis) = valAndFormulaOfEnv rho + in (us,phi:phis) Def _ rho -> valAndFormulaOfEnv rho valOfEnv :: Env -> [Val] -valOfEnv = valAndFormulaOfEnv . fst +valOfEnv = fst . valAndFormulaOfEnv formulaOfEnv :: Env -> [Formula] -formulaOfEnv = valAndFormulaOfEnv . snd +formulaOfEnv = snd . valAndFormulaOfEnv domainEnv :: Env -> [Name] domainEnv rho = case rho of