Package: frown / 0.6.1-14

ghc-7.4.1-compat Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
Index: frown-0.6.1/Main.lhs
===================================================================
--- frown-0.6.1.orig/Main.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Main.lhs	2012-03-15 14:21:07.000000000 +0100
@@ -53,11 +53,12 @@
 > import Prettier               hiding (  string, concat  )
 > import qualified Prettier as PP
 > import qualified SearchTree as ST
-> import Monad                  (  when  )
-> import Directory
-> import IO
-> import System
+> import Control.Monad                  (  when  )
+> import System.Directory
+> import System.IO
 > import System.Console.GetOpt
+> import System.Exit
+> import System.Environment
 
 %-------------------------------=  --------------------------------------------
 \section{The main program}
@@ -689,4 +690,4 @@
                                  | let add op = ADDOP (op :: Addop)
                                  | let id  s  = IDENT (s :: String);
 
-   |add op| serves as an abbreviation for |ADDOP op|.
\ No newline at end of file
+   |add op| serves as an abbreviation for |ADDOP op|.
Index: frown-0.6.1/Base.lhs
===================================================================
--- frown-0.6.1.orig/Base.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Base.lhs	2012-03-15 14:20:13.000000000 +0100
@@ -36,9 +36,9 @@
 > where
 >
 > import Prettier
-> import Monad                  (  MonadPlus(..)  )
-> import IO
-> import System
+> import Control.Monad          (  MonadPlus(..)  )
+> import System.Exit
+> import System.IO
 
 %-------------------------------------------------------------------------------
 \subsection{List utilities}
Index: frown-0.6.1/Case.lhs
===================================================================
--- frown-0.6.1.orig/Case.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Case.lhs	2012-03-15 14:16:03.000000000 +0100
@@ -45,10 +45,10 @@
 > import MergeSort
 > import Base
 > import Options
-> import Maybe
-> import IO
-> import Monad
-> import List                   (  partition  )
+> import Data.Maybe
+> import System.IO
+> import Control.Monad
+> import Data.List              (  partition  )
 > import Prelude                hiding (  lookup  )
 
 %-------------------------------=  --------------------------------------------
@@ -347,4 +347,4 @@
 > actions'                      :: Symbol -> Past -> Past
 > actions' x (Node es ts)       =  Node [ a{ future = f } | a <- es
 >                                                         , Just f <- [lookup (future a) x] ]
->                                       [ (e, actions' x t) | (e, t) <- ts ]
\ No newline at end of file
+>                                       [ (e, actions' x t) | (e, t) <- ts ]
Index: frown-0.6.1/Compact.lhs
===================================================================
--- frown-0.6.1.orig/Compact.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Compact.lhs	2012-03-15 14:19:05.000000000 +0100
@@ -49,9 +49,9 @@
 > import Base
 > import Generate
 > import MergeSort
-> import Char
-> import IO
-> import Maybe
+> import Data.Char
+> import System.IO
+> import Data.Maybe
 > import Prelude                hiding (  lookup  )
 
 %-------------------------------=  --------------------------------------------
@@ -444,4 +444,4 @@
 
 >     wrap s                    =  prefix opts ++ s ++ suffix opts
 >     wrap_var s                =  var (wrap s)
->     wrap_con s                =  con (wrap s)
\ No newline at end of file
+>     wrap_con s                =  con (wrap s)
Index: frown-0.6.1/Convert.lhs
===================================================================
--- frown-0.6.1.orig/Convert.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Convert.lhs	2012-03-15 14:16:45.000000000 +0100
@@ -42,13 +42,13 @@
 > import OrdUniqListSet         (  Set, MinView(Empty, Min)  ) -- for nhc98
 > import Atom                   hiding (  string  )
 > import Haskell                hiding (  Empty, Decl, guard  )
-> import Maybe
-> import List
+> import Data.Maybe
+> import Data.List
 > import Base
 > import Prettier               hiding (  concat, intersperse  )
 > import qualified Prettier as PP
-> import Monad
-> import IO                     hiding (  isEOF  )
+> import Control.Monad
+> import System.IO              hiding (  isEOF  )
 > import Options
 
 > newEOF                        :: Ident
@@ -361,4 +361,4 @@
 >           | terminal w        =  w
 >           | otherwise         =  case lookup w bindings of
 >                                      Just w' -> w' { attributes = attributes w }
->                                      Nothing -> updateArgs w (map substitute (arguments w))
\ No newline at end of file
+>                                      Nothing -> updateArgs w (map substitute (arguments w))
Index: frown-0.6.1/GParser2.hs
===================================================================
--- frown-0.6.1.orig/GParser2.hs	2005-12-15 10:09:24.000000000 +0100
+++ frown-0.6.1/GParser2.hs	2012-03-15 14:20:37.000000000 +0100
@@ -47,9 +47,9 @@
   import qualified Base
   import Prettier               (  Pretty  )
   import Options
-  import Char
-  import List
-  import IO
+  import Data.Char              hiding ( isSymbol )
+  import Data.List
+  import System.IO
 
 
 
@@ -2258,4 +2258,4 @@
       where verb                =  verbose opts
  
   run                           :: (Monad m) => Lex m Answer -> (String -> m Answer)
-  run parser inp                =  unLex parser (\a _ _ _ _ -> return a) False inp 1 (take 1 (lines inp))
\ No newline at end of file
+  run parser inp                =  unLex parser (\a _ _ _ _ -> return a) False inp 1 (take 1 (lines inp))
Index: frown-0.6.1/GParser2.lg
===================================================================
--- frown-0.6.1.orig/GParser2.lg	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/GParser2.lg	2012-03-15 14:18:08.000000000 +0100
@@ -47,9 +47,9 @@
 > import qualified Base
 > import Prettier               (  Pretty  )
 > import Options
-> import Char
-> import List
-> import IO
+> import Data.Char
+> import Data.List
+> import System.IO
 
 % - - - - - - - - - - - - - - - = - - - - - - - - - - - - - - - - - - - - - - -
 \subsection{Abstract syntax}
@@ -481,4 +481,4 @@
 >     where verb                =  verbose opts
 >
 > run                           :: (Monad m) => Lex m Answer -> (String -> m Answer)
-> run parser inp                =  unLex parser (\a _ _ _ _ -> return a) False inp 1 (take 1 (lines inp))
\ No newline at end of file
+> run parser inp                =  unLex parser (\a _ _ _ _ -> return a) False inp 1 (take 1 (lines inp))
Index: frown-0.6.1/GVStack.lhs
===================================================================
--- frown-0.6.1.orig/GVStack.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/GVStack.lhs	2012-03-15 14:18:51.000000000 +0100
@@ -45,10 +45,10 @@
 > import Options
 > import Base
 > import Generate
-> import IO
-> import Monad
-> import Char
-> import List                   (  maximumBy  )
+> import System.IO
+> import Control.Monad
+> import Data.Char
+> import Data.List              (  maximumBy  )
 > import Prelude                hiding (  lookup  )
 
 %-------------------------------=  --------------------------------------------
Index: frown-0.6.1/Generate.lhs
===================================================================
--- frown-0.6.1.orig/Generate.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Generate.lhs	2012-03-15 14:12:58.000000000 +0100
@@ -43,7 +43,7 @@
 > import OrdUniqListSet         (  Set  )
 > import Base
 > --import Char                   (  toLower, toUpper  )
-> import List                   (  intersperse  )
+> import Data.List              (  intersperse  )
 
 Symbols.
 
Index: frown-0.6.1/Haskell.lhs
===================================================================
--- frown-0.6.1.orig/Haskell.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Haskell.lhs	2012-03-15 14:14:23.000000000 +0100
@@ -35,7 +35,7 @@
 > import Atom                   hiding (  string  )
 > import qualified Atom
 > import Prettier
-> import Char
+> import Data.Char
 > import Prelude                hiding (  concat  )
 
 %-------------------------------=  --------------------------------------------
Index: frown-0.6.1/LR0.lhs
===================================================================
--- frown-0.6.1.orig/LR0.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/LR0.lhs	2012-03-15 14:13:48.000000000 +0100
@@ -45,7 +45,7 @@
 > import Base                   hiding (  list  )
 > import qualified Base
 > import Prelude                hiding (  null  )
-> import IO
+> import System.IO
 > import Options
 
 %-------------------------------=  --------------------------------------------
@@ -269,4 +269,4 @@
 productions such as |Start# : Start, EOF;|.
 
 > errorState                    :: State
-> errorState                    =  State 0 (Set.empty :\/ Set.empty)
\ No newline at end of file
+> errorState                    =  State 0 (Set.empty :\/ Set.empty)
Index: frown-0.6.1/Lexer2.lhs
===================================================================
--- frown-0.6.1.orig/Lexer2.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Lexer2.lhs	2012-03-15 14:14:43.000000000 +0100
@@ -35,9 +35,9 @@
 > module Lexer2
 > where
 > import Prelude
-> import Char
-> import IO
-> import Monad
+> import Data.Char
+> import System.IO
+> import Control.Monad
 > import Base
 > import Options
 
Index: frown-0.6.1/Lib/OrdUniqListFM.lhs
===================================================================
--- frown-0.6.1.orig/Lib/OrdUniqListFM.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Lib/OrdUniqListFM.lhs	2012-03-15 14:14:08.000000000 +0100
@@ -64,8 +64,8 @@
 > import qualified OrdUniqList as OUL
 > import MergeSort		(  mergeSort  )
 > import Prettier               hiding (  empty  )
-> import qualified List
-> import Maybe                  (  fromMaybe  )
+> import qualified Data.List as List
+> import Data.Maybe             (  fromMaybe  )
 
 > infixl 9  !
 > infixl 9  //
@@ -292,4 +292,4 @@
 @prefixLookup@ returns the list of all completions of the given list.
 
  prefixLookup			:: Ord a => FM [a] b -> [a] -> [([a], b)]
- prefixLookup (FM f) s		=  [ b | Assoc b@(a, _)<-f, s `isPrefixOf` a ]
\ No newline at end of file
+ prefixLookup (FM f) s		=  [ b | Assoc b@(a, _)<-f, s `isPrefixOf` a ]
Index: frown-0.6.1/Lib/OrdUniqListSet.lhs
===================================================================
--- frown-0.6.1.orig/Lib/OrdUniqListSet.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Lib/OrdUniqListSet.lhs	2012-03-15 14:19:55.000000000 +0100
@@ -59,8 +59,8 @@
 > import qualified Prelude
 > import qualified OrdUniqList as OUL
 > import Prettier               hiding (  empty  )
-> import qualified List
-> import Monad
+> import qualified Data.List as List
+> import Control.Monad
 
 %-------------------------------------------------------------------------------
 \subsection{Type definitions and instance declarations}
Index: frown-0.6.1/Lookahead.lhs
===================================================================
--- frown-0.6.1.orig/Lookahead.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Lookahead.lhs	2012-03-15 14:16:21.000000000 +0100
@@ -42,9 +42,9 @@
 > import qualified Prettier as PP
 > import Base
 > import Options
-> import IO
-> import Maybe
-> import Monad                  (  when  )
+> import System.IO
+> import Data.Maybe
+> import Control.Monad             (  when  )
 
 %-------------------------------=  --------------------------------------------
 \section{Grouping of actions}
Index: frown-0.6.1/Options.lhs
===================================================================
--- frown-0.6.1.orig/Options.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Options.lhs	2012-03-15 14:12:01.000000000 +0100
@@ -33,8 +33,8 @@
 > where
 > import Base
 > import System.Console.GetOpt
-> import Char
-> import IO
+> import Data.Char
+> import System.IO
 
 %-------------------------------=  --------------------------------------------
 \section{Command line options}
@@ -149,4 +149,4 @@
 >   | otherwise                 =  Signature False
 
 > (<<)                          :: String -> String -> Bool
-> s << t                        =  map toLower s `isPrefix` map toLower t
\ No newline at end of file
+> s << t                        =  map toLower s `isPrefix` map toLower t
Index: frown-0.6.1/SearchTree.lhs
===================================================================
--- frown-0.6.1.orig/SearchTree.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/SearchTree.lhs	2012-03-15 14:11:29.000000000 +0100
@@ -32,7 +32,7 @@
 >                               ,  length, lookup, unsafeLookup  )
 > where
 > import MergeSort		(  mergeSortBy  )
-> import Maybe                  (  fromMaybe  )
+> import Data.Maybe             (  fromMaybe  )
 > import Prelude                hiding (  length, lookup  )
 > import qualified Prelude
 
Index: frown-0.6.1/Stackless.lhs
===================================================================
--- frown-0.6.1.orig/Stackless.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Stackless.lhs	2012-03-15 14:12:44.000000000 +0100
@@ -47,10 +47,10 @@
 > import Base
 > import Generate
 > import MergeSort
-> import Char
-> import Maybe
-> import IO
-> import Monad
+> import Data.Char
+> import Data.Maybe
+> import System.IO
+> import Control.Monad
 > import Prelude                hiding (  lookup  )
 
 Characteristics.
@@ -311,4 +311,4 @@
 
 >     wrap s                    =  prefix opts ++ s ++ suffix opts
 >     wrap_var s                =  var (wrap s)
->     wrap_con s                =  con (wrap s)
\ No newline at end of file
+>     wrap_con s                =  con (wrap s)
Index: frown-0.6.1/Standard.lhs
===================================================================
--- frown-0.6.1.orig/Standard.lhs	2012-03-15 13:09:04.000000000 +0100
+++ frown-0.6.1/Standard.lhs	2012-03-15 14:19:39.000000000 +0100
@@ -47,9 +47,9 @@
 > import Options
 > import Base
 > import Generate
-> import Char
-> import IO
-> import Maybe
+> import Data.Char
+> import System.IO
+> import Data.Maybe
 > import Prelude                hiding (  lookup  )
 
 Characteristics.
@@ -293,4 +293,4 @@
 
 >     wrap s                    =  prefix opts ++ s ++ suffix opts
 >     wrap_var s                =  var (wrap s)
->     wrap_con s                =  con (wrap s)
\ No newline at end of file
+>     wrap_con s                =  con (wrap s)