April 2011 - Libraries

[commit: base] branch 'encoding' created
by Max Bolingbroke 04 Apr '11

04 Apr '11

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base New branch : encoding Referencing: e60a79b8e093c4b5748642867eaa24fbd7781639

1 0

Minor rev of HP for GHC 7.0.3
by Don Stewart 03 Apr '11

03 Apr '11

A candidate minor revision of the Haskell Platform to 2011.2.0.1 is available for testing and installer building: * Updates GHC to 7.0.3 * Updates (minor) text to 0.11.0.6 Source installer: http://lambda.haskell.org/hp-tmp/2011.2.0.1/ Cabal spec: http://code.galois.com/darcs/haskell-platform/haskell-platform.cabal -- Don

1 0

[commit: base] master: Change some uses of CString functions to CAString instead (a8927d2)
by Max Bolingbroke 03 Apr '11

03 Apr '11

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master http://hackage.haskell.org/trac/ghc/changeset/a8927d235f8189bcd05df3bc4c130… >--------------------------------------------------------------- commit a8927d235f8189bcd05df3bc4c130a9a184672e4 Author: Max Bolingbroke <batterseapower(a)hotmail.com> Date: Sun Apr 3 22:36:39 2011 +0100 Change some uses of CString functions to CAString instead This prevents potential loops in future if we implement FFI spec behaviour where the CString family use the locale encoding. >--------------------------------------------------------------- GHC/IO/Encoding/Iconv.hs | 25 +++++++++++++++---------- GHC/IO/Encoding/UTF16.hs | 3 ++- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/GHC/IO/Encoding/Iconv.hs b/GHC/IO/Encoding/Iconv.hs index 440344a..6d87595 100644 --- a/GHC/IO/Encoding/Iconv.hs +++ b/GHC/IO/Encoding/Iconv.hs @@ -57,7 +57,8 @@ iconv_trace s | otherwise = return () puts :: String -> IO () -puts s = do _ <- withCStringLen (s ++ "\n") $ \(p, len) -> +puts s = do _ <- withCAStringLen (s ++ "\n") $ \(p, len) -> + -- In reality should be withCString, but assume ASCII to avoid loop c_write 1 (castPtr p) (fromIntegral len) return () @@ -96,14 +97,17 @@ utf32le = unsafePerformIO (mkTextEncoding "UTF32LE") utf32be :: TextEncoding utf32be = unsafePerformIO (mkTextEncoding "UTF32BE") -{-# NOINLINE localeEncoding #-} -localeEncoding :: TextEncoding -localeEncoding = unsafePerformIO $ do +{-# NOINLINE localeEncodingName #-} +localeEncodingName :: String +localeEncodingName = unsafePerformIO $ do -- Use locale_charset() or nl_langinfo(CODESET) to get the encoding -- if we have either of them. cstr <- c_localeEncoding - r <- peekCString cstr - mkTextEncoding r + peekCAString cstr -- Assume charset names are ASCII + +{-# NOINLINE localeEncoding #-} +localeEncoding :: TextEncoding +localeEncoding = unsafePerformIO $ mkTextEncoding localeEncodingName -- We hope iconv_t is a storable type. It should be, since it has at least the -- value -1, which is a possible return value from iconv_open. @@ -139,8 +143,8 @@ mkTextEncoding :: String -> IO TextEncoding mkTextEncoding charset = do return (TextEncoding { textEncodingName = charset, - mkTextDecoder = newIConv raw_charset (haskellChar ++ suffix) (iconvDecode cfm), - mkTextEncoder = newIConv haskellChar charset (iconvEncode cfm)}) + mkTextDecoder = newIConv raw_charset (haskellChar ++ suffix) iconvDecode, + mkTextEncoder = newIConv haskellChar charset iconvEncode}) where -- An annoying feature of GNU iconv is that the //PREFIXES only take -- effect when they appear on the tocode parameter to iconv_open: @@ -150,8 +154,9 @@ newIConv :: String -> String -> (IConv -> Buffer a -> Buffer b -> IO (Buffer a, Buffer b)) -> IO (BufferCodec a b ()) newIConv from to fn = - withCString from $ \ from_str -> - withCString to $ \ to_str -> do + -- Assume charset names are ASCII + withCAString from $ \ from_str -> + withCAString to $ \ to_str -> do iconvt <- throwErrnoIfMinus1 "mkTextEncoding" $ hs_iconv_open to_str from_str let iclose = throwErrnoIfMinus1_ "Iconv.close" $ hs_iconv_close iconvt return BufferCodec{ diff --git a/GHC/IO/Encoding/UTF16.hs b/GHC/IO/Encoding/UTF16.hs index c3b3847..5cc55f5 100644 --- a/GHC/IO/Encoding/UTF16.hs +++ b/GHC/IO/Encoding/UTF16.hs @@ -57,7 +57,8 @@ import GHC.Show import GHC.Ptr puts :: String -> IO () -puts s = do withCStringLen (s++"\n") $ \(p,len) -> + -- In reality should be withCString, but assume ASCII to avoid possible loop +puts s = do withCAStringLen (s++"\n") $ \(p,len) -> c_write 1 (castPtr p) (fromIntegral len) return () #endif

