[project @ 2003-07-29 12:03:13 by ross]

trim imports

diff --git a/Control/Monad/ST.hs b/Control/Monad/ST.hs
index 008dafc..3ea3bb3 100644 (file)
--- a/Control/Monad/ST.hs
+++ b/Control/Monad/ST.hs
@@ -33,7 +33,7 @@ module Control.Monad.ST
 import Prelude
 
 import Control.Monad.Fix
-import Data.Dynamic
+import Data.Typeable
 
 #ifdef __HUGS__
 import Hugs.ST

diff --git a/Data/Array.hs b/Data/Array.hs
index d9083da..0dd1b23 100644 (file)
--- a/Data/Array.hs
+++ b/Data/Array.hs
@@ -44,10 +44,6 @@ module  Data.Array
 
     ) where
 
-#ifndef __NHC__
-import Data.Dynamic
-#endif
-
 import Data.Ix
 
 #ifdef __GLASGOW_HASKELL__
@@ -64,6 +60,10 @@ import Array         -- Haskell'98 arrays
 #endif
 
 #ifndef __NHC__
+import Data.Typeable
+#endif
+
+#ifndef __NHC__
 #include "Typeable.h"
 INSTANCE_TYPEABLE2(Array,arrayTc,"Array")
 #endif

diff --git a/Data/Array/Base.hs b/Data/Array/Base.hs
index e32e8c0..58ee5eb 100644 (file)
--- a/Data/Array/Base.hs
+++ b/Data/Array/Base.hs
@@ -19,12 +19,10 @@ module Data.Array.Base where
 import Prelude
 
 import Data.Ix         ( Ix, range, index, rangeSize )
-import Data.Bits
 import Data.Int
 import Data.Word
 import Foreign.Ptr
 import Foreign.StablePtr
-import Foreign.Storable
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.Arr         ( STArray, unsafeIndex )
@@ -41,6 +39,8 @@ import GHC.Word               ( Word8(..), Word16(..), Word32(..), Word64(..) )
 #endif
 
 #ifdef __HUGS__
+import Data.Bits
+import Foreign.Storable
 import qualified Hugs.Array as Arr
 import qualified Hugs.ST as ArrST
 import Hugs.Array ( unsafeIndex )
@@ -48,7 +48,7 @@ import Hugs.ST ( STArray, ST(..), runST )
 import Hugs.ByteArray
 #endif
 
-import Data.Dynamic
+import Data.Typeable
 #include "Typeable.h"
 
 #include "MachDeps.h"

diff --git a/Data/Array/IO/Internals.hs b/Data/Array/IO/Internals.hs
index 5d81eab..17f0f37 100644 (file)
--- a/Data/Array/IO/Internals.hs
+++ b/Data/Array/IO/Internals.hs
@@ -25,7 +25,7 @@ import Prelude
 import Data.Array.MArray
 import Data.Int
 import Data.Word
-import Data.Dynamic
+import Data.Typeable
 
 #ifdef __HUGS__
 import Hugs.IOArray

