X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FhsSyn%2FHsDecls.lhs;h=1faaa2676d832186999c8c2dc5fa521e99471798;hb=f098cfb236c17bcb3c46e39f9b1d7d8d8ca86003;hp=9df546a7fea68221f80c78ea525c004f8c2a95c0;hpb=5a75bc61b8a58caf4ae4bc115394a37132943d32;p=ghc-hetmet.git

diff --git a/compiler/hsSyn/HsDecls.lhs b/compiler/hsSyn/HsDecls.lhs
index 9df546a..1faaa26 100644
--- a/compiler/hsSyn/HsDecls.lhs
+++ b/compiler/hsSyn/HsDecls.lhs
@@ -27,7 +27,7 @@ module HsDecls (
 	ConDecl(..), ResType(..), ConDeclField(..), LConDecl,	
 	HsConDeclDetails, hsConDeclArgTys,
 	DocDecl(..), LDocDecl, docDeclDoc,
-	DeprecDecl(..),  LDeprecDecl,
+	WarnDecl(..),  LWarnDecl,
 	HsGroup(..),  emptyRdrGroup, emptyRnGroup, appendGroups,
 	tcdName, tyClDeclNames, tyClDeclTyVars,
 	isClassDecl, isSynDecl, isDataDecl, isTypeDecl, isFamilyDecl,
@@ -43,7 +43,6 @@ import {-# SOURCE #-}	HsExpr( HsExpr, pprExpr )
 
 import HsBinds
 import HsPat
-import HsImpExp
 import HsTypes
 import HsDoc
 import NameSet
@@ -79,7 +78,7 @@ data HsDecl id
   | SigD	(Sig id)
   | DefD	(DefaultDecl id)
   | ForD        (ForeignDecl id)
-  | DeprecD	(DeprecDecl id)
+  | WarningD	(WarnDecl id)
   | RuleD	(RuleDecl id)
   | SpliceD	(SpliceDecl id)
   | DocD	(DocDecl id)
@@ -113,7 +112,7 @@ data HsGroup id
 
 	hs_defds  :: [LDefaultDecl id],
 	hs_fords  :: [LForeignDecl id],
-	hs_depds  :: [LDeprecDecl id],
+	hs_warnds :: [LWarnDecl id],
 	hs_ruleds :: [LRuleDecl id],
 
 	hs_docs   :: [LDocDecl id]
@@ -125,7 +124,7 @@ emptyRnGroup  = emptyGroup { hs_valds = emptyValBindsOut }
 
 emptyGroup = HsGroup { hs_tyclds = [], hs_instds = [], hs_derivds = [],
 		       hs_fixds = [], hs_defds = [], hs_fords = [], 
-		       hs_depds = [], hs_ruleds = [],
+		       hs_warnds = [], hs_ruleds = [],
 		       hs_valds = error "emptyGroup hs_valds: Can't happen",
                        hs_docs = [] }
 
@@ -139,7 +138,7 @@ appendGroups
 	hs_fixds  = fixds1, 
 	hs_defds  = defds1,
 	hs_fords  = fords1, 
-	hs_depds  = depds1,
+	hs_warnds = warnds1,
 	hs_ruleds = rulds1,
   hs_docs   = docs1 }
     HsGroup { 
@@ -150,7 +149,7 @@ appendGroups
 	hs_fixds  = fixds2, 
 	hs_defds  = defds2,
 	hs_fords  = fords2, 
-	hs_depds  = depds2,
+	hs_warnds = warnds2,
 	hs_ruleds = rulds2,
   hs_docs   = docs2 }
   = 
@@ -162,7 +161,7 @@ appendGroups
 	hs_fixds  = fixds1 ++ fixds2, 
 	hs_defds  = defds1 ++ defds2,
 	hs_fords  = fords1 ++ fords2, 
-	hs_depds  = depds1 ++ depds2,
+	hs_warnds = warnds1 ++ warnds2,
 	hs_ruleds = rulds1 ++ rulds2,
   hs_docs   = docs1  ++ docs2 }
 \end{code}
@@ -177,7 +176,7 @@ instance OutputableBndr name => Outputable (HsDecl name) where
     ppr (ForD fd)               = ppr fd
     ppr (SigD sd)               = ppr sd
     ppr (RuleD rd)              = ppr rd
-    ppr (DeprecD dd)            = ppr dd
+    ppr (WarningD wd)           = ppr wd
     ppr (SpliceD dd)            = ppr dd
     ppr (DocD doc)              = ppr doc
 
@@ -187,7 +186,7 @@ instance OutputableBndr name => Outputable (HsGroup name) where
 		   hs_instds = inst_decls,
                    hs_derivds = deriv_decls,
 		   hs_fixds  = fix_decls,
-		   hs_depds  = deprec_decls,
+		   hs_warnds = deprec_decls,
 		   hs_fords  = foreign_decls,
 		   hs_defds  = default_decls,
 		   hs_ruleds = rule_decls })
@@ -712,7 +711,7 @@ pprConDecl :: OutputableBndr name => ConDecl name -> SDoc
 pprConDecl (ConDecl con expl tvs cxt details ResTyH98 doc)
   = sep [ppr_mbDoc doc, pprHsForAll expl tvs cxt, ppr_details con details]
   where
-    ppr_details con (InfixCon t1 t2) = hsep [ppr t1, pprHsVar con, ppr t2]
+    ppr_details con (InfixCon t1 t2) = hsep [ppr t1, pprHsInfix con, ppr t2]
     ppr_details con (PrefixCon tys)  = hsep (pprHsVar con : map ppr tys)
     ppr_details con (RecCon fields)  = ppr con <+> ppr_fields fields
 
@@ -994,11 +993,11 @@ docDeclDoc (DocGroup _ d) = d
 We use exported entities for things to deprecate.
 
 \begin{code}
-type LDeprecDecl name = Located (DeprecDecl name)
+type LWarnDecl name = Located (WarnDecl name)
 
-data DeprecDecl name = Deprecation name DeprecTxt
+data WarnDecl name = Warning name WarningTxt
 
-instance OutputableBndr name => Outputable (DeprecDecl name) where
-    ppr (Deprecation thing txt)
+instance OutputableBndr name => Outputable (WarnDecl name) where
+    ppr (Warning thing txt)
       = hsep [text "{-# DEPRECATED", ppr thing, doubleQuotes (ppr txt), text "#-}"]
 \end{code}