diff --git a/attoparsec-data.cabal b/attoparsec-data.cabal --- a/attoparsec-data.cabal +++ b/attoparsec-data.cabal @@ -1,34 +1,75 @@ -name: attoparsec-data -version: 1.0.5.3 -category: Parsing -synopsis: Parsers for the standard Haskell data types -homepage: https://github.com/nikita-volkov/attoparsec-data -bug-reports: https://github.com/nikita-volkov/attoparsec-data/issues -author: Nikita Volkov -maintainer: Nikita Volkov -copyright: (c) 2017, Nikita Volkov -license: MIT -license-file: LICENSE -build-type: Simple -cabal-version: >=1.10 +cabal-version: 3.0 +name: attoparsec-data +version: 1.0.5.4 +category: Parsing +synopsis: Parsers for the standard Haskell data types +description: Collection of parsers for various common data formats. +homepage: https://github.com/nikita-volkov/attoparsec-data +bug-reports: https://github.com/nikita-volkov/attoparsec-data/issues +author: Nikita Volkov +maintainer: Nikita Volkov +copyright: (c) 2017, Nikita Volkov +license: MIT +license-file: LICENSE +source-repository head + type: git + location: git://github.com/nikita-volkov/attoparsec-data.git + library - hs-source-dirs: library - default-extensions: Arrows, BangPatterns, ConstraintKinds, DataKinds, DefaultSignatures, DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveTraversable, EmptyDataDecls, FlexibleContexts, FlexibleInstances, FunctionalDependencies, GADTs, GeneralizedNewtypeDeriving, LambdaCase, LiberalTypeSynonyms, MagicHash, MultiParamTypeClasses, MultiWayIf, NoImplicitPrelude, NoMonomorphismRestriction, OverloadedStrings, PatternGuards, ParallelListComp, QuasiQuotes, RankNTypes, RecordWildCards, ScopedTypeVariables, StandaloneDeriving, TemplateHaskell, TupleSections, TypeFamilies, TypeOperators, UnboxedTuples - default-language: Haskell2010 - exposed-modules: - Attoparsec.Data + hs-source-dirs: library + default-language: Haskell2010 + default-extensions: + NoImplicitPrelude + NoMonomorphismRestriction + Arrows + BangPatterns + ConstraintKinds + DataKinds + DefaultSignatures + DeriveDataTypeable + DeriveFoldable + DeriveFunctor + DeriveGeneric + DeriveTraversable + EmptyDataDecls + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + GeneralizedNewtypeDeriving + LambdaCase + LiberalTypeSynonyms + MagicHash + MultiParamTypeClasses + MultiWayIf + OverloadedStrings + ParallelListComp + PatternGuards + QuasiQuotes + RankNTypes + RecordWildCards + ScopedTypeVariables + StandaloneDeriving + TemplateHaskell + TupleSections + TypeFamilies + TypeOperators + UnboxedTuples + + exposed-modules: Attoparsec.Data other-modules: Attoparsec.Data.Explicit Attoparsec.Data.Implicit Attoparsec.Data.Parsers Attoparsec.Data.Prelude + build-depends: - attoparsec >=0.13 && <0.15, - attoparsec-time >=1 && <1.1, - base >=4.11 && <5, - bytestring >=0.10 && <0.12, - scientific >=0.2 && <0.4, - text >=1 && <3, - time >=1.4 && <2, - uuid >=1.3 && <1.4 + , attoparsec >=0.13 && <0.15 + , attoparsec-time >=1.0.3.1 && <1.1 + , base >=4.11 && <5 + , bytestring >=0.10 && <0.13 + , scientific >=0.2 && <0.4 + , text >=1 && <3 + , time >=1.4 && <2 + , uuid >=1.3 && <1.4 diff --git a/library/Attoparsec/Data.hs b/library/Attoparsec/Data.hs --- a/library/Attoparsec/Data.hs +++ b/library/Attoparsec/Data.hs @@ -1,10 +1,10 @@ module Attoparsec.Data -( - -- * Explicit - module Attoparsec.Data.Explicit, - -- * Implicit - module Attoparsec.Data.Implicit, -) + ( -- * Explicit + module Attoparsec.Data.Explicit, + + -- * Implicit + module Attoparsec.Data.Implicit, + ) where import Attoparsec.Data.Explicit diff --git a/library/Attoparsec/Data/Explicit.hs b/library/Attoparsec/Data/Explicit.hs --- a/library/Attoparsec/Data/Explicit.hs +++ b/library/Attoparsec/Data/Explicit.hs @@ -1,60 +1,55 @@ module Attoparsec.Data.Explicit -( - char, - text, - utf8Bytes, - bool, - signedIntegral, - unsignedIntegral, - A.double, - A.scientific, - string, - uuid, - D.show, - -- * Time - B.timeOfDayInISO8601, - B.dayInISO8601, - B.timeZoneInISO8601, - B.utcTimeInISO8601, - B.diffTime, - B.nominalDiffTime, -) + ( char, + text, + utf8Bytes, + bool, + signedIntegral, + unsignedIntegral, + A.double, + A.scientific, + string, + uuid, + D.show, + + -- * Time + B.timeOfDayInISO8601, + B.dayInISO8601, + B.timeZoneInISO8601, + B.utcTimeInISO8601, + B.diffTime, + B.nominalDiffTime, + ) where +import qualified Attoparsec.Data.Parsers as D import Attoparsec.Data.Prelude hiding (bool) -import qualified Data.Attoparsec.Text as A import qualified Attoparsec.Time.Text as B +import qualified Data.Attoparsec.Text as A import qualified Data.Text.Encoding as C -import qualified Attoparsec.Data.Parsers as D import qualified Data.UUID as Uuid - -{-| -Any character. --} +-- | +-- Any character. char :: A.Parser Char char = A.anyChar -{-| -Consumes all the remaining input. --} +-- | +-- Consumes all the remaining input. text :: A.Parser Text text = A.takeText -{-| -Consumes all the remaining input, encoding it using UTF8. --} +-- | +-- Consumes all the remaining input, encoding it using UTF8. utf8Bytes :: A.Parser ByteString utf8Bytes = C.encodeUtf8 <$> A.takeText -{-| -Accepts any string interpretable as a boolean: -"1" or "0", "true" or "false", "yes" or "no", "y" or "n", "t" or "f". -Case-insensitive. --} +-- | +-- Accepts any string interpretable as a boolean: +-- "1" or "0", "true" or "false", "yes" or "no", "y" or "n", "t" or "f". +-- Case-insensitive. bool :: A.Parser Bool bool = A.anyChar >>= \case @@ -70,30 +65,26 @@ 'Y' -> A.asciiCI "es" $> True <|> pure True _ -> empty -{-| -Signed decimal. --} -signedIntegral :: Integral a => A.Parser a +-- | +-- Signed decimal. +signedIntegral :: (Integral a) => A.Parser a signedIntegral = A.signed A.decimal -{-| -Unsigned decimal. --} -unsignedIntegral :: Integral a => A.Parser a +-- | +-- Unsigned decimal. +unsignedIntegral :: (Integral a) => A.Parser a unsignedIntegral = A.decimal -{-| -Plain String. --} +-- | +-- Plain String. string :: A.Parser String string = many A.anyChar -{-| -UUID. --} +-- | +-- UUID. uuid :: A.Parser UUID uuid = do text <- A.take 36 diff --git a/library/Attoparsec/Data/Implicit.hs b/library/Attoparsec/Data/Implicit.hs --- a/library/Attoparsec/Data/Implicit.hs +++ b/library/Attoparsec/Data/Implicit.hs @@ -1,47 +1,64 @@ -{-# LANGUAGE CPP #-} module Attoparsec.Data.Implicit where -import Attoparsec.Data.Prelude import qualified Attoparsec.Data.Explicit as A +import Attoparsec.Data.Prelude import qualified Data.Attoparsec.Text as B - -{-| -Provides the default lenient parser for a type. - -By convention, the parser should not check for the end of input. --} +-- | +-- Provides the default lenient parser for a type. +-- +-- By convention, the parser should not check for the end of input. class LenientParser a where lenientParser :: B.Parser a -#define INSTANCE(TYPE, FUNCTION) instance LenientParser TYPE where {{-# INLINE lenientParser #-}; lenientParser = FUNCTION;} - -- | Consumes all the remaining input. -INSTANCE(Text, A.text) +instance LenientParser Text where lenientParser = A.text + -- | Consumes all the remaining input, encoding it using UTF8. -INSTANCE(ByteString, A.utf8Bytes) -INSTANCE(Char, A.char) -INSTANCE(Bool, A.bool) -INSTANCE(Integer, A.signedIntegral) -INSTANCE(Int, A.signedIntegral) -INSTANCE(Int8, A.signedIntegral) -INSTANCE(Int16, A.signedIntegral) -INSTANCE(Int32, A.signedIntegral) -INSTANCE(Int64, A.signedIntegral) -INSTANCE(Word, A.unsignedIntegral) -INSTANCE(Word8, A.unsignedIntegral) -INSTANCE(Word16, A.unsignedIntegral) -INSTANCE(Word32, A.unsignedIntegral) -INSTANCE(Word64, A.unsignedIntegral) -INSTANCE(Double, A.double) -INSTANCE(Scientific, A.scientific) -INSTANCE(TimeOfDay, A.timeOfDayInISO8601) -INSTANCE(Day, A.dayInISO8601) -INSTANCE(TimeZone, A.timeZoneInISO8601) -INSTANCE(UTCTime, A.utcTimeInISO8601) -INSTANCE(DiffTime, A.diffTime) -INSTANCE(NominalDiffTime, A.nominalDiffTime) -INSTANCE(String, A.string) -INSTANCE(UUID, A.uuid) +instance LenientParser ByteString where lenientParser = A.utf8Bytes -#undef INSTANCE +instance LenientParser Char where lenientParser = A.char + +instance LenientParser Bool where lenientParser = A.bool + +instance LenientParser Integer where lenientParser = A.signedIntegral + +instance LenientParser Int where lenientParser = A.signedIntegral + +instance LenientParser Int8 where lenientParser = A.signedIntegral + +instance LenientParser Int16 where lenientParser = A.signedIntegral + +instance LenientParser Int32 where lenientParser = A.signedIntegral + +instance LenientParser Int64 where lenientParser = A.signedIntegral + +instance LenientParser Word where lenientParser = A.unsignedIntegral + +instance LenientParser Word8 where lenientParser = A.unsignedIntegral + +instance LenientParser Word16 where lenientParser = A.unsignedIntegral + +instance LenientParser Word32 where lenientParser = A.unsignedIntegral + +instance LenientParser Word64 where lenientParser = A.unsignedIntegral + +instance LenientParser Double where lenientParser = A.double + +instance LenientParser Scientific where lenientParser = A.scientific + +instance LenientParser TimeOfDay where lenientParser = A.timeOfDayInISO8601 + +instance LenientParser Day where lenientParser = A.dayInISO8601 + +instance LenientParser TimeZone where lenientParser = A.timeZoneInISO8601 + +instance LenientParser UTCTime where lenientParser = A.utcTimeInISO8601 + +instance LenientParser DiffTime where lenientParser = A.diffTime + +instance LenientParser NominalDiffTime where lenientParser = A.nominalDiffTime + +instance LenientParser String where lenientParser = A.string + +instance LenientParser UUID where lenientParser = A.uuid diff --git a/library/Attoparsec/Data/Parsers.hs b/library/Attoparsec/Data/Parsers.hs --- a/library/Attoparsec/Data/Parsers.hs +++ b/library/Attoparsec/Data/Parsers.hs @@ -1,17 +1,15 @@ -{-| -Lower-level parsers, which avoid overriding the native Attoparsec names. --} +-- | +-- Lower-level parsers, which avoid overriding the native Attoparsec names. module Attoparsec.Data.Parsers where import Attoparsec.Data.Prelude hiding (bool) import Data.Attoparsec.Text -import qualified GHC.Show import qualified Data.Text as Text +import qualified GHC.Show -{-| -Parse the output of the 'show' function applied to 'String' or 'Text' -into what was used for its input. --} +-- | +-- Parse the output of the 'show' function applied to 'String' or 'Text' +-- into what was used for its input. show :: Parser Text show = char '"' *> body <* char '"' @@ -22,7 +20,7 @@ chunk = escaped <|> nonEscaped nonEscaped = - takeWhile1 (\ a -> a /= '\\' && a /= '"') + takeWhile1 (\a -> a /= '\\' && a /= '"') escaped = Text.singleton <$> escapedChar @@ -33,21 +31,29 @@ escapedCharBody :: Parser Char escapedCharBody = - char '\\' <|> - char 'a' $> '\a' <|> - char 'b' $> '\b' <|> - char 'f' $> '\f' <|> - char 'n' $> '\n' <|> - char 'r' $> '\r' <|> - char 't' $> '\t' <|> - char 'v' $> '\v' <|> - string "DEL" $> '\DEL' <|> - ordEscapedCharBody <|> - asciiTabEscapedCharBody + char '\\' + <|> char 'a' + $> '\a' + <|> char 'b' + $> '\b' + <|> char 'f' + $> '\f' + <|> char 'n' + $> '\n' + <|> char 'r' + $> '\r' + <|> char 't' + $> '\t' + <|> char 'v' + $> '\v' + <|> string "DEL" + $> '\DEL' + <|> ordEscapedCharBody + <|> asciiTabEscapedCharBody asciiTabEscapedCharBody :: Parser Char asciiTabEscapedCharBody = - zipWith asciiTabChar [0..] GHC.Show.asciiTab & asum + zipWith asciiTabChar [0 ..] GHC.Show.asciiTab & asum where asciiTabChar index chars = string (fromString chars) $> chr index diff --git a/library/Attoparsec/Data/Prelude.hs b/library/Attoparsec/Data/Prelude.hs --- a/library/Attoparsec/Data/Prelude.hs +++ b/library/Attoparsec/Data/Prelude.hs @@ -1,25 +1,22 @@ module Attoparsec.Data.Prelude -( - module Exports, -) + ( module Exports, + ) where - --- base -------------------------- import Control.Applicative as Exports import Control.Arrow as Exports hiding (first, second) import Control.Category as Exports import Control.Concurrent as Exports import Control.Exception as Exports -import Control.Monad as Exports hiding (fail, mapM_, sequence_, forM_, msum, mapM, sequence, forM) -import Control.Monad.IO.Class as Exports +import Control.Monad as Exports hiding (fail, forM, forM_, mapM, mapM_, msum, sequence, sequence_) import Control.Monad.Fail as Exports import Control.Monad.Fix as Exports hiding (fix) +import Control.Monad.IO.Class as Exports import Control.Monad.ST as Exports import Data.Bifunctor as Exports import Data.Bits as Exports import Data.Bool as Exports +import Data.ByteString as Exports (ByteString) import Data.Char as Exports import Data.Coerce as Exports import Data.Complex as Exports @@ -29,22 +26,26 @@ import Data.Fixed as Exports import Data.Foldable as Exports hiding (toList) import Data.Function as Exports hiding (id, (.)) -import Data.Functor as Exports +import Data.Functor as Exports hiding (unzip) import Data.Functor.Compose as Exports -import Data.Int as Exports import Data.IORef as Exports +import Data.Int as Exports import Data.Ix as Exports -import Data.List as Exports hiding (sortOn, isSubsequenceOf, uncons, concat, foldr, foldl1, maximum, minimum, product, sum, all, and, any, concatMap, elem, foldl, foldr1, notElem, or, find, maximumBy, minimumBy, mapAccumL, mapAccumR, foldl') -import Data.List.NonEmpty as Exports (NonEmpty(..)) +import Data.List as Exports hiding (all, and, any, concat, concatMap, elem, find, foldl, foldl', foldl1, foldr, foldr1, isSubsequenceOf, mapAccumL, mapAccumR, maximum, maximumBy, minimum, minimumBy, notElem, or, product, sortOn, sum, uncons) +import Data.List.NonEmpty as Exports (NonEmpty (..)) import Data.Maybe as Exports import Data.Monoid as Exports hiding (Alt) import Data.Ord as Exports import Data.Proxy as Exports import Data.Ratio as Exports import Data.STRef as Exports +import Data.Scientific as Exports (Scientific) import Data.String as Exports +import Data.Text as Exports (Text) +import Data.Time as Exports import Data.Traversable as Exports import Data.Tuple as Exports +import Data.UUID as Exports (UUID) import Data.Unique as Exports import Data.Version as Exports import Data.Void as Exports @@ -54,12 +55,11 @@ import Foreign.Ptr as Exports import Foreign.StablePtr as Exports import Foreign.Storable as Exports -import GHC.Conc as Exports hiding (orElse, withMVar, threadWaitWriteSTM, threadWaitWrite, threadWaitReadSTM, threadWaitRead) -import GHC.Exts as Exports (IsList(..), lazy, inline, sortWith, groupWith) +import GHC.Conc as Exports hiding (orElse, threadWaitRead, threadWaitReadSTM, threadWaitWrite, threadWaitWriteSTM, withMVar) +import GHC.Exts as Exports (IsList (..), groupWith, inline, lazy, sortWith) import GHC.Generics as Exports (Generic) import GHC.IO.Exception as Exports import Numeric as Exports -import Prelude as Exports hiding (fail, concat, foldr, mapM_, sequence_, foldl1, maximum, minimum, product, sum, all, and, any, concatMap, elem, foldl, foldr1, notElem, or, mapM, sequence, id, (.)) import System.Environment as Exports import System.Exit as Exports import System.IO as Exports (Handle, hClose) @@ -68,28 +68,7 @@ import System.Mem as Exports import System.Mem.StableName as Exports import System.Timeout as Exports -import Text.ParserCombinators.ReadP as Exports (ReadP, ReadS, readP_to_S, readS_to_P) -import Text.ParserCombinators.ReadPrec as Exports (ReadPrec, readPrec_to_P, readP_to_Prec, readPrec_to_S, readS_to_Prec) -import Text.Printf as Exports (printf, hPrintf) -import Text.Read as Exports (Read(..), readMaybe, readEither) +import Text.Printf as Exports (hPrintf, printf) +import Text.Read as Exports (Read (..), readEither, readMaybe) import Unsafe.Coerce as Exports - --- text -------------------------- -import Data.Text as Exports (Text) - --- bytestring -------------------------- -import Data.ByteString as Exports (ByteString) - --- scientific -------------------------- -import Data.Scientific as Exports (Scientific) - --- time -------------------------- -import Data.Time as Exports - --- uuid -------------------------- -import Data.UUID as Exports (UUID) +import Prelude as Exports hiding (all, and, any, concat, concatMap, elem, fail, foldl, foldl1, foldr, foldr1, id, mapM, mapM_, maximum, minimum, notElem, or, product, sequence, sequence_, sum, (.))