X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FPackages.lhs;h=6a5b63cedb6affe17fa4d6e07c6bcba78a84416d;hb=8604da0136707cc14845d14a88c2272fe576b6d0;hp=d10d873ed47893f6d5db7b203db28d5b5d98cc1c;hpb=cee41c05edf4067f58f220a7b99d0b0346c2469e;p=ghc-hetmet.git

diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index d10d873..6a5b63c 100644
--- a/compiler/main/Packages.lhs
+++ b/compiler/main/Packages.lhs
@@ -19,7 +19,6 @@ module Packages (
 
 	-- * Inspecting the set of packages in scope
 	getPackageIncludePath,
-	getPackageCIncludes,
 	getPackageLibraryPath,
 	getPackageLinkOpts,
 	getPackageExtraCcOpts,
@@ -46,11 +45,10 @@ import Util
 import Maybes		( expectJust, MaybeErr(..) )
 import Panic
 import Outputable
-import Pretty ( Doc )
 
 import System.Environment ( getEnv )
-import Distribution.InstalledPackageInfo
-import Distribution.Package
+import Distribution.InstalledPackageInfo hiding (depends)
+import Distribution.Package hiding (depends)
 import Distribution.Version
 import FastString
 import ErrUtils         ( debugTraceMsg, putMsg, Message )
@@ -319,7 +317,7 @@ matchingPackages str pkgs
         -- A package named on the command line can either include the
 	-- version, or just the name if it is unambiguous.
 	matches str p
-		=  str == showPackageId (package p)
+		=  str == display (package p)
 		|| str == pkgName (package p)
 
 pickPackages :: [PackageConfig] -> [String] -> [PackageConfig]
@@ -347,10 +345,10 @@ hideOldPackages dflags pkgs = mapM maybe_hide pkgs
 	   | not (exposed p) = return p
 	   | (p' : _) <- later_versions = do
 		debugTraceMsg dflags 2 $
-		   (ptext SLIT("hiding package") <+> 
-                    text (showPackageId (package p)) <+>
-		    ptext SLIT("to avoid conflict with later version") <+>
-		    text (showPackageId (package p')))
+		   (ptext (sLit "hiding package") <+> 
+                    text (display (package p)) <+>
+		    ptext (sLit "to avoid conflict with later version") <+>
+		    text (display (package p')))
 		return (p {exposed=False})
 	   | otherwise = return p
 	  where myname = pkgName (package p)
@@ -410,16 +408,16 @@ findWiredInPackages dflags pkgs preload this_package = do
           where
                 notfound = do
 			  debugTraceMsg dflags 2 $
-			    ptext SLIT("wired-in package ")
+			    ptext (sLit "wired-in package ")
 				 <> text wired_pkg
-				 <> ptext SLIT(" not found.")
+				 <> ptext (sLit " not found.")
 			  return Nothing
                 pick pkg = do
                         debugTraceMsg dflags 2 $
-			    ptext SLIT("wired-in package ")
+			    ptext (sLit "wired-in package ")
 				 <> text wired_pkg
-				 <> ptext SLIT(" mapped to ")
-				 <> text (showPackageId (package pkg))
+				 <> ptext (sLit " mapped to ")
+				 <> text (display (package pkg))
 			return (Just (package pkg))
 
 
@@ -485,9 +483,9 @@ elimDanglingDeps dflags pkgs ignored = go [] pkgs'
 
    reportElim (p, deps) = 
         debugTraceMsg dflags 2 $
-             (ptext SLIT("package") <+> pprPkg p <+> 
-                  ptext SLIT("will be ignored due to missing or recursive dependencies:") $$ 
-	      nest 2 (hsep (map (text.showPackageId) deps)))
+             (ptext (sLit "package") <+> pprPkg p <+> 
+                  ptext (sLit "will be ignored due to missing or recursive dependencies:") $$ 
+	      nest 2 (hsep (map (text.display) deps)))
 
 -- -----------------------------------------------------------------------------
 -- When all the command-line options are in, we can process our package
@@ -576,7 +574,7 @@ mkModuleMap pkg_db = foldr extend_modmap emptyUFM pkgids
 	        hidden_mods  = hiddenModules pkg
 
 pprPkg :: PackageConfig -> SDoc
-pprPkg p = text (showPackageId (package p))
+pprPkg p = text (display (package p))
 
 -- -----------------------------------------------------------------------------
 -- Extracting information from the packages in scope
@@ -594,11 +592,6 @@ getPackageIncludePath dflags pkgs = do
   ps <- getPreloadPackagesAnd dflags pkgs
   return (nub (filter notNull (concatMap includeDirs ps)))
 
-	-- includes are in reverse dependency order (i.e. rts first)
-getPackageCIncludes :: [PackageConfig] -> IO [String]
-getPackageCIncludes pkg_configs = do
-  return (reverse (nub (filter notNull (concatMap includes pkg_configs))))
-
 getPackageLibraryPath :: DynFlags -> [PackageId] -> IO [String]
 getPackageLibraryPath dflags pkgs = do 
   ps <- getPreloadPackagesAnd dflags pkgs
@@ -695,13 +688,13 @@ add_package pkg_db ps (p, mb_parent)
 missingPackageErr :: String -> IO [PackageConfig]
 missingPackageErr p = throwDyn (CmdLineError (showSDoc (missingPackageMsg p)))
 
-missingPackageMsg :: String -> PprStyle -> Doc
-missingPackageMsg p = ptext SLIT("unknown package:") <+> text p
+missingPackageMsg :: String -> SDoc
+missingPackageMsg p = ptext (sLit "unknown package:") <+> text p
 
-missingDependencyMsg :: Maybe PackageId -> PprStyle -> Doc
+missingDependencyMsg :: Maybe PackageId -> SDoc
 missingDependencyMsg Nothing = empty
 missingDependencyMsg (Just parent)
-  = space <> parens (ptext SLIT("dependency of") <+> ftext (packageIdFS parent))
+  = space <> parens (ptext (sLit "dependency of") <+> ftext (packageIdFS parent))
 
 -- -----------------------------------------------------------------------------
 
@@ -721,8 +714,8 @@ dumpPackages dflags
 	putMsg dflags $
 	      vcat (map (text.showInstalledPackageInfo.to_ipi) (eltsUFM pkg_map))
  where
-  to_ipi pkgconf@InstalledPackageInfo_{ exposedModules = e,
-                                        hiddenModules = h } = 
+  to_ipi pkgconf@(InstalledPackageInfo { exposedModules = e,
+                                         hiddenModules = h }) = 
     pkgconf{ exposedModules = map moduleNameString e,
              hiddenModules  = map moduleNameString h }
 \end{code}