From: qrczak Date: Sat, 14 Apr 2001 22:27:34 +0000 (+0000) Subject: [project @ 2001-04-14 22:27:34 by qrczak] X-Git-Tag: Approximately_9120_patches~2152 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=8c99af6a535d6d09b60a5d172980f8364b1c380c;p=ghc-hetmet.git [project @ 2001-04-14 22:27:34 by qrczak] Don't rely so much on exports from ArrayBase. --- diff --git a/ghc/compiler/ghci/ByteCodeLink.lhs b/ghc/compiler/ghci/ByteCodeLink.lhs index ac74052..795c1e9 100644 --- a/ghc/compiler/ghci/ByteCodeLink.lhs +++ b/ghc/compiler/ghci/ByteCodeLink.lhs @@ -32,11 +32,13 @@ import ByteCodeItbls ( ItblEnv, ItblPtr ) import Monad ( foldM ) import ST ( runST ) +import IArray ( array ) import MArray ( castSTUArray, newFloatArray, writeFloatArray, newDoubleArray, writeDoubleArray, newIntArray, writeIntArray, - newAddrArray, writeAddrArray ) + newAddrArray, writeAddrArray, + readWordArray ) import Foreign ( Word16, Ptr(..) ) import Addr ( Word, Addr, nullAddr ) import FiniteMap @@ -45,8 +47,8 @@ import PrelBase ( Int(..) ) import PrelGHC ( BCO#, newBCO#, unsafeCoerce#, ByteArray#, Array#, addrToHValue#, mkApUpd0# ) import IOExts ( fixIO ) -import ArrayBase import PrelArr ( Array(..) ) +import ArrayBase ( UArray(..) ) import PrelIOBase ( IO(..) ) \end{code} @@ -448,8 +450,8 @@ mkLitA a \begin{code} {- -data BCO# = BCO# ByteArray# -- instrs :: array Word16# - ByteArray# -- literals :: array Word32# +data BCO# = BCO# ByteArray# -- instrs :: Array Word16# + ByteArray# -- literals :: Array Word32# PtrArray# -- ptrs :: Array HValue ByteArray# -- itbls :: Array Addr# -}