[project @ 1998-02-03 17:13:54 by simonm]

[ghc-hetmet.git] / ghc / compiler / utils / FastString.lhs

diff --git a/ghc/compiler/utils/FastString.lhs b/ghc/compiler/utils/FastString.lhs
index 0d6b055..8a2d89a 100644 (file)
--- 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} 
@@ -378,9 +387,9 @@ hashSubStrFO fo# start# len# =
    2# -> ((ord# c0 *# 631#) +# (ord# c1 *# 217#) +# len#) `remInt#` hASH_TBL_SIZE#
    _  -> ((ord# c0 *# 631#) +# (ord# c1 *# 217#) +# (ord# c2 *# 43#) +# len#) `remInt#` hASH_TBL_SIZE#
   where
-    c0 = indexCharOffFO# fo# 0#
-    c1 = indexCharOffFO# fo# (len# `quotInt#` 2# -# 1#)
-    c2 = indexCharOffFO# fo# (len# -# 1#)
+    c0 = indexCharOffForeignObj# fo# 0#
+    c1 = indexCharOffForeignObj# fo# (len# `quotInt#` 2# -# 1#)
+    c2 = indexCharOffForeignObj# fo# (len# -# 1#)
 
 --    c1 = indexCharOffFO# fo# 1#
 --    c2 = indexCharOffFO# fo# 2#
@@ -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