import {-# SOURCE #-} DsExpr ( dsExpr, dsLet )
import BasicTypes ( Boxity(..) )
-import DataCon ( dataConId )
import TyCon ( tyConName )
-import HsSyn ( OutPat(..), HsExpr(..), Stmt(..),
- HsMatchContext(..), HsDoContext(..),
- collectHsOutBinders )
+import HsSyn ( Pat(..), HsExpr(..), Stmt(..),
+ HsMatchContext(..), HsStmtContext(..),
+ collectHsBinders )
import TcHsSyn ( TypecheckedStmt, TypecheckedPat, TypecheckedHsExpr,
- outPatType )
+ hsPatType )
import CoreSyn
import DsMonad -- the monadery used in the desugarer
import Type ( mkTyVarTy, mkFunTys, mkFunTy, Type,
splitTyConApp_maybe )
import TysPrim ( alphaTyVar )
-import TysWiredIn ( nilDataCon, consDataCon, unitDataConId, unitTy,
- mkListTy, mkTupleTy, intDataCon )
+import TysWiredIn ( nilDataCon, consDataCon, trueDataConId, falseDataConId,
+ unitDataConId, unitTy,
+ mkListTy, mkTupleTy )
import Match ( matchSimply )
-import PrelNames ( trueDataConName, falseDataConName, foldrName,
- buildName, replicatePName, mapPName, filterPName,
- zipPName, crossPName, parrTyConName )
+import PrelNames ( foldrName, buildName, replicatePName, mapPName,
+ filterPName, zipPName, crossPName, parrTyConName )
import PrelInfo ( pAT_ERROR_ID )
import SrcLoc ( noSrcLoc )
import Panic ( panic )
in
newSysLocalsDs [c_ty,n_ty] `thenDs` \ [c, n] ->
dfListComp c n quals `thenDs` \ result ->
- dsLookupGlobalValue buildName `thenDs` \ build_id ->
+ dsLookupGlobalId buildName `thenDs` \ build_id ->
returnDs (Var build_id `App` Type elt_ty
`App` mkLams [n_tyvar, c, n] result)
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
letrec_body = App (Var h) core_list1
in
deListComp quals core_fail `thenDs` \ rest_expr ->
- matchSimply (Var u2) (DoCtxt ListComp) pat
+ matchSimply (Var u2) (StmtCtxt ListComp) pat
rest_expr core_fail `thenDs` \ core_match ->
let
rhs = Lam u1 $
= 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
dfListComp c_id b quals `thenDs` \ core_rest ->
-- build the pattern match
- matchSimply (Var x) (DoCtxt ListComp)
+ matchSimply (Var x) (StmtCtxt ListComp)
pat core_rest (Var b) `thenDs` \ core_expr ->
-- now build the outermost foldr, and return
- dsLookupGlobalValue foldrName `thenDs` \ foldr_id ->
+ dsLookupGlobalId foldrName `thenDs` \ foldr_id ->
returnDs (
Var foldr_id `App` Type x_ty
`App` Type b_ty
-> Type -- Don't use; called with `undefined' below
-> DsM CoreExpr
dsPArrComp qs _ =
- dsLookupGlobalValue replicatePName `thenDs` \repP ->
+ dsLookupGlobalId replicatePName `thenDs` \repP ->
let unitArray = mkApps (Var repP) [Type unitTy,
- mkConApp intDataCon [mkIntLit 1],
+ mkIntExpr 1,
mkTupleExpr []]
in
dePArrComp qs (TuplePat [] Boxed) unitArray
-- <<[:e' | :]>> pa ea = mapP (\pa -> e') ea
--
dePArrComp [ResultStmt e' _] pa cea =
- dsLookupGlobalValue mapPName `thenDs` \mapP ->
+ dsLookupGlobalId mapPName `thenDs` \mapP ->
let ty = parrElemType cea
in
deLambda ty pa e' `thenDs` \(clam,
-- <<[:e' | b, qs:]>> pa ea = <<[:e' | qs:]>> pa (filterP (\pa -> b) ea)
--
dePArrComp (ExprStmt b _ _ : qs) pa cea =
- dsLookupGlobalValue filterPName `thenDs` \filterP ->
+ dsLookupGlobalId filterPName `thenDs` \filterP ->
let ty = parrElemType cea
in
deLambda ty pa b `thenDs` \(clam,_) ->
-- <<[:e' | qs:]>> (pa, p) (crossP ea ef)
--
dePArrComp (BindStmt p e _ : qs) pa cea =
- dsLookupGlobalValue falseDataConName `thenDs` \falseId ->
- dsLookupGlobalValue trueDataConName `thenDs` \trueId ->
- dsLookupGlobalValue filterPName `thenDs` \filterP ->
- dsLookupGlobalValue crossPName `thenDs` \crossP ->
- dsExpr e `thenDs` \ce ->
+ dsLookupGlobalId filterPName `thenDs` \filterP ->
+ dsLookupGlobalId crossPName `thenDs` \crossP ->
+ dsExpr e `thenDs` \ce ->
let ty'cea = parrElemType cea
ty'ce = parrElemType ce
- false = Var falseId
- true = Var trueId
+ false = Var falseDataConId
+ true = Var trueDataConId
in
newSysLocalDs ty'ce `thenDs` \v ->
- matchSimply (Var v) (DoCtxt PArrComp) p true false `thenDs` \pred ->
+ 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
-- {x_1, ..., x_n} = DV (ds) -- Defined Variables
--
dePArrComp (LetStmt ds : qs) pa cea =
- dsLookupGlobalValue mapPName `thenDs` \mapP ->
- let xs = collectHsOutBinders ds
+ dsLookupGlobalId mapPName `thenDs` \mapP ->
+ let xs = collectHsBinders ds
ty'cea = parrElemType cea
in
newSysLocalDs ty'cea `thenDs` \v ->
errMsg = "DsListComp.dePArrComp: internal error!"
in
mkErrorAppDs pAT_ERROR_ID errTy errMsg `thenDs` \cerr ->
- matchSimply (Var v) (DoCtxt PArrComp) pa projBody cerr `thenDs` \ccase ->
+ 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 (ParStmtOut [] : qss2) pa cea = dePArrComp qss2 pa cea
dePArrComp (ParStmtOut ((xs, qs):qss) : qss2) pa cea =
- dsLookupGlobalValue zipPName `thenDs` \zipP ->
+ 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
errMsg = "DsListComp.deLambda: internal error!"
in
mkErrorAppDs pAT_ERROR_ID errTy errMsg `thenDs` \cerr ->
- matchSimply (Var v) (DoCtxt PArrComp) p ce cerr `thenDs` \res ->
+ 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