diff --git a/Data/Array/ST.hs b/Data/Array/ST.hs
index 0db90e1..4982de8 100644 (file)
--- a/Data/Array/ST.hs
+++ b/Data/Array/ST.hs
@@ -28,13 +28,12 @@ module Data.Array.ST (
 import Prelude
 
 import Data.Array.MArray
-import Data.Array.Base hiding (MArray(..))
+import Data.Array.Base ( STUArray, castSTUArray )
 
 #ifdef __HUGS__
-import Hugs.ST
+import Hugs.ST         ( STArray )
 #endif
 
 #ifdef __GLASGOW_HASKELL__
-import GHC.Arr
-import GHC.ST
+import GHC.Arr         ( STArray )
 #endif

diff --git a/Data/Complex.hs b/Data/Complex.hs
index f2cef50..621b48e 100644 (file)
--- a/Data/Complex.hs
+++ b/Data/Complex.hs
@@ -40,7 +40,7 @@ module Data.Complex
 import Prelude
 
 #ifndef __NHC__
-import Data.Dynamic
+import Data.Typeable
 #endif
 
 #ifdef __HUGS__

diff --git a/Data/Dynamic.hs b/Data/Dynamic.hs
index 0a9c116..26782ce 100644 (file)
--- a/Data/Dynamic.hs
+++ b/Data/Dynamic.hs
@@ -47,9 +47,6 @@ import GHC.Base
 import GHC.Show
 import GHC.Err
 import GHC.Num
-import GHC.Float
-import GHC.Real( rem )
-import GHC.IOBase
 #endif
 
 #ifdef __HUGS__

diff --git a/Data/PackedString.hs b/Data/PackedString.hs
index 083aa47..cd4fad9 100644 (file)
--- a/Data/PackedString.hs
+++ b/Data/PackedString.hs
@@ -71,7 +71,7 @@ import Prelude
 
 import Data.Array.Unboxed
 import Data.Array.IO
-import Data.Dynamic
+import Data.Typeable
 import Data.Char
 
 import System.IO

diff --git a/Data/STRef.hs b/Data/STRef.hs
index a13bc56..3edfb87 100644 (file)
--- a/Data/STRef.hs
+++ b/Data/STRef.hs
@@ -32,7 +32,7 @@ import GHC.STRef
 import Hugs.ST
 #endif
 
-import Data.Dynamic
+import Data.Typeable
 
 #include "Typeable.h"
 INSTANCE_TYPEABLE2(STRef,stRefTc,"STRef")

diff --git a/Data/STRef/Lazy.hs b/Data/STRef/Lazy.hs
index faf7de5..d7e028c 100644 (file)
--- a/Data/STRef/Lazy.hs
+++ b/Data/STRef/Lazy.hs
@@ -22,7 +22,6 @@ module Data.STRef.Lazy (
 
 import Control.Monad.ST.Lazy
 import qualified Data.STRef as ST
-import qualified Control.Monad.ST as ST
 
 newSTRef    :: a -> ST s (ST.STRef s a)
 readSTRef   :: ST.STRef s a -> ST s a

diff --git a/Foreign/C/Error.hs b/Foreign/C/Error.hs
index cb8023b..33a7bfd 100644 (file)
--- a/Foreign/C/Error.hs
+++ b/Foreign/C/Error.hs
@@ -107,7 +107,6 @@ import Foreign.Marshal.Error        ( void )
 import Data.Maybe
 
 #if __GLASGOW_HASKELL__
-import GHC.Storable
 import GHC.IOBase
 import GHC.Num
 import GHC.Base

diff --git a/Foreign/C/Types.hs b/Foreign/C/Types.hs
index d2f3bc8..eb05feb 100644 (file)
--- a/Foreign/C/Types.hs
+++ b/Foreign/C/Types.hs
@@ -63,7 +63,7 @@ import Foreign.Storable
 import Data.Bits       ( Bits(..) )
 import Data.Int                ( Int8,  Int16,  Int32,  Int64  )
 import Data.Word       ( Word8, Word16, Word32, Word64 )
-import Data.Dynamic
+import Data.Typeable
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.Base

diff --git a/Foreign/C/TypesISO.hs b/Foreign/C/TypesISO.hs
index 79ea7b5..ab2c928 100644 (file)
--- a/Foreign/C/TypesISO.hs
+++ b/Foreign/C/TypesISO.hs
@@ -52,7 +52,7 @@ import NHC.FFI
 import Data.Bits       ( Bits(..) )
 import Data.Int
 import Data.Word
-import Data.Dynamic
+import Data.Typeable
 import Foreign.Storable
 
 #ifdef __GLASGOW_HASKELL__

diff --git a/Foreign/ForeignPtr.hs b/Foreign/ForeignPtr.hs
index 4a86c94..af39a61 100644 (file)
--- a/Foreign/ForeignPtr.hs
+++ b/Foreign/ForeignPtr.hs
@@ -71,7 +71,7 @@ import GHC.ForeignPtr
 
 #if !defined(__NHC__) && !defined(__GLASGOW_HASKELL__)
 import Foreign.Marshal.Alloc   ( malloc, mallocBytes, finalizerFree )
-import Data.Dynamic
+import Data.Typeable
 
 #include "Typeable.h"
 INSTANCE_TYPEABLE1(ForeignPtr,foreignPtrTc,"ForeignPtr")

diff --git a/Foreign/Marshal/Array.hs b/Foreign/Marshal/Array.hs
index 0cd959d..002afed 100644 (file)
--- a/Foreign/Marshal/Array.hs
+++ b/Foreign/Marshal/Array.hs
@@ -62,7 +62,7 @@ module Foreign.Marshal.Array (
 import Control.Monad
 import Foreign.Ptr     (Ptr, plusPtr)
 import Foreign.Storable        (Storable(sizeOf,peekElemOff,pokeElemOff))
-import Foreign.Marshal.Alloc (alloca, mallocBytes, allocaBytes, reallocBytes)
+import Foreign.Marshal.Alloc (mallocBytes, allocaBytes, reallocBytes)
 import Foreign.Marshal.Utils (copyBytes, moveBytes)
 
 #ifdef __GLASGOW_HASKELL__

diff --git a/Foreign/Marshal/Pool.hs b/Foreign/Marshal/Pool.hs
index 4f3364c..20be91a 100644 (file)
--- a/Foreign/Marshal/Pool.hs
+++ b/Foreign/Marshal/Pool.hs
@@ -45,7 +45,7 @@ module Foreign.Marshal.Pool (
 ) where
 
 #ifdef __GLASGOW_HASKELL__
-import GHC.Base              ( Int, Monad(..), (.), not, map )
+import GHC.Base              ( Int, Monad(..), (.), not )
 import GHC.Err               ( undefined )
 import GHC.Exception         ( block, unblock, throw, catchException )
 import GHC.IOBase            ( IO, IORef, newIORef, readIORef, writeIORef, )

diff --git a/GHC/ForeignPtr.hs b/GHC/ForeignPtr.hs
index 430d3ad..1778623 100644 (file)
--- a/GHC/ForeignPtr.hs
+++ b/GHC/ForeignPtr.hs
@@ -31,7 +31,7 @@ module GHC.ForeignPtr
 import Control.Monad   ( sequence_ )
 import Foreign.Ptr
 import Foreign.Storable
-import Data.Dynamic
+import Data.Typeable
 
 import GHC.List        ( null )
 import GHC.Base

diff --git a/Prelude.hs b/Prelude.hs
index 2d0fe96..31aa6b6 100644 (file)
--- a/Prelude.hs
+++ b/Prelude.hs
@@ -123,7 +123,6 @@ import GHC.Num
 import GHC.Real
 import GHC.Float
 import GHC.Show
-import GHC.Conc
 import GHC.Err   ( error, undefined )
 #endif
 

diff --git a/System/Mem/StableName.hs b/System/Mem/StableName.hs
index bec26b5..8a3c858 100644 (file)
--- a/System/Mem/StableName.hs
+++ b/System/Mem/StableName.hs
@@ -31,7 +31,7 @@ module System.Mem.StableName (
 
 import Prelude
 
-import Data.Dynamic
+import Data.Typeable
 
 #ifdef __HUGS__
 import Hugs.Stable

diff --git a/System/Mem/Weak.hs b/System/Mem/Weak.hs
index 1caf672..5790105 100644 (file)
--- a/System/Mem/Weak.hs
+++ b/System/Mem/Weak.hs
@@ -69,7 +69,7 @@ module System.Mem.Weak (
 
 import Prelude
 
-import Data.Dynamic
+import Data.Typeable
 
 #ifdef __HUGS__
 import Hugs.Weak

diff --git a/System/Posix/Types.hs b/System/Posix/Types.hs
index 0bd389d..7a9d6da 100644 (file)
--- a/System/Posix/Types.hs
+++ b/System/Posix/Types.hs
@@ -47,7 +47,7 @@ module System.Posix.Types (
 
 import Foreign
 import Foreign.C
-import Data.Dynamic
+import Data.Typeable
 import Data.Bits
 
 #ifdef __GLASGOW_HASKELL__

diff --git a/System/Random.hs b/System/Random.hs
index b284b42..98420e1 100644 (file)
--- a/System/Random.hs
+++ b/System/Random.hs
@@ -56,10 +56,6 @@ import System.IO.Unsafe ( unsafePerformIO )
 import Data.IORef
 import Numeric         ( readDec )
 
-#ifdef __GLASGOW_HASKELL__
-import GHC.IOBase      ( stToIO )
-#endif
-
 -- The standard nhc98 implementation of Time.ClockTime does not match
 -- the extended one expected in this module, so we lash-up a quick
 -- replacement here.