module VectType ( vectTyCon, vectType, vectTypeEnv,
- PAInstance, buildPADict,
- vectDataConWorkers )
+ PAInstance, buildPADict )
where
#include "HsVersions.h"
import Outputable
import Control.Monad ( liftM, liftM2, zipWithM, zipWithM_ )
-import Data.List ( inits, tails )
+import Data.List ( inits, tails, zipWith4 )
-- ----------------------------------------------------------------------------
-- Types
, painstArrTyCon :: TyCon
}
-vectTypeEnv :: TypeEnv -> VM (TypeEnv, [FamInst])
+vectTypeEnv :: TypeEnv -> VM (TypeEnv, [FamInst], [(Var, CoreExpr)])
vectTypeEnv env
= do
cs <- readGEnv $ mk_map . global_tycons
parr_tcs <- zipWithM buildPArrayTyCon orig_tcs vect_tcs
dfuns <- mapM mkPADFun vect_tcs
defTyConPAs (zip vect_tcs dfuns)
+ binds <- sequence (zipWith4 buildTyConBindings orig_tcs vect_tcs parr_tcs dfuns)
let all_new_tcs = new_tcs ++ parr_tcs
++ [ADataCon dc | tc <- all_new_tcs
, dc <- tyConDataCons tc])
- return (new_env, map mkLocalFamInst parr_tcs)
+ return (new_env, map mkLocalFamInst parr_tcs, concat binds)
where
tycons = typeEnvTyCons env
groups = tyConGroups tycons
e <- replicatePA len n
return [e]
}
-
-vectDataConWorkers :: PAInstance -> VM [(Var, CoreExpr)]
-vectDataConWorkers (PAInstance { painstOrigTyCon = orig_tc
- , painstVectTyCon = vect_tc
- , painstArrTyCon = arr_tc
- })
+
+buildTyConBindings :: TyCon -> TyCon -> TyCon -> Var -> VM [(Var, CoreExpr)]
+buildTyConBindings orig_tc vect_tc arr_tc dfun
= do
shape <- tyConShape vect_tc
sequence_ (zipWith3 (vectDataConWorker shape vect_tc arr_tc arr_dc)
vectModule guts
= do
defTyConRdrPAs builtin_PAs
- (types', fam_insts) <- vectTypeEnv (mg_types guts)
+ (types', fam_insts, tc_binds) <- vectTypeEnv (mg_types guts)
let fam_inst_env' = extendFamInstEnvList (mg_fam_inst_env guts) fam_insts
updGEnv (setFamInstEnv fam_inst_env')
-- workers <- mapM vectDataConWorkers pa_insts
binds' <- mapM vectTopBind (mg_binds guts)
return $ guts { mg_types = types'
- , mg_binds = -- Rec (concat workers ++ concat dicts) :
- binds'
+ , mg_binds = Rec tc_binds : binds'
, mg_fam_inst_env = fam_inst_env'
, mg_fam_insts = mg_fam_insts guts ++ fam_insts
}