[project @ 2000-10-24 10:36:08 by simonpj]

[ghc-hetmet.git] / ghc / compiler / ghci / CmStaticInfo.lhs

diff --git a/ghc/compiler/ghci/CmStaticInfo.lhs b/ghc/compiler/ghci/CmStaticInfo.lhs
index 6a4d00b..a4a7178 100644 (file)
--- a/ghc/compiler/ghci/CmStaticInfo.lhs
+++ b/ghc/compiler/ghci/CmStaticInfo.lhs
@@ -9,20 +9,11 @@ where
 
 #include "HsVersions.h"
 
-import List            ( nub )
-import Char            ( isUpper )
-import Directory       ( getDirectoryContents )
-
-import Module          ( ModuleName, mkModuleName, PackageName )
+import Monad
 \end{code}
 
 \begin{code}
-data PackageConfigInfo
-   = PackageConfigInfo { 
-        pci_rawinfo  :: [Package],  -- contents of packages.conf
-        pci_modtable :: [(ModuleName, PackageName, FilePath)]
-                                    -- maps each available module to pkg and path
-     }
+newtype PackageConfigInfo = PackageConfigInfo [Package]
 
 -- copied from the driver
 data Package
@@ -42,41 +33,5 @@ data Package
   deriving Read
 
 mkPCI :: [Package] -> IO PackageConfigInfo
-mkPCI raw_package_info
-   = do mtab <- mk_module_table raw_package_info
-        return (PackageConfigInfo { pci_rawinfo  = raw_package_info,
-                                    pci_modtable = mtab })
-
-mk_module_table :: [Package] -> IO [(ModuleName,PackageName,FilePath)]
-mk_module_table raw_info
-   = do 
-        -- the list of directories where package interfaces are
-        let -- p_i_dirs :: [(PkgName,Path)]
-            p_i_dirs = concatMap nm_and_paths raw_info
-
-        -- interface names in each directory
-        ifacess <- mapM ifaces_in_dir p_i_dirs
-        let -- iface_table :: [(ModName,PkgName,Path)] 
-            iface_table = map fsifyStrings (concat ifacess)
-
-        -- ToDo: allow a range of home package directories
-        return iface_table
-     where
-        fsifyStrings (mod_str, pkg_str, path_str)
-           = (mkModuleName mod_str, _PK_ pkg_str, path_str)
-        -- nm_and_paths :: Package -> [(PkgName,Path)]
-        nm_and_paths package 
-           = [(name package, path) | path <- nub (import_dirs package)]
-
-        -- ifaces_in_dir :: (PkgName,Path) -> IO [(ModName,PkgName,Path)]
-        ifaces_in_dir (pkgname,path)
-           = getDirectoryContents path >>= \ entries ->
-             return [(zap_hi if_nm, pkgname, path) 
-                    | if_nm <- entries, looks_like_iface_name if_nm]
-        looks_like_iface_name e
-           = not (null e) && isUpper (head e) 
-                          && take 3 (reverse e) == "ih."
-        zap_hi 
-           = reverse . drop 3 . reverse
-
+mkPCI = return . PackageConfigInfo
 \end{code}