Oops, forgot that the memory returned from realloc could have moved.
- slurpFile :: Int# -> Int# -> Addr -> Int# -> Int# -> IO Int
+ slurpFile :: Int# -> Int# -> Addr -> Int# -> Int# -> IO (Addr, Int)
slurpFile c off chunk chunk_sz max_off = slurp c off
where
slurpFile c off chunk chunk_sz max_off = slurp c off
where
- slurp :: Int# -> Int# -> IO Int
+ slurp :: Int# -> Int# -> IO (Addr, Int)
slurp c off | off >=# max_off = do
let new_sz = chunk_sz *# 2#
chunk' <- reAllocMem chunk (I# new_sz)
slurp c off | off >=# max_off = do
let new_sz = chunk_sz *# 2#
chunk' <- reAllocMem chunk (I# new_sz)
if intc == ((-1)::Int)
then do errtype <- getErrType
if errtype == (ERR_EOF :: Int)
if intc == ((-1)::Int)
then do errtype <- getErrType
if errtype == (ERR_EOF :: Int)
+ then return (chunk, I# off)
else constructErrorAndFail "slurpFile"
else case chr intc of
'\t' -> tabIt c off
else constructErrorAndFail "slurpFile"
else case chr intc of
'\t' -> tabIt c off
| otherwise = c +# 1#
slurp c' (off +# 1#)
| otherwise = c +# 1#
slurp c' (off +# 1#)
- tabIt :: Int# -> Int# -> IO Int
+ tabIt :: Int# -> Int# -> IO (Addr, Int)
-- can't run out of buffer in here, because we reserved an
-- extra tAB_SIZE bytes at the end earlier.
tabIt c off = do
-- can't run out of buffer in here, because we reserved an
-- extra tAB_SIZE bytes at the end earlier.
tabIt c off = do
-- allow space for a full tab at the end of the buffer
-- (that's what the max_off thing is for)
-- allow space for a full tab at the end of the buffer
-- (that's what the max_off thing is for)
- rc <- slurpFile 0# 0# chunk chunk_sz (chunk_sz -# tAB_SIZE)
+ (chunk', rc) <- slurpFile 0# 0# chunk chunk_sz (chunk_sz -# tAB_SIZE)
writeHandle handle handle_
if rc < (0::Int)
then constructErrorAndFail "slurpFile"
writeHandle handle handle_
if rc < (0::Int)
then constructErrorAndFail "slurpFile"
- else return (chunk, rc)
+ else return (chunk', rc)
reAllocMem :: Addr -> Int -> IO Addr
reAllocMem :: Addr -> Int -> IO Addr