| Commit message (Collapse) | Author | Age | Files | Lines | 
| |  | 
 | 
| |\  
| | 
| | 
| | 
| |  | 
Conflicts:
	src/Haddock/InterfaceFile.hs
 | 
| | |  | 
 | 
| |\|  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | | 
| | 
| | 
| |  | 
finding the package that a module belongs to
 | 
| | | 
| | 
| | 
| | 
| |  | 
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.
 | 
| | | 
| | 
| | 
| | 
| |  | 
the user
and the actual qualification for a concrete module
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |\   | 
 | 
| | | | 
| | | 
| | | 
| | |  | 
Thanks to Phyx.
 | 
| | | |  | 
 | 
| | |/  
| |   
| |   
| |   
| |    | 
The Xhtml backend has special markup for that, Hoogle and LaTeX reuse
what we have for DocEmphasis.
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| |\ \   | 
 | 
| | | |  | 
 | 
| | |\ \   | 
 | 
| | | | |  | 
 | 
| | |/ /  
|/| |    | 
 | 
| |/ /   | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| |/   | 
 | 
| |  | 
 | 
| | 
| 
| 
|  | 
(A bug that should have been fixed long ago.)
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
renaming time.
Previously this was done in the backends.
Also, warn when a doc comment refers to something that is in scope but which we
don't have the .haddock file for.
These changes mean we can make DocIdentifier [a] into DocIdentifier a.
 | 
| |  | 
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
|  | 
This big patch implements a kind-polymorphic core for GHC. The current
implementation focuses on making sure that all kind-monomorphic programs still
work in the new core; it is not yet guaranteed that kind-polymorphic programs
(using the new -XPolyKinds flag) will work.
For more information, see http://haskell.org/haskellwiki/GHC/Kinds
 | 
| |  | 
 | 
| |  | 
 | 
| |\   | 
 | 
| | | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| |  | 
Joachim Breitner <mail@joachim-breitner.de>**20110619201645
  Ignore-this: f6c51228205b0902ad5bfad5040b989a
  As reported on http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=578301,
  generating the global index takes much too long if type-level (with lots of
  auto-generated types) is installed. The patch avoids a quadratic runtime in the
  subfunction getIfaceIndex of ppHtmlIndex by using a temporary set. Runtime improvement observed here from 25.36s to 2.86s.
 | 
| |\ \  
| | | 
| | | 
| | | 
| | |  | 
Conflicts:
	src/Haddock/Convert.hs
 | 
| | |/   | 
 | 
| |/   | 
 | 
| |  | 
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
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.
 | 
| | 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
| 
|  | 
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
 | 
| | 
| 
| 
| 
|  | 
Avoids indenting the title, and makes more sense since the title
is not a doc string anyway.
 |