From: Manuel M T Chakravarty Date: Sun, 6 Aug 2006 01:10:28 +0000 (+0000) Subject: Resolve conflict in MkExternalCore X-Git-Tag: After_FC_branch_merge~148 X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=e6e4036c03b21295e6457d0443106cf4e2830f4a;hp=1f95d6db898bc4c92ebb8a8e8f9920d5237bac61 Resolve conflict in MkExternalCore Thu Jul 6 09:55:27 EDT 2006 simonpj@microsoft.com --- diff --git a/compiler/coreSyn/MkExternalCore.lhs b/compiler/coreSyn/MkExternalCore.lhs index 21b389d..c8885f7 100644 --- a/compiler/coreSyn/MkExternalCore.lhs +++ b/compiler/coreSyn/MkExternalCore.lhs @@ -115,7 +115,8 @@ make_exp (App e (Type t)) = C.Appt (make_exp e) (make_ty t) make_exp (App e1 e2) = C.App (make_exp e1) (make_exp e2) make_exp (Lam v e) | isTyVar v = C.Lam (C.Tb (make_tbind v)) (make_exp e) make_exp (Lam v e) | otherwise = C.Lam (C.Vb (make_vbind v)) (make_exp e) -make_exp (Let b e) = C.Let (make_vdef b) (make_exp e) +make_exp (Cast e co) = C.Cast (make_exp e) (make_ty co) +make_exp (Let b e) = C.Let (make_vdef emptyNameSet b) (make_exp e) -- gaw 2004 make_exp (Case e v ty alts) = C.Case (make_exp e) (make_vbind v) (make_ty ty) (map make_alt alts) make_exp (Note (SCC cc) e) = C.Note "SCC" (make_exp e) -- temporary