From 9f6ed71a50e2d2084f664793f4f39ce815cad17f Mon Sep 17 00:00:00 2001 From: qrczak Date: Fri, 8 Dec 2000 21:28:15 +0000 Subject: [PATCH] [project @ 2000-12-08 21:28:15 by qrczak] Let newtypes in stub files generate correct C type names. It worked in ghc-4.09 but was not merged into 4.11? --- ghc/compiler/deSugar/DsForeign.lhs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ghc/compiler/deSugar/DsForeign.lhs b/ghc/compiler/deSugar/DsForeign.lhs index a1f34d6..65ddba6 100644 --- a/ghc/compiler/deSugar/DsForeign.lhs +++ b/ghc/compiler/deSugar/DsForeign.lhs @@ -29,7 +29,8 @@ import Name ( mkGlobalName, nameModule, nameOccName, getOccString, mkForeignExportOcc, isLocalName, NamedThing(..), ) -import Type ( splitTyConApp_maybe, tyConAppTyCon, splitFunTys, splitForAllTys, +import Type ( repType, splitTyConApp_maybe, + tyConAppTyCon, splitFunTys, splitForAllTys, Type, mkFunTys, mkForAllTys, mkTyConApp, mkFunTy, splitAppTy, applyTy, funResultTy ) @@ -486,5 +487,9 @@ showStgType :: Type -> SDoc showStgType t = text "Hs" <> text (showFFIType t) showFFIType :: Type -> String -showFFIType t = getOccString (getName (tyConAppTyCon t)) +showFFIType t = getOccString (getName tc) + where + tc = case splitTyConApp_maybe (repType t) of + Just (tc,_) -> tc + Nothing -> pprPanic "showFFIType" (ppr t) \end{code} -- 1.7.10.4