summaryrefslogtreecommitdiff
path: root/libraries/template-haskell
Commit message (Collapse)AuthorAgeFilesLines
* Package keys (for linking/type equality) separated from package IDs.Edward Z. Yang2014-08-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch set makes us no longer assume that a package key is a human readable string, leaving Cabal free to "do whatever it wants" to allocate keys; we'll look up the PackageId in the database to display to the user. This also means we have a new level of qualifier decisions to make at the package level, and rewriting some Safe Haskell error reporting code to DTRT. Additionally, we adjust the build system to use a new ghc-cabal output Make variable PACKAGE_KEY to determine library names and other things, rather than concatenating PACKAGE/VERSION as before. Adds a new `-this-package-key` flag to subsume the old, erroneously named `-package-name` flag, and `-package-key` to select packages by package key. RFC: The md5 hashes are pretty tough on the eye, as far as the file system is concerned :( ToDo: safePkg01 test had its output updated, but the fix is not really right: the rest of the dependencies are truncated due to the fact the we're only grepping a single line, but ghc-pkg is wrapping its output. ToDo: In a later commit, update all submodules to stop using -package-name and use -this-package-key. For now, we don't do it to avoid submodule explosion. Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu> Test Plan: validate Reviewers: simonpj, simonmar, hvr, austin Subscribers: simonmar, relrod, carter Differential Revision: https://phabricator.haskell.org/D80
* Simplify .gitignore filesHerbert Valerio Riedel2014-06-281-2/+16
| | | | | | | | | It's a bit confusing to have .gitignore files spread all over the filesystem. This commit tries to consolidate those into one .gitignore file per component. Moreover, we try to describe files to be ignored which happen to have a common identifying pattern by glob patterns. Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
* Whitespace onlyGabor Greif2014-06-281-61/+61
|
* Typos in commentsGabor Greif2014-06-191-1/+1
|
* Refine deprecation warnings in template-haskell.Richard Eisenberg2014-06-111-2/+2
|
* Add .gitignore for autogenerated test files.Edward Z. Yang2014-05-291-0/+2
| | | | | | | | I used this shell command to automatically generate the lists: for i in `git ls-files -o --exclude-standard --directory`; do echo "`basename $i`" >> "`dirname "$i"`/.gitignore"; done Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
* Provide deprecated backward compatible implementation to 'equalP'Gabor Greif2014-05-192-1/+10
|
* Re-add 'classP' with a compatible implementation and a deprecation noticeGabor Greif2014-05-192-1/+8
|
* Drop `template-haskell`'s build-dep on `containers`Herbert Valerio Riedel2014-04-253-3/+113
| | | | | | | | | | | | | | | | | | | This is an attempt to address https://github.com/haskell/cabal/issues/1811 by replicating the less than 100 lines of code actually used from the containers package into an internal non-exposed `template-haskell` module. Moreover, `template-haskell` does not expose the `Map` type, so this change should have no visible effect on the public API. It may turn out that `Data.Map` is not necessary and that even a simple list-based associative list (`Prelude.lookup`) may suffice. However, in order to avoid any regressions, this commit takes the safe route and just clones `Data.Map` for now. Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
* Update Cabal source-repository entries (re #8545)Herbert Valerio Riedel2014-04-191-6/+2
| | | | | | | | This adapts the source-repository entries to match the new situation of base.git, ghc-prim.git, integer-gmp.git, integer-simple.git, and template-haskell.git being folded into ghc.git Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
* Bump to 2.10.0.0Herbert Valerio Riedel2014-03-231-3/+3
| | | | | | Due to backward-incompat changes in 57b662c (re #7021) Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
* Add documentation to why Pred has become a type synonym.Richard Eisenberg2014-02-091-0/+3
|
* Change type of equalityT to be more parallel with others.Richard Eisenberg2014-02-091-7/+2
|
* Make Pred a type synonym of Type (issue #7021)YoEight2014-02-094-49/+37
| | | | | | In order to make any type as a Predicate in Template Haskell, as allowed by ConstraintKinds Signed-off-by: Richard Eisenberg <eir@cis.upenn.edu>
* Deprecate TH.global (Trac #8656)Simon Peyton Jones2014-01-091-0/+2
|
* Improve mkName, so that it correctly parses the name ^..Simon Peyton Jones2013-12-301-4/+20
| | | | This fixes Trac #8633; thanks to aavogt for a first draft.
* Kill trailing whitespacesJan Stolarek2013-12-281-18/+18
|
* Use type synonymJan Stolarek2013-12-281-1/+1
|
* Use addDependentFile in quoteFile.Austin Seipp2013-11-031-1/+2
| | | | | | | We'd expect recompilation if these files change. Authored-by: Adam Vogt <vogt.adam@gmail.com> Signed-off-by: Austin Seipp <austin@well-typed.com>
* Allow module reification (#1480)Austin Seipp2013-11-014-4/+38
| | | | | Authored-by: Gergely Risko <gergely@risko.hu> Signed-off-by: Austin Seipp <austin@well-typed.com>
* Refactor & modernize `.cabal` to `cabal-version>=1.10`Herbert Valerio Riedel2013-10-241-23/+47
| | | | | | | | | | | | Updates the `description` include a link to the Haskell wiki and list potantially used extensions in `other-extensions`. This also sets proper `build-depends` which effectively tie `template-haskell` to GHC 7.7/7.8 and thus should help keep `cabal-install` from attempting to compile the `template-haskell` package with older/newer GHCs. Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
* Declare all language extensions via `{-# LANGUAGE #-}`Herbert Valerio Riedel2013-10-242-2/+2
| | | | | | Only a few were missing in the `{-# LANGUAGE #-}` annotations. Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
* Make TExp's argument have nominal role (Trac #8459)Simon Peyton Jones2013-10-221-1/+15
|
* Add reifyAnnotations (#8397)Austin Seipp2013-10-112-3/+20
| | | | Signed-off-by: Austin Seipp <austin@well-typed.com>
* Add Template Haskell state.Geoffrey Mainland2013-10-041-0/+16
| | | | | | The Quasi monad can now carry state, and this state can be shared amongst quasiquoters/splices/etc. State is stored in a finite map of Dynamic values and is indexed by TypeReps.
* Add support for top-level finalizersGeoffrey Mainland2013-10-041-0/+9
|
* Correctly pretty-print let and do expressions.Geoffrey Mainland2013-10-041-3/+13
|
* Add the TExpQ type alias.Geoffrey Mainland2013-10-041-0/+1
|
* Make a TExp a wrap a TH.Exp instead of a TH.ExpQ.Geoffrey Mainland2013-10-041-1/+9
| | | | | | | | We also provide two new helper functions: unTypeQ :: Q (TExp a) -> Q Exp unsafeTExpCoerce :: Q Exp -> Q (TExp a)
* Add a method to the Quasi type class that adds new top-level declarations.Geoffrey Mainland2013-10-041-0/+9
|
* Add TExp data type.Geoffrey Mainland2013-10-042-0/+11
|
* Add TH support for annotations (#8340)Austin Seipp2013-10-014-2/+19
| | | | | Authored-by: Gergely Risko <gergely@risko.hu> Signed-off-by: Austin Seipp <austin@well-typed.com>
* Follow changes in comparison primops (see #6135)Jan Stolarek2013-09-181-9/+8
|
* Trailing whitespacesJan Stolarek2013-09-181-71/+71
|
* Support new role annotation syntax.Richard Eisenberg2013-09-174-24/+42
| | | | | | | This reverts the change to TyVarBndr (which now has only two constructors, PlainTV and KindedTV) and adds a new Dec, RoleAnnotD. There is also an updated definition for the type Role, to allow for wildcard annotations.
* Update Git repo URL in `.cabal` fileHerbert Valerio Riedel2013-09-111-1/+1
|
* Fix AMP warningsDavid Luposchainsky2013-09-081-1/+9
| | | | Signed-off-by: Austin Seipp <aseipp@pobox.com>
* Improve pretty printing for Template Haskell operatorsSimon Peyton Jones2013-08-291-4/+21
| | | | | | Fixes Trac #8187, #8188. Thanks to Yoshikuni Jujo for pointing this out and doing the first draft.
* Fix GHC Trac #8186.Richard Eisenberg2013-08-271-1/+1
| | | | Make parS in TH.Lib work.
* Implement roles into Template Haskell.Richard Eisenberg2013-08-024-1/+31
| | | | | The biggest change is to the TyVarBndr type, which now can deal with role annotations.
* Remove some redundant warning suppressionIan Lynagh2013-07-281-6/+0
|
* Update export list for closed type familiesRichard Eisenberg2013-07-021-0/+1
|
* Update to support closed type families.Richard Eisenberg2013-06-213-19/+34
|
* Fix typoGabor Greif2013-03-201-1/+1
|
* Add "deprecated in" comments to deprecated pragmasIan Lynagh2013-02-191-1/+1
|
* some more typosGabor Greif2013-02-022-2/+2
|
* Implement overlapping type family instances.Richard Eisenberg2012-12-214-9/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Bump base lower version to 4.5 (the version GHC 7.4.1 came with)Ian Lynagh2012-11-301-1/+1
|
* Bump version number following new policyIan Lynagh2012-11-301-1/+1
| | | | | We now keep the HEAD version numbers as values which would be suitable for immediate release.
* Add comment to .cabal file saying what GHC 7.6.1 shipped withIan Lynagh2012-11-301-0/+1
|