[project @ 2004-11-26 16:19:45 by simonmar]

Further integration with the new package story.  GHC now supports
pretty much everything in the package proposal.

  - GHC now works in terms of PackageIds (<pkg>-<version>) rather than
    just package names.  You can still specify package names without
    versions on the command line, as long as the name is unambiguous.

  - GHC understands hidden/exposed modules in a package, and will refuse
    to import a hidden module.  Also, the hidden/eposed status of packages
    is taken into account.

  - I had to remove the old package syntax from ghc-pkg, backwards
    compatibility isn't really practical.

  - All the package.conf.in files have been rewritten in the new syntax,
    and contain a complete list of modules in the package.  I've set all
    the versions to 1.0 for now - please check your package(s) and fix the
    version number & other info appropriately.

  - New options:

	-hide-package P    sets the expose flag on package P to False
	-ignore-package P  unregisters P for this compilation

	For comparison, -package P sets the expose flag on package P
        to True, and also causes P to be linked in eagerly.

        -package-name is no longer officially supported.  Unofficially, it's
	a synonym for -ignore-package, which has more or less the same effect
	as -package-name used to.

	Note that a package may be hidden and yet still be linked into
	the program, by virtue of being a dependency of some other package.
	To completely remove a package from the compiler's internal database,
        use -ignore-package.

	The compiler will complain if any two packages in the
        transitive closure of exposed packages contain the same
        module.

	You *must* use -ignore-package P when compiling modules for
        package P, if package P (or an older version of P) is already
        registered.  The compiler will helpfully complain if you don't.
	The fptools build system does this.

   - Note: the Cabal library won't work yet.  It still thinks GHC uses
     the old package config syntax.

Internal changes/cleanups:

   - The ModuleName type has gone away.  Modules are now just (a
     newtype of) FastStrings, and don't contain any package information.
     All the package-related knowledge is in DynFlags, which is passed
     down to where it is needed.

   - DynFlags manipulation has been cleaned up somewhat: there are no
     global variables holding DynFlags any more, instead the DynFlags
     are passed around properly.

   - There are a few less global variables in GHC.  Lots more are
     scheduled for removal.

   - -i is now a dynamic flag, as are all the package-related flags (but
     using them in {-# OPTIONS #-} is Officially Not Recommended).

   - make -j now appears to work under fptools/libraries/.  Probably
     wouldn't take much to get it working for a whole build.

1 files changed, 4 insertions, 11 deletions

diff --git a/ghc/compiler/iface/BinIface.hs b/ghc/compiler/iface/BinIface.hs
index 286c612dfb..0d9f61934c 100644
--- a/ghc/compiler/iface/BinIface.hs
+++ b/ghc/compiler/iface/BinIface.hs
@@ -16,7 +16,6 @@ import IfaceSyn
 import VarEnv
 import Class		( DefMeth(..) )
 import CostCentre
-import Module		( moduleName, mkModule )
 import DriverState	( v_Build_tag )
 import CmdLineOpts	( opt_HiVersion )
 import Kind		( Kind(..) )
@@ -95,7 +94,7 @@ instance Binary ModIface where
    put_ bh (ModIface {
 		 mi_module    = mod,
 		 mi_mod_vers  = mod_vers,
-		 mi_package   = pkg_name,
+		 mi_package   = _, -- we ignore the package on output
 		 mi_orphan    = orphan,
 		 mi_deps      = deps,
 		 mi_usages    = usages,
@@ -110,8 +109,7 @@ instance Binary ModIface where
 	put_ bh (show opt_HiVersion)
 	build_tag <- readIORef v_Build_tag
 	put  bh build_tag
-	put_ bh pkg_name
-	put_ bh (moduleName mod)
+	put_ bh mod
 	put_ bh mod_vers
 	put_ bh orphan
 	lazyPut bh deps
@@ -145,7 +143,6 @@ instance Binary ModIface where
 		"mismatched interface file ways: expected "
 		++ build_tag ++ ", found " ++ check_way))
 
-	pkg_name  <- get bh
 	mod_name  <- get bh
 
 	mod_vers  <- get bh
@@ -161,12 +158,8 @@ instance Binary ModIface where
 	rules	  <- {-# SCC "bin_rules" #-} lazyGet bh
 	rule_vers <- get bh
 	return (ModIface {
-		 mi_package   = pkg_name,
-		 mi_module    = mkModule pkg_name mod_name,
-			-- We write the module as a ModuleName, becuase whether
-			-- or not it's a home-package module depends on the importer
-			-- mkModule reconstructs the Module, by comparing the static 
-			-- opt_InPackage flag with the package name in the interface file
+		 mi_package   = ThisPackage, -- to be filled in properly later
+		 mi_module    = mod_name,
 		 mi_mod_vers  = mod_vers,
 		 mi_boot      = False,		-- Binary interfaces are never .hi-boot files!
 		 mi_orphan    = orphan,