From 7b046c4c012e00a11876b130648c210234d361da Mon Sep 17 00:00:00 2001 From: Simon Huber Date: Thu, 19 Mar 2015 11:40:47 +0100 Subject: [PATCH] time to wake up --- CTT.hs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 -- 2.34.1