aboutsummaryrefslogtreecommitdiff
path: root/src/Haddock/Backends/Hoogle.hs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ghc-7.6' into ghc-7.6-merge-2Kazu Yamamoto2013-02-011-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * 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-10/+9
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+19
|\|
| * Attach warnings to `Documentation` typeSimon Hengel2012-05-171-1/+1
| |
| * newtype-wrap Doc nodes for things that may have warnings attachedSimon Hengel2012-05-171-7/+11
| |
| * Mostly hlint-inspired cleanup.David Waern2012-02-041-2/+2
| |
| * Add DocWarning to DocSimon Hengel2012-02-041-0/+1
| | | | | | | | | | The Xhtml backend has special markup for that, Hoogle and LaTeX reuse what we have for DocEmphasis.
* | Follow changes in GHCIan Lynagh2012-06-121-54/+57
| |
* | Follow changes in LHsTyVarBndrsSimon Peyton Jones2012-05-251-1/+1
| |
* | Follow changes to LHsTyVarBndrsSimon Peyton Jones2012-05-111-3/+4
| |
* | Follow refactoring of TyClDecl/HsTyDefnSimon Peyton Jones2012-03-261-8/+11
| |
* | Follow rename of Instance to ClsInst in GHCIan Lynagh2012-01-031-1/+1
|/
* Allow doc comments to link to out-of-scope things (#78).David Waern2011-11-261-16/+17
| | | | (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-1/+1
| | | | | | | | | | | 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.
* Follow changes to ForeignImport/ForeignExport in GHCIan Lynagh2011-10-011-2/+2
|
* Adapt Haddock for the ConstraintKind extension changesMax Bolingbroke2011-09-061-2/+2
|
* * Merge in git patch from Michal TerepetaDavid Waern2011-06-111-3/+4
| | | | | | | | | | | | | | | | From 6fc71d067738ef4b7de159327bb6dc3d0596be29 Mon Sep 17 00:00:00 2001 From: Michal Terepeta <michal.terepeta@gmail.com> Date: Sat, 14 May 2011 19:18:22 +0200 Subject: [PATCH] Follow the change of TypeSig in GHC. This follows the change in GHC to make TypeSig take a list of names (instead of just one); GHC ticket #1595. This should also improve the Haddock output in case the user writes a type signature that refers to many names: -- | Some comment.. foo, bar :: ... will now generate the expected output with one signature for both names.
* Write hoogle output in utf8; fixes GHC build on WindowsIan Lynagh2011-01-051-3/+5
|
* hlint policeDavid Waern2010-11-161-3/+2
|
* Position the module header the same way everywhereDavid Waern2010-05-131-1/+0
| | | | Silly, but nice with some consistency :-)
* Add markup support for interactive examplessimon.hengel2010-04-021-1/+2
|
* Fix build with GHC 6.12.1david.waern2010-03-181-5/+2
|
* Track changes in HsTyVarBndrsimonpj2010-02-101-2/+2
|
* Rename HsDoc back into DocDavid Waern2009-11-281-4/+4
|
* Backends.Hoogle: eliminate warningsIsaac Dupree2009-08-231-4/+0
|
* re-implement function-argument docsIsaac Dupree2009-08-231-5/+7
| | | | | | | ..on top of the lexParseRn work. This patch doesn't change the InstalledInterface format, and thus, it does not work cross-package, but that will be easy to add subsequently.
* less big-Map-based proper extraction of constructor subdocsIsaac Dupree2009-08-231-8/+12
|
* Fix unused import warningsIan Lynagh2009-07-071-1/+0
|
* Add Haddock module headersDavid Waern2009-06-241-4/+9
| | | | | | | | | Add a proper Haddock module header to each module, with a more finegrained copyright. If you feel mis-accreditted, please correct any copyright notice! The maintainer field is set to haddock@projects.haskell.org. Next step is to add a brief description to each module.
* Move H.GHC.Utils to H.GhcUtilsDavid Waern2009-04-051-1/+1
|
* -Wall police in H.B.HoogleDavid Waern2009-03-271-12/+20
|
* Add verbosity flag and utils, remove "verbose" flagDavid Waern2008-12-071-1/+1
|
* Make forall's in constructors explicit, i.e. data Foo = Foo {foo :: Eq a => a}Neil Mitchell2008-12-151-2/+8
|
* Drop HsDocTy annotations, they mess up pretty printing and also have a ↵Neil Mitchell2008-11-271-9/+29
| | | | bracketing bug (#2584)
* Fix #61David Waern2008-10-161-1/+1
| | | | | | | | | | | | | | | | | | | We were not getting docs for re-exported class methods. This was because we were looking up the docs in a map made from the declarations in the current module being rendered. Obviously, re-exported class methods come from another module. Class methods and ATs were the only thing we were looking up using the doc map, everything else we found in the ExporItems. So now I've put subordinate docs in the ExportItem's directly, to make things a bit more consistent. To do this, I added subordinates to the the declarations in the declaration map. This was easy since we were computing subordinates anyway, to store stand-alone in the map. I added a new type synonym 'DeclInfo', which is what we call what is now stored in the map. This little refactoring removes duplicate code to retrieve subordinates and documentation from the HsGroup.
* Add support for DocPicDavid Waern2008-10-101-0/+1
| | | | | | The support for DocPic was merged into the GHC source long ago, but the support in Haddock was forgotten. Thanks Peter Gavin for submitting this fix!
* Do not wrap __ in bracketsNeil Mitchell2008-09-111-1/+1
|
* In the hoogle back end, markup definition lists using <i>, not <b>Neil Mitchell2008-08-211-1/+1
|
* Simplify the code by removing not-to-important use of <.> in the Hoogle back endNeil Mitchell2008-08-201-5/+1
|
* Remove Explicit top-level forall's when pretty-printing signaturesNeil Mitchell2008-08-181-1/+5
|
* Use the same method to put out signatures as class methods in the Hoogle backendNeil Mitchell2008-08-181-1/+1
|
* Make Hoogle add documentation to a packageNeil Mitchell2008-08-131-2/+3
|
* Generalise Hoogle.doc and add a docWithNeil Mitchell2008-08-131-5/+11
|
* Add support for type synonyms to Hoogle, was accidentally missing before ↵Neil Mitchell2008-08-121-0/+5
| | | | (woops!)
* Output all items, even if they are not defined in this module - ensures map ↵Neil Mitchell2008-08-121-8/+1
| | | | comes from Prelude, not just GHC.Base
* Hide <.> from GHC import in Hoogle only for ghc <= 6.8.3David Waern2008-08-121-0/+4
|
* Move reL to H.GHC.Utils so we can use it everywhereDavid Waern2008-08-031-2/+0
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 11:48:56 +0000