asn1-parse 0.9.2 → 0.9.3

raw patch · 2 files changed

+11/−9 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Data/ASN1/Parse.hs +10/−8
• asn1-parse.cabal +1/−1

@@ -12,6 +12,7 @@     -- * run     , runParseASN1State     , runParseASN1+    , throwParseError     -- * combinators     , onNextContainer     , onNextContainerMaybe@@ -56,8 +57,9 @@ put :: [ASN1] -> ParseASN1 () put stream = P $ \_ -> Right ((), stream) -throwError :: String -> ParseASN1 a-throwError s = P $ \_ -> Left s+-- | throw a parse error+throwParseError :: String -> ParseASN1 a+throwParseError s = P $ \_ -> Left s  -- | run the parse monad over a stream and returns the result and the remaining ASN1 Stream. runParseASN1State :: ParseASN1 a -> [ASN1] -> Either String (a,[ASN1])@@ -79,7 +81,7 @@ getObject = do     l <- get     case fromASN1 l of-        Left err     -> throwError err+        Left err     -> throwParseError err         Right (a,l2) -> put l2 >> return a  -- | get next element from the stream@@ -87,7 +89,7 @@ getNext = do     list <- get     case list of-        []    -> throwError "empty"+        []    -> throwParseError "empty"         (h:l) -> put l >> return h  -- | get many elements until there's nothing left@@ -115,15 +117,15 @@ getNextContainer ty = do     list <- get     case list of-        []                    -> throwError "empty"+        []                    -> throwParseError "empty"         (h:l) | h == Start ty -> do let (l1, l2) = getConstructedEnd 0 l                                     put l2 >> return l1-              | otherwise     -> throwError "not an expected container"+              | otherwise     -> throwParseError "not an expected container"   -- | run a function of the next elements of a container of specified type onNextContainer :: ASN1ConstructionType -> ParseASN1 a -> ParseASN1 a-onNextContainer ty f = getNextContainer ty >>= either throwError return . runParseASN1 f+onNextContainer ty f = getNextContainer ty >>= either throwParseError return . runParseASN1 f  -- | just like getNextContainer, except it doesn't throw an error if the container doesn't exists. getNextContainerMaybe :: ASN1ConstructionType -> ParseASN1 (Maybe [ASN1])@@ -140,7 +142,7 @@ onNextContainerMaybe ty f = do     n <- getNextContainerMaybe ty     case n of-        Just l  -> either throwError (return . Just) $ runParseASN1 f l+        Just l  -> either throwParseError (return . Just) $ runParseASN1 f l         Nothing -> return Nothing  -- | returns if there's more elements in the stream.

@@ -1,5 +1,5 @@ Name:                asn1-parse-Version:             0.9.2+Version:             0.9.3 Description:         Simple monadic parser for ASN1 stream types, when ASN1 pattern matching is not convenient. License:             BSD3 License-file:        LICENSE