git.iko.soy/typeable/attoparsec
on caadabe help sign in
53 files changed+464−1687
since splitsnapshots
unifiedsplit
.gitignore−1 .hgtags−7 .travis.yml−161 Data/Attoparsec.hs+1−1 Data/Attoparsec/ByteString.hs+4−11 Data/Attoparsec/ByteString/Buffer.hs+6−10 Data/Attoparsec/ByteString/Char8.hs+20−16 Data/Attoparsec/ByteString/FastSet.hs+1−1 Data/Attoparsec/ByteString/Internal.hs+34−85 Data/Attoparsec/ByteString/Lazy.hs+3−10 Data/Attoparsec/Char8.hs+1−1 Data/Attoparsec/Combinator.hs+10−23 Data/Attoparsec/Internal.hs+5−31 Data/Attoparsec/Internal/Types.hs+32−48 Data/Attoparsec/Lazy.hs+1−1 Data/Attoparsec/Number.hs+1−1 Data/Attoparsec/Text.hs+7−17 Data/Attoparsec/Text/Buffer.hs+8−20 Data/Attoparsec/Text/FastSet.hs+60−80 Data/Attoparsec/Text/Internal.hs+45−87 Data/Attoparsec/Text/Lazy.hs+10−13 Data/Attoparsec/Types.hs+1−1 Data/Attoparsec/Zepto.hs+44−86 README.markdown+6 attoparsec.cabal+15−60 benchmarks/Aeson.hs+2−6 benchmarks/Benchmarks.hs−8 benchmarks/Genome.hs−75 benchmarks/HeadersByteString.hs+41−10 benchmarks/HeadersByteString/Atto.hs−57 benchmarks/Links.hs+2−2 benchmarks/Numbers.hs−1 benchmarks/Sets.hs−21 benchmarks/TextFastSet.hs−121 benchmarks/attoparsec-benchmarks.cabal−5 benchmarks/http-request.txt+8−3 benchmarks/http-response.txt+4−2 benchmarks/warp-3.0.1.1/Network/Wai/Handler/Warp/RequestHeader.hs+1−1 changelog.md−54 tests/Makefile+14 tests/QC.hs+2−2 tests/QC/Buffer.hs+4−6 tests/QC/ByteString.hs+15−34 tests/QC/Combinator.hs+5−18 tests/QC/Common.hs+4−34 tests/QC/IPv6/Internal.hs−316 tests/QC/IPv6/Types.hs−29 tests/QC/Rechunked.hs+2−3 tests/QC/Simple.hs+3−3 tests/QC/Text.hs+14−35 tests/QC/Text/FastSet.hs−15 tests/QC/Text/Regressions.hs−54 tests/TestFastSet.hs+28
.gitignore−1
@@ -3,4 +3,3 @@
33/dist/
44.cabal-sandbox
55cabal.sandbox.config
6−*.sw[op]
.hgtags−7
@@ -50,14 +50,7 @@ ec23283e88c00af34c3144a8775ca4358daea3f7 0.10.4.0
5050a3c7a521fd58595d6a470ab890cc54a80dd45bd7 0.11.3.1
515138326ce07aca6c8c3a014b0d454d2a5bfdbd6a52 0.11.3.2
5252694039f4fc157a8ca5dce37959391615b6c3f535 0.11.3.3
53−1fe92d1838fb1b1afcee1ca18d4970cf7e01956e 0.11.3.4
545368203a4cb847da905fa44b5aa1942b99d5867ab4 0.12.0.0
5554c9c2b05707b2fffcd749d5817e3e0d04e6ad6d0d 0.12.1.0
56559157c2b4c35aa5f683b4ac51e6ff52c696bc22e2 0.12.1.1
5756682ba515f7ba62500ad79371b37b90932e0c0e3d 0.12.1.2
58−2066a72b79b478f59a9c7f1839c522fc59ba9af7 0.12.1.3
59−ef875ad3bebef2b6fb1bd7063de6a46a06d0d4b4 0.12.1.4
60−dc1fcff28d13a508f677c7b06af6420877842493 0.12.1.5
61−013e04e4526bfd5e9e4a611b42e6f03c413bea91 0.12.1.6
62−0ddbce995b77b8db391b4d6519f13feddf4b5bf3 0.13.0.0
63−46c16463ec20ad46c9cd0bfb1050c4268f34b749 0.13.0.1
.travis.ymldeleted−161
@@ -1,161 +0,0 @@
1−# This Travis job script has been generated by a script via
2−#
3−# haskell-ci '--tests-jobs=>=7.4' '--no-benchmarks' 'attoparsec.cabal'
4−#
5−# For more information, see https://github.com/haskell-CI/haskell-ci
6−#
7−# version: 0.3.20190815
8−#
9−language: c
10−dist: xenial
11−git:
12− # whether to recursively clone submodules
13− submodules: false
14−cache:
15− directories:
16− - $HOME/.cabal/packages
17− - $HOME/.cabal/store
18−before_cache:
19− - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
20− # remove files that are regenerated by 'cabal update'
21− - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
22− - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
23− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
24− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
25− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
26− - rm -rfv $CABALHOME/packages/head.hackage
27−matrix:
28− include:
29− - compiler: ghc-8.8.1
30− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
31− - compiler: ghc-8.6.5
32− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
33− - compiler: ghc-8.4.4
34− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
35− - compiler: ghc-8.2.2
36− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
37− - compiler: ghc-8.0.2
38− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
39− - compiler: ghc-7.10.3
40− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}
41− - compiler: ghc-7.8.4
42− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}
43− - compiler: ghc-7.6.3
44− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-2.4"]}}
45− - compiler: ghc-7.4.2
46− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.4.2","cabal-install-2.4"]}}
47− - compiler: ghc-7.2.2
48− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.2.2","cabal-install-2.4"]}}
49− - compiler: ghc-7.0.4
50− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.0.4","cabal-install-2.4"]}}
51−before_install:
52− - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
53− - WITHCOMPILER="-w $HC"
54− - HCPKG="$HC-pkg"
55− - unset CC
56− - CABAL=/opt/ghc/bin/cabal
57− - CABALHOME=$HOME/.cabal
58− - export PATH="$CABALHOME/bin:$PATH"
59− - TOP=$(pwd)
60− - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
61− - echo $HCNUMVER
62− - CABAL="$CABAL -vnormal+nowrap+markoutput"
63− - set -o pipefail
64− - |
65− echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
66− echo 'BEGIN { state = "output"; }' >> .colorful.awk
67− echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
68− echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
69− echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
70− echo ' if (state == "cabal") {' >> .colorful.awk
71− echo ' print blue($0)' >> .colorful.awk
72− echo ' } else {' >> .colorful.awk
73− echo ' print $0' >> .colorful.awk
74− echo ' }' >> .colorful.awk
75− echo '}' >> .colorful.awk
76− - cat .colorful.awk
77− - |
78− color_cabal_output () {
79− awk -f $TOP/.colorful.awk
80− }
81− - echo text | color_cabal_output
82−install:
83− - ${CABAL} --version
84− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
85− - TEST=--enable-tests
86− - if [ $HCNUMVER -lt 70400 ] ; then TEST=--disable-tests ; fi
87− - BENCH=--enable-benchmarks
88− - BENCH=--disable-benchmarks
89− - HEADHACKAGE=false
90− - rm -f $CABALHOME/config
91− - |
92− echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
93− echo "remote-build-reporting: anonymous" >> $CABALHOME/config
94− echo "write-ghc-environment-files: always" >> $CABALHOME/config
95− echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
96− echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
97− echo "world-file: $CABALHOME/world" >> $CABALHOME/config
98− echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
99− echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
100− echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
101− echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
102− echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
103− echo "install-dirs user" >> $CABALHOME/config
104− echo " prefix: $CABALHOME" >> $CABALHOME/config
105− echo "repository hackage.haskell.org" >> $CABALHOME/config
106− echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
107− - cat $CABALHOME/config
108− - rm -fv cabal.project cabal.project.local cabal.project.freeze
109− - travis_retry ${CABAL} v2-update -v
110− # Generate cabal.project
111− - rm -rf cabal.project cabal.project.local cabal.project.freeze
112− - touch cabal.project
113− - |
114− echo "packages: ." >> cabal.project
115− - |
116− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(attoparsec)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
117− - cat cabal.project || true
118− - cat cabal.project.local || true
119− - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
120− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
121− - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
122− - rm cabal.project.freeze
123− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
124− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
125−script:
126− - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
127− # Packaging...
128− - ${CABAL} v2-sdist all | color_cabal_output
129− # Unpacking...
130− - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
131− - cd ${DISTDIR} || false
132− - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
133− - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
134− - PKGDIR_attoparsec="$(find . -maxdepth 1 -type d -regex '.*/attoparsec-[0-9.]*')"
135− # Generate cabal.project
136− - rm -rf cabal.project cabal.project.local cabal.project.freeze
137− - touch cabal.project
138− - |
139− echo "packages: ${PKGDIR_attoparsec}" >> cabal.project
140− - |
141− - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(attoparsec)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
142− - cat cabal.project || true
143− - cat cabal.project.local || true
144− # Building...
145− # this builds all libraries and executables (without tests/benchmarks)
146− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
147− # Building with tests and benchmarks...
148− # build & run tests, build benchmarks
149− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
150− # Testing...
151− - if [ $HCNUMVER -ge 70400 ] ; then ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi
152− # cabal check...
153− - (cd ${PKGDIR_attoparsec} && ${CABAL} -vnormal check)
154− # haddock...
155− - ${CABAL} v2-haddock $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
156− # Building without installed constraints for packages in global-db...
157− - rm -f cabal.project.local
158− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
159−
160−# REGENDATA ["--tests-jobs=>=7.4","--no-benchmarks","attoparsec.cabal"]
161−# EOF
Data/Attoparsec.hs+1−1
@@ -1,6 +1,6 @@
11-- |
22-- Module : Data.Attoparsec
3−-- Copyright : Bryan O'Sullivan 2007-2015
3+-- Copyright : Bryan O'Sullivan 2007-2014
44-- License : BSD3
55--
66-- Maintainer : bos@serpentine.com
Data/Attoparsec/ByteString.hs+4−11
@@ -1,10 +1,6 @@
1−{-# LANGUAGE CPP #-}
2−#if __GLASGOW_HASKELL__ >= 702
3−{-# LANGUAGE Trustworthy #-}
4−#endif
51-- |
62-- Module : Data.Attoparsec.ByteString
7−-- Copyright : Bryan O'Sullivan 2007-2015
3+-- Copyright : Bryan O'Sullivan 2007-2014
84-- License : BSD3
95--
106-- Maintainer : bos@serpentine.com
@@ -63,7 +59,6 @@ module Data.Attoparsec.ByteString
6359 , I.skipWhile
6460 , I.take
6561 , I.scan
66− , I.runScanner
6762 , I.takeWhile
6863 , I.takeWhile1
6964 , I.takeTill
@@ -97,7 +92,6 @@ module Data.Attoparsec.ByteString
9792 ) where
9893
9994import Data.Attoparsec.Combinator
100−import Data.List (intercalate)
10195import qualified Data.Attoparsec.ByteString.Internal as I
10296import qualified Data.Attoparsec.Internal as I
10397import qualified Data.ByteString as B
@@ -224,7 +218,6 @@ maybeResult _ = Nothing
224218-- | Convert a 'Result' value to an 'Either' value. A 'T.Partial'
225219-- result is treated as failure.
226220eitherResult :: Result r -> Either String r
227−eitherResult (T.Done _ r) = Right r
228−eitherResult (T.Fail _ [] msg) = Left msg
229−eitherResult (T.Fail _ ctxs msg) = Left (intercalate " > " ctxs ++ ": " ++ msg)
230−eitherResult _ = Left "Result: incomplete input"
221+eitherResult (T.Done _ r) = Right r
222+eitherResult (T.Fail _ _ msg) = Left msg
223+eitherResult _ = Left "Result: incomplete input"
Data/Attoparsec/ByteString/Buffer.hs+6−10
@@ -1,7 +1,7 @@
11{-# LANGUAGE BangPatterns #-}
22-- |
33-- Module : Data.Attoparsec.ByteString.Buffer
4−-- Copyright : Bryan O'Sullivan 2007-2015
4+-- Copyright : Bryan O'Sullivan 2007-2014
55-- License : BSD3
66--
77-- Maintainer : bos@serpentine.com
@@ -57,8 +57,7 @@ import Control.Exception (assert)
5757import Data.ByteString.Internal (ByteString(..), memcpy, nullForeignPtr)
5858import Data.Attoparsec.Internal.Fhthagn (inlinePerformIO)
5959import Data.List (foldl1')
60−import Data.Monoid as Mon (Monoid(..))
61−import Data.Semigroup (Semigroup(..))
60+import Data.Monoid (Monoid(..))
6261import Data.Word (Word8)
6362import Foreign.ForeignPtr (ForeignPtr, withForeignPtr)
6463import Foreign.Ptr (castPtr, plusPtr)
@@ -87,17 +86,14 @@ buffer (PS fp off len) = Buf fp off len len 0
8786unbuffer :: Buffer -> ByteString
8887unbuffer (Buf fp off len _ _) = PS fp off len
8988
90−instance Semigroup Buffer where
91− (Buf _ _ _ 0 _) <> b = b
92− a <> (Buf _ _ _ 0 _) = a
93− buf <> (Buf fp off len _ _) = append buf fp off len
94−
9589instance Monoid Buffer where
9690 mempty = Buf nullForeignPtr 0 0 0 0
9791
98− mappend = (<>)
92+ mappend (Buf _ _ _ 0 _) b = b
93+ mappend a (Buf _ _ _ 0 _) = a
94+ mappend buf (Buf fp off len _ _) = append buf fp off len
9995
100− mconcat [] = Mon.mempty
96+ mconcat [] = mempty
10197 mconcat xs = foldl1' mappend xs
10298
10399pappend :: Buffer -> ByteString -> Buffer
Data/Attoparsec/ByteString/Char8.hs+20−16
@@ -1,13 +1,10 @@
1−{-# LANGUAGE BangPatterns, CPP, FlexibleInstances, TypeFamilies,
1+{-# LANGUAGE BangPatterns, FlexibleInstances, TypeFamilies,
22 TypeSynonymInstances, GADTs #-}
3−#if __GLASGOW_HASKELL__ >= 702
4−{-# LANGUAGE Trustworthy #-} -- Imports internal modules
5−#endif
63{-# OPTIONS_GHC -fno-warn-orphans -fno-warn-warnings-deprecations #-}
74
85-- |
96-- Module : Data.Attoparsec.ByteString.Char8
10−-- Copyright : Bryan O'Sullivan 2007-2015
7+-- Copyright : Bryan O'Sullivan 2007-2014
118-- License : BSD3
129--
1310-- Maintainer : bos@serpentine.com
@@ -70,7 +67,7 @@ module Data.Attoparsec.ByteString.Char8
7067
7168 -- * Efficient string handling
7269 , I.string
73− , I.stringCI
70+ , stringCI
7471 , skipSpace
7572 , skipWhile
7673 , I.take
@@ -127,11 +124,7 @@ module Data.Attoparsec.ByteString.Char8
127124 , I.atEnd
128125 ) where
129126
130−#if !MIN_VERSION_base(4,8,0)
131−import Control.Applicative (pure, (*>), (<*), (<$>))
132−import Data.Word (Word)
133−#endif
134−import Control.Applicative ((<|>))
127+import Control.Applicative (pure, (*>), (<*), (<$>), (<|>))
135128import Control.Monad (void, when)
136129import Data.Attoparsec.ByteString.FastSet (charClass, memberChar)
137130import Data.Attoparsec.ByteString.Internal (Parser)
@@ -143,7 +136,7 @@ import Data.Int (Int8, Int16, Int32, Int64)
143136import Data.String (IsString(..))
144137import Data.Scientific (Scientific)
145138import qualified Data.Scientific as Sci
146−import Data.Word (Word8, Word16, Word32, Word64)
139+import Data.Word (Word8, Word16, Word32, Word64, Word)
147140import Prelude hiding (takeWhile)
148141import qualified Data.Attoparsec.ByteString as A
149142import qualified Data.Attoparsec.ByteString.Internal as I
@@ -169,6 +162,16 @@ instance (a ~ B.ByteString) => IsString (Parser a) where
169162-- currency sign in ISO-8859-1). Haskell 'Char' values above U+00FF
170163-- are truncated, so e.g. U+1D6B7 is truncated to the byte @0xB7@.
171164
165+-- ASCII-specific but fast, oh yes.
166+toLower :: Word8 -> Word8
167+toLower w | w >= 65 && w <= 90 = w + 32
168+ | otherwise = w
169+
170+-- | Satisfy a literal string, ignoring case.
171+stringCI :: B.ByteString -> Parser B.ByteString
172+stringCI = I.stringTransform (B8.map toLower)
173+{-# INLINE stringCI #-}
174+
172175-- | Consume input as long as the predicate returns 'True', and return
173176-- the consumed input.
174177--
@@ -232,7 +235,7 @@ isDigit c = c >= '0' && c <= '9'
232235
233236-- | A fast digit predicate.
234237isDigit_w8 :: Word8 -> Bool
235−isDigit_w8 w = w - 48 <= 9
238+isDigit_w8 w = w >= 48 && w <= 57
236239{-# INLINE isDigit_w8 #-}
237240
238241-- | Match any character.
@@ -269,7 +272,7 @@ isSpace c = (c == ' ') || ('\t' <= c && c <= '\r')
269272
270273-- | Fast 'Word8' predicate for matching ASCII space characters.
271274isSpace_w8 :: Word8 -> Bool
272−isSpace_w8 w = w == 32 || w - 9 <= 4
275+isSpace_w8 w = (w == 32) || (9 <= w && w <= 13)
273276{-# INLINE isSpace_w8 #-}
274277
275278
@@ -444,8 +447,9 @@ hexadecimal = B8.foldl' step 0 `fmap` I.takeWhile1 isHexDigit
444447
445448-- | Parse and decode an unsigned decimal number.
446449decimal :: Integral a => Parser a
447−decimal = B8.foldl' step 0 `fmap` I.takeWhile1 isDigit_w8
448− where step a w = a * 10 + fromIntegral (w - 48)
450+decimal = B8.foldl' step 0 `fmap` I.takeWhile1 isDig
451+ where isDig w = w >= 48 && w <= 57
452+ step a w = a * 10 + fromIntegral (w - 48)
449453{-# SPECIALISE decimal :: Parser Int #-}
450454{-# SPECIALISE decimal :: Parser Int8 #-}
451455{-# SPECIALISE decimal :: Parser Int16 #-}
Data/Attoparsec/ByteString/FastSet.hs+1−1
@@ -3,7 +3,7 @@
33-----------------------------------------------------------------------------
44-- |
55-- Module : Data.Attoparsec.ByteString.FastSet
6−-- Copyright : Bryan O'Sullivan 2007-2015
6+-- Copyright : Bryan O'Sullivan 2007-2014
77-- License : BSD3
88--
99-- Maintainer : bos@serpentine.com
Data/Attoparsec/ByteString/Internal.hs+34−85
@@ -1,8 +1,7 @@
1−{-# LANGUAGE BangPatterns, CPP, GADTs, OverloadedStrings, RankNTypes,
2− RecordWildCards #-}
1+{-# LANGUAGE BangPatterns, GADTs, OverloadedStrings, RecordWildCards #-}
32-- |
43-- Module : Data.Attoparsec.ByteString.Internal
5−-- Copyright : Bryan O'Sullivan 2007-2015
4+-- Copyright : Bryan O'Sullivan 2007-2014
65-- License : BSD3
76--
87-- Maintainer : bos@serpentine.com
@@ -47,7 +46,7 @@ module Data.Attoparsec.ByteString.Internal
4746 -- * Efficient string handling
4847 , skipWhile
4948 , string
50− , stringCI
49+ , stringTransform
5150 , take
5251 , scan
5352 , runScanner
@@ -66,10 +65,7 @@ module Data.Attoparsec.ByteString.Internal
6665 , atEnd
6766 ) where
6867
69−#if !MIN_VERSION_base(4,8,0)
70−import Control.Applicative ((<$>))
71−#endif
72−import Control.Applicative ((<|>))
68+import Control.Applicative ((<|>), (<$>))
7369import Control.Monad (when)
7470import Data.Attoparsec.ByteString.Buffer (Buffer, buffer)
7571import Data.Attoparsec.ByteString.FastSet (charClass, memberWord8)
@@ -78,7 +74,6 @@ import Data.Attoparsec.Internal
7874import Data.Attoparsec.Internal.Fhthagn (inlinePerformIO)
7975import Data.Attoparsec.Internal.Types hiding (Parser, Failure, Success)
8076import Data.ByteString (ByteString)
81−import Data.List (intercalate)
8277import Data.Word (Word8)
8378import Foreign.ForeignPtr (withForeignPtr)
8479import Foreign.Ptr (castPtr, minusPtr, plusPtr)
@@ -141,15 +136,22 @@ storable = hack undefined
141136 hack :: Storable b => b -> Parser b
142137 hack dummy = do
143138 (fp,o,_) <- B.toForeignPtr `fmap` take (sizeOf dummy)
144− return . inlinePerformIO . withForeignPtr fp $ \p ->
139+ return . B.inlinePerformIO . withForeignPtr fp $ \p ->
145140 peek (castPtr $ p `plusPtr` o)
146141
147−-- | Consume exactly @n@ bytes of input.
148−take :: Int -> Parser ByteString
149−take n0 = do
142+-- | Consume @n@ bytes of input, but succeed only if the predicate
143+-- returns 'True'.
144+takeWith :: Int -> (ByteString -> Bool) -> Parser ByteString
145+takeWith n0 p = do
150146 let n = max n0 0
151147 s <- ensure n
152− advance n >> return s
148+ if p s
149+ then advance n >> return s
150+ else fail "takeWith"
151+
152+-- | Consume exactly @n@ bytes of input.
153+take :: Int -> Parser ByteString
154+take n = takeWith n (const True)
153155{-# INLINE take #-}
154156
155157-- | @string s@ parses a sequence of bytes that identically match
@@ -168,59 +170,13 @@ take n0 = do
168170-- before failing. In attoparsec, the above parser will /succeed/ on
169171-- that input, because the failed first branch will consume nothing.
170172string :: ByteString -> Parser ByteString
171−string s = string_ (stringSuspended id) id s
173+string s = takeWith (B.length s) (==s)
172174{-# INLINE string #-}
173175
174−-- ASCII-specific but fast, oh yes.
175−toLower :: Word8 -> Word8
176−toLower w | w >= 65 && w <= 90 = w + 32
177− | otherwise = w
178−
179−-- | Satisfy a literal string, ignoring case.
180−stringCI :: ByteString -> Parser ByteString
181−stringCI s = string_ (stringSuspended lower) lower s
182− where lower = B8.map toLower
183−{-# INLINE stringCI #-}
184−
185−string_ :: (forall r. ByteString -> ByteString -> Buffer -> Pos -> More
186− -> Failure r -> Success ByteString r -> Result r)
187− -> (ByteString -> ByteString)
188− -> ByteString -> Parser ByteString
189−string_ suspended f s0 = T.Parser $ \t pos more lose succ ->
190− let n = B.length s
191− s = f s0
192− in if lengthAtLeast pos n t
193− then let t' = substring pos (Pos n) t
194− in if s == f t'
195− then succ t (pos + Pos n) more t'
196− else lose t pos more [] "string"
197− else let t' = Buf.unsafeDrop (fromPos pos) t
198− in if f t' `B.isPrefixOf` s
199− then suspended s (B.drop (B.length t') s) t pos more lose succ
200− else lose t pos more [] "string"
201−{-# INLINE string_ #-}
202−
203−stringSuspended :: (ByteString -> ByteString)
204− -> ByteString -> ByteString -> Buffer -> Pos -> More
205− -> Failure r
206− -> Success ByteString r
207− -> Result r
208−stringSuspended f s0 s t pos more lose succ =
209− runParser (demandInput_ >>= go) t pos more lose succ
210− where go s'0 = T.Parser $ \t' pos' more' lose' succ' ->
211− let m = B.length s
212− s' = f s'0
213− n = B.length s'
214− in if n >= m
215− then if B.unsafeTake m s' == s
216− then let o = Pos (B.length s0)
217− in succ' t' (pos' + o) more'
218− (substring pos' o t')
219− else lose' t' pos' more' [] "string"
220− else if s' == B.unsafeTake n s
221− then stringSuspended f s0 (B.unsafeDrop n s)
222− t' pos' more' lose' succ'
223− else lose' t' pos' more' [] "string"
176+stringTransform :: (ByteString -> ByteString) -> ByteString
177+ -> Parser ByteString
178+stringTransform f s = takeWith (B.length s) ((==f s) . f)
179+{-# INLINE stringTransform #-}
224180
225181-- | Skip past input for as long as the predicate returns 'True'.
226182skipWhile :: (Word8 -> Bool) -> Parser ()
@@ -257,24 +213,15 @@ takeTill p = takeWhile (not . p)
257213-- parsers loop until a failure occurs. Careless use will thus result
258214-- in an infinite loop.
259215takeWhile :: (Word8 -> Bool) -> Parser ByteString
260−takeWhile p = do
261− s <- B8.takeWhile p <$> get
262− continue <- inputSpansChunks (B.length s)
263− if continue
264− then takeWhileAcc p [s]
265− else return s
266−{-# INLINE takeWhile #-}
267−
268−takeWhileAcc :: (Word8 -> Bool) -> [ByteString] -> Parser ByteString
269−takeWhileAcc p = go
216+takeWhile p = (B.concat . reverse) `fmap` go []
270217 where
271218 go acc = do
272219 s <- B8.takeWhile p <$> get
273220 continue <- inputSpansChunks (B.length s)
274221 if continue
275222 then go (s:acc)
276− else return $ concatReverse (s:acc)
277−{-# INLINE takeWhileAcc #-}
223+ else return (s:acc)
224+{-# INLINE takeWhile #-}
278225
279226takeRest :: Parser [ByteString]
280227takeRest = go []
@@ -338,13 +285,16 @@ scan_ f s0 p = go [] s0
338285-- parsers loop until a failure occurs. Careless use will thus result
339286-- in an infinite loop.
340287scan :: s -> (s -> Word8 -> Maybe s) -> Parser ByteString
341−scan = scan_ $ \_ chunks -> return $! concatReverse chunks
288+scan = scan_ $ \_ chunks ->
289+ case chunks of
290+ [x] -> return x
291+ xs -> return $! B.concat $ reverse xs
342292{-# INLINE scan #-}
343293
344294-- | Like 'scan', but generalized to return the final state of the
345295-- scanner.
346296runScanner :: s -> (s -> Word8 -> Maybe s) -> Parser (ByteString, s)
347−runScanner = scan_ $ \s xs -> let !sx = concatReverse xs in return (sx, s)
297+runScanner = scan_ $ \s xs -> return (B.concat (reverse xs), s)
348298{-# INLINE runScanner #-}
349299
350300-- | Consume input as long as the predicate returns 'True', and return
@@ -364,9 +314,8 @@ takeWhile1 p = do
364314 advance len
365315 eoc <- endOfChunk
366316 if eoc
367− then takeWhileAcc p [s]
317+ then (s<>) `fmap` takeWhile p
368318 else return s
369−{-# INLINE takeWhile1 #-}
370319
371320-- | Match any byte in a set.
372321--
@@ -467,10 +416,9 @@ parse m s = T.runParser m (buffer s) (Pos 0) Incomplete failK successK
467416-- @
468417parseOnly :: Parser a -> ByteString -> Either String a
469418parseOnly m s = case T.runParser m (buffer s) (Pos 0) Complete failK successK of
470− Fail _ [] err -> Left err
471− Fail _ ctxs err -> Left (intercalate " > " ctxs ++ ": " ++ err)
472− Done _ a -> Right a
473− _ -> error "parseOnly: impossible error!"
419+ Fail _ _ err -> Left err
420+ Done _ a -> Right a
421+ _ -> error "parseOnly: impossible error!"
474422{-# INLINE parseOnly #-}
475423
476424get :: Parser ByteString
@@ -517,6 +465,7 @@ ensure n = T.Parser $ \t pos more lose succ ->
517465 then succ t pos more (substring pos (Pos n) t)
518466 -- The uncommon case is kept out-of-line to reduce code size:
519467 else ensureSuspended n t pos more lose succ
468+-- Non-recursive so the bounds check can be inlined:
520469{-# INLINE ensure #-}
521470
522471-- | Return both the result of a parse and the portion of the input
Data/Attoparsec/ByteString/Lazy.hs+3−10
@@ -1,11 +1,6 @@
1−{-# LANGUAGE CPP #-}
2−#if __GLASGOW_HASKELL__ >= 702
3−{-# LANGUAGE Trustworthy #-} -- Imports internal modules
4−#endif
5−
61-- |
72-- Module : Data.Attoparsec.ByteString.Lazy
8−-- Copyright : Bryan O'Sullivan 2007-2015
3+-- Copyright : Bryan O'Sullivan 2007-2014
94-- License : BSD3
105--
116-- Maintainer : bos@serpentine.com
@@ -41,7 +36,6 @@ module Data.Attoparsec.ByteString.Lazy
4136
4237import Control.DeepSeq (NFData(rnf))
4338import Data.ByteString.Lazy.Internal (ByteString(..), chunk)
44−import Data.List (intercalate)
4539import qualified Data.ByteString as B
4640import qualified Data.Attoparsec.ByteString as A
4741import qualified Data.Attoparsec.Internal.Types as T
@@ -105,6 +99,5 @@ maybeResult _ = Nothing
10599
106100-- | Convert a 'Result' value to an 'Either' value.
107101eitherResult :: Result r -> Either String r
108−eitherResult (Done _ r) = Right r
109−eitherResult (Fail _ [] msg) = Left msg
110−eitherResult (Fail _ ctxs msg) = Left (intercalate " > " ctxs ++ ": " ++ msg)
102+eitherResult (Done _ r) = Right r
103+eitherResult (Fail _ _ msg) = Left msg
Data/Attoparsec/Char8.hs+1−1
@@ -1,6 +1,6 @@
11-- |
22-- Module : Data.Attoparsec.Char8
3−-- Copyright : Bryan O'Sullivan 2007-2015
3+-- Copyright : Bryan O'Sullivan 2007-2014
44-- License : BSD3
55--
66-- Maintainer : bos@serpentine.com
Data/Attoparsec/Combinator.hs+10−23
@@ -1,10 +1,7 @@
1−{-# LANGUAGE BangPatterns, CPP #-}
2−#if __GLASGOW_HASKELL__ >= 702
3−{-# LANGUAGE Trustworthy #-} -- Imports internal modules
4−#endif
1+{-# LANGUAGE BangPatterns #-}
52-- |
63-- Module : Data.Attoparsec.Combinator
7−-- Copyright : Daan Leijen 1999-2001, Bryan O'Sullivan 2007-2015
4+-- Copyright : Daan Leijen 1999-2001, Bryan O'Sullivan 2007-2014
85-- License : BSD3
96--
107-- Maintainer : bos@serpentine.com
@@ -36,18 +33,15 @@ module Data.Attoparsec.Combinator
3633 , satisfyElem
3734 , endOfInput
3835 , atEnd
39− , lookAhead
4036 ) where
4137
42−#if !MIN_VERSION_base(4,8,0)
43−import Control.Applicative (Applicative(..), (<$>))
44−import Data.Monoid (Monoid(mappend))
45−#endif
46−import Control.Applicative (Alternative(..), empty, liftA2, many, (<|>))
38+import Control.Applicative (Alternative(..), Applicative(..), empty, liftA2,
39+ many, (<|>), (*>), (<$>))
4740import Control.Monad (MonadPlus(..))
4841import Data.Attoparsec.Internal.Types (Parser(..), IResult(..))
4942import Data.Attoparsec.Internal (endOfInput, atEnd, satisfyElem)
5043import Data.ByteString (ByteString)
44+import Data.Monoid (Monoid(mappend))
5145import Data.Text (Text)
5246import qualified Data.Attoparsec.Zepto as Z
5347import Prelude hiding (succ)
@@ -132,7 +126,7 @@ many1' p = liftM2' (:) p (many' p)
132126-- | @sepBy p sep@ applies /zero/ or more occurrences of @p@, separated
133127-- by @sep@. Returns a list of the values returned by @p@.
134128--
135−-- > commaSep p = p `sepBy` (char ',')
129+-- > commaSep p = p `sepBy` (symbol ",")
136130sepBy :: Alternative f => f a -> f s -> f [a]
137131sepBy p s = liftA2 (:) p ((s *> sepBy1 p s) <|> pure []) <|> pure []
138132{-# SPECIALIZE sepBy :: Parser ByteString a -> Parser ByteString s
@@ -144,7 +138,7 @@ sepBy p s = liftA2 (:) p ((s *> sepBy1 p s) <|> pure []) <|> pure []
144138-- by @sep@. Returns a list of the values returned by @p@. The value
145139-- returned by @p@ is forced to WHNF.
146140--
147−-- > commaSep p = p `sepBy'` (char ',')
141+-- > commaSep p = p `sepBy'` (symbol ",")
148142sepBy' :: (MonadPlus m) => m a -> m s -> m [a]
149143sepBy' p s = scan `mplus` return []
150144 where scan = liftM2' (:) p ((s >> sepBy1' p s) `mplus` return [])
@@ -156,7 +150,7 @@ sepBy' p s = scan `mplus` return []
156150-- | @sepBy1 p sep@ applies /one/ or more occurrences of @p@, separated
157151-- by @sep@. Returns a list of the values returned by @p@.
158152--
159−-- > commaSep p = p `sepBy1` (char ',')
153+-- > commaSep p = p `sepBy1` (symbol ",")
160154sepBy1 :: Alternative f => f a -> f s -> f [a]
161155sepBy1 p s = scan
162156 where scan = liftA2 (:) p ((s *> scan) <|> pure [])
@@ -169,7 +163,7 @@ sepBy1 p s = scan
169163-- by @sep@. Returns a list of the values returned by @p@. The value
170164-- returned by @p@ is forced to WHNF.
171165--
172−-- > commaSep p = p `sepBy1'` (char ',')
166+-- > commaSep p = p `sepBy1'` (symbol ",")
173167sepBy1' :: (MonadPlus m) => m a -> m s -> m [a]
174168sepBy1' p s = scan
175169 where scan = liftM2' (:) p ((s >> scan) `mplus` return [])
@@ -242,14 +236,7 @@ eitherP a b = (Left <$> a) <|> (Right <$> b)
242236-- | If a parser has returned a 'T.Partial' result, supply it with more
243237-- input.
244238feed :: Monoid i => IResult i r -> i -> IResult i r
245−feed (Fail t ctxs msg) d = Fail (mappend t d) ctxs msg
239+feed f@(Fail _ _ _) _ = f
246240feed (Partial k) d = k d
247241feed (Done t r) d = Done (mappend t d) r
248242{-# INLINE feed #-}
249−
250−-- | Apply a parser without consuming any input.
251−lookAhead :: Parser i a -> Parser i a
252−lookAhead p = Parser $ \t pos more lose succ ->
253− let succ' t' _pos' more' = succ t' pos more'
254− in runParser p t pos more lose succ'
255−{-# INLINE lookAhead #-}
Data/Attoparsec/Internal.hs+5−31
@@ -1,7 +1,7 @@
1−{-# LANGUAGE BangPatterns, CPP, ScopedTypeVariables #-}
1+{-# LANGUAGE BangPatterns, ScopedTypeVariables #-}
22-- |
33-- Module : Data.Attoparsec.Internal
4−-- Copyright : Bryan O'Sullivan 2007-2015
4+-- Copyright : Bryan O'Sullivan 2007-2014
55-- License : BSD3
66--
77-- Maintainer : bos@serpentine.com
@@ -15,18 +15,13 @@ module Data.Attoparsec.Internal
1515 ( compareResults
1616 , prompt
1717 , demandInput
18− , demandInput_
1918 , wantInput
2019 , endOfInput
2120 , atEnd
2221 , satisfyElem
23− , concatReverse
2422 ) where
2523
26−#if !MIN_VERSION_base(4,8,0)
2724import Control.Applicative ((<$>))
28−import Data.Monoid (Monoid, mconcat)
29−#endif
3025import Data.Attoparsec.Internal.Types
3126import Data.ByteString (ByteString)
3227import Data.Text (Text)
@@ -45,8 +40,8 @@ compareResults (Done t0 r0) (Done t1 r1) =
4540compareResults (Partial _) (Partial _) = Nothing
4641compareResults _ _ = Just False
4742
48−-- | Ask for input. If we receive any, pass the augmented input to a
49−-- success continuation, otherwise to a failure continuation.
43+-- | Ask for input. If we receive any, pass it to a success
44+-- continuation, otherwise to a failure continuation.
5045prompt :: Chunk t
5146 => State t -> Pos -> More
5247 -> (State t -> Pos -> More -> IResult t r)
@@ -73,25 +68,12 @@ demandInput :: Chunk t => Parser t ()
7368demandInput = Parser $ \t pos more lose succ ->
7469 case more of
7570 Complete -> lose t pos more [] "not enough input"
76− _ -> let lose' _ pos' more' = lose t pos' more' [] "not enough input"
71+ _ -> let lose' t' pos' more' = lose t' pos' more' [] "not enough input"
7772 succ' t' pos' more' = succ t' pos' more' ()
7873 in prompt t pos more lose' succ'
7974{-# SPECIALIZE demandInput :: Parser ByteString () #-}
8075{-# SPECIALIZE demandInput :: Parser Text () #-}
8176
82−-- | Immediately demand more input via a 'Partial' continuation
83−-- result. Return the new input.
84−demandInput_ :: Chunk t => Parser t t
85−demandInput_ = Parser $ \t pos more lose succ ->
86− case more of
87− Complete -> lose t pos more [] "not enough input"
88− _ -> Partial $ \s ->
89− if nullChunk s
90− then lose t pos Complete [] "not enough input"
91− else succ (pappendChunk t s) pos more s
92−{-# SPECIALIZE demandInput_ :: Parser ByteString ByteString #-}
93−{-# SPECIALIZE demandInput_ :: Parser Text Text #-}
94−
9577-- | This parser always succeeds. It returns 'True' if any input is
9678-- available either immediately or on demand, and 'False' if the end
9779-- of all input has been reached.
@@ -161,11 +143,3 @@ satisfyElem p = Parser $ \t pos more lose succ ->
161143 | otherwise -> lose t pos more [] "satisfyElem"
162144 Nothing -> satisfySuspended p t pos more lose succ
163145{-# INLINE satisfyElem #-}
164−
165−-- | Concatenate a monoid after reversing its elements. Used to
166−-- glue together a series of textual chunks that have been accumulated
167−-- \"backwards\".
168−concatReverse :: Monoid m => [m] -> m
169−concatReverse [x] = x
170−concatReverse xs = mconcat (reverse xs)
171−{-# INLINE concatReverse #-}
Data/Attoparsec/Internal/Types.hs+32−48
@@ -1,8 +1,8 @@
1−{-# LANGUAGE CPP, BangPatterns, GeneralizedNewtypeDeriving, OverloadedStrings,
1+{-# LANGUAGE BangPatterns, GeneralizedNewtypeDeriving, OverloadedStrings,
22 Rank2Types, RecordWildCards, TypeFamilies #-}
33-- |
44-- Module : Data.Attoparsec.Internal.Types
5−-- Copyright : Bryan O'Sullivan 2007-2015
5+-- Copyright : Bryan O'Sullivan 2007-2014
66-- License : BSD3
77--
88-- Maintainer : bos@serpentine.com
@@ -25,21 +25,18 @@ module Data.Attoparsec.Internal.Types
2525 , Chunk(..)
2626 ) where
2727
28−import Control.Applicative as App (Applicative(..), (<$>))
29−import Control.Applicative (Alternative(..))
28+import Control.Applicative (Alternative(..), Applicative(..), (<$>))
3029import Control.DeepSeq (NFData(rnf))
3130import Control.Monad (MonadPlus(..))
32−import qualified Control.Monad.Fail as Fail (MonadFail(..))
33−import Data.Monoid as Mon (Monoid(..))
34−import Data.Semigroup (Semigroup(..))
3531import Data.Word (Word8)
3632import Data.ByteString (ByteString)
3733import qualified Data.ByteString as BS
3834import Data.ByteString.Internal (w2c)
35+import Data.Monoid (Monoid(..))
3936import Data.Text (Text)
4037import qualified Data.Text as Text
4138import Data.Text.Unsafe (Iter(..))
42−import Prelude hiding (succ)
39+import Prelude hiding (getChar, succ)
4340import qualified Data.Attoparsec.ByteString.Buffer as B
4441import qualified Data.Attoparsec.Text.Buffer as T
4542
@@ -70,13 +67,10 @@ data IResult i r =
7067 -- not yet been consumed (if any) when the parse succeeded.
7168
7269instance (Show i, Show r) => Show (IResult i r) where
73− showsPrec d ir = showParen (d > 10) $
74− case ir of
75− (Fail t stk msg) -> showString "Fail" . f t . f stk . f msg
76− (Partial _) -> showString "Partial _"
77− (Done t r) -> showString "Done" . f t . f r
78− where f :: Show a => a -> ShowS
79− f x = showChar ' ' . showsPrec 11 x
70+ show (Fail t stk msg) =
71+ unwords [ "Fail", show t, show stk, show msg]
72+ show (Partial _) = "Partial _"
73+ show (Done t r) = unwords ["Done", show t, show r]
8074
8175instance (NFData i, NFData r) => NFData (IResult i r) where
8276 rnf (Fail t stk msg) = rnf t `seq` rnf stk `seq` rnf msg
@@ -89,8 +83,8 @@ instance Functor (IResult i) where
8983 fmap f (Partial k) = Partial (fmap f . k)
9084 fmap f (Done t r) = Done t (f r)
9185
92−-- | The core parser type. This is parameterised over the type @i@
93−-- of string being processed.
86+-- | The core parser type. This is parameterised over the types @i@
87+-- of string being processed and @t@ of internal state representation.
9488--
9589-- This type is an instance of the following classes:
9690--
@@ -127,21 +121,17 @@ type Success i t a r = t -> Pos -> More -> a -> IResult i r
127121data More = Complete | Incomplete
128122 deriving (Eq, Show)
129123
130−instance Semigroup More where
131− c@Complete <> _ = c
132− _ <> m = m
133−
134−instance Mon.Monoid More where
135− mappend = (<>)
136− mempty = Incomplete
124+instance Monoid More where
125+ mappend c@Complete _ = c
126+ mappend _ m = m
127+ mempty = Incomplete
137128
138129instance Monad (Parser i) where
139−#if !(MIN_VERSION_base(4,13,0))
140− fail = Fail.fail
130+ fail err = Parser $ \t pos more lose _succ -> lose t pos more [] msg
131+ where msg = "Failed reading: " ++ err
141132 {-# INLINE fail #-}
142−#endif
143133
144− return = App.pure
134+ return v = Parser $ \t pos more _lose succ -> succ t pos more v
145135 {-# INLINE return #-}
146136
147137 m >>= k = Parser $ \t !pos more lose succ ->
@@ -149,15 +139,6 @@ instance Monad (Parser i) where
149139 in runParser m t pos more lose succ'
150140 {-# INLINE (>>=) #-}
151141
152− (>>) = (*>)
153− {-# INLINE (>>) #-}
154−
155−
156−instance Fail.MonadFail (Parser i) where
157− fail err = Parser $ \t pos more lose _succ -> lose t pos more [] msg
158− where msg = "Failed reading: " ++ err
159− {-# INLINE fail #-}
160−
161142plus :: Parser i a -> Parser i a -> Parser i a
162143plus f g = Parser $ \t pos more lose succ ->
163144 let lose' t' _pos' more' _ctx _msg = runParser g t' pos more' lose succ
@@ -182,23 +163,23 @@ apP d e = do
182163{-# INLINE apP #-}
183164
184165instance Applicative (Parser i) where
185− pure v = Parser $ \t !pos more _lose succ -> succ t pos more v
166+ pure = return
186167 {-# INLINE pure #-}
187168 (<*>) = apP
188169 {-# INLINE (<*>) #-}
189− m *> k = m >>= \_ -> k
170+
171+ -- These definitions are equal to the defaults, but this
172+ -- way the optimizer doesn't have to work so hard to figure
173+ -- that out.
174+ (*>) = (>>)
190175 {-# INLINE (*>) #-}
191− x <* y = x >>= \a -> y >> pure a
176+ x <* y = x >>= \a -> y >> return a
192177 {-# INLINE (<*) #-}
193178
194−instance Semigroup (Parser i a) where
195− (<>) = plus
196− {-# INLINE (<>) #-}
197−
198179instance Monoid (Parser i a) where
199180 mempty = fail "mempty"
200181 {-# INLINE mempty #-}
201− mappend = (<>)
182+ mappend = plus
202183 {-# INLINE mappend #-}
203184
204185instance Alternative (Parser i) where
@@ -209,9 +190,8 @@ instance Alternative (Parser i) where
209190 {-# INLINE (<|>) #-}
210191
211192 many v = many_v
212− where
213− many_v = some_v <|> pure []
214− some_v = (:) <$> v <*> many_v
193+ where many_v = some_v <|> pure []
194+ some_v = (:) <$> v <*> many_v
215195 {-# INLINE many #-}
216196
217197 some v = some_v
@@ -220,6 +200,10 @@ instance Alternative (Parser i) where
220200 some_v = (:) <$> v <*> many_v
221201 {-# INLINE some #-}
222202
203+(<>) :: (Monoid m) => m -> m -> m
204+(<>) = mappend
205+{-# INLINE (<>) #-}
206+
223207-- | A common interface for input chunks.
224208class Monoid c => Chunk c where
225209 type ChunkElem c
Data/Attoparsec/Lazy.hs+1−1
@@ -1,6 +1,6 @@
11-- |
22-- Module : Data.Attoparsec.Lazy
3−-- Copyright : Bryan O'Sullivan 2007-2015
3+-- Copyright : Bryan O'Sullivan 2007-2014
44-- License : BSD3
55--
66-- Maintainer : bos@serpentine.com
Data/Attoparsec/Number.hs+1−1
@@ -1,7 +1,7 @@
11{-# LANGUAGE DeriveDataTypeable #-}
22-- |
33-- Module : Data.Attoparsec.Number
4−-- Copyright : Bryan O'Sullivan 2007-2015
4+-- Copyright : Bryan O'Sullivan 2007-2014
55-- License : BSD3
66--
77-- Maintainer : bos@serpentine.com
Data/Attoparsec/Text.hs+7−17
@@ -1,12 +1,9 @@
1−{-# LANGUAGE BangPatterns, CPP, FlexibleInstances, TypeSynonymInstances #-}
2−#if __GLASGOW_HASKELL__ >= 702
3−{-# LANGUAGE Trustworthy #-} -- Imports internal modules
4−#endif
1+{-# LANGUAGE BangPatterns, FlexibleInstances, TypeSynonymInstances #-}
52{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
63
74-- |
85-- Module : Data.Attoparsec.Text
9−-- Copyright : Bryan O'Sullivan 2007-2015
6+-- Copyright : Bryan O'Sullivan 2007-2014
107-- License : BSD3
118--
129-- Maintainer : bos@serpentine.com
@@ -72,7 +69,6 @@ module Data.Attoparsec.Text
7269 , skipSpace
7370 , I.skipWhile
7471 , I.scan
75− , I.runScanner
7672 , I.take
7773 , I.takeWhile
7874 , I.takeWhile1
@@ -126,11 +122,7 @@ module Data.Attoparsec.Text
126122 , I.atEnd
127123 ) where
128124
129−#if !MIN_VERSION_base(4,8,0)
130−import Control.Applicative (pure, (*>), (<*), (<$>))
131−import Data.Word (Word)
132−#endif
133−import Control.Applicative ((<|>))
125+import Control.Applicative (pure, (<$>), (*>), (<*), (<|>))
134126import Data.Attoparsec.Combinator
135127import Data.Attoparsec.Number (Number(..))
136128import Data.Scientific (Scientific)
@@ -139,9 +131,8 @@ import Data.Attoparsec.Text.Internal (Parser, Result, parse, takeWhile1)
139131import Data.Bits (Bits, (.|.), shiftL)
140132import Data.Char (isAlpha, isDigit, isSpace, ord)
141133import Data.Int (Int8, Int16, Int32, Int64)
142−import Data.List (intercalate)
143134import Data.Text (Text)
144−import Data.Word (Word8, Word16, Word32, Word64)
135+import Data.Word (Word8, Word16, Word32, Word64, Word)
145136import qualified Data.Attoparsec.Internal as I
146137import qualified Data.Attoparsec.Internal.Types as T
147138import qualified Data.Attoparsec.Text.Internal as I
@@ -266,10 +257,9 @@ maybeResult _ = Nothing
266257-- | Convert a 'Result' value to an 'Either' value. A 'Partial' result
267258-- is treated as failure.
268259eitherResult :: Result r -> Either String r
269−eitherResult (T.Done _ r) = Right r
270−eitherResult (T.Fail _ [] msg) = Left msg
271−eitherResult (T.Fail _ ctxs msg) = Left (intercalate " > " ctxs ++ ": " ++ msg)
272−eitherResult _ = Left "Result: incomplete input"
260+eitherResult (T.Done _ r) = Right r
261+eitherResult (T.Fail _ _ msg) = Left msg
262+eitherResult _ = Left "Result: incomplete input"
273263
274264-- | A predicate that matches either a carriage return @\'\\r\'@ or
275265-- newline @\'\\n\'@ character.
Data/Attoparsec/Text/Buffer.hs+8−20
@@ -1,9 +1,9 @@
1−{-# LANGUAGE BangPatterns, CPP, MagicHash, RankNTypes, RecordWildCards,
1+{-# LANGUAGE BangPatterns, MagicHash, RankNTypes, RecordWildCards,
22 UnboxedTuples #-}
33
44-- |
55-- Module : Data.Attoparsec.Text.Buffer
6−-- Copyright : Bryan O'Sullivan 2007-2015
6+-- Copyright : Bryan O'Sullivan 2007-2014
77-- License : BSD3
88--
99-- Maintainer : bos@serpentine.com
@@ -28,7 +28,6 @@ module Data.Attoparsec.Text.Buffer
2828 Buffer
2929 , buffer
3030 , unbuffer
31− , unbufferAt
3231 , length
3332 , pappend
3433 , iter
@@ -40,8 +39,7 @@ module Data.Attoparsec.Text.Buffer
4039import Control.Exception (assert)
4140import Data.Bits (shiftR)
4241import Data.List (foldl1')
43−import Data.Monoid as Mon (Monoid(..))
44−import Data.Semigroup (Semigroup(..))
42+import Data.Monoid (Monoid(..))
4543import Data.Text ()
4644import Data.Text.Internal (Text(..))
4745import Data.Text.Internal.Encoding.Utf16 (chr2)
@@ -74,25 +72,15 @@ buffer (Text arr off len) = Buf arr off len len 0
7472unbuffer :: Buffer -> Text
7573unbuffer (Buf arr off len _ _) = Text arr off len
7674
77−unbufferAt :: Int -> Buffer -> Text
78−unbufferAt s (Buf arr off len _ _) =
79− assert (s >= 0 && s <= len) $
80− Text arr (off+s) (len-s)
81−
82−instance Semigroup Buffer where
83− (Buf _ _ _ 0 _) <> b = b
84− a <> (Buf _ _ _ 0 _) = a
85− buf <> (Buf arr off len _ _) = append buf arr off len
86− {-# INLINE (<>) #-}
87−
8875instance Monoid Buffer where
8976 mempty = Buf A.empty 0 0 0 0
90− {-# INLINE mempty #-}
9177
92− mappend = (<>)
78+ mappend (Buf _ _ _ 0 _) b = b
79+ mappend a (Buf _ _ _ 0 _) = a
80+ mappend buf (Buf arr off len _ _) = append buf arr off len
9381
94− mconcat [] = Mon.mempty
95− mconcat xs = foldl1' (<>) xs
82+ mconcat [] = mempty
83+ mconcat xs = foldl1' mappend xs
9684
9785pappend :: Buffer -> Text -> Buffer
9886pappend (Buf _ _ _ 0 _) t = buffer t
Data/Attoparsec/Text/FastSet.hs+60−80
@@ -1,20 +1,17 @@
1−{-# LANGUAGE BangPatterns #-}
2−
3−------------------------------------------------------------------------------
1+-----------------------------------------------------------------------------
42-- |
53-- Module : Data.Attoparsec.FastSet
6−-- Copyright : Felipe Lessa 2010, Bryan O'Sullivan 2007-2015
4+-- Copyright : Felipe Lessa 2010, Bryan O'Sullivan 2007-2014
75-- License : BSD3
86--
97-- Maintainer : felipe.lessa@gmail.com
108-- Stability : experimental
119-- Portability : unknown
1210--
13−-- Fast set membership tests for 'Char' values. We test for
11+-- Fast set membership tests for 'Char' values. The set
12+-- representation is unboxed for efficiency. We test for
1413-- membership using a hashtable implemented with Robin Hood
15−-- collision resolution. The set representation is unboxed,
16−-- and the characters and hashes interleaved, for efficiency.
17−--
14+-- collision resolution.
1815--
1916-----------------------------------------------------------------------------
2017module Data.Attoparsec.Text.FastSet
@@ -30,92 +27,75 @@ module Data.Attoparsec.Text.FastSet
3027 , charClass
3128 ) where
3229
33−import Data.Bits ((.|.), (.&.), shiftR)
30+import Data.Bits
31+import Data.List (sortBy)
3432import Data.Function (on)
35−import Data.List (sort, sortBy)
3633import qualified Data.Array.Base as AB
3734import qualified Data.Array.Unboxed as A
3835import qualified Data.Text as T
3936
40−data FastSet = FastSet {
41− table :: {-# UNPACK #-} !(A.UArray Int Int)
42− , mask :: {-# UNPACK #-} !Int
43− }
44−
45−data Entry = Entry {
46− key :: {-# UNPACK #-} !Char
47− , initialIndex :: {-# UNPACK #-} !Int
48− , index :: {-# UNPACK #-} !Int
49− }
50−
51−offset :: Entry -> Int
52−offset e = index e - initialIndex e
53−
37+data FastSet = FastSet {keys :: !(A.UArray Int Char),
38+ initialOffsets :: !(A.UArray Int Int),
39+ mask :: {-# UNPACK #-} !Int}
40+ deriving (Eq, Ord, Show)
41+
42+data Entry = Entry {key :: {-# UNPACK #-} !Char,
43+ initialOffset :: {-# UNPACK #-} !Int,
44+ offset :: {-# UNPACK #-} !Int} deriving (Show)
45+
46+probe :: Entry -> Int
47+probe e = offset e - initialOffset e
48+
5449resolveCollisions :: [Entry] -> [Entry]
5550resolveCollisions [] = []
56−resolveCollisions [e] = [e]
57−resolveCollisions (a:b:entries) = a' : resolveCollisions (b' : entries)
58− where (a', b')
59− | index a < index b = (a, b)
60− | offset a < offset b = (b { index=index a }, a { index=index a + 1 })
61− | otherwise = (a, b { index=index a + 1 })
62−
63−pad :: Int -> [Entry] -> [Entry]
51+resolveCollisions [x] = [x]
52+resolveCollisions (a:b:ys)
53+ | key a == key b = resolveCollisions (a:ys)
54+ | otherwise = a' : resolveCollisions (b':ys)
55+ where (a', b')
56+ | offset a < offset b = (a, b)
57+ | probe a < probe b = (b{offset=offset a}, a{offset=offset a + 1})
58+ | otherwise = (a, b{offset=offset a + 1})
59+
60+pad :: [Entry]-> [Entry]
6461pad = go 0
65− where -- ensure that we pad enough so that lookups beyond the
66− -- last hash in the table fall within the array
67− go !_ !m [] = replicate (max 1 m + 1) empty
68− go k m (e:entries) = map (const empty) [k..i - 1] ++ e :
69− go (i + 1) (m + i - k - 1) entries
70− where i = index e
71− empty = Entry '\0' maxBound 0
72−
62+ where go _ [] = [empty]
63+ go k (p:ps) = map (const empty) [k..o - 1] ++ p : go (o + 1) ps
64+ where o = offset p
65+ empty = Entry '\0' maxBound 0
66+
7367nextPowerOf2 :: Int -> Int
74−nextPowerOf2 0 = 1
75−nextPowerOf2 x = go (x - 1) 1
76− where go y 32 = y + 1
77− go y k = go (y .|. (y `shiftR` k)) $ k * 2
78−
79−fastHash :: Char -> Int
80−fastHash = fromEnum
68+nextPowerOf2 x = go (x - 1) 1
69+ where go y 32 = y + 1
70+ go y k = go (y .|. (y `shiftR` k)) $ k * 2
8171
8272fromList :: String -> FastSet
83−fromList s = FastSet (AB.listArray (0, length interleaved - 1) interleaved)
84− mask'
85− where s' = ordNub (sort s)
86− l = length s'
87− mask' = nextPowerOf2 ((5 * l) `div` 4) - 1
88− entries = pad mask' .
89− resolveCollisions .
90− sortBy (compare `on` initialIndex) .
91− zipWith (\c i -> Entry c i i) s' .
92− map ((.&. mask') . fastHash) $ s'
93− interleaved = concatMap (\e -> [fromEnum $ key e, initialIndex e])
94− entries
95−
96−ordNub :: Eq a => [a] -> [a]
97−ordNub [] = []
98−ordNub (y:ys) = go y ys
99− where go x (z:zs)
100− | x == z = go x zs
101− | otherwise = x : go z zs
102− go x [] = [x]
103−
73+fromList s = FastSet (arr key) (arr initialOffset) mask'
74+ where l = length s
75+ mask' = nextPowerOf2 ((5 * l) `div` 4) - 1
76+ offsets = map (\c -> fromEnum c .&. mask') s
77+ entries = pad . resolveCollisions $ sortBy (compare `on` initialOffset) $ zipWith (\c o -> Entry c o o) s offsets
78+ arr :: A.IArray a e => (Entry -> e) -> a Int e
79+ arr f = AB.listArray (0, length entries - 1) $ map f entries
80+
10481set :: T.Text -> FastSet
10582set = fromList . T.unpack
106−
83+
10784-- | Check the set for membership.
10885member :: Char -> FastSet -> Bool
109−member c a = go (2 * i)
110− where i = fastHash c .&. mask a
111− lookupAt j b = (i' <= i) && (c == c' || b)
112− where c' = toEnum $ AB.unsafeAt (table a) j
113− i' = AB.unsafeAt (table a) $ j + 1
114− go j = lookupAt j . lookupAt (j + 2) . lookupAt (j + 4) .
115− lookupAt (j + 6) . go $ j + 8
116−
86+member c a = go 0
87+ where i = fromEnum c .&. mask a
88+ go :: Int -> Bool
89+ go p
90+ | p > p' || p' == maxBound = False
91+ | p' == p && c' == c = True
92+ | otherwise = go (p + 1)
93+ where j = i + p
94+ p' = j - AB.unsafeAt (initialOffsets a) j
95+ c' = AB.unsafeAt (keys a) j
96+
11797charClass :: String -> FastSet
11898charClass = fromList . go
119− where go (a:'-':b:xs) = [a..b] ++ go xs
120− go (x:xs) = x : go xs
121− go _ = ""
99+ where go (a:'-':b:xs) = [a..b] ++ go xs
100+ go (x:xs) = x : go xs
101+ go _ = ""
Data/Attoparsec/Text/Internal.hs+45−87
@@ -3,7 +3,7 @@
33{-# OPTIONS_GHC -fno-warn-orphans #-}
44-- |
55-- Module : Data.Attoparsec.Text.Internal
6−-- Copyright : Bryan O'Sullivan 2007-2015
6+-- Copyright : Bryan O'Sullivan 2007-2014
77-- License : BSD3
88--
99-- Maintainer : bos@serpentine.com
@@ -65,18 +65,17 @@ module Data.Attoparsec.Text.Internal
6565 , atEnd
6666 ) where
6767
68−import Control.Applicative ((<|>), (<$>), pure, (*>))
68+import Control.Applicative ((<|>), (<$>))
6969import Control.Monad (when)
7070import Data.Attoparsec.Combinator ((<?>))
7171import Data.Attoparsec.Internal
7272import Data.Attoparsec.Internal.Types hiding (Parser, Failure, Success)
7373import qualified Data.Attoparsec.Text.Buffer as Buf
7474import Data.Attoparsec.Text.Buffer (Buffer, buffer)
75−import Data.Char (isAsciiUpper, isAsciiLower, toUpper, toLower)
76−import Data.List (intercalate)
75+import Data.Char (chr, ord)
7776import Data.String (IsString(..))
7877import Data.Text.Internal (Text(..))
79−import Prelude hiding (getChar, succ, take, takeWhile)
78+import Prelude hiding (getChar, length, succ, take, takeWhile)
8079import qualified Data.Attoparsec.Internal.Types as T
8180import qualified Data.Attoparsec.Text.FastSet as Set
8281import qualified Data.Text as T
@@ -160,46 +159,9 @@ take n = takeWith (max n 0) (const True)
160159-- before failing. In attoparsec, the above parser will /succeed/ on
161160-- that input, because the failed first branch will consume nothing.
162161string :: Text -> Parser Text
163−string s = string_ (stringSuspended id) id s
162+string s = takeWith (T.length s) (==s)
164163{-# INLINE string #-}
165164
166−string_ :: (forall r. Text -> Text -> Buffer -> Pos -> More
167− -> Failure r -> Success Text r -> Result r)
168− -> (Text -> Text)
169− -> Text -> Parser Text
170−string_ suspended f s0 = T.Parser $ \t pos more lose succ ->
171− let s = f s0
172− ft = f (Buf.unbufferAt (fromPos pos) t)
173− in case T.commonPrefixes s ft of
174− Nothing
175− | T.null s -> succ t pos more T.empty
176− | T.null ft -> suspended s s t pos more lose succ
177− | otherwise -> lose t pos more [] "string"
178− Just (pfx,ssfx,tsfx)
179− | T.null ssfx -> let l = Pos (T.lengthWord16 pfx)
180− in succ t (pos + l) more (substring pos l t)
181− | not (T.null tsfx) -> lose t pos more [] "string"
182− | otherwise -> suspended s ssfx t pos more lose succ
183−{-# INLINE string_ #-}
184−
185−stringSuspended :: (Text -> Text)
186− -> Text -> Text -> Buffer -> Pos -> More
187− -> Failure r
188− -> Success Text r
189− -> Result r
190−stringSuspended f s000 s0 t0 pos0 more0 lose0 succ0 =
191− runParser (demandInput_ >>= go) t0 pos0 more0 lose0 succ0
192− where
193− go s' = T.Parser $ \t pos more lose succ ->
194− let s = f s'
195− in case T.commonPrefixes s0 s of
196− Nothing -> lose t pos more [] "string"
197− Just (_pfx,ssfx,tsfx)
198− | T.null ssfx -> let l = Pos (T.lengthWord16 s000)
199− in succ t (pos + l) more (substring pos l t)
200− | T.null tsfx -> stringSuspended f s000 ssfx t pos more lose succ
201− | otherwise -> lose t pos more [] "string"
202−
203165-- | Satisfy a literal string, ignoring case.
204166--
205167-- Note: this function is currently quite inefficient. Unicode case
@@ -222,23 +184,30 @@ stringCI s = go 0
222184
223185-- | Satisfy a literal string, ignoring case for characters in the ASCII range.
224186asciiCI :: Text -> Parser Text
225−asciiCI s = fmap fst $ match $ T.foldr ((*>) . asciiCharCI) (pure ()) s
187+asciiCI input = do
188+ (k,t) <- ensure n
189+ if asciiToLower t == s
190+ then advance k >> return t
191+ else fail "asciiCI"
192+ where
193+ n = T.length input
194+ s = asciiToLower input
195+
196+ -- convert letters in the ASCII range to lower-case
197+ asciiToLower = T.map f
198+ where
199+ offset = ord 'a' - ord 'A'
200+ f c | 'A' <= c && c <= 'Z' = chr (ord c + offset)
201+ | otherwise = c
226202{-# INLINE asciiCI #-}
227203
228−asciiCharCI :: Char -> Parser Char
229−asciiCharCI c
230− | isAsciiUpper c = char c <|> char (toLower c)
231− | isAsciiLower c = char c <|> char (toUpper c)
232− | otherwise = char c
233−{-# INLINE asciiCharCI #-}
234−
235204-- | Skip past input for as long as the predicate returns 'True'.
236205skipWhile :: (Char -> Bool) -> Parser ()
237206skipWhile p = go
238207 where
239208 go = do
240209 t <- T.takeWhile p <$> get
241− continue <- inputSpansChunks (size t)
210+ continue <- inputSpansChunks (length t)
242211 when continue go
243212{-# INLINE skipWhile #-}
244213
@@ -267,25 +236,14 @@ takeTill p = takeWhile (not . p)
267236-- parsers loop until a failure occurs. Careless use will thus result
268237-- in an infinite loop.
269238takeWhile :: (Char -> Bool) -> Parser Text
270−takeWhile p = do
271− h <- T.takeWhile p <$> get
272− continue <- inputSpansChunks (size h)
273− -- only use slow concat path if necessary
274− if continue
275− then takeWhileAcc p [h]
276− else return h
277−{-# INLINE takeWhile #-}
278−
279−takeWhileAcc :: (Char -> Bool) -> [Text] -> Parser Text
280−takeWhileAcc p = go
239+takeWhile p = (T.concat . reverse) `fmap` go []
281240 where
282241 go acc = do
283242 h <- T.takeWhile p <$> get
284− continue <- inputSpansChunks (size h)
243+ continue <- inputSpansChunks (length h)
285244 if continue
286245 then go (h:acc)
287− else return $ concatReverse (h:acc)
288−{-# INLINE takeWhileAcc #-}
246+ else return (h:acc)
289247
290248takeRest :: Parser [Text]
291249takeRest = go []
@@ -295,7 +253,7 @@ takeRest = go []
295253 if input
296254 then do
297255 s <- get
298− advance (size s)
256+ advance (length s)
299257 go (s:acc)
300258 else return (reverse acc)
301259
@@ -308,7 +266,7 @@ takeLazyText :: Parser L.Text
308266takeLazyText = L.fromChunks `fmap` takeRest
309267
310268data Scan s = Continue s
311− | Finished s {-# UNPACK #-} !Int Text
269+ | Finished {-# UNPACK #-} !Int Text
312270
313271scan_ :: (s -> [Text] -> Parser r) -> s -> (s -> Char -> Maybe s) -> Parser r
314272scan_ f s0 p = go [] s0
@@ -317,17 +275,17 @@ scan_ f s0 p = go [] s0
317275 case T.uncons t of
318276 Just (c,t') -> case p s c of
319277 Just s' -> scanner s' (n+1) t'
320− Nothing -> Finished s n t
278+ Nothing -> Finished n t
321279 Nothing -> Continue s
322280 go acc s = do
323281 input <- get
324282 case scanner s 0 input of
325− Continue s' -> do continue <- inputSpansChunks (size input)
283+ Continue s' -> do continue <- inputSpansChunks (length input)
326284 if continue
327285 then go (input : acc) s'
328286 else f s' (input : acc)
329− Finished s' n t -> do advance (size input - size t)
330− f s' (T.take n input : acc)
287+ Finished n t -> do advance (length input - length t)
288+ f s (T.take n input : acc)
331289{-# INLINE scan_ #-}
332290
333291-- | A stateful scanner. The predicate consumes and transforms a
@@ -343,13 +301,16 @@ scan_ f s0 p = go [] s0
343301-- parsers loop until a failure occurs. Careless use will thus result
344302-- in an infinite loop.
345303scan :: s -> (s -> Char -> Maybe s) -> Parser Text
346−scan = scan_ $ \_ chunks -> return $! concatReverse chunks
304+scan = scan_ $ \_ chunks ->
305+ case chunks of
306+ [x] -> return x
307+ xs -> return . T.concat . reverse $ xs
347308{-# INLINE scan #-}
348309
349310-- | Like 'scan', but generalized to return the final state of the
350311-- scanner.
351312runScanner :: s -> (s -> Char -> Maybe s) -> Parser (Text, s)
352−runScanner = scan_ $ \s xs -> let !sx = concatReverse xs in return (sx, s)
313+runScanner = scan_ $ \s xs -> return (T.concat (reverse xs), s)
353314{-# INLINE runScanner #-}
354315
355316-- | Consume input as long as the predicate returns 'True', and return
@@ -362,14 +323,13 @@ takeWhile1 :: (Char -> Bool) -> Parser Text
362323takeWhile1 p = do
363324 (`when` demandInput) =<< endOfChunk
364325 h <- T.takeWhile p <$> get
365− let size' = size h
366− when (size' == 0) $ fail "takeWhile1"
367− advance size'
326+ let len = length h
327+ when (len == 0) $ fail "takeWhile1"
328+ advance len
368329 eoc <- endOfChunk
369330 if eoc
370− then takeWhileAcc p [h]
331+ then (h<>) `fmap` takeWhile p
371332 else return h
372−{-# INLINE takeWhile1 #-}
373333
374334-- | Match any character in a set.
375335--
@@ -469,10 +429,9 @@ parse m s = runParser m (buffer s) 0 Incomplete failK successK
469429-- @
470430parseOnly :: Parser a -> Text -> Either String a
471431parseOnly m s = case runParser m (buffer s) 0 Complete failK successK of
472− Fail _ [] err -> Left err
473− Fail _ ctxs err -> Left (intercalate " > " ctxs ++ ": " ++ err)
474− Done _ a -> Right a
475− _ -> error "parseOnly: impossible error!"
432+ Fail _ _ err -> Left err
433+ Done _ a -> Right a
434+ _ -> error "parseOnly: impossible error!"
476435{-# INLINE parseOnly #-}
477436
478437get :: Parser Text
@@ -517,6 +476,7 @@ ensure n = T.Parser $ \t pos more lose succ ->
517476 Just n' -> succ t pos more (n', substring pos n' t)
518477 -- The uncommon case is kept out-of-line to reduce code size:
519478 Nothing -> ensureSuspended n t pos more lose succ
479+-- Non-recursive so the bounds check can be inlined:
520480{-# INLINE ensure #-}
521481
522482-- | Return both the result of a parse and the portion of the input
@@ -527,8 +487,6 @@ match p = T.Parser $ \t pos more lose succ ->
527487 (substring pos (pos'-pos) t', a)
528488 in runParser p t pos more lose succ'
529489
530−-- | Ensure that at least @n@ code points of input are available.
531−-- Returns the number of words consumed while traversing.
532490lengthAtLeast :: Pos -> Int -> Buffer -> Maybe Pos
533491lengthAtLeast pos n t = go 0 (fromPos pos)
534492 where go i !p
@@ -545,5 +503,5 @@ substring (Pos pos) (Pos n) = Buf.substring pos n
545503lengthOf :: Buffer -> Pos
546504lengthOf = Pos . Buf.length
547505
548−size :: Text -> Pos
549−size (Text _ _ l) = Pos l
506+length :: Text -> Pos
507+length = Pos . T.length
Data/Attoparsec/Text/Lazy.hs+10−13
@@ -1,12 +1,7 @@
1−{-# LANGUAGE CPP #-}
2−#if __GLASGOW_HASKELL__ >= 702
3−{-# LANGUAGE Trustworthy #-} -- Imports internal modules
4−#endif
5−
61{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
72-- |
83-- Module : Data.Attoparsec.Text.Lazy
9−-- Copyright : Bryan O'Sullivan 2007-2015
4+-- Copyright : Bryan O'Sullivan 2007-2014
105-- License : BSD3
116--
127-- Maintainer : bos@serpentine.com
@@ -41,7 +36,6 @@ module Data.Attoparsec.Text.Lazy
4136 ) where
4237
4338import Control.DeepSeq (NFData(rnf))
44−import Data.List (intercalate)
4539import Data.Text.Lazy.Internal (Text(..), chunk)
4640import qualified Data.Attoparsec.Internal.Types as T
4741import qualified Data.Attoparsec.Text as A
@@ -51,16 +45,20 @@ import Data.Attoparsec.Text hiding (IResult(..), Result, eitherResult,
5145
5246-- | The result of a parse.
5347data Result r = Fail Text [String] String
54− -- ^ The parse failed. The 'Text' is the input
48+ -- ^ The parse failed. The 'ByteString' is the input
5549 -- that had not yet been consumed when the failure
5650 -- occurred. The @[@'String'@]@ is a list of contexts
5751 -- in which the error occurred. The 'String' is the
5852 -- message describing the error, if any.
5953 | Done Text r
60− -- ^ The parse succeeded. The 'Text' is the
54+ -- ^ The parse succeeded. The 'ByteString' is the
6155 -- input that had not yet been consumed (if any) when
6256 -- the parse succeeded.
63− deriving (Show)
57+
58+instance Show r => Show (Result r) where
59+ show (Fail bs stk msg) =
60+ "Fail " ++ show bs ++ " " ++ show stk ++ " " ++ show msg
61+ show (Done bs r) = "Done " ++ show bs ++ " " ++ show r
6462
6563instance NFData r => NFData (Result r) where
6664 rnf (Fail bs ctxs msg) = rnf bs `seq` rnf ctxs `seq` rnf msg
@@ -96,6 +94,5 @@ maybeResult _ = Nothing
9694
9795-- | Convert a 'Result' value to an 'Either' value.
9896eitherResult :: Result r -> Either String r
99−eitherResult (Done _ r) = Right r
100−eitherResult (Fail _ [] msg) = Left msg
101−eitherResult (Fail _ ctxs msg) = Left (intercalate " > " ctxs ++ ": " ++ msg)
97+eitherResult (Done _ r) = Right r
98+eitherResult (Fail _ _ msg) = Left msg
Data/Attoparsec/Types.hs+1−1
@@ -1,6 +1,6 @@
11-- |
22-- Module : Data.Attoparsec.Types
3−-- Copyright : Bryan O'Sullivan 2007-2015
3+-- Copyright : Bryan O'Sullivan 2007-2014
44-- License : BSD3
55--
66-- Maintainer : bos@serpentine.com
Data/Attoparsec/Zepto.hs+44−86
@@ -1,12 +1,8 @@
1−{-# LANGUAGE CPP #-}
2−#if __GLASGOW_HASKELL__ >= 702
3−{-# LANGUAGE Trustworthy #-} -- Data.ByteString.Unsafe
4−#endif
5−{-# LANGUAGE BangPatterns #-}
1+{-# LANGUAGE BangPatterns, MagicHash, UnboxedTuples #-}
62
73-- |
84-- Module : Data.Attoparsec.Zepto
9−-- Copyright : Bryan O'Sullivan 2007-2015
5+-- Copyright : Bryan O'Sullivan 2007-2014
106-- License : BSD3
117--
128-- Maintainer : bos@serpentine.com
@@ -27,139 +23,101 @@
2723module Data.Attoparsec.Zepto
2824 (
2925 Parser
30− , ZeptoT
3126 , parse
32− , parseT
3327 , atEnd
3428 , string
3529 , take
3630 , takeWhile
3731 ) where
3832
39−import Control.Applicative
40−import Control.Monad (MonadPlus(..), ap)
41−import qualified Control.Monad.Fail as Fail
42−import Control.Monad.IO.Class (MonadIO(..))
43−import Data.ByteString (ByteString)
44−import Data.Functor.Identity (Identity(runIdentity))
45−import Data.Monoid as Mon (Monoid(..))
46−import Data.Semigroup (Semigroup(..))
4733import Data.Word (Word8)
48−import Prelude hiding (take, takeWhile)
34+import Control.Applicative
35+import Control.Monad
36+import Data.Monoid
4937import qualified Data.ByteString as B
5038import qualified Data.ByteString.Unsafe as B
39+import Data.ByteString (ByteString)
40+import Prelude hiding (take, takeWhile)
5141
5242newtype S = S {
5343 input :: ByteString
5444 }
5545
5646data Result a = Fail String
57− | OK !a S
47+ | OK !a
5848
5949-- | A simple parser.
6050--
6151-- This monad is strict in its state, and the monadic bind operator
6252-- ('>>=') evaluates each result to weak head normal form before
6353-- passing it along.
64−newtype ZeptoT m a = Parser {
65− runParser :: S -> m (Result a)
54+newtype Parser a = Parser {
55+ runParser :: S -> (# Result a, S #)
6656 }
6757
68−type Parser a = ZeptoT Identity a
69−
70−instance Monad m => Functor (ZeptoT m) where
71− fmap f m = Parser $ \s -> do
72− result <- runParser m s
73− case result of
74− OK a s' -> return (OK (f a) s')
75− Fail err -> return (Fail err)
58+instance Functor Parser where
59+ fmap f m = Parser $ \s -> case runParser m s of
60+ (# OK a, s' #) -> (# OK (f a), s' #)
61+ (# Fail err, s' #) -> (# Fail err, s' #)
7662 {-# INLINE fmap #-}
7763
78−instance MonadIO m => MonadIO (ZeptoT m) where
79− liftIO act = Parser $ \s -> do
80− result <- liftIO act
81− return (OK result s)
82− {-# INLINE liftIO #-}
83−
84−instance Monad m => Monad (ZeptoT m) where
85− return = pure
64+instance Monad Parser where
65+ return a = Parser $ \s -> (# OK a, s #)
8666 {-# INLINE return #-}
8767
88− m >>= k = Parser $ \s -> do
89− result <- runParser m s
90− case result of
91− OK a s' -> runParser (k a) s'
92− Fail err -> return (Fail err)
68+ m >>= k = Parser $ \s -> case runParser m s of
69+ (# OK a, s' #) -> runParser (k a) s'
70+ (# Fail err, s' #) -> (# Fail err, s' #)
9371 {-# INLINE (>>=) #-}
9472
95−#if !(MIN_VERSION_base(4,13,0))
96− fail = Fail.fail
97− {-# INLINE fail #-}
98−#endif
73+ fail msg = Parser $ \s -> (# Fail msg, s #)
9974
100−instance Monad m => Fail.MonadFail (ZeptoT m) where
101− fail msg = Parser $ \_ -> return (Fail msg)
102− {-# INLINE fail #-}
103−
104−instance Monad m => MonadPlus (ZeptoT m) where
75+instance MonadPlus Parser where
10576 mzero = fail "mzero"
10677 {-# INLINE mzero #-}
10778
108− mplus a b = Parser $ \s -> do
109− result <- runParser a s
110− case result of
111− ok@(OK _ _) -> return ok
112− _ -> runParser b s
79+ mplus a b = Parser $ \s ->
80+ case runParser a s of
81+ (# ok@(OK _), s' #) -> (# ok, s' #)
82+ (# _, _ #) -> case runParser b s of
83+ (# ok@(OK _), s'' #) -> (# ok, s'' #)
84+ (# err, s'' #) -> (# err, s'' #)
11385 {-# INLINE mplus #-}
11486
115−instance (Monad m) => Applicative (ZeptoT m) where
116− pure a = Parser $ \s -> return (OK a s)
87+instance Applicative Parser where
88+ pure = return
11789 {-# INLINE pure #-}
11890 (<*>) = ap
11991 {-# INLINE (<*>) #-}
12092
121−gets :: Monad m => (S -> a) -> ZeptoT m a
122−gets f = Parser $ \s -> return (OK (f s) s)
93+gets :: (S -> a) -> Parser a
94+gets f = Parser $ \s -> (# OK (f s), s #)
12395{-# INLINE gets #-}
12496
125−put :: Monad m => S -> ZeptoT m ()
126−put s = Parser $ \_ -> return (OK () s)
97+put :: S -> Parser ()
98+put s = Parser $ \_ -> (# OK (), s #)
12799{-# INLINE put #-}
128100
129101-- | Run a parser.
130102parse :: Parser a -> ByteString -> Either String a
131−parse p bs = case runIdentity (runParser p (S bs)) of
132− (OK a _) -> Right a
133− (Fail err) -> Left err
134−{-# INLINE parse #-}
135−
136−-- | Run a parser on top of the given base monad.
137−parseT :: Monad m => ZeptoT m a -> ByteString -> m (Either String a)
138−parseT p bs = do
139− result <- runParser p (S bs)
140− case result of
141− OK a _ -> return (Right a)
142− Fail err -> return (Left err)
143−{-# INLINE parseT #-}
144−
145−instance Monad m => Semigroup (ZeptoT m a) where
146− (<>) = mplus
147− {-# INLINE (<>) #-}
148−
149−instance Monad m => Mon.Monoid (ZeptoT m a) where
103+parse p bs = case runParser p (S bs) of
104+ (# OK a, _ #) -> Right a
105+ (# Fail err, _ #) -> Left err
106+
107+instance Monoid (Parser a) where
150108 mempty = fail "mempty"
151109 {-# INLINE mempty #-}
152− mappend = (<>)
110+ mappend = mplus
153111 {-# INLINE mappend #-}
154112
155−instance Monad m => Alternative (ZeptoT m) where
113+instance Alternative Parser where
156114 empty = fail "empty"
157115 {-# INLINE empty #-}
158116 (<|>) = mplus
159117 {-# INLINE (<|>) #-}
160118
161119-- | Consume input while the predicate returns 'True'.
162−takeWhile :: Monad m => (Word8 -> Bool) -> ZeptoT m ByteString
120+takeWhile :: (Word8 -> Bool) -> Parser ByteString
163121takeWhile p = do
164122 (h,t) <- gets (B.span p . input)
165123 put (S t)
@@ -167,7 +125,7 @@ takeWhile p = do
167125{-# INLINE takeWhile #-}
168126
169127-- | Consume @n@ bytes of input.
170−take :: Monad m => Int -> ZeptoT m ByteString
128+take :: Int -> Parser ByteString
171129take !n = do
172130 s <- gets input
173131 if B.length s >= n
@@ -176,7 +134,7 @@ take !n = do
176134{-# INLINE take #-}
177135
178136-- | Match a string exactly.
179−string :: Monad m => ByteString -> ZeptoT m ()
137+string :: ByteString -> Parser ()
180138string s = do
181139 i <- gets input
182140 if s `B.isPrefixOf` i
@@ -185,7 +143,7 @@ string s = do
185143{-# INLINE string #-}
186144
187145-- | Indicate whether the end of the input has been reached.
188−atEnd :: Monad m => ZeptoT m Bool
146+atEnd :: Parser Bool
189147atEnd = do
190148 i <- gets input
191149 return $! B.null i
README.markdown+6
@@ -16,6 +16,12 @@ Master [git repository](https://github.com/bos/attoparsec):
1616
1717* `git clone git://github.com/bos/attoparsec.git`
1818
19+There's also a [Mercurial mirror](https://bitbucket.org/bos/attoparsec):
20+
21+* `hg clone https://bitbucket.org/bos/attoparsec`
22+
23+(You can create and contribute changes using either Mercurial or git.)
24+
1925Authors
2026-------
2127
attoparsec.cabal+15−60
@@ -1,13 +1,12 @@
11name: attoparsec
2−version: 0.13.2.2
3−x-revision: 3
2+version: 0.12.1.2
43license: BSD3
54license-file: LICENSE
65category: Text, Parsing
76author: Bryan O'Sullivan <bos@serpentine.com>
8−maintainer: Bryan O'Sullivan <bos@serpentine.com>, Ben Gamari <ben@smart-cactus.org>
7+maintainer: Bryan O'Sullivan <bos@serpentine.com>
98stability: experimental
10−tested-with: GHC == 7.0.4, GHC == 7.2.2, GHC == 7.4.2, GHC ==7.6.3, GHC ==7.8.4, GHC ==7.10.3, GHC ==8.0.2, GHC ==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
9+tested-with: GHC == 7.0, GHC == 7.2, GHC == 7.4, GHC == 7.6, GHC == 7.8
1110synopsis: Fast combinator parsing for bytestrings and text
1211cabal-version: >= 1.8
1312homepage: https://github.com/bos/attoparsec
@@ -22,7 +21,6 @@ extra-source-files:
2221 benchmarks/*.cabal
2322 benchmarks/*.hs
2423 benchmarks/*.txt
25− benchmarks/json-data/*.json
2624 benchmarks/Makefile
2725 benchmarks/med.txt.bz2
2826 changelog.md
@@ -30,8 +28,9 @@ extra-source-files:
3028 examples/*.hs
3129 examples/Makefile
3230 tests/*.hs
31+ tests/Makefile
3332 tests/QC/*.hs
34− tests/QC/IPv6/*.hs
33+ tests/TestFastSet.hs
3534
3635Flag developer
3736 Description: Whether to build the library in development mode
@@ -40,30 +39,22 @@ Flag developer
4039
4140library
4241 build-depends: array,
43− base >= 4.3 && < 5,
42+ base >= 4.2 && < 5,
4443 bytestring,
4544 containers,
4645 deepseq,
4746 scientific >= 0.3.1 && < 0.4,
48− transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.6,
4947 text >= 1.1.1.3
5048 if impl(ghc < 7.4)
5149 build-depends:
5250 bytestring < 0.10.4.0
5351
54− if !impl(ghc >= 8.0)
55− -- Data.Semigroup && Control.Monad.Fail are available in base-4.9+
56− build-depends: fail == 4.9.*,
57− semigroups >=0.16.1 && <0.20
58−
5952 exposed-modules: Data.Attoparsec
6053 Data.Attoparsec.ByteString
6154 Data.Attoparsec.ByteString.Char8
6255 Data.Attoparsec.ByteString.Lazy
6356 Data.Attoparsec.Char8
6457 Data.Attoparsec.Combinator
65− Data.Attoparsec.Internal
66− Data.Attoparsec.Internal.Types
6758 Data.Attoparsec.Lazy
6859 Data.Attoparsec.Number
6960 Data.Attoparsec.Text
@@ -73,7 +64,9 @@ library
7364 other-modules: Data.Attoparsec.ByteString.Buffer
7465 Data.Attoparsec.ByteString.FastSet
7566 Data.Attoparsec.ByteString.Internal
67+ Data.Attoparsec.Internal
7668 Data.Attoparsec.Internal.Fhthagn
69+ Data.Attoparsec.Internal.Types
7770 Data.Attoparsec.Text.Buffer
7871 Data.Attoparsec.Text.FastSet
7972 Data.Attoparsec.Text.Internal
@@ -91,31 +84,9 @@ test-suite tests
9184 QC.ByteString
9285 QC.Combinator
9386 QC.Common
94− QC.IPv6.Internal
95− QC.IPv6.Types
9687 QC.Rechunked
9788 QC.Simple
9889 QC.Text
99− QC.Text.FastSet
100− QC.Text.Regressions
101−
102− other-modules: Data.Attoparsec.ByteString
103− Data.Attoparsec.ByteString.Buffer
104− Data.Attoparsec.ByteString.Char8
105− Data.Attoparsec.ByteString.FastSet
106− Data.Attoparsec.ByteString.Internal
107− Data.Attoparsec.ByteString.Lazy
108− Data.Attoparsec.Combinator
109− Data.Attoparsec.Internal
110− Data.Attoparsec.Internal.Fhthagn
111− Data.Attoparsec.Internal.Types
112− Data.Attoparsec.Number
113− Data.Attoparsec.Text
114− Data.Attoparsec.Text.Buffer
115− Data.Attoparsec.Text.FastSet
116− Data.Attoparsec.Text.Internal
117− Data.Attoparsec.Text.Lazy
118− Data.Attoparsec.Zepto
11990
12091 ghc-options:
12192 -Wall -threaded -rtsopts
@@ -125,23 +96,16 @@ test-suite tests
12596
12697 build-depends:
12798 array,
128− base,
99+ base >= 4 && < 5,
129100 bytestring,
130101 deepseq >= 1.1,
131− QuickCheck >= 2.13.2 && < 2.14,
132− quickcheck-unicode,
102+ QuickCheck >= 2.7,
133103 scientific,
134− tasty >= 0.11,
135− tasty-quickcheck >= 0.8,
104+ test-framework >= 0.8.0.2,
105+ test-framework-quickcheck2 >= 0.3.0.3,
136106 text,
137− transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.6,
138107 vector
139108
140− if !impl(ghc >= 8.0)
141− -- Data.Semigroup && Control.Monad.Fail are available in base-4.9+
142− build-depends: fail == 4.9.*,
143− semigroups >=0.16.1 && <0.20
144−
145109benchmark benchmarks
146110 type: exitcode-stdio-1.0
147111 hs-source-dirs: benchmarks benchmarks/warp-3.0.1.1 .
@@ -150,14 +114,9 @@ benchmark benchmarks
150114 other-modules:
151115 Common
152116 HeadersByteString
153− HeadersByteString.Atto
154117 HeadersText
155118 Links
156− Network.Wai.Handler.Warp.ReadInt
157− Network.Wai.Handler.Warp.RequestHeader
158119 Numbers
159− Sets
160− TextFastSet
161120 Warp
162121 ghc-options: -O2 -Wall
163122
@@ -169,7 +128,6 @@ benchmark benchmarks
169128 base == 4.*,
170129 bytestring >= 0.10.4.0,
171130 case-insensitive,
172− containers,
173131 criterion >= 1.0,
174132 deepseq >= 1.1,
175133 directory,
@@ -179,16 +137,13 @@ benchmark benchmarks
179137 parsec >= 3.1.2,
180138 scientific,
181139 text >= 1.1.1.0,
182− transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.6,
183140 unordered-containers,
184141 vector
185142
186− if !impl(ghc >= 8.0)
187− -- Data.Semigroup && Control.Monad.Fail are available in base-4.9+
188− build-depends: fail == 4.9.*,
189− semigroups >=0.16.1 && <0.19
190−
191143source-repository head
192144 type: git
193145 location: https://github.com/bos/attoparsec
194146
147+source-repository head
148+ type: mercurial
149+ location: https://bitbucket.org/bos/attoparsec
benchmarks/Aeson.hs+2−6
@@ -10,13 +10,8 @@ module Aeson
1010import Data.ByteString.Builder
1111 (Builder, byteString, toLazyByteString, charUtf8, word8)
1212
13−#if !MIN_VERSION_base(4,8,0)
14−import Control.Applicative ((*>), (<$>), (<*), pure)
15−import Data.Monoid (mappend, mempty)
16−#endif
17−
1813import Common (pathTo)
19−import Control.Applicative (liftA2)
14+import Control.Applicative ((*>), (<$>), (<*), liftA2, pure)
2015import Control.DeepSeq (NFData(..))
2116import Control.Monad (forM)
2217import Data.Attoparsec.ByteString.Char8 (Parser, char, endOfInput, scientific,
@@ -25,6 +20,7 @@ import Data.Bits ((.|.), shiftL)
2520import Data.ByteString (ByteString)
2621import Data.Char (chr)
2722import Data.List (sort)
23+import Data.Monoid (mappend, mempty)
2824import Data.Scientific (Scientific)
2925import Data.Text (Text)
3026import Data.Text.Encoding (decodeUtf8')
benchmarks/Benchmarks.hs−8
@@ -13,7 +13,6 @@ import Text.Parsec.Text ()
1313import Text.Parsec.Text.Lazy ()
1414import qualified Warp
1515import qualified Aeson
16−import qualified Genome
1716import qualified Data.Attoparsec.ByteString as AB
1817import qualified Data.Attoparsec.ByteString.Char8 as AC
1918import qualified Data.Attoparsec.ByteString.Lazy as ABL
@@ -28,7 +27,6 @@ import qualified HeadersByteString
2827import qualified HeadersText
2928import qualified Links
3029import qualified Text.Parsec as P
31−import qualified Sets
3230
3331main :: IO ()
3432main = do
@@ -71,14 +69,10 @@ main = do
7169 , bench "isAlpha_ascii" $ nf (ABL.parse (AC.takeWhile AC.isAlpha_ascii)) bl
7270 , bench "isAlpha_iso8859_15" $
7371 nf (ABL.parse (AC.takeWhile AC.isAlpha_iso8859_15)) bl
74− , bench "T isAlpha" $ nf (AT.parse (AT.takeWhile isAlpha)) t
75− , bench "TL isAlpha" $ nf (ATL.parse (AT.takeWhile isAlpha)) tl
7672 ]
7773 , bgroup "takeWhile1" [
7874 bench "isAlpha" $ nf (ABL.parse (AC.takeWhile1 isAlpha)) bl
7975 , bench "isAlpha_ascii" $ nf (ABL.parse (AC.takeWhile1 AC.isAlpha_ascii)) bl
80− , bench "T isAlpha" $ nf (AT.parse (AT.takeWhile1 isAlpha)) t
81− , bench "TL isAlpha" $ nf (ATL.parse (AT.takeWhile1 isAlpha)) tl
8276 ]
8377 , bench "word32LE" $ nf (AB.parse word32LE) b
8478 , bgroup "scan" [
@@ -86,12 +80,10 @@ main = do
8680 , bench "long" $ nf (AB.parse quotedString) b
8781 ]
8882 , aeson
89− , Genome.genome
9083 , headersBS
9184 , headersT
9285 , Links.links
9386 , numbers
94− , Sets.benchmarks
9587 , Warp.benchmarks
9688 ]
9789
benchmarks/Genome.hsdeleted−75
@@ -1,75 +0,0 @@
1−{-# LANGUAGE OverloadedStrings #-}
2−
3−module Genome
4− (
5− genome
6− ) where
7−
8−import Control.Applicative
9−import Criterion.Main
10−import Data.ByteString (ByteString)
11−import qualified Data.ByteString.Char8 as B8
12−import qualified Data.ByteString.Lazy.Char8 as L8
13−import Data.Attoparsec.ByteString.Char8 as B
14−import qualified Data.Attoparsec.ByteString.Lazy as BL
15−import Data.Text (Text)
16−import qualified Data.Text as T
17−import qualified Data.Text.Lazy as TL
18−import Data.Attoparsec.Text as T
19−import qualified Data.Attoparsec.Text.Lazy as TL
20−import Common (rechunkBS, rechunkT)
21−
22−genome :: Benchmark
23−genome = bgroup "genome" [
24− bgroup "bytestring" [
25− bench "s" $ nf (map (B.parse searchBS)) (B8.tails geneB)
26− , bench "l" $ nf (map (BL.parse searchBS)) (L8.tails geneBL)
27− , bgroup "CI" [
28− bench "s" $ nf (map (B.parse searchBSCI)) (B8.tails geneB)
29− , bench "l" $ nf (map (BL.parse searchBSCI)) (L8.tails geneBL)
30− ]
31− ]
32− , bgroup "text" [
33− bench "s" $ nf (map (T.parse searchT)) (T.tails geneT)
34− , bench "l" $ nf (map (TL.parse searchT)) (TL.tails geneTL)
35− , bgroup "CI" [
36− bench "s" $ nf (map (T.parse searchTCI)) (T.tails geneT)
37− , bench "l" $ nf (map (TL.parse searchTCI)) (TL.tails geneTL)
38− ]
39− ]
40− ]
41− where geneB = B8.pack gene
42− geneBL = rechunkBS 4 geneB
43− geneT = T.pack gene
44− geneTL = rechunkT 4 geneT
45−
46−searchBS :: B.Parser ByteString
47−searchBS = "caac" *> ("aaca" <|> "aact")
48−
49−searchBSCI :: B.Parser ByteString
50−searchBSCI = B.stringCI "CAAC" *> (B.stringCI "AACA" <|> B.stringCI "AACT")
51−
52−searchT :: T.Parser Text
53−searchT = "caac" *> ("aaca" <|> "aact")
54−
55−searchTCI :: T.Parser Text
56−searchTCI = T.asciiCI "CAAC" *> (T.asciiCI "AACA" <|> T.asciiCI "AACT")
57−
58−-- Dictyostelium discoideum developmental protein DG1094 (gacT) gene,
59−-- partial cds. http://www.ncbi.nlm.nih.gov/nuccore/AF081586.1
60−
61−gene :: String
62−gene = "atcgatttagaaagatacaaagatagaaccatcaataataaacaagagaagagagcaagt\
63− \agagatattaataaagagattgaaagagagattgaaaagaagagattatcaccaagagaa\
64− \agattaaatttatttggtctttcttcctcatcttcatcagtgaattcaacattaacaaga\
65− \tctacagcaaatattatctctacaatagacggtagtggaggtagtaatcgtaatagtaaa\
66− \aattatggtaatggctcatcctcctcctcaaatagaagatatagtaatactattaatcaa\
67− \caattacaaatgcaattacaacaacttcaaatccaacaacaacaatatcaacaaactcaa\
68− \caatctcaaataccattacaatatcaacaacaacaacagcaacaacaacaacaaaccact\
69− \acaactacaactacatcaagtggtagtaatagattctcttcaaatagatataaaccagtt\
70− \gatcttacacaatcatcttcaaactttcgttattcacgtgaaatttatgatgatgattat\
71− \tattcaaataataatttaatgatgtttggtaatgagcaaccaaatcaaacaccaatttct\
72− \gtatcatcttcatctgcattcacacgtcaaagatctcaaagttgctttgaaccagagaat\
73− \cttgtattgctacaacaacaatatcaacaatatcaacaacaacaacaacaacaacaacaa\
74− \attccattccaagcaaatccacaatatagtaatgctgttattgaacaaaaattggatcaa\
75− \attagagataccattaataatttacatagagataaccgagtctctaga"
benchmarks/HeadersByteString.hs+41−10
@@ -1,22 +1,53 @@
1+{-# LANGUAGE BangPatterns, OverloadedStrings #-}
2+{-# OPTIONS_GHC -fno-warn-missing-signatures -fno-warn-orphans #-}
13module HeadersByteString (headers) where
24
35import Common (pathTo, rechunkBS)
6+import Control.Applicative
7+import Control.DeepSeq (NFData(..))
48import Criterion.Main (bench, bgroup, nf, nfIO)
59import Criterion.Types (Benchmark)
6−import HeadersByteString.Atto (request, response)
710import Network.Wai.Handler.Warp.RequestHeader (parseHeaderLines)
11+import Network.HTTP.Types.Version (HttpVersion, http11)
812import qualified Data.Attoparsec.ByteString.Char8 as B
913import qualified Data.Attoparsec.ByteString.Lazy as BL
1014import qualified Data.ByteString.Char8 as B
1115
12−-- Note: In the benchmarks for parsing an http request
13−-- from a strict bytestring, we consider warp's implementation,
14−-- which has highly optimized code for handling the first
15−-- line in particular. It's treatment of the headers
16−-- is more relaxed from the treatment they are given by the
17−-- attoparsec parser benchmarked here. Consequently, it
18−-- is should not be possible to match its performance since
19−-- it accepts header names with disallowed characters.
16+instance NFData HttpVersion where
17+ rnf !_ = ()
18+
19+header = do
20+ name <- B.takeWhile1 (B.inClass "a-zA-Z0-9_-") <* B.char ':' <* B.skipSpace
21+ body <- bodyLine
22+ return (name, body)
23+
24+bodyLine = B.takeTill (\c -> c == '\r' || c == '\n') <* B.endOfLine
25+
26+requestLine = do
27+ m <- (B.takeTill B.isSpace <* B.char ' ')
28+ (p,q) <- B.break (=='?') <$> (B.takeTill B.isSpace <* B.char ' ')
29+ v <- httpVersion
30+ return (m,p,q,v)
31+
32+httpVersion = http11 <$ "HTTP/1.1"
33+
34+responseLine = (,,) <$>
35+ (httpVersion <* B.skipSpace) <*>
36+ (int <* B.skipSpace) <*>
37+ bodyLine
38+
39+int :: B.Parser Int
40+int = B.decimal
41+
42+request = (,) <$> (requestLine <* B.endOfLine) <*> manyheader
43+
44+response = (,) <$> responseLine <*> many header
45+
46+manyheader = do
47+ c <- B.peekChar'
48+ if c == '\r' || c == '\n'
49+ then return []
50+ else (:) <$> header <*> manyheader
2051
2152headers :: IO Benchmark
2253headers = do
@@ -27,7 +58,7 @@ headers = do
2758 return $ bgroup "headers" [
2859 bgroup "B" [
2960 bench "request" $ nf (B.parseOnly request) req
30− , bench "warp" $ nfIO (parseHeaderLines (B.split '\n' req))
61+ , bench "warp" $ nfIO (parseHeaderLines [req])
3162 , bench "response" $ nf (B.parseOnly response) resp
3263 ]
3364 , bgroup "BL" [
benchmarks/HeadersByteString/Atto.hsdeleted−57
@@ -1,57 +0,0 @@
1−{-# LANGUAGE BangPatterns, OverloadedStrings #-}
2−{-# OPTIONS_GHC -fno-warn-missing-signatures -fno-warn-orphans #-}
3−module HeadersByteString.Atto
4− (
5− request
6− , response
7− ) where
8−
9−import Control.Applicative
10−import Control.DeepSeq (NFData(..))
11−import Network.HTTP.Types.Version (HttpVersion, http11)
12−import qualified Data.Attoparsec.ByteString.Char8 as B
13−import qualified Data.ByteString.Char8 as B
14−
15−instance NFData HttpVersion where
16− rnf !_ = ()
17−
18−isHeaderChar :: Char -> Bool
19−isHeaderChar c =
20− (c >= 'a' && c <= 'z') ||
21− (c >= 'A' && c <= 'Z') ||
22− (c >= '0' && c <= '9') ||
23− (c == '_') ||
24− (c == '-')
25−
26−header = do
27− name <- B.takeWhile1 isHeaderChar <* B.char ':' <* B.skipSpace
28− body <- bodyLine
29− return (name, body)
30−
31−bodyLine = B.takeTill (\c -> c == '\r' || c == '\n') <* B.endOfLine
32−
33−requestLine = do
34− m <- (B.takeTill B.isSpace <* B.char ' ')
35− (p,q) <- B.break (=='?') <$> (B.takeTill B.isSpace <* B.char ' ')
36− v <- httpVersion
37− return (m,p,q,v)
38−
39−httpVersion = http11 <$ "HTTP/1.1"
40−
41−responseLine = (,,) <$>
42− (httpVersion <* B.skipSpace) <*>
43− (int <* B.skipSpace) <*>
44− bodyLine
45−
46−int :: B.Parser Int
47−int = B.decimal
48−
49−request = (,) <$> (requestLine <* B.endOfLine) <*> manyheader
50−
51−response = (,) <$> responseLine <*> many header
52−
53−manyheader = do
54− c <- B.peekChar'
55− if c == '\r' || c == '\n'
56− then return []
57− else (:) <$> header <*> manyheader
benchmarks/Links.hs+2−2
@@ -5,8 +5,8 @@ module Links (links) where
55import Control.Applicative
66import Control.DeepSeq (NFData(..))
77import Criterion.Main (Benchmark, bench, nf)
8−import Data.Attoparsec.ByteString as A
9−import Data.Attoparsec.ByteString.Char8 as A8
8+import Data.Attoparsec as A
9+import Data.Attoparsec.Char8 as A8
1010import Data.ByteString.Char8 as B8
1111
1212data Link = Link {
benchmarks/Numbers.hs−1
@@ -1,5 +1,4 @@
11{-# LANGUAGE BangPatterns #-}
2−{-# OPTIONS_GHC -fno-warn-deprecations #-}
32
43module Numbers (numbers) where
54
benchmarks/Sets.hsdeleted−21
@@ -1,21 +0,0 @@
1−module Sets (benchmarks) where
2−
3−import Criterion
4−import Data.Char (ord)
5−import qualified Data.Attoparsec.Text.FastSet as FastSet
6−import qualified TextFastSet
7−import qualified Data.HashSet as HashSet
8−import qualified Data.IntSet as IntSet
9−
10−smallSet :: String
11−smallSet = ['a'..'z'] ++ ['A'..'Z'] ++ ['0'..'9']
12−
13−benchmarks :: Benchmark
14−benchmarks = bgroup "sets" [
15− bench "Fast" $ whnf (FastSet.member '*') (FastSet.fromList smallSet)
16− , bench "Hash" $ whnf (HashSet.member '*') (HashSet.fromList smallSet)
17− , bench "Int" $ whnf (IntSet.member (ord '*'))
18− (IntSet.fromList (map ord smallSet))
19− , bench "TextFast" $ whnf (TextFastSet.member '*')
20− (TextFastSet.fromList smallSet)
21− ]
benchmarks/TextFastSet.hsdeleted−121
@@ -1,121 +0,0 @@
1−{-# LANGUAGE BangPatterns #-}
2−
3−------------------------------------------------------------------------------
4−-- |
5−-- Module : Data.Attoparsec.FastSet
6−-- Copyright : Felipe Lessa 2010, Bryan O'Sullivan 2007-2015
7−-- License : BSD3
8−--
9−-- Maintainer : felipe.lessa@gmail.com
10−-- Stability : experimental
11−-- Portability : unknown
12−--
13−-- Fast set membership tests for 'Char' values. We test for
14−-- membership using a hashtable implemented with Robin Hood
15−-- collision resolution. The set representation is unboxed,
16−-- and the characters and hashes interleaved, for efficiency.
17−--
18−--
19−-----------------------------------------------------------------------------
20−module TextFastSet
21− (
22− -- * Data type
23− FastSet
24− -- * Construction
25− , fromList
26− , set
27− -- * Lookup
28− , member
29− -- * Handy interface
30− , charClass
31− ) where
32−
33−import Data.Bits ((.|.), (.&.), shiftR)
34−import Data.Function (on)
35−import Data.List (sort, sortBy)
36−import qualified Data.Array.Base as AB
37−import qualified Data.Array.Unboxed as A
38−import qualified Data.Text as T
39−
40−data FastSet = FastSet {
41− table :: {-# UNPACK #-} !(A.UArray Int Int)
42− , mask :: {-# UNPACK #-} !Int
43− }
44−
45−data Entry = Entry {
46− key :: {-# UNPACK #-} !Char
47− , initialIndex :: {-# UNPACK #-} !Int
48− , index :: {-# UNPACK #-} !Int
49− }
50−
51−offset :: Entry -> Int
52−offset e = index e - initialIndex e
53−
54−resolveCollisions :: [Entry] -> [Entry]
55−resolveCollisions [] = []
56−resolveCollisions [e] = [e]
57−resolveCollisions (a:b:entries) = a' : resolveCollisions (b' : entries)
58− where (a', b')
59− | index a < index b = (a, b)
60− | offset a < offset b = (b { index=index a }, a { index=index a + 1 })
61− | otherwise = (a, b { index=index a + 1 })
62−
63−pad :: Int -> [Entry] -> [Entry]
64−pad = go 0
65− where -- ensure that we pad enough so that lookups beyond the
66− -- last hash in the table fall within the array
67− go !_ !m [] = replicate (max 1 m + 1) empty
68− go k m (e:entries) = map (const empty) [k..i - 1] ++ e :
69− go (i + 1) (m + i - k - 1) entries
70− where i = index e
71− empty = Entry '\0' maxBound 0
72−
73−nextPowerOf2 :: Int -> Int
74−nextPowerOf2 0 = 1
75−nextPowerOf2 x = go (x - 1) 1
76− where go y 32 = y + 1
77− go y k = go (y .|. (y `shiftR` k)) $ k * 2
78−
79−fastHash :: Char -> Int
80−fastHash = fromEnum
81−
82−fromList :: String -> FastSet
83−fromList s = FastSet (AB.listArray (0, length interleaved - 1) interleaved)
84− mask'
85− where s' = ordNub (sort s)
86− l = length s'
87− mask' = nextPowerOf2 ((5 * l) `div` 4) - 1
88− entries = pad mask' .
89− resolveCollisions .
90− sortBy (compare `on` initialIndex) .
91− zipWith (\c i -> Entry c i i) s' .
92− map ((.&. mask') . fastHash) $ s'
93− interleaved = concatMap (\e -> [fromEnum $ key e, initialIndex e])
94− entries
95−
96−ordNub :: Eq a => [a] -> [a]
97−ordNub [] = []
98−ordNub (y:ys) = go y ys
99− where go x (z:zs)
100− | x == z = go x zs
101− | otherwise = x : go z zs
102− go x [] = [x]
103−
104−set :: T.Text -> FastSet
105−set = fromList . T.unpack
106−
107−-- | Check the set for membership.
108−member :: Char -> FastSet -> Bool
109−member c a = go (2 * i)
110− where i = fastHash c .&. mask a
111− lookupAt j b = (i' <= i) && (c == c' || b)
112− where c' = toEnum $ AB.unsafeAt (table a) j
113− i' = AB.unsafeAt (table a) $ j + 1
114− go j = lookupAt j . lookupAt (j + 2) . lookupAt (j + 4) .
115− lookupAt (j + 6) . go $ j + 8
116−
117−charClass :: String -> FastSet
118−charClass = fromList . go
119− where go (a:'-':b:xs) = [a..b] ++ go xs
120− go (x:xs) = x : go xs
121− go _ = ""
benchmarks/attoparsec-benchmarks.cabal−5
@@ -11,13 +11,10 @@ executable attoparsec-benchmarks
1111 other-modules:
1212 Common
1313 HeadersByteString
14− HeadersByteString.Atto
1514 HeadersText
1615 Links
1716 Numbers
1817 Network.Wai.Handler.Warp.ReadInt
19− Sets
20− TextFastSet
2118 Warp
2219 hs-source-dirs: .. . warp-3.0.1.1
2320 ghc-options: -O2 -Wall -rtsopts
@@ -26,7 +23,6 @@ executable attoparsec-benchmarks
2623 base == 4.*,
2724 bytestring >= 0.10.4.0,
2825 case-insensitive,
29− containers,
3026 criterion >= 1.0,
3127 deepseq >= 1.1,
3228 directory,
@@ -36,6 +32,5 @@ executable attoparsec-benchmarks
3632 parsec >= 3.1.2,
3733 scientific >= 0.3.1,
3834 text >= 1.1.1.0,
39− transformers,
4035 unordered-containers,
4136 vector
benchmarks/http-request.txt+8−3
@@ -1,9 +1,14 @@
11GET / HTTP/1.1
22Host: twitter.com
3−Accept: text/html, application/xhtml+xml, application/xml; q=0.9, image/webp, */*; q=0.8
3+Accept: text/html, application/xhtml+xml, application/xml; q=0.9,
4+ image/webp, */*; q=0.8
45Accept-Encoding: gzip,deflate,sdch
56Accept-Language: en-GB,en-US;q=0.8,en;q=0.6
67Cache-Control: max-age=0
7−Cookie: guest_id=v1%3A139; _twitter_sess=BAh7CSIKZmxhc2hJQz-e1e1; __utma=43838368.452555194.1399611824.1; __utmb=43838368; __utmc=43838368; __utmz=1399611824.1.1.utmcsr=(direct)|utmcmd=(none)
8−User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.86 Safari/537.36
8+Cookie: guest_id=v1%3A139; _twitter_sess=BAh7CSIKZmxhc2hJQz-e1e1;
9+ __utma=43838368.452555194.1399611824.1; __utmb=43838368;
10+ __utmc=43838368; __utmz=1399611824.1.1.utmcsr=(direct)|utmcmd=(none)
11+User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_5)
12+ AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.86
13+ Safari/537.36
914
benchmarks/http-response.txt+4−2
@@ -3,8 +3,10 @@ Date: Fri, 09 May 2014 04:24:57 GMT
33Expires: -1
44Cache-Control: private, max-age=0
55Content-Type: text/html; charset=ISO-8859-1
6−Set-Cookie: PREF=ID=1a871afc4240db5e:FF:LM=1399609497:S=e5MZ0itEekjVwNcU; expires=Sun, 08-May-2016 04:24:57 GMT; path=/; domain=.google.com
7−Set-Cookie: NID=67=-WlfaDG6VSEPk7abAjrK98HBSoCD2ID6JKkUR95tEumzDmg7Fc8pSQ8; expires=Sat, 08-Nov-2014 04:24:57 GMT; path=/; domain=.google.com; HttpOnly
6+Set-Cookie: PREF=ID=1a871afc4240db5e:FF:LM=1399609497:S=e5MZ0itEekjVwNcU;
7+ expires=Sun, 08-May-2016 04:24:57 GMT; path=/; domain=.google.com
8+Set-Cookie: NID=67=-WlfaDG6VSEPk7abAjrK98HBSoCD2ID6JKkUR95tEumzDmg7Fc8pSQ8;
9+ expires=Sat, 08-Nov-2014 04:24:57 GMT; path=/; domain=.google.com; HttpOnly
810P3P: CP="This is not a P3P policy! See http://www.google.com/support/accounts/bin/answer.py?hl=en&answer=151657 for more info."
911Server: gws
1012X-XSS-Protection: 1; mode=block
benchmarks/warp-3.0.1.1/Network/Wai/Handler/Warp/RequestHeader.hs+1−1
@@ -139,7 +139,7 @@ parseRequestLine requestLine@(PS fptr off len) = withForeignPtr fptr $ \ptr -> d
139139
140140parseHeader :: ByteString -> H.Header
141141parseHeader s =
142− let (k, rest) = S.break (== 58) s -- ':'
142+ let (k, rest) = S.breakByte 58 s -- ':'
143143 rest' = S.dropWhile (\c -> c == 32 || c == 9) $ S.drop 1 rest
144144 in (CI.mk k, rest')
145145
changelog.md−54
@@ -1,57 +1,3 @@
1−0.13.2.1
2−
3−* Improved performance of `Data.Attoparsec.Text.asciiCI`
4−
5−0.13.2.0
6−
7−* `pure` is now strict in `Position`
8−
9−0.13.1.0
10−
11−* `runScanner` now correctly returns the final state
12− (https://github.com/bos/attoparsec/issues/105).
13−* `Parser`, `ZeptoT`, `Buffer`, and `More` now expose `Semigroup` instances.
14−* `Parser`, and `ZeptoT` now expose `MonadFail` instances.
15−
16−0.13.0.2
17−
18−* Restore the fast specialised character set implementation for Text
19−* Move testsuite from test-framework to tasty
20−* Performance optimization of takeWhile and takeWhile1
21−
22−0.13.0.1
23−
24−* Fixed a bug in the implementations of inClass and notInClass for
25− Text (https://github.com/bos/attoparsec/issues/103)
26−
27−0.13.0.0
28−
29−* Made the parser type in the Zepto module a monad transformer
30− (needed by aeson's string unescaping parser).
31−
32−0.12.1.6
33−
34−* Fixed a case folding bug in the ByteString version of stringCI.
35−
36−0.12.1.5
37−
38−* Fixed an indexing bug in the new Text implementation of string,
39− reported by Michel Boucey.
40−
41−0.12.1.4
42−
43−* Fixed a case where the string parser would consume an unnecessary
44− amount of input before failing a match, when it could bail much
45− earlier (https://github.com/bos/attoparsec/issues/97)
46−
47−* Added more context to error messages
48− (https://github.com/bos/attoparsec/pull/79)
49−
50−0.12.1.3
51−
52−* Fixed incorrect tracking of Text lengths
53− (https://github.com/bos/attoparsec/issues/80)
54−
5510.12.1.2
562
573* Fixed the incorrect tracking of capacity if the initial buffer was
tests/Makefilenew file+14
@@ -0,0 +1,14 @@
1+all: TestFastSet.out qc.out
2+
3+%.out: %.exe
4+ ./$< | tee $<.tmp
5+ mv $<.tmp $@
6+
7+qc.exe: QC.hs
8+ ghc -O -fno-warn-orphans --make -o $@ $<
9+
10+%.exe: %.hs
11+ ghc -O -fno-warn-orphans --make -o $@ $<
12+
13+clean:
14+ -rm -f *.hi *.o *.exe *.out
tests/QC.hs+2−2
@@ -6,11 +6,11 @@ import qualified QC.ByteString as ByteString
66import qualified QC.Combinator as Combinator
77import qualified QC.Simple as Simple
88import qualified QC.Text as Text
9−import Test.Tasty (defaultMain, testGroup)
9+import Test.Framework (defaultMain, testGroup)
1010
1111main = defaultMain tests
1212
13−tests = testGroup "tests" [
13+tests = [
1414 testGroup "bs" ByteString.tests
1515 , testGroup "buf" Buffer.tests
1616 , testGroup "combinator" Combinator.tests
tests/QC/Buffer.hs+4−6
@@ -1,15 +1,13 @@
1−{-# LANGUAGE BangPatterns, CPP, FlexibleInstances, OverloadedStrings,
1+{-# LANGUAGE BangPatterns, FlexibleInstances, OverloadedStrings,
22 TypeSynonymInstances #-}
33
44module QC.Buffer (tests) where
55
6−#if !MIN_VERSION_base(4,8,0)
76import Control.Applicative ((<$>))
87import Data.Monoid (Monoid(mconcat))
9−#endif
108import QC.Common ()
11−import Test.Tasty (TestTree)
12−import Test.Tasty.QuickCheck (testProperty)
9+import Test.Framework (Test)
10+import Test.Framework.Providers.QuickCheck2 (testProperty)
1311import Test.QuickCheck
1412import qualified Data.Attoparsec.ByteString.Buffer as BB
1513import qualified Data.Attoparsec.Text.Buffer as BT
@@ -82,7 +80,7 @@ t_dropWord16 (BP _ts t buf) = do
8280 i <- choose (0, T.lengthWord16 t)
8381 return $ T.dropWord16 i t === BT.dropWord16 i buf
8482
85−tests :: [TestTree]
83+tests :: [Test]
8684tests = [
8785 testProperty "b_unbuffer" b_unbuffer
8886 , testProperty "t_unbuffer" t_unbuffer
tests/QC/ByteString.hs+15−34
@@ -1,23 +1,20 @@
1−{-# LANGUAGE BangPatterns, CPP, OverloadedStrings #-}
1+{-# LANGUAGE BangPatterns, OverloadedStrings #-}
22module QC.ByteString (tests) where
33
4−#if !MIN_VERSION_base(4,8,0)
5−import Control.Applicative ((<*>), (<$>))
6−#endif
7−import Data.Char (chr, ord, toUpper)
4+import Control.Applicative ((<$>), (<*>))
5+import Data.Char (chr, ord)
86import Data.Int (Int64)
97import Data.Word (Word8)
108import Prelude hiding (take, takeWhile)
11−import QC.Common (ASCII(..), liftOp, parseBS, toStrictBS)
12−import Test.Tasty (TestTree)
13−import Test.Tasty.QuickCheck (testProperty)
9+import QC.Common (liftOp, parseBS, toStrictBS)
10+import Test.Framework (Test)
11+import Test.Framework.Providers.QuickCheck2 (testProperty)
1412import Test.QuickCheck
1513import qualified Data.Attoparsec.ByteString as P
1614import qualified Data.Attoparsec.ByteString.Char8 as P8
1715import qualified Data.Attoparsec.ByteString.FastSet as S
1816import qualified Data.Attoparsec.ByteString.Lazy as PL
1917import qualified Data.ByteString as B
20−import qualified Data.ByteString.Char8 as B8
2118import qualified Data.ByteString.Lazy as L
2219import qualified Data.ByteString.Lazy.Char8 as L8
2320
@@ -26,11 +23,9 @@ import qualified Data.ByteString.Lazy.Char8 as L8
2623satisfy :: Word8 -> L.ByteString -> Property
2724satisfy w s = parseBS (P.satisfy (<=w)) (L.cons w s) === Just w
2825
29−satisfyWith :: Word8 -> L.ByteString -> Property
30−satisfyWith w s = parseBS (P.satisfyWith (chr . fromIntegral) (<=c))
26+satisfyWith :: Char -> L.ByteString -> Property
27+satisfyWith c s = parseBS (P.satisfyWith (chr . fromIntegral) (<=c))
3128 (L.cons (fromIntegral (ord c)) s) === Just c
32− where
33− c = chr (fromIntegral w)
3429
3530word8 :: Word8 -> L.ByteString -> Property
3631word8 w s = parseBS (P.word8 w) (L.cons w s) === Just w
@@ -68,18 +63,6 @@ string :: L.ByteString -> L.ByteString -> Property
6863string s t = parseBS (P.string s') (s `L.append` t) === Just s'
6964 where s' = toStrictBS s
7065
71−stringCI :: ASCII L.ByteString -> ASCII L.ByteString -> Property
72−stringCI (ASCII s) (ASCII t) =
73− parseBS (P8.stringCI up) (s `L.append` t) === Just s'
74− where s' = toStrictBS s
75− up = B8.map toUpper s'
76−
77−strings :: L.ByteString -> L.ByteString -> L.ByteString -> Property
78−strings s t u =
79− parseBS (P.string (toStrictBS s) >> P.string t') (L.concat [s,t,u])
80− === Just t'
81− where t' = toStrictBS t
82−
8366skipWhile :: Word8 -> L.ByteString -> Property
8467skipWhile w s =
8568 let t = L.dropWhile (<=w) s
@@ -148,16 +131,16 @@ scan :: L.ByteString -> Positive Int64 -> Property
148131scan s (Positive k) = parseBS p s === Just (toStrictBS $ L.take k s)
149132 where p = P.scan k $ \ n _ ->
150133 if n > 0 then let !n' = n - 1 in Just n' else Nothing
151−
134+
152135members :: [Word8] -> Property
153−members s = property $ all (`S.memberWord8` set) s
154− where set = S.fromList s
155−
136+ members s = property . all (`S.memberWord8` set) s
137+ where set = S.fromList s
138+
156139nonmembers :: [Word8] -> [Word8] -> Property
157−nonmembers s s' = property . not . any (`S.memberWord8` set) $ filter (not . (`elem` s)) s'
158− where set = S.fromList s
140+ nonmembers s s' = property . not . any (`S.memberWord8` set) $ filter (not . (`elem` s)) s'
141+ where set = S.fromList s
159142
160−tests :: [TestTree]
143+tests :: [Test]
161144tests = [
162145 testProperty "anyWord8" anyWord8
163146 , testProperty "endOfInput" endOfInput
@@ -171,8 +154,6 @@ tests = [
171154 , testProperty "skip" skip
172155 , testProperty "skipWhile" skipWhile
173156 , testProperty "string" string
174− , testProperty "stringCI" stringCI
175− , testProperty "strings" strings
176157 , testProperty "take" take
177158 , testProperty "takeByteString" takeByteString
178159 , testProperty "takeCount" takeCount
tests/QC/Combinator.hs+5−18
@@ -1,15 +1,10 @@
1−{-# LANGUAGE CPP, OverloadedStrings #-}
2−
31module QC.Combinator where
42
5−#if !MIN_VERSION_base(4,8,0)
6−import Control.Applicative ((<*>), (<$>), (<*), (*>))
7−#endif
8−import Data.Maybe (fromJust, isJust)
3+import Control.Applicative
94import Data.Word (Word8)
10−import QC.Common (Repack, parseBS, repackBS, toLazyBS)
11−import Test.Tasty (TestTree)
12−import Test.Tasty.QuickCheck (testProperty)
5+import QC.Common (Repack, parseBS, repackBS)
6+import Test.Framework (Test)
7+import Test.Framework.Providers.QuickCheck2 (testProperty)
138import Test.QuickCheck
149import qualified Data.Attoparsec.ByteString.Char8 as P
1510import qualified Data.Attoparsec.Combinator as C
@@ -27,13 +22,6 @@ count (Positive (Small n)) rs s =
2722 (length <$> parseBS (C.count n (P.string s)) input) == Just n
2823 where input = repackBS rs (B.concat (replicate (n+1) s))
2924
30−lookAhead :: NonEmptyList Word8 -> Bool
31−lookAhead (NonEmpty xs) =
32− let ys = B.pack xs
33− withLookAheadThenConsume = (\x y -> (x, y)) <$> C.lookAhead (P.string ys) <*> P.string ys
34− mr = parseBS withLookAheadThenConsume $ toLazyBS ys
35− in isJust mr && fst (fromJust mr) == snd (fromJust mr)
36−
3725match :: Int -> NonNegative Int -> NonNegative Int -> Repack -> Bool
3826match n (NonNegative x) (NonNegative y) rs =
3927 parseBS (P.match parser) (repackBS rs input) == Just (input, n)
@@ -43,10 +31,9 @@ match n (NonNegative x) (NonNegative y) rs =
4331 B8.replicate x 'x', B8.pack (show n), B8.replicate y 'y'
4432 ]
4533
46−tests :: [TestTree]
34+tests :: [Test]
4735tests = [
4836 testProperty "choice" choice
4937 , testProperty "count" count
50− , testProperty "lookAhead" lookAhead
5138 , testProperty "match" match
5239 ]
tests/QC/Common.hs+4−34
@@ -1,9 +1,7 @@
1−{-# LANGUAGE CPP, FlexibleInstances #-}
21{-# OPTIONS_GHC -fno-warn-orphans #-}
32module QC.Common
43 (
5− ASCII(..)
6− , parseBS
4+ parseBS
75 , parseT
86 , toLazyBS
97 , toStrictBS
@@ -15,12 +13,9 @@ module QC.Common
1513 , liftOp
1614 ) where
1715
18−#if !MIN_VERSION_base(4,8,0)
19−import Control.Applicative ((<*>), (<$>))
20−#endif
16+import Control.Applicative ((<$>), (<*>))
2117import Data.Char (isAlpha)
2218import Test.QuickCheck
23−import Test.QuickCheck.Unicode (shrinkChar, string)
2419import qualified Data.ByteString as B
2520import qualified Data.ByteString.Lazy as BL
2621import qualified Data.Text as T
@@ -28,16 +23,6 @@ import qualified Data.Text.Lazy as TL
2823import qualified Data.Attoparsec.ByteString.Lazy as BL
2924import qualified Data.Attoparsec.Text.Lazy as TL
3025
31−#if !MIN_VERSION_base(4,4,0)
32−-- This should really be a dependency on the random package :-(
33−instance Random Word8 where
34− randomR = integralRandomR
35− random = randomR (minBound,maxBound)
36−
37−instance Arbitrary Word8 where
38− arbitrary = choose (minBound, maxBound)
39−#endif
40−
4126parseBS :: BL.Parser r -> BL.ByteString -> Maybe r
4227parseBS p = BL.maybeResult . BL.parse p
4328
@@ -52,22 +37,9 @@ toLazyBS = BL.fromChunks . (:[])
5237
5338instance Arbitrary B.ByteString where
5439 arbitrary = B.pack <$> arbitrary
55− shrink = map B.pack . shrink . B.unpack
5640
5741instance Arbitrary BL.ByteString where
5842 arbitrary = repackBS <$> arbitrary <*> arbitrary
59− shrink = map BL.pack . shrink . BL.unpack
60−
61−newtype ASCII a = ASCII { fromASCII :: a }
62− deriving (Eq, Ord, Show)
63−
64−instance Arbitrary (ASCII B.ByteString) where
65− arbitrary = (ASCII . B.pack) <$> listOf (choose (0,127))
66− shrink = map (ASCII . B.pack) . shrink . B.unpack . fromASCII
67−
68−instance Arbitrary (ASCII BL.ByteString) where
69− arbitrary = ASCII <$> (repackBS <$> arbitrary <*> (fromASCII <$> arbitrary))
70− shrink = map (ASCII . BL.pack) . shrink . BL.unpack . fromASCII
7143
7244type Repack = NonEmptyList (Positive (Small Int))
7345
@@ -84,12 +56,10 @@ repackBS_ = go . cycle
8456 go _ _ = error "unpossible"
8557
8658instance Arbitrary T.Text where
87− arbitrary = T.pack <$> string
88− shrink = map T.pack . shrinkList shrinkChar . T.unpack
59+ arbitrary = T.pack <$> arbitrary
8960
9061instance Arbitrary TL.Text where
91− arbitrary = TL.pack <$> string
92− shrink = map TL.pack . shrinkList shrinkChar . TL.unpack
62+ arbitrary = repackT <$> arbitrary <*> arbitrary
9363
9464repackT :: Repack -> T.Text -> TL.Text
9565repackT (NonEmpty bs) =
tests/QC/IPv6/Internal.hsdeleted−316
@@ -1,316 +0,0 @@
1−-- -----------------------------------------------------------------------------
2−
3−-- |
4−-- Module : Text.IPv6Addr
5−-- Copyright : Copyright © Michel Boucey 2011-2015
6−-- License : BSD-Style
7−-- Maintainer : michel.boucey@gmail.com
8−--
9−-- Dealing with IPv6 address text representations, canonization and manipulations.
10−--
11−
12−-- -----------------------------------------------------------------------------
13−
14−{-# LANGUAGE OverloadedStrings #-}
15−
16−module QC.IPv6.Internal where {-
17− ( expandTokens
18− , macAddr
19− , maybeIPv6AddrTokens
20− , ipv4AddrToIPv6AddrTokens
21− , ipv6TokensToText
22− , ipv6TokensToIPv6Addr
23− , isIPv6Addr
24− , maybeTokIPv6Addr
25− , maybeTokPureIPv6Addr
26− , fromDoubleColon
27− , fromIPv6Addr
28− , toDoubleColon
29− ) where -}
30−
31−import Debug.Trace
32−import Control.Monad (replicateM)
33−import Data.Attoparsec.Text
34−import Data.Char (isDigit,isHexDigit,toLower)
35−import Data.Monoid ((<>))
36−import Control.Applicative ((<|>),(<*))
37−import Data.List (group,isSuffixOf,elemIndex,elemIndices,intersperse)
38−import Data.Word (Word32)
39−import Numeric (showHex)
40−import qualified Data.Text as T
41−import qualified Data.Text.Read as R (decimal)
42−import Data.Maybe (fromJust)
43−
44−import QC.IPv6.Types
45−
46−tok0 = "0"
47−
48−-- | Returns the 'T.Text' of an IPv6 address.
49−fromIPv6Addr :: IPv6Addr -> T.Text
50−fromIPv6Addr (IPv6Addr t) = t
51−
52−-- | Given an arbitrary list of 'IPv6AddrToken', returns the corresponding 'T.Text'.
53−ipv6TokensToText :: [IPv6AddrToken] -> T.Text
54−ipv6TokensToText l = T.concat $ map ipv6TokenToText l
55−
56−-- | Returns the corresponding 'T.Text' of an IPv6 address token.
57−ipv6TokenToText :: IPv6AddrToken -> T.Text
58−ipv6TokenToText (SixteenBit s) = s
59−ipv6TokenToText Colon = ":"
60−ipv6TokenToText DoubleColon = "::"
61−ipv6TokenToText AllZeros = tok0 -- "A single 16-bit 0000 field MUST be represented as 0" (RFC 5952, 4.1)
62−ipv6TokenToText (IPv4Addr a) = a
63−
64−-- | Returns 'True' if a list of 'IPv6AddrToken' constitutes a valid IPv6 Address.
65−isIPv6Addr :: [IPv6AddrToken] -> Bool
66−isIPv6Addr [] = False
67−isIPv6Addr [DoubleColon] = True
68−isIPv6Addr [DoubleColon,SixteenBit tok1] = True
69−isIPv6Addr tks =
70− diffNext tks && (do
71− let cdctks = countDoubleColon tks
72− let lentks = length tks
73− let lasttk = last tks
74− let lenconst = (lentks == 15 && cdctks == 0) || (lentks < 15 && cdctks == 1)
75− firstValidToken tks &&
76− (case countIPv4Addr tks of
77− 0 -> case lasttk of
78− SixteenBit _ -> lenconst
79− DoubleColon -> lenconst
80− AllZeros -> lenconst
81− _ -> False
82− 1 -> case lasttk of
83− IPv4Addr _ -> (lentks == 13 && cdctks == 0) || (lentks < 12 && cdctks == 1)
84− _ -> False
85− otherwise -> False))
86− where diffNext [] = False
87− diffNext [_] = True
88− diffNext (t:ts) = do
89− let h = head ts
90− case t of
91− SixteenBit _ -> case h of
92− SixteenBit _ -> False
93− AllZeros -> False
94− _ -> diffNext ts
95− AllZeros -> case h of
96− SixteenBit _ -> False
97− AllZeros -> False
98− _ -> diffNext ts
99− _ -> diffNext ts
100− firstValidToken l =
101− case head l of
102− SixteenBit _ -> True
103− DoubleColon -> True
104− AllZeros -> True
105− _ -> False
106− countDoubleColon l = length $ elemIndices DoubleColon l
107− tok1 = "1"
108−
109−countIPv4Addr = foldr oneMoreIPv4Addr 0
110− where
111− oneMoreIPv4Addr t c = case t of
112− IPv4Addr _ -> c + 1
113− otherwise -> c
114−
115−-- | This is the main function which returns 'Just' the list of a tokenized IPv6
116−-- address text representation validated against RFC 4291 and canonized
117−-- in conformation with RFC 5952, or 'Nothing'.
118−maybeTokIPv6Addr :: T.Text -> Maybe [IPv6AddrToken]
119−maybeTokIPv6Addr t =
120− case maybeIPv6AddrTokens t of
121− Just ltks -> if isIPv6Addr ltks
122− then Just $ (ipv4AddrReplacement . toDoubleColon . fromDoubleColon) ltks
123− else Nothing
124− Nothing -> Nothing
125− where
126− ipv4AddrReplacement ltks =
127− if ipv4AddrRewrite ltks
128− then init ltks ++ ipv4AddrToIPv6AddrTokens (last ltks)
129− else ltks
130−
131−-- | Returns 'Just' the list of tokenized pure IPv6 address, always rewriting an
132−-- embedded IPv4 address if present.
133−maybeTokPureIPv6Addr :: T.Text -> Maybe [IPv6AddrToken]
134−maybeTokPureIPv6Addr t = do
135− ltks <- maybeIPv6AddrTokens t
136− if isIPv6Addr ltks
137− then Just $ (toDoubleColon . ipv4AddrReplacement . fromDoubleColon) ltks
138− else Nothing
139− where
140− ipv4AddrReplacement ltks' = init ltks' ++ ipv4AddrToIPv6AddrTokens (last ltks')
141−
142−-- | Tokenize a 'T.Text' into 'Just' a list of 'IPv6AddrToken', or 'Nothing'.
143−maybeIPv6AddrTokens :: T.Text -> Maybe [IPv6AddrToken]
144−maybeIPv6AddrTokens s =
145− case readText s of
146− Done r l -> traceShow (r,l) $ if r==T.empty then Just l else Nothing
147− Fail {} -> Nothing
148− where
149− readText s = feed (parse (many1 $ ipv4Addr <|> sixteenBit <|> doubleColon <|> colon) s) T.empty
150−
151−-- | An embedded IPv4 address have to be rewritten to output a pure IPv6 Address
152−-- text representation in hexadecimal digits. But some well-known prefixed IPv6
153−-- addresses have to keep visible in their text representation the fact that
154−-- they deals with IPv4 to IPv6 transition process (RFC 5952 Section 5):
155−--
156−-- IPv4-compatible IPv6 address like "::1.2.3.4"
157−--
158−-- IPv4-mapped IPv6 address like "::ffff:1.2.3.4"
159−--
160−-- IPv4-translated address like "::ffff:0:1.2.3.4"
161−--
162−-- IPv4-translatable address like "64:ff9b::1.2.3.4"
163−--
164−-- ISATAP address like "fe80::5efe:1.2.3.4"
165−--
166−ipv4AddrRewrite :: [IPv6AddrToken] -> Bool
167−ipv4AddrRewrite tks =
168− case last tks of
169− IPv4Addr _ -> do
170− let itks = init tks
171− not (itks == [DoubleColon]
172− || itks == [DoubleColon,SixteenBit tokffff,Colon]
173− || itks == [DoubleColon,SixteenBit tokffff,Colon,AllZeros,Colon]
174− || itks == [SixteenBit "64",Colon,SixteenBit "ff9b",DoubleColon]
175− || [SixteenBit "200",Colon,SixteenBit tok5efe,Colon] `isSuffixOf` itks
176− || [AllZeros,Colon,SixteenBit tok5efe,Colon] `isSuffixOf` itks
177− || [DoubleColon,SixteenBit tok5efe,Colon] `isSuffixOf` itks)
178− _ -> False
179− where
180− tokffff = "ffff"
181− tok5efe = "5efe"
182−
183−-- | Rewrites an embedded 'IPv4Addr' into the corresponding list of pure 'IPv6Addr' tokens.
184−--
185−-- > ipv4AddrToIPv6AddrTokens (IPv4Addr "127.0.0.1") == [SixteenBits "7f0",Colon,SixteenBits "1"]
186−--
187−ipv4AddrToIPv6AddrTokens :: IPv6AddrToken -> [IPv6AddrToken]
188−ipv4AddrToIPv6AddrTokens t =
189− case t of
190− IPv4Addr a -> do
191− let m = toHex a
192− [ SixteenBit ((!!) m 0 <> addZero ((!!) m 1))
193− , Colon
194− , SixteenBit ((!!) m 2 <> addZero ((!!) m 3)) ]
195− _ -> [t]
196− where
197− toHex a = map (\x -> T.pack $ showHex (read (T.unpack x)::Int) "") $ T.split (=='.') a
198− addZero d = if T.length d == 1 then tok0 <> d else d
199−
200−expandTokens :: [IPv6AddrToken] -> [IPv6AddrToken]
201−expandTokens = map expandToken
202− where expandToken (SixteenBit s) = SixteenBit $ T.justifyRight 4 '0' s
203− expandToken AllZeros = SixteenBit "0000"
204− expandToken t = t
205−
206−fromDoubleColon :: [IPv6AddrToken] -> [IPv6AddrToken]
207−fromDoubleColon tks =
208− if DoubleColon `notElem` tks
209− then tks
210− else do let s = splitAt (fromJust $ elemIndex DoubleColon tks) tks
211− let fsts = fst s
212− let snds = if not (null (snd s)) then tail(snd s) else []
213− let fste = if null fsts then [] else fsts ++ [Colon]
214− let snde = if null snds then [] else Colon : snds
215− fste ++ allZerosTokensReplacement(quantityOfAllZerosTokenToReplace tks) ++ snde
216− where
217− allZerosTokensReplacement x = intersperse Colon (replicate x AllZeros)
218− quantityOfAllZerosTokenToReplace x =
219− ntks tks - foldl (\c x -> if (x /= DoubleColon) && (x /= Colon) then c+1 else c) 0 x
220− where
221− ntks tks = if countIPv4Addr tks == 1 then 7 else 8
222−
223−toDoubleColon :: [IPv6AddrToken] -> [IPv6AddrToken]
224−toDoubleColon tks =
225− zerosToDoubleColon tks (zerosRunToReplace $ zerosRunsList tks)
226− where
227− zerosToDoubleColon :: [IPv6AddrToken] -> (Int,Int) -> [IPv6AddrToken]
228− -- No all zeros token, so no double colon replacement...
229− zerosToDoubleColon ls (_,0) = ls
230− -- "The symbol '::' MUST NOT be used to shorten just one 16-bit 0 field" (RFC 5952 4.2.2)
231− zerosToDoubleColon ls (_,1) = ls
232− zerosToDoubleColon ls (i,l) =
233− let ls' = filter (/= Colon) ls
234− in intersperse Colon (Prelude.take i ls') ++ [DoubleColon] ++ intersperse Colon (drop (i+l) ls')
235− zerosRunToReplace t =
236− let l = longestLengthZerosRun t
237− in (firstLongestZerosRunIndex t l,l)
238− where
239− firstLongestZerosRunIndex x y = sum . snd . unzip $ Prelude.takeWhile (/=(True,y)) x
240− longestLengthZerosRun x =
241− maximum $ map longest x
242− where longest t = case t of
243− (True,i) -> i
244− _ -> 0
245− zerosRunsList x = map helper $ groupZerosRuns x
246− where
247− helper h = (head h == AllZeros, lh) where lh = length h
248− groupZerosRuns = group . filter (/= Colon)
249−
250−ipv6TokensToIPv6Addr :: [IPv6AddrToken] -> Maybe IPv6Addr
251−ipv6TokensToIPv6Addr l = Just $ IPv6Addr $ ipv6TokensToText l
252−
253−fullSixteenBit :: T.Text -> Maybe IPv6AddrToken
254−fullSixteenBit t =
255− case parse ipv6AddrFullChunk t of
256− Done a b -> if a==T.empty then Just $ SixteenBit $ T.pack b else Nothing
257− _ -> Nothing
258−
259−macAddr :: Parser (Maybe [IPv6AddrToken])
260−macAddr = do
261− n1 <- count 2 hexaChar <* ":"
262− n2 <- count 2 hexaChar <* ":"
263− n3 <- count 2 hexaChar <* ":"
264− n4 <- count 2 hexaChar <* ":"
265− n5 <- count 2 hexaChar <* ":"
266− n6 <- count 2 hexaChar
267− return $ maybeIPv6AddrTokens $ T.pack $ concat [n1,n2,n3,n4,n5,n6]
268−
269−sixteenBit :: Parser IPv6AddrToken
270−sixteenBit = do
271− r <- ipv6AddrFullChunk <|> count 3 hexaChar <|> count 2 hexaChar <|> count 1 hexaChar
272− -- "Leading zeros MUST be suppressed" (RFC 5952, 4.1)
273− let r' = T.dropWhile (=='0') $ T.pack r
274− return $ if T.null r'
275− then AllZeros
276− -- Hexadecimal digits MUST be in lowercase (RFC 5952 4.3)
277− else SixteenBit $ T.toLower r'
278−
279−ipv4Addr :: Parser IPv6AddrToken
280−ipv4Addr = do
281− n1 <- manyDigits <* "."
282− if n1 /= T.empty
283− then do n2 <- manyDigits <* "."
284− if n2 /= T.empty
285− then do n3 <- manyDigits <* "."
286− if n3 /= T.empty
287− then do n4 <- manyDigits
288− if n4 /= T.empty
289− then return $ IPv4Addr $ T.intercalate "." [n1,n2,n3,n4]
290− else parserFailure
291− else parserFailure
292− else parserFailure
293− else parserFailure
294− where
295− parserFailure = fail "ipv4Addr parsing failure"
296− manyDigits = do
297− ds <- takeWhile1 isDigit
298− case R.decimal ds of
299− Right (n,_) -> return (if n < 256 then T.pack $ show n else T.empty)
300− Left _ -> return T.empty
301−
302−doubleColon :: Parser IPv6AddrToken
303−doubleColon = do
304− string "::"
305− return DoubleColon
306−
307−colon :: Parser IPv6AddrToken
308−colon = do
309− string ":"
310− return Colon
311−
312−ipv6AddrFullChunk :: Parser String
313−ipv6AddrFullChunk = count 4 hexaChar
314−
315−hexaChar :: Parser Char
316−hexaChar = satisfy (inClass "0-9a-fA-F")
tests/QC/IPv6/Types.hsdeleted−29
@@ -1,29 +0,0 @@
1−-- -----------------------------------------------------------------------------
2−
3−-- |
4−-- Module : Text.IPv6Addr
5−-- Copyright : Copyright © Michel Boucey 2011-2015
6−-- License : BSD-Style
7−-- Maintainer : michel.boucey@gmail.com
8−--
9−-- Dealing with IPv6 address text representations, canonization and manipulations.
10−--
11−
12−-- -----------------------------------------------------------------------------
13−
14−module QC.IPv6.Types where
15−
16−import qualified Data.Text as T
17−
18−data IPv6Addr = IPv6Addr T.Text
19−
20−instance Show IPv6Addr where
21− show (IPv6Addr addr) = T.unpack addr
22−
23−data IPv6AddrToken
24− = SixteenBit T.Text -- ^ A four hexadecimal digits group representing a 16-Bit chunk
25− | AllZeros -- ^ An all zeros 16-Bit chunk
26− | Colon -- ^ A separator between 16-Bit chunks
27− | DoubleColon -- ^ A double-colon stands for a unique compression of many consecutive 16-Bit chunks
28− | IPv4Addr T.Text -- ^ An embedded IPv4 address as representation of the last 32-Bit
29− deriving (Eq,Show)
tests/QC/Rechunked.hs+2−3
@@ -6,7 +6,7 @@ module QC.Rechunked (
66 ) where
77
88import Control.Monad (forM, forM_)
9−import Control.Monad.ST (ST, runST)
9+import Control.Monad.ST (runST)
1010import Data.List (unfoldr)
1111import Test.QuickCheck (Gen, choose)
1212import qualified Data.ByteString as B
@@ -29,7 +29,7 @@ rechunk_ split len xs = (unfoldr go . (,) xs) `fmap` rechunkSizes (len xs)
2929
3030rechunkSizes :: Int -> Gen [Int]
3131rechunkSizes n0 = shuffle =<< loop [] (0:repeat 1) n0
32− where loop _ [] _ = error "it's 2015, where's my Stream type?"
32+ where loop _ [] _ = error "it's 2014, where's my Stream type?"
3333 loop acc (lb:lbs) n
3434 | n <= 0 = shuffle (reverse acc)
3535 | otherwise = do
@@ -49,7 +49,6 @@ fisherYates xs = (V.toList . V.backpermute v) `fmap` swapIndices (G.length v)
4949 return (runST (swapAll swaps))
5050 where
5151 n = n0 - 1
52− swapAll :: [(Int,Int)] -> ST s (V.Vector Int)
5352 swapAll ijs = do
5453 mv <- G.unsafeThaw (G.enumFromTo 0 n :: V.Vector Int)
5554 forM_ ijs $ uncurry (M.swap mv)
tests/QC/Simple.hs+3−3
@@ -10,8 +10,8 @@ import Data.ByteString (ByteString)
1010import Data.List (foldl')
1111import Data.Maybe (fromMaybe)
1212import QC.Rechunked (rechunkBS)
13−import Test.Tasty (TestTree)
14−import Test.Tasty.QuickCheck (testProperty)
13+import Test.Framework (Test)
14+import Test.Framework.Providers.QuickCheck2 (testProperty)
1515import Test.QuickCheck (Property, counterexample, forAll)
1616import qualified Data.Attoparsec.ByteString.Char8 as A
1717
@@ -31,7 +31,7 @@ parse :: A.Parser r -> [ByteString] -> A.Result r
3131parse p (x:xs) = foldl' A.feed (A.parse p x) xs
3232parse p [] = A.parse p ""
3333
34−tests :: [TestTree]
34+tests :: [Test]
3535tests = [
3636 testProperty "issue75" t_issue75
3737 ]
tests/QC/Text.hs+14−35
@@ -1,26 +1,19 @@
1−{-# LANGUAGE BangPatterns, CPP, OverloadedStrings #-}
1+{-# LANGUAGE BangPatterns, OverloadedStrings #-}
22{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}
33module QC.Text (tests) where
44
5−#if !MIN_VERSION_base(4,8,0)
6−import Control.Applicative ((<*>), (<$>))
7−#endif
5+import Control.Applicative ((<$>), (<*>))
86import Data.Int (Int64)
9−import Data.Word (Word8)
107import Prelude hiding (take, takeWhile)
118import QC.Common (liftOp, parseT)
12−import qualified QC.Text.FastSet as FastSet
13−import qualified QC.Text.Regressions as Regressions
14−import Test.Tasty (TestTree, testGroup)
15−import Test.Tasty.QuickCheck (testProperty)
9+import Test.Framework (Test)
10+import Test.Framework.Providers.QuickCheck2 (testProperty)
1611import Test.QuickCheck
1712import qualified Data.Attoparsec.Text as P
1813import qualified Data.Attoparsec.Text.Lazy as PL
1914import qualified Data.Attoparsec.Text.FastSet as S
20−import qualified Data.ByteString as BS
2115import qualified Data.Char as Char
2216import qualified Data.Text as T
23−import qualified Data.Text.Encoding as TE
2417import qualified Data.Text.Lazy as L
2518
2619-- Basic byte-level combinators.
@@ -67,18 +60,9 @@ string :: L.Text -> L.Text -> Property
6760string s t = parseT (P.string s') (s `L.append` t) === Just s'
6861 where s' = toStrict s
6962
70−strings :: L.Text -> L.Text -> L.Text -> Property
71−strings s t u =
72− parseT (P.string (toStrict s) >> P.string t') (L.concat [s,t,u])
73− === Just t'
74− where t' = toStrict t
75−
76−-- | Note: "simple, and efficient" works for well formed input...
77−-- i.e. e.g. Latin1 texts
78−stringCI :: [Word8] -> Property
79−stringCI ws = P.parseOnly (P.stringCI fs) s === Right s
63+stringCI :: T.Text -> Property
64+stringCI s = P.parseOnly (P.stringCI fs) s === Right s
8065 where fs = T.toCaseFold s
81− s = TE.decodeLatin1 (BS.pack ws)
8266
8367asciiCI :: T.Text -> Gen Bool
8468asciiCI x =
@@ -126,8 +110,8 @@ takeWhile w s =
126110
127111takeWhile1 :: Char -> L.Text -> Property
128112takeWhile1 w s =
129− let s' = L.cons w s
130− (h,t) = L.span (<=w) s'
113+ let s' = L.cons w s
114+ (h,t) = L.span (<=w) s'
131115 in case PL.parse (P.takeWhile1 (<=w)) s' of
132116 PL.Done t' h' -> t === t' .&&. toStrict h === h'
133117 _ -> property False
@@ -156,21 +140,19 @@ endOfLine s =
156140 (c, fst <$> L.uncons s') === ('\r', Just '\n')
157141
158142scan :: L.Text -> Positive Int64 -> Property
159−-- for some reason, if counterexample is removed, this test fails?
160−scan s (Positive k) = counterexample (show s)
161− $ parseT p s === Just (toStrict $ L.take k s)
143+scan s (Positive k) = parseT p s === Just (toStrict $ L.take k s)
162144 where p = P.scan k $ \ n _ ->
163145 if n > 0 then let !n' = n - 1 in Just n' else Nothing
164−
146+
165147members :: String -> Property
166−members s = property $ all (`S.member` set) s
148+members s = property . all (`S.member` set) s
167149 where set = S.fromList s
168−
150+
169151nonmembers :: String -> String -> Property
170152nonmembers s s' = property . not . any (`S.member` set) $ filter (not . (`elem` s)) s'
171153 where set = S.fromList s
172−
173−tests :: [TestTree]
154+
155+tests :: [Test]
174156tests = [
175157 testProperty "anyChar" anyChar
176158 , testProperty "asciiCI" asciiCI
@@ -186,7 +168,6 @@ tests = [
186168 , testProperty "skip" skip
187169 , testProperty "skipWhile" skipWhile
188170 , testProperty "string" string
189− , testProperty "strings" strings
190171 , testProperty "stringCI" stringCI
191172 , testProperty "take" take
192173 , testProperty "takeText" takeText
@@ -198,6 +179,4 @@ tests = [
198179 , testProperty "takeWhile1_empty" takeWhile1_empty
199180 , testProperty "members" members
200181 , testProperty "nonmembers" nonmembers
201− , testGroup "FastSet" FastSet.tests
202− , testGroup "Regressions" Regressions.tests
203182 ]
tests/QC/Text/FastSet.hsdeleted−15
@@ -1,15 +0,0 @@
1−module QC.Text.FastSet where
2−
3−import Test.Tasty (TestTree)
4−import Test.Tasty.QuickCheck (testProperty)
5−import Test.QuickCheck
6−import qualified Data.Attoparsec.Text.FastSet as FastSet
7−
8−membershipCorrect :: String -> String -> Property
9−membershipCorrect members others =
10− let fs = FastSet.fromList members
11− correct c = (c `FastSet.member` fs) == (c `elem` members)
12− in property $ all correct (members ++ others)
13−
14−tests :: [TestTree]
15−tests = [ testProperty "membership is correct" membershipCorrect ]
tests/QC/Text/Regressions.hsdeleted−54
@@ -1,54 +0,0 @@
1−{-# LANGUAGE OverloadedStrings #-}
2−
3−module QC.Text.Regressions (
4− tests
5− ) where
6−
7−import Data.Text (Text)
8−import qualified Data.Text as T
9−import Data.List (foldl')
10−import Data.Maybe (fromMaybe)
11−import Data.Char (isLower)
12−import Data.Monoid ((<>))
13−import QC.Rechunked (rechunkT)
14−import Test.Tasty (TestTree)
15−import Test.Tasty.QuickCheck (testProperty)
16−import Test.QuickCheck (Property, counterexample, forAll)
17−import qualified Data.Attoparsec.Text as A
18−
19−
20−--------------------------------------------------------------------------------
21−-- 105 was about runScanner not always returning the final state. The result
22−-- did depend on how the data was fed to the parser.
23−
24−t_issue105 :: Property
25−t_issue105 = expect issue105 "lowER" (A.Done "ER" "low")
26−
27−issue105 :: A.Parser Text
28−issue105 = do
29− (_, firstFourLowercaseLetters) <- A.runScanner "" f
30− return $ firstFourLowercaseLetters
31−
32− where
33− f :: Text -> Char -> Maybe Text
34− f acc c = if T.length acc < 4 && isLower c
35− then Just $ acc <> T.singleton c
36− else Nothing
37−
38−
39−expect :: (Show r, Eq r) => A.Parser r -> Text -> A.Result r -> Property
40−expect p input wanted =
41− forAll (rechunkT input) $ \in' ->
42− let result = parse p in'
43− in counterexample (show result ++ " /= " ++ show wanted) $
44− fromMaybe False (A.compareResults result wanted)
45−
46−parse :: A.Parser r -> [Text] -> A.Result r
47−parse p (x:xs) = foldl' A.feed (A.parse p x) xs
48−parse p [] = A.parse p ""
49−
50−
51−tests :: [TestTree]
52−tests = [
53− testProperty "issue105" t_issue105
54− ]
tests/TestFastSet.hsnew file+28
@@ -0,0 +1,28 @@
1+module Main (main) where
2+
3+import Data.Word (Word8)
4+import qualified Data.Attoparsec.ByteString.FastSet as F
5+import qualified Data.Attoparsec.Text.FastSet as F
6+import Test.QuickCheck
7+
8+prop_members s =
9+ let set = F.fromList s
10+ in all (`F.memberWord8` set) s
11+
12+prop_nonmembers s s' =
13+ let set = F.fromList s
14+ in not . any (`F.memberWord8` set) $ filter (not . (`elem` s)) s'
15+
16+prop_membersText s =
17+ let set = F.fromList s
18+ in all (`FT.member` set) s
19+
20+prop_nonmembersText s s' =
21+ let set = FT.fromList s
22+ in not . any (`FT.member` set) $ filter (not . (`elem` s)) s'
23+
24+main = do
25+ quickCheck prop_members
26+ quickCheck prop_nonmembers
27+ quickCheck prop_membersText
28+ quickCheck prop_nonmembersText