From 2ece0f10dd4771b22a6bcd45f799c56ab9a79bb1 Mon Sep 17 00:00:00 2001 From: Roman Leshchinskiy Date: Tue, 17 Jul 2007 05:28:35 +0000 Subject: [PATCH] Refactor --- compiler/vectorise/VectMonad.hs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/compiler/vectorise/VectMonad.hs b/compiler/vectorise/VectMonad.hs index 2b7a7ca..7b201fa 100644 --- a/compiler/vectorise/VectMonad.hs +++ b/compiler/vectorise/VectMonad.hs @@ -165,19 +165,14 @@ updVectInfo :: GlobalEnv -> TypeEnv -> VectInfo -> VectInfo updVectInfo env tyenv info = info { vectInfoVar = global_exported_vars env - , vectInfoTyCon = tc_env - , vectInfoDataCon = dc_env + , vectInfoTyCon = mk_env typeEnvTyCons global_tycons + , vectInfoDataCon = mk_env typeEnvDataCons global_datacons } where - tc_env = mkNameEnv [(tc_name, (tc,tc')) - | tc <- typeEnvTyCons tyenv - , let tc_name = tyConName tc - , Just tc' <- [lookupNameEnv (global_tycons env) tc_name]] - - dc_env = mkNameEnv [(dc_name, (dc,dc')) - | dc <- typeEnvDataCons tyenv - , let dc_name = dataConName dc - , Just dc' <- [lookupNameEnv (global_datacons env) dc_name]] + mk_env from_tyenv from_env = mkNameEnv [(name, (from,to)) + | from <- from_tyenv tyenv + , let name = getName from + , Just to <- [lookupNameEnv (from_env env) name]] data VResult a = Yes GlobalEnv LocalEnv a | No -- 1.7.10.4