Commits

Bryan O'Sullivan committed f57af9f Merge

Merge with Bjorn

Comments (0)

Files changed (3)

Data/Attoparsec/Char8.hs

     , isDigit_w8
     , isAlpha_iso8859_15
     , isAlpha_ascii
+    , isSpace
 
     -- *** Character classes
     , inClass

Data/Attoparsec/FastSet.hs

 
 mkTable :: B.ByteString -> B.ByteString
 mkTable s = I.unsafeCreate 32 $ \t -> do
-            I.memset t 0 32
+            _ <- I.memset t 0 32
             U.unsafeUseAsCStringLen s $ \(p, l) ->
               let loop n | n == l = return ()
                          | otherwise = do
     build-depends: base < 2.0 || >= 3, bytestring >= 0.9, containers >= 0.1.0.1
 
   if flag(applicative-in-base)
-    build-depends: base >= 2.0
+    build-depends: base >= 2.0 && < 5.0
     cpp-options: -DAPPLICATIVE_IN_BASE
   else
     build-depends: base < 2.0