[project @ 2000-10-12 15:21:36 by rrt]

[ghc-hetmet.git] / ghc / driver / Package.hs

diff --git a/ghc/driver/Package.hs b/ghc/driver/Package.hs
index f064f62..d842d12 100644 (file)
--- a/ghc/driver/Package.hs
+++ b/ghc/driver/Package.hs
@@ -3,43 +3,45 @@ module Package where
 import Pretty
 
 data Package = Package {
-               import_dirs    :: [String],
-               library_dirs   :: [String],
-               libraries      :: [String],
-               include_dir    :: String,
-               c_include      :: String,
-               package_deps   :: [String],
-               extra_ghc_opts :: String,
-               extra_cc_opts  :: String,
-               extra_ld_opts  :: String
+               name            :: String,
+               import_dirs     :: [String],
+               library_dirs    :: [String],
+               hs_libraries    :: [String],
+               extra_libraries :: [String],
+               include_dirs    :: [String],
+               c_includes      :: [String],
+               package_deps    :: [String],
+               extra_ghc_opts  :: [String],
+               extra_cc_opts   :: [String],
+               extra_ld_opts   :: [String]
                }
   deriving (Read, Show)
 
-pprPackage :: [(String,Package)] -> String
-pprPackage pkgs = render (brackets (vcat (punctuate comma (map pprPkg pkgs))))
+listPkgs :: [Package] -> String
+listPkgs pkgs = render (fsep (punctuate comma (map (text . name) pkgs)))
 
-pprPkg (name, (Package
-       { import_dirs    = import_dirs    
-       , library_dirs   = library_dirs   
-       , libraries      = libraries      
-       , include_dir    = include_dir    
-       , c_include      = c_include      
-       , package_deps   = package_deps   
-       , extra_ghc_opts = extra_ghc_opts 
-       , extra_cc_opts  = extra_cc_opts  
-       , extra_ld_opts  = extra_ld_opts   }))
-   = parens ( 
-       text (show name) <> comma
-    <+> text "Package" <+> braces (
-       vcat [
-          text "import_dirs = "    <> text (show import_dirs) <> comma,
-          text "library_dirs = "   <> text (show library_dirs) <> comma,
-          text "libraries = "      <> text (show libraries) <> comma,
-          text "include_dir = "    <> text (show include_dir) <> comma,
-          text "c_include = "      <> text (show c_include) <> comma,
-          text "package_deps = "   <> text (show package_deps) <> comma,
-          text "extra_ghc_opts = " <> text (show extra_ghc_opts) <> comma,
-          text "extra_cc_opts = "  <> text (show extra_cc_opts) <> comma,
-          text "extra_ld_opts = "  <> text (show extra_ld_opts)
-       ])
-    )
+dumpPackages :: [Package] -> String
+dumpPackages pkgs = 
+   render (brackets (vcat (punctuate comma (map dumpPkgGuts pkgs))))
+
+dumpPkgGuts :: Package -> Doc
+dumpPkgGuts pkg =
+   text "Package" $$ nest 3 (braces (
+      sep (punctuate comma [
+         text "name = " <> text (show (name pkg)),
+         dumpField "import_dirs"     (import_dirs     pkg),
+         dumpField "library_dirs"    (library_dirs    pkg),
+         dumpField "hs_libraries"    (hs_libraries    pkg),
+         dumpField "extra_libraries" (extra_libraries pkg),
+         dumpField "include_dirs"    (include_dirs    pkg),
+         dumpField "c_includes"      (c_includes      pkg),
+         dumpField "package_deps"    (package_deps    pkg),
+         dumpField "extra_ghc_opts"  (extra_ghc_opts  pkg),
+         dumpField "extra_cc_opts"   (extra_cc_opts   pkg),
+         dumpField "extra_ld_opts"   (extra_ld_opts   pkg)
+      ])))
+
+dumpField :: String -> [String] -> Doc
+dumpField name val =
+   hang (text name <+> equals) 2
+        (brackets (sep (punctuate comma (map (text . show) val))))