git.iko.soy/typeable/attoparsec
on master help sign in
12 files changed+228−126
since splitsnapshots
unifiedsplit
.travis.yml+149−79 Data/Attoparsec/Internal/Types.hs+7−4 Data/Attoparsec/Text/Internal.hs+11−13 Data/Attoparsec/Zepto.hs+2 attoparsec.cabal+12−11 benchmarks/HeadersByteString.hs+10−1 benchmarks/HeadersByteString/Atto.hs+9−1 benchmarks/http-request.txt+3−8 benchmarks/http-response.txt+2−4 changelog.md+8 tests/QC/ByteString.hs+4−2 tests/QC/Text.hs+11−3
.travis.yml+149−79
@@ -1,91 +1,161 @@
1−# This file has been generated -- see https://github.com/hvr/multi-ghc-travis
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+#
29language: c
3−sudo: false
4−
5−# Bryan threatens to turn off Travis-CI if he gets any email :-)
6−notifications:
7− email: false
8−
10+dist: xenial
11+git:
12+ # whether to recursively clone submodules
13+ submodules: false
914cache:
1015 directories:
11− - $HOME/.cabsnap
1216 - $HOME/.cabal/packages
13−
17+ - $HOME/.cabal/store
1418before_cache:
15− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
16− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
17−
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
1827matrix:
1928 include:
20− - env: CABALVER=1.16 GHCVER=7.4.2
21− compiler: ": #GHC 7.4.2"
22− addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
23− - env: CABALVER=1.16 GHCVER=7.6.3
24− compiler: ": #GHC 7.6.3"
25− addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
26− - env: CABALVER=1.18 GHCVER=7.8.4
27− compiler: ": #GHC 7.8.4"
28− addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
29− - env: CABALVER=1.22 GHCVER=7.10.3
30− compiler: ": #GHC 7.10.3"
31− addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
32− - env: CABALVER=1.24 GHCVER=8.0.1
33− compiler: ": #GHC 8.0.1"
34− addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
35−
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"]}}
3651before_install:
37− - unset CC
38− - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
39−
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
4082install:
41− - cabal --version
42− - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
43− - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
44− then
45− zcat $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz >
46− $HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
47− fi
48− - travis_retry cabal update -v
49− - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
50− - cabal install --only-dependencies --enable-tests --dry -v > installplan.txt
51− - sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt
52−
53−# check whether current requested install-plan matches cached package-db snapshot
54− - if diff -u installplan.txt $HOME/.cabsnap/installplan.txt;
55− then
56− echo "cabal build-cache HIT";
57− rm -rfv .ghc;
58− cp -a $HOME/.cabsnap/ghc $HOME/.ghc;
59− cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin $HOME/.cabal/;
60− else
61− echo "cabal build-cache MISS";
62− rm -rf $HOME/.cabsnap;
63− mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
64− cabal install --only-dependencies --enable-tests;
65− fi
66−
67−# snapshot package-db on cache miss
68− - if [ ! -d $HOME/.cabsnap ];
69− then
70− echo "snapshotting package-db to build-cache";
71− mkdir $HOME/.cabsnap;
72− cp -a $HOME/.ghc $HOME/.cabsnap/ghc;
73− cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
74− fi
75−
76−# Here starts the actual work to be performed for the package under test;
77−# any command which exits with a non-zero exit code causes the build to fail.
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
78125script:
79− - if [ -f configure.ac ]; then autoreconf -i; fi
80− - cabal configure --enable-tests -v2 # -v2 provides useful information for debugging
81− - cabal build # this builds all libraries and executables (including tests)
82− - cabal test
83− - cabal sdist # tests that a source-distribution can be generated
84−
85−# Check that the resulting source distribution can be built & installed.
86−# If there are no other `.tar.gz` files in `dist`, this can be even simpler:
87−# `cabal install --force-reinstalls dist/*-*.tar.gz`
88− - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
89− (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
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
90159
160+# REGENDATA ["--tests-jobs=>=7.4","--no-benchmarks","attoparsec.cabal"]
91161# EOF
Data/Attoparsec/Internal/Types.hs+7−4
@@ -1,4 +1,4 @@
1−{-# LANGUAGE BangPatterns, GeneralizedNewtypeDeriving, OverloadedStrings,
1+{-# LANGUAGE CPP, BangPatterns, GeneralizedNewtypeDeriving, OverloadedStrings,
22 Rank2Types, RecordWildCards, TypeFamilies #-}
33-- |
44-- Module : Data.Attoparsec.Internal.Types
@@ -39,7 +39,7 @@ import Data.ByteString.Internal (w2c)
3939import Data.Text (Text)
4040import qualified Data.Text as Text
4141import Data.Text.Unsafe (Iter(..))
42−import Prelude hiding (getChar, succ)
42+import Prelude hiding (succ)
4343import qualified Data.Attoparsec.ByteString.Buffer as B
4444import qualified Data.Attoparsec.Text.Buffer as T
4545
@@ -136,8 +136,10 @@ instance Mon.Monoid More where
136136 mempty = Incomplete
137137
138138instance Monad (Parser i) where
139+#if !(MIN_VERSION_base(4,13,0))
139140 fail = Fail.fail
140141 {-# INLINE fail #-}
142+#endif
141143
142144 return = App.pure
143145 {-# INLINE return #-}
@@ -207,8 +209,9 @@ instance Alternative (Parser i) where
207209 {-# INLINE (<|>) #-}
208210
209211 many v = many_v
210− where many_v = some_v <|> pure []
211− some_v = (:) App.<$> v <*> many_v
212+ where
213+ many_v = some_v <|> pure []
214+ some_v = (:) <$> v <*> many_v
212215 {-# INLINE many #-}
213216
214217 some v = some_v
Data/Attoparsec/Text/Internal.hs+11−13
@@ -1,4 +1,4 @@
1−{-# LANGUAGE BangPatterns, CPP, FlexibleInstances, GADTs, OverloadedStrings,
1+{-# LANGUAGE BangPatterns, FlexibleInstances, GADTs, OverloadedStrings,
22 Rank2Types, RecordWildCards, TypeFamilies, TypeSynonymInstances #-}
33{-# OPTIONS_GHC -fno-warn-orphans #-}
44-- |
@@ -65,17 +65,14 @@ module Data.Attoparsec.Text.Internal
6565 , atEnd
6666 ) where
6767
68−#if !MIN_VERSION_base(4,8,0)
69−import Control.Applicative ((<$>))
70−#endif
71−import Control.Applicative ((<|>))
68+import Control.Applicative ((<|>), (<$>), pure, (*>))
7269import Control.Monad (when)
7370import Data.Attoparsec.Combinator ((<?>))
7471import Data.Attoparsec.Internal
7572import Data.Attoparsec.Internal.Types hiding (Parser, Failure, Success)
7673import qualified Data.Attoparsec.Text.Buffer as Buf
7774import Data.Attoparsec.Text.Buffer (Buffer, buffer)
78−import Data.Char (chr, ord)
75+import Data.Char (isAsciiUpper, isAsciiLower, toUpper, toLower)
7976import Data.List (intercalate)
8077import Data.String (IsString(..))
8178import Data.Text.Internal (Text(..))
@@ -225,15 +222,16 @@ stringCI s = go 0
225222
226223-- | Satisfy a literal string, ignoring case for characters in the ASCII range.
227224asciiCI :: Text -> Parser Text
228−asciiCI s = string_ (stringSuspended asciiToLower) asciiToLower s
229− where
230− asciiToLower = T.map f
231− where
232− offset = ord 'a' - ord 'A'
233− f c | 'A' <= c && c <= 'Z' = chr (ord c + offset)
234− | otherwise = c
225+asciiCI s = fmap fst $ match $ T.foldr ((*>) . asciiCharCI) (pure ()) s
235226{-# INLINE asciiCI #-}
236227
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+
237235-- | Skip past input for as long as the predicate returns 'True'.
238236skipWhile :: (Char -> Bool) -> Parser ()
239237skipWhile p = go
Data/Attoparsec/Zepto.hs+2
@@ -92,8 +92,10 @@ instance Monad m => Monad (ZeptoT m) where
9292 Fail err -> return (Fail err)
9393 {-# INLINE (>>=) #-}
9494
95+#if !(MIN_VERSION_base(4,13,0))
9596 fail = Fail.fail
9697 {-# INLINE fail #-}
98+#endif
9799
98100instance Monad m => Fail.MonadFail (ZeptoT m) where
99101 fail msg = Parser $ \_ -> return (Fail msg)
attoparsec.cabal+12−11
@@ -1,12 +1,13 @@
11name: attoparsec
2−version: 0.13.1.0
2+version: 0.13.2.2
3+x-revision: 3
34license: BSD3
45license-file: LICENSE
56category: Text, Parsing
67author: Bryan O'Sullivan <bos@serpentine.com>
7−maintainer: Bryan O'Sullivan <bos@serpentine.com>
8+maintainer: Bryan O'Sullivan <bos@serpentine.com>, Ben Gamari <ben@smart-cactus.org>
89stability: experimental
9−tested-with: GHC == 7.0.1, GHC == 7.2.1, GHC == 7.4.2, GHC ==7.6.3, GHC ==7.8.4, GHC ==7.10.3
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
1011synopsis: Fast combinator parsing for bytestrings and text
1112cabal-version: >= 1.8
1213homepage: https://github.com/bos/attoparsec
@@ -39,12 +40,12 @@ Flag developer
3940
4041library
4142 build-depends: array,
42− base >= 4.2 && < 5,
43+ base >= 4.3 && < 5,
4344 bytestring,
4445 containers,
4546 deepseq,
4647 scientific >= 0.3.1 && < 0.4,
47− transformers,
48+ transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.6,
4849 text >= 1.1.1.3
4950 if impl(ghc < 7.4)
5051 build-depends:
@@ -53,7 +54,7 @@ library
5354 if !impl(ghc >= 8.0)
5455 -- Data.Semigroup && Control.Monad.Fail are available in base-4.9+
5556 build-depends: fail == 4.9.*,
56− semigroups >=0.16.1 && <0.19
57+ semigroups >=0.16.1 && <0.20
5758
5859 exposed-modules: Data.Attoparsec
5960 Data.Attoparsec.ByteString
@@ -124,22 +125,22 @@ test-suite tests
124125
125126 build-depends:
126127 array,
127− base >= 4 && < 5,
128+ base,
128129 bytestring,
129130 deepseq >= 1.1,
130− QuickCheck >= 2.7 && < 2.10,
131+ QuickCheck >= 2.13.2 && < 2.14,
131132 quickcheck-unicode,
132133 scientific,
133134 tasty >= 0.11,
134135 tasty-quickcheck >= 0.8,
135136 text,
136− transformers,
137+ transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.6,
137138 vector
138139
139140 if !impl(ghc >= 8.0)
140141 -- Data.Semigroup && Control.Monad.Fail are available in base-4.9+
141142 build-depends: fail == 4.9.*,
142− semigroups >=0.16.1 && <0.19
143+ semigroups >=0.16.1 && <0.20
143144
144145benchmark benchmarks
145146 type: exitcode-stdio-1.0
@@ -178,7 +179,7 @@ benchmark benchmarks
178179 parsec >= 3.1.2,
179180 scientific,
180181 text >= 1.1.1.0,
181− transformers,
182+ transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.6,
182183 unordered-containers,
183184 vector
184185
benchmarks/HeadersByteString.hs+10−1
@@ -9,6 +9,15 @@ import qualified Data.Attoparsec.ByteString.Char8 as B
99import qualified Data.Attoparsec.ByteString.Lazy as BL
1010import qualified Data.ByteString.Char8 as B
1111
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.
20+
1221headers :: IO Benchmark
1322headers = do
1423 req <- B.readFile =<< pathTo "http-request.txt"
@@ -18,7 +27,7 @@ headers = do
1827 return $ bgroup "headers" [
1928 bgroup "B" [
2029 bench "request" $ nf (B.parseOnly request) req
21− , bench "warp" $ nfIO (parseHeaderLines [req])
30+ , bench "warp" $ nfIO (parseHeaderLines (B.split '\n' req))
2231 , bench "response" $ nf (B.parseOnly response) resp
2332 ]
2433 , bgroup "BL" [
benchmarks/HeadersByteString/Atto.hs+9−1
@@ -15,8 +15,16 @@ import qualified Data.ByteString.Char8 as B
1515instance NFData HttpVersion where
1616 rnf !_ = ()
1717
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+
1826header = do
19− name <- B.takeWhile1 (B.inClass "a-zA-Z0-9_-") <* B.char ':' <* B.skipSpace
27+ name <- B.takeWhile1 isHeaderChar <* B.char ':' <* B.skipSpace
2028 body <- bodyLine
2129 return (name, body)
2230
benchmarks/http-request.txt+3−8
@@ -1,14 +1,9 @@
11GET / HTTP/1.1
22Host: twitter.com
3−Accept: text/html, application/xhtml+xml, application/xml; q=0.9,
4− image/webp, */*; q=0.8
3+Accept: text/html, application/xhtml+xml, application/xml; q=0.9, image/webp, */*; q=0.8
54Accept-Encoding: gzip,deflate,sdch
65Accept-Language: en-GB,en-US;q=0.8,en;q=0.6
76Cache-Control: max-age=0
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
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
149
benchmarks/http-response.txt+2−4
@@ -3,10 +3,8 @@ 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;
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
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
108P3P: CP="This is not a P3P policy! See http://www.google.com/support/accounts/bin/answer.py?hl=en&answer=151657 for more info."
119Server: gws
1210X-XSS-Protection: 1; mode=block
changelog.md+8
@@ -1,3 +1,11 @@
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+
190.13.1.0
210
311* `runScanner` now correctly returns the final state
tests/QC/ByteString.hs+4−2
@@ -26,9 +26,11 @@ import qualified Data.ByteString.Lazy.Char8 as L8
2626satisfy :: Word8 -> L.ByteString -> Property
2727satisfy w s = parseBS (P.satisfy (<=w)) (L.cons w s) === Just w
2828
29−satisfyWith :: Char -> L.ByteString -> Property
30−satisfyWith c s = parseBS (P.satisfyWith (chr . fromIntegral) (<=c))
29+satisfyWith :: Word8 -> L.ByteString -> Property
30+satisfyWith w s = parseBS (P.satisfyWith (chr . fromIntegral) (<=c))
3131 (L.cons (fromIntegral (ord c)) s) === Just c
32+ where
33+ c = chr (fromIntegral w)
3234
3335word8 :: Word8 -> L.ByteString -> Property
3436word8 w s = parseBS (P.word8 w) (L.cons w s) === Just w
tests/QC/Text.hs+11−3
@@ -6,6 +6,7 @@ module QC.Text (tests) where
66import Control.Applicative ((<*>), (<$>))
77#endif
88import Data.Int (Int64)
9+import Data.Word (Word8)
910import Prelude hiding (take, takeWhile)
1011import QC.Common (liftOp, parseT)
1112import qualified QC.Text.FastSet as FastSet
@@ -16,8 +17,10 @@ import Test.QuickCheck
1617import qualified Data.Attoparsec.Text as P
1718import qualified Data.Attoparsec.Text.Lazy as PL
1819import qualified Data.Attoparsec.Text.FastSet as S
20+import qualified Data.ByteString as BS
1921import qualified Data.Char as Char
2022import qualified Data.Text as T
23+import qualified Data.Text.Encoding as TE
2124import qualified Data.Text.Lazy as L
2225
2326-- Basic byte-level combinators.
@@ -70,9 +73,12 @@ strings s t u =
7073 === Just t'
7174 where t' = toStrict t
7275
73−stringCI :: T.Text -> Property
74−stringCI s = P.parseOnly (P.stringCI fs) s === Right s
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
7580 where fs = T.toCaseFold s
81+ s = TE.decodeLatin1 (BS.pack ws)
7682
7783asciiCI :: T.Text -> Gen Bool
7884asciiCI x =
@@ -150,7 +156,9 @@ endOfLine s =
150156 (c, fst <$> L.uncons s') === ('\r', Just '\n')
151157
152158scan :: L.Text -> Positive Int64 -> Property
153−scan s (Positive k) = parseT p s === Just (toStrict $ L.take k s)
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)
154162 where p = P.scan k $ \ n _ ->
155163 if n > 0 then let !n' = n - 1 in Just n' else Nothing
156164