From 395e45741693259cac3c4b074c54d3a40e7996f1 Mon Sep 17 00:00:00 2001 From: Roman Leshchinskiy Date: Fri, 24 Aug 2007 04:09:01 +0000 Subject: [PATCH] Refactoring --- compiler/vectorise/VectType.hs | 40 +++++++++++++++------------------------ compiler/vectorise/VectUtils.hs | 35 ++++++++++++++++++++-------------- 2 files changed, 36 insertions(+), 39 deletions(-) diff --git a/compiler/vectorise/VectType.hs b/compiler/vectorise/VectType.hs index e505cd3..fd0b535 100644 --- a/compiler/vectorise/VectType.hs +++ b/compiler/vectorise/VectType.hs @@ -213,11 +213,11 @@ buildPReprType = liftM repr_type . mkTyConRepr buildToPRepr :: TyConRepr -> TyCon -> TyCon -> TyCon -> VM CoreExpr buildToPRepr (TyConRepr { - repr_tys = repr_tys - , repr_prod_tycons = prod_tycons - , repr_prod_tys = prod_tys - , repr_sum_tycon = repr_sum_tycon - , repr_type = repr_type + repr_tys = repr_tys + , repr_prod_data_cons = prod_data_cons + , repr_prod_tys = prod_tys + , repr_sum_data_cons = sum_data_cons + , repr_type = repr_type }) vect_tc prepr_tc _ = do @@ -228,15 +228,12 @@ buildToPRepr (TyConRepr { . wrapFamInstBody prepr_tc var_tys . Case (Var arg) (mkWildId arg_ty) repr_type . mk_alts data_cons vars - . zipWith3 mk_prod prod_tycons repr_tys $ map (map Var) vars + . zipWith3 mk_prod prod_data_cons repr_tys $ map (map Var) vars where var_tys = mkTyVarTys $ tyConTyVars vect_tc arg_ty = mkTyConApp vect_tc var_tys data_cons = tyConDataCons vect_tc - Just sum_tycon = repr_sum_tycon - sum_data_cons = tyConDataCons sum_tycon - mk_alts _ _ [] = [(DEFAULT, [], Var unitDataConId)] mk_alts [dc] [vars] [expr] = [(DataAlt dc, vars, expr)] mk_alts dcs vars exprs = zipWith4 mk_alt dcs vars sum_data_cons exprs @@ -246,17 +243,15 @@ buildToPRepr (TyConRepr { mk_prod _ _ [] = Var unitDataConId mk_prod _ _ [expr] = expr - mk_prod (Just tc) tys exprs = mkConApp dc (map Type tys ++ exprs) - where - [dc] = tyConDataCons tc + mk_prod (Just dc) tys exprs = mkConApp dc (map Type tys ++ exprs) buildFromPRepr :: TyConRepr -> TyCon -> TyCon -> TyCon -> VM CoreExpr buildFromPRepr (TyConRepr { - repr_tys = repr_tys - , repr_prod_tycons = prod_tycons - , repr_prod_tys = prod_tys - , repr_sum_tycon = repr_sum_tycon - , repr_type = repr_type + repr_tys = repr_tys + , repr_prod_data_cons = prod_data_cons + , repr_prod_tys = prod_tys + , repr_sum_data_cons = sum_data_cons + , repr_type = repr_type }) vect_tc prepr_tc _ = do @@ -265,16 +260,14 @@ buildFromPRepr (TyConRepr { liftM (Lam arg . un_sum (unwrapFamInstScrut prepr_tc var_tys (Var arg))) - (sequence $ zipWith4 un_prod data_cons prod_tycons prod_tys repr_tys) + (sequence + $ zipWith4 un_prod data_cons prod_data_cons prod_tys repr_tys) where var_tys = mkTyVarTys $ tyConTyVars vect_tc ty_args = map Type var_tys res_ty = mkTyConApp vect_tc var_tys data_cons = tyConDataCons vect_tc - Just sum_tc = repr_sum_tycon - sum_data_cons = tyConDataCons sum_tc - un_prod dc _ _ [] = do var <- newLocalVar FSLIT("u") unitTy @@ -284,7 +277,7 @@ buildFromPRepr (TyConRepr { var <- newLocalVar FSLIT("x") ty return (var, mkConApp dc (ty_args ++ [Var var])) - un_prod dc (Just prod_tc) prod_ty tys + un_prod dc (Just prod_dc) prod_ty tys = do vars <- mapM (newLocalVar FSLIT("x")) tys pv <- newLocalVar FSLIT("p") prod_ty @@ -294,9 +287,6 @@ buildFromPRepr (TyConRepr { [(DataAlt prod_dc, vars, res)] return (pv, expr) - where - [prod_dc] = tyConDataCons prod_tc - un_sum scrut [(var, expr)] = Let (NonRec var scrut) expr un_sum scrut alts diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs index 77e037f..05102c0 100644 --- a/compiler/vectorise/VectUtils.hs +++ b/compiler/vectorise/VectUtils.hs @@ -41,6 +41,7 @@ import BasicTypes ( Boxity(..) ) import Outputable import FastString +import Maybes ( orElse ) import Data.List ( zipWith4 ) import Control.Monad ( liftM, liftM2, zipWithM_ ) @@ -126,13 +127,15 @@ mkBuiltinTyConApps1 get_tc dft tys mk tc ty1 ty2 = mkTyConApp tc [ty1,ty2] data TyConRepr = TyConRepr { - repr_tyvars :: [TyVar] - , repr_tys :: [[Type]] - - , repr_prod_tycons :: [Maybe TyCon] - , repr_prod_tys :: [Type] - , repr_sum_tycon :: Maybe TyCon - , repr_type :: Type + repr_tyvars :: [TyVar] + , repr_tys :: [[Type]] + + , repr_prod_tycons :: [Maybe TyCon] + , repr_prod_data_cons :: [Maybe DataCon] + , repr_prod_tys :: [Type] + , repr_sum_tycon :: Maybe TyCon + , repr_sum_data_cons :: [DataCon] + , repr_type :: Type } mkTyConRepr :: TyCon -> VM TyConRepr @@ -143,13 +146,15 @@ mkTyConRepr vect_tc sum_tycon <- mk_tycon sumTyCon prod_tys return $ TyConRepr { - repr_tyvars = tyvars - , repr_tys = rep_tys - - , repr_prod_tycons = prod_tycons - , repr_prod_tys = prod_tys - , repr_sum_tycon = sum_tycon - , repr_type = mk_tc_app_maybe sum_tycon prod_tys + repr_tyvars = tyvars + , repr_tys = rep_tys + + , repr_prod_tycons = prod_tycons + , repr_prod_data_cons = map (fmap mk_single_datacon) prod_tycons + , repr_prod_tys = prod_tys + , repr_sum_tycon = sum_tycon + , repr_sum_data_cons = fmap tyConDataCons sum_tycon `orElse` [] + , repr_type = mk_tc_app_maybe sum_tycon prod_tys } where tyvars = tyConTyVars vect_tc @@ -161,6 +166,8 @@ mkTyConRepr vect_tc | otherwise = return Nothing where n = length tys + mk_single_datacon tc | [dc] <- tyConDataCons tc = dc + mk_tc_app_maybe Nothing [] = unitTy mk_tc_app_maybe Nothing [ty] = ty mk_tc_app_maybe (Just tc) tys = mkTyConApp tc tys -- 1.7.10.4