diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-08-20 22:32:52 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-08-20 22:32:52 +0000 |
| commit | cff5e3cb247cd2241ec95838ebb8bee3c677b0c0 (patch) | |
| tree | 39a0d28a2c8ffdafc158a3596e982408db407953 /libraries/base/Foreign | |
| parent | 48612e58abc0b46b3a8a0f897e1edc5536313c3a (diff) | |
| download | haskell-cff5e3cb247cd2241ec95838ebb8bee3c677b0c0.tar.gz | |
Fix some more warnings
Diffstat (limited to 'libraries/base/Foreign')
| -rw-r--r-- | libraries/base/Foreign/Marshal/Alloc.hs | 14 | ||||
| -rw-r--r-- | libraries/base/Foreign/Marshal/Array.hs | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libraries/base/Foreign/Marshal/Alloc.hs b/libraries/base/Foreign/Marshal/Alloc.hs index 9911718256..9fd576d365 100644 --- a/libraries/base/Foreign/Marshal/Alloc.hs +++ b/libraries/base/Foreign/Marshal/Alloc.hs @@ -109,14 +109,14 @@ alloca = doAlloca undefined -- #ifdef __GLASGOW_HASKELL__ allocaBytes :: Int -> (Ptr a -> IO b) -> IO b -allocaBytes (I# size) action = IO $ \ s -> - case newPinnedByteArray# size s of { (# s, mbarr# #) -> - case unsafeFreezeByteArray# mbarr# s of { (# s, barr# #) -> +allocaBytes (I# size) action = IO $ \ s0 -> + case newPinnedByteArray# size s0 of { (# s1, mbarr# #) -> + case unsafeFreezeByteArray# mbarr# s1 of { (# s2, barr# #) -> let addr = Ptr (byteArrayContents# barr#) in - case action addr of { IO action -> - case action s of { (# s, r #) -> - case touch# barr# s of { s -> - (# s, r #) + case action addr of { IO action' -> + case action' s2 of { (# s3, r #) -> + case touch# barr# s3 of { s4 -> + (# s4, r #) }}}}} #else allocaBytes :: Int -> (Ptr a -> IO b) -> IO b diff --git a/libraries/base/Foreign/Marshal/Array.hs b/libraries/base/Foreign/Marshal/Array.hs index ce28ddb573..2297a4ddd2 100644 --- a/libraries/base/Foreign/Marshal/Array.hs +++ b/libraries/base/Foreign/Marshal/Array.hs @@ -152,8 +152,8 @@ pokeArray :: Storable a => Ptr a -> [a] -> IO () #ifndef __GLASGOW_HASKELL__ pokeArray ptr vals = zipWithM_ (pokeElemOff ptr) [0..] vals #else -pokeArray ptr vals = go vals 0# - where go [] n# = return () +pokeArray ptr vals0 = go vals0 0# + where go [] _ = return () go (val:vals) n# = do pokeElemOff ptr (I# n#) val; go vals (n# +# 1#) #endif @@ -166,7 +166,7 @@ pokeArray0 marker ptr vals = do pokeArray ptr vals pokeElemOff ptr (length vals) marker #else -pokeArray0 marker ptr vals = go vals 0# +pokeArray0 marker ptr vals0 = go vals0 0# where go [] n# = pokeElemOff ptr (I# n#) marker go (val:vals) n# = do pokeElemOff ptr (I# n#) val; go vals (n# +# 1#) #endif |