summaryrefslogtreecommitdiff
path: root/utils
Commit message (Collapse)AuthorAgeFilesLines
* haddock: update submodule to fix #10206Austin Seipp2015-05-111-0/+0
| | | | Signed-off-by: Austin Seipp <austin@well-typed.com>
* Permit empty closed type familiesAdam Gundry2015-05-041-0/+0
| | | | | | | | | | | | | | | | | | | Fixes #9840 and #10306, and includes an alternative resolution to #8028. This permits empty closed type families, and documents them in the user guide. It updates the Haddock submodule to support the API change. Test Plan: Added `indexed-types/should_compile/T9840` and updated `indexed-types/should_fail/ClosedFam4` and `th/T8028`. Reviewers: austin, simonpj, goldfire Reviewed By: goldfire Subscribers: bgamari, jstolarek, thomie, goldfire Differential Revision: https://phabricator.haskell.org/D841 GHC Trac Issues: #9840, #10306
* Update haddock submodule to track TyCon changeSimon Peyton Jones2015-05-011-0/+0
|
* Typos in error messages and in commentsGabor Greif2015-04-103-3/+3
|
* Update hsc2hs submoduleReid Barton2015-04-051-0/+0
|
* Comments only, mostly typosThomas Miedema2015-04-031-1/+3
| | | | [skip ci]
* Drop old integer-gmp-0.5 from GHC source treeHerbert Valerio Riedel2015-03-311-4/+0
| | | | | | | | | | | | | | | | | | This completes what c774b28f76ee4c220f7c1c9fd81585e0e3af0e8a (#9281) started. `integer-gmp-1.0` was added as an additional `libraries/integer-gmp2` folder while retaining the ability to configure GHC w/ the old `integer-gmp-0.5` to have a way back, and or the ability to easily switch between old/new `integer-gmp` for benchmark/debugging purposes. This commit removes the old `libraries/integer-gmp` folder and moves `libraries/integer-gmp2` into its place, while removing any mentions of "gmp2" as well as the to support two different `integer-gmp` packages in GHC's source-tree. Reviewed By: austin Differential Revision: https://phabricator.haskell.org/D769
* Update list of primops that don't get wrappers (#10191)Reid Barton2015-03-271-6/+4
| | | | | | | | | | | | | | | | | | | Summary: The list was 14 years old, and there don't seem to be any problems with seq# or par#; the other par*# primops were not actually implemented at all and were removed in D758. Test Plan: validate; will also try to locally validate an unregisterised build in case there was some truth to the deleted comment Reviewers: austin Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D759 GHC Trac Issues: #10191
* Minor bump `base` version to 4.8.1.0Herbert Valerio Riedel2015-03-231-1/+7
| | | | | We've accumulated enough to justify a minor version bump to 4.8.1.0, but not enough to justify a major version bump yet as far as I can see.
* hpc: use System.FilePath.(</>) instead of (++)Thomas Miedema2015-03-174-6/+10
| | | | | | | | | | | | | | | | Summary: BAD: "." ++ "/" ++ "/absolute/path" == ".//absolute/path" GOOD: "." </> "/absolute/path" == "/absolute path" Also replace `++ ".ext"` with `<.> "ext"`. Although it doesn't fix any bugs in this instance, it might in some other. As a general rule it's better not to use (++) on FilePaths. Reviewed By: austin, hvr Differential Revision: https://phabricator.haskell.org/D703 GHC Trac Issues: #10138
* Update Haddock submoduleHerbert Valerio Riedel2015-03-151-0/+0
| | | | | | This pulls in a cherry-picked commit adding support for the new `--package-name` and `--package-version` flags and thus helps addressing #10115.
* Update filepath submodule to filepath-1.4 snapshotHerbert Valerio Riedel2015-03-112-1/+1
| | | | | | This also needs to update a couple of other submodules to update the upper bound on filepath to allow this major version bump to 1.4.0.0
* Update Cabal submodule to latest 1.22 snapshotEdward Z. Yang2015-03-111-0/+3
| | | | | | | | | | | | | | | This changes the library file name format NOTE: This patch originally updated to Cabal HEAD, but was reduced to update to Cabal 1.22 HEAD by hvr as this is needed in order to update the filepath submodule to version 1.4.0, and subsequently to be cherry-picked into the ghc-7.10 branch Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu> Reviewed By: austin Differential Revision: https://phabricator.haskell.org/D707
* hsc2hs: update submoduleAustin Seipp2015-03-091-0/+0
| | | | | | This includes the fix for #9524. Signed-off-by: Austin Seipp <austin@well-typed.com>
* Cleanup ghc-pkgThomas Miedema2015-02-181-112/+37
| | | | | | | | | | | | | | | | | | | | Summary: * Delete dead code in ghc-pkg (not_yet ready since 2004) * remove --auto-ghc-libs Commit 78185538b (2011) mentions: "Deprecate the ghc-pkg --auto-ghci-libs flag It was never a universal solution. It only worked with the GNU linker. It has not been used by Cabal for ages. GHCi can now load .a files so it will not be needed in future." "Warning: --auto-ghci-libs is deprecated and will be removed in GHC 7.4" Reviewers: austin Reviewed By: austin Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D666
* runghc: be explicit about ghc version (#9054)Thomas Miedema2015-02-182-1/+9
| | | | | | | | | | | | | | Summary: runghc-7.x should always call ghc-7.x Reviewers: austin Reviewed By: austin Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D664 GHC Trac Issues: #9054
* Add configurable verbosity level to hpcYuras Shumovich2015-02-177-3/+32
| | | | | | | | | | | | | | | | | | | Summary: All commands now have `--verbosity` flag, so one can configure cabal package with `--hpc-options="--verbosity=0"`. Right now it is used only in `hpc markup` to supress unnecessary output. Reviewers: austin Reviewed By: austin Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D660 GHC Trac Issues: #10091
* Delete vestigial external core code (#9402)Thomas Miedema2015-02-171-120/+0
| | | | | | | | | | | | | | Test Plan: harbormaster Reviewers: austin Reviewed By: austin Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D659 GHC Trac Issues: #9402
* Improve outdated ghc-pkg cache warning (#9606)Thomas Miedema2015-02-171-2/+8
| | | | | | | | | | | | | | | | Summary: No more frustration. Test Plan: I tested it. Reviewers: austin Reviewed By: austin Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D658 GHC Trac Issues: #9606
* Refactor the handling of quasi-quotesSimon Peyton Jones2015-02-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As Trac #10047 points out, a quasi-quotation [n|...blah...|] is supposed to behave exactly like $(n "...blah..."). But it doesn't! This was outright wrong: quasiquotes were being run even inside brackets. Now that TH supports both typed and untyped splices, a quasi-quote is properly regarded as a particular syntax for an untyped splice. But apart from that they should be treated the same. So this patch refactors the handling of quasiquotes to do just that. The changes touch quite a lot of files, but mostly in a routine way. The biggest changes by far are in RnSplice, and more minor changes in TcSplice. These are the places where there was real work to be done. Everything else is routine knock-on changes. * No more QuasiQuote forms in declarations, expressions, types, etc. So we get rid of these data constructors * HsBinds.QuasiQuoteD * HsExpr.HsSpliceE * HsPat.QuasiQuotePat * HsType.HsQuasiQuoteTy * We get rid of the HsQuasiQuote type altogether * Instead, we augment the HsExpr.HsSplice type to have three consructors, for the three types of splice: * HsTypedSplice * HsUntypedSplice * HsQuasiQuote There are some related changes in the data types in HsExpr near HsSplice. Specifically: PendingRnSplice, PendingTcSplice, UntypedSpliceFlavour. * In Hooks, we combine rnQuasiQuoteHook and rnRnSpliceHook into one. A smaller, clearer interface. * We have to update the Haddock submodule, to accommodate the hsSyn changes
* Add a workaround to allow older cabal-install to use ghc-7.10Duncan Coutts2015-02-091-6/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: This should smooth the upgrade process for people and help with testing the 7.10 RCs. Otherwise people need to first install cabal-install-1.22 before they can use 7.10. The problem is that older cabal still used file-style package dbs for the inplace package db when building packages. The workaround is that both ghc and ghc-pkg will notice when cabal tells them to use a file style db e.g. "dist/package.conf.inplace" and, so long as that db is empty (ie content is []) then they'll instead us a dir style db with the same name but ".d" appended, so in this example that would be "dist/package.conf.inplace.d". We have to use a separate dir rather than transparently upgrading because old Cabal really assumes the path is a file, and if it encounters a dir it will fail. This seems to be enough for older Cabal to work, and may well be enough for other scripts that create dbs using "echo [] > package.conf". Test Plan: validate and check new and old cabal can sucessfully install things, including packages that have internal deps (ie using the inplace db) Reviewers: hvr, tibbe, austin Reviewed By: tibbe, austin Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D628
* Revert "Update Haddock submodule"Herbert Valerio Riedel2015-01-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 34d68d8e83676c5010e9bc5d4619f24879f222af as it breaks the build: Configuring hsc2hs-0.67... Configuring ghc-cabal-0.1... Configuring parallel-3.2.0.6... Configuring hpc-bin-0.67... Configuring haddock-2.16.0... ghc-cabal: At least the following dependencies are missing: ghc >=7.9 && <7.11 make[1]: *** [utils/haddock/dist/package-data.mk] Error 1 make[1]: *** Waiting for unfinished jobs.... GHC PKG libraries/parallel/dist-install/package-data.mk Reading package info from "libraries/parallel/dist-install/inplace-pkg-config" ... done. parallel-3.2.0.6: Warning: haddock-interfaces: /srv/builds/commits/rGHC/B3035-34d68d8e83676c5010e9bc5d4619f24879f222af/libraries/parallel/dist-install/doc/html/parallel/parallel.haddock doesn't exist or isn't a file parallel-3.2.0.6: cannot find any of ["Control/Seq.hi","Control/Seq.p_hi","Control/Seq.dyn_hi"] (ignoring) parallel-3.2.0.6: cannot find any of ["Control/Parallel.hi","Control/Parallel.p_hi","Control/Parallel.dyn_hi"] (ignoring) parallel-3.2.0.6: cannot find any of ["Control/Parallel/Strategies.hi","Control/Parallel/Strategies.p_hi","Control/Parallel/Strategies.dyn_hi"] (ignoring) parallel-3.2.0.6: cannot find any of ["libHSparal_791B1zx5CJ25cUOFECtmw0.a","libHSparal_791B1zx5CJ25cUOFECtmw0.p_a","libHSparal_791B1zx5CJ25cUOFECtmw0-ghc7.11.20150123.so","libHSparal_791B1zx5CJ25cUOFECtmw0-ghc7.11.20150123.dylib","HSparal_791B1zx5CJ25cUOFECtmw0-ghc7.11.20150123.dll"] on library path (ignoring) make: *** [all] Error 2 Moreover, utils/haddock is supposed to track the `ghc-head` branch (which is what `git submodule update --remote utils/haddock` helps with)
* Update Haddock submoduleMateusz Kowalczyk2015-01-231-0/+0
|
* API Annotations tweaks.Alan Zimmerman2015-01-161-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: HsTyLit now has SourceText Update documentation of HsSyn to reflect which annotations are attached to which element. Ensure that the parser always keeps HsSCC and HsTickPragma values, to be ignored in the desugar phase if not needed Bringing in SourceText for pragmas Add Location in NPlusKPat Add Location in FunDep Make RecCon payload Located Explicitly add AnnVal to RdrName where it is compound Add Location in IPBind Add Location to name in IEThingAbs Add Maybe (Located id,Bool) to Match to track fun_id,infix This includes converting Match into a record and adding a note about why the fun_id needs to be replicated in the Match. Add Location in KindedTyVar Sort out semi-colons for parsing - import statements - stmts - decls - decls_cls - decls_inst This updates the haddock submodule. Test Plan: ./validate Reviewers: hvr, austin, goldfire, simonpj Reviewed By: simonpj Subscribers: thomie, carter Differential Revision: https://phabricator.haskell.org/D538
* Improve HsBangSimon Peyton Jones2015-01-081-0/+0
| | | | | | | | | | | | Provoked by questions from Johan - Improve comments, fix misleading stuff - Add commented synonyms for HsSrcBang, HsImplBang, and use them throughout - Rename HsUserBang to HsSrcBang - Rename dataConStrictMarks to dataConSrcBangs dataConRepBangs to dataConImplBangs This renaming affects Haddock in a trivial way, hence submodule update
* Another fix to genprimopcode, when generating Prim.hsSimon Peyton Jones2015-01-061-1/+17
| | | | | | | | | When haddock processes Prim.hs, it was calling TcEnv.tcGetDefaultTys, and that made it look for Integer and String, which are not in ghc-prim. Result was a crash. But we don't need defaulting in Prim.hs, so add default ()
* Update haddock submodule, and fix haddock input file from genprimopcodeSimon Peyton Jones2015-01-062-0/+6
| | | | | | | | | * A module in haddock an unused constraint, now fixed and pushed to ghc-head This patch records the new commit in GHC repo * genprimopcode generates a dummy Prim.hs for haddock. But then Haddock was complaining about redundant constraints. So this patch makes genprimopcode generate a warning-suppression OPTIONS_GHC pragma in Prim.hs
* Avoid redundant-import warning (w/o CPP)Herbert Valerio Riedel2014-12-271-0/+3
|
* Update hsc2hs submodule for de-tabbingHerbert Valerio Riedel2014-12-271-0/+0
|
* Eliminate so-called "silent superclass parameters"Simon Peyton Jones2014-12-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of silent superclass parameters was to solve the awkward problem of superclass dictinaries being bound to bottom. See THE PROBLEM in Note [Recursive superclasses] in TcInstDcls Although the silent-superclass idea worked, * It had non-local consequences, and had effects even in Haddock, where we had to discard silent parameters before displaying instance declarations * It had unexpected peformance costs, shown up by Trac #3064 and its test case. In monad-transformer code, when constructing a Monad dictionary you had to pass an Applicative dictionary; and to construct that you neede a Functor dictionary. Yet these extra dictionaries were often never used. (All this got much worse when we added Applicative as a superclass of Monad.) Test T3064 compiled *far* faster after silent superclasses were eliminated. * It introduced new bugs. For example SilentParametersOverlapping, T5051, and T7862, all failed to compile because of instance overlap directly because of the silent-superclass trick. So this patch takes a new approach, which I worked out with Dimitrios in the closing hours before Christmas. It is described in detail in THE PROBLEM in Note [Recursive superclasses] in TcInstDcls. Seems to work great! Quite a bit of knock-on effect * The main implementation work is in tcSuperClasses in TcInstDcls Everything else is fall-out * IdInfo.DFunId no longer needs its n-silent argument * Ditto IDFunId in IfaceSyn * Hence interface file format changes * Now that DFunIds do not have silent superclass parameters, printing out instance declarations is simpler. There is tiny knock-on effect in Haddock, so that submodule is updated * I realised that when computing the "size of a dictionary type" in TcValidity.sizePred, we should be rather conservative about type functions, which can arbitrarily increase the size of a type. Hence the new datatype TypeSize, which has a TSBig constructor for "arbitrarily big". * instDFunType moves from TcSMonad to Inst * Interestingly, CmmNode and CmmExpr both now need a non-silent (Ord r) in a couple of instance declarations. These were previously silent but must now be explicit. * Quite a bit of wibbling in error messages
* Bump GHC version from 7.9 to 7.11Herbert Valerio Riedel2014-12-221-0/+0
| | | | | | This needs to update the Haddock submodule as well Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
* trac #9744, make program name and product version configurable through ↵Luite Stegeman2014-12-201-0/+0
| | | | | | | | | | | | | | | | | | | DynFlags/Settings Summary: This allows GHC API clients to use a package database and dynamic library names that do not clash with those of the host GHC This also updates the Haddock submodule. Reviewers: hvr, austin Reviewed By: austin Subscribers: thomie, carter Differential Revision: https://phabricator.haskell.org/D496
* Relocate bash completion scripts to utils/Jan Stolarek2014-12-192-0/+103
|
* Update Cabal submodule to 1.22 versionHerbert Valerio Riedel2014-12-183-4/+4
|
* Update Haddock submoduleMateusz Kowalczyk2014-12-181-0/+0
|
* Update Haddock submoduleHerbert Valerio Riedel2014-12-171-0/+0
| | | | This pulls in the fix for the broken `@since`-rendering
* Add unwind information to CmmPeter Wortmann2014-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unwind information allows the debugger to discover more information about a program state, by allowing it to "reconstruct" other states of the program. In practice, this means that we explain to the debugger how to unravel stack frames, which comes down mostly to explaining how to find their Sp and Ip register values. * We declare yet another new constructor for CmmNode - and this time there's actually little choice, as unwind information can and will change mid-block. We don't actually make use of these capabilities, and back-end support would be tricky (generate new labels?), but it feels like the right way to do it. * Even though we only use it for Sp so far, we allow CmmUnwind to specify unwind information for any register. This is pretty cheap and could come in useful in future. * We allow full CmmExpr expressions for specifying unwind values. The advantage here is that we don't have to make up new syntax, and can e.g. use the WDS macro directly. On the other hand, the back-end will now have to simplify the expression until it can sensibly be converted into DWARF byte code - a process which might fail, yielding NCG panics. On the other hand, when you're writing Cmm by hand you really ought to know what you're doing. (From Phabricator D169)
* *Really* Re-Update Haddock submoduleHerbert Valerio Riedel2014-12-161-0/+0
| | | | The actual gitlink update got lost in 0c9c2d899e63b810e7ab6b486f7244826b4a2e33
* comment about why this program existsSimon Marlow2014-12-151-1/+16
|
* Update `binary` submodule to final 0.7.2.3 releaseHerbert Valerio Riedel2014-12-142-0/+22
| | | | | | This also introduces a "bootstrap" `cabal_macros.h` header to provide the `MIN_VERSION_base()` macro during Cabal bootstrapping which as it is now used by `binary`.
* Revert "Update Haddock submodule to latest `master` tip"Herbert Valerio Riedel2014-12-141-0/+0
| | | | | | | | This reverts commit 7f634320a2c39f4f81f631deb844acbaebaced66 again for now as it causes validate's bindist phase to fail with haddock: internal error: .../install dir/lib/ghc-7.9.20141214/html: getDirectoryContents: does not exist (No such file or directory)
* Update Haddock submodule to latest `master` tipHerbert Valerio Riedel2014-12-141-0/+0
| | | | | | | This also updates the perf-numbers for `haddock.base` and `haddock.Cabal` NB: this switches from `ghc-head` to `master` branch temporarily until GHC 7.10 has been properly branched off.
* Update submodule 'haddock' to render 'pattern' as a keywordDr. ERDI Gergo2014-11-291-0/+0
|
* Implement Partial Type SignaturesThomas Winant2014-11-281-0/+0
| | | | | | | | | | | | | | | | | | | | Summary: Add support for Partial Type Signatures, i.e. holes in types, see: https://ghc.haskell.org/trac/ghc/wiki/PartialTypeSignatures This requires an update to the Haddock submodule. Test Plan: validate Reviewers: austin, goldfire, simonpj Reviewed By: simonpj Subscribers: thomie, Iceland_jack, dominique.devriese, simonmar, carter, goldfire Differential Revision: https://phabricator.haskell.org/D168 GHC Trac Issues: #9478
* Cabal submodule update: hole support and tests.Edward Z. Yang2014-11-261-0/+2
| | | | | | | | | | | | | | Depends on D485 Summary: Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu> Test Plan: validate Reviewers: simonpj, austin Subscribers: thomie, carter Differential Revision: https://phabricator.haskell.org/D487
* Make clearNursery freeSimon Marlow2014-11-251-0/+1
| | | | | | | | | | | | | | | | | | | | | Summary: clearNursery resets all the bd->free pointers of nursery blocks to make the blocks empty. In profiles we've seen clearNursery taking significant amounts of time particularly with large -N and -A values. This patch moves the work of clearNursery to the point at which we actually need the new block, thereby introducing an invariant that blocks to the right of the CurrentNursery pointer still need their bd->free pointer reset. This should make things faster overall, because we don't need to clear blocks that we don't use. Test Plan: validate Reviewers: AndreasVoellmy, ezyang, austin Subscribers: thomie, carter, ezyang, simonmar Differential Revision: https://phabricator.haskell.org/D318
* Deprecate Data.Version.versionTags (#2496)Thomas Miedema2014-11-221-1/+1
| | | | | | | | | | | | The library submission was accepted: http://www.haskell.org/pipermail/libraries/2014-September/023777.html The T5892ab testcases were changed to use `Data.Tree` instead of `Data.Version` Reviewed By: ekmett Differential Revision: https://phabricator.haskell.org/D395
* AST changes to prepare for API annotations, for #9628Alan Zimmerman2014-11-212-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Summary: AST changes to prepare for API annotations Add locations to parts of the AST so that API annotations can then be added. The outline of the whole process is captured here https://ghc.haskell.org/trac/ghc/wiki/GhcAstAnnotations This change updates the haddock submodule. Test Plan: sh ./validate Reviewers: austin, simonpj, Mikolaj Reviewed By: simonpj, Mikolaj Subscribers: thomie, goldfire, carter Differential Revision: https://phabricator.haskell.org/D426 GHC Trac Issues: #9628
* Fix #7484, checking for good binder names in Convert.Richard Eisenberg2014-11-211-0/+0
| | | | | This commit also refactors a bunch of lexeme-oriented code into a new module Lexeme, and includes a submodule update for haddock.
* Split SynTyCon to SynonymTyCon and FamilyTyConJan Stolarek2014-11-201-0/+0
| | | | | | | | | | | | | | This patch refactors internal representation of type synonyms and type families by splitting them into two separate data constructors of TyCon data type. The main motivation is is that some fields make sense only for type synonyms and some make sense only for type families. This will be even more true with the upcoming injective type families. There is also some refactoring of names to keep the naming constistent. And thus tc_kind field has become tyConKind and tc_roles has become tcRoles. Both changes are not visible from the outside of TyCon module. Updates haddock submodule Reviewers: simonpj Differential Revision: https://phabricator.haskell.org/D508 GHC Trac Issues: #9812