add Data.Function

[haskell-directory.git] / Data / Array.hs

diff --git a/Data/Array.hs b/Data/Array.hs
index 2cd6553..09c4f65 100644 (file)
--- a/Data/Array.hs
+++ b/Data/Array.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -fno-implicit-prelude #-}
+{-# OPTIONS_GHC -fno-implicit-prelude #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Array 
@@ -58,8 +58,10 @@ module  Data.Array
 import Data.Ix
 
 #ifdef __GLASGOW_HASKELL__
-import GHC.Arr         -- Most of the hard work is done here
-import GHC.Err         ( undefined )
+import GHC.Arr                 -- Most of the hard work is done here
+import Data.Generics.Basics     -- To provide a Data instance
+import Data.Generics.Instances  -- To provide a Data instance
+import GHC.Err ( error )        -- Needed for Data instance
 #endif
 
 #ifdef __HUGS__
@@ -70,14 +72,7 @@ import Hugs.Array
 import Array           -- Haskell'98 arrays
 #endif
 
-#ifndef __NHC__
 import Data.Typeable
-#endif
-
-#ifndef __NHC__
-#include "Typeable.h"
-INSTANCE_TYPEABLE2(Array,arrayTc,"Array")
-#endif
 
 {- $intro
 Haskell provides indexable /arrays/, which may be thought of as functions