Merge with Bjorn
commita4675e495e2ec3c0989b5b0240664a7a7843aa94
authorBryan O'Sullivan <bos@serpentine.com>
dateTue 22 Jun 2010, 20:01 (16 years ago)
parent15005d836d205f
Data/Attoparsec/Char8.hs+1
@@ -48,6 +48,7 @@ module Data.Attoparsec.Char8
4848 , isDigit_w8
4949 , isAlpha_iso8859_15
5050 , isAlpha_ascii
51+ , isSpace
5152
5253 -- *** Character classes
5354 , inClass
Data/Attoparsec/FastSet.hs+1−1
@@ -97,7 +97,7 @@ memberChar c = memberWord8 (I.c2w c)
9797
9898mkTable :: B.ByteString -> B.ByteString
9999mkTable s = I.unsafeCreate 32 $ \t -> do
100− I.memset t 0 32
100+ _ <- I.memset t 0 32
101101 U.unsafeUseAsCStringLen s $ \(p, l) ->
102102 let loop n | n == l = return ()
103103 | otherwise = do
attoparsec.cabal+1−1
@@ -40,7 +40,7 @@ library
4040 build-depends: base < 2.0 || >= 3, bytestring >= 0.9, containers >= 0.1.0.1
4141
4242 if flag(applicative-in-base)
43− build-depends: base >= 2.0
43+ build-depends: base >= 2.0 && < 5.0
4444 cpp-options: -DAPPLICATIVE_IN_BASE
4545 else
4646 build-depends: base < 2.0