1 0

[commit: base] master: Fix handling of suffixes for GNU iconv (4d36327)
by Max Bolingbroke 03 Apr '11

03 Apr '11

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master http://hackage.haskell.org/trac/ghc/changeset/4d3632720af9016d0099896d155e9… >--------------------------------------------------------------- commit 4d3632720af9016d0099896d155e96b0957acd4b Author: Max Bolingbroke <batterseapower(a)hotmail.com> Date: Sun Apr 3 21:55:00 2011 +0100 Fix handling of suffixes for GNU iconv >--------------------------------------------------------------- GHC/IO/Encoding/Iconv.hs | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/GHC/IO/Encoding/Iconv.hs b/GHC/IO/Encoding/Iconv.hs index 0316698..440344a 100644 --- a/GHC/IO/Encoding/Iconv.hs +++ b/GHC/IO/Encoding/Iconv.hs @@ -41,6 +41,7 @@ import Data.Maybe import GHC.Base import GHC.IO.Buffer import GHC.IO.Encoding.Types +import GHC.List (span) import GHC.Num import GHC.Show import GHC.Real @@ -138,8 +139,12 @@ mkTextEncoding :: String -> IO TextEncoding mkTextEncoding charset = do return (TextEncoding { textEncodingName = charset, - mkTextDecoder = newIConv charset haskellChar iconvDecode, - mkTextEncoder = newIConv haskellChar charset iconvEncode}) + mkTextDecoder = newIConv raw_charset (haskellChar ++ suffix) (iconvDecode cfm), + mkTextEncoder = newIConv haskellChar charset (iconvEncode cfm)}) + where + -- An annoying feature of GNU iconv is that the //PREFIXES only take + -- effect when they appear on the tocode parameter to iconv_open: + (raw_charset, suffix) = span (/= '/') charset newIConv :: String -> String -> (IConv -> Buffer a -> Buffer b -> IO (Buffer a, Buffer b))

1 0

[commit: base] master: Change debug prints in readTextDevice' to refer to right function (6b62d7c)
by Max Bolingbroke 03 Apr '11

