diff --git a/Data/Conduit/Attoparsec.hs b/Data/Conduit/Attoparsec.hs deleted file mode 100644 --- a/Data/Conduit/Attoparsec.hs +++ /dev/null @@ -1,89 +0,0 @@ -{-# LANGUAGE DeriveDataTypeable #-} -{-# LANGUAGE FlexibleContexts #-} - --- | --- Copyright: 2011 Michael Snoyman, 2010 John Millikin --- License: MIT --- --- Turn an Attoparsec parser into a 'C.Sink'. --- --- This code was taken from attoparsec-enumerator and adapted for conduits. -module Data.Conduit.Attoparsec - ( ParseError (..) - , AttoparsecInput - , sinkParser - ) where - -import Control.Exception (Exception) -import Data.Typeable (Typeable) -import qualified Data.ByteString as B -import qualified Data.Text as T -import Control.Monad.Trans.Class (lift) - -import qualified Data.Attoparsec.ByteString -import qualified Data.Attoparsec.Text -import qualified Data.Attoparsec.Types as A -import qualified Data.Conduit as C - --- | The context and message from a 'A.Fail' value. -data ParseError = ParseError - { errorContexts :: [String] - , errorMessage :: String - } | DivergentParser - deriving (Show, Typeable) - -instance Exception ParseError - --- | A class of types which may be consumed by an Attoparsec parser. -class AttoparsecInput a where - parseA :: A.Parser a b -> a -> A.IResult a b - feedA :: A.IResult a b -> a -> A.IResult a b - empty :: a - isNull :: a -> Bool - notEmpty :: [a] -> [a] - -instance AttoparsecInput B.ByteString where - parseA = Data.Attoparsec.ByteString.parse - feedA = Data.Attoparsec.ByteString.feed - empty = B.empty - isNull = B.null - notEmpty = filter (not . B.null) - -instance AttoparsecInput T.Text where - parseA = Data.Attoparsec.Text.parse - feedA = Data.Attoparsec.Text.feed - empty = T.empty - isNull = T.null - notEmpty = filter (not . T.null) - --- | Convert an Attoparsec 'A.Parser' into a 'C.Sink'. The parser will --- be streamed bytes until it returns 'A.Done' or 'A.Fail'. --- --- If parsing fails, a 'ParseError' will be thrown with 'C.monadThrow'. -sinkParser :: (AttoparsecInput a, C.MonadThrow m) => A.Parser a b -> C.Sink a m b -sinkParser = - sink . parseA - where - sink parser = C.NeedInput (push parser) (close parser) - - push parser c | isNull c = sink parser - push parser c = go (parser c) sink - - close parser = go - (feedA (parser empty) empty) - (const $ C.PipeM exc $ lift exc) - where - exc = C.monadThrow DivergentParser - - go (A.Done leftover x) _ = - C.Done lo x - where - lo - | isNull leftover = Nothing - | otherwise = Just leftover - go (A.Fail _ contexts msg) _ = - C.PipeM exc $ lift exc - where - exc = C.monadThrow $ ParseError contexts msg - - go (A.Partial parser') onPartial = onPartial parser' diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,30 +1,20 @@ -Copyright (c)2011, Michael Snoyman - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. +Copyright (c) 2012 Michael Snoyman, http://www.yesodweb.com/ - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: - * Neither the name of Michael Snoyman nor the names of other - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/attoparsec-conduit.cabal b/attoparsec-conduit.cabal --- a/attoparsec-conduit.cabal +++ b/attoparsec-conduit.cabal @@ -1,42 +1,19 @@ Name: attoparsec-conduit -Version: 0.4.0.1 -Synopsis: Turn attoparsec parsers into sinks. -Description: Turn attoparsec parsers into sinks. -License: BSD3 +Version: 1.1.0 +Synopsis: Consume attoparsec parsers via conduit. (deprecated) +Description: Consume attoparsec parsers via conduit. +License: MIT License-file: LICENSE Author: Michael Snoyman Maintainer: michael@snoyman.com -Category: Data, Conduit +Category: Data, Conduit, Parsing Build-type: Simple Cabal-version: >=1.8 Homepage: http://github.com/snoyberg/conduit -extra-source-files: test/main.hs Library - Exposed-modules: Data.Conduit.Attoparsec Build-depends: base >= 4 && < 5 - , transformers >= 0.2.2 && < 0.4 - , bytestring >= 0.9 - , attoparsec >= 0.10 - , text >= 0.11 - , conduit >= 0.4 && < 0.5 - ghc-options: -Wall - -test-suite test - hs-source-dirs: test - main-is: main.hs - type: exitcode-stdio-1.0 - cpp-options: -DTEST - build-depends: conduit - , base - , hspec - , HUnit - , QuickCheck - , bytestring - , blaze-builder - , transformers - , text - ghc-options: -Wall + , conduit >= 1.1 source-repository head type: git diff --git a/test/main.hs b/test/main.hs deleted file mode 100644 --- a/test/main.hs +++ /dev/null @@ -1,35 +0,0 @@ -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE CPP #-} -import Test.Hspec.Monadic -{- -import Test.Hspec.HUnit () -import Test.Hspec.QuickCheck (prop) -import Test.HUnit - -import qualified Data.Conduit as C -import qualified Data.Conduit.List as CL -import qualified Data.Conduit.Lazy as CLazy -import qualified Data.Conduit.Text as CT -import Data.Conduit.Blaze (builderToByteString) -import Data.Conduit (runResourceT) -import Control.Monad.ST (runST) -import Data.Monoid -import qualified Data.ByteString as S -import qualified Data.IORef as I -import Blaze.ByteString.Builder (fromByteString, toLazyByteString, insertLazyByteString) -import qualified Data.ByteString.Lazy as L -import Data.ByteString.Lazy.Char8 () -import Data.Maybe (catMaybes) -import Control.Monad.Trans.Writer (Writer) -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Encoding as TLE -import Control.Monad.Trans.Resource (runExceptionT_, withIO, resourceForkIO) -import Control.Concurrent (threadDelay, killThread) -import Control.Monad.IO.Class (liftIO) -import Control.Applicative (pure, (<$>), (<*>)) --} - -main :: IO () -main = hspecX $ do - return ()