X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FcoreSyn%2FMkExternalCore.lhs;h=faa6bb997632c9a6f56ceb784f22908709f44392;hp=12513c672a9f3fc7a1cf06dd2136ef76165eaf03;hb=d5a9ee0e98a76bca1b41bbc5252e851c88b3ff4c;hpb=ad94d40948668032189ad22a0ad741ac1f645f50

diff --git a/compiler/coreSyn/MkExternalCore.lhs b/compiler/coreSyn/MkExternalCore.lhs
index 12513c6..faa6bb9 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 -w #-}
--- 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/CodingStyle#Warnings
--- for details
-
 module MkExternalCore (
 	emitExternalCore
 ) where
@@ -44,8 +37,8 @@ emitExternalCore dflags exports cg_guts
  = (do handle <- openFile corename WriteMode
        hPutStrLn handle (show (mkExternalCore exports cg_guts))      
        hClose handle)
-   `catch` (\err -> pprPanic "Failed to open or write external core output file" 
-	                     (text corename))
+   `catch` (\_ -> pprPanic "Failed to open or write external core output file"
+                           (text corename))
    where corename = extCoreName dflags
 emitExternalCore _ _ _
  | otherwise
@@ -69,13 +62,11 @@ collect_tdefs tcon tdefs
   where
     tdef | isNewTyCon tcon = 
                 C.Newtype (make_con_qid (tyConName tcon)) (map make_tbind tyvars) repclause 
--- 20060420 GHC handles empty data types just fine. ExtCore should too! jds
---         | null (tyConDataCons tcon) = error "MkExternalCore died: can't handle datatype declarations with no data constructors"
          | otherwise = 
                 C.Data (make_con_qid (tyConName tcon)) (map make_tbind tyvars) (map make_cdef (tyConDataCons tcon)) 
          where repclause | isRecursiveTyCon tcon || isOpenTyCon tcon= Nothing
-		         | otherwise = Just (make_ty rep)
-                                           where (_, rep) = newTyConRep tcon
+		         | otherwise = Just (make_ty (repType rhs))
+                                           where (_, rhs) = newTyConRhs tcon
     tyvars = tyConTyVars tcon
 
 collect_tdefs _ tdefs = tdefs
@@ -118,7 +109,7 @@ make_exp (Var v) =
         -> pprPanic "MkExternalCore died: can't handle non-{static,dynamic}-C foreign call"
                     (ppr v)
     _ -> C.Var (make_var_qid (Var.varName v))
-make_exp (Lit (l@(MachLabel s _))) = C.Label (unpackFS s)
+make_exp (Lit (MachLabel s _)) = C.Label (unpackFS s)
 make_exp (Lit l) = C.Lit (make_lit l)
 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)
@@ -128,7 +119,7 @@ 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 (SCC _) e) = C.Note "SCC"  (make_exp e) -- temporary
 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"
@@ -140,8 +131,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 = 
@@ -179,7 +175,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
 
 
 
@@ -198,7 +193,7 @@ make_kind _ = error "MkExternalCore died: make_kind"
 {- 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
+make_id _is_var nm = (occNameString . nameOccName) nm
 
 {-	SIMON thinks this stuff isn't necessary
 make_id is_var nm =