From c1a31d0d47994808ca7b8389a1d5d634b45d6755 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Wed, 9 Aug 2006 14:31:53 +0000 Subject: [PATCH 1/1] fixes to the stage2 build following removal of old FFI syntax --- compiler/deSugar/DsMeta.hs | 4 ++-- compiler/hsSyn/Convert.lhs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs index c1f2456..ba13bf7 100644 --- a/compiler/deSugar/DsMeta.hs +++ b/compiler/deSugar/DsMeta.hs @@ -135,7 +135,7 @@ groupBinders (HsGroup { hs_valds = val_decls, hs_tyclds = tycl_decls, -- Collect the binders of a Group = collectHsValBinders val_decls ++ [n | d <- tycl_decls, n <- tyClDeclNames (unLoc d)] ++ - [n | L _ (ForeignImport n _ _ _) <- foreign_decls] + [n | L _ (ForeignImport n _ _) <- foreign_decls] {- Note [Binders and occurrences] @@ -251,7 +251,7 @@ repInstD' (L loc (InstDecl ty binds _)) -- Ignore user pragmas for now (tvs, cxt, cls, tys) = splitHsInstDeclTy (unLoc ty) repForD :: Located (ForeignDecl Name) -> DsM (SrcSpan, Core TH.DecQ) -repForD (L loc (ForeignImport name typ (CImport cc s ch cn cis) _)) +repForD (L loc (ForeignImport name typ (CImport cc s ch cn cis))) = do MkC name' <- lookupLOcc name MkC typ' <- repLTy typ MkC cc' <- repCCallConv cc diff --git a/compiler/hsSyn/Convert.lhs b/compiler/hsSyn/Convert.lhs index 88d8954..2055650 100644 --- a/compiler/hsSyn/Convert.lhs +++ b/compiler/hsSyn/Convert.lhs @@ -210,7 +210,7 @@ cvtForD (ImportF callconv safety from nm ty) = do { nm' <- vNameL nm ; ty' <- cvtType ty ; let i = CImport (cvt_conv callconv) safety' c_header nilFS cis - ; return $ ForeignImport nm' ty' i False } + ; return $ ForeignImport nm' ty' i } | otherwise = failWith $ text (show from)<+> ptext SLIT("is not a valid ccall impent") @@ -224,7 +224,7 @@ cvtForD (ExportF callconv as nm ty) = do { nm' <- vNameL nm ; ty' <- cvtType ty ; let e = CExport (CExportStatic (mkFastString as) (cvt_conv callconv)) - ; return $ ForeignExport nm' ty' e False } + ; return $ ForeignExport nm' ty' e } cvt_conv CCall = CCallConv cvt_conv StdCall = StdCallConv -- 1.7.10.4