X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FdeSugar%2FDsExpr.lhs;h=a85f1001ec11dc13770dbb278a7c3baa6190134a;hp=a93b1d7461738c710969cf0aa218ebe16c90b36e;hb=9da4639011348fb6c318e3cba4b08622f811d9c4;hpb=0fa697bca153468bf073aad1fe02d5b4055059f2 diff --git a/compiler/deSugar/DsExpr.lhs b/compiler/deSugar/DsExpr.lhs index a93b1d7..a85f100 100644 --- a/compiler/deSugar/DsExpr.lhs +++ b/compiler/deSugar/DsExpr.lhs @@ -14,6 +14,7 @@ import IOEnv ( ioToIOEnv ) import PrelNames ( breakpointJumpName, breakpointCondJumpName ) import TysWiredIn ( unitTy ) import TypeRep ( Type(..) ) +import TyCon ( isUnLiftedTyCon ) #endif import Match ( matchWrapper, matchSinglePat, matchEquations ) @@ -33,7 +34,7 @@ import DsMeta ( dsBracket ) #endif import HsSyn -import TcHsSyn ( hsPatType, mkVanillaTuplePat ) +import TcHsSyn ( hsLPatType, mkVanillaTuplePat ) -- NB: The desugarer, which straddles the source and Core worlds, sometimes -- needs to see source types (newtypes etc), and sometimes not @@ -42,13 +43,13 @@ import TcHsSyn ( hsPatType, mkVanillaTuplePat ) import TcType ( tcSplitAppTy, tcSplitFunTys, tcTyConAppTyCon, tcTyConAppArgs, isUnLiftedType, Type, mkAppTy ) -import Type ( funArgTy, splitFunTys, isUnboxedTupleType, mkFunTy ) +import Type ( splitFunTys, isUnboxedTupleType, mkFunTy ) import CoreSyn import CoreUtils ( exprType, mkIfThenElse, bindNonRec ) import CostCentre ( mkUserCC ) import Id ( Id, idType, idName, idDataCon ) -import PrelInfo ( rEC_CON_ERROR_ID, iRREFUT_PAT_ERROR_ID ) +import PrelInfo ( rEC_CON_ERROR_ID ) import DataCon ( DataCon, dataConWrapId, dataConFieldLabels, dataConInstOrigArgTys ) import DataCon ( isVanillaDataCon ) import TyCon ( FieldLabel, tyConDataCons ) @@ -84,7 +85,9 @@ dsValBinds (ValBindsOut binds _) body = foldrDs ds_val_bind body binds ------------------------- dsIPBinds (IPBinds ip_binds dict_binds) body = do { prs <- dsLHsBinds dict_binds - ; let inner = foldr (\(x,r) e -> Let (NonRec x r) e) body prs + ; let inner = Let (Rec prs) body + -- The dict bindings may not be in + -- dependency order; hence Rec ; foldrDs ds_ip_bind inner ip_binds } where ds_ip_bind (L _ (IPBind n e)) body @@ -118,7 +121,7 @@ ds_val_bind (NonRecursive, hsbinds) body FunBind { fun_id = L _ fun, fun_matches = matches, fun_co_fn = co_fn } -> matchWrapper (FunRhs (idName fun)) matches `thenDs` \ (args, rhs) -> ASSERT( null args ) -- Functions aren't lifted - ASSERT( isIdCoercion co_fn ) + ASSERT( isIdHsWrapper co_fn ) returnDs (bindNonRec fun rhs body_w_exports) PatBind {pat_lhs = pat, pat_rhs = grhss, pat_rhs_ty = ty } @@ -127,9 +130,9 @@ ds_val_bind (NonRecursive, hsbinds) body putSrcSpanDs loc $ do { rhs <- dsGuarded grhss ty ; let upat = unLoc pat - eqn = EqnInfo { eqn_wrap = idWrapper, eqn_pats = [upat], + eqn = EqnInfo { eqn_pats = [upat], eqn_rhs = cantFailMatchResult body_w_exports } - ; var <- selectMatchVar upat ty + ; var <- selectMatchVar upat ; result <- matchEquations PatBindRhs [var] [eqn] (exprType body) ; return (scrungleMatch var rhs result) } @@ -202,6 +205,7 @@ dsExpr (HsVar var) = returnDs (Var var) dsExpr (HsIPVar ip) = returnDs (Var (ipNameName ip)) dsExpr (HsLit lit) = dsLit lit dsExpr (HsOverLit lit) = dsOverLit lit +dsExpr (HsWrap co_fn e) = dsCoercion co_fn (dsExpr e) dsExpr (NegApp expr neg_expr) = do { core_expr <- dsLExpr expr @@ -213,11 +217,11 @@ dsExpr expr@(HsLam a_Match) returnDs (mkLams binders matching_code) #if defined(GHCI) && defined(BREAKPOINT) -dsExpr (HsApp (L _ (HsApp realFun@(L _ (HsCoerce _ fun)) (L loc arg))) _) +dsExpr (HsApp (L _ (HsApp realFun@(L _ (HsWrap _ fun)) (L loc arg))) _) | HsVar funId <- fun , idName funId `elem` [breakpointJumpName, breakpointCondJumpName] - , ids <- filter (not.hasTyVar.idType) (extractIds arg) - = do dsWarn (text "Extracted ids:" <+> ppr ids <+> ppr (map idType ids)) + , ids <- filter (isValidType . idType) (extractIds arg) + = do warnDs (text "Extracted ids:" <+> ppr ids <+> ppr (map idType ids)) stablePtr <- ioToIOEnv $ newStablePtr ids -- Yes, I know... I'm gonna burn in hell. let Ptr addr# = castStablePtrToPtr stablePtr @@ -229,17 +233,18 @@ dsExpr (HsApp (L _ (HsApp realFun@(L _ (HsCoerce _ fun)) (L loc arg))) _) extractIds (HsApp fn arg) | HsVar argId <- unLoc arg = argId:extractIds (unLoc fn) - | TyApp arg' ts <- unLoc arg - , HsVar argId <- unLoc arg' - = error (showSDoc (ppr ts)) -- argId:extractIds (unLoc fn) + | HsWrap co_fn arg' <- unLoc arg + , HsVar argId <- arg' -- SLPJ: not sure what is going on here + = error (showSDoc (ppr co_fn)) -- argId:extractIds (unLoc fn) extractIds x = [] extractHVals ids = ExplicitList unitTy (map (L loc . HsVar) ids) - hasTyVar (TyVarTy _) = True - hasTyVar (FunTy a b) = hasTyVar a || hasTyVar b - hasTyVar (NoteTy _ t) = hasTyVar t - hasTyVar (AppTy a b) = hasTyVar a || hasTyVar b - hasTyVar (TyConApp _ ts) = any hasTyVar ts - hasTyVar _ = False + -- checks for tyvars and unlifted kinds. + isValidType (TyVarTy _) = False + isValidType (FunTy a b) = isValidType a && isValidType b + isValidType (NoteTy _ t) = isValidType t + isValidType (AppTy a b) = isValidType a && isValidType b + isValidType (TyConApp con ts) = not (isUnLiftedTyCon con) && all isValidType ts + isValidType _ = True #endif dsExpr expr@(HsApp fun arg) @@ -277,20 +282,10 @@ dsExpr (OpApp e1 op _ e2) dsLExpr e2 `thenDs` \ y_core -> returnDs (mkApps core_op [x_core, y_core]) -dsExpr (SectionL expr op) - = dsLExpr op `thenDs` \ core_op -> - -- for the type of y, we need the type of op's 2nd argument - let - (x_ty:y_ty:_, _) = splitFunTys (exprType core_op) - -- Must look through an implicit-parameter type; - -- newtype impossible; hence Type.splitFunTys - in - dsLExpr expr `thenDs` \ x_core -> - newSysLocalDs x_ty `thenDs` \ x_id -> - newSysLocalDs y_ty `thenDs` \ y_id -> - - returnDs (bindNonRec x_id x_core $ - Lam y_id (mkApps core_op [Var x_id, Var y_id])) +dsExpr (SectionL expr op) -- Desugar (e !) to ((!) e) + = dsLExpr op `thenDs` \ core_op -> + dsLExpr expr `thenDs` \ x_core -> + returnDs (App core_op x_core) -- dsLExpr (SectionR op expr) -- \ x -> op x expr dsExpr (SectionR op expr) @@ -358,20 +353,6 @@ dsExpr (HsIf guard_expr then_expr else_expr) \noindent -\underline{\bf Type lambda and application} -% ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -\begin{code} -dsExpr (TyLam tyvars expr) - = dsLExpr expr `thenDs` \ core_expr -> - returnDs (mkLams tyvars core_expr) - -dsExpr (TyApp expr tys) - = dsLExpr expr `thenDs` \ core_expr -> - returnDs (mkTyApps core_expr tys) -\end{code} - - -\noindent \underline{\bf Various data construction things} % ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ \begin{code} @@ -536,20 +517,18 @@ dsExpr expr@(RecordUpd record_expr rbinds record_in_ty record_out_ty) [] -> nlHsVar old_arg_id mk_alt con - = newSysLocalsDs (dataConInstOrigArgTys con in_inst_tys) `thenDs` \ arg_ids -> + = ASSERT( isVanillaDataCon con ) + newSysLocalsDs (dataConInstOrigArgTys con in_inst_tys) `thenDs` \ arg_ids -> -- This call to dataConInstOrigArgTys won't work for existentials -- but existentials don't have record types anyway let val_args = zipWithEqual "dsExpr:RecordUpd" mk_val_arg (dataConFieldLabels con) arg_ids rhs = foldl (\a b -> nlHsApp a b) - (noLoc $ TyApp (nlHsVar (dataConWrapId con)) - out_inst_tys) - val_args + (nlHsTyApp (dataConWrapId con) out_inst_tys) + val_args in - returnDs (mkSimpleMatch [noLoc $ ConPatOut (noLoc con) [] [] emptyLHsBinds - (PrefixCon (map nlVarPat arg_ids)) record_in_ty] - rhs) + returnDs (mkSimpleMatch [mkPrefixConPat con (map nlVarPat arg_ids) record_in_ty] rhs) in -- Record stuff doesn't work for existentials -- The type checker checks for this, but we need @@ -584,27 +563,6 @@ dsExpr expr@(RecordUpd record_expr rbinds record_in_ty record_out_ty) con_fields = dataConFieldLabels con_id \end{code} - -\noindent -\underline{\bf Dictionary lambda and application} -% ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -@DictLam@ and @DictApp@ turn into the regular old things. -(OLD:) @DictFunApp@ also becomes a curried application, albeit slightly more -complicated; reminiscent of fully-applied constructors. -\begin{code} -dsExpr (DictLam dictvars expr) - = dsLExpr expr `thenDs` \ core_expr -> - returnDs (mkLams dictvars core_expr) - ------------------- - -dsExpr (DictApp expr dicts) -- becomes a curried application - = dsLExpr expr `thenDs` \ core_expr -> - returnDs (foldl (\f d -> f `App` (Var d)) core_expr dicts) - -dsExpr (HsCoerce co_fn e) = dsCoercion co_fn (dsExpr e) -\end{code} - Here is where we desugar the Template Haskell brackets and escapes \begin{code} @@ -726,7 +684,7 @@ dsMDo tbl stmts body result_ty ; match_code <- extractMatchResult match fail_expr ; rhs' <- dsLExpr rhs - ; returnDs (mkApps (Var bind_id) [Type (hsPatType pat), Type b_ty, + ; returnDs (mkApps (Var bind_id) [Type (hsLPatType pat), Type b_ty, rhs', Lam var match_code]) } go (RecStmt rec_stmts later_ids rec_ids rec_rets binds : stmts) @@ -744,7 +702,7 @@ dsMDo tbl stmts body result_ty later_ids' = filter (`notElem` mono_rec_ids) later_ids mono_rec_ids = [ id | HsVar id <- rec_rets ] - mfix_app = nlHsApp (noLoc $ TyApp (nlHsVar mfix_id) [tup_ty]) mfix_arg + mfix_app = nlHsApp (nlHsTyApp mfix_id [tup_ty]) mfix_arg mfix_arg = noLoc $ HsLam (MatchGroup [mkSimpleMatch [mfix_pat] body] (mkFunTy tup_ty body_ty)) @@ -761,7 +719,7 @@ dsMDo tbl stmts body result_ty tup_ty = mkCoreTupTy (map idType (later_ids' ++ rec_ids)) -- mkCoreTupTy deals with singleton case - return_app = nlHsApp (noLoc $ TyApp (nlHsVar return_id) [tup_ty]) + return_app = nlHsApp (nlHsTyApp return_id [tup_ty]) (mk_ret_tup rets) mk_wild_pat :: Id -> LPat Id