From: simonpj Date: Thu, 11 Aug 2005 08:45:41 +0000 (+0000) Subject: [project @ 2005-08-11 08:45:41 by simonpj] X-Git-Tag: Initial_conversion_from_CVS_complete~248 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=ea5ae017de01553bc808c2fa216218b9a13b51ef;p=ghc-hetmet.git [project @ 2005-08-11 08:45:41 by simonpj] Wibble; fixes TH failures --- diff --git a/ghc/compiler/deSugar/DsMeta.hs b/ghc/compiler/deSugar/DsMeta.hs index 9785cdb..e13b062 100644 --- a/ghc/compiler/deSugar/DsMeta.hs +++ b/ghc/compiler/deSugar/DsMeta.hs @@ -54,7 +54,7 @@ import Maybe ( catMaybes ) import Unique ( mkPreludeTyConUnique, mkPreludeMiscIdUnique, getKey, Uniquable(..) ) import BasicTypes ( isBoxed ) import Outputable -import Bag ( bagToList ) +import Bag ( bagToList, unionManyBags ) import FastString ( unpackFS ) import ForeignCall ( Safety(..), CCallConv(..), CCallTarget(..) ) @@ -697,8 +697,8 @@ repBinds (HsValBinds decs) rep_val_binds :: HsValBinds Name -> DsM [(SrcSpan, Core TH.DecQ)] -- Assumes: all the binders of the binding are alrady in the meta-env -rep_val_binds (ValBindsIn binds sigs) - = do { core1 <- rep_binds' binds +rep_val_binds (ValBindsOut binds sigs) + = do { core1 <- rep_binds' (unionManyBags (map snd binds)) ; core2 <- rep_sigs' sigs ; return (core1 ++ core2) }