projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
External Core: print function types correctly, improve newtype pretty-printing
[ghc-hetmet.git]
/
compiler
/
utils
/
BufWrite.hs
diff --git
a/compiler/utils/BufWrite.hs
b/compiler/utils/BufWrite.hs
index
d625a6e
..
3064135
100644
(file)
--- a/
compiler/utils/BufWrite.hs
+++ b/
compiler/utils/BufWrite.hs
@@
-23,6
+23,7
@@
module BufWrite (
#include "HsVersions.h"
import FastString
#include "HsVersions.h"
import FastString
+import FastTypes
import FastMutInt
import Control.Monad ( when )
import FastMutInt
import Control.Monad ( when )
@@
-30,11
+31,6
@@
import Data.Char ( ord )
import Foreign
import System.IO
import Foreign
import System.IO
-import GHC.IOBase ( IO(..) )
-import GHC.Ptr ( Ptr(..) )
-
-import GHC.Exts ( Int(..), Int#, Addr# )
-
-- -----------------------------------------------------------------------------
data BufHandle = BufHandle {-#UNPACK#-}!(Ptr Word8)
-- -----------------------------------------------------------------------------
data BufHandle = BufHandle {-#UNPACK#-}!(Ptr Word8)
@@
-94,18
+90,18
@@
bPutFS b@(BufHandle buf r hdl) fs@(FastString _ len _ fp _) =
copyBytes (buf `plusPtr` i) ptr len
writeFastMutInt r (i+len)
copyBytes (buf `plusPtr` i) ptr len
writeFastMutInt r (i+len)
-bPutLitString :: BufHandle -> Addr# -> Int# -> IO ()
-bPutLitString b@(BufHandle buf r hdl) a# len# = do
- let len = I# len#
+bPutLitString :: BufHandle -> LitString -> FastInt -> IO ()
+bPutLitString b@(BufHandle buf r hdl) a len_ = a `seq` do
+ let len = iBox len_
i <- readFastMutInt r
if (i+len) >= buf_size
then do hPutBuf hdl buf i
writeFastMutInt r 0
if (len >= buf_size)
i <- readFastMutInt r
if (i+len) >= buf_size
then do hPutBuf hdl buf i
writeFastMutInt r 0
if (len >= buf_size)
- then hPutBuf hdl (Ptr a#) len
- else bPutLitString b a# len#
+ then hPutBuf hdl a len
+ else bPutLitString b a len_
else do
else do
- copyBytes (buf `plusPtr` i) (Ptr a#) len
+ copyBytes (buf `plusPtr` i) a len
writeFastMutInt r (i+len)
bFlush :: BufHandle -> IO ()
writeFastMutInt r (i+len)
bFlush :: BufHandle -> IO ()