diff options
| author | Alec Theriault <alec.theriault@gmail.com> | 2017-12-10 12:22:21 -0800 |
|---|---|---|
| committer | Alexander Biehl <alexbiehl@gmail.com> | 2018-02-01 14:58:18 +0100 |
| commit | 4f75be94f45a0e92553eccefe56230c554333ce7 (patch) | |
| tree | b88a2dd52d4bcd001f423c490c14b4c3cbaaee0e /hypsrc-test | |
| parent | 60e10eb876899165e9644013508361bf72048bdb (diff) | |
Use the GHC lexer for the Hyperlinker backend (#714)
* Start changing to use GHC lexer
* better cpp
* Change SrcSpan to RealSrcSpan
* Remove error
* Try to stop too many open files
* wip
* wip
* Revert "wip"
This reverts commit b605510a195f26315e3d8ca90e6d95a6737553e1.
Conflicts:
haddock-api/haddock-api.cabal
haddock-api/src/Haddock/Interface.hs
* Remove pointless 'caching'
* Use dlist rather than lists when finding vars
* Use a map rather than list
* Delete bogus comment
* Rebase followup
Things now run using the GHC lexer. There are still
- stray debug statements
- unnecessary changes w.r.t. master
* Cleaned up differences w.r.t. current Haddock HEAD
Things are looking good. quasiquotes in particular look beautiful: the
TH ones (with Haskell source inside) colour/link their contents too!
Haven't yet begun to check for possible performance problems.
* Support CPP and top-level pragmas
The support for these is hackier - but no more hacky than the existing
support.
* Tests pass, CPP is better recognized
The tests were in some cases altered: I consider the new output to be more
correct than the old one....
* Fix shrinking of source without tabs in test
* Replace 'Position'/'Span' with GHC counterparts
Replaces 'Position' -> 'GHC.RealSrcLoc' and 'Span' -> 'GHC.RealSrcSpan'.
* Nits
* Forgot entry in .cabal
* Update changelog
Diffstat (limited to 'hypsrc-test')
| -rw-r--r-- | hypsrc-test/ref/src/Identifiers.html | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/hypsrc-test/ref/src/Identifiers.html b/hypsrc-test/ref/src/Identifiers.html index f52db4ab..ce69ad37 100644 --- a/hypsrc-test/ref/src/Identifiers.html +++ b/hypsrc-test/ref/src/Identifiers.html @@ -827,11 +827,7 @@ > </span ><a href="Identifiers.html#norf" ><span class="hs-identifier hs-var" - >Identifiers</span - ><span class="hs-operator hs-var" - >.</span - ><span class="hs-identifier hs-var" - >norf</span + >Identifiers.norf</span ></a ><span > </span @@ -931,4 +927,4 @@ ></pre ></body ></html ->
\ No newline at end of file +> |