03 Apr '11

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master http://hackage.haskell.org/trac/ghc/changeset/6b62d7caf5428f518bc612c913db4… >--------------------------------------------------------------- commit 6b62d7caf5428f518bc612c913db429f4f25e3a5 Author: Max Bolingbroke <batterseapower(a)hotmail.com> Date: Sun Apr 3 21:53:45 2011 +0100 Change debug prints in readTextDevice' to refer to right function >--------------------------------------------------------------- GHC/IO/Handle/Internals.hs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GHC/IO/Handle/Internals.hs b/GHC/IO/Handle/Internals.hs index 6409bbd..1dbd4bb 100644 --- a/GHC/IO/Handle/Internals.hs +++ b/GHC/IO/Handle/Internals.hs @@ -825,7 +825,7 @@ readTextDevice' h_@Handle__{..} bbuf0 cbuf = do then ioe_invalidCharacter else return bbuf2 - debugIO ("readTextDevice after reading: bbuf=" ++ summaryBuffer bbuf2) + debugIO ("readTextDevice' after reading: bbuf=" ++ summaryBuffer bbuf2) (bbuf3,cbuf') <- case haDecoder of @@ -837,7 +837,7 @@ readTextDevice' h_@Handle__{..} bbuf0 cbuf = do writeIORef haLastDecode (state, bbuf2) (encode decoder) bbuf2 cbuf - debugIO ("readTextDevice after decoding: cbuf=" ++ summaryBuffer cbuf' ++ + debugIO ("readTextDevice' after decoding: cbuf=" ++ summaryBuffer cbuf' ++ " bbuf=" ++ summaryBuffer bbuf3) writeIORef haByteBuffer bbuf3

1 0

[commit: base] master: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/base (345ff2c)
by Max Bolingbroke 03 Apr '11

03 Apr '11

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master http://hackage.haskell.org/trac/ghc/changeset/345ff2ccb5da1519562a89aec5009… >--------------------------------------------------------------- commit 345ff2ccb5da1519562a89aec5009cbfa4617986 Merge: 4fcd348... f5937ed... Author: Max Bolingbroke <batterseapower(a)hotmail.com> Date: Sun Apr 3 21:51:23 2011 +0100 Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/base Data/List.hs | 15 ++++++++++----- Foreign/Marshal/Alloc.hs | 5 +++-- Foreign/Marshal/Utils.hs | 4 ++-- 3 files changed, 15 insertions(+), 9 deletions(-)

1 0

[commit: base] master: Add .gitignore (4fcd348)
by Max Bolingbroke 03 Apr '11

03 Apr '11

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master http://hackage.haskell.org/trac/ghc/changeset/4fcd348b68e4fd41b96288de1f58e… >--------------------------------------------------------------- commit 4fcd348b68e4fd41b96288de1f58e31b1aa5807b Author: Max Bolingbroke <batterseapower(a)hotmail.com> Date: Sun Apr 3 21:51:14 2011 +0100 Add .gitignore >--------------------------------------------------------------- .gitignore | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8ca30ca --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ + +# Specific generated files +/GNUmakefile +/autom4te.cache/ +/base.buildinfo +/config.log +/config.status +/configure +/dist-install/ +/ghc.mk +/include/EventConfig.h +/include/HsBaseConfig.h +/include/HsBaseConfig.h.in

1 0

[commit: base] master: Less strict inits and tails (f5937ed)
by Ian Lynagh 03 Apr '11

03 Apr '11

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master http://hackage.haskell.org/trac/ghc/changeset/f5937ede7984724880a82d6bab56f… >--------------------------------------------------------------- commit f5937ede7984724880a82d6bab56f81a5b1e1f80 Author: Ian Lynagh <igloo(a)earth.li> Date: Sun Apr 3 17:08:46 2011 +0100 Less strict inits and tails Converted from darcs patches from Bas van Dijk <v.dijk.bas(a)gmail.com> Previously: tails _|_ = _|_ Now: tails _|_ = _|_ : _|_ Previously: inits _|_ = _|_ Now: inits _|_ = [] : _|_ >--------------------------------------------------------------- Data/List.hs | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Data/List.hs b/Data/List.hs index 061ad42..bb71da5 100644 --- a/Data/List.hs +++ b/Data/List.hs @@ -744,19 +744,24 @@ groupBy eq (x:xs) = (x:ys) : groupBy eq zs -- -- > inits "abc" == ["","a","ab","abc"] -- +-- Note that 'inits' has the following strictness property: +-- @inits _|_ = [] : _|_@ inits :: [a] -> [[a]] -inits [] = [[]] -inits (x:xs) = [[]] ++ map (x:) (inits xs) +inits xs = [] : case xs of + [] -> [] + x : xs' -> map (x :) (inits xs') -- | The 'tails' function returns all final segments of the argument, -- longest first. For example, -- -- > tails "abc" == ["abc", "bc", "c",""] -- +-- Note that 'tails' has the following strictness property: +-- @tails _|_ = _|_ : _|_@ tails :: [a] -> [[a]] -tails [] = [[]] -tails xxs@(_:xs) = xxs : tails xs - +tails xs = xs : case xs of + [] -> [] + _ : xs' -> tails xs' -- | The 'subsequences' function returns the list of all subsequences of the argument. --

1 0

[commit: base] master: Tweak alloca docs (83f2740)
by Ian Lynagh 03 Apr '11

03 Apr '11

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master http://hackage.haskell.org/trac/ghc/changeset/83f2740e7b4132594dbe5b0ab458f… >--------------------------------------------------------------- commit 83f2740e7b4132594dbe5b0ab458fbdf3f197ffb Author: Ian Lynagh <igloo(a)earth.li> Date: Sun Apr 3 16:27:56 2011 +0100 Tweak alloca docs Based on a patch from Jason Dagit >--------------------------------------------------------------- Foreign/Marshal/Alloc.hs | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Foreign/Marshal/Alloc.hs b/Foreign/Marshal/Alloc.hs index ddb4a90..612d2c7 100644 --- a/Foreign/Marshal/Alloc.hs +++ b/Foreign/Marshal/Alloc.hs @@ -22,8 +22,9 @@ -- foreign functions or to provide space in which compound result values -- are obtained from foreign functions. -- --- If any of the allocation functions fails, a value of 'nullPtr' is --- produced. If 'free' or 'reallocBytes' is applied to a memory area +-- If any of the allocation functions fails, an exception is thrown. +-- In some cases, memory exhaustion may mean the process is terminated. +-- If 'free' or 'reallocBytes' is applied to a memory area -- that has been allocated with 'alloca' or 'allocaBytes', the -- behaviour is undefined. Any further access to memory areas allocated with -- 'alloca' or 'allocaBytes', after the computation that was passed to

1 0

[commit: base] master: Generalize the type of Foreign.Marshal.Utils.maybeNew; fixes trac #5044 (b27b90f)
by Ian Lynagh 03 Apr '11

03 Apr '11

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master http://hackage.haskell.org/trac/ghc/changeset/b27b90f0e55518313d9611fbc4381… >--------------------------------------------------------------- commit b27b90f0e55518313d9611fbc4381b4b73121975 Author: Ian Lynagh <igloo(a)earth.li> Date: Sun Apr 3 14:55:50 2011 +0100 Generalize the type of Foreign.Marshal.Utils.maybeNew; fixes trac #5044 git conversion of: Tue Mar 8 22:31:07 CET 2011 Bas van Dijk <v.dijk.bas(a)gmail.com> * Generalize the type of Foreign.Marshal.Utils.maybeNew This makes it consistent with maybeWith >--------------------------------------------------------------- Foreign/Marshal/Utils.hs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Foreign/Marshal/Utils.hs b/Foreign/Marshal/Utils.hs index 5ae677a..bf9bdb3 100644 --- a/Foreign/Marshal/Utils.hs +++ b/Foreign/Marshal/Utils.hs @@ -118,8 +118,8 @@ toBool = (/= 0) -- -- * the 'nullPtr' is used to represent 'Nothing' -- -maybeNew :: ( a -> IO (Ptr a)) - -> (Maybe a -> IO (Ptr a)) +maybeNew :: ( a -> IO (Ptr b)) + -> (Maybe a -> IO (Ptr b)) maybeNew = maybe (return nullPtr) -- |Converts a @withXXX@ combinator into one marshalling a value wrapped

1 0