[project @ 2002-09-13 16:06:28 by simonpj]

wibbles

diff --git a/ghc/compiler/deSugar/DsMeta.hs b/ghc/compiler/deSugar/DsMeta.hs
index ba26f7a..7c64556 100644 (file)
--- a/ghc/compiler/deSugar/DsMeta.hs
+++ b/ghc/compiler/deSugar/DsMeta.hs
@@ -703,6 +703,7 @@ repVal (MkC p) (MkC b) (MkC ds) = rep2 valName [p, b, ds]
 repFun :: Core String -> Core [M.Clse] -> DsM (Core M.Decl)  
 repFun (MkC nm) (MkC b) = rep2 funName [nm, b]
 
+{-
 repData :: Core String -> Core [String] -> Core [M.Cons] -> Core [String] -> DsM (Core M.Decl)
 repData (MkC nm) (MkC tvs) (MkC cons) (MkC derivs) = rep2 dataDName [nm, tvs, cons, derivs]
 
@@ -740,6 +741,7 @@ repArrowTyCon = rep2 arrowTyConName []
 repListTyCon :: DsM (Core M.Tag)
 repListTyCon = rep2 listTyConName []
 
+-}
 
 --------------- Miscellaneous -------------------
 

diff --git a/ghc/compiler/hsSyn/Convert.lhs b/ghc/compiler/hsSyn/Convert.lhs
index e3a6064..2e8b83a 100644 (file)
--- a/ghc/compiler/hsSyn/Convert.lhs
+++ b/ghc/compiler/hsSyn/Convert.lhs
@@ -16,7 +16,7 @@ import HsSyn as Hs
        (       HsExpr(..), HsLit(..), ArithSeqInfo(..), 
                HsDoContext(..), 
                Match(..), GRHSs(..), GRHS(..), HsPred(..),
-               HsDecl(..), TyClDecl(..), InstDecl(..),
+               HsDecl(..), TyClDecl(..), InstDecl(..), ConDecl(..),
                Stmt(..), HsBinds(..), MonoBinds(..), Sig(..),
                Pat(..), HsConDetails(..), HsOverLit, BangType(..),
                placeHolderType, HsType(..), HsTupCon(..),
@@ -26,7 +26,7 @@ import HsSyn as Hs
 
 import RdrName ( RdrName, mkRdrUnqual, mkRdrQual, mkOrig )
 import Module   ( mkModuleName )
-import RdrHsSyn        ( mkHsIntegral, mkClassDecl, mkTyData, mkConDecl )
+import RdrHsSyn        ( mkHsIntegral, mkClassDecl, mkTyData )
 import OccName
 import SrcLoc  ( SrcLoc, generatedSrcLoc )
 import TyCon   ( DataConDetails(..) )
@@ -53,7 +53,7 @@ cvt_top (Data tc tvs constrs derivs)
                    (mk_derivs derivs) loc0)
   where
     mk_con (Constr c tys)
-       = mkConDecl (cName c) noExistentials noContext
+       = ConDecl (cName c) noExistentials noContext
                    (PrefixCon (map mk_arg tys)) loc0
 
     mk_arg ty = BangType NotMarkedStrict (cvtType ty)