Commits

wren romano committed 952c175 Merge

Merged with upstream (tag 0.8.5.2 for changeset 9712028a0311)

  • Participants
  • Parent commits b7e5b7d, a1eff58

Comments (0)

Files changed (4)

 76c08ffe493594369487fd26f85487f9cc0572f7 0.8.3.0
 39351efe1d73462a717ce004a2d2f75729c67f3b 0.8.4.0
 d04f4a8c7afdedddd4828c0844ab2b75bdb90789 0.8.5.0
+034e03c9d2b74c8c52438896a0098a086809adc6 0.8.5.1
+9712028a0311a3d12e213727603b5e84a2b8103c 0.8.5.2

Data/Attoparsec/Char8.hs

 
     -- * Running parsers
     , A.parse
+    , A.feed
+    , A.parseOnly
     , A.parseTest
     , A.parseWith
-    , A.feed
+
+    -- ** Result conversion
+    , A.maybeResult
+    , A.eitherResult
 
     -- * Combinators
     , (I.<?>)
     , module Data.Attoparsec.Combinator
 
     -- * Parsing individual characters
+    , char
+    , char8
+    , anyChar
+    , notChar
     , satisfy
-    , char
-    , anyChar
-    , char8
-    , notChar
 
     -- ** Special character parsers
     , digit

Data/Attoparsec/Internal.hs

 addS i0 a0 m0 _i1 a1 m1 f =
     let !i = I (unI i0 +++ unA a1)
         a  = A (unA a0 +++ unA a1)
-        m  = m0 <> m1
+        !m = m0 <> m1
     in f i a m
   where
     Complete <> _ = Complete
 name:            attoparsec
-version:         0.8.5.0
+version:         0.8.5.2
 license:         BSD3
 license-file:    LICENSE
 category:        Text, Parsing