diff options
author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-10-07 20:54:54 -0700 |
---|---|---|
committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-04-07 11:55:49 -0700 |
commit | a7524eaed33324e2155c47d4a705bef1d70a2b5b (patch) | |
tree | d3bb67c7cdfc5a6afa663484efe7b15c87ce43f1 /ghc | |
parent | a058ad65e0936c1b7104ee976cbf80d97fd7232e (diff) | |
download | haskell-a7524eaed33324e2155c47d4a705bef1d70a2b5b.tar.gz |
Support for multiple signature files in scope.
Summary:
A common pattern when programming with signatures is to combine multiple
signatures together (signature linking). We achieve this by making it
not-an-error to have multiple, distinct interface files for the same module
name, as long as they have the same backing implementation. When a user
imports a module name, they get ALL matching signatures dumped into their
scope.
On the way, I refactored the module finder code, which now distinguishes
between exact finds (when you had a 'Module') and regular finds (when
you had a 'ModuleName'). I also refactored the package finder code to
use a Monoid instance on LookupResult to collect together various results.
ToDo: At the moment, if a signature is declared in the local package,
it completely overrides any remote signatures. Eventually, we'll want
to also pull in the remote signatures (or even override the local signature,
if the full implementation is available.) There are bunch of ToDos in the
code for what to do once this is done.
ToDo: At the moment, whenever a module name lookup occurs in GHCi and we
would have seen a signature, we instead continue and return the Module
for the backing implementation. This is correct for most cases, but there
might be some situations where we want something a little more fine-grained
(e.g. :browse should only list identifiers which are available through
the in-scope signatures, and not ALL of them.)
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: simonpj, hvr, austin
Subscribers: carter, thomie
Differential Revision: https://phabricator.haskell.org/D790
GHC Trac Issues: #9252
Diffstat (limited to 'ghc')
-rw-r--r-- | ghc/Main.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ghc/Main.hs b/ghc/Main.hs index fa266a24f8..201ee5d8d2 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -834,11 +834,12 @@ abiHash strs = do let modname = mkModuleName str r <- findImportedModule hsc_env modname Nothing case r of - Found _ m -> return m + FoundModule h -> return [fr_mod h] + FoundSigs hs _ -> return (map fr_mod hs) _error -> throwGhcException $ CmdLineError $ showSDoc dflags $ cannotFindInterface dflags modname r - mods <- mapM find_it strs + mods <- fmap concat (mapM find_it strs) let get_iface modl = loadUserInterface False (text "abiHash") modl ifaces <- initIfaceCheck hsc_env $ mapM get_iface mods |