diff options
29 files changed, 38 insertions, 47 deletions
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc019.hs b/testsuite/tests/ghc-regress/concurrent/should_run/conc019.hs index 10a362d96f..51b3d7563a 100644 --- a/testsuite/tests/ghc-regress/concurrent/should_run/conc019.hs +++ b/testsuite/tests/ghc-regress/concurrent/should_run/conc019.hs @@ -1,4 +1,3 @@ -import IO import Control.Concurrent import Control.Exception import Data.List diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc022.hs b/testsuite/tests/ghc-regress/concurrent/should_run/conc022.hs index c70f4a1a73..5d420d8af7 100644 --- a/testsuite/tests/ghc-regress/concurrent/should_run/conc022.hs +++ b/testsuite/tests/ghc-regress/concurrent/should_run/conc022.hs @@ -3,7 +3,6 @@ import Control.Concurrent import Control.Exception -import IO import GHC.Exts ( fork# ) import GHC.IO ( IO(..) ) diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc023.hs b/testsuite/tests/ghc-regress/concurrent/should_run/conc023.hs index ed85862c9d..b128c224a3 100644 --- a/testsuite/tests/ghc-regress/concurrent/should_run/conc023.hs +++ b/testsuite/tests/ghc-regress/concurrent/should_run/conc023.hs @@ -5,7 +5,7 @@ -- random delay between 0 and m seconds. We use a semaphore to wait -- for all the threads to finish. -import Random +import System.Random import Control.Concurrent import Control.Exception diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.hs b/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.hs index 9e0c1279f7..0bd22ab787 100644 --- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.hs +++ b/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.hs @@ -2,7 +2,7 @@ -- [Not strictly a 'deriving' issue] module Main( main ) where -import Array +import Data.Array bds :: ((Int,Int),(Int,Int)) bds = ((1,4),(2,5)) diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi009.hs b/testsuite/tests/ghc-regress/ffi/should_run/ffi009.hs index 2c412b9464..5e91843bb5 100644 --- a/testsuite/tests/ghc-regress/ffi/should_run/ffi009.hs +++ b/testsuite/tests/ghc-regress/ffi/should_run/ffi009.hs @@ -1,5 +1,5 @@ import Foreign -import Random +import System.Random -------------------------------------------------------------------------------- diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum01.hs b/testsuite/tests/ghc-regress/lib/should_run/enum01.hs index 4a99ac7a17..d8178667eb 100644 --- a/testsuite/tests/ghc-regress/lib/should_run/enum01.hs +++ b/testsuite/tests/ghc-regress/lib/should_run/enum01.hs @@ -3,8 +3,8 @@ module Main(main) where import Control.Exception import Prelude hiding (catch) -import Char -import Ratio +import Data.Char +import Data.Ratio main = do -- Enum Int diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum02.hs b/testsuite/tests/ghc-regress/lib/should_run/enum02.hs index d357788754..3ba9d4912d 100644 --- a/testsuite/tests/ghc-regress/lib/should_run/enum02.hs +++ b/testsuite/tests/ghc-regress/lib/should_run/enum02.hs @@ -3,7 +3,7 @@ module Main(main) where import Control.Exception import Prelude hiding (catch) -import Int +import Data.Int main = do putStrLn "Testing Enum Int8:" diff --git a/testsuite/tests/ghc-regress/lib/should_run/list002.hs b/testsuite/tests/ghc-regress/lib/should_run/list002.hs index 43bf1dcb19..188ff8953d 100644 --- a/testsuite/tests/ghc-regress/lib/should_run/list002.hs +++ b/testsuite/tests/ghc-regress/lib/should_run/list002.hs @@ -1,6 +1,6 @@ -- !!! Test that List.sortBy is stable. -import List +import Data.List main = print (sortBy (\(a,b) (a',b')->compare a a') ([1,1,1,1,1,1,1,1,1,1]`zip`[1..10])) diff --git a/testsuite/tests/ghc-regress/lib/should_run/memo002.hs b/testsuite/tests/ghc-regress/lib/should_run/memo002.hs index 8f903b764d..aa0a1d27c9 100644 --- a/testsuite/tests/ghc-regress/lib/should_run/memo002.hs +++ b/testsuite/tests/ghc-regress/lib/should_run/memo002.hs @@ -1,8 +1,8 @@ module Main where -import Memo2 ( memo ) -import List ( genericLength, genericReplicate ) -import System ( getArgs ) +import Memo2 ( memo ) +import Data.List ( genericLength, genericReplicate ) +import System.Environment ( getArgs ) main :: IO () main = do (arg:_) <- getArgs diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/DataTypes.hs b/testsuite/tests/ghc-regress/programs/andy_cherry/DataTypes.hs index 9e8b31d43c..9f7c5571ba 100644 --- a/testsuite/tests/ghc-regress/programs/andy_cherry/DataTypes.hs +++ b/testsuite/tests/ghc-regress/programs/andy_cherry/DataTypes.hs @@ -2,9 +2,9 @@ module DataTypes where import GenUtils - import Array -- 1.3 - import Ix - import Char + import Data.Array -- 1.3 + import Data.Ix + import Data.Char infix 1 =: -- 1.3 (=:) a b = (a,b) diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/GenUtils.hs b/testsuite/tests/ghc-regress/programs/andy_cherry/GenUtils.hs index 649deb487a..3e1de07fb8 100644 --- a/testsuite/tests/ghc-regress/programs/andy_cherry/GenUtils.hs +++ b/testsuite/tests/ghc-regress/programs/andy_cherry/GenUtils.hs @@ -38,8 +38,8 @@ module GenUtils ( combinePairs, formatText ) where -import Array -- 1.3 -import Ix -- 1.3 +import Data.Array -- 1.3 +import Data.Ix -- 1.3 import Debug.Trace ( trace ) diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/InterpUtils.hs b/testsuite/tests/ghc-regress/programs/andy_cherry/InterpUtils.hs index e562045dd6..820163e8fd 100644 --- a/testsuite/tests/ghc-regress/programs/andy_cherry/InterpUtils.hs +++ b/testsuite/tests/ghc-regress/programs/andy_cherry/InterpUtils.hs @@ -3,7 +3,7 @@ import GenUtils import DataTypes - import Array -- 1.3 + import Data.Array -- 1.3 diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/Main.hs b/testsuite/tests/ghc-regress/programs/andy_cherry/Main.hs index 3a85ba207b..aa4274ec59 100644 --- a/testsuite/tests/ghc-regress/programs/andy_cherry/Main.hs +++ b/testsuite/tests/ghc-regress/programs/andy_cherry/Main.hs @@ -7,8 +7,8 @@ import Interp import PrintTEX - import System -- 1.3 (partain) - import Char -- 1.3 + import System.Environment -- 1.3 (partain) + import Data.Char -- 1.3 --fakeArgs = "game001.txt" --fakeArgs = "pca2.pgn" diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/Parser.hs b/testsuite/tests/ghc-regress/programs/andy_cherry/Parser.hs index 045b3fc71d..6dddb64a0e 100644 --- a/testsuite/tests/ghc-regress/programs/andy_cherry/Parser.hs +++ b/testsuite/tests/ghc-regress/programs/andy_cherry/Parser.hs @@ -3,7 +3,7 @@ import GenUtils import DataTypes - import Char -- 1.3 + import Data.Char -- 1.3 diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/PrintTEX.hs b/testsuite/tests/ghc-regress/programs/andy_cherry/PrintTEX.hs index b4a6c660eb..d8f253f6d4 100644 --- a/testsuite/tests/ghc-regress/programs/andy_cherry/PrintTEX.hs +++ b/testsuite/tests/ghc-regress/programs/andy_cherry/PrintTEX.hs @@ -3,8 +3,8 @@ import GenUtils import DataTypes - import Array -- 1.3 - import Char -- 1.3 + import Data.Array -- 1.3 + import Data.Char -- 1.3 diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Plot.lhs b/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Plot.lhs index 8a33acfbab..8db1066aef 100644 --- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Plot.lhs +++ b/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Plot.lhs @@ -8,7 +8,6 @@ The first line just gives the module name. For the moment, I don't anticipate using any modules (although this may change). > module Plot where -> import IO Now we give the type of the function. This consists of a file name, a list of values, and a function that goes from the appropriate types. diff --git a/testsuite/tests/ghc-regress/programs/cholewo-eval/Arr.lhs b/testsuite/tests/ghc-regress/programs/cholewo-eval/Arr.lhs index b1f4d8076e..799f493529 100644 --- a/testsuite/tests/ghc-regress/programs/cholewo-eval/Arr.lhs +++ b/testsuite/tests/ghc-regress/programs/cholewo-eval/Arr.lhs @@ -1,7 +1,7 @@ \begin{code} module Arr ( - module Array, + module Data.Array, safezipWith, safezip, row, @@ -28,7 +28,7 @@ module Arr ( -- showsVecList, showsMatList -- spy, ) where -import Array +import Data.Array import Numeric --import Trace --import IOExtensions(unsafePerformIO) diff --git a/testsuite/tests/ghc-regress/programs/fast2haskell/Fast2haskell.hs b/testsuite/tests/ghc-regress/programs/fast2haskell/Fast2haskell.hs index 43f6fa2b81..da8789eca4 100644 --- a/testsuite/tests/ghc-regress/programs/fast2haskell/Fast2haskell.hs +++ b/testsuite/tests/ghc-regress/programs/fast2haskell/Fast2haskell.hs @@ -6,12 +6,12 @@ land_i, lnot_i, lor_i, lshift_i, rshift_i, descr, destr_update, indassoc, lowbound, tabulate, upbound, update, valassoc) where { - import Bits; + import Data.Bits; -- import Word2; - import Word; - import Complex; -- 1.3 - import Array; -- 1.3 --- import Int ( Num(fromInt) ); + import Data.Word; + import Data.Complex; -- 1.3 + import Data.Array; -- 1.3 +-- import Data.Int ( Num(fromInt) ); type Complex_type = Complex Double; type Array_type b = Array Int b; type Assoc_type a = (Int, a); diff --git a/testsuite/tests/ghc-regress/programs/fast2haskell/Main.hs b/testsuite/tests/ghc-regress/programs/fast2haskell/Main.hs index b0c2935bc7..9c4a21dece 100644 --- a/testsuite/tests/ghc-regress/programs/fast2haskell/Main.hs +++ b/testsuite/tests/ghc-regress/programs/fast2haskell/Main.hs @@ -1,8 +1,8 @@ module Main (main) -- TEST where { import Fast2haskell; -import Complex;--1.3 -import Array;--1.3 +import Data.Complex;--1.3 +import Data.Array;--1.3 c_eps=(5.00000e-06 :: Double); c_t=True; diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/Funcs_Lexer.hs b/testsuite/tests/ghc-regress/programs/joao-circular/Funcs_Lexer.hs index 4e420d4366..c9f5c07b16 100644 --- a/testsuite/tests/ghc-regress/programs/joao-circular/Funcs_Lexer.hs +++ b/testsuite/tests/ghc-regress/programs/joao-circular/Funcs_Lexer.hs @@ -7,7 +7,7 @@ module Funcs_Lexer where -import Char +import Data.Char -- -- Tokens passed to the parser diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/Main.hs b/testsuite/tests/ghc-regress/programs/joao-circular/Main.hs index 01204fc013..2202554816 100644 --- a/testsuite/tests/ghc-regress/programs/joao-circular/Main.hs +++ b/testsuite/tests/ghc-regress/programs/joao-circular/Main.hs @@ -1,6 +1,6 @@ module Main (main) where -import System +import System.Environment import LrcPrelude import Funcs_Parser_Lazy diff --git a/testsuite/tests/ghc-regress/programs/jules_xref/Main.hs b/testsuite/tests/ghc-regress/programs/jules_xref/Main.hs index b9126f403e..19f364d0f9 100644 --- a/testsuite/tests/ghc-regress/programs/jules_xref/Main.hs +++ b/testsuite/tests/ghc-regress/programs/jules_xref/Main.hs @@ -3,7 +3,7 @@ -- module Main where -import Char -- 1.3 +import Data.Char -- 1.3 --1.3:data Maybe a = Nothing | Just a diff --git a/testsuite/tests/ghc-regress/programs/north_array/Main.hs b/testsuite/tests/ghc-regress/programs/north_array/Main.hs index 049d8bf563..b6ceb706d6 100644 --- a/testsuite/tests/ghc-regress/programs/north_array/Main.hs +++ b/testsuite/tests/ghc-regress/programs/north_array/Main.hs @@ -1,4 +1,4 @@ -import Array -- 1.3 +import Data.Array -- 1.3 val1, val2 :: Array (Int,Int) Int val1 = array ((1,2), (2,1)) [] diff --git a/testsuite/tests/ghc-regress/programs/sanders_array/Main.hs b/testsuite/tests/ghc-regress/programs/sanders_array/Main.hs index 491a46b619..d5a2b29d12 100644 --- a/testsuite/tests/ghc-regress/programs/sanders_array/Main.hs +++ b/testsuite/tests/ghc-regress/programs/sanders_array/Main.hs @@ -7,8 +7,8 @@ Date: Mon, 28 Oct 91 17:02:19 GMT I'm struggling with the following code fragment at the moment: -} -import Array -- 1.3 -import Ix -- 1.3 +import Data.Array -- 1.3 +import Data.Ix -- 1.3 conv_list :: (Ix a, Ix b) => [a] -> [b] -> [[c]] -> Array (a,b) c -> Array (a,b) c conv_list [] _ _ ar = ar diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/TcRun025_B.hs b/testsuite/tests/ghc-regress/typecheck/should_run/TcRun025_B.hs index ad3409964f..a6d752c1a7 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/TcRun025_B.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_run/TcRun025_B.hs @@ -4,7 +4,7 @@ module TcRun025_B where - import List( sort ) + import Data.List( sort ) -- This class has no tyvars in its class op context -- One uses a newtype, the other a data type diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun008.hs b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun008.hs index 2b4c6b676a..80097a8f24 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun008.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun008.hs @@ -4,8 +4,6 @@ module Main where -import IO - class Foo a where bar :: a -> [a] diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun018.hs b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun018.hs index d7d439733c..9f9bd14d0f 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun018.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun018.hs @@ -1,7 +1,5 @@ {-# LANGUAGE MultiParamTypeClasses, FlexibleInstances #-} -import Monad - class Monad m => C1 m x class (Monad m, C1 m x) => C2 m x diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun020.hs b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun020.hs index 41fb70c051..98cbc71e3c 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun020.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun020.hs @@ -5,8 +5,6 @@ module Main where -import Monad - class Monad m => C1 m x class (C1 m x) => C2 m x where diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun024.hs b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun024.hs index be2e63d0f1..82c6f49e33 100644 --- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun024.hs +++ b/testsuite/tests/ghc-regress/typecheck/should_run/tcrun024.hs @@ -4,7 +4,7 @@ module Main where - import List( sort ) + import Data.List( sort ) just = [Just "fred",Just "bill"] |