Ticket #132: base.dpatch

File base.dpatch, 30.8 KB (added by igloo, 6 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 <[email protected]>**20090725211926] {
6hunk ./Data/HashTable.hs 140
7-  where rec hd@HD{ tables=t, totBuckets=b } =
8-               hd{ tables=t+1, totBuckets=b+fromIntegral tABLE_MIN }
9+  where rec hd@(HD{ tables=t, totBuckets=b }) =
10+                hd{ tables=t+1, totBuckets=b+fromIntegral tABLE_MIN }
11hunk ./Data/HashTable.hs 145
12-  where rec hd@HD{ insertions=ins, maxEntries=mx, maxChain=mc } =
13-               hd{ insertions=ins+fromIntegral i, maxEntries=mx `max` sz,
14-                   maxChain=mc `max` length bkt }
15+  where rec hd@(HD{ insertions=ins, maxEntries=mx, maxChain=mc }) =
16+                hd{ insertions=ins+fromIntegral i, maxEntries=mx `max` sz,
17+                    maxChain=mc `max` length bkt }
18hunk ./Data/HashTable.hs 151
19-  where rec hd@HD{ totBuckets=b, maxBuckets=mx } =
20-               hd{ totBuckets=b+fromIntegral (newer-older),
21-                   maxBuckets=mx `max` newer }
22+  where rec hd@(HD{ totBuckets=b, maxBuckets=mx }) =
23+                hd{ totBuckets=b+fromIntegral (newer-older),
24+                    maxBuckets=mx `max` newer }
25hunk ./Data/HashTable.hs 157
26-  where lkup hd@HD{ lookups=l } = hd{ lookups=l+1 }
27+  where lkup hd@(HD{ lookups=l }) = hd{ lookups=l+1 }
28hunk ./Data/HashTable.hs 326
29-findBucket HashTable{ tab=ref, hash_fn=hash} key = do
30-  table@HT{ buckets=bkts, bmask=b } <- readIORef ref
31+findBucket (HashTable{ tab=ref, hash_fn=hash}) key = do
32+  table@(HT{ buckets=bkts, bmask=b }) <- readIORef ref
33hunk ./Data/HashTable.hs 354
34-               ht@HashTable{ tab=ref, hash_fn=hash } key = do
35-  (table@HT{ kcount=k, buckets=bkts, bmask=b },
36+               ht@(HashTable{ tab=ref, hash_fn=hash }) key = do
37+  (table@(HT{ kcount=k, buckets=bkts, bmask=b }),
38hunk ./Data/HashTable.hs 371
39-expandHashTable hash table@HT{ buckets=bkts, bmask=mask } = do
40+expandHashTable hash table@(HT{ buckets=bkts, bmask=mask }) = do
41hunk ./Data/HashTable.hs 409
42-delete ht@HashTable{ cmp=eq } key =
43+delete ht@(HashTable{ cmp=eq }) key =
44hunk ./Data/HashTable.hs 425
45-update ht@HashTable{ cmp=eq } key val =
46+update ht@(HashTable{ cmp=eq }) key val =
47hunk ./Data/HashTable.hs 437
48-lookup ht@HashTable{ cmp=eq } key = do
49+lookup ht@(HashTable{ cmp=eq }) key = do
50hunk ./Data/HashTable.hs 463
51-mapReduce m r HashTable{ tab=ref } = do
52-  HT{ buckets=bckts, bmask=b } <- readIORef ref
53+mapReduce m r (HashTable{ tab=ref }) = do
54+  (HT{ buckets=bckts, bmask=b }) <- readIORef ref
55hunk ./Data/Version.hs 144
56-                  return Version{versionBranch=branch, versionTags=tags}
57+                  return $ Version{versionBranch=branch, versionTags=tags}
58hunk ./GHC/IO/Buffer.hs 194
59-withBuffer Buffer{ bufRaw=raw } f = withForeignPtr (castForeignPtr raw) f
60+withBuffer (Buffer{ bufRaw=raw }) f = withForeignPtr (castForeignPtr raw) f
61hunk ./GHC/IO/Buffer.hs 200
62-isEmptyBuffer Buffer{ bufR=w } = w == 0
63+isEmptyBuffer (Buffer{ bufR=w }) = w == 0
64hunk ./GHC/IO/Buffer.hs 203
65-isFullBuffer Buffer{ bufR=w, bufSize=s } = s == w
66+isFullBuffer (Buffer{ bufR=w, bufSize=s }) = s == w
67hunk ./GHC/IO/Buffer.hs 219
68-bufferElems Buffer{ bufR=w, bufL=r } = w - r
69+bufferElems (Buffer{ bufR=w, bufL=r }) = w - r
70hunk ./GHC/IO/Buffer.hs 222
71-bufferAvailable Buffer{ bufR=w, bufSize=s } = s - w
72+bufferAvailable (Buffer{ bufR=w, bufSize=s }) = s - w
73hunk ./GHC/IO/Buffer.hs 225
74-bufferRemove i buf@Buffer{ bufL=r } = bufferAdjustL (r+i) buf
75+bufferRemove i buf@(Buffer{ bufL=r }) = bufferAdjustL (r+i) buf
76hunk ./GHC/IO/Buffer.hs 228
77-bufferAdjustL l buf@Buffer{ bufR=w }
78+bufferAdjustL l buf@(Buffer{ bufR=w })
79hunk ./GHC/IO/Buffer.hs 233
80-bufferAdd i buf@Buffer{ bufR=w } = buf{ bufR=w+i }
81+bufferAdd i buf@(Buffer{ bufR=w }) = buf{ bufR=w+i }
82hunk ./GHC/IO/Buffer.hs 252
83-slideContents buf@Buffer{ bufL=l, bufR=r, bufRaw=raw } = do
84+slideContents buf@(Buffer{ bufL=l, bufR=r, bufRaw=raw }) = do
85hunk ./GHC/IO/Buffer.hs 257
86-  return buf{ bufL=0, bufR=elems }
87+  return $ buf{ bufL=0, bufR=elems }
88hunk ./GHC/IO/Buffer.hs 276
89-checkBuffer buf@Buffer{ bufState = state, bufL=r, bufR=w, bufSize=size } = do
90+checkBuffer buf@(Buffer{ bufState = state, bufL=r, bufR=w, bufSize=size }) = do
91hunk ./GHC/IO/Encoding/Iconv.hs 155
92-    return BufferCodec{
93+    return $ BufferCodec{
94hunk ./GHC/IO/Encoding/Iconv.hs 174
95-  input@Buffer{  bufRaw=iraw, bufL=ir, bufR=iw, bufSize=_  }  iscale
96-  output@Buffer{ bufRaw=oraw, bufL=_,  bufR=ow, bufSize=os }  oscale
97+  input@(Buffer{  bufRaw=iraw, bufL=ir, bufR=iw, bufSize=_  })  iscale
98+  output@(Buffer{ bufRaw=oraw, bufL=_,  bufR=ow, bufSize=os })  oscale
99hunk ./GHC/IO/Encoding/Latin1.hs 79
100-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
101-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
102+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
103+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
104hunk ./GHC/IO/Encoding/Latin1.hs 98
105-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
106-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
107+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
108+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
109hunk ./GHC/IO/Encoding/Latin1.hs 115
110-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
111-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
112+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
113+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
114hunk ./GHC/IO/Encoding/UTF16.hs 87
115-  output@Buffer{ bufRaw=oraw, bufL=_, bufR=ow, bufSize=os }
116+  output@(Buffer{ bufRaw=oraw, bufL=_, bufR=ow, bufSize=os })
117hunk ./GHC/IO/Encoding/UTF16.hs 97
118-                    utf16_native_encode input output{ bufR = ow+2 }
119+                    utf16_native_encode input (output{ bufR = ow+2 })
120hunk ./GHC/IO/Encoding/UTF16.hs 101
121-  input@Buffer{  bufRaw=iraw, bufL=ir, bufR=iw,  bufSize=_  }
122+  input@(Buffer{  bufRaw=iraw, bufL=ir, bufR=iw,  bufSize=_  })
123hunk ./GHC/IO/Encoding/UTF16.hs 114
124-               utf16be_decode input{ bufL= ir+2 } output
125+               utf16be_decode (input{ bufL= ir+2 }) output
126hunk ./GHC/IO/Encoding/UTF16.hs 117
127-               utf16le_decode input{ bufL= ir+2 } output
128+               utf16le_decode (input{ bufL= ir+2 }) output
129hunk ./GHC/IO/Encoding/UTF16.hs 187
130-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
131-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
132+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
133+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
134hunk ./GHC/IO/Encoding/UTF16.hs 219
135-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
136-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
137+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
138+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
139hunk ./GHC/IO/Encoding/UTF16.hs 256
140-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
141-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
142+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
143+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
144hunk ./GHC/IO/Encoding/UTF16.hs 292
145-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
146-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
147+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
148+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
149hunk ./GHC/IO/Encoding/UTF32.hs 76
150-  output@Buffer{ bufRaw=oraw, bufL=_, bufR=ow, bufSize=os }
151+  output@(Buffer{ bufRaw=oraw, bufL=_, bufR=ow, bufSize=os })
152hunk ./GHC/IO/Encoding/UTF32.hs 88
153-                    utf32_native_encode input output{ bufR = ow+4 }
154+                    utf32_native_encode input (output{ bufR = ow+4 })
155hunk ./GHC/IO/Encoding/UTF32.hs 92
156-  input@Buffer{  bufRaw=iraw, bufL=ir, bufR=iw,  bufSize=_  }
157+  input@(Buffer{  bufRaw=iraw, bufL=ir, bufR=iw,  bufSize=_  })
158hunk ./GHC/IO/Encoding/UTF32.hs 107
159-               utf32be_decode input{ bufL= ir+4 } output
160+               utf32be_decode (input{ bufL= ir+4 }) output
161hunk ./GHC/IO/Encoding/UTF32.hs 110
162-               utf32le_decode input{ bufL= ir+4 } output
163+               utf32le_decode (input{ bufL= ir+4 }) output
164hunk ./GHC/IO/Encoding/UTF32.hs 180
165-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
166-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
167+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
168+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
169hunk ./GHC/IO/Encoding/UTF32.hs 206
170-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
171-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
172+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
173+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
174hunk ./GHC/IO/Encoding/UTF32.hs 237
175-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
176-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
177+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
178+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
179hunk ./GHC/IO/Encoding/UTF32.hs 259
180-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
181-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
182+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
183+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
184hunk ./GHC/IO/Encoding/UTF8.hs 86
185-  input@Buffer{  bufRaw=iraw, bufL=ir, bufR=iw,  bufSize=_  }
186+  input@(Buffer{  bufRaw=iraw, bufL=ir, bufR=iw,  bufSize=_  })
187hunk ./GHC/IO/Encoding/UTF8.hs 105
188-       utf8_decode input{ bufL = ir + 3 } output
189+       utf8_decode (input{ bufL = ir + 3 }) output
190hunk ./GHC/IO/Encoding/UTF8.hs 109
191-  output@Buffer{ bufRaw=oraw, bufL=_, bufR=ow, bufSize=os }
192+  output@(Buffer{ bufRaw=oraw, bufL=_, bufR=ow, bufSize=os })
193hunk ./GHC/IO/Encoding/UTF8.hs 120
194-                    utf8_encode input output{ bufR = ow+3 }
195+                    utf8_encode input (output{ bufR = ow+3 })
196hunk ./GHC/IO/Encoding/UTF8.hs 129
197-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
198-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
199+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
200+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
201hunk ./GHC/IO/Encoding/UTF8.hs 180
202-  input@Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  }
203-  output@Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os }
204+  input@(Buffer{  bufRaw=iraw, bufL=ir0, bufR=iw,  bufSize=_  })
205+  output@(Buffer{ bufRaw=oraw, bufL=_,   bufR=ow0, bufSize=os })
206hunk ./GHC/IO/FD.hs 344
207-  return fd{ fdFD = newfd }
208+  return $ fd{ fdFD = newfd }
209hunk ./GHC/IO/FD.hs 351
210-  return fd{ fdFD = fdFD fdto } -- original FD, with the new fdFD
211+  return $ fd{ fdFD = fdFD fdto } -- original FD, with the new fdFD
212hunk ./GHC/IO/FD.hs 359
213-  return fd{ fdIsNonBlocking = fromEnum set }
214+  return $ fd{ fdIsNonBlocking = fromEnum set }
215hunk ./GHC/IO/Handle/Internals.hs 171
216-augmentIOError ioe@IOError{ ioe_filename = fp } fun h
217+augmentIOError ioe@(IOError{ ioe_filename = fp }) fun h
218hunk ./GHC/IO/Handle/Internals.hs 195
219-checkWritableHandle act h_@Handle__{..}
220+checkWritableHandle act h_@(Handle__{..})
221hunk ./GHC/IO/Handle/Internals.hs 206
222-           writeIORef haCharBuffer buf{ bufState = WriteBuffer }
223+           writeIORef haCharBuffer (buf{ bufState = WriteBuffer })
224hunk ./GHC/IO/Handle/Internals.hs 208
225-           writeIORef haByteBuffer buf{ bufState = WriteBuffer }
226+           writeIORef haByteBuffer (buf{ bufState = WriteBuffer })
227hunk ./GHC/IO/Handle/Internals.hs 231
228-checkReadableHandle act h_@Handle__{..} =
229+checkReadableHandle act h_@(Handle__{..}) =
230hunk ./GHC/IO/Handle/Internals.hs 243
231-             writeIORef haCharBuffer cbuf'{ bufState = ReadBuffer }
232+             writeIORef haCharBuffer (cbuf'{ bufState = ReadBuffer })
233hunk ./GHC/IO/Handle/Internals.hs 245
234-             writeIORef haByteBuffer bbuf{ bufState = ReadBuffer }
235+             writeIORef haByteBuffer (bbuf{ bufState = ReadBuffer })
236hunk ./GHC/IO/Handle/Internals.hs 260
237-checkSeekableHandle act handle_@Handle__{haDevice=dev} =
238+checkSeekableHandle act handle_@(Handle__{haDevice=dev}) =
239hunk ./GHC/IO/Handle/Internals.hs 377
240-flushBuffer h_@Handle__{..} = do
241+flushBuffer h_@(Handle__{..}) = do
242hunk ./GHC/IO/Handle/Internals.hs 390
243-flushCharBuffer h_@Handle__{..} = do
244+flushCharBuffer h_@(Handle__{..}) = do
245hunk ./GHC/IO/Handle/Internals.hs 406
246-flushWriteBuffer h_@Handle__{..} = do
247+flushWriteBuffer h_@(Handle__{..}) = do
248hunk ./GHC/IO/Handle/Internals.hs 414
249-flushWriteBuffer_ h_@Handle__{..} cbuf = do
250+flushWriteBuffer_ h_@(Handle__{..}) cbuf = do
251hunk ./GHC/IO/Handle/Internals.hs 418
252-             return cbuf{ bufL=0, bufR=0 }
253+             return $ cbuf{ bufL=0, bufR=0 }
254hunk ./GHC/IO/Handle/Internals.hs 426
255-flushCharReadBuffer Handle__{..} = do
256+flushCharReadBuffer (Handle__{..}) = do
257hunk ./GHC/IO/Handle/Internals.hs 436
258-  writeIORef haCharBuffer cbuf0{ bufL=0, bufR=0 }
259+  writeIORef haCharBuffer (cbuf0{ bufL=0, bufR=0 })
260hunk ./GHC/IO/Handle/Internals.hs 447
261-      writeIORef haByteBuffer bbuf0 { bufL = bufL bbuf0 + bufL cbuf0 }
262+      writeIORef haByteBuffer (bbuf0 { bufL = bufL bbuf0 + bufL cbuf0 })
263hunk ./GHC/IO/Handle/Internals.hs 459
264-                               cbuf0{ bufL=0, bufR=0, bufSize = bufL cbuf0 }
265+                               (cbuf0{ bufL=0, bufR=0, bufSize = bufL cbuf0 })
266hunk ./GHC/IO/Handle/Internals.hs 473
267-flushByteReadBuffer h_@Handle__{..} = do
268+flushByteReadBuffer h_@(Handle__{..}) = do
269hunk ./GHC/IO/Handle/Internals.hs 486
270-  writeIORef haByteBuffer bbuf{ bufL=0, bufR=0 }
271+  writeIORef haByteBuffer (bbuf{ bufL=0, bufR=0 })
272hunk ./GHC/IO/Handle/Internals.hs 587
273-openTextEncoding (Just TextEncoding{..}) ha_type cont = do
274+openTextEncoding (Just (TextEncoding{..})) ha_type cont = do
275hunk ./GHC/IO/Handle/Internals.hs 625
276-hClose_handle_ Handle__{..} = do
277+hClose_handle_ (Handle__{..}) = do
278hunk ./GHC/IO/Handle/Internals.hs 665
279-hLookAhead_ handle_@Handle__{..} = do
280+hLookAhead_ handle_@(Handle__{..}) = do
281hunk ./GHC/IO/Handle/Internals.hs 694
282-writeTextDevice h_@Handle__{..} cbuf = do
283+writeTextDevice h_@(Handle__{..}) cbuf = do
284hunk ./GHC/IO/Handle/Internals.hs 709
285-  writeIORef haByteBuffer bbuf{bufL=0,bufR=0}
286+  writeIORef haByteBuffer (bbuf{bufL=0,bufR=0})
287hunk ./GHC/IO/Handle/Internals.hs 718
288-readTextDevice h_@Handle__{..} cbuf = do
289+readTextDevice h_@(Handle__{..}) cbuf = do
290hunk ./GHC/IO/Handle/Internals.hs 755
291-readTextDevice' h_@Handle__{..} bbuf0 cbuf = do
292+readTextDevice' h_@(Handle__{..}) bbuf0 cbuf = do
293hunk ./GHC/IO/Handle/Internals.hs 789
294-readTextDeviceNonBlocking h_@Handle__{..} cbuf = do
295+readTextDeviceNonBlocking h_@(Handle__{..}) cbuf = do
296hunk ./GHC/IO/Handle/Text.hs 80
297-  wantReadableHandle_ "hWaitForInput" h $ \ handle_@Handle__{..} -> do
298+  wantReadableHandle_ "hWaitForInput" h $ \ handle_@(Handle__{..}) -> do
299hunk ./GHC/IO/Handle/Text.hs 110
300-  wantReadableHandle_ "hGetChar" handle $ \handle_@Handle__{..} -> do
301+  wantReadableHandle_ "hGetChar" handle $ \handle_@(Handle__{..}) -> do
302hunk ./GHC/IO/Handle/Text.hs 174
303-hGetLineBuffered handle_@Handle__{..} = do
304+hGetLineBuffered handle_@(Handle__{..}) = do
305hunk ./GHC/IO/Handle/Text.hs 181
306-hGetLineBufferedLoop handle_@Handle__{..}
307-        buf@Buffer{ bufL=r0, bufR=w, bufRaw=raw0 } xss =
308+hGetLineBufferedLoop handle_@(Handle__{..})
309+        buf@(Buffer{ bufL=r0, bufR=w, bufRaw=raw0 }) xss =
310hunk ./GHC/IO/Handle/Text.hs 219
311-                     writeIORef haCharBuffer buf1{ bufL=0, bufR=0 }
312+                     writeIORef haCharBuffer (buf1{ bufL=0, bufR=0 })
313hunk ./GHC/IO/Handle/Text.hs 357
314-lazyReadBuffered h handle_@Handle__{..} = do
315+lazyReadBuffered h handle_@(Handle__{..}) = do
316hunk ./GHC/IO/Handle/Text.hs 361
317-            buf'@Buffer{..} <- getSomeCharacters handle_ buf
318+            buf'@(Buffer{..}) <- getSomeCharacters handle_ buf
319hunk ./GHC/IO/Handle/Text.hs 382
320-getSomeCharacters handle_@Handle__{..} buf@Buffer{..} =
321+getSomeCharacters handle_@(Handle__{..}) buf@(Buffer{..}) =
322hunk ./GHC/IO/Handle/Text.hs 429
323-hPutcBuffered handle_@Handle__{..} is_line c = do
324+hPutcBuffered handle_@(Handle__{..}) is_line c = do
325hunk ./GHC/IO/Handle/Text.hs 448
326-    putc buf@Buffer{ bufRaw=raw, bufR=w } c = do
327+    putc buf@(Buffer{ bufRaw=raw, bufR=w }) c = do
328hunk ./GHC/IO/Handle/Text.hs 505
329-getSpareBuffer Handle__{haCharBuffer=ref,
330-                        haBuffers=spare_ref,
331-                        haBufferMode=mode}
332+getSpareBuffer (Handle__{haCharBuffer=ref,
333+                         haBuffers=spare_ref,
334+                         haBufferMode=mode})
335hunk ./GHC/IO/Handle/Text.hs 526
336-            buf@Buffer{ bufRaw=raw, bufSize=len } s =
337+            buf@(Buffer{ bufRaw=raw, bufSize=len }) s =
338hunk ./GHC/IO/Handle/Text.hs 604
339-  handle_@Handle__{ haCharBuffer=ref, haBuffers=spare_buf_ref } = do
340+  handle_@(Handle__{ haCharBuffer=ref, haBuffers=spare_buf_ref }) = do
341hunk ./GHC/IO/Handle/Text.hs 609
342-      old_buf@Buffer{ bufRaw=old_raw, bufR=w, bufSize=size }
343+      old_buf@(Buffer{ bufRaw=old_raw, bufR=w, bufSize=size })
344hunk ./GHC/IO/Handle/Text.hs 627
345-                    writeIORef ref old_buf{ bufR = w + count }
346+                    writeIORef ref (old_buf{ bufR = w + count })
347hunk ./GHC/IO/Handle/Text.hs 717
348-      \ h_@Handle__{..} -> do
349+      \ h_@(Handle__{..}) -> do
350hunk ./GHC/IO/Handle/Text.hs 735
351-bufWrite h_@Handle__{..} ptr count can_block =
352+bufWrite h_@(Handle__{..}) ptr count can_block =
353hunk ./GHC/IO/Handle/Text.hs 737
354-  old_buf@Buffer{ bufRaw=old_raw, bufR=w, bufSize=size }
355+  old_buf@(Buffer{ bufRaw=old_raw, bufR=w, bufSize=size })
356hunk ./GHC/IO/Handle/Text.hs 746
357-                writeIORef haByteBuffer old_buf{ bufR = w + count }
358+                writeIORef haByteBuffer (old_buf{ bufR = w + count })
359hunk ./GHC/IO/Handle/Text.hs 753
360-                writeIORef haByteBuffer old_buf{bufL=0,bufR=0}
361+                writeIORef haByteBuffer (old_buf{bufL=0,bufR=0})
362hunk ./GHC/IO/Handle/Text.hs 763
363-writeChunk h_@Handle__{..} ptr bytes
364+writeChunk h_@(Handle__{..}) ptr bytes
365hunk ./GHC/IO/Handle/Text.hs 768
366-writeChunkNonBlocking h_@Handle__{..} ptr bytes
367+writeChunkNonBlocking h_@(Handle__{..}) ptr bytes
368hunk ./GHC/IO/Handle/Text.hs 806
369-bufRead h_@Handle__{..} ptr so_far count =
370+bufRead h_@(Handle__{..}) ptr so_far count =
371hunk ./GHC/IO/Handle/Text.hs 808
372-  buf@Buffer{ bufRaw=raw, bufR=w, bufL=r, bufSize=sz } <- readIORef haByteBuffer
373+  buf@(Buffer{ bufRaw=raw, bufR=w, bufL=r, bufSize=sz }) <- readIORef haByteBuffer
374hunk ./GHC/IO/Handle/Text.hs 823
375-                writeIORef haByteBuffer buf{ bufR=0, bufL=0 }
376+                writeIORef haByteBuffer (buf{ bufR=0, bufL=0 })
377hunk ./GHC/IO/Handle/Text.hs 829
378-                writeIORef haByteBuffer buf{ bufL = r + count }
379+                writeIORef haByteBuffer (buf{ bufL = r + count })
380hunk ./GHC/IO/Handle/Text.hs 834
381-        writeIORef haByteBuffer buf{ bufR=0, bufL=0 }
382+        writeIORef haByteBuffer (buf{ bufR=0, bufL=0 })
383hunk ./GHC/IO/Handle/Text.hs 847
384-readChunk h_@Handle__{..} ptr bytes
385+readChunk h_@(Handle__{..}) ptr bytes
386hunk ./GHC/IO/Handle/Text.hs 889
387-bufReadNonBlocking h_@Handle__{..} ptr so_far count =
388+bufReadNonBlocking h_@(Handle__{..}) ptr so_far count =
389hunk ./GHC/IO/Handle/Text.hs 891
390-  buf@Buffer{ bufRaw=raw, bufR=w, bufL=r, bufSize=sz } <- readIORef haByteBuffer
391+  buf@(Buffer{ bufRaw=raw, bufR=w, bufL=r, bufSize=sz }) <- readIORef haByteBuffer
392hunk ./GHC/IO/Handle/Text.hs 912
393-                writeIORef haByteBuffer buf{ bufR=0, bufL=0 }
394+                writeIORef haByteBuffer (buf{ bufR=0, bufL=0 })
395hunk ./GHC/IO/Handle/Text.hs 918
396-                writeIORef haByteBuffer buf{ bufL = r + count }
397+                writeIORef haByteBuffer (buf{ bufL = r + count })
398hunk ./GHC/IO/Handle/Text.hs 923
399-        writeIORef haByteBuffer buf{ bufR=0, bufL=0 }
400+        writeIORef haByteBuffer (buf{ bufR=0, bufL=0 })
401hunk ./GHC/IO/Handle/Text.hs 938
402-readChunkNonBlocking h_@Handle__{..} ptr bytes
403+readChunkNonBlocking h_@(Handle__{..}) ptr bytes
404hunk ./GHC/IO/Handle/Types.hs 173
405-isReadWriteHandleType ReadWriteHandle{} = True
406-isReadWriteHandleType _                 = False
407+isReadWriteHandleType (ReadWriteHandle{}) = True
408+isReadWriteHandleType _                   = False
409hunk ./GHC/IO/Handle.hs 111
410-    withHandle_ "hFileSize" handle $ \ handle_@Handle__{haDevice=dev} -> do
411+    withHandle_ "hFileSize" handle $ \ handle_@(Handle__{haDevice=dev}) -> do
412hunk ./GHC/IO/Handle.hs 127
413-    withHandle_ "hSetFileSize" handle $ \ handle_@Handle__{haDevice=dev} -> do
414+    withHandle_ "hSetFileSize" handle $ \ handle_@(Handle__{haDevice=dev}) -> do
415hunk ./GHC/IO/Handle.hs 192
416-  withAllHandles__ "hSetBuffering" handle $ \ handle_@Handle__{..} -> do
417+  withAllHandles__ "hSetBuffering" handle $ \ handle_@(Handle__{..}) -> do
418hunk ./GHC/IO/Handle.hs 242
419-          return Handle__{ haBufferMode = mode,.. }
420+          return $ Handle__{ haBufferMode = mode,.. }
421hunk ./GHC/IO/Handle.hs 261
422-  withHandle "hSetEncoding" hdl $ \h_@Handle__{..} -> do
423+  withHandle "hSetEncoding" hdl $ \h_@(Handle__{..}) -> do
424hunk ./GHC/IO/Handle.hs 283
425-  withHandle_ "hGetEncoding" hdl $ \h_@Handle__{..} -> return haCodec
426+  withHandle_ "hGetEncoding" hdl $ \h_@(Handle__{..}) -> return haCodec
427hunk ./GHC/IO/Handle.hs 391
428-    wantSeekableHandle "hSeek" handle $ \ handle_@Handle__{..} -> do
429+    wantSeekableHandle "hSeek" handle $ \ handle_@(Handle__{..}) -> do
430hunk ./GHC/IO/Handle.hs 403
431-        then writeIORef haCharBuffer buf{ bufL = r + fromIntegral offset }
432+        then writeIORef haCharBuffer (buf{ bufL = r + fromIntegral offset })
433hunk ./GHC/IO/Handle.hs 413
434-    wantSeekableHandle "hGetPosn" handle $ \ handle_@Handle__{..} -> do
435+    wantSeekableHandle "hGetPosn" handle $ \ handle_@(Handle__{..}) -> do
436hunk ./GHC/IO/Handle.hs 496
437-    withHandle_ "hIsSeekable" handle $ \ handle_@Handle__{..} -> do
438+    withHandle_ "hIsSeekable" handle $ \ handle_@(Handle__{..}) -> do
439hunk ./GHC/IO/Handle.hs 514
440-      withHandle_ "hSetEcho" handle $ \ Handle__{..} -> do
441+      withHandle_ "hSetEcho" handle $ \(Handle__{..}) -> do
442hunk ./GHC/IO/Handle.hs 527
443-       withHandle_ "hGetEcho" handle $ \ Handle__{..} -> do
444+       withHandle_ "hGetEcho" handle $ \(Handle__{..}) -> do
445hunk ./GHC/IO/Handle.hs 536
446-    withHandle_ "hIsTerminalDevice" handle $ \ Handle__{..} -> do
447+    withHandle_ "hIsTerminalDevice" handle $ \(Handle__{..}) -> do
448hunk ./GHC/IO/Handle.hs 552
449-  withAllHandles__ "hSetBinaryMode" handle $ \ h_@Handle__{..} ->
450+  withAllHandles__ "hSetBinaryMode" handle $ \h_@(Handle__{..}) ->
451hunk ./GHC/IO/Handle.hs 568
452-         return Handle__{ haLastDecode = ref,
453-                          haEncoder  = mb_encoder,
454-                          haDecoder  = mb_decoder,
455-                          haCodec    = mb_te,
456-                          haInputNL  = inputNL nl,
457-                          haOutputNL = outputNL nl, .. }
458+         return $ Handle__{ haLastDecode = ref,
459+                            haEncoder  = mb_encoder,
460+                            haDecoder  = mb_decoder,
461+                            haCodec    = mb_te,
462+                            haInputNL  = inputNL nl,
463+                            haOutputNL = outputNL nl, .. }
464hunk ./GHC/IO/Handle.hs 581
465-hSetNewlineMode handle NewlineMode{ inputNL=i, outputNL=o } =
466-  withAllHandles__ "hSetNewlineMode" handle $ \h_@Handle__{..} ->
467+hSetNewlineMode handle (NewlineMode{ inputNL=i, outputNL=o }) =
468+  withAllHandles__ "hSetNewlineMode" handle $ \h_@(Handle__{..}) ->
469hunk ./GHC/IO/Handle.hs 585
470-         return h_{ haInputNL=i, haOutputNL=o }
471+         return $ h_{ haInputNL=i, haOutputNL=o }
472hunk ./GHC/IO/Handle.hs 614
473-dupHandle filepath h other_side h_@Handle__{..} mb_finalizer = do
474+dupHandle filepath h other_side h_@(Handle__{..}) mb_finalizer = do
475hunk ./GHC/IO/Handle.hs 622
476-       withHandle_' "dupHandle" h r $ \Handle__{haDevice=dev} -> do
477+       withHandle_' "dupHandle" h r $ \(Handle__{haDevice=dev}) -> do
478hunk ./GHC/IO/Handle.hs 631
479-dupHandle_ new_dev filepath other_side h_@Handle__{..} mb_finalizer = do
480+dupHandle_ new_dev filepath other_side h_@(Handle__{..}) mb_finalizer = do
481hunk ./GHC/IO/Handle.hs 635
482-      NewlineMode { inputNL = haInputNL, outputNL = haOutputNL }
483+      (NewlineMode { inputNL = haInputNL, outputNL = haOutputNL })
484hunk ./GHC/IO/Handle.hs 683
485-            hto_@Handle__{haDevice=devTo,..}
486-            h_@Handle__{haDevice=dev} mb_finalizer = do
487+            hto_@(Handle__{haDevice=devTo,..})
488+            h_@(Handle__{haDevice=dev}) mb_finalizer = do
489hunk ./GHC/TopHandler.lhs 168
490-                Just IOError{ ioe_type = ResourceVanished,
491-                              ioe_errno = Just ioe,
492-                              ioe_handle = Just hdl }
493+                Just (IOError{ ioe_type = ResourceVanished,
494+                               ioe_errno = Just ioe,
495+                               ioe_handle = Just hdl })
496}
497
498Context:
499
500[Move the instances of Functor and Monad IO to GHC.Base, to avoid orphans
501Simon Marlow <[email protected]>**20090722102130
502 Ignore-this: a7d85ac0025d559674249de0108dbcf4
503]
504[move "instance Exception Dynamic" so it isn't an orphan
505Simon Marlow <[email protected]>**20090721093854
506 Ignore-this: 5ede91ecfec2112c91b699d4de87cd02
507]
508[Add integer-simple as a build option
509Ian Lynagh <[email protected]>**20090722013151]
510[Use shift[LR]Integer in the Bits Integer instance
511Ian Lynagh <[email protected]>**20090721222440]
512[depend directly on integer-gmp, rather than indirecting through integer
513Ian Lynagh <[email protected]>**20090721185228]
514[Improve the index checking for array accesses; fixes #2120 #2669
515Ian Lynagh <[email protected]>**20090719153228
516 As well as checking that offset we are reading is actually inside the
517 array, we now also check that it is "in range" as defined by the Ix
518 instance. This fixes confusing behaviour (#2120) and improves some error
519 messages (#2669).
520]
521[Make chr say what its argument was, if it's a bad argument
522Ian Lynagh <[email protected]>**20090718151049]
523[remove unused warning
524Simon Marlow <[email protected]>**20090715124416
525 Ignore-this: 31f613654089d0f4a44363946087b41e
526]
527[warning fix: -fno-implicit-prelude -> -XNoImplicitPrelude
528Simon Marlow <[email protected]>**20090715122839
529 Ignore-this: dc8957249731d5bcb71c01899e5adf2b
530]
531[Add hGetEncoding :: Handle -> IO (Maybe TextEncoding)
532Simon Marlow <[email protected]>**20090715122519
533 Ignore-this: 14c3eff996db062da1199739781e4708
534 as suggested during the discussion on the libraries list
535]
536[Add more documentation to mkTextEncoding
537Simon Marlow <[email protected]>**20090715122414
538 Ignore-this: 97253b2624267df3a246a18121e8ea81
539 noting that "//IGNORE" and "//TRANSLIT" suffixes can be used with GNU
540 iconv.
541]
542[Add the utf8_bom codec
543Simon Marlow <[email protected]>**20090715122257
544 Ignore-this: 1c9396cd805201fe873a39382ced79c7
545 as suggested during the discussion on the libraries list.
546]
547[Export Unicode and newline functionality from System.IO; update Haddock docs
548Simon Marlow <[email protected]>**20090713113104
549 Ignore-this: c3f017a555335aa55d106253393f72e2
550]
551[add a comment about the non-workingness of CHARBUF_UTF16
552Simon Marlow <[email protected]>**20090707124406
553 Ignore-this: 98d00411b68d688b3b4cffc9507b1f35
554]
555[Fix build on Windows
556Ian Lynagh <[email protected]>**20090711004351]
557[Fix some "warn-unused-do-bind" warnings where we want to ignore the value
558Ian Lynagh <[email protected]>**20090710204513]
559[Use throwErrnoIfMinus1_ when calling getrusage
560Ian Lynagh <[email protected]>**20090710204221]
561[Remove an unused import
562Ian Lynagh <[email protected]>**20090710153345]
563[reportStackOverflow now returns IO ()
564Ian Lynagh <[email protected]>**20090710153257
565 It used to do "return undefined" to return IO a.
566]
567[GHC.Conc.reportError now returns IO ()
568Ian Lynagh <[email protected]>**20090710152646
569 It used to return IO a, by "return undefined".
570]
571[Fix some "warn-unused-do-bind" warnings where we want to ignore the value
572Ian Lynagh <[email protected]>**20090710152526]
573[Minor SampleVar refactoring
574Ian Lynagh <[email protected]>**20090710151438]
575[Fix "warn-unused-do-bind" warnings in GHC/IO/Handle/Text.hs
576Ian Lynagh <[email protected]>**20090710122905]
577[Fix some "warn-unused-do-bind" warnings where we just want to ignore the result
578Ian Lynagh <[email protected]>**20090710005638]
579[Use the result of writeCharBuf in GHC/IO/Encoding/Latin1.hs too
580Ian Lynagh <[email protected]>**20090710004032]
581[Minor code tidyups in GHC.Conc
582Ian Lynagh <[email protected]>**20090710003801]
583[Fix "warn-unused-do-bind" warning in GHC.Conc
584Ian Lynagh <[email protected]>**20090710003530
585 If we fail to communicate with the IO manager then we print a warning
586 using debugErrLn from the ghc-prim package.
587]
588[Fix "warn-unused-do-bind" warnings in System.Posix.Internals
589Ian Lynagh <[email protected]>**20090709164546]
590[Fix "warn-unused-do-bind" warnings where we really do want to ignore the result
591Ian Lynagh <[email protected]>**20090709163912]
592[Add back imports needed on Windows
593Ian Lynagh <[email protected]>**20090707181924]
594[Use the result of writeCharBuf
595Simon Marlow <[email protected]>**20090706133303
596 Ignore-this: 52288dd559bf4c4f313df6197091d935
597   
598 This only makes a difference when CHARBUF_UTF16 is in use, which it
599 normally isn't.  I suspect CHARBUF_UTF16 doesn't currently work for
600 other reasons (CHARBUF_UTF16 was an experiment before I wrote the
601 GHC.IO.Encoding.UTF* codecs), but this patch at least makes it
602 slightly closer to working.
603]
604[Remove unused imports
605Ian Lynagh <[email protected]>**20090707115810]
606[Remove unused imports from base
607[email protected]**20090706111842
608 Ignore-this: f9b5f353e3bb820f787c56d615b28765
609 
610 These unused imports are detected by the new unused-import code
611 
612]
613[Add 'eof' to Text.ParserCombinators.ReadP
614[email protected]**20090706111801
615 Ignore-this: 2aea7b848e00c894761bc4011adaa95d
616 
617 Add a ReadP parser that succeeds at the end of input. Very useful!
618 
619]
620[Remove some cruft from Data.HashTable
621Ian Lynagh <[email protected]>**20090706181630]
622[Don't export CLDouble for GHC; fixes trac #2793
623Ian Lynagh <[email protected]>**20090705155120
624 We never really supported CLDouble (it was a plain old double underneath),
625 and pretending that we do does more harm than good.
626]
627[a byte between 0x80 and 0xBF is illegal immediately (#3341)
628Simon Marlow <[email protected]>**20090702081415
629 Ignore-this: dc19ef59a1a21118d5a7dd38aa2f611c
630]
631[avoid a warning
632Simon Marlow <[email protected]>**20090630084134
633 Ignore-this: c92a45ee216faf01327feae9fe06d6e2
634]
635[Add a wrapper for libiconv.
636Matthias Kilian <[email protected]>**20090629183634
637 Ignore-this: 23c6047c0d71b745b495cc223574a47f
638]
639[#include <sys/times.h> if we have it (should fix build problems)
640Simon Marlow <[email protected]>**20090629085351
641 Ignore-this: a35e93b37ca9595c73460243180f4b9d
642]
643[set binary mode for existing FDs on Windows (fixes some GHCi test failures)
644Simon Marlow <[email protected]>**20090626120522
645 Ignore-this: 580cf636e9c77d8427aff6861d089481
646]
647[Move directory-related stuff to the unix package
648Simon Marlow <[email protected]>**20090625120325
649 Ignore-this: b997b3cbce0a46ca87ad825bbdc0a411
650 now that it isn't used on Windows any more.
651]
652[TAG 2009-06-25
653Ian Lynagh <[email protected]>**20090625160056]
654Patch bundle hash:
6555c4590d476c551027b5d3f478e3b9a003f4ff4f9