aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Implement overlapping type family instances.Richard Eisenberg2012-12-2111-168/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Track changes in UNPACK pragma stuffSimon Peyton Jones2012-12-191-7/+13
|
* Follow changes in GHC: 'flags' has been renamed 'generalFlags'Ian Lynagh2012-10-182-3/+3
|
* Follow dopt->gopt renameIan Lynagh2012-10-161-1/+1
|
* Follow changes in GHCIan Lynagh2012-10-081-1/+1
|
* Follow data type changes in the tc-untouchables branchSimon Peyton Jones2012-09-201-6/+3
| | | | Relating entirely to SynTyConRhs
* Remove some temporary pragmas I accidentally recordedIan Lynagh2012-08-143-3/+0
|
* Improve haddock memory usageIan Lynagh2012-08-134-51/+68
|
* Follow changes in GHCIan Lynagh2012-08-071-1/+2
|
* Build with GHC 7.7Ian Lynagh2012-07-201-0/+4
|
* Merge branch 'master' of darcs.haskell.org:/srv/darcs//haddockIan Lynagh2012-07-1919-386/+531
|\
| * Forward port changes from stable.Paolo Capriotti2012-07-1919-386/+531
| |\
| | * Use a map for warnings, as suggested by @waernSimon Hengel2012-05-261-23/+20
| | |
| | * Add Applicative instance for (GenRnM a)Simon Hengel2012-05-261-2/+6
| | |
| | * Simplify lookupWarningSimon Hengel2012-05-171-6/+8
| | |
| | * Attach warnings to `Documentation` typeSimon Hengel2012-05-178-53/+56
| | |
| | * newtype-wrap Doc nodes for things that may have warnings attachedSimon Hengel2012-05-178-85/+89
| | |
| | * Use >>= instead of fmap and joinSimon Hengel2012-05-172-7/+4
| | |
| | * Merge http://code.haskell.org/~thielema/haddock/ into ghc-7.4David Waern2012-05-165-27/+48
| | |\
| | | * qualification style 'abbreviated' -> 'aliased'Henning Thielemann2012-04-025-22/+22
| | | |
| | | * Merge branch 'ghc-7.4' of http://darcs.haskell.org/haddock into ghc-7.4Henning Thielemann2012-04-021-15/+16
| | | |\
| | | * | abbreviated qualification: use Packages.lookupModuleInAllPackages for ↵Henning Thielemann2012-04-023-12/+33
| | | | | | | | | | | | | | | | | | | | finding the package that a module belongs to
| | * | | Merge branch 'ghc-7.4' of http://darcs.haskell.org/haddock into ghc-7.4David Waern2012-05-152-5/+6
| | |\ \ \
| | | * | | Fix reporting of modules safe haskell mode (#5989)David Terei2012-04-062-5/+6
| | | | |/ | | | |/|
| | * | | Merge http://code.haskell.org/~thielema/haddock/ into ghc-7.4David Waern2012-04-025-28/+67
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * 'abbreviate' qualification style - basic supportHenning Thielemann2012-04-015-28/+67
| | | | | | | | | | | | | | | | | | | | Currently we ignore the package a module is imported from. This means that a module import would shadow another one with the same module name from a different package.
| | | * Merge branch 'ghc-7.4' of http://darcs.haskell.org/haddock into ghc-7.4Henning Thielemann2012-04-011-1/+2
| | | |\
| | * | | 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-015-27/+49
| | |\| |
| | | * | emit an error message when the --qual option is used incorrectlyHenning Thielemann2012-04-012-6/+13
| | | | |
| | | * | add QualOption type for distinction between qualification argument given by ↵Henning Thielemann2012-04-015-26/+41
| | | | | | | | | | | | | | | | | | | | | | | | | the user and the actual qualification for a concrete module
| | * | | Merge branch 'dev' of https://github.com/sol/haddock into ghc-7.4David Waern2012-04-011-1/+3
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | 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.
| | * | | Don't crash on unicode strings in doc comments.David Waern2012-04-011-1/+2
| | | |/ | | |/|
| | * | Fix crash when using --qual. Naughty GHC API!David Waern2012-04-011-1/+4
| | | |
| | * | Don't filter out unexported names from the four maps - fixes a regression.David Waern2012-04-011-5/+4
| | | |
| | * | Cleanup.David Waern2012-04-011-12/+1
| | | |
| | * | Take reader environment directly from TypecheckedSource.David Waern2012-04-011-3/+11
| | |/
| | * Mostly hlint-inspired cleanup.David Waern2012-02-0410-88/+86
| | |
| | * Clean up some code from last SoC project.David Waern2012-02-043-76/+78
| | |
| | * Remove code for older ghc versions.David Waern2012-02-041-4/+0
| | |
| | * Use <> instead of mappend.David Waern2012-02-041-3/+3
| | |
| | * Style police.David Waern2012-02-041-2/+2
| | |
| | * Merge branch 'fix-for-186' of https://github.com/sol/haddock into ghc-7.4David Waern2012-02-043-11/+11
| | |\
| | | * Make sure that generated xhtml is valid (close #186)Simon Hengel2012-01-123-11/+11
| | | | | | | | | | | | | | | | Thanks to Phyx.
| | * | Some cleanup and make sure we filter warnings through exports.David Waern2012-02-041-33/+47
| | | |
| | * | Fix issues in support for warnings.David Waern2012-02-041-24/+9
| | | | | | | | | | | | | | | | | | | | * Match against local names only. * Simplify (it's OK to map over the warnings).
| | * | Remove obsolete TODOSimon Hengel2012-02-041-1/+0
| | | |
| | * | Expand type signatures for modules without explicit export listSimon Hengel2012-02-041-1/+14
| | | |
| | * | Expand type signatures in export list (fixes #192)Simon Hengel2012-02-041-14/+5
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 14:46:17 +0000