Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'no-pred-ty' | Max Bolingbroke | 2011-09-09 | 8 | -115/+75 |
|\ | | | | | | | | | Conflicts: src/Haddock/Convert.hs | ||||
| * | Adapt Haddock for the ConstraintKind extension changes | Max Bolingbroke | 2011-09-06 | 8 | -106/+73 |
| | | |||||
* | | Ignore associated type defaults (just as we ignore default methods) | Max Bolingbroke | 2011-09-09 | 4 | -10/+18 |
|/ | |||||
* | Hack this to make it work with both Alex 2.x and Alex 3.x. Unicode in | Simon Marlow | 2011-08-11 | 1 | -2/+32 |
| | | | | | | | documentation strings is (still) mangled. I don't think it's possible to make it so that we get the current behaviour with Alex 2.x but magic Unicode support if you use Alex 3.x. At some point we have to decide that Alex 3.x is a requirement, then we can do Unicode. | ||||
* | Bump GHC dep to allow 7.2 | Ian Lynagh | 2011-06-26 | 1 | -0/+4 |
| | |||||
* | Fix build | Ian Lynagh | 2011-06-17 | 8 | -14/+27 |
| | |||||
* | * Merge in git patch from Michal Terepeta | David Waern | 2011-06-11 | 10 | -122/+194 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | Add git commits since switchover: | David Waern | 2011-06-10 | 7 | -32/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | Indentation | David Waern | 2011-05-22 | 1 | -14/+14 |
| | |||||
* | Fix some stylistic issues in mkExportItems | David Waern | 2011-05-22 | 1 | -19/+11 |
| | |||||
* | Break out fullContentsOf, give it a better name and some documentation | David Waern | 2011-05-22 | 1 | -22/+46 |
| | | | | | The documentation describes how we want this function to eventually behave, once we have fixed a few problems with the current implementation. | ||||
* | Fix a bug | David Waern | 2011-05-22 | 1 | -3/+3 |
| | |||||
* | We don't need to send DocOptions nor a flag to mkExportItems | David Waern | 2011-05-22 | 1 | -9/+9 |
| | |||||
* | Improve a haddock comment | David Waern | 2011-05-21 | 1 | -2/+2 |
| | |||||
* | Add support for blank lines in the result of examples | Simon Hengel | 2011-04-08 | 1 | -4/+11 |
| | | | | | Result lines that only contain the string "<BLANKLINE>" are treated as a blank line. | ||||
* | Fix build with ghc 7.0.1 | David Waern | 2011-03-10 | 1 | -0/+4 |
| | |||||
* | Update Haddock to reflect change in hs_tyclds field of HsGroup | simonpj | 2011-01-10 | 1 | -7/+7 |
| | |||||
* | Put title outside doc div when HTML:fying title+prologue | David Waern | 2011-01-22 | 1 | -1/+1 |
| | | | | | Avoids indenting the title, and makes more sense since the title is not a doc string anyway. | ||||
* | Write hoogle output in utf8; fixes GHC build on Windows | Ian Lynagh | 2011-01-05 | 1 | -3/+5 |
| | |||||
* | Fix indentation problem | David Waern | 2010-12-11 | 1 | -6/+6 |
| | |||||
* | Solve conflicts | David Waern | 2010-12-07 | 2 | -0/+2 |
| | |||||
* | Add {-# LANGUAGE BangPatterns #-} to mollify GHC | Simon Marlow | 2010-11-17 | 1 | -1/+0 |
| | |||||
* | Alex generates BangPatterns, so make Lex.x accept them | simonpj | 2010-11-15 | 1 | -1/+0 |
| | | | | (It'd be better for Alex to generate this pragma.) | ||||
* | QUALI -> QUAL in the description --qual for consistency | David Waern | 2010-12-06 | 1 | -1/+1 |
| | |||||
* | Remove --debug. It was't used, and --verbosity should take its place | David Waern | 2010-12-06 | 1 | -3/+0 |
| | |||||
* | Haddockify ppHtml comments | David Waern | 2010-12-06 | 1 | -11/+11 |
| | |||||
* | Wibble | David Waern | 2010-12-06 | 1 | -0/+1 |
| | |||||
* | Add a flag --pretty-html for rendering indented html with newlines | David Waern | 2010-12-06 | 4 | -27/+37 |
| | |||||
* | Add BangPatterns to alex and happy source files | David Waern | 2010-11-21 | 2 | -0/+2 |
| | |||||
* | Re-order functions | David Waern | 2010-11-20 | 1 | -8/+8 |
| | |||||
* | Re-structure qualification code a little | David Waern | 2010-11-20 | 1 | -20/+19 |
| | |||||
* | add full qualification for undocumented names | tob.brandt | 2010-11-20 | 1 | -3/+2 |
| | |||||
* | Follow the style guide closer in Haddock.Types and improve docs | David Waern | 2010-11-20 | 1 | -143/+147 |
| | |||||
* | Haddock documentation updates | David Waern | 2010-11-20 | 2 | -10/+15 |
| | |||||
* | hlint police | David Waern | 2010-11-16 | 6 | -20/+20 |
| | |||||
* | hlint police | David Waern | 2010-11-16 | 2 | -21/+19 |
| | |||||
* | Make a little more use of DoAndIfThenElse | David Waern | 2010-11-16 | 2 | -69/+66 |
| | |||||
* | Remove LANGUAGE ForeignFunctionInterface pragmas | David Waern | 2010-11-16 | 2 | -2/+1 |
| | |||||
* | Style wibbles | David Waern | 2010-11-16 | 1 | -26/+26 |
| | |||||
* | Wibble | David Waern | 2010-11-15 | 1 | -1/+1 |
| | |||||
* | Remove docNameOcc under the motto "don't name compositions" | David Waern | 2010-11-15 | 5 | -23/+17 |
| | |||||
* | Just say "internal error" instead of "internal Haddock or GHC error" | David Waern | 2010-11-15 | 1 | -1/+1 |
| | |||||
* | Match all AsyncExceptions in exception handler | David Waern | 2010-11-15 | 1 | -3/+10 |
| | |||||
* | Remove more ghc < 7 code | David Waern | 2010-11-15 | 1 | -1/+0 |
| | |||||
* | Fix bad merge | David Waern | 2010-11-15 | 1 | -1/+1 |
| | |||||
* | Remove code for ghc < 7 | David Waern | 2010-11-15 | 7 | -63/+1 |
| | |||||
* | follow changes in the GHC API | Simon Marlow | 2010-10-27 | 4 | -3/+20 |
| | |||||
* | Solve conflict | David Waern | 2010-11-14 | 1 | -1/+2 |
| | |||||
* | Follow extension-flattening change in GHC | Ian Lynagh | 2010-10-23 | 1 | -6/+1 |
| | |||||
* | Fix URL creation on Windows: Use / not \ in URLs. Fixes #4353 | Ian Lynagh | 2010-09-29 | 1 | -2/+2 |
| |