Ticket #59: do-not-ignore-declarations-with-same-location.dpatch

File do-not-ignore-declarations-with-same-location.dpatch, 7.5 kB (added by nomeata, 5 years ago)
Line 
1Sun Oct  5 01:44:04 CEST 2008  Joachim Breitner <mail@joachim-breitner.de>
2  * Do not ignore declarations with same location
3  This is to improve support for source files with Template Haskell, see
4  http://trac.haskell.org/haddock/ticket/59
5-----BEGIN PGP SIGNED MESSAGE-----
6Hash: SHA1
7
8
9New patches:
10
11[Do not ignore declarations with same location
12Joachim Breitner <mail@joachim-breitner.de>**20081004234404
13 This is to improve support for source files with Template Haskell, see
14 http://trac.haskell.org/haddock/ticket/59
15] {
16hunk ./src/Haddock/Interface/Create.hs 330
17- -      Just d0
18- -        | sameDecl d0 e -> collect d doc_so_far es 
19- -        | otherwise -> finishedDoc d0 doc_so_far (collect (Just e) DocEmpty es)
20+      Just d0 -> finishedDoc d0 doc_so_far (collect (Just e) DocEmpty es)
21hunk ./src/Haddock/Interface/Create.hs 341
22- -
23- -sameDecl d1 d2 = getLoc d1 == getLoc d2
24- -
25- -
26}
27
28Context:
29
30[Fix building haddock when GhcProfiled=YES
31Ian Lynagh <igloo@earth.li>**20080928014235]
32[Do not wrap __ in brackets
33Neil Mitchell**20080911145607]
34[Increase the GHC upper bound from 6.11 to 6.13
35Ian Lynagh <igloo@earth.li>**20080923180658]
36[Fix the in-tree haddock on Windows
37Ian Lynagh <igloo@earth.li>**20080921122016]
38[Fix paths used on Windows frmo a GHC tree: There is no whare directory
39Ian Lynagh <igloo@earth.li>**20080921111900]
40[TAG 6.10 branch has been forked
41Ian Lynagh <igloo@earth.li>**20080919123437]
42[Port Main to new GHC API.
43Thomas Schilling <nominolo@googlemail.com>**20080915091125]
44[Port Haddock.GHC to new GHC API.
45Thomas Schilling <nominolo@googlemail.com>**20080915091100]
46[Port Haddock.GHC.Typecheck to new GHC API.
47Thomas Schilling <nominolo@googlemail.com>**20080915091037]
48[Reflect GHC API changes.
49Thomas Schilling <nominolo@googlemail.com>**20080915090937]
50[Port Haddock.Interface to new GHC API.
51Thomas Schilling <nominolo@googlemail.com>**20080915090916
52 
53 This required one bigger change: 'readInterfaceFile' used to take an
54 optional 'Session' argument.  This was used to optionally update the
55 name cache of an existing GHC session.  This does not work with the
56 new GHC API, because an active session requires the function to return
57 a 'GhcMonad' action, but this is not possible if no session is
58 provided.
59 
60 The solution is to use an argument of functions for reading and
61 updating the name cache and to make the function work for any monad
62 that embeds IO, so it's result type can adapt to the calling context.
63 
64 While refactoring, I tried to make the code a little more
65 self-documenting, mostly turning comments into function names.
66]
67[Use "exec" when calling haddock in the wrapper
68Ian Lynagh <igloo@earth.li>**20080915100232]
69[Add a "#!/bin/sh" to haddock.wrapper
70Ian Lynagh <igloo@earth.li>**20080914153422]
71[Wibble imports
72Ian Lynagh <igloo@earth.li>**20080912125913]
73[Add a LANGUAGE ForeignFunctionInterface pragma
74Ian Lynagh <igloo@earth.li>**20080912125824]
75[Import GHC.Paths if not IN_GHC_TREE, seems to match the use of GHC.Paths functions much better
76Neil Mitchell**20080911104855]
77[Fix installed haddock on Windows
78Ian Lynagh <igloo@earth.li>**20080910221544]
79[Fix haddock inplace on Windows
80Ian Lynagh <igloo@earth.li>**20080910194744]
81[We need to tell haddock that its datasubdir is . or it can't find package.conf
82Ian Lynagh <igloo@earth.li>**20080910165818]
83[bindist fixes
84Ian Lynagh <igloo@earth.li>**20080907185251]
85[follow library changes
86Ian Lynagh <igloo@earth.li>**20080903223553]
87[Fix in-tree haddock on Windows
88Ian Lynagh <igloo@earth.li>**20080829000742]
89[Don't use Cabal wrappers on Windows
90Ian Lynagh <igloo@earth.li>**20080828211427]
91[Fixes for using haddock in a GHC build tree
92Ian Lynagh <igloo@earth.li>**20080828142229]
93[Fix some warnings
94Ian Lynagh <igloo@earth.li>**20080827213222]
95[Increase the upper bound on the GHC version number
96Ian Lynagh <igloo@earth.li>**20080827204155]
97[Update extensions in Cabal file
98Ian Lynagh <igloo@earth.li>**20080827204127
99 Use ScopedTypeVariables instead of PatternSignatures
100]
101[Add a manual Cabal flag to control the ghc-paths dependency
102Ian Lynagh <igloo@earth.li>**20080827180702]
103[Add haddock.wrapper
104Ian Lynagh <igloo@earth.li>**20080827180646]
105[Add a Makefile for GHC's build system. Still won't work yet, but we're closer
106Ian Lynagh <igloo@earth.li>**20080814104914]
107[In the hoogle back end, markup definition lists using <i>, not <b>
108Neil Mitchell**20080821182024]
109[Simplify the code by removing not-to-important use of <.> in the Hoogle back end
110Neil Mitchell**20080820075913]
111[Remove Explicit top-level forall's when pretty-printing signatures
112Neil Mitchell**20080818125304]
113[Use the same method to put out signatures as class methods in the Hoogle backend
114Neil Mitchell**20080818125243]
115[Make Hoogle add documentation to a package
116Neil Mitchell**20080813140346]
117[Generalise Hoogle.doc and add a docWith
118Neil Mitchell**20080813140324]
119[Add support for type synonyms to Hoogle, was accidentally missing before (woops!)
120Neil Mitchell**20080812213732]
121[Output all items, even if they are not defined in this module - ensures map comes from Prelude, not just GHC.Base
122Neil Mitchell**20080812160253]
123[Change ghc version dependency to >= 6.8.2 && <= 6.9
124David Waern <david.waern@gmail.com>**20080813215017]
125[Follow changes to Binary in GHC 6.9
126David Waern <david.waern@gmail.com>**20080813214736]
127[Follow changes to parseDynamic- parseStaticFlags in GHC
128David Waern <david.waern@gmail.com>**20080813214654]
129[Update test following Haddock version change
130David Waern <david.waern@gmail.com>**20080813214620]
131[Follow extensible exceptions changes
132David Waern <david.waern@gmail.com>**20080813214529]
133[Follow move of package string functions from PackageConfig to Module
134David Waern <david.waern@gmail.com>**20080813214417]
135[Add __GHC_PATCHLEVEL__ symbol also when building the library
136David Waern <david.waern@gmail.com>**20080813214358]
137[Follow changes to parseDynamic/StaticFlags
138David Waern <david.waern@gmail.com>**20080812231112]
139[Hide <.> from GHC import in Hoogle only for ghc <= 6.8.3
140David Waern <david.waern@gmail.com>**20080812230358]
141[Comment out H.GHC.loadPackages - it is unused and doesn't build with ghc >= 6.9
142David Waern <david.waern@gmail.com>**20080812230202]
143[Remove matching on NoteTy in AttachInstances, it has been removed
144David Waern <david.waern@gmail.com>**20080812224957]
145[Make our .haddock file version number depend on the GHC version
146David Waern <david.waern@gmail.com>**20080812224039
147 
148 We need to do this, since our .haddock format can potentially
149 change whenever GHC's version changes (even when only the patchlevel
150 changes).
151]
152[Import Control.OldException instead of C.Exception when using ghc >= 6.9
153David Waern <david.waern@gmail.com>**20080811194154
154 
155 We should really test for base version instead, but I don't currently
156 know which version to test for.
157]
158[Make H.GHC.Utils build with GHC HEAD
159David Waern <david.waern@gmail.com>**20080810224205]
160[Change ghc version dependency to >= 6.8.2
161David Waern <david.waern@gmail.com>**20080805192608]
162[Doc: say that the --hoogle option is functional
163David Waern <david.waern@gmail.com>**20080811185637]
164[invoking haddock clarification and help
165Luke Plant <L.Plant.98@cantab.net>**20080811152059]
166[Fix CHANGES
167David Waern <david.waern@gmail.com>**20080805191649]
168[TAG 2.2.2
169David Waern <david.waern@gmail.com>**20080805191453]
170Patch bundle hash:
1716569725c7f61fd8609ce30427b9ad673ab8631c8
172-----BEGIN PGP SIGNATURE-----
173Version: GnuPG v1.4.9 (GNU/Linux)
174
175iEYEARECAAYFAkjoAFQACgkQ9ijrk0dDIGzePACgrtPrkQVD4JNo+RFv/K64kaDq
176udYAn2qyImJkayDs4DZjujUhad1qpcIm
177=Mpvs
178-----END PGP SIGNATURE-----