aboutsummaryrefslogtreecommitdiff
path: root/haddock-api/src/Haddock/Backends/Hyperlinker/Parser.hs
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/ghc-8.10' into ghc-9.0Ben Gamari2021-01-051-2/+3
|\
| * Adapt Haddock for QualifiedDoMatthías Páll Gissurarson2020-12-081-2/+2
| |
| * Enable two warnings (#1245)tomjaguarpaw2020-12-081-0/+1
| | | | | | | | | | because they will be soon be added to -Wall. See https://gitlab.haskell.org/ghc/ghc/-/issues/15656
| * Merge branch 'ghc-8.8' into ghc-8.10Alec Theriault2020-03-201-1/+1
| |\
| | * Remove workaround for now-fixed Clang CPP bug (#1028)Alec Theriault2019-03-291-45/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before LLVM 6.0.1 (or 10.0 on Apple LLVM), there was a bug where lines that started with an octothorpe but turned out not to lex like pragmas would have an extra line added after them. Since this bug has been fixed upstream and that it doesn't have dire consequences anyways, the workaround is not really worth it anymore - we can just tell people to update their clang version (or re-structure their pragma code).
* | | Updates for the new linear types syntax: a %p -> bVladislav Zavialov2020-09-301-0/+1
| | |
* | | Sync with GHC removing {-# CORE #-} pragmaKrzysztof Gogolewski2020-07-121-2/+0
| | | | | | | | | | | | See ghc ticket #18048
* | | Handle LexicalNegation's ITprefixminusVladislav Zavialov2020-06-281-0/+1
| | |
* | | Adapt Haddock for QualifiedDoMatthías Páll Gissurarson2020-06-261-2/+2
| | |
* | | Adapt Haddock to LinearTypesKrzysztof Gogolewski2020-06-171-0/+1
| | | | | | | | | | | | See ghc/ghc!852.
* | | Fix after unit refactoringSylvain Henry2020-06-081-1/+1
| | |
* | | Module structureSylvain Henry2020-04-241-5/+5
| | |
* | | Module renamingSylvain Henry2020-04-101-3/+4
| | |
* | | Modules: TypesSylvain Henry2020-03-181-2/+2
| | |
* | | Ignore the BufLoc/BufSpan added in GHC's !2516Vladislav Zavialov2020-02-281-6/+8
| | |
* | | Modules: Driver (#13009)Sylvain Henry2020-02-191-1/+1
| | |
* | | No MonadFail/Alternative for PVladislav Zavialov2020-02-161-26/+28
| | |
* | | Update Hyperlinker.Parser.classify to use ITdollarVladislav Zavialov2019-11-241-4/+2
|/ /
* | Remove spaces around @-patterns (#1093)Vladislav Zavialov2019-09-281-1/+1
| | | | | | This is needed to compile `haddock` when [GHC Proposal #229](https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0229-whitespace-bang-patterns.rst) is implemented.
* | Parser changes to match !380Vladislav Zavialov2019-02-171-6/+9
| |
* | Remove workaround for now-fixed Clang CPP bug (#1028)Alec Theriault2019-02-111-45/+2
|/ | | | | | | | | | Before LLVM 6.0.1 (or 10.0 on Apple LLVM), there was a bug where lines that started with an octothorpe but turned out not to lex like pragmas would have an extra line added after them. Since this bug has been fixed upstream and that it doesn't have dire consequences anyways, the workaround is not really worth it anymore - we can just tell people to update their clang version (or re-structure their pragma code).
* Use `.hie` files for the Hyperlinker backend (#977)Alec Theriault2019-01-311-196/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Summary This is a large architectural change to the Hyperlinker. * extract link (and now also type) information from `.hie` instead of doing ad-hoc SYB traversals of the `RenamedSource`. Also adds a superb type-on-hover feature (#715). * re-engineer the lexer to avoid needless string conversions. By going directly through GHC's `P` monad and taking bytestring slices, we avoid a ton of allocation and have better handling of position pragmas and CPP. In terms of performance, the Haddock side of things has gotten _much_ more efficient. Unfortunately, much of this is cancelled out by the increased GHC workload for generating `.hie` files. For the full set of boot libs (including `ghc`-the-library) * the sum of total time went down by 9-10% overall * the sum of total allocations went down by 6-7% # Motivation Haddock is moving towards working entirely over `.hi` and `.hie` files. This change means we no longer need the `RenamedSource` from `TypecheckedModule` (something which is _not_ in `.hi` files). # Details Along the way a bunch of things were fixed: * Cross package (and other) links are now more reliable (#496) * The lexer tries to recover from errors on every line (instead of at CPP boundaries) * `LINE`/`COLUMN` pragmas are taken into account * filter out zero length tokens before rendering * avoid recomputing the `ModuleName`-based `SrcMap` * remove the last use of `Documentation.Haddock.Utf8` (see #998) * restructure temporary folder logic for `.hi`/`.hie` model
* Add ITcomment_line_prag token to Hyperlinker ParserBen Sklaroff2018-08-211-5/+6
| | | | | | | | | | This token is necessary for parsing #line pragmas inside nested comments. Reviewers: bgamari Reviewed By: bgamari Differential Revision: https://phabricator.haskell.org/D4935
* Handle -XStarIsTypeVladislav Zavialov2018-06-141-0/+1
|
* Improve hyperlinker's 'spanToNewline' (#846)Alec Theriault2018-06-131-7/+25
| | | | | | | | | | | | | | | | 'spanToNewline' is used to help break apart the source into lines which can then be partioned into CPP and non-CPP chunks. It is important that 'spanToNewline' not break apart tokens, so it needs to properly handle things like * block comments, possibly nested * string literals, possibly multi-line * CPP macros, possibly multi-line String literals in particular were not being properly handled. The fix is to to fall back in 'Text.Read.lex' to help lex things that are not comments. Fixes #837.
* Filter out CRLFs in hyperlinker backend (#813)Alec Theriault2018-06-131-2/+7
| | | This prevents spurious lines from appearing in the final output.
* Remove `ITtildehsh` tokenSimon Jakobi2018-06-131-1/+0
|
* DerivingVia changesRyan Scott2018-06-131-6/+1
|
* Support the new 'ITcolumn_prag' tokenAlec Theriault2018-02-021-0/+2
|
* Properly color pragma contents in hyperlinkerAlec Theriault2018-02-021-13/+65
| | | | | | The hyperlinker backend now classifies the content of pragmas as 'TkPragma'. That means that in something like '{-# INLINE foo #-}', 'foo' still gets classified as a pragma token.
* Hyperlinker: Adjust parser to new PFailed constructorAlexander Biehl2018-02-011-8/+8
|
* Use the GHC lexer for the Hyperlinker backend (#714)Alec Theriault2018-02-011-190/+344
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Change Hyperlinked lexer to know about DataKinds ticksOleg Grenrus2016-05-241-1/+11
|
* Extract main hyperlinker types to separate module.Łukasz Hanuszczak2015-07-061-36/+4
|
* Fix issue with operators being recognized as preprocessor directives.Łukasz Hanuszczak2015-07-021-3/+3
|
* Improve support for hyperlinking type families.Łukasz Hanuszczak2015-07-021-0/+1
|
* Add basic tests related to comment parsing.Łukasz Hanuszczak2015-06-301-1/+1
|
* Prevent source parser from throwing exception when lexing fails.Łukasz Hanuszczak2015-06-301-1/+3
|
* Add some documentation for parser module of source hyperlinker.Łukasz Hanuszczak2015-06-301-0/+39
|
* Add support for parsing C preprocessor macros.Łukasz Hanuszczak2015-06-301-4/+16
|
* Fix issues with escaped newlines in comments.Łukasz Hanuszczak2015-06-301-8/+5
|
* Fix bug with improper newline handling.Łukasz Hanuszczak2015-06-301-1/+1
|
* Fix parsing of single line comments with broken up newlines.Łukasz Hanuszczak2015-06-301-1/+11
|
* Fix weird hyperlinking of parenthesized operators.Łukasz Hanuszczak2015-06-301-0/+1
|
* Add support for recognizing compiler pragmas in source parser.Łukasz Hanuszczak2015-06-301-0/+2
|
* Fix comment recognition in Haskell source parser.Łukasz Hanuszczak2015-06-301-2/+3
|
* Fix identifier recognition in Haskell source parser.Łukasz Hanuszczak2015-06-301-2/+5
|
* Make parser module export all types and associated accessors.Łukasz Hanuszczak2015-06-301-3/+2
|
* Add record accessors to exports of hyperlinker parser module.Łukasz Hanuszczak2015-06-301-1/+6
|
* Adapt source span tagging to work with current whitespace handling.Łukasz Hanuszczak2015-06-301-4/+7
|