X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FhsSyn%2FHsImpExp.lhs;h=97c23f48fb732ae513478784343d0f206753c53c;hb=967cc47f37cb93a5e2b6df7822c9a646f0428247;hp=07309d68af04efe54658ca3ef679a195ae03fd1f;hpb=e8e9742681b0ef189f4c18ec36cd47be26327755;p=ghc-hetmet.git

diff --git a/ghc/compiler/hsSyn/HsImpExp.lhs b/ghc/compiler/hsSyn/HsImpExp.lhs
index 07309d6..97c23f4 100644
--- a/ghc/compiler/hsSyn/HsImpExp.lhs
+++ b/ghc/compiler/hsSyn/HsImpExp.lhs
@@ -4,18 +4,14 @@
 \section[HsImpExp]{Abstract syntax: imports, exports, interfaces}
 
 \begin{code}
-#include "HsVersions.h"
-
 module HsImpExp where
 
-IMP_Ubiq()
+#include "HsVersions.h"
 
+import BasicTypes	( Module, IfaceFlavour(..) )
+import Name		( NamedThing )
 import Outputable
-import Pretty
 import SrcLoc		( SrcLoc )
-#if __GLASGOW_HASKELL__ >= 202
-import Name
-#endif
 \end{code}
 
 %************************************************************************
@@ -29,6 +25,8 @@ One per \tr{import} declaration in a module.
 data ImportDecl name
   = ImportDecl	  Module			-- module name
 		  Bool				-- True => qualified
+		  IfaceFlavour			-- True => source imported module 
+						--    (current interpretation: ignore ufolding info)
 		  (Maybe Module)		-- as Module
 		  (Maybe (Bool, [IE name]))	-- (True => hiding, names)
 		  SrcLoc
@@ -36,21 +34,25 @@ data ImportDecl name
 
 \begin{code}
 instance (NamedThing name, Outputable name) => Outputable (ImportDecl name) where
-    ppr sty (ImportDecl mod qual as spec _)
-      = hang (hsep [ptext SLIT("import"), pp_qual qual, ptext mod, pp_as as])
+    ppr (ImportDecl mod qual as_source as spec _)
+      = hang (hsep [ptext SLIT("import"), pp_src as_source, 
+                    pp_qual qual, ptext mod, pp_as as])
 	     4 (pp_spec spec)
       where
+	pp_src HiFile     = empty
+	pp_src HiBootFile = ptext SLIT("{-# SOURCE #-}")
+
 	pp_qual False   = empty
 	pp_qual True	= ptext SLIT("qualified")
 
 	pp_as Nothing   = empty
-	pp_as (Just a)  = (<>) (ptext SLIT("as ")) (ptext a)
+	pp_as (Just a)  = ptext SLIT("as ") <+> ptext a
 
 	pp_spec Nothing = empty
 	pp_spec (Just (False, spec))
-			= parens (interpp'SP sty spec)
+			= parens (interpp'SP spec)
 	pp_spec (Just (True, spec))
-			= (<>) (ptext SLIT("hiding ")) (parens (interpp'SP sty spec))
+			= ptext SLIT("hiding") <+> parens (interpp'SP spec)
 \end{code}
 
 %************************************************************************
@@ -78,14 +80,12 @@ ieName (IEThingAll  n)   = n
 
 \begin{code}
 instance (NamedThing name, Outputable name) => Outputable (IE name) where
-    ppr sty (IEVar	var)	= ppr sty var
-    ppr sty (IEThingAbs	thing)	= ppr sty thing
-    ppr sty (IEThingAll	thing)
-	= hcat [ppr sty thing, text "(..)"]
-    ppr sty (IEThingWith thing withs)
-	= (<>) (ppr sty thing)
-	    (parens (fsep (punctuate comma (map (ppr sty) withs))))
-    ppr sty (IEModuleContents mod)
-	= (<>) (ptext SLIT("module ")) (ptext mod)
+    ppr (IEVar	        var)	= ppr var
+    ppr (IEThingAbs	thing)	= ppr thing
+    ppr (IEThingAll	thing)	= hcat [ppr thing, text "(..)"]
+    ppr (IEThingWith thing withs)
+	= ppr thing <> parens (fsep (punctuate comma (map ppr withs)))
+    ppr (IEModuleContents mod)
+	= ptext SLIT("module") <+> ptext mod
 \end{code}