Resolve conflict in MkExternalCore

[ghc-hetmet.git] / compiler / coreSyn / MkExternalCore.lhs

diff --git a/compiler/coreSyn/MkExternalCore.lhs b/compiler/coreSyn/MkExternalCore.lhs
index 3315240..c8885f7 100644 (file)
--- a/compiler/coreSyn/MkExternalCore.lhs
+++ b/compiler/coreSyn/MkExternalCore.lhs
@@ -1,4 +1,4 @@
-%
+
 % (c) The University of Glasgow 2001
 %
 \begin{code}
@@ -18,14 +18,15 @@ import TyCon
 import TypeRep
 import Type
 import PprExternalCore -- Instances
-import DataCon ( DataCon, dataConTyVars, dataConRepArgTys, 
+import DataCon ( DataCon, dataConExTyVars, dataConRepArgTys, 
                  dataConName, dataConTyCon )
 import CoreSyn
 import Var
 import IdInfo
-import Kind
 import Literal
 import Name
+import NameSet ( NameSet, emptyNameSet )
+import UniqSet ( elementOfUniqSet )
 import Outputable
 import ForeignCall
 import DynFlags        ( DynFlags(..) )
@@ -33,27 +34,27 @@ import StaticFlags  ( opt_EmitExternalCore )
 import IO
 import FastString
 
-emitExternalCore :: DynFlags -> CgGuts -> IO ()
-emitExternalCore dflags cg_guts
+emitExternalCore :: DynFlags -> NameSet -> CgGuts -> IO ()
+emitExternalCore dflags exports cg_guts
  | opt_EmitExternalCore 
  = (do handle <- openFile corename WriteMode
-       hPutStrLn handle (show (mkExternalCore cg_guts))      
+       hPutStrLn handle (show (mkExternalCore exports cg_guts))      
        hClose handle)
    `catch` (\err -> pprPanic "Failed to open or write external core output file" 
                             (text corename))
    where corename = extCoreName dflags
-emitExternalCore _ _
+emitExternalCore _ _ _
  | otherwise
  = return ()
 
 
-mkExternalCore :: CgGuts -> C.Module
+mkExternalCore :: NameSet -> CgGuts -> C.Module
 -- The ModGuts has been tidied, but the implicit bindings have
 -- not been injected, so we have to add them manually here
 -- We don't include the strange data-con *workers* because they are
 -- implicit in the data type declaration itself
-mkExternalCore (CgGuts {cg_module=this_mod, cg_tycons = tycons, cg_binds = binds})
-  = C.Module mname tdefs (map make_vdef binds)
+mkExternalCore exports (CgGuts {cg_module=this_mod, cg_tycons = tycons, cg_binds = binds})
+  = C.Module mname tdefs (map (make_vdef exports) binds)
   where
     mname  = make_mid this_mod
     tdefs  = foldr collect_tdefs [] tycons
@@ -81,7 +82,7 @@ make_cdef dcon =  C.Constr dcon_name existentials tys
   where 
     dcon_name    = make_var_id (dataConName dcon)
     existentials = map make_tbind ex_tyvars
-    ex_tyvars    = drop (tyConArity (dataConTyCon dcon)) (dataConTyVars dcon)
+    ex_tyvars    = dataConExTyVars dcon
     tys         = map make_ty (dataConRepArgTys dcon)
 
 make_tbind :: TyVar -> C.Tbind
@@ -90,12 +91,14 @@ make_tbind tv = (make_var_id (tyVarName tv), make_kind (tyVarKind tv))
 make_vbind :: Var -> C.Vbind
 make_vbind v = (make_var_id  (Var.varName v), make_ty (idType v))
 
-make_vdef :: CoreBind -> C.Vdefg
-make_vdef b = 
+make_vdef :: NameSet -> CoreBind -> C.Vdefg
+make_vdef exports b = 
   case b of
     NonRec v e -> C.Nonrec (f (v,e))
     Rec ves -> C.Rec (map f ves)
-  where f (v,e) = (make_var_id (Var.varName v), make_ty (idType v),make_exp e)
+  where
+  f (v,e) = (local, make_var_id (Var.varName v), make_ty (idType v),make_exp e)
+       where local = not $ elementOfUniqSet (Var.varName v) exports
        -- Top level bindings are unqualified now
 
 make_exp :: CoreExpr -> C.Exp
@@ -112,11 +115,11 @@ 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
-make_exp (Note (Coerce t_to t_from) e) = C.Coerce (make_ty t_to) (make_exp e)
 make_exp (Note (CoreNote s) e) = C.Note s (make_exp e)  -- hdaume: core annotations
 make_exp (Note InlineMe e) = C.Note "InlineMe" (make_exp e)
 make_exp _ = error "MkExternalCore died: make_exp"
@@ -172,11 +175,12 @@ make_ty (NoteTy _ t)      = make_ty t
 
 
 make_kind :: Kind -> C.Kind
-make_kind (FunKind k1 k2)  = C.Karrow (make_kind k1) (make_kind k2)
-make_kind LiftedTypeKind   = C.Klifted
-make_kind UnboxedTypeKind  = C.Kunboxed
-make_kind UnliftedTypeKind = C.Kunlifted
-make_kind OpenTypeKind     = C.Kopen
+make_kind (FunTy k1 k2)  = C.Karrow (make_kind k1) (make_kind k2)
+make_kind k
+  | isLiftedTypeKind k   = C.Klifted
+  | isUnliftedTypeKind k = C.Kunlifted
+--   | isUnboxedTypeKind k  = C.Kunboxed       Fix me
+  | isOpenTypeKind k     = C.Kopen
 make_kind _ = error "MkExternalCore died: make_kind"
 
 {- Id generation. -}
@@ -201,7 +205,7 @@ make_var_id :: Name -> C.Id
 make_var_id = make_id True
 
 make_mid :: Module -> C.Id
-make_mid = moduleString
+make_mid = showSDoc . pprModule
 
 make_qid :: Bool -> Name -> C.Qual C.Id
 make_qid is_var n = (mname,make_id is_var n)