X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcoreSyn%2FMkExternalCore.lhs;h=1dc3b7e929b43d88710440ed8fd8314ce7113d05;hp=4fa8218cf6c606f94c8c9e96c04a97296d625403;hb=2fbab1a0f1a017799e8f5130bdf1078060623f29;hpb=9ab0ac4fecdf56e96c69c987cbfa22806ef3722f

diff --git a/compiler/coreSyn/MkExternalCore.lhs b/compiler/coreSyn/MkExternalCore.lhs
index 4fa8218..1dc3b7e 100644
--- a/compiler/coreSyn/MkExternalCore.lhs
+++ b/compiler/coreSyn/MkExternalCore.lhs
@@ -2,13 +2,6 @@
 % (c) The University of Glasgow 2001-2006
 %
 \begin{code}
-{-# OPTIONS -fno-warn-incomplete-patterns #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and fix
--- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
--- for details
-
 module MkExternalCore (
 	emitExternalCore
 ) where
@@ -68,9 +61,23 @@ collect_tdefs tcon tdefs
   | isAlgTyCon tcon = tdef: tdefs
   where
     tdef | isNewTyCon tcon = 
-                C.Newtype (make_con_qid (tyConName tcon)) (map make_tbind tyvars) repclause 
+                C.Newtype (qtc tcon) (map make_tbind tyvars) 
+                  (case newTyConCo_maybe tcon of
+                     Just coercion -> (qtc coercion, 
+                       make_kind $ (uncurry mkCoKind) $  
+                                  case isCoercionTyCon_maybe coercion of
+                                    -- See Note [Newtype coercions] in 
+                                    -- types/TyCon
+                                    Just (arity,coKindFun) -> coKindFun $
+                                       map mkTyVarTy $ take arity tyvars
+                                    Nothing -> pprPanic ("MkExternalCore:\
+                                      coercion tcon should have a kind fun")
+                                        (ppr tcon))
+                     Nothing       -> pprPanic ("MkExternalCore: newtype tcon\
+                                       should have a coercion: ") (ppr tcon))
+                   repclause 
          | otherwise = 
-                C.Data (make_con_qid (tyConName tcon)) (map make_tbind tyvars) (map make_cdef (tyConDataCons tcon)) 
+                C.Data (qtc tcon) (map make_tbind tyvars) (map make_cdef (tyConDataCons tcon)) 
          where repclause | isRecursiveTyCon tcon || isOpenTyCon tcon= Nothing
 		         | otherwise = Just (make_ty (repType rhs))
                                            where (_, rhs) = newTyConRhs tcon
@@ -78,6 +85,9 @@ collect_tdefs tcon tdefs
 
 collect_tdefs _ tdefs = tdefs
 
+qtc :: TyCon -> C.Qual C.Tcon
+qtc = make_con_qid . tyConName
+
 
 make_cdef :: DataCon -> C.Cdef
 make_cdef dcon =  C.Constr dcon_name existentials tys
@@ -138,8 +148,13 @@ make_alt (DataAlt dcon, vs, e) =
            (map make_vbind vbs)
 	   (make_exp e)    
 	where (tbs,vbs) = span isTyVar vs
-make_alt (LitAlt l,_,e) = C.Alit (make_lit l) (make_exp e)
-make_alt (DEFAULT,[],e) = C.Adefault (make_exp e)
+make_alt (LitAlt l,_,e)   = C.Alit (make_lit l) (make_exp e)
+make_alt (DEFAULT,[],e)   = C.Adefault (make_exp e)
+-- This should never happen, as the DEFAULT alternative binds no variables,
+-- but we might as well check for it:
+make_alt a@(DEFAULT,_ ,_) = pprPanic ("MkExternalCore: make_alt: DEFAULT "
+             ++ "alternative had a non-empty var list") (ppr a)
+
 
 make_lit :: Literal -> C.Lit
 make_lit l = 
@@ -162,7 +177,7 @@ make_ty (TyVarTy tv)    	 = C.Tvar (make_var_id (tyVarName tv))
 make_ty (AppTy t1 t2) 		 = C.Tapp (make_ty t1) (make_ty t2)
 make_ty (FunTy t1 t2) 		 = make_ty (TyConApp funTyCon [t1,t2])
 make_ty (ForAllTy tv t) 	 = C.Tforall (make_tbind tv) (make_ty t)
-make_ty (TyConApp tc ts) 	 = foldl C.Tapp (C.Tcon (make_con_qid (tyConName tc))) 
+make_ty (TyConApp tc ts) 	 = foldl C.Tapp (C.Tcon (qtc tc)) 
 					 (map make_ty ts)
 -- Newtypes are treated just like any other type constructor; not expanded
 -- Reason: predTypeRep does substitution and, while substitution deals
@@ -177,7 +192,6 @@ make_ty (TyConApp tc ts) 	 = foldl C.Tapp (C.Tcon (make_con_qid (tyConName tc)))
 -- Maybe CoreTidy should know whether to expand newtypes or not?
 
 make_ty (PredTy p)	= make_ty (predTypeRep p)
-make_ty (NoteTy _ t) 	= make_ty t
 
 
 
@@ -193,28 +207,26 @@ make_kind _ = error "MkExternalCore died: make_kind"
 
 {- Id generation. -}
 
-{- Use encoded strings.
-   Also, adjust casing to work around some badly-chosen internal names. -}
 make_id :: Bool -> Name -> C.Id
 make_id _is_var nm = (occNameString . nameOccName) nm
 
-{-	SIMON thinks this stuff isn't necessary
-make_id is_var nm = 
-  case n of
-    'Z':cs | is_var -> 'z':cs 
-    'z':cs | not is_var -> 'Z':cs 
-    c:cs | isUpper c && is_var -> 'z':'d':n
-    c:cs | isLower c && (not is_var) -> 'Z':'d':n
-    _ -> n
-  where n = (occNameString . nameOccName) nm
--}
-
 make_var_id :: Name -> C.Id
 make_var_id = make_id True
 
+-- It's important to encode the module name here, because in External Core,
+-- base:GHC.Base => base:GHCziBase
+-- We don't do this in pprExternalCore because we
+-- *do* want to keep the package name (we don't want baseZCGHCziBase,
+-- because that would just be ugly.)
+-- SIGH.
 make_mid :: Module -> C.Id
-make_mid = showSDoc . pprModule
-
+-- Super ugly code, but I can't find anything else that does quite what I
+-- want (encodes the hierarchical module name without encoding the colon
+-- that separates the package name from it.)
+make_mid m = (packageIdString (modulePackageId m)) ++
+             ":" ++
+             showSDoc (pprCode CStyle (pprModuleName (moduleName m)))
+               
 make_qid :: Bool -> Name -> C.Qual C.Id
 make_qid is_var n = (mname,make_id is_var n)
     where mname =