X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDsListComp.lhs;h=e9c455da71b0ffb6457348615cd352ffec0bacd0;hb=16e4ce4c0c02650082f2e11982017c903c549ad5;hp=a7cec0cc11a61dfbdfaddb3b11944b5141d86ba3;hpb=861e836ed0cc1aa45932ecb3470967964440a0ef;p=ghc-hetmet.git diff --git a/ghc/compiler/deSugar/DsListComp.lhs b/ghc/compiler/deSugar/DsListComp.lhs index a7cec0c..e9c455d 100644 --- a/ghc/compiler/deSugar/DsListComp.lhs +++ b/ghc/compiler/deSugar/DsListComp.lhs @@ -1,18 +1,22 @@ % % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % -\section[DsListComp]{Desugaring list comprehensions} +\section[DsListComp]{Desugaring list comprehensions and array comprehensions} \begin{code} -module DsListComp ( dsListComp ) where +module DsListComp ( dsListComp, dsPArrComp ) where #include "HsVersions.h" import {-# SOURCE #-} DsExpr ( dsExpr, dsLet ) -import HsSyn ( Stmt(..) ) -import TcHsSyn ( TypecheckedStmt ) -import DsHsSyn ( outPatType ) +import BasicTypes ( Boxity(..) ) +import TyCon ( tyConName ) +import HsSyn ( Pat(..), HsExpr(..), Stmt(..), + HsMatchContext(..), HsStmtContext(..), + collectHsBinders ) +import TcHsSyn ( TypecheckedStmt, TypecheckedPat, TypecheckedHsExpr, + hsPatType ) import CoreSyn import DsMonad -- the monadery used in the desugarer @@ -22,11 +26,17 @@ import CmdLineOpts ( opt_FoldrBuildOn ) import CoreUtils ( exprType, mkIfThenElse ) import Id ( idType ) import Var ( Id ) -import Type ( mkTyVarTy, mkFunTys, mkFunTy, Type ) +import Type ( mkTyVarTy, mkFunTys, mkFunTy, Type, + splitTyConApp_maybe ) import TysPrim ( alphaTyVar ) -import TysWiredIn ( nilDataCon, consDataCon ) +import TysWiredIn ( nilDataCon, consDataCon, trueDataConId, falseDataConId, + unitDataConId, unitTy, mkListTy ) import Match ( matchSimply ) -import PrelNames ( foldrIdKey, buildIdKey ) +import PrelNames ( foldrName, buildName, replicatePName, mapPName, + filterPName, zipPName, crossPName, parrTyConName ) +import PrelInfo ( pAT_ERROR_ID ) +import SrcLoc ( noSrcLoc ) +import Panic ( panic ) \end{code} List comprehensions may be desugared in one of two ways: ``ordinary'' @@ -41,7 +51,8 @@ dsListComp :: [TypecheckedStmt] -> DsM CoreExpr dsListComp quals elt_ty - | not opt_FoldrBuildOn -- Be boring + | not opt_FoldrBuildOn -- Be boring + || isParallelComp quals = deListComp quals (mkNilExpr elt_ty) | otherwise -- foldr/build lives! @@ -51,12 +62,13 @@ dsListComp quals elt_ty c_ty = mkFunTys [elt_ty, n_ty] n_ty in newSysLocalsDs [c_ty,n_ty] `thenDs` \ [c, n] -> - dfListComp c n quals `thenDs` \ result -> - - dsLookupGlobalValue buildIdKey `thenDs` \ build_id -> + dsLookupGlobalId buildName `thenDs` \ build_id -> returnDs (Var build_id `App` Type elt_ty `App` mkLams [n_tyvar, c, n] result) + + where isParallelComp (ParStmt bndrstmtss : _) = True + isParallelComp _ = False \end{code} %************************************************************************ @@ -102,15 +114,62 @@ TQ << [ e | p <- L1, qs ] ++ L2 >> = is the TE translation scheme. Note that we carry around the @L@ list already desugared. @dsListComp@ does the top TE rule mentioned above. +To the above, we add an additional rule to deal with parallel list +comprehensions. The translation goes roughly as follows: + [ e | p1 <- e11, let v1 = e12, p2 <- e13 + | q1 <- e21, let v2 = e22, q2 <- e23] + => + [ e | ((x1, .., xn), (y1, ..., ym)) <- + zip [(x1,..,xn) | p1 <- e11, let v1 = e12, p2 <- e13] + [(y1,..,ym) | q1 <- e21, let v2 = e22, q2 <- e23]] +where (x1, .., xn) are the variables bound in p1, v1, p2 + (y1, .., ym) are the variables bound in q1, v2, q2 + +In the translation below, the ParStmt branch translates each parallel branch +into a sub-comprehension, and desugars each independently. The resulting lists +are fed to a zip function, we create a binding for all the variables bound in all +the comprehensions, and then we hand things off the the desugarer for bindings. +The zip function is generated here a) because it's small, and b) because then we +don't have to deal with arbitrary limits on the number of zip functions in the +prelude, nor which library the zip function came from. +The introduced tuples are Boxed, but only because I couldn't get it to work +with the Unboxed variety. \begin{code} + deListComp :: [TypecheckedStmt] -> CoreExpr -> DsM CoreExpr -deListComp [ReturnStmt expr] list -- Figure 7.4, SLPJ, p 135, rule C above +deListComp (ParStmt stmtss_w_bndrs : quals) list + = mapDs do_list_comp stmtss_w_bndrs `thenDs` \ exps -> + mkZipBind qual_tys `thenDs` \ (zip_fn, zip_rhs) -> + + -- Deal with [e | pat <- zip l1 .. ln] in example above + deBindComp pat (Let (Rec [(zip_fn, zip_rhs)]) (mkApps (Var zip_fn) exps)) + quals list + + where + bndrs_s = map snd stmtss_w_bndrs + + -- pat is the pattern ((x1,..,xn), (y1,..,ym)) in the example above + pat = TuplePat pats Boxed + pats = map mk_hs_tuple_pat bndrs_s + + -- Types of (x1,..,xn), (y1,..,yn) etc + qual_tys = map mk_bndrs_tys bndrs_s + + do_list_comp (stmts, bndrs) + = dsListComp (stmts ++ [ResultStmt (mk_hs_tuple_expr bndrs) noSrcLoc]) + (mk_bndrs_tys bndrs) + + mk_bndrs_tys bndrs = mkCoreTupTy (map idType bndrs) + + -- Last: the one to return +deListComp [ResultStmt expr locn] list -- Figure 7.4, SLPJ, p 135, rule C above = dsExpr expr `thenDs` \ core_expr -> returnDs (mkConsExpr (exprType core_expr) core_expr list) -deListComp (GuardStmt guard locn : quals) list -- rule B above + -- Non-last: must be a guard +deListComp (ExprStmt guard ty locn : quals) list -- rule B above = dsExpr guard `thenDs` \ core_guard -> deListComp quals list `thenDs` \ core_rest -> returnDs (mkIfThenElse core_guard core_rest list) @@ -122,11 +181,17 @@ deListComp (LetStmt binds : quals) list deListComp (BindStmt pat list1 locn : quals) core_list2 -- rule A' above = dsExpr list1 `thenDs` \ core_list1 -> - let + deBindComp pat core_list1 quals core_list2 +\end{code} + + +\begin{code} +deBindComp pat core_list1 quals core_list2 + = let u3_ty@u1_ty = exprType core_list1 -- two names, same thing -- u1_ty is a [alpha] type, and u2_ty = alpha - u2_ty = outPatType pat + u2_ty = hsPatType pat res_ty = exprType core_list2 h_ty = u1_ty `mkFunTy` res_ty @@ -139,7 +204,7 @@ deListComp (BindStmt pat list1 locn : quals) core_list2 -- rule A' above letrec_body = App (Var h) core_list1 in deListComp quals core_fail `thenDs` \ rest_expr -> - matchSimply (Var u2) ListCompMatch pat + matchSimply (Var u2) (StmtCtxt ListComp) pat rest_expr core_fail `thenDs` \ core_match -> let rhs = Lam u1 $ @@ -150,6 +215,49 @@ deListComp (BindStmt pat list1 locn : quals) core_list2 -- rule A' above \end{code} +\begin{code} +mkZipBind :: [Type] -> DsM (Id, CoreExpr) +-- mkZipBind [t1, t2] +-- = (zip, \as1:[t1] as2:[t2] +-- -> case as1 of +-- [] -> [] +-- (a1:as'1) -> case as2 of +-- [] -> [] +-- (a2:as'2) -> (a2,a2) : zip as'1 as'2)] + +mkZipBind elt_tys + = mapDs newSysLocalDs list_tys `thenDs` \ ass -> + mapDs newSysLocalDs elt_tys `thenDs` \ as' -> + mapDs newSysLocalDs list_tys `thenDs` \ as's -> + newSysLocalDs zip_fn_ty `thenDs` \ zip_fn -> + let + inner_rhs = mkConsExpr ret_elt_ty + (mkCoreTup (map Var as')) + (mkVarApps (Var zip_fn) as's) + zip_body = foldr mk_case inner_rhs (zip3 ass as' as's) + in + returnDs (zip_fn, mkLams ass zip_body) + where + list_tys = map mkListTy elt_tys + ret_elt_ty = mkCoreTupTy elt_tys + zip_fn_ty = mkFunTys list_tys (mkListTy ret_elt_ty) + + mk_case (as, a', as') rest + = Case (Var as) as [(DataAlt nilDataCon, [], mkNilExpr ret_elt_ty), + (DataAlt consDataCon, [a', as'], rest)] + +-- Helper functions that makes an HsTuple only for non-1-sized tuples +mk_hs_tuple_expr :: [Id] -> TypecheckedHsExpr +mk_hs_tuple_expr [] = HsVar unitDataConId +mk_hs_tuple_expr [id] = HsVar id +mk_hs_tuple_expr ids = ExplicitTuple [ HsVar i | i <- ids ] Boxed + +mk_hs_tuple_pat :: [Id] -> TypecheckedPat +mk_hs_tuple_pat [b] = VarPat b +mk_hs_tuple_pat bs = TuplePat (map VarPat bs) Boxed +\end{code} + + %************************************************************************ %* * \subsection[DsListComp-foldr-build]{Foldr/Build desugaring of list comprehensions} @@ -174,11 +282,13 @@ dfListComp :: Id -> Id -- 'c' and 'n' -> [TypecheckedStmt] -- the rest of the qual's -> DsM CoreExpr -dfListComp c_id n_id [ReturnStmt expr] + -- Last: the one to return +dfListComp c_id n_id [ResultStmt expr locn] = dsExpr expr `thenDs` \ core_expr -> returnDs (mkApps (Var c_id) [core_expr, Var n_id]) -dfListComp c_id n_id (GuardStmt guard locn : quals) + -- Non-last: must be a guard +dfListComp c_id n_id (ExprStmt guard ty locn : quals) = dsExpr guard `thenDs` \ core_guard -> dfListComp c_id n_id quals `thenDs` \ core_rest -> returnDs (mkIfThenElse core_guard core_rest (Var n_id)) @@ -193,7 +303,7 @@ dfListComp c_id n_id (BindStmt pat list1 locn : quals) = dsExpr list1 `thenDs` \ core_list1 -> -- find the required type - let x_ty = outPatType pat + let x_ty = hsPatType pat b_ty = idType n_id in @@ -204,10 +314,11 @@ dfListComp c_id n_id (BindStmt pat list1 locn : quals) dfListComp c_id b quals `thenDs` \ core_rest -> -- build the pattern match - matchSimply (Var x) ListCompMatch pat core_rest (Var b) `thenDs` \ core_expr -> + matchSimply (Var x) (StmtCtxt ListComp) + pat core_rest (Var b) `thenDs` \ core_expr -> -- now build the outermost foldr, and return - dsLookupGlobalValue foldrIdKey `thenDs` \ foldr_id -> + dsLookupGlobalId foldrName `thenDs` \ foldr_id -> returnDs ( Var foldr_id `App` Type x_ty `App` Type b_ty @@ -217,4 +328,145 @@ dfListComp c_id n_id (BindStmt pat list1 locn : quals) ) \end{code} +%************************************************************************ +%* * +\subsection[DsPArrComp]{Desugaring of array comprehensions} +%* * +%************************************************************************ + +\begin{code} + +-- entry point for desugaring a parallel array comprehension +-- +-- [:e | qss:] = <<[:e | qss:]>> () [:():] +-- +dsPArrComp :: [TypecheckedStmt] + -> Type -- Don't use; called with `undefined' below + -> DsM CoreExpr +dsPArrComp qs _ = + dsLookupGlobalId replicatePName `thenDs` \repP -> + let unitArray = mkApps (Var repP) [Type unitTy, + mkIntExpr 1, + mkCoreTup []] + in + dePArrComp qs (TuplePat [] Boxed) unitArray +-- the work horse +-- +dePArrComp :: [TypecheckedStmt] + -> TypecheckedPat -- the current generator pattern + -> CoreExpr -- the current generator expression + -> DsM CoreExpr +-- +-- <<[:e' | :]>> pa ea = mapP (\pa -> e') ea +-- +dePArrComp [ResultStmt e' _] pa cea = + dsLookupGlobalId mapPName `thenDs` \mapP -> + let ty = parrElemType cea + in + deLambda ty pa e' `thenDs` \(clam, + ty'e') -> + returnDs $ mkApps (Var mapP) [Type ty, Type ty'e', clam, cea] +-- +-- <<[:e' | b, qs:]>> pa ea = <<[:e' | qs:]>> pa (filterP (\pa -> b) ea) +-- +dePArrComp (ExprStmt b _ _ : qs) pa cea = + dsLookupGlobalId filterPName `thenDs` \filterP -> + let ty = parrElemType cea + in + deLambda ty pa b `thenDs` \(clam,_) -> + dePArrComp qs pa (mkApps (Var filterP) [Type ty, clam, cea]) +-- +-- <<[:e' | p <- e, qs:]>> pa ea = +-- let ef = filterP (\x -> case x of {p -> True; _ -> False}) e +-- in +-- <<[:e' | qs:]>> (pa, p) (crossP ea ef) +-- +dePArrComp (BindStmt p e _ : qs) pa cea = + dsLookupGlobalId filterPName `thenDs` \filterP -> + dsLookupGlobalId crossPName `thenDs` \crossP -> + dsExpr e `thenDs` \ce -> + let ty'cea = parrElemType cea + ty'ce = parrElemType ce + false = Var falseDataConId + true = Var trueDataConId + in + newSysLocalDs ty'ce `thenDs` \v -> + matchSimply (Var v) (StmtCtxt PArrComp) p true false `thenDs` \pred -> + let cef = mkApps (Var filterP) [Type ty'ce, mkLams [v] pred, ce] + ty'cef = ty'ce -- filterP preserves the type + pa' = TuplePat [pa, p] Boxed + in + dePArrComp qs pa' (mkApps (Var crossP) [Type ty'cea, Type ty'cef, cea, cef]) +-- +-- <<[:e' | let ds, qs:]>> pa ea = +-- <<[:e' | qs:]>> (pa, (x_1, ..., x_n)) +-- (mapP (\v@pa -> (v, let ds in (x_1, ..., x_n))) ea) +-- where +-- {x_1, ..., x_n} = DV (ds) -- Defined Variables +-- +dePArrComp (LetStmt ds : qs) pa cea = + dsLookupGlobalId mapPName `thenDs` \mapP -> + let xs = collectHsBinders ds + ty'cea = parrElemType cea + in + newSysLocalDs ty'cea `thenDs` \v -> + dsLet ds (mkCoreTup (map Var xs)) `thenDs` \clet -> + newSysLocalDs (exprType clet) `thenDs` \let'v -> + let projBody = mkDsLet (NonRec let'v clet) $ + mkCoreTup [Var v, Var let'v] + errTy = exprType projBody + errMsg = "DsListComp.dePArrComp: internal error!" + in + mkErrorAppDs pAT_ERROR_ID errTy errMsg `thenDs` \cerr -> + matchSimply (Var v) (StmtCtxt PArrComp) pa projBody cerr `thenDs` \ccase -> + let pa' = TuplePat [pa, TuplePat (map VarPat xs) Boxed] Boxed + proj = mkLams [v] ccase + in + dePArrComp qs pa' (mkApps (Var mapP) [Type ty'cea, proj, cea]) +-- +-- <<[:e' | qs | qss:]>> pa ea = +-- <<[:e' | qss:]>> (pa, (x_1, ..., x_n)) +-- (zipP ea <<[:(x_1, ..., x_n) | qs:]>>) +-- where +-- {x_1, ..., x_n} = DV (qs) +-- +dePArrComp (ParStmt [] : qss2) pa cea = dePArrComp qss2 pa cea +dePArrComp (ParStmt ((qs, xs):qss) : qss2) pa cea = + dsLookupGlobalId zipPName `thenDs` \zipP -> + let pa' = TuplePat [pa, TuplePat (map VarPat xs) Boxed] Boxed + ty'cea = parrElemType cea + resStmt = ResultStmt (ExplicitTuple (map HsVar xs) Boxed) noSrcLoc + in + dsPArrComp (qs ++ [resStmt]) undefined `thenDs` \cqs -> + let ty'cqs = parrElemType cqs + cea' = mkApps (Var zipP) [Type ty'cea, Type ty'cqs, cea, cqs] + in + dePArrComp (ParStmt qss : qss2) pa' cea' + +-- generate Core corresponding to `\p -> e' +-- +deLambda :: Type -- type of the argument + -> TypecheckedPat -- argument pattern + -> TypecheckedHsExpr -- body + -> DsM (CoreExpr, Type) +deLambda ty p e = + newSysLocalDs ty `thenDs` \v -> + dsExpr e `thenDs` \ce -> + let errTy = exprType ce + errMsg = "DsListComp.deLambda: internal error!" + in + mkErrorAppDs pAT_ERROR_ID errTy errMsg `thenDs` \cerr -> + matchSimply (Var v) (StmtCtxt PArrComp) p ce cerr `thenDs` \res -> + returnDs (mkLams [v] res, errTy) + +-- obtain the element type of the parallel array produced by the given Core +-- expression +-- +parrElemType :: CoreExpr -> Type +parrElemType e = + case splitTyConApp_maybe (exprType e) of + Just (tycon, [ty]) | tyConName tycon == parrTyConName -> ty + _ -> panic + "DsListComp.parrElemType: not a parallel array type" +\end{code}