Fix build for GHC 7.6

nh2 · May 3, 2013 · 08010e7 · 08010e7
1 parent e56e98c
commit 08010e7
Show file tree

Hide file tree

Showing 93 changed files with 264 additions and 241 deletions.
diff --git a/Examples/WASHExamples.cabal b/Examples/WASHExamples.cabal
@@ -1,5 +1,5 @@
 Name: WashNGoExamples
-Version: 2.10
+Version: 2.11
 License: BSD3
 License-File: LICENSE
 Author: Peter Thiemann
@@ -8,17 +8,17 @@ Homepage: http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/
 Category: Web
 Stability: Beta
 Synopsis: Example package for WASH
-Build-Depends: base, haskell98, parsec, WashNGo>=2.10
+Build-Depends: base, parsec, random, old-time, directory, WashNGo>=2.13
 
 Executable: Date
 Main-Is: Date.hs
 Hs-Source-Dirs: new
-Ghc-Options: -pgmF wash2hs -F -fglasgow-exts
+Ghc-Options: -pgmF wash2hs -F
 
 Executable: Date2
 Main-Is: Date2.hs
 Hs-Source-Dirs: new
-Ghc-Options: -pgmF wash2hs -F -fglasgow-exts
+Ghc-Options: -pgmF wash2hs -F
 
 -- Executable: Reservation
 -- Main-Is: Reservation.hs

diff --git a/Examples/new/Date2.hs b/Examples/new/Date2.hs
@@ -1,5 +1,4 @@
 -- © 2001, 2002 Peter Thiemann
-{-# ghc_options -fglasgow-exts -}
 module Main where
 
 import Prelude hiding (head, span, div, map)

diff --git a/Examples/new/GuessNumberNoCheating.hs b/Examples/new/GuessNumberNoCheating.hs
@@ -1,9 +1,9 @@
 -- © 2001-2005 Peter Thiemann
 module Main where
 
-import Random
-import Monad
-import List
+import System.Random
+import Control.Monad
+import Data.List
 
 import WASH.CGI.CGI
 import qualified WASH.CGI.Persistent2 as P

diff --git a/Examples/new/Multiplication.hs b/Examples/new/Multiplication.hs
@@ -3,7 +3,7 @@ module Main where
 
 import Prelude hiding (head, div, span, map)
 import WASH.HTML.HTMLMonad
-import Random
+import System.Random
 import WASH.CGI.CGI
 
 main = 

diff --git a/Examples/new/Reservation.hs b/Examples/new/Reservation.hs
@@ -6,7 +6,7 @@ module Main where
 import WASH.CGI.CGI hiding (map)
 import qualified WASH.CGI.Transaction as T
 
-import Monad
+import Control.Monad
 
 type SeatCategory = Char
 seatCategories :: [SeatCategory]

diff --git a/Examples/new/Tutorial.hs b/Examples/new/Tutorial.hs
@@ -3,7 +3,7 @@ module Main where
 
 import WASH.CGI.CGI hiding (head, div, span, map)
 import qualified WASH.CGI.CGI as CGI
-import Random
+import System.Random
 import qualified WASH.CGI.Persistent2 as P
 import qualified WASH.CGI.Cookie as C
 import WASH.CGI.Types -- for nhc98 

diff --git a/Examples/old/CalcFix.hs b/Examples/old/CalcFix.hs
@@ -1,7 +1,7 @@
 -- © 2001-2005 Peter Thiemann
 module Main where
 
-import Char
+import Data.Char
 import Prelude hiding (head, span, map)
 import WASH.CGI.CGI hiding (div)
 

diff --git a/Examples/old/CalcHistory.hs b/Examples/old/CalcHistory.hs
@@ -1,7 +1,7 @@
 -- © 2006 Peter Thiemann
 module Main where
 
-import Char
+import Data.Char
 import Prelude hiding (head, span, map)
 import WASH.CGI.CGI hiding (div)
 

diff --git a/Examples/old/Calculator.hs b/Examples/old/Calculator.hs
@@ -1,7 +1,7 @@
 -- © 2001-2005 Peter Thiemann
 module Main where
 
-import Char
+import Data.Char
 import Prelude hiding (head, span, map)
 import WASH.CGI.CGI hiding (div)
 

diff --git a/Examples/old/ForeignReport.hs b/Examples/old/ForeignReport.hs
@@ -1,16 +1,15 @@
 module ForeignReport where
 
-import Char
-import Directory
-import List hiding (head)
-import Maybe
-import Random
+import Data.Char
+import System.Directory
+import Data.List hiding (head)
+import Data.Maybe
+import System.Random
 import Prelude hiding (head)
 import WASH.HTML.HTMLMonad
 import WASH.CGI.CGI
 import Item
 import RepBase
-import System
 
 
 reviewerlogin F0 = venueQuery "Reviewer Login" $ do

diff --git a/Examples/old/GuessNumber.hs b/Examples/old/GuessNumber.hs
@@ -1,9 +1,9 @@
 -- © 2001, 2002 Peter Thiemann
 module Main where
 
-import Random
+import System.Random
 import Prelude hiding (head, div, span, map)
-import List hiding (head, span, map)
+import Data.List hiding (head, span, map)
 
 import WASH.HTML.HTMLMonad
 import WASH.CGI.CGI

diff --git a/Examples/old/GuessNumberCookie.hs b/Examples/old/GuessNumberCookie.hs
@@ -1,9 +1,9 @@
 -- © 2001, 2002 Peter Thiemann
 module Main where
 
-import Random
+import System.Random
 import Prelude hiding (head, span, map, div)
-import List hiding (head, span, map)
+import Data.List hiding (head, span, map)
 
 import WASH.CGI.CGI
 import qualified WASH.CGI.Persistent2 as P

diff --git a/Examples/old/GuessNumberNoCheating.hs b/Examples/old/GuessNumberNoCheating.hs
@@ -1,9 +1,9 @@
 -- © 2001, 2002 Peter Thiemann
 module Main where
 
-import Random
+import System.Random
 import Prelude hiding (head, span, map, div)
-import List hiding (head, span, map)
+import Data.List hiding (head, span, map)
 
 import WASH.HTML.HTMLMonad
 import WASH.CGI.CGI

diff --git a/Examples/old/Item.hs b/Examples/old/Item.hs
@@ -2,15 +2,15 @@ module Item where
 
 import Prelude hiding (head,map,span,div)
 import qualified Prelude (head,map,span,div)
-import Random
-import Directory
+import System.Random
+import System.Directory
 import WASH.CGI.CGI
 import WASH.HTML.HTMLMonad
-import List hiding (head)
-import Char
-import Maybe
+import Data.List hiding (head)
+import Data.Char
+import Data.Maybe
 import WASH.Utility.Locking
-import IO
+import System.IO
 import WASH.Utility.Auxiliary
 
 ----------------------------------------

diff --git a/Examples/old/Makefile b/Examples/old/Makefile
@@ -85,28 +85,28 @@ install-example-sources:
 	done
 
 Manager: Manager.o Item.o RepBase.o Report2.o Submit.o ForeignReport.o
-	$(LINK.o) $^ -o $@ -fglasgow-exts -package text
+	$(LINK.o) $^ -o $@ -package text
 
 MANAGER: MANAGER.o Item.o RepBase.o Report2.o Submit.o ForeignReport.o
-	$(LINK.o) $^ -o $@ -fglasgow-exts -package text
+	$(LINK.o) $^ -o $@ -package text
 Manager.o : Manager.hs
-	$(HC) $(HCFLAGS) -fglasgow-exts -c $< -o $@
+	$(HC) $(HCFLAGS) -c $< -o $@
 MANAGER.o : MANAGER.hs
-	$(HC) $(HCFLAGS) -fglasgow-exts -c $< -o $@
+	$(HC) $(HCFLAGS) -c $< -o $@
 Report2.o : Report2.hs
-	$(HC) $(HCFLAGS) -fglasgow-exts -c $< -o $@
+	$(HC) $(HCFLAGS) -c $< -o $@
 Submit.o : Submit.hs
-	$(HC) $(HCFLAGS) -fglasgow-exts -c $< -o $@
+	$(HC) $(HCFLAGS) -c $< -o $@
 Item.o : Item.hs
-	$(HC) $(HCFLAGS) -fglasgow-exts -c $< -o $@
+	$(HC) $(HCFLAGS) -c $< -o $@
 
 GuessNumber: GuessNumber.o Score.o
 GuessNumberNoCheating: GuessNumberNoCheating.o Score.o
 GuessNumberCookie: GuessNumberCookie.o Score.o
 TinyShop: TinyShop.o DiskImages.o
-	$(LINK.o) $^ -o $@ -fglasgow-exts -package text
+	$(LINK.o) $^ -o $@ -package text
 TinyShopXX: TinyShopXX.o DiskImages.o
-	$(LINK.o) $^ -o $@ -fglasgow-exts -package text
+	$(LINK.o) $^ -o $@ -package text
 
 clean::
 	$(RM) -f *.hi *.o

diff --git a/Examples/old/Multiplication.hs b/Examples/old/Multiplication.hs
@@ -3,7 +3,7 @@ module Main where
 
 import Prelude hiding (head, div, span, map)
 import WASH.HTML.HTMLMonad
-import Random
+import System.Random
 import WASH.CGI.CGI
 
 main = 

diff --git a/Examples/old/RepBase.hs b/Examples/old/RepBase.hs
@@ -1,16 +1,15 @@
 module RepBase (module Item, module RepBase) where
 
 import Auxiliary
-import Char
-import Directory
-import List hiding (head)
-import Maybe
-import Random
+import Data.Char
+import System.Directory
+import Data.List hiding (head)
+import Data.Maybe
+import System.Random
 import Prelude hiding (head)
 import WASH.HTML.HTMLMonad
 import WASH.CGI.CGI
 import Item
-import System
 import WASH.Utility.Locking
 import WASH.Mail.Email
 

diff --git a/Examples/old/Report2.hs b/Examples/old/Report2.hs
@@ -1,20 +1,19 @@
 module Report2 where
 
 import WASH.Utility.Auxiliary
-import Char
-import Directory
-import List hiding (head)
-import Maybe
-import Monad
-import Random
+import Data.Char
+import System.Directory
+import Data.List hiding (head)
+import Data.Maybe
+import Control.Monad
+import System.Random
 import Prelude hiding (head)
 import WASH.HTML.HTMLMonad
 import WASH.CGI.CGI
 import WASH.CGI.CGIInternals (unsafe_io)
 import WASH.CGI.CGIMonad
 import WASH.CGI.Fields
 import RepBase
-import System
 import WASH.Mail.Email
 
 -- pcAccess :: (?venuePath :: String) => F0 -> CGI ()

diff --git a/Examples/old/SendFile.hs b/Examples/old/SendFile.hs
@@ -1,15 +1,14 @@
 -- © 2002 Peter Thiemann
 module Main where
 
-import Char
-import Directory
-import List hiding (head, span, map)
-import Maybe
-import Random
+import Data.Char
+import System.Directory
+import Data.List hiding (head, span, map)
+import Data.Maybe
+import System.Random
 import Prelude hiding (head, div, span, map)
 import WASH.HTML.HTMLMonad
 import WASH.CGI.CGI
-import System
 
 fileList = [("lp/part1.ps", "langproc")]
 storeDirectory = "/home/thiemann/public/"

diff --git a/Examples/old/Submit.hs b/Examples/old/Submit.hs
@@ -2,13 +2,13 @@
 module Submit where
 
 import WASH.Utility.Auxiliary
-import Char
-import Directory
+import Data.Char
+import System.Directory
 import WASH.CGI.Fields
-import List hiding (head)
-import Maybe
-import Monad
-import Random
+import Data.List hiding (head)
+import Data.Maybe
+import Control.Monad
+import System.Random
 import Prelude hiding (head)
 import WASH.HTML.HTMLMonad
 import WASH.CGI.CGI

diff --git a/Examples/old/TimeTable.hs b/Examples/old/TimeTable.hs
@@ -5,9 +5,9 @@ import Prelude hiding (head, map, span, div, init)
 import qualified Prelude (head, map, span, div)
 import WASH.CGI.CGI hiding (span, head, map, div)
 import qualified WASH.CGI.Persistent2 as P
-import Maybe
-import Monad
-import List hiding (head, map, span, init)
+import Data.Maybe
+import Control.Monad
+import Data.List hiding (head, map, span, init)
 import WASH.CGI.Types
 
 type StoreTTEntry = Maybe (String, [String], [TTEntry])

diff --git a/Examples/old/TinyShop.hs b/Examples/old/TinyShop.hs
@@ -3,7 +3,7 @@ module Main where
 
 import WASH.CGI.CGI hiding (map, div, span, head)
 import DiskImages
-import Monad
+import Control.Monad
 
 helloCGI = 
   standardQuery "Welcome to TinyShop" $

diff --git a/Examples/old/TinyShopXX.hs b/Examples/old/TinyShopXX.hs
@@ -3,7 +3,7 @@ module Main where
 
 import WASH.CGI.CGIXX hiding (map, div, span, head)
 import DiskImages
-import Monad
+import Control.Monad
 
 helloCGI = 
   standardQuery "Welcome to TinyShop" $

diff --git a/Examples/old/Tutorial.hs b/Examples/old/Tutorial.hs
@@ -3,7 +3,7 @@ module Main where
 
 import WASH.CGI.CGI hiding (head, div, span, map)
 import qualified WASH.CGI.CGI as CGI
-import Random
+import System.Random
 import qualified WASH.CGI.Persistent2 as P
 import qualified WASH.CGI.Cookie as C
 import WASH.CGI.Types -- for nhc98 

diff --git a/Examples/old/UseAT.hs b/Examples/old/UseAT.hs
@@ -1,6 +1,6 @@
 import WASH.CGI.CGI
 
-import Monad
+import Control.Monad
 
 main = 
   run page1

diff --git a/Examples/old/UseCGI4.hs b/Examples/old/UseCGI4.hs
@@ -1,7 +1,7 @@
 -- © 2001 Peter Thiemann
 module Main where
 
-import Maybe
+import Data.Maybe
 import Prelude hiding (head, div, map, span)
 import WASH.HTML.HTMLMonad
 import WASH.CGI.CGI

diff --git a/Examples/old/UseGraphics.hs b/Examples/old/UseGraphics.hs
@@ -1,7 +1,7 @@
 -- © 2001 Peter Thiemann
 module Main where
 
-import List
+import Data.List
 
 import WASH.CGI.CGI hiding (map, div, span, head)
 import WASH.CGI.CGIGraphics

diff --git a/Examples/old/ex2-2.hs b/Examples/old/ex2-2.hs
@@ -7,9 +7,9 @@ module Main where
 
 import WASH.CGI.CGI hiding (div)
 import WASH.CGI.Fields
-import Time
-import Char
-import Ix
+import System.Time
+import Data.Char
+import Data.Ix
 
 main =
   run $ standardQuery "Days of Life!" $