From: simonpj@microsoft.com <unknown>
Date: Fri, 11 Aug 2006 11:03:01 +0000 (+0000)
Subject: Improve error message (imported from Prelude at Implicit import declaration)
X-Git-Tag: Before_FC_branch_merge~224
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=371cd67ed23b0dfc85dcc8a386dda26d2b8b8f4e

Improve error message (imported from Prelude at Implicit import declaration)
---

diff --git a/compiler/basicTypes/RdrName.lhs b/compiler/basicTypes/RdrName.lhs
index 3c6cd77..e99a41e 100644
--- a/compiler/basicTypes/RdrName.lhs
+++ b/compiler/basicTypes/RdrName.lhs
@@ -45,7 +45,7 @@ import Module   ( ModuleName, mkModuleNameFS, Module, moduleName )
 import Name	( Name, NamedThing(getName), nameModule, nameParent_maybe,
 		  nameOccName, isExternalName, nameSrcLoc )
 import Maybes	( mapCatMaybes )
-import SrcLoc	( isGoodSrcLoc, SrcSpan )
+import SrcLoc	( isGoodSrcLoc, isGoodSrcSpan, SrcSpan )
 import FastString ( FastString )
 import Outputable
 import Util	( thenCmp )
@@ -538,7 +538,10 @@ ppr_defn loc | isGoodSrcLoc loc = parens (ptext SLIT("defined at") <+> ppr loc)
 	     | otherwise	= empty
 
 instance Outputable ImportSpec where
-   ppr imp_spec@(ImpSpec imp_decl _)
-     = ptext SLIT("imported from") <+> ppr (is_mod imp_decl) 
-	<+> ptext SLIT("at") <+> ppr (importSpecLoc imp_spec)
+   ppr imp_spec
+     = ptext SLIT("imported from") <+> ppr (importSpecModule imp_spec) 
+	<+> if isGoodSrcSpan loc then ptext SLIT("at") <+> ppr loc
+				 else empty
+     where
+       loc = importSpecLoc imp_spec
 \end{code}