diff options
author | simonmar <unknown> | 2004-11-26 16:22:13 +0000 |
---|---|---|
committer | simonmar <unknown> | 2004-11-26 16:22:13 +0000 |
commit | ef5b4b146aa172d8ac10f39b5eb3d7a0f948d8f1 (patch) | |
tree | ccf398dd86fd64e8034098b39f47e610885d88cd /ghc/compiler/parser/RdrHsSyn.lhs | |
parent | 1f8b341a88b6b60935b0ce80b59ed6e356b8cfbf (diff) | |
download | haskell-ef5b4b146aa172d8ac10f39b5eb3d7a0f948d8f1.tar.gz |
[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.
Diffstat (limited to 'ghc/compiler/parser/RdrHsSyn.lhs')
-rw-r--r-- | ghc/compiler/parser/RdrHsSyn.lhs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ghc/compiler/parser/RdrHsSyn.lhs b/ghc/compiler/parser/RdrHsSyn.lhs index cfbbaa7b64..236d53859a 100644 --- a/ghc/compiler/parser/RdrHsSyn.lhs +++ b/ghc/compiler/parser/RdrHsSyn.lhs @@ -50,7 +50,8 @@ module RdrHsSyn ( import HsSyn -- Lots of it import IfaceType -import HscTypes ( ModIface(..), emptyModIface, mkIfaceVerCache ) +import HscTypes ( ModIface(..), emptyModIface, mkIfaceVerCache, + IfacePackage(..) ) import IfaceSyn ( IfaceDecl(..), IfaceIdInfo(..), IfaceConDecl(..), IfaceConDecls(..) ) import RdrName ( RdrName, isRdrTyVar, mkUnqual, rdrNameOcc, isRdrTyVar, isRdrDataCon, isUnqual, getRdrName, isQual, @@ -65,9 +66,8 @@ import ForeignCall ( CCallConv, Safety, CCallTarget(..), CExportSpec(..), import OccName ( OccName, srcDataName, varName, isDataOcc, isTcOcc, occNameUserString, isValOcc ) import BasicTypes ( initialVersion, StrictnessMark(..) ) -import Module ( ModuleName ) +import Module ( Module ) import SrcLoc -import CmdLineOpts ( opt_InPackage ) import OrdList ( OrdList, fromOL ) import Bag ( Bag, emptyBag, snocBag, consBag, foldrBag ) import Outputable @@ -206,11 +206,12 @@ to get hi-boot files right! \begin{code} -mkBootIface :: ModuleName -> [HsDecl RdrName] -> ModIface +mkBootIface :: Module -> [HsDecl RdrName] -> ModIface -- Make the ModIface for a hi-boot file -- The decls are of very limited form +-- The package will be filled in later (see LoadIface.readIface) mkBootIface mod decls - = (emptyModIface opt_InPackage mod) { + = (emptyModIface ThisPackage{-fill in later-} mod) { mi_boot = True, mi_exports = [(mod, map mk_export decls')], mi_decls = decls_w_vers, |