diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-07-24 15:13:49 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-09-21 11:53:56 -0700 |
| commit | 06d46b1e4507e09eb2a7a04998a92610c8dc6277 (patch) | |
| tree | 7dc84733d3b6a8313c272c2c8fed4cc0b5d30e90 /testsuite/.gitignore | |
| parent | 09d214dcd8e831c128c684facb7c8da1d63c58bc (diff) | |
| download | haskell-06d46b1e4507e09eb2a7a04998a92610c8dc6277.tar.gz | |
Unify hsig and hs-boot; add preliminary "hs-boot" merging.
This patch drops the file level distinction between hs-boot and hsig;
we figure out which one we are compiling based on whether or not there
is a corresponding hs file lying around.
To make the "import A" syntax continue to work for bare hs-boot
files, we also introduce hs-boot merging, which takes an A.hi-boot
and converts it to an A.hi when there is no A.hs file in scope.
This will be generalized in Backpack to merge multiple A.hi files together;
which means we can jettison the "load multiple interface files" functionality.
This works automatically for --make, but for one-shot compilation
we need a new mode: ghc --merge-requirements A will generate an A.hi/A.o
from a local A.hi-boot file; Backpack will extend this mechanism further.
Has Haddock submodule update to deal with change in msHsFilePath behavior.
- This commit drops support for the hsig extension. Can
we support it? It's annoying because the finder code is
written with the assumption that where there's an hs-boot
file, there's always an hs file too. To support hsig, you'd
have to probe two locations. Easier to just not support it.
- #10333 affects us, modifying an hs-boot still doesn't trigger
recomp.
- See compiler/main/Finder.hs: this diff is very skeevy, but
it seems to work.
- This code cunningly doesn't drop hs-boot files from the
"drop hs-boot files" module graph, if they don't have a
corresponding hs file. I have no idea if this actually is useful.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: simonpj, austin, bgamari, spinda
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1098
Diffstat (limited to 'testsuite/.gitignore')
| -rw-r--r-- | testsuite/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/testsuite/.gitignore b/testsuite/.gitignore index 14704f7f58..88c89deb64 100644 --- a/testsuite/.gitignore +++ b/testsuite/.gitignore @@ -613,6 +613,7 @@ mk/ghcconfig*_bin_ghc*.exe.mk /tests/driver/recomp014/A.hs /tests/driver/recomp014/A1.hs /tests/driver/recomp014/B.hsig +/tests/driver/recomp014/B.hs-boot /tests/driver/recomp014/C.hs /tests/driver/recomp014/recomp014 /tests/driver/rtsOpts |