[project @ 2002-05-10 20:44:29 by panne]

Re-enable bootstrapping: More Ptr trouble, now that it's (almost) abstract...

diff --git a/ghc/compiler/ghci/ByteCodeFFI.lhs b/ghc/compiler/ghci/ByteCodeFFI.lhs
index 480deab..017ae0d 100644 (file)
--- a/ghc/compiler/ghci/ByteCodeFFI.lhs
+++ b/ghc/compiler/ghci/ByteCodeFFI.lhs
@@ -18,7 +18,7 @@ import Bits           ( Bits(..), shiftR, shiftL )
 import Foreign         ( newArray )
 
 import Word            ( Word8, Word32 )
-import Foreign         ( Ptr(..), mallocBytes )
+import Foreign         ( Ptr, mallocBytes )
 import IOExts          ( trace, unsafePerformIO )
 import IO              ( hPutStrLn, stderr )
 \end{code}

diff --git a/ghc/compiler/ghci/ByteCodeGen.lhs b/ghc/compiler/ghci/ByteCodeGen.lhs
index 3fc5433..bde65b5 100644 (file)
--- a/ghc/compiler/ghci/ByteCodeGen.lhs
+++ b/ghc/compiler/ghci/ByteCodeGen.lhs
@@ -56,7 +56,7 @@ import ByteCodeFFI    ( taggedSizeW, untaggedSizeW, mkMarshalCode, moan64 )
 import Linker          ( lookupSymbol )
 
 import List            ( intersperse, sortBy, zip4 )
-import Foreign         ( Ptr(..), castPtr, mallocBytes, pokeByteOff, Word8 )
+import Foreign         ( Ptr, castPtr, mallocBytes, pokeByteOff, Word8 )
 import CTypes          ( CInt )
 import Exception       ( throwDyn )
 

diff --git a/ghc/compiler/ghci/ByteCodeItbls.lhs b/ghc/compiler/ghci/ByteCodeItbls.lhs
index 9dda624..519e50c 100644 (file)
--- a/ghc/compiler/ghci/ByteCodeItbls.lhs
+++ b/ghc/compiler/ghci/ByteCodeItbls.lhs
@@ -21,14 +21,18 @@ import ClosureInfo  ( mkVirtHeapOffsets )
 import FastString      ( FastString(..) )
 import Util             ( lengthIs, listLengthCmp )
 
-import Foreign         ( Storable(..), Word8, Word16, Word32, Word64, Ptr(..), 
+import Foreign         ( Storable(..), Word8, Word16, Word32, Word64,
                          malloc, castPtr, plusPtr )
 import Bits            ( Bits(..), shiftR )
 
 import Monad           ( liftM )
 
 import GlaExts         ( Int(I#), addr2Int# )
-import Ptr             ( Ptr(Ptr) )
+#if __GLASGOW_HASKELL__ < 503
+import Ptr             ( Ptr(..) )
+#else
+import GHC.Ptr         ( Ptr(..) )
+#endif
 \end{code}
 
 %************************************************************************

diff --git a/ghc/compiler/ghci/ByteCodeLink.lhs b/ghc/compiler/ghci/ByteCodeLink.lhs
index a1132ee..c9e2ee5 100644 (file)
--- a/ghc/compiler/ghci/ByteCodeLink.lhs
+++ b/ghc/compiler/ghci/ByteCodeLink.lhs
@@ -43,8 +43,8 @@ import GHC.Word               ( Word(..) )
 import Data.Array.MArray ( MArray, newArray_, readArray, writeArray )
 import Data.Array.ST   ( castSTUArray )
 import Data.Array.Base ( UArray(..) )
-import Foreign.Ptr     ( Ptr, nullPtr )
-import Foreign         ( Word16, Ptr(..), free )
+import Foreign.Ptr     ( nullPtr )
+import Foreign         ( Word16, free )
 import System.Mem.Weak  ( addFinalizer )
 import Data.Int                ( Int64 )
 
@@ -57,9 +57,11 @@ import GlaExts               ( BCO#, newBCO#, unsafeCoerce#,
 #if __GLASGOW_HASKELL__ >= 503
 import GHC.Arr         ( Array(..) )
 import GHC.IOBase      ( IO(..) )
+import GHC.Ptr         ( Ptr(..) )
 #else
 import PrelArr         ( Array(..) )
 import PrelIOBase      ( IO(..) )
+import Ptr             ( Ptr(..) )
 #endif
 \end{code}
 

diff --git a/ghc/compiler/utils/FastString.lhs b/ghc/compiler/utils/FastString.lhs
index 6f4876f..06a5c28 100644 (file)
--- a/ghc/compiler/utils/FastString.lhs
+++ b/ghc/compiler/utils/FastString.lhs
@@ -60,7 +60,6 @@ import GlaExts
 import PrelAddr                ( Addr(..) )
 #else
 import Addr            ( Addr(..) )
-import Ptr             ( Ptr(..) )
 #endif
 #if __GLASGOW_HASKELL__ < 503
 import PrelArr         ( STArray(..), newSTArray )

diff --git a/ghc/compiler/utils/Pretty.lhs b/ghc/compiler/utils/Pretty.lhs
index 994435a..71f4825 100644 (file)
--- a/ghc/compiler/utils/Pretty.lhs
+++ b/ghc/compiler/utils/Pretty.lhs
@@ -201,7 +201,11 @@ import PrimPacked  ( strLength )
 import PrelAddr                ( Addr(..) )
 #else
 import Addr            ( Addr(..) )
+#if __GLASGOW_HASKELL__ < 503
 import Ptr             ( Ptr(..) )
+#else
+import GHC.Ptr         ( Ptr(..) )
+#endif
 #endif
 
 -- Don't import Util( assertPanic ) because it makes a loop in the module structure

diff --git a/ghc/compiler/utils/StringBuffer.lhs b/ghc/compiler/utils/StringBuffer.lhs
index 2ab170b..b51fd9d 100644 (file)
--- a/ghc/compiler/utils/StringBuffer.lhs
+++ b/ghc/compiler/utils/StringBuffer.lhs
@@ -70,7 +70,11 @@ import PrelAddr      ( Addr(..) )
 import Panic           ( panic )
 #else
 import Addr            ( Addr(..) )
+#if __GLASGOW_HASKELL__ < 503
 import Ptr             ( Ptr(..) )
+#else
+import GHC.Ptr         ( Ptr(..) )
+#endif
 #endif
 
 #if __GLASGOW_HASKELL__  < 501