From 89a8d817f0c2951ec305c286a526205d06bf9221 Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Mon, 20 Oct 2014 15:57:13 -0700 Subject: Revert "Rename _closure to _static_closure, apply naming consistently." This reverts commit 35672072b4091d6f0031417bc160c568f22d0469. Conflicts: compiler/main/DriverPipeline.hs --- compiler/deSugar/DsForeign.lhs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/deSugar') diff --git a/compiler/deSugar/DsForeign.lhs b/compiler/deSugar/DsForeign.lhs index 94ae779751..c60e9146bc 100644 --- a/compiler/deSugar/DsForeign.lhs +++ b/compiler/deSugar/DsForeign.lhs @@ -598,7 +598,7 @@ mkFExportCBits dflags c_nm maybe_target arg_htys res_hty is_IO_res_ty cc the_cfun = case maybe_target of Nothing -> text "(StgClosure*)deRefStablePtr(the_stableptr)" - Just hs_fn -> text "STATIC_CLOSURE(" <> ppr hs_fn <> text ")" + Just hs_fn -> char '&' <> ppr hs_fn <> text "_closure" cap = text "cap" <> comma @@ -623,7 +623,7 @@ mkFExportCBits dflags c_nm maybe_target arg_htys res_hty is_IO_res_ty cc extern_decl = case maybe_target of Nothing -> empty - Just hs_fn -> text "extern StgClosure " <> ppr hs_fn <> text "_static_closure" <> semi + Just hs_fn -> text "extern StgClosure " <> ppr hs_fn <> text "_closure" <> semi -- finally, the whole darn thing @@ -679,7 +679,7 @@ foreignExportInitialiser hs_fn = <> text "() __attribute__((constructor));" , text "static void stginit_export_" <> ppr hs_fn <> text "()" , braces (text "foreignExportStablePtr" - <> parens (text "(StgPtr) &" <> ppr hs_fn <> text "_static_closure") + <> parens (text "(StgPtr) &" <> ppr hs_fn <> text "_closure") <> semi) ] -- cgit v1.2.1