From: simonpj <unknown>
Date: Fri, 13 Sep 2002 15:17:16 +0000 (+0000)
Subject: [project @ 2002-09-13 15:17:15 by simonpj]
X-Git-Tag: Approx_11550_changesets_converted~1683
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=fa9c9782a4e66d7af52f4e1ef8ddf2445741dd44;p=ghc-hetmet.git

[project @ 2002-09-13 15:17:15 by simonpj]
Ooops... forgot these droppings, sorry
---

diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs
index 7100acb..efb2cd4 100644
--- a/ghc/compiler/deSugar/Desugar.lhs
+++ b/ghc/compiler/deSugar/Desugar.lhs
@@ -11,7 +11,7 @@ module Desugar ( deSugar, deSugarExpr ) where
 import CmdLineOpts	( DynFlag(..), dopt, opt_SccProfilingOn )
 import HscTypes		( ModGuts(..), ModGuts, HscEnv(..), ExternalPackageState(..), 
 			  PersistentCompilerState(..), 
-	  		  lookupType )
+	  		  lookupType, unQualInScope )
 import HsSyn		( MonoBinds, RuleDecl(..), RuleBndr(..), 
 			  HsExpr(..), HsBinds(..), MonoBinds(..) )
 import TcHsSyn		( TypecheckedRuleDecl, TypecheckedHsExpr )
@@ -32,11 +32,13 @@ import Id		( Id )
 import NameEnv		( lookupNameEnv )
 import VarEnv
 import VarSet
-import Bag		( isEmptyBag )
+import Bag		( isEmptyBag, mapBag )
 import CoreLint		( showPass, endPass )
 import ErrUtils		( doIfSet, dumpIfSet_dyn, pprBagOfWarnings, addShortWarnLocLine )
 import Outputable
+import qualified Pretty
 import UniqSupply	( mkSplitUniqSupply )
+import SrcLoc		( SrcLoc )
 import FastString
 import DATA_IOREF	( readIORef )
 \end{code}
@@ -73,7 +75,7 @@ deSugar hsc_env pcs
 		= initDs dflags us lookup mod
 			 (dsProgram binds rules fords)
 	
-	      warn_doc = pprBagOfWarnings (mapBag mk_warn ds_warns))
+	      warn_doc = pprBagOfWarnings (mapBag mk_warn ds_warns)
 
 	-- Display any warnings
         ; doIfSet (not (isEmptyBag ds_warns))
@@ -110,7 +112,8 @@ deSugar hsc_env pcs
 
 	-- Desugarer warnings are SDocs; here we
 	-- add the info about whether or not to print unqualified
-    mk_warn (loc,sdoc) = (loc, addShortWarnLocLine loc print_unqual sdoc)
+    mk_warn :: (SrcLoc,SDoc) -> (SrcLoc, Pretty.Doc)
+    mk_warn (loc, sdoc) = addShortWarnLocLine loc print_unqual sdoc
 
 	-- The lookup function passed to initDs is used for well-known Ids, 
 	-- such as fold, build, cons etc, so the chances are
@@ -138,10 +141,13 @@ deSugarExpr hsc_env pcs mod_name unqual tc_expr
 
 	-- Do desugaring
 	; let (core_expr, ds_warns) = initDs dflags us lookup mod_name (dsExpr tc_expr)    
+	      warn_doc = pprBagOfWarnings (mapBag mk_warn ds_warns)
+	      mk_warn :: (SrcLoc,SDoc) -> (SrcLoc, Pretty.Doc)
+	      mk_warn (loc,sdoc) = addShortWarnLocLine loc unqual sdoc
 
 	-- Display any warnings
         ; doIfSet (not (isEmptyBag ds_warns))
-		  (printErrs (pprBagOfWarnings ds_warns))
+		  (printErrs warn_doc)
 
 	-- Dump output
 	; dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr core_expr)
diff --git a/ghc/compiler/deSugar/DsMonad.lhs b/ghc/compiler/deSugar/DsMonad.lhs
index 9a8b447..6936e2d 100644
--- a/ghc/compiler/deSugar/DsMonad.lhs
+++ b/ghc/compiler/deSugar/DsMonad.lhs
@@ -84,7 +84,7 @@ instance Monad DsM where
 
 type DsWarnings = Bag DsWarning         -- The desugarer reports matches which are
 					-- completely shadowed or incomplete patterns
-type DsWarning = (Loc, SDoc)
+type DsWarning = (SrcLoc, SDoc)
 
 {-# INLINE thenDs #-}
 {-# INLINE returnDs #-}
diff --git a/ghc/compiler/deSugar/Match.lhs b/ghc/compiler/deSugar/Match.lhs
index 02eeed7..3982d4c 100644
--- a/ghc/compiler/deSugar/Match.lhs
+++ b/ghc/compiler/deSugar/Match.lhs
@@ -28,7 +28,7 @@ import TysWiredIn	( consDataCon, mkTupleTy, mkListTy,
 			  tupleCon, parrFakeCon, mkPArrTy )
 import BasicTypes	( Boxity(..) )
 import UniqSet
-import SrcLoc		( noSrcLoc )x
+import SrcLoc		( noSrcLoc )
 import Util             ( lengthExceeds, isSingleton, notNull )
 import Outputable
 \end{code}