diff options
| author | panne <unknown> | 2000-04-13 19:31:05 +0000 |
|---|---|---|
| committer | panne <unknown> | 2000-04-13 19:31:05 +0000 |
| commit | 8ab73b40ac2ac5861b4dd03a50e4624ce3b0d024 (patch) | |
| tree | 497d59512b4ea3d9d5091d78d8bee55951aa6bac | |
| parent | b982e78c46903a4718ab7633753d799e378f6822 (diff) | |
| download | haskell-8ab73b40ac2ac5861b4dd03a50e4624ce3b0d024.tar.gz | |
[project @ 2000-04-13 19:31:05 by panne]
Bootstrapping fun:
* Addr is an abstract type in Addr, so import from PrelAddr instead
* Ignore the (recently introduced) return value of hPutBuf{,BA}
Probably more to come. No problem, as long as I don't run out of malt
first... %-)
| -rw-r--r-- | ghc/compiler/utils/FastString.lhs | 5 | ||||
| -rw-r--r-- | ghc/compiler/utils/PrimPacked.lhs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ghc/compiler/utils/FastString.lhs b/ghc/compiler/utils/FastString.lhs index 75606423d7..3d63e7f26f 100644 --- a/ghc/compiler/utils/FastString.lhs +++ b/ghc/compiler/utils/FastString.lhs @@ -86,7 +86,7 @@ import PrelIOBase ( Handle__(..), IOError(..), IOErrorType(..), import PrimPacked import GlaExts -import Addr ( Addr(..) ) +import PrelAddr ( Addr(..) ) #if __GLASGOW_HASKELL__ < 407 import MutableArray ( MutableArray(..) ) #else @@ -640,6 +640,7 @@ hPutFS handle (FastString _ l# ba#) #else | otherwise = do mba <- stToIO $ unsafeThawByteArray (ByteArray (bot::Int) bot ba#) hPutBufBA handle mba (I# l#) + return () #endif where bot = error "hPutFS.ba" @@ -648,7 +649,7 @@ hPutFS handle (FastString _ l# ba#) hPutFS handle (CharStr a# l#) | l# ==# 0# = return () - | otherwise = hPutBuf handle (A# a#) (I# l#) + | otherwise = do hPutBuf handle (A# a#) (I# l#) ; return () #endif diff --git a/ghc/compiler/utils/PrimPacked.lhs b/ghc/compiler/utils/PrimPacked.lhs index 96c17f1e66..aa38d6a130 100644 --- a/ghc/compiler/utils/PrimPacked.lhs +++ b/ghc/compiler/utils/PrimPacked.lhs @@ -31,7 +31,7 @@ module PrimPacked #include "HsVersions.h" import GlaExts -import Addr ( Addr(..) ) +import PrelAddr ( Addr(..) ) import ST import Foreign -- ForeignObj is now exported abstractly. |