Ticket #132: haddock.dpatch

File haddock.dpatch, 7.8 KB (added by igloo, 5 years ago)

Patch to change GHC's parser to support (only) the proposed replacement syntax

Line 
1
2New patches:
3
4[Make the code compatible with the stricter labelled-field parsing rules
5Ian Lynagh <igloo@earth.li>**20090725211910] {
6hunk ./src/Haddock/Backends/Hoogle.hs 114
7-        f (TyClD d@TyData{}) = ppData d
8-        f (TyClD d@ClassDecl{}) = ppClass d
9-        f (TyClD d@TySynonym{}) = ppSynonym d
10+        f (TyClD d@(TyData{})) = ppData d
11+        f (TyClD d@(ClassDecl{})) = ppClass d
12+        f (TyClD d@(TySynonym{})) = ppSynonym d
13hunk ./src/Haddock/Backends/Hoogle.hs 139
14-ppClass x = out x{tcdSigs=[]} :
15+ppClass x = out (x{tcdSigs=[]}) :
16hunk ./src/Haddock/Backends/Hoogle.hs 160
17-ppData x = showData x{tcdCons=[],tcdDerivs=Nothing} :
18+ppData x = showData (x{tcdCons=[],tcdDerivs=Nothing}) :
19hunk ./src/Haddock/Interface/Create.hs 71
20-  return Interface {
21+  return $ Interface {
22hunk ./src/Haddock/Interface/Create.hs 559
23-    exportName e@ExportDecl {} =
24+    exportName e@(ExportDecl {}) =
25hunk ./src/Haddock/Interface/Create.hs 564
26-    exportName ExportNoDecl {} = [] -- we don't count these as visible, since
27-                                    -- we don't want links to go to them.
28+    exportName (ExportNoDecl {}) = [] -- we don't count these as visible, since
29+                                      -- we don't want links to go to them.
30hunk ./src/Haddock/Interface.hs 104
31-         _ <- setSessionDynFlags dflags { hscTarget = HscC }
32+         _ <- setSessionDynFlags (dflags { hscTarget = HscC })
33hunk ./src/Haddock/InterfaceFile.hs 218
34-      bh2 <- return $! setUserData bh1 ud'{ud_symtab = symtab}
35+      bh2 <- return $! setUserData bh1 (ud'{ud_symtab = symtab})
36hunk ./src/Haddock/InterfaceFile.hs 251
37-putName BinSymbolTable{
38+putName (BinSymbolTable{
39hunk ./src/Haddock/InterfaceFile.hs 253
40-            bin_symtab_next = symtab_next }    bh name
41+            bin_symtab_next = symtab_next })    bh name
42hunk ./src/Haddock/InterfaceFile.hs 274
43-putFastString BinDictionary { bin_dict_next = j_r,
44-                              bin_dict_map  = out_r}  bh f
45+putFastString (BinDictionary { bin_dict_next = j_r,
46+                               bin_dict_map  = out_r})  bh f
47}
48
49Context:
50
51[Use cProjectVersion directly rather than going through compilerInfo
52Ian Lynagh <igloo@earth.li>**20090716002031
53 Fixes the build after changes in GHC
54]
55[Fix unused import warnings
56Ian Lynagh <igloo@earth.li>**20090707133545]
57[Bump version number
58Ian Lynagh <igloo@earth.li>**20090705193540
59 Cabal needs to distinguish between haddocks having a --verbose and
60 --verbosity flag
61]
62[Fix warnings
63Ian Lynagh <igloo@earth.li>**20090705171759]
64[Remove the -Wwarn hack in the GHC build system
65Ian Lynagh <igloo@earth.li>**20090705170148]
66[Resolve conflicts
67Ian Lynagh <igloo@earth.li>**20090705170113]
68[Fix #104 - create output directory if missing
69David Waern <david.waern@gmail.com>**20090627132603]
70[Remove misplaced whitespace in H.I.Rename
71David Waern <david.waern@gmail.com>**20090627124646]
72[Document Interface and InstalledInterface better
73David Waern <david.waern@gmail.com>**20090625215356
74 Ignore-this: b78b2b038f68b36696a6ac06827ab358
75]
76[Fix spelling error
77David Waern <david.waern@gmail.com>**20090624223944]
78[Add Haddock module headers
79David Waern <david.waern@gmail.com>**20090624222323
80 
81 Add a proper Haddock module header to each module, with a more finegrained
82 copyright. If you feel mis-accreditted, please correct any copyright notice!
83 
84 The maintainer field is set to haddock@projects.haskell.org.
85 
86 Next step is to add a brief description to each module.
87]
88[Delete Haddock.Exception and move contents to Haddock.Types
89David Waern <david.waern@gmail.com>**20090624210750
90 
91 Only a few lines of code that mainly declares a type - why not just put it in Haddock.Types.
92]
93[Resolve conflict
94David Waern <david.waern@gmail.com>**20090426150943
95 Ignore-this: 321562705f46ca5d32030dc8592def98
96]
97[add unicode output
98porges@porg.es**20081207082219]
99[Fix whitespace and stylistic issues in Main
100David Waern <david.waern@gmail.com>**20090405130704
101 Ignore-this: d8ba3067d2ea211c2078218a6a1e23bc
102]
103[Remove Haddock.GHC and move its (small) contents to Main
104David Waern <david.waern@gmail.com>**20090405125721
105 Ignore-this: 778a1f65c6f462cf8333f54f30214aa3
106]
107[Move H.GHC.Utils to H.GhcUtils
108David Waern <david.waern@gmail.com>**20090405124253
109 Ignore-this: 4e8249c709b954127c5f409a83b9f07
110]
111[hlint police
112David Waern <david.waern@gmail.com>**20090401205802
113 Ignore-this: 8172c7b791dcefed0b153be1b97e7a1b
114]
115[hlint police
116David Waern <david.waern@gmail.com>**20090401204842
117 Ignore-this: c1f0f643fee562b8357686d2d390a52b
118]
119[hlint police
120David Waern <david.waern@gmail.com>**20090401204030
121 Ignore-this: 341379f58a73a5c06c2d5dad1e09e48d
122]
123[Turn on -Wall -Werror
124David Waern <david.waern@gmail.com>**20090328222339
125 Ignore-this: ba1ff273b7a56d8fe280605ca0477cd1
126]
127[-Wall police in Main
128David Waern <david.waern@gmail.com>**20090328222259
129 Ignore-this: a73bbbcdf64c4dc368405a852706c055
130]
131[-Wall police in H.Interface
132David Waern <david.waern@gmail.com>**20090328221019
133 Ignore-this: f09fd8df77bde5b4c64afde68cdd2fa8
134]
135[-Wall police in H.I.Create
136David Waern <david.waern@gmail.com>**20090328215907
137 Ignore-this: d4847e9b4dabe92bf5abbff8f409d788
138]
139[Layout fix
140David Waern <david.waern@gmail.com>**20090328212706
141 Ignore-this: 7e9e6b7c9101da7151c755f79d032ba7
142]
143[Wibble
144David Waern <david.waern@gmail.com>**20090328210941
145 Ignore-this: 761ebdb58bbf40ffb4582fa0a85b35dd
146]
147[-Wall police in H.I.AttachInstances
148David Waern <david.waern@gmail.com>**20090328001515
149 Ignore-this: 17a477d8edc392df5fc110bfad7a95f6
150]
151[-Wall police in H.I.Rename
152David Waern <david.waern@gmail.com>**20090328000355
153 Ignore-this: 35ece1ead654630f00964e215ffa423f
154]
155[Wibble
156David Waern <david.waern@gmail.com>**20090327235134
157 Ignore-this: b9ea8b2004414fd6efc1e39d5161cda2
158]
159[Define Foldable and Traversable instances for Located
160David Waern <david.waern@gmail.com>**20090327234128
161 Ignore-this: 84f7441937ab25a09710b63f8f3e51a
162]
163[-Wall police in H.B.Hoogle
164David Waern <david.waern@gmail.com>**20090327231253
165 Ignore-this: 8a4fea2a78a94caef7bf6a177c1900fa
166]
167[-Wall police
168David Waern <david.waern@gmail.com>**20090327224521
169 Ignore-this: 1b68fe34554d3c94a870758efbdfc657
170]
171[Document DocName
172David Waern <david.waern@gmail.com>**20090327220626
173 Ignore-this: 48db339912ecd4205e2531d032abebdb
174]
175[Remove H.DocName and put DocName in H.Types
176David Waern <david.waern@gmail.com>**20090327213304
177 Ignore-this: d30ebc4e11902d66daf7a5a7ede798b5
178]
179[Use docNameOcc instead of nameOccName . getName
180David Waern <david.waern@gmail.com>**20090327212146
181 Ignore-this: f9bb557b4915deef9c3e604696a1ec14
182]
183[Remove docNameOrig and use getName everywhere instead
184David Waern <david.waern@gmail.com>**20090327211922
185 Ignore-this: 5331a5f7173e2922161d32243e0eea40
186]
187[Remove H.GHC.Typecheck
188David Waern <david.waern@gmail.com>**20090327211511
189 Ignore-this: 3ef47769b328a7d92a21dce438438250
190]
191[Fix conflicts
192David Waern <david.waern@gmail.com>**20090327000726
193 Ignore-this: a5329bc1d069f75431a044a455d088e5
194]
195[Add some basic "verbose" mode logging in H.Interface
196David Waern <david.waern@gmail.com>**20081207200105]
197[Add verbosity flag and utils, remove "verbose" flag
198David Waern <david.waern@gmail.com>**20081207195853]
199[-Wall police in H.B.Html
200David Waern <david.waern@gmail.com>**20090326232044
201 Ignore-this: 3fd73d651309faf2579f01ac386373
202]
203[Fix warnings in H.B.DevHelp
204David Waern <david.waern@gmail.com>**20090324222123
205 Ignore-this: c4a52c2e870f69880582babdc5549298
206]
207[Remove unnecessary LANGUAGE pragma
208David Waern <david.waern@gmail.com>**20090324221015
209 Ignore-this: 804942fa87d3c4aac9f1556ca06df3af
210]
211[Update Makefile for the new GHC build system
212Ian Lynagh <igloo@earth.li>**20090705165035]
213[Follow extra field in ConDecl
214simonpj@microsoft.com**20090702153522
215 Ignore-this: dc96d475bbbf2a9a2c8c12c5ed95019d
216]
217[TAG 2009-06-25
218Ian Lynagh <igloo@earth.li>**20090625155950]
219Patch bundle hash:
22090f110a219c2d82940237c3561a40e7bbbafcee7