projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1998-12-02 13:17:09 by simonm]
[ghc-hetmet.git]
/
ghc
/
compiler
/
utils
/
PrimPacked.lhs
diff --git
a/ghc/compiler/utils/PrimPacked.lhs
b/ghc/compiler/utils/PrimPacked.lhs
index
2578d4a
..
153ff5d
100644
(file)
--- a/
ghc/compiler/utils/PrimPacked.lhs
+++ b/
ghc/compiler/utils/PrimPacked.lhs
@@
-1,5
+1,5
@@
%
%
-% (c) The GRASP/AQUA Project, Glasgow University, 1997
+% (c) The GRASP/AQUA Project, Glasgow University, 1997-1998
%
\section{Basic ops on packed representations}
%
\section{Basic ops on packed representations}
@@
-43,10
+43,12
@@
import PrelForeign ( ForeignObj(..) )
import ArrBase ( StateAndMutableByteArray#(..),
StateAndByteArray#(..) )
import STBase
import ArrBase ( StateAndMutableByteArray#(..),
StateAndByteArray#(..) )
import STBase
-#else
+#elif __GLASGOW_HASKELL__ < 400
import PrelArr ( StateAndMutableByteArray#(..),
StateAndByteArray#(..) )
import PrelST
import PrelArr ( StateAndMutableByteArray#(..),
StateAndByteArray#(..) )
import PrelST
+#else
+import PrelST
#endif
\end{code}
#endif
\end{code}
@@
-176,19
+178,33
@@
write_ps_array :: MutableByteArray s Int -> Int# -> Char# -> ST s ()
freeze_ps_array :: MutableByteArray s Int -> Int# -> ST s (ByteArray Int)
new_ps_array size = ST $ \ s ->
freeze_ps_array :: MutableByteArray s Int -> Int# -> ST s (ByteArray Int)
new_ps_array size = ST $ \ s ->
+#if __GLASGOW_HASKELL__ < 400
case (newCharArray# size s) of { StateAndMutableByteArray# s2# barr# ->
STret s2# (MutableByteArray bot barr#) }
case (newCharArray# size s) of { StateAndMutableByteArray# s2# barr# ->
STret s2# (MutableByteArray bot barr#) }
+#else
+ case (newCharArray# size s) of { (# s2#, barr# #) ->
+ (# s2#, MutableByteArray bot barr# #) }
+#endif
where
bot = error "new_ps_array"
write_ps_array (MutableByteArray _ barr#) n ch = ST $ \ s# ->
case writeCharArray# barr# n ch s# of { s2# ->
where
bot = error "new_ps_array"
write_ps_array (MutableByteArray _ barr#) n ch = ST $ \ s# ->
case writeCharArray# barr# n ch s# of { s2# ->
+#if __GLASGOW_HASKELL__ < 400
STret s2# () }
STret s2# () }
+#else
+ (# s2#, () #) }
+#endif
-- same as unsafeFreezeByteArray
freeze_ps_array (MutableByteArray _ arr#) len# = ST $ \ s# ->
-- same as unsafeFreezeByteArray
freeze_ps_array (MutableByteArray _ arr#) len# = ST $ \ s# ->
+#if __GLASGOW_HASKELL__ < 400
case unsafeFreezeByteArray# arr# s# of { StateAndByteArray# s2# frozen# ->
STret s2# (ByteArray (0,I# len#) frozen#) }
case unsafeFreezeByteArray# arr# s# of { StateAndByteArray# s2# frozen# ->
STret s2# (ByteArray (0,I# len#) frozen#) }
+#else
+ case unsafeFreezeByteArray# arr# s# of { (# s2#, frozen# #) ->
+ (# s2#, ByteArray (0,I# len#) frozen# #) }
+#endif
\end{code}
\end{code}