diff options
| author | simonm <unknown> | 1998-02-03 17:16:13 +0000 |
|---|---|---|
| committer | simonm <unknown> | 1998-02-03 17:16:13 +0000 |
| commit | be33dbc967b4915cfdb0307ae1b7ae3cee651b8c (patch) | |
| tree | e24ad0b966727772172a1c47fa89c06cd671e507 /ghc/compiler/utils/FastString.lhs | |
| parent | c29022c49449b7d8862dcc2259e16cafe9461945 (diff) | |
| download | haskell-be33dbc967b4915cfdb0307ae1b7ae3cee651b8c.tar.gz | |
[project @ 1998-02-03 17:13:54 by simonm]
- Fixes for bootstrapping with 3.01.
- Use 'official' extension interfaces rather than internal prelude
modules (such as ArrBase) where possible.
- Remove some cruft.
- Delete some unused imports found by '-fwarn-unused-imports'.
Diffstat (limited to 'ghc/compiler/utils/FastString.lhs')
| -rw-r--r-- | ghc/compiler/utils/FastString.lhs | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/ghc/compiler/utils/FastString.lhs b/ghc/compiler/utils/FastString.lhs index 1635997c99..8a2d89af6d 100644 --- a/ghc/compiler/utils/FastString.lhs +++ b/ghc/compiler/utils/FastString.lhs @@ -48,22 +48,31 @@ module FastString #define COMPILING_FAST_STRING #include "HsVersions.h" +#if __GLASGOW_HASKELL__ < 301 import PackBase +import STBase ( StateAndPtr#(..) ) +import IOHandle ( filePtr, readHandle, writeHandle ) +import IOBase ( Handle__(..), IOError(..), IOErrorType(..), + IOResult(..), IO(..), + constructError + ) +#else +import PrelPack +import PrelST ( StateAndPtr#(..) ) +import PrelHandle ( filePtr, readHandle, writeHandle ) +import PrelIOBase ( Handle__(..), IOError(..), IOErrorType(..), + IOResult(..), IO(..), + constructError + ) +#endif + import PrimPacked import GlaExts -import Addr ( Addr(..) ) -import STBase ( StateAndPtr#(..) ) -import ArrBase ( MutableArray(..) ) -import Foreign ( ForeignObj(..) ) -import IOExts ( IOArray(..), newIOArray, - IORef, newIORef, readIORef, writeIORef - ) +import Addr ( Addr(..) ) +import MutableArray ( MutableArray(..) ) +import Foreign ( ForeignObj(..) ) +import IOExts ( IORef, newIORef, readIORef, writeIORef ) import IO -import IOHandle ( filePtr, readHandle, writeHandle ) -import IOBase ( Handle__(..), IOError(..), IOErrorType(..), - IOResult(..), IO(..), - constructError - ) #define hASH_TBL_SIZE 993 \end{code} @@ -458,19 +467,19 @@ hPutFS handle (FastString _ l# ba#) = if l# ==# 0# then return () else - _readHandle handle >>= \ htype -> + readHandle handle >>= \ htype -> case htype of ErrorHandle ioError -> - _writeHandle handle htype >> + writeHandle handle htype >> fail ioError ClosedHandle -> - _writeHandle handle htype >> + writeHandle handle htype >> fail MkIOError(handle,IllegalOperation,"handle is closed") SemiClosedHandle _ _ -> - _writeHandle handle htype >> + writeHandle handle htype >> fail MkIOError(handle,IllegalOperation,"handle is closed") ReadHandle _ _ _ -> - _writeHandle handle htype >> + writeHandle handle htype >> fail MkIOError(handle,IllegalOperation,"handle is not open for writing") other -> let fp = filePtr htype in @@ -485,19 +494,19 @@ hPutFS handle (CharStr a# l#) = if l# ==# 0# then return () else - _readHandle handle >>= \ htype -> + readHandle handle >>= \ htype -> case htype of ErrorHandle ioError -> - _writeHandle handle htype >> + writeHandle handle htype >> fail ioError ClosedHandle -> - _writeHandle handle htype >> + writeHandle handle htype >> fail MkIOError(handle,IllegalOperation,"handle is closed") SemiClosedHandle _ _ -> - _writeHandle handle htype >> + writeHandle handle htype >> fail MkIOError(handle,IllegalOperation,"handle is closed") ReadHandle _ _ _ -> - _writeHandle handle htype >> + writeHandle handle htype >> fail MkIOError(handle,IllegalOperation,"handle is not open for writing") other -> let fp = filePtr htype in |