aboutsummaryrefslogtreecommitdiff
path: root/src/Haddock/Interface/Rename.hs
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Propagate overloading-mode for instance declarations in haddock (#9242)"Mateusz Kowalczyk2014-08-141-6/+2
| | | | This reverts commit 8d20ca8d5a9bee73252ff2035ec45f9c03d0820c.
* Revert "Adapt to new definition of HsDecls.TyFamEqn"Mateusz Kowalczyk2014-08-141-17/+7
| | | | This reverts commit cb96b4f1ed0462b4a394b9fda6612c3bea9886bd.
* Adapt to new definition of HsDecls.TyFamEqnSimon Peyton Jones2014-07-141-7/+17
| | | | | This is a knock-on from the refactoring from Trac #9063. I'll push the corresponding changes to GHC shortly.
* Propagate overloading-mode for instance declarations in haddock (#9242)Iavor S. Diatchki2014-07-011-2/+6
|
* Display minimal complete definitions for type classesNiklas Haas2014-03-131-0/+1
| | | | | | | | | This corresponds to the new {-# MINIMAL #-} pragma present in GHC 7.8+. I also cleaned up some of the places in which ExportDecl is used to make adding fields easier in the future. Lots of test cases have been updated since they now render with minimality information.
* Hide RHS of TFs with non-exported right hand sidesNiklas Haas2014-03-131-1/+1
| | | | | | Not sure what to do about data families yet, since technically it would not make a lot of sense to display constructors that cannot be used by the user.
* Differentiate between TH splices (line-links) and regular namesNiklas Haas2014-03-091-2/+2
| | | | | | | | | | | | | | | | | This adds a new type of source code link, to a specific line rather than a specific declaration/name - this is used to link to the location of a TH splice that defines a certain name. Rather hefty changes throughout and still one unresolved issue (the line URLs aren't parsed from the third form of --read-interface which means they're currently restricted to same-interface links). Not sure if this issue is really worth all the hassle, especially since we could just use line links in general. This commit also contains some cleanup/clarification of the types in Haddock.Backends.Xhtml.Decl and shortens some overlong lines in the process. Notably, the Bool parameter was replaced by a Unicode type synonym to help clarify its presence in type signatures.
* Render fixity informationNiklas Haas2014-03-081-2/+8
| | | | | | Affects functions, type synonyms, type families, class names, data type names, constructors, data families, associated TFs/DFs, type synonyms, pattern synonyms and everything else I could think of.
* Improve display of poly-kinded type operatorsnand2014-02-111-2/+3
| | | | | | | This now displays them as (==) k a b c ... to mirror GHC's behavior, instead of the old (k == a) b c ... which was just wrong. Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
* Add support for type/data familiesnand2014-02-111-3/+6
| | | | | | | | This adds support for type/data families with their respective instances, as well as closed type families and associated type/data families. Signed-off-by: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
* Support for -XPatternSynonymsDr. ERDI Gergo2014-01-191-0/+9
| | | | Signed-off-by: Austin Seipp <austin@well-typed.com>
* Support for bold.Mateusz Kowalczyk2014-01-121-2/+2
| | | | | | | Conflicts: src/Haddock/Backends/Hoogle.hs src/Haddock/Interface/Rename.hs src/Haddock/Parser.hs
* Some code simplification by using traverseSimon Hengel2014-01-121-50/+5
|
* Track changes in HsSpliceTy data constructorSimon Peyton Jones2013-11-251-1/+1
|
* Revision to reflect new role annotation syntax in GHC.Richard Eisenberg2013-09-171-5/+6
|
* Changes to reflect changes in GHC's type HsTyVarBndrRichard Eisenberg2013-08-021-6/+5
|
* Updates to reflect changes in HsDecls to support closed type families.Richard Eisenberg2013-06-211-6/+13
|
* Merge branch 'ghc-7.6' into ghc-7.6-merge-2Kazu Yamamoto2013-02-011-26/+37
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: haddock.cabal src/Haddock/Interface/AttachInstances.hs src/Haddock/Interface/Create.hs src/Haddock/Interface/LexParseRn.hs src/Haddock/InterfaceFile.hs src/Haddock/Types.hs Only GHC HEAD can compile this. GHC 7.6.x cannot compile this. Some test fail.
| * Handle more cases in renameTypeSimon Hengel2012-10-141-14/+19
| |
| * Simplify lookupRnSimon Hengel2012-10-141-7/+7
| |
| * Simplify RnM typeSimon Hengel2012-10-141-10/+9
| |
| * Better error messagesSimon Hengel2012-10-131-2/+6
| |
| * Handle HsExplicitListTy in renameer (fixes #213)Simon Hengel2012-10-131-0/+2
| |
| * Add markup support for propertiesKazu Yamamoto2012-10-091-0/+1
| |
| * Merge branch 'dev' of https://github.com/sol/haddock into ghc-7.6David Waern2012-07-231-1/+1
| |\ | | | | | | | | | | | | Conflicts: src/Haddock/InterfaceFile.hs
| | * Add an optional label to URLsSimon Hengel2012-05-271-1/+1
| | |
* | | Implement overlapping type family instances.Richard Eisenberg2012-12-211-37/+65
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An ordered, overlapping type family instance is introduced by 'type instance where', followed by equations. See the new section in the user manual (7.7.2.2) for details. The canonical example is Boolean equality at the type level: type family Equals (a :: k) (b :: k) :: Bool type instance where Equals a a = True Equals a b = False A branched family instance, such as this one, checks its equations in order and applies only the first the matches. As explained in the note [Instance checking within groups] in FamInstEnv.lhs, we must be careful not to simplify, say, (Equals Int b) to False, because b might later unify with Int. This commit includes all of the commits on the overlapping-tyfams branch. SPJ requested that I combine all my commits over the past several months into one monolithic commit. The following GHC repos are affected: ghc, testsuite, utils/haddock, libraries/template-haskell, and libraries/dph. Here are some details for the interested: - The definition of CoAxiom has been moved from TyCon.lhs to a new file CoAxiom.lhs. I made this decision because of the number of definitions necessary to support BranchList. - BranchList is a GADT whose type tracks whether it is a singleton list or not-necessarily-a-singleton-list. The reason I introduced this type is to increase static checking of places where GHC code assumes that a FamInst or CoAxiom is indeed a singleton. This assumption takes place roughly 10 times throughout the code. I was worried that a future change to GHC would invalidate the assumption, and GHC might subtly fail to do the right thing. By explicitly labeling CoAxioms and FamInsts as being Unbranched (singleton) or Branched (not-necessarily-singleton), we make this assumption explicit and checkable. Furthermore, to enforce the accuracy of this label, the list of branches of a CoAxiom or FamInst is stored using a BranchList, whose constructors constrain its type index appropriately. I think that the decision to use BranchList is probably the most controversial decision I made from a code design point of view. Although I provide conversions to/from ordinary lists, it is more efficient to use the brList... functions provided in CoAxiom than always to convert. The use of these functions does not wander far from the core CoAxiom/FamInst logic. BranchLists are motivated and explained in the note [Branched axioms] in CoAxiom.lhs. - The CoAxiom type has changed significantly. You can see the new type in CoAxiom.lhs. It uses a CoAxBranch type to track branches of the CoAxiom. Correspondingly various functions producing and consuming CoAxioms had to change, including the binary layout of interface files. - To get branched axioms to work correctly, it is important to have a notion of type "apartness": two types are apart if they cannot unify, and no substitution of variables can ever get them to unify, even after type family simplification. (This is different than the normal failure to unify because of the type family bit.) This notion in encoded in tcApartTys, in Unify.lhs. Because apartness is finer-grained than unification, the tcUnifyTys now calls tcApartTys. - CoreLinting axioms has been updated, both to reflect the new form of CoAxiom and to enforce the apartness rules of branch application. The formalization of the new rules is in docs/core-spec/core-spec.pdf. - The FamInst type (in types/FamInstEnv.lhs) has changed significantly, paralleling the changes to CoAxiom. Of course, this forced minor changes in many files. - There are several new Notes in FamInstEnv.lhs, including one discussing confluent overlap and why we're not doing it. - lookupFamInstEnv, lookupFamInstEnvConflicts, and lookup_fam_inst_env' (the function that actually does the work) have all been more-or-less completely rewritten. There is a Note [lookup_fam_inst_env' implementation] describing the implementation. One of the changes that affects other files is to change the type of matches from a pair of (FamInst, [Type]) to a new datatype (which now includes the index of the matching branch). This seemed a better design. - The TySynInstD constructor in Template Haskell was updated to use the new datatype TySynEqn. I also bumped the TH version number, requiring changes to DPH cabal files. (That's why the DPH repo has an overlapping-tyfams branch.) - As SPJ requested, I refactored some of the code in HsDecls: * splitting up TyDecl into SynDecl and DataDecl, correspondingly changing HsTyDefn to HsDataDefn (with only one constructor) * splitting FamInstD into TyFamInstD and DataFamInstD and splitting FamInstDecl into DataFamInstDecl and TyFamInstDecl * making the ClsInstD take a ClsInstDecl, for parallelism with InstDecl's other constructors * changing constructor TyFamily into FamDecl * creating a FamilyDecl type that stores the details for a family declaration; this is useful because FamilyDecls can appear in classes but other decls cannot * restricting the associated types and associated type defaults for a * class to be the new, more restrictive types * splitting cid_fam_insts into cid_tyfam_insts and cid_datafam_insts, according to the new types * perhaps one or two more that I'm overlooking None of these changes has far-reaching implications. - The user manual, section 7.7.2.2, is updated to describe the new type family instances.
* | Forward port changes from stable.Paolo Capriotti2012-07-191-14/+24
|\|
| * Add Applicative instance for (GenRnM a)Simon Hengel2012-05-261-2/+6
| |
| * Attach warnings to `Documentation` typeSimon Hengel2012-05-171-1/+2
| |
| * newtype-wrap Doc nodes for things that may have warnings attachedSimon Hengel2012-05-171-8/+6
| |
| * Mostly hlint-inspired cleanup.David Waern2012-02-041-8/+12
| |
| * Add DocWarning to DocSimon Hengel2012-02-041-0/+3
| | | | | | | | | | The Xhtml backend has special markup for that, Hoogle and LaTeX reuse what we have for DocEmphasis.
* | Follow changes for the implementation of implicit parametersSimon Peyton Jones2012-06-131-2/+1
| |
* | Follow changes in GHCIan Lynagh2012-06-121-3/+3
| |
* | Follow changes in LHsTyVarBndrsSimon Peyton Jones2012-05-251-3/+4
| |
* | Follow changes to LHsTyVarBndrsSimon Peyton Jones2012-05-111-14/+19
| |
* | Track changes in HsSynSimon Peyton Jones2012-04-201-7/+12
| |
* | Merge branch 'master' of http://darcs.haskell.org//haddockSimon Peyton Jones2012-03-261-0/+2
|\ \
| * | Add a missing case for type literals.Iavor S. Diatchki2012-03-191-0/+2
| | |
* | | Follow refactoring of TyClDecl/HsTyDefnSimon Peyton Jones2012-03-261-35/+45
|/ /
* | Follow changes to tcdKindSig (Trac #5937)Simon Peyton Jones2012-03-161-6/+9
| |
* | Follow changes in data representation from the big PolyKinds commitSimon Peyton Jones2012-03-021-7/+9
| |
* | Follow changes in GHCIan Lynagh2012-02-221-2/+2
| |
* | Follow changes in GHC caused by the CAPI CTYPE pragmaIan Lynagh2012-02-161-4/+4
| |
* | Track changes in HsDeclsSimon Peyton Jones2012-02-061-2/+5
|/
* Go back to having a doc, sub and decl map instead of one big decl map.David Waern2011-12-271-13/+6
| | | | | | | | | This setup makes more sense since when we add value bindings to the processed declarations (for type inference), we will have multiple declarations which should share documentation. Also, we already have a separate doc map for instances which we can now merge into the main doc map. Another benefit is that we don't need the DeclInfo type any longer.
* Allow doc comments to link to out-of-scope things (#78).David Waern2011-11-261-0/+1
| | | | (A bug that should have been fixed long ago.)
* Give preference to type over data constructors for doc comment links at ↵David Waern2011-11-261-6/+4
| | | | | | | | | | | renaming time. Previously this was done in the backends. Also, warn when a doc comment refers to something that is in scope but which we don't have the .haddock file for. These changes mean we can make DocIdentifier [a] into DocIdentifier a.
* New kind-polymorphic coreJose Pedro Magalhaes2011-11-111-7/+20
| | | | | | | | | This big patch implements a kind-polymorphic core for GHC. The current implementation focuses on making sure that all kind-monomorphic programs still work in the new core; it is not yet guaranteed that kind-polymorphic programs (using the new -XPolyKinds flag) will work. For more information, see http://haskell.org/haskellwiki/GHC/Kinds
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 19:18:00 +0000