aboutsummaryrefslogtreecommitdiff
path: root/src/Main.hs
Commit message (Collapse)AuthorAgeFilesLines
* Implement overlapping type family instances.Richard Eisenberg2012-12-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Follow dopt->gopt renameIan Lynagh2012-10-161-1/+1
|
* Follow changes in GHCIan Lynagh2012-10-081-1/+1
|
* Merge branch 'master' of darcs.haskell.org:/srv/darcs//haddockIan Lynagh2012-07-191-11/+17
|\
| * Forward port changes from stable.Paolo Capriotti2012-07-191-11/+17
| |\
| | * Check qualification option before processing modules.David Waern2012-04-011-14/+13
| | |
| | * Merge http://code.haskell.org/~thielema/haddock/ into ghc-7.4David Waern2012-04-011-2/+7
| | |\
| | | * emit an error message when the --qual option is used incorrectlyHenning Thielemann2012-04-011-1/+5
| | | |
| | | * add QualOption type for distinction between qualification argument given by ↵Henning Thielemann2012-04-011-1/+2
| | | | | | | | | | | | | | | | | | | | the user and the actual qualification for a concrete module
| | * | Save/restore global state for static flags when running GHC actionsSimon Hengel2012-03-051-1/+3
| | |/ | | | | | | | | | | | | This is necessary if we want to run createInterfaces (from Documentation.Haddock) multiple times in the same process.
* | / Fix haddock following some GHC changesIan Lynagh2012-07-161-4/+4
|/ / | | | | | | | | Passing _|_ as the Settings for defaultDynFlags no longer works well enough
* / Follow changes in GHCIan Lynagh2012-06-121-31/+33
|/
* Allow doc comments to link to out-of-scope things (#78).David Waern2011-11-261-2/+5
| | | | (A bug that should have been fixed long ago.)
* Add flag --interface-version.David Waern2011-11-251-5/+4
|
* Fix build.David Waern2011-11-061-9/+15
|
* Merge branch 'master' of http://darcs.haskell.org/haddockDavid Waern2011-11-061-1/+3
|\
| * Merge branch 'master' of http://darcs.haskell.org/haddockDavid Waern2011-10-011-1/+3
| |\
| | * Follow changes to BinIface Name serializationMax Bolingbroke2011-09-271-1/+3
| | |
* | | Fix build.David Waern2011-11-051-6/+7
| | |
* | | Add --print-ghc-path.David Waern2011-10-271-13/+17
| | |
* | | Remove NEW_GHC_LAYOUT conditional.David Waern2011-10-231-4/+0
|/ /
* / Use printException instead of deprecated printExceptionAndWarningsDavid Waern2011-10-011-1/+1
|/
* Add git commits since switchover:David Waern2011-06-101-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | darcs format (followed by a conflict resolution): commit 6f92cdd12d1354dfbd80f8323ca333bea700896a Merge: f420cc4 28df3a1 Author: Simon Peyton Jones <simonpj@microsoft.com> Date: Thu May 19 17:54:34 2011 +0100 Merge remote branch 'origin/master' into ghc-generics commit 28df3a119f770fdfe85c687dd73d5f6712b8e7d0 Author: Max Bolingbroke <batterseapower@hotmail.com> Date: Sat May 14 22:37:02 2011 +0100 Unicode fix for getExecDir on Windows commit 89813e729be8bce26765b95419a171a7826f6d70 Merge: 6df3a04 797ab27 Author: Simon Peyton Jones <simonpj@microsoft.com> Date: Mon May 9 11:55:17 2011 +0100 Merge branch 'ghc-new-co' commit 6df3a040da3dbddee67c6e30a892f87e6b164383 Author: Ian Lynagh <igloo@earth.li> Date: Sun May 8 17:05:50 2011 +0100 Follow changes in SDoc commit f420cc48b9259f0b1afd2438b12f9a2bde57053d Author: Jose Pedro Magalhaes <jpm@cs.uu.nl> Date: Wed May 4 17:31:52 2011 +0200 Adapt haddock to the removal of HsNumTy and TypePat. commit 797ab27bdccf39c73ccad374fea265f124cb52ea Merge: 1d81436 5a91450 Author: Simon Peyton Jones <simonpj@microsoft.com> Date: Mon May 2 12:05:03 2011 +0100 Merge remote branch 'origin/master' into ghc-new-co commit 1d8143659a81cf9611668348e33fd0775c7ab1d2 Author: Simon Peyton Jones <simonpj@microsoft.com> Date: Mon May 2 12:03:46 2011 +0100 Wibbles for ghc-new-co branch commit 5a91450e2ea5a93c70bd3904b022445c9cc82488 Author: Ian Lynagh <igloo@earth.li> Date: Fri Apr 22 00:51:56 2011 +0100 Follow defaultDynFlags change in GHC
* Fix indentation problemDavid Waern2010-12-111-6/+6
|
* WibbleDavid Waern2010-12-061-0/+1
|
* Add a flag --pretty-html for rendering indented html with newlinesDavid Waern2010-12-061-3/+5
|
* Remove LANGUAGE ForeignFunctionInterface pragmasDavid Waern2010-11-161-1/+1
|
* Style wibblesDavid Waern2010-11-161-26/+26
|
* WibbleDavid Waern2010-11-151-1/+1
|
* Just say "internal error" instead of "internal Haddock or GHC error"David Waern2010-11-151-1/+1
|
* Match all AsyncExceptions in exception handlerDavid Waern2010-11-151-3/+10
|
* Remove more ghc < 7 codeDavid Waern2010-11-151-1/+0
|
* Remove code for ghc < 7David Waern2010-11-151-2/+0
|
* Follow extension-flattening change in GHCIan Lynagh2010-10-231-6/+1
|
* Style policeDavid Waern2010-10-161-1/+1
|
* adding the option to fully qualify identifiersTobias Brandt2010-08-271-1/+2
|
* Use flattenExtensionFlags with ghc >= 6.13 onlyDavid Waern2010-08-291-1/+7
|
* Follow flattenLanguageFlags -> flattenExtensionFlags renameIan Lynagh2010-07-241-1/+1
|
* Flatten the dynflags before parsingIan Lynagh2010-07-241-1/+1
|
* Naming wibblesDavid Waern2010-08-291-9/+9
|
* Add source entity path to --read-interfaceDavid Waern2010-08-291-32/+39
| | | | | | | | | | | | | You can now use this flag like this: --read-interface=<html path>,<source entity path>,<.haddock file> By "source entity path" I mean the same thing that is specified with the --source-entity flag. The purpose of this is to be able to specify the source entity path per package, to allow source links to work in the presence of cross-package documentation. When given two arguments or less the --read-interface flag behaves as before.
* Get rid of GhcModule and related cruftDavid Waern2010-08-261-0/+2
| | | | We can get everything we need directly from TypecheckedModule.
* Follow recent API additions with some refactoringsDavid Waern2010-08-261-46/+30
| | | | | Simon Hegel's patch prompted me to do some refactorings in Main, Haddock.Documentation and Haddock.Interface.
* Add createInterfaces' (a more high-level alternative to createInterfaces) to ↵Simon Hengel2010-08-081-25/+47
| | | | Haddock API
* excisting last vestiges of the --xhtml flagMark Lentczner2010-07-241-5/+1
|
* command like processing for theme selectionMark Lentczner2010-07-231-7/+8
| | | | | | | The bulk of the change is threadnig the selected theme set through functions in Xhtml.hs so that the selected themes can be used when generating the page output. There isn't much going on in most of these changes, just passing it along. The real work is all done in Themes.hs.
* remove --html-help support - it was old, out-of-date, and mostly missingMark Lentczner2010-07-221-7/+3
|
* remove old HTML backendMark Lentczner2010-07-221-12/+3
|
* Improve function nameDavid Waern2010-07-221-3/+3
|
* Fix a bug where we allowed --hoogle, --latex, etc without input filesDavid Waern2010-07-221-0/+15
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 05:27:42 +0000