]> git.pld-linux.org Git - packages/BNFC.git/blame - BNFC-ghc72.patch
projects / packages / BNFC.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- should work now with alex 3 and ghc 7.2
[packages/BNFC.git] / BNFC-ghc72.patch
CommitLineData
8f39da9e
JR		 1diff -ur BNFC-2.4.2.0/BNFC.cabal BNFC-2.4.2.0-ghc-7.2/BNFC.cabal
2--- BNFC-2.4.2.0/BNFC.cabal 2010-09-15 16:26:38.000000000 +0200
3+++ BNFC-2.4.2.0-ghc-7.2/BNFC.cabal 2011-10-28 14:30:05.093264132 +0200
4@@ -24,7 +24,7 @@
5 Extra-source-files: BNF.cf
6
7 Executable bnfc
8- Build-Depends: haskell98, base>=4 && <5, mtl, directory, array, process
9+ Build-Depends: base>=4 && <5, mtl, directory, array, process
10 Main-is: Main.hs
11 HS-source-dirs: . formats
12 formats/haskell2
13diff -ur BNFC-2.4.2.0/CF.hs BNFC-2.4.2.0-ghc-7.2/CF.hs
14--- BNFC-2.4.2.0/CF.hs 2010-09-15 16:26:38.000000000 +0200
15+++ BNFC-2.4.2.0-ghc-7.2/CF.hs 2011-10-28 14:34:50.556610344 +0200
16@@ -101,8 +101,8 @@
17 ) where
18
19 import Utils (prParenth,(+++))
20-import List (nub, intersperse, partition, sort,sort,group)
21-import Char
22+import Data.List (nub, intersperse, partition, sort,sort,group)
23+import Data.Char
24 import AbsBNF (Reg())
25
26 -- A context free grammar consists of a set of rules and some extended
27diff -ur BNFC-2.4.2.0/GetCF.hs BNFC-2.4.2.0-ghc-7.2/GetCF.hs
28--- BNFC-2.4.2.0/GetCF.hs 2010-09-15 16:26:38.000000000 +0200
29+++ BNFC-2.4.2.0-ghc-7.2/GetCF.hs 2011-10-28 14:39:40.099956741 +0200
30@@ -20,17 +20,17 @@
31
32 module GetCF where
33
34-import Directory ( doesFileExist, renameFile )
35-import Monad ( when )
36+import System.Directory ( doesFileExist, renameFile )
37+import Control.Monad ( when )
38
39 import CF
40 import Utils
41 import ParBNF
42-import List(nub,partition)
43+import Data.List(nub,partition)
44 import qualified AbsBNF as Abs
45 -- import LexBNF
46 import ErrM
47-import Char
48+import Data.Char
49 import TypeChecker
50
51 readCF :: FilePath -> IO CF
52diff -ur BNFC-2.4.2.0/Main.hs BNFC-2.4.2.0-ghc-7.2/Main.hs
53--- BNFC-2.4.2.0/Main.hs 2010-09-15 16:26:38.000000000 +0200
54+++ BNFC-2.4.2.0-ghc-7.2/Main.hs 2011-10-28 15:02:46.772214302 +0200
55@@ -41,9 +41,10 @@
56
57 import MultiView (preprocessMCF, mkTestMulti, mkMakefileMulti)
58
59-import System
60+import System.Process
61+import System.Environment
62 import System.Exit
63-import Char
64+import Data.Char
65 import Data.List (elemIndex)
66
67 version = "2.4.2.0"
68diff -ur BNFC-2.4.2.0/MultiView.hs BNFC-2.4.2.0-ghc-7.2/MultiView.hs
69--- BNFC-2.4.2.0/MultiView.hs 2010-09-15 16:26:38.000000000 +0200
70+++ BNFC-2.4.2.0-ghc-7.2/MultiView.hs 2011-10-28 14:38:04.706619104 +0200
71@@ -20,17 +20,17 @@
72
73 module MultiView where
74
75-import Directory ( doesFileExist, renameFile )
76+import System.Directory ( doesFileExist, renameFile )
77
78 import qualified CF as CF
79 import Utils
80 import ParBNF
81 import PrintBNF
82-import List(nub,partition)
83+import Data.List(nub,partition)
84 import AbsBNF
85 -- import LexBNF
86 import ErrM
87-import Char
88+import Data.Char
89 import TypeChecker
90
91 preprocessMCF :: FilePath -> IO ([FilePath],String)
92diff -ur BNFC-2.4.2.0/ParBNF.hs BNFC-2.4.2.0-ghc-7.2/ParBNF.hs
93--- BNFC-2.4.2.0/ParBNF.hs 2010-09-15 16:26:38.000000000 +0200
94+++ BNFC-2.4.2.0-ghc-7.2/ParBNF.hs 2011-10-28 14:35:43.716612743 +0200
95@@ -4,7 +4,7 @@
96 import AbsBNF
97 import LexBNF
98 import ErrM
99-import Array
100+import Data.Array
101 #if __GLASGOW_HASKELL__ >= 503
102 import GHC.Exts
103 #else
104diff -ur BNFC-2.4.2.0/PrintBNF.hs BNFC-2.4.2.0-ghc-7.2/PrintBNF.hs
105--- BNFC-2.4.2.0/PrintBNF.hs 2010-09-15 16:26:38.000000000 +0200
106+++ BNFC-2.4.2.0-ghc-7.2/PrintBNF.hs 2011-10-28 14:35:28.079945370 +0200
107@@ -4,7 +4,7 @@
108 -- pretty-printer generated by the BNF converter
109
110 import AbsBNF
111-import Char
112+import Data.Char
113
114 -- the top-level printing method
115 printTree :: Print a => a -> String
116diff -ur BNFC-2.4.2.0/formats/CFtoLatex.hs BNFC-2.4.2.0-ghc-7.2/formats/CFtoLatex.hs
117--- BNFC-2.4.2.0/formats/CFtoLatex.hs 2010-09-15 16:26:38.000000000 +0200
118+++ BNFC-2.4.2.0-ghc-7.2/formats/CFtoLatex.hs 2011-10-28 14:42:26.973297602 +0200
119@@ -22,7 +22,7 @@
120 import CF
121 import AbsBNF (Reg (..))
122 import Utils
123-import List (nub,intersperse)
124+import Data.List (nub,intersperse)
125
126 cfToLatex :: String -> CF -> String
127 cfToLatex name cf = unlines [
128diff -ur BNFC-2.4.2.0/formats/CFtoTxt.hs BNFC-2.4.2.0-ghc-7.2/formats/CFtoTxt.hs
129--- BNFC-2.4.2.0/formats/CFtoTxt.hs 2010-09-15 16:26:38.000000000 +0200
130+++ BNFC-2.4.2.0-ghc-7.2/formats/CFtoTxt.hs 2011-10-28 14:42:32.619964525 +0200
131@@ -22,7 +22,7 @@
132 import CF
133 import AbsBNF (Reg (..))
134 import Utils
135-import List (nub,intersperse)
136+import Data.List (nub,intersperse)
137
138 cfToTxt :: String -> CF -> String
139 cfToTxt name cf = unlines [
140diff -ur BNFC-2.4.2.0/formats/NamedVariables.hs BNFC-2.4.2.0-ghc-7.2/formats/NamedVariables.hs
141--- BNFC-2.4.2.0/formats/NamedVariables.hs 2010-09-15 16:26:38.000000000 +0200
142+++ BNFC-2.4.2.0-ghc-7.2/formats/NamedVariables.hs 2011-10-28 14:42:41.336631584 +0200
143@@ -38,8 +38,8 @@
144 module NamedVariables where
145
146 import CF
147-import Char (toLower)
148-import List (nub)
149+import Data.Char (toLower)
150+import Data.List (nub)
151
152 type IVar = (String, Int)
153 --The type of an instance variable
154diff -ur BNFC-2.4.2.0/formats/OOAbstract.hs BNFC-2.4.2.0-ghc-7.2/formats/OOAbstract.hs
155--- BNFC-2.4.2.0/formats/OOAbstract.hs 2010-09-15 16:26:38.000000000 +0200
156+++ BNFC-2.4.2.0-ghc-7.2/formats/OOAbstract.hs 2011-10-28 14:42:51.129965360 +0200
157@@ -44,8 +44,8 @@
158 import CF
159 import Utils((+++),(++++))
160 import NamedVariables
161-import List
162-import Char(toLower)
163+import Data.List
164+import Data.Char(toLower)
165
166 -- A datastructure more appropriate than CF
167
168diff -ur BNFC-2.4.2.0/formats/c/CFtoBisonC.hs BNFC-2.4.2.0-ghc-7.2/formats/c/CFtoBisonC.hs
169--- BNFC-2.4.2.0/formats/c/CFtoBisonC.hs 2010-09-15 16:26:38.000000000 +0200
170+++ BNFC-2.4.2.0-ghc-7.2/formats/c/CFtoBisonC.hs 2011-10-28 14:45:15.879971891 +0200
171@@ -42,9 +42,9 @@
172 module CFtoBisonC (cf2Bison) where
173
174 import CF
175-import List (intersperse, isPrefixOf)
176+import Data.List (intersperse, isPrefixOf)
177 import NamedVariables hiding (varName)
178-import Char (toLower)
179+import Data.Char (toLower)
180 import Utils ((+++), (++++))
181
182 --This follows the basic structure of CFtoHappy.
183diff -ur BNFC-2.4.2.0/formats/c/CFtoCAbs.hs BNFC-2.4.2.0-ghc-7.2/formats/c/CFtoCAbs.hs
184--- BNFC-2.4.2.0/formats/c/CFtoCAbs.hs 2010-09-15 16:26:38.000000000 +0200
185+++ BNFC-2.4.2.0-ghc-7.2/formats/c/CFtoCAbs.hs 2011-10-28 14:47:42.956645193 +0200
186@@ -43,8 +43,8 @@
187 import CF
188 import Utils((+++),(++++))
189 import NamedVariables
190-import List
191-import Char(toLower)
192+import Data.List
193+import Data.Char(toLower)
194
195
196 --The result is two files (.H file, .C file)
197diff -ur BNFC-2.4.2.0/formats/c/CFtoCPrinter.hs BNFC-2.4.2.0-ghc-7.2/formats/c/CFtoCPrinter.hs
198--- BNFC-2.4.2.0/formats/c/CFtoCPrinter.hs 2010-09-15 16:26:38.000000000 +0200
199+++ BNFC-2.4.2.0-ghc-7.2/formats/c/CFtoCPrinter.hs 2011-10-28 14:44:50.559970748 +0200
200@@ -44,8 +44,8 @@
201 import CF
202 import Utils ((+++), (++++))
203 import NamedVariables
204-import List
205-import Char(toLower, toUpper)
206+import Data.List
207+import Data.Char(toLower, toUpper)
208
209 --Produces (.h file, .c file)
210 cf2CPrinter :: CF -> (String, String)
211diff -ur BNFC-2.4.2.0/formats/c/CFtoCSkel.hs BNFC-2.4.2.0-ghc-7.2/formats/c/CFtoCSkel.hs
212--- BNFC-2.4.2.0/formats/c/CFtoCSkel.hs 2010-09-15 16:26:38.000000000 +0200
213+++ BNFC-2.4.2.0-ghc-7.2/formats/c/CFtoCSkel.hs 2011-10-28 14:45:03.536637999 +0200
214@@ -42,8 +42,8 @@
215 import CF
216 import Utils ( (+++) )
217 import NamedVariables
218-import List ( isPrefixOf )
219-import Char ( toLower, toUpper )
220+import Data.List ( isPrefixOf )
221+import Data.Char ( toLower, toUpper )
222
223 --Produces (.H file, .C file)
224 cf2CSkel :: CF -> (String, String)
225diff -ur BNFC-2.4.2.0/formats/c/CFtoFlexC.hs BNFC-2.4.2.0-ghc-7.2/formats/c/CFtoFlexC.hs
226--- BNFC-2.4.2.0/formats/c/CFtoFlexC.hs 2010-09-15 16:26:38.000000000 +0200
227+++ BNFC-2.4.2.0-ghc-7.2/formats/c/CFtoFlexC.hs 2011-10-28 14:45:24.669972287 +0200
228@@ -41,7 +41,7 @@
229 import RegToFlex
230 -- import Utils((+++), (++++))
231 import NamedVariables
232-import List
233+import Data.List
234
235 --The environment must be returned for the parser to use.
236 cf2flex :: String -> CF -> (String, SymEnv)
237diff -ur BNFC-2.4.2.0/formats/c/CTop.hs BNFC-2.4.2.0-ghc-7.2/formats/c/CTop.hs
238--- BNFC-2.4.2.0/formats/c/CTop.hs 2010-09-15 16:26:38.000000000 +0200
239+++ BNFC-2.4.2.0-ghc-7.2/formats/c/CTop.hs 2011-10-28 14:57:06.603337290 +0200
240@@ -28,8 +28,8 @@
241 import CFtoLatex
242 -- import System
243 import GetCF
244-import Char
245-import System
246+import Data.Char
247+import System.Exit
248
249 makeC :: Bool -> String -> FilePath -> IO ()
250 makeC make name file = do
251diff -ur BNFC-2.4.2.0/formats/c-sharp/CAbstoCSharpAbs.hs BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CAbstoCSharpAbs.hs
252--- BNFC-2.4.2.0/formats/c-sharp/CAbstoCSharpAbs.hs 2010-09-15 16:26:38.000000000 +0200
253+++ BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CAbstoCSharpAbs.hs 2011-10-28 14:47:57.646645855 +0200
254@@ -44,8 +44,8 @@
255 import CF
256 import Utils((+++),(++++))
257 import NamedVariables
258-import List
259-import Char(toLower)
260+import Data.List
261+import Data.Char(toLower)
262 import Data.Maybe
263 import CSharpUtils
264
265diff -ur BNFC-2.4.2.0/formats/c-sharp/CAbstoCSharpAbstractVisitSkeleton.hs BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CAbstoCSharpAbstractVisitSkeleton.hs
266--- BNFC-2.4.2.0/formats/c-sharp/CAbstoCSharpAbstractVisitSkeleton.hs 2010-09-15 16:26:38.000000000 +0200
267+++ BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CAbstoCSharpAbstractVisitSkeleton.hs 2011-10-28 14:48:01.649979370 +0200
268@@ -51,7 +51,7 @@
269 import CF
270 import Utils ((+++), (++++))
271 import NamedVariables
272-import List
273+import Data.List
274 import OOAbstract hiding (basetypes)
275 import CSharpUtils
276 import CAbstoCSharpAbs
277diff -ur BNFC-2.4.2.0/formats/c-sharp/CAbstoCSharpVisitSkeleton.hs BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CAbstoCSharpVisitSkeleton.hs
278--- BNFC-2.4.2.0/formats/c-sharp/CAbstoCSharpVisitSkeleton.hs 2010-09-15 16:26:38.000000000 +0200
279+++ BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CAbstoCSharpVisitSkeleton.hs 2011-10-28 14:48:05.163312861 +0200
280@@ -41,7 +41,7 @@
281 import CF
282 import Utils ((+++), (++++))
283 import NamedVariables
284-import List
285+import Data.List
286 import OOAbstract hiding (basetypes)
287 import CSharpUtils
288 import CAbstoCSharpAbs
289diff -ur BNFC-2.4.2.0/formats/c-sharp/CFtoCSharpPrinter.hs BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CFtoCSharpPrinter.hs
290--- BNFC-2.4.2.0/formats/c-sharp/CFtoCSharpPrinter.hs 2010-09-15 16:26:38.000000000 +0200
291+++ BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CFtoCSharpPrinter.hs 2011-10-28 14:48:10.306646427 +0200
292@@ -43,8 +43,8 @@
293 import CF
294 import Utils ((+++), (++++))
295 import NamedVariables
296-import List
297-import Char(toLower, toUpper, isSpace)
298+import Data.List
299+import Data.Char(toLower, toUpper, isSpace)
300 import Data.Maybe
301 import CSharpUtils
302
303diff -ur BNFC-2.4.2.0/formats/c-sharp/CFtoGPLEX.hs BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CFtoGPLEX.hs
304--- BNFC-2.4.2.0/formats/c-sharp/CFtoGPLEX.hs 2010-09-15 16:26:38.000000000 +0200
305+++ BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CFtoGPLEX.hs 2011-10-28 14:48:14.363313276 +0200
306@@ -42,7 +42,7 @@
307 import RegToGPLEX
308 import Utils((+++), (++++))
309 import NamedVariables
310-import List
311+import Data.List
312 import CSharpUtils
313
314 --The environment must be returned for the parser to use.
315diff -ur BNFC-2.4.2.0/formats/c-sharp/CFtoGPPG.hs BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CFtoGPPG.hs
316--- BNFC-2.4.2.0/formats/c-sharp/CFtoGPPG.hs 2010-09-15 16:26:38.000000000 +0200
317+++ BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CFtoGPPG.hs 2011-10-28 14:48:20.333313546 +0200
318@@ -39,9 +39,9 @@
319 module CFtoGPPG (cf2gppg) where
320
321 import CF
322-import List (intersperse, isPrefixOf)
323+import Data.List (intersperse, isPrefixOf)
324 import NamedVariables hiding (varName)
325-import Char (toLower,isUpper,isDigit)
326+import Data.Char (toLower,isUpper,isDigit)
327 import Utils ((+++), (++++))
328 import TypeChecker
329 import ErrM
330diff -ur BNFC-2.4.2.0/formats/c-sharp/CSharpTop.hs BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CSharpTop.hs
331--- BNFC-2.4.2.0/formats/c-sharp/CSharpTop.hs 2010-09-15 16:26:38.000000000 +0200
332+++ BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CSharpTop.hs 2011-10-28 14:58:34.663341263 +0200
333@@ -48,10 +48,9 @@
334 import CFtoCSharpPrinter
335 import CFtoLatex
336 import CSharpUtils
337-import System
338+import System.Environment
339 import GetCF
340-import Char
341-import System
342+import System.Exit
343 import System.Directory
344 import System.IO
345 import System.Process
346diff -ur BNFC-2.4.2.0/formats/c-sharp/CSharpUtils.hs BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CSharpUtils.hs
347--- BNFC-2.4.2.0/formats/c-sharp/CSharpUtils.hs 2010-09-15 16:26:38.000000000 +0200
348+++ BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/CSharpUtils.hs 2011-10-28 14:50:02.039984801 +0200
349@@ -40,9 +40,9 @@
350 import CF
351 import Control.Monad.ST
352 -- Control.Monad.State
353-import Char (toLower)
354+import Data.Char (toLower)
355 import Data.Maybe
356-import List
357+import Data.List
358 import OOAbstract hiding (basetypes)
359
360 type Namespace = String
361diff -ur BNFC-2.4.2.0/formats/c-sharp/RegToGPLEX.hs BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/RegToGPLEX.hs
362--- BNFC-2.4.2.0/formats/c-sharp/RegToGPLEX.hs 2010-09-15 16:26:38.000000000 +0200
363+++ BNFC-2.4.2.0-ghc-7.2/formats/c-sharp/RegToGPLEX.hs 2011-10-28 14:48:52.096648312 +0200
364@@ -3,7 +3,7 @@
365 -- modified from RegToFlex
366
367 import AbsBNF
368-import Char
369+import Data.Char
370
371 -- the top-level printing method
372 printRegGPLEX :: Reg -> String
373diff -ur BNFC-2.4.2.0/formats/cpp/CFtoBison.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp/CFtoBison.hs
374--- BNFC-2.4.2.0/formats/cpp/CFtoBison.hs 2010-09-15 16:26:38.000000000 +0200
375+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp/CFtoBison.hs 2011-10-28 14:46:35.719975492 +0200
376@@ -61,9 +61,9 @@
377 module CFtoBison (cf2Bison) where
378
379 import CF
380-import List (intersperse, isPrefixOf)
381+import Data.List (intersperse, isPrefixOf)
382 import NamedVariables hiding (varName)
383-import Char (toLower,isUpper)
384+import Data.Char (toLower,isUpper)
385 import Utils ((+++), (++++))
386 import TypeChecker
387 import ErrM
388diff -ur BNFC-2.4.2.0/formats/cpp/CFtoCPPAbs.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp/CFtoCPPAbs.hs
389--- BNFC-2.4.2.0/formats/cpp/CFtoCPPAbs.hs 2010-09-15 16:26:38.000000000 +0200
390+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp/CFtoCPPAbs.hs 2011-10-28 14:46:41.279975744 +0200
391@@ -43,8 +43,8 @@
392 import CF
393 import Utils((+++),(++++))
394 import NamedVariables
395-import List
396-import Char(toLower)
397+import Data.List
398+import Data.Char(toLower)
399
400
401 --The result is two files (.H file, .C file)
402diff -ur BNFC-2.4.2.0/formats/cpp/CFtoCPPPrinter.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp/CFtoCPPPrinter.hs
403--- BNFC-2.4.2.0/formats/cpp/CFtoCPPPrinter.hs 2010-09-15 16:26:38.000000000 +0200
404+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp/CFtoCPPPrinter.hs 2011-10-28 14:46:47.326642683 +0200
405@@ -25,8 +25,8 @@
406 import CF
407 import Utils ((+++), (++++))
408 import NamedVariables
409-import List
410-import Char(toLower, toUpper)
411+import Data.List
412+import Data.Char(toLower, toUpper)
413
414 --Produces (.H file, .C file)
415 cf2CPPPrinter :: CF -> (String, String)
416diff -ur BNFC-2.4.2.0/formats/cpp/CFtoCVisitSkel.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp/CFtoCVisitSkel.hs
417--- BNFC-2.4.2.0/formats/cpp/CFtoCVisitSkel.hs 2010-09-15 16:26:38.000000000 +0200
418+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp/CFtoCVisitSkel.hs 2011-10-28 14:47:08.076643619 +0200
419@@ -42,8 +42,8 @@
420 import CF
421 import Utils ((+++), (++++))
422 import NamedVariables
423-import List
424-import Char(toLower, toUpper)
425+import Data.List
426+import Data.Char(toLower, toUpper)
427
428 --Produces (.H file, .C file)
429 cf2CVisitSkel :: CF -> (String, String)
430diff -ur BNFC-2.4.2.0/formats/cpp/CFtoFlex.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp/CFtoFlex.hs
431--- BNFC-2.4.2.0/formats/cpp/CFtoFlex.hs 2010-09-15 16:26:38.000000000 +0200
432+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp/CFtoFlex.hs 2011-10-28 14:47:13.686643872 +0200
433@@ -41,7 +41,7 @@
434 import RegToFlex
435 import Utils((+++), (++++))
436 import NamedVariables
437-import List
438+import Data.List
439 import STLUtils
440
441 --The environment must be returned for the parser to use.
442diff -ur BNFC-2.4.2.0/formats/cpp/CPPTop.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp/CPPTop.hs
443--- BNFC-2.4.2.0/formats/cpp/CPPTop.hs 2010-09-15 16:26:38.000000000 +0200
444+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp/CPPTop.hs 2011-10-28 14:58:58.886675688 +0200
445@@ -27,10 +27,10 @@
446 import CFtoCVisitSkel
447 import CFtoCPPPrinter
448 import CFtoLatex
449-import System
450+-- import System
451 import GetCF
452-import Char
453-import System
454+import Data.Char
455+import System.Exit
456
457 makeCPP :: Bool -> String -> FilePath -> IO ()
458 makeCPP make name file = do
459diff -ur BNFC-2.4.2.0/formats/cpp/RegToFlex.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp/RegToFlex.hs
460--- BNFC-2.4.2.0/formats/cpp/RegToFlex.hs 2010-09-15 16:26:38.000000000 +0200
461+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp/RegToFlex.hs 2011-10-28 14:47:30.029977943 +0200
462@@ -3,7 +3,7 @@
463 -- modified from pretty-printer generated by the BNF converter
464
465 import AbsBNF
466-import Char
467+import Data.Char
468
469 -- the top-level printing method
470 printRegFlex :: Reg -> String
471diff -ur BNFC-2.4.2.0/formats/cpp_stl/CFtoBisonSTL.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp_stl/CFtoBisonSTL.hs
472--- BNFC-2.4.2.0/formats/cpp_stl/CFtoBisonSTL.hs 2010-09-15 16:26:38.000000000 +0200
473+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp_stl/CFtoBisonSTL.hs 2011-10-28 14:49:38.733317083 +0200
474@@ -45,9 +45,9 @@
475 module CFtoBisonSTL (cf2Bison) where
476
477 import CF
478-import List (intersperse, isPrefixOf)
479+import Data.List (intersperse, isPrefixOf)
480 import NamedVariables hiding (varName)
481-import Char (toLower,isUpper,isDigit)
482+import Data.Char (toLower,isUpper,isDigit)
483 import Utils ((+++), (++++))
484 import TypeChecker
485 import ErrM
486diff -ur BNFC-2.4.2.0/formats/cpp_stl/CFtoCVisitSkelSTL.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp_stl/CFtoCVisitSkelSTL.hs
487--- BNFC-2.4.2.0/formats/cpp_stl/CFtoCVisitSkelSTL.hs 2010-09-15 16:26:38.000000000 +0200
488+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp_stl/CFtoCVisitSkelSTL.hs 2011-10-28 14:49:33.259983502 +0200
489@@ -42,8 +42,8 @@
490 import CF
491 import Utils ((+++), (++++))
492 import NamedVariables
493-import List
494-import Char(toLower, toUpper)
495+import Data.List
496+import Data.Char(toLower, toUpper)
497 import OOAbstract
498 import STLUtils
499
500diff -ur BNFC-2.4.2.0/formats/cpp_stl/CFtoSTLAbs.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp_stl/CFtoSTLAbs.hs
501--- BNFC-2.4.2.0/formats/cpp_stl/CFtoSTLAbs.hs 2010-09-15 16:26:38.000000000 +0200
502+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp_stl/CFtoSTLAbs.hs 2011-10-28 14:49:27.763316588 +0200
503@@ -44,8 +44,8 @@
504 import CF
505 import Utils((+++),(++++))
506 import NamedVariables
507-import List
508-import Char(toLower)
509+import Data.List
510+import Data.Char(toLower)
511 import STLUtils
512
513 --The result is two files (.H file, .C file)
514diff -ur BNFC-2.4.2.0/formats/cpp_stl/CFtoSTLPrinter.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp_stl/CFtoSTLPrinter.hs
515--- BNFC-2.4.2.0/formats/cpp_stl/CFtoSTLPrinter.hs 2010-09-15 16:26:38.000000000 +0200
516+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp_stl/CFtoSTLPrinter.hs 2011-10-28 14:49:19.833316230 +0200
517@@ -25,8 +25,8 @@
518 import CF
519 import Utils ((+++), (++++))
520 import NamedVariables
521-import List
522-import Char(toLower, toUpper)
523+import Data.List
524+import Data.Char(toLower, toUpper)
525 import STLUtils
526
527 --Produces (.H file, .C file)
528diff -ur BNFC-2.4.2.0/formats/cpp_stl/STLTop.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp_stl/STLTop.hs
529--- BNFC-2.4.2.0/formats/cpp_stl/STLTop.hs 2010-09-15 16:26:38.000000000 +0200
530+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp_stl/STLTop.hs 2011-10-28 14:57:18.803337840 +0200
531@@ -29,10 +29,10 @@
532 import CFtoCVisitSkelSTL
533 import CFtoSTLPrinter
534 import CFtoLatex
535-import System
536+-- import System
537 import GetCF
538-import Char
539-import System
540+import Data.Char
541+import System.Exit
542 import STLUtils
543
544 makeSTL :: Bool -> Bool -> Maybe String -> String -> FilePath -> IO ()
545diff -ur BNFC-2.4.2.0/formats/cpp_stl/STLUtils.hs BNFC-2.4.2.0-ghc-7.2/formats/cpp_stl/STLUtils.hs
546--- BNFC-2.4.2.0/formats/cpp_stl/STLUtils.hs 2010-09-15 16:26:38.000000000 +0200
547+++ BNFC-2.4.2.0-ghc-7.2/formats/cpp_stl/STLUtils.hs 2011-10-28 14:49:03.476648825 +0200
548@@ -19,7 +19,7 @@
549
550 module STLUtils where
551
552-import Char
553+import Data.Char
554
555 nsDefine :: Maybe String -> String -> String
556 nsDefine inPackage h = maybe h (\ns -> map toUpper ns ++ "_" ++ h) inPackage
557diff -ur BNFC-2.4.2.0/formats/f-sharp/FSharpTop.hs BNFC-2.4.2.0-ghc-7.2/formats/f-sharp/FSharpTop.hs
558--- BNFC-2.4.2.0/formats/f-sharp/FSharpTop.hs 2010-09-15 16:26:38.000000000 +0200
559+++ BNFC-2.4.2.0-ghc-7.2/formats/f-sharp/FSharpTop.hs 2011-10-28 14:56:37.926669329 +0200
560@@ -36,10 +36,10 @@
561 import GetCF
562 import Utils
563
564-import Char
565+import Data.Char
566 import Data.Maybe (fromMaybe,maybe)
567-import System
568-import Monad(when)
569+import System.Exit
570+import Control.Monad(when)
571
572 -- naming conventions
573
574diff -ur BNFC-2.4.2.0/formats/haskell-gadt/CFtoAbstractGADT.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell-gadt/CFtoAbstractGADT.hs
575--- BNFC-2.4.2.0/formats/haskell-gadt/CFtoAbstractGADT.hs 2010-09-15 16:26:38.000000000 +0200
576+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell-gadt/CFtoAbstractGADT.hs 2011-10-28 14:50:13.799985332 +0200
577@@ -21,7 +21,7 @@
578
579 import CF
580 import Utils((+++),(++++))
581-import List(intersperse,nub)
582+import Data.List(intersperse,nub)
583
584 import HaskellGADTCommon
585
586diff -ur BNFC-2.4.2.0/formats/haskell-gadt/CFtoPrinterGADT.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell-gadt/CFtoPrinterGADT.hs
587--- BNFC-2.4.2.0/formats/haskell-gadt/CFtoPrinterGADT.hs 2010-09-15 16:26:38.000000000 +0200
588+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell-gadt/CFtoPrinterGADT.hs 2011-10-28 14:50:20.019985612 +0200
589@@ -22,8 +22,8 @@
590 import CF
591 import Utils
592 import CFtoTemplate
593-import List (intersperse)
594-import Char(toLower)
595+import Data.List (intersperse)
596+import Data.Char(toLower)
597
598 import HaskellGADTCommon
599
600diff -ur BNFC-2.4.2.0/formats/haskell-gadt/CFtoTemplateGADT.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell-gadt/CFtoTemplateGADT.hs
601--- BNFC-2.4.2.0/formats/haskell-gadt/CFtoTemplateGADT.hs 2010-09-15 16:26:38.000000000 +0200
602+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell-gadt/CFtoTemplateGADT.hs 2011-10-28 14:50:24.599985819 +0200
603@@ -24,7 +24,7 @@
604
605 import CF
606 import Utils((+++))
607-import List (delete,groupBy)
608+import Data.List (delete,groupBy)
609
610 import HaskellGADTCommon
611
612@@ -62,4 +62,4 @@
613 prCatTrans :: Cat -> [Constructor] -> [String]
614 prCatTrans cat cs = ["trans" ++ cat +++ "::" +++ cat +++ "-> Result",
615 "trans" ++ cat +++ "t = case t of"]
616- ++ map prConsCase cs
617\ No newline at end of file
618+ ++ map prConsCase cs
619diff -ur BNFC-2.4.2.0/formats/haskell-gadt/HaskellGADTCommon.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell-gadt/HaskellGADTCommon.hs
620--- BNFC-2.4.2.0/formats/haskell-gadt/HaskellGADTCommon.hs 2010-09-15 16:26:38.000000000 +0200
621+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell-gadt/HaskellGADTCommon.hs 2011-10-28 14:50:28.319985987 +0200
622@@ -21,7 +21,7 @@
623
624 import CF
625
626-import Char
627+import Data.Char
628
629 data Constructor = Constructor {
630 consCat :: Cat,
631diff -ur BNFC-2.4.2.0/formats/haskell-gadt/HaskellTopGADT.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell-gadt/HaskellTopGADT.hs
632--- BNFC-2.4.2.0/formats/haskell-gadt/HaskellTopGADT.hs 2010-09-15 16:26:38.000000000 +0200
633+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell-gadt/HaskellTopGADT.hs 2011-10-28 15:00:58.286681076 +0200
634@@ -40,10 +40,10 @@
635 import GetCF
636 import Utils
637
638-import Char
639+import Data.Char
640 import Data.Maybe (fromMaybe,maybe)
641-import System
642-import Monad(when)
643+import System.Exit
644+import Control.Monad(when)
645
646 -- naming conventions
647
648diff -ur BNFC-2.4.2.0/formats/haskell2/CFtoAbstract.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell2/CFtoAbstract.hs
649--- BNFC-2.4.2.0/formats/haskell2/CFtoAbstract.hs 2010-09-15 16:26:38.000000000 +0200
650+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell2/CFtoAbstract.hs 2011-10-28 14:50:42.843319975 +0200
651@@ -21,7 +21,7 @@
652
653 import CF
654 import Utils((+++),(++++))
655-import List(intersperse)
656+import Data.List(intersperse)
657
658 -- to produce a Haskell module
659 cf2Abstract :: Bool -> String -> CF -> String
660diff -ur BNFC-2.4.2.0/formats/haskell2/CFtoAlex.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell2/CFtoAlex.hs
661--- BNFC-2.4.2.0/formats/haskell2/CFtoAlex.hs 2010-09-15 16:26:38.000000000 +0200
662+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell2/CFtoAlex.hs 2011-10-28 14:50:46.526653475 +0200
663@@ -22,7 +22,7 @@
664
665 import CF
666 import RegToAlex
667-import List
668+import Data.List
669
670 cf2alex :: String -> String -> CF -> String
671 cf2alex name errMod cf = unlines $ concat $ intersperse [""] [
672diff -ur BNFC-2.4.2.0/formats/haskell2/CFtoAlex2.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell2/CFtoAlex2.hs
673--- BNFC-2.4.2.0/formats/haskell2/CFtoAlex2.hs 2010-09-15 16:26:38.000000000 +0200
674+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell2/CFtoAlex2.hs 2011-10-28 14:50:52.769987090 +0200
675@@ -33,11 +33,11 @@
676 module CFtoAlex2 (cf2alex2) where
677
678 import CF
679-import List
680+import Data.List
681
682 -- For RegToAlex, see below.
683 import AbsBNF
684-import Char
685+import Data.Char
686
687 cf2alex2 :: String -> String -> String -> Bool -> Bool -> CF -> String
688 cf2alex2 name errMod shareMod shareStrings byteStrings cf =
689diff -ur BNFC-2.4.2.0/formats/haskell2/CFtoHappy.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell2/CFtoHappy.hs
690--- BNFC-2.4.2.0/formats/haskell2/CFtoHappy.hs 2010-09-15 16:26:38.000000000 +0200
691+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell2/CFtoHappy.hs 2011-10-28 14:51:00.106654087 +0200
692@@ -26,8 +26,8 @@
693
694 import CF
695 --import Lexer
696-import List (intersperse, sort)
697-import Char
698+import Data.List (intersperse, sort)
699+import Data.Char
700
701 -- Type declarations
702
703diff -ur BNFC-2.4.2.0/formats/haskell2/CFtoPrinter.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell2/CFtoPrinter.hs
704--- BNFC-2.4.2.0/formats/haskell2/CFtoPrinter.hs 2010-09-15 16:26:38.000000000 +0200
705+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell2/CFtoPrinter.hs 2011-10-28 14:51:09.816654525 +0200
706@@ -22,8 +22,8 @@
707 import CF
708 import Utils
709 import CFtoTemplate
710-import List (intersperse)
711-import Char(toLower)
712+import Data.List (intersperse)
713+import Data.Char(toLower)
714
715 -- derive pretty-printer from a BNF grammar. AR 15/2/2002
716 cf2Printer :: Bool -> String -> String -> CF -> String
717diff -ur BNFC-2.4.2.0/formats/haskell2/CFtoTemplate.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell2/CFtoTemplate.hs
718--- BNFC-2.4.2.0/formats/haskell2/CFtoTemplate.hs 2010-09-15 16:26:38.000000000 +0200
719+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell2/CFtoTemplate.hs 2011-10-28 14:38:42.819954157 +0200
720@@ -23,8 +23,8 @@
721 ) where
722
723 import CF
724-import Char
725-import List (delete)
726+import Data.Char
727+import Data.List (delete)
728
729 type ModuleName = String
730 type Constructor = String
731diff -ur BNFC-2.4.2.0/formats/haskell2/HaskellTop.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell2/HaskellTop.hs
732--- BNFC-2.4.2.0/formats/haskell2/HaskellTop.hs 2010-09-15 16:26:38.000000000 +0200
733+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell2/HaskellTop.hs 2011-10-28 15:01:17.467580274 +0200
734@@ -40,10 +40,10 @@
735 import GetCF
736 import Utils
737
738-import Char
739+import Data.Char
740 import Data.Maybe (fromMaybe,maybe)
741-import System
742-import Monad(when)
743+import System.Exit
744+import Control.Monad(when)
745
746 -- naming conventions
747
046a7f65
JR		 748@@ -235,8 +235,8 @@
749 ["-- automatically generated by BNF Converter",
750 "module Main where\n",
751 "",
752- "import IO ( stdin, hGetContents )",
753- "import System ( getArgs, getProgName )",
754+ "import System.IO ( stdin, hGetContents )",
755+ "import System.Environment ( getArgs, getProgName )",
756 "",
757 "import " ++ alexFileM opts,
758 "import " ++ happyFileM opts,
759@@ -246,7 +246,7 @@
760 if lay then ("import " ++ layoutFileM opts) else "",
761 if use_xml then ("import " ++ xmlFileM opts) else "",
762 if_glr "import Data.FiniteMap(FiniteMap, lookupFM, fmToList)",
763- if_glr "import Maybe(fromJust)",
764+ if_glr "import Data.Maybe(fromJust)",
765 "import " ++ errFileM opts,
766 "",
767 if use_glr
8f39da9e
JR		 768diff -ur BNFC-2.4.2.0/formats/haskell2/RegToAlex.hs BNFC-2.4.2.0-ghc-7.2/formats/haskell2/RegToAlex.hs
769--- BNFC-2.4.2.0/formats/haskell2/RegToAlex.hs 2010-09-15 16:26:38.000000000 +0200
770+++ BNFC-2.4.2.0-ghc-7.2/formats/haskell2/RegToAlex.hs 2011-10-28 14:51:30.906655477 +0200
771@@ -22,7 +22,7 @@
772 -- modified from pretty-printer generated by the BNF converter
773
774 import AbsBNF
775-import Char
776+import Data.Char
777
778 -- the top-level printing method
779 printRegAlex :: Reg -> String
780diff -ur BNFC-2.4.2.0/formats/java/CFtoCup.hs BNFC-2.4.2.0-ghc-7.2/formats/java/CFtoCup.hs
781--- BNFC-2.4.2.0/formats/java/CFtoCup.hs 2010-09-15 16:26:38.000000000 +0200
782+++ BNFC-2.4.2.0-ghc-7.2/formats/java/CFtoCup.hs 2011-10-28 14:51:40.103322559 +0200
783@@ -38,7 +38,7 @@
784 module CFtoCup ( cf2Cup ) where
785
786 import CF
787-import List (intersperse, isPrefixOf)
788+import Data.List (intersperse, isPrefixOf)
789 import Data.Char (isUpper)
790 import NamedVariables
791 import TypeChecker -- We need to (re-)typecheck to figure out list instances in
792diff -ur BNFC-2.4.2.0/formats/java/CFtoJLex.hs BNFC-2.4.2.0-ghc-7.2/formats/java/CFtoJLex.hs
793--- BNFC-2.4.2.0/formats/java/CFtoJLex.hs 2010-09-15 16:26:38.000000000 +0200
794+++ BNFC-2.4.2.0-ghc-7.2/formats/java/CFtoJLex.hs 2011-10-28 14:51:44.849989439 +0200
795@@ -42,7 +42,7 @@
796 import RegToJLex
797 import Utils ( (+++) )
798 import NamedVariables
799-import List
800+import Data.List
801
802 --The environment must be returned for the parser to use.
803 cf2jlex :: String -> String -> CF -> (String, SymEnv)
804diff -ur BNFC-2.4.2.0/formats/java/CFtoJavaAbs.hs BNFC-2.4.2.0-ghc-7.2/formats/java/CFtoJavaAbs.hs
805--- BNFC-2.4.2.0/formats/java/CFtoJavaAbs.hs 2010-09-15 16:26:38.000000000 +0200
806+++ BNFC-2.4.2.0-ghc-7.2/formats/java/CFtoJavaAbs.hs 2011-10-28 14:51:50.013323006 +0200
807@@ -47,8 +47,8 @@
808 import CF
809 import Utils((+++),(++++))
810 import NamedVariables hiding (IVar, getVars, varName)
811-import List
812-import Char(toLower)
813+import Data.List
814+import Data.Char(toLower)
815
816 --Produces abstract data types in Java.
817 --These follow Appel's "non-object oriented" version.
818diff -ur BNFC-2.4.2.0/formats/java/CFtoJavaPrinter.hs BNFC-2.4.2.0-ghc-7.2/formats/java/CFtoJavaPrinter.hs
819--- BNFC-2.4.2.0/formats/java/CFtoJavaPrinter.hs 2010-09-15 16:26:38.000000000 +0200
820+++ BNFC-2.4.2.0-ghc-7.2/formats/java/CFtoJavaPrinter.hs 2011-10-28 14:51:55.646656593 +0200
821@@ -48,8 +48,8 @@
822 import CF
823 import NamedVariables
824 import Utils ( (+++) )
825-import List
826-import Char ( toLower )
827+import Data.List
828+import Data.Char ( toLower )
829
830 --Produces the PrettyPrinter class.
831 --It will generate two methods "print" and "show"
832diff -ur BNFC-2.4.2.0/formats/java/CFtoJavaSkeleton.hs BNFC-2.4.2.0-ghc-7.2/formats/java/CFtoJavaSkeleton.hs
833--- BNFC-2.4.2.0/formats/java/CFtoJavaSkeleton.hs 2010-09-15 16:26:38.000000000 +0200
834+++ BNFC-2.4.2.0-ghc-7.2/formats/java/CFtoJavaSkeleton.hs 2011-10-28 14:52:01.343323517 +0200
835@@ -21,8 +21,8 @@
836 import CF
837 import Utils ((+++), (++++))
838 import NamedVariables
839-import List
840-import Char(toLower)
841+import Data.List
842+import Data.Char(toLower)
843
844
845 cf2JavaSkeleton :: String -> String -> CF -> String
846diff -ur BNFC-2.4.2.0/formats/java/CFtoVisitSkel.hs BNFC-2.4.2.0-ghc-7.2/formats/java/CFtoVisitSkel.hs
847--- BNFC-2.4.2.0/formats/java/CFtoVisitSkel.hs 2010-09-15 16:26:38.000000000 +0200
848+++ BNFC-2.4.2.0-ghc-7.2/formats/java/CFtoVisitSkel.hs 2011-10-28 14:52:06.073323730 +0200
849@@ -42,8 +42,8 @@
850 import CF
851 import Utils ((+++), (++++))
852 import NamedVariables
853-import List
854-import Char(toLower, toUpper)
855+import Data.List
856+import Data.Char(toLower, toUpper)
857
858 --Produces a Skeleton using the Visitor Design Pattern.
859 --Thus the user can choose which Skeleton to use.
860diff -ur BNFC-2.4.2.0/formats/java/JavaTop.hs BNFC-2.4.2.0-ghc-7.2/formats/java/JavaTop.hs
861--- BNFC-2.4.2.0/formats/java/JavaTop.hs 2010-09-15 16:26:38.000000000 +0200
862+++ BNFC-2.4.2.0-ghc-7.2/formats/java/JavaTop.hs 2011-10-28 15:00:30.163346474 +0200
863@@ -37,8 +37,10 @@
864 -------------------------------------------------------------------
865 -- Dependencies.
866 -------------------------------------------------------------------
867-import Directory ( createDirectory )
868-import IO ( try, isAlreadyExistsError )
869+import System.Directory ( createDirectory )
870+import System.IO
871+import System.IO.Error
872+-- ( try, isAlreadyExistsError )
873
874 import Utils
875 import CF
876@@ -49,10 +51,10 @@
877 import CFtoJavaSkeleton
878 import CFtoVisitSkel
879 import CFtoLatex
880-import System
881+import System.Exit
882 import GetCF ( tryReadCF, writeFileRep )
883-import Char
884-import List(intersperse)
885+import Data.Char
886+import Data.List(intersperse)
887
888 -------------------------------------------------------------------
889 -- | Build the Java output.
890diff -ur BNFC-2.4.2.0/formats/java/RegToJLex.hs BNFC-2.4.2.0-ghc-7.2/formats/java/RegToJLex.hs
891--- BNFC-2.4.2.0/formats/java/RegToJLex.hs 2010-09-15 16:26:38.000000000 +0200
892+++ BNFC-2.4.2.0-ghc-7.2/formats/java/RegToJLex.hs 2011-10-28 14:52:17.229990901 +0200
893@@ -3,7 +3,7 @@
894 -- modified from pretty-printer generated by the BNF converter
895
896 import AbsBNF
897-import Char
898+import Data.Char
899
900 -- the top-level printing method
901 printRegJLex :: Reg -> String
902diff -ur BNFC-2.4.2.0/formats/java1.5/CFtoAbstractVisitor.hs BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoAbstractVisitor.hs
903--- BNFC-2.4.2.0/formats/java1.5/CFtoAbstractVisitor.hs 2010-09-15 16:26:38.000000000 +0200
904+++ BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoAbstractVisitor.hs 2011-10-28 14:52:25.139991258 +0200
905@@ -24,8 +24,8 @@
906 import CFtoJavaAbs15 (typename)
907 import Utils ((+++), (++++))
908 import NamedVariables
909-import List
910-import Char(toLower, toUpper, isDigit)
911+import Data.List
912+import Data.Char(toLower, toUpper, isDigit)
913
914 cf2AbstractVisitor :: String -> String -> CF -> String
915 cf2AbstractVisitor packageBase packageAbsyn cf =
916diff -ur BNFC-2.4.2.0/formats/java1.5/CFtoAllVisitor.hs BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoAllVisitor.hs
917--- BNFC-2.4.2.0/formats/java1.5/CFtoAllVisitor.hs 2010-09-15 16:26:38.000000000 +0200
918+++ BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoAllVisitor.hs 2011-10-28 14:52:30.846658182 +0200
919@@ -24,8 +24,8 @@
920 import CFtoJavaAbs15 (typename)
921 import Utils ((+++), (++++))
922 import NamedVariables
923-import List
924-import Char(toLower, toUpper, isDigit)
925+import Data.List
926+import Data.Char(toLower, toUpper, isDigit)
927
928 cf2AllVisitor :: String -> String -> CF -> String
929 cf2AllVisitor packageBase packageAbsyn cf =
930diff -ur BNFC-2.4.2.0/formats/java1.5/CFtoComposVisitor.hs BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoComposVisitor.hs
931--- BNFC-2.4.2.0/formats/java1.5/CFtoComposVisitor.hs 2010-09-15 16:26:38.000000000 +0200
932+++ BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoComposVisitor.hs 2011-10-28 14:52:36.249991759 +0200
933@@ -24,8 +24,8 @@
934 import CFtoJavaAbs15 (typename)
935 import Utils ((+++), (++++))
936 import NamedVariables
937-import List
938-import Char(toLower, toUpper, isDigit)
939+import Data.List
940+import Data.Char(toLower, toUpper, isDigit)
941
942 cf2ComposVisitor :: String -> String -> CF -> String
943 cf2ComposVisitor packageBase packageAbsyn cf =
944diff -ur BNFC-2.4.2.0/formats/java1.5/CFtoCup15.hs BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoCup15.hs
945--- BNFC-2.4.2.0/formats/java1.5/CFtoCup15.hs 2010-09-15 16:26:38.000000000 +0200
946+++ BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoCup15.hs 2011-10-28 14:52:44.713325474 +0200
947@@ -40,7 +40,7 @@
948 module CFtoCup15 ( cf2Cup ) where
949
950 import CF
951-import List (intersperse, isPrefixOf)
952+import Data.List (intersperse, isPrefixOf)
953 import NamedVariables
954 import Utils ( (+++) )
955 import TypeChecker -- We need to (re-)typecheck to figure out list instances in
956diff -ur BNFC-2.4.2.0/formats/java1.5/CFtoFoldVisitor.hs BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoFoldVisitor.hs
957--- BNFC-2.4.2.0/formats/java1.5/CFtoFoldVisitor.hs 2010-09-15 16:26:38.000000000 +0200
958+++ BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoFoldVisitor.hs 2011-10-28 14:52:49.933325710 +0200
959@@ -24,8 +24,8 @@
960 import CFtoJavaAbs15 (typename)
961 import Utils ((+++), (++++))
962 import NamedVariables
963-import List
964-import Char(toLower, toUpper, isDigit)
965+import Data.List
966+import Data.Char(toLower, toUpper, isDigit)
967
968 cf2FoldVisitor :: String -> String -> CF -> String
969 cf2FoldVisitor packageBase packageAbsyn cf =
970diff -ur BNFC-2.4.2.0/formats/java1.5/CFtoJLex15.hs BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoJLex15.hs
971--- BNFC-2.4.2.0/formats/java1.5/CFtoJLex15.hs 2010-09-15 16:26:38.000000000 +0200
972+++ BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoJLex15.hs 2011-10-28 14:52:54.106659231 +0200
973@@ -43,7 +43,7 @@
974 import RegToJLex
975 import Utils ( (+++) )
976 import NamedVariables
977-import List
978+import Data.List
979
980 --The environment must be returned for the parser to use.
981 cf2jlex :: String -> String -> CF -> (String, SymEnv)
982--- BNFC-2.4.2.0/formats/java1.5/CFtoJavaAbs15.hs 2010-09-15 16:26:38.000000000 +0200
983+++ BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoJavaAbs15.hs 2011-10-28 14:54:05.833329134 +0200
984@@ -48,9 +48,9 @@
985 import CF
986 import Utils((+++),(++++))
987 import NamedVariables hiding (IVar, getVars, varName)
988-import List
989-import Char(toLower, isDigit)
990-import Maybe(catMaybes,fromMaybe)
991+import Data.List
992+import Data.Char(toLower, isDigit)
993+import Data.Maybe(catMaybes,fromMaybe)
994
995 --Produces abstract data types in Java.
996 --These follow Appel's "non-object oriented" version.
997diff -ur BNFC-2.4.2.0/formats/java1.5/CFtoJavaPrinter15.hs BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoJavaPrinter15.hs
998--- BNFC-2.4.2.0/formats/java1.5/CFtoJavaPrinter15.hs 2010-09-15 16:26:38.000000000 +0200
999+++ BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoJavaPrinter15.hs 2011-10-28 14:53:04.176659685 +0200
1000@@ -51,8 +51,8 @@
1001 import CF
1002 import NamedVariables
1003 import Utils ( (+++) )
1004-import List
1005-import Char ( toLower, isSpace )
1006+import Data.List
1007+import Data.Char ( toLower, isSpace )
1008
1009 --Produces the PrettyPrinter class.
1010 --It will generate two methods "print" and "show"
1011diff -ur BNFC-2.4.2.0/formats/java1.5/CFtoVisitSkel15.hs BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoVisitSkel15.hs
1012--- BNFC-2.4.2.0/formats/java1.5/CFtoVisitSkel15.hs 2010-09-15 16:26:38.000000000 +0200
1013+++ BNFC-2.4.2.0-ghc-7.2/formats/java1.5/CFtoVisitSkel15.hs 2011-10-28 14:53:09.309993250 +0200
1014@@ -44,8 +44,8 @@
1015 import CFtoJavaAbs15 (typename)
1016 import Utils ((+++), (++++))
1017 import NamedVariables
1018-import List
1019-import Char(toLower, toUpper, isDigit)
1020+import Data.List
1021+import Data.Char(toLower, toUpper, isDigit)
1022
1023 --Produces a Skeleton using the Visitor Design Pattern.
1024 --Thus the user can choose which Skeleton to use.
1025diff -ur BNFC-2.4.2.0/formats/java1.5/JavaTop15.hs BNFC-2.4.2.0-ghc-7.2/formats/java1.5/JavaTop15.hs
1026--- BNFC-2.4.2.0/formats/java1.5/JavaTop15.hs 2010-09-15 16:26:38.000000000 +0200
1027+++ BNFC-2.4.2.0-ghc-7.2/formats/java1.5/JavaTop15.hs 2011-10-28 14:59:35.690010683 +0200
1028@@ -38,8 +38,9 @@
1029 -------------------------------------------------------------------
1030 -- Dependencies.
1031 -------------------------------------------------------------------
1032-import Directory ( createDirectory )
1033-import IO ( try, isAlreadyExistsError )
1034+import System.Directory ( createDirectory )
1035+import System.IO
1036+-- ( try, isAlreadyExistsError )
1037
1038 import Utils
1039 import CF
1040@@ -54,10 +55,10 @@
1041 import CFtoFoldVisitor
1042 import CFtoAllVisitor
1043 import CFtoLatex
1044-import System
1045+import System.Exit
1046 import GetCF ( tryReadCF, writeFileRep )
1047-import Char
1048-import List(intersperse)
1049+import Data.Char
1050+import Data.List(intersperse)
1051
1052 -------------------------------------------------------------------
1053 -- | Build the Java output.
1054diff -ur BNFC-2.4.2.0/formats/ocaml/CFtoOCamlAbs.hs BNFC-2.4.2.0-ghc-7.2/formats/ocaml/CFtoOCamlAbs.hs
1055--- BNFC-2.4.2.0/formats/ocaml/CFtoOCamlAbs.hs 2010-09-15 16:26:38.000000000 +0200
1056+++ BNFC-2.4.2.0-ghc-7.2/formats/ocaml/CFtoOCamlAbs.hs 2011-10-28 14:42:12.693296959 +0200
1057@@ -23,7 +23,7 @@
1058
1059 import CF
1060 import Utils((+++),(++++))
1061-import List(intersperse)
1062+import Data.List(intersperse)
1063 import OCamlUtil
1064
1065 -- to produce an OCaml module
1066diff -ur BNFC-2.4.2.0/formats/ocaml/CFtoOCamlLex.hs BNFC-2.4.2.0-ghc-7.2/formats/ocaml/CFtoOCamlLex.hs
1067--- BNFC-2.4.2.0/formats/ocaml/CFtoOCamlLex.hs 2010-09-15 16:26:38.000000000 +0200
1068+++ BNFC-2.4.2.0-ghc-7.2/formats/ocaml/CFtoOCamlLex.hs 2011-10-28 14:43:09.089966170 +0200
1069@@ -22,8 +22,8 @@
1070
1071 module CFtoOCamlLex (cf2ocamllex) where
1072
1073-import List
1074-import Char
1075+import Data.List
1076+import Data.Char
1077
1078 import CF
1079 import AbsBNF
1080diff -ur BNFC-2.4.2.0/formats/ocaml/CFtoOCamlPrinter.hs BNFC-2.4.2.0-ghc-7.2/formats/ocaml/CFtoOCamlPrinter.hs
1081--- BNFC-2.4.2.0/formats/ocaml/CFtoOCamlPrinter.hs 2010-09-15 16:26:38.000000000 +0200
1082+++ BNFC-2.4.2.0-ghc-7.2/formats/ocaml/CFtoOCamlPrinter.hs 2011-10-28 14:41:13.969960976 +0200
1083@@ -24,8 +24,8 @@
1084 import CF
1085 import Utils
1086 import CFtoTemplate
1087-import List (intersperse)
1088-import Char(toLower,isDigit)
1089+import Data.List (intersperse)
1090+import Data.Char(toLower,isDigit)
1091 import OCamlUtil
1092
1093 -- derive pretty-printer from a BNF grammar. AR 15/2/2002
1094diff -ur BNFC-2.4.2.0/formats/ocaml/CFtoOCamlShow.hs BNFC-2.4.2.0-ghc-7.2/formats/ocaml/CFtoOCamlShow.hs
1095--- BNFC-2.4.2.0/formats/ocaml/CFtoOCamlShow.hs 2010-09-15 16:26:38.000000000 +0200
1096+++ BNFC-2.4.2.0-ghc-7.2/formats/ocaml/CFtoOCamlShow.hs 2011-10-28 14:40:47.476626448 +0200
1097@@ -26,8 +26,8 @@
1098 import CF
1099 import Utils
1100 import CFtoTemplate
1101-import List (intersperse)
1102-import Char(toLower,isDigit)
1103+import Data.List (intersperse)
1104+import Data.Char(toLower,isDigit)
1105 import OCamlUtil
1106
1107 cf2show :: String -> String -> CF -> String
1108diff -ur BNFC-2.4.2.0/formats/ocaml/CFtoOCamlTemplate.hs BNFC-2.4.2.0-ghc-7.2/formats/ocaml/CFtoOCamlTemplate.hs
1109--- BNFC-2.4.2.0/formats/ocaml/CFtoOCamlTemplate.hs 2010-09-15 16:26:38.000000000 +0200
1110+++ BNFC-2.4.2.0-ghc-7.2/formats/ocaml/CFtoOCamlTemplate.hs 2011-10-28 14:41:29.796628357 +0200
1111@@ -25,8 +25,8 @@
1112 ) where
1113
1114 import CF
1115-import Char
1116-import List (delete)
1117+import Data.Char
1118+import Data.List (delete)
1119 import Utils((+++))
1120 import OCamlUtil
1121
1122diff -ur BNFC-2.4.2.0/formats/ocaml/CFtoOCamlYacc.hs BNFC-2.4.2.0-ghc-7.2/formats/ocaml/CFtoOCamlYacc.hs
1123--- BNFC-2.4.2.0/formats/ocaml/CFtoOCamlYacc.hs 2010-09-15 16:26:38.000000000 +0200
1124+++ BNFC-2.4.2.0-ghc-7.2/formats/ocaml/CFtoOCamlYacc.hs 2011-10-28 14:41:56.553296231 +0200
1125@@ -27,8 +27,8 @@
1126 where
1127
1128 import CF
1129-import List (intersperse,nub)
1130-import Char
1131+import Data.List (intersperse,nub)
1132+import Data.Char
1133
1134 import Utils ((+++))
1135 import OCamlUtil
1136diff -ur BNFC-2.4.2.0/formats/ocaml/OCamlTop.hs BNFC-2.4.2.0-ghc-7.2/formats/ocaml/OCamlTop.hs
1137--- BNFC-2.4.2.0/formats/ocaml/OCamlTop.hs 2010-09-15 16:26:38.000000000 +0200
1138+++ BNFC-2.4.2.0-ghc-7.2/formats/ocaml/OCamlTop.hs 2011-10-28 14:56:52.490003319 +0200
1139@@ -35,10 +35,10 @@
1140 import GetCF
1141 import Utils
1142
1143-import Char
1144+import Data.Char
1145 import Data.Maybe (fromMaybe,maybe)
1146-import System
1147-import Monad(when)
1148+import System.Exit
1149+import Control.Monad(when)
1150
1151 -- naming conventions
1152
1153diff -ur BNFC-2.4.2.0/formats/ocaml/OCamlUtil.hs BNFC-2.4.2.0-ghc-7.2/formats/ocaml/OCamlUtil.hs
1154--- BNFC-2.4.2.0/formats/ocaml/OCamlUtil.hs 2010-09-15 16:26:38.000000000 +0200
1155+++ BNFC-2.4.2.0-ghc-7.2/formats/ocaml/OCamlUtil.hs 2011-10-28 14:40:31.863292410 +0200
1156@@ -21,7 +21,7 @@
1157
1158 import CF
1159 import Utils
1160-import Char (toLower, toUpper)
1161+import Data.Char (toLower, toUpper)
1162
1163 -- Translate Haskell types to OCaml types
1164 -- Note: OCaml (data-)types start with lowercase letter
1165diff -ur BNFC-2.4.2.0/formats/profile/CFtoHappyProfile.hs BNFC-2.4.2.0-ghc-7.2/formats/profile/CFtoHappyProfile.hs
1166--- BNFC-2.4.2.0/formats/profile/CFtoHappyProfile.hs 2010-09-15 16:26:38.000000000 +0200
1167+++ BNFC-2.4.2.0-ghc-7.2/formats/profile/CFtoHappyProfile.hs 2011-10-28 14:53:28.246660771 +0200
1168@@ -25,8 +25,8 @@
1169
1170 import CF
1171 --import Lexer
1172-import List (intersperse)
1173-import Char
1174+import Data.List (intersperse)
1175+import Data.Char
1176
1177 -- Type declarations
1178
1179diff -ur BNFC-2.4.2.0/formats/profile/ProfileTop.hs BNFC-2.4.2.0-ghc-7.2/formats/profile/ProfileTop.hs
1180--- BNFC-2.4.2.0/formats/profile/ProfileTop.hs 2010-09-15 16:26:38.000000000 +0200
1181+++ BNFC-2.4.2.0-ghc-7.2/formats/profile/ProfileTop.hs 2011-10-28 15:00:45.843347181 +0200
1182@@ -36,9 +36,9 @@
1183 import GetCF
1184 import Utils
1185
1186-import Char
1187-import System
1188-import Monad(when)
1189+import Data.Char
1190+import System.Exit
1191+import Control.Monad(when)
1192
1193 -- naming conventions
1194
1195diff -ur BNFC-2.4.2.0/formats/xml/CFtoXML.hs BNFC-2.4.2.0-ghc-7.2/formats/xml/CFtoXML.hs
1196--- BNFC-2.4.2.0/formats/xml/CFtoXML.hs 2010-09-15 16:26:38.000000000 +0200
1197+++ BNFC-2.4.2.0-ghc-7.2/formats/xml/CFtoXML.hs 2011-10-28 14:38:23.549953287 +0200
1198@@ -24,8 +24,8 @@
1199 import GetCF (writeFileRep)
1200 import Utils
1201 import CFtoTemplate
1202-import List (intersperse, nub)
1203-import Char(toLower)
1204+import Data.List (intersperse, nub)
1205+import Data.Char(toLower)
1206
1207 type Coding = Bool ---- change to at least three values
1208
BNF Converter
This page took 0.474302 seconds and 4 git commands to generate.