git.iko.soy/typeable/attoparsec
on fb6478b help sign in
.travis.yml+79−149
since splitsnapshots
unifiedsplit
@@ -1,161 +1,91 @@
1−# This Travis job script has been generated by a script via
1+# This file has been generated -- see https://github.com/hvr/multi-ghc-travis
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−#
9language: c
2language: c
10−dist: xenial
3+sudo: false
11−git:
4+
12− # whether to recursively clone submodules
5+# Bryan threatens to turn off Travis-CI if he gets any email :-)
6+notifications:
13− submodules: false
7+ email: false
8+
14cache:
9cache:
15 directories:
10 directories:
11+ - $HOME/.cabsnap
16 - $HOME/.cabal/packages
12 - $HOME/.cabal/packages
17− - $HOME/.cabal/store
13+
18before_cache:
14before_cache:
19− - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
15+ - rm -fv $HOME/.cabal/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.*
16+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
22− - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
17+
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
27matrix:
18matrix:
28 include:
19 include:
29− - compiler: ghc-8.8.1
20+ - env: CABALVER=1.16 GHCVER=7.4.2
30− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
21+ compiler: ": #GHC 7.4.2"
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"]}}
22+ addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
35− - compiler: ghc-8.2.2
23+ - env: CABALVER=1.16 GHCVER=7.6.3
36− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
24+ compiler: ": #GHC 7.6.3"
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"]}}
25+ addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
43− - compiler: ghc-7.6.3
26+ - env: CABALVER=1.18 GHCVER=7.8.4
44− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-2.4"]}}
45− - compiler: ghc-7.4.2
27+ compiler: ": #GHC 7.8.4"
46− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.4.2","cabal-install-2.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
47− - compiler: ghc-7.2.2
30+ compiler: ": #GHC 7.10.3"
48− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.2.2","cabal-install-2.4"]}}
31+ addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
32+ - env: CABALVER=1.24 GHCVER=8.0.1
49− - compiler: ghc-7.0.4
33+ compiler: ": #GHC 8.0.1"
50− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.0.4","cabal-install-2.4"]}}
34+ addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}
35+
51before_install:
36before_install:
52− - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
53− - WITHCOMPILER="-w $HC"
54− - HCPKG="$HC-pkg"
55− - unset CC
37+ - unset CC
56− - CABAL=/opt/ghc/bin/cabal
38+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
57− - CABALHOME=$HOME/.cabal
39+
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
82install:
40install:
83− - ${CABAL} --version
41+ - cabal --version
84− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
42+ - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
85− - TEST=--enable-tests
43+ - if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
86− - if [ $HCNUMVER -lt 70400 ] ; then TEST=--disable-tests ; fi
44+ then
87− - BENCH=--enable-benchmarks
45+ zcat $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz >
88− - BENCH=--disable-benchmarks
46+ $HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
89− - HEADHACKAGE=false
47+ fi
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
48+ - travis_retry cabal update -v
110− # Generate cabal.project
49+ - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
111− - rm -rf cabal.project cabal.project.local cabal.project.freeze
50+ - cabal install --only-dependencies --enable-tests --dry -v > installplan.txt
112− - touch cabal.project
51+ - sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt
113− - |
52+
114− echo "packages: ." >> cabal.project
53+# check whether current requested install-plan matches cached package-db snapshot
115− - |
54+ - if diff -u installplan.txt $HOME/.cabsnap/installplan.txt;
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"
55+ then
117− - cat cabal.project || true
56+ echo "cabal build-cache HIT";
118− - cat cabal.project.local || true
57+ rm -rfv .ghc;
119− - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
58+ cp -a $HOME/.cabsnap/ghc $HOME/.ghc;
120− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
59+ cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin $HOME/.cabal/;
121− - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
60+ else
122− - rm cabal.project.freeze
61+ echo "cabal build-cache MISS";
123− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
62+ rm -rf $HOME/.cabsnap;
124− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
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.
125script:
78script:
126− - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
79+ - if [ -f configure.ac ]; then autoreconf -i; fi
127− # Packaging...
80+ - cabal configure --enable-tests -v2 # -v2 provides useful information for debugging
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)
81+ - cabal build # this builds all libraries and executables (including tests)
146− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
82+ - cabal test
147− # Building with tests and benchmarks...
83+ - cabal sdist # tests that a source-distribution can be generated
148− # build & run tests, build benchmarks
84+
149− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
85+# Check that the resulting source distribution can be built & installed.
150− # Testing...
86+# If there are no other `.tar.gz` files in `dist`, this can be even simpler:
151− - if [ $HCNUMVER -ge 70400 ] ; then ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi
87+# `cabal install --force-reinstalls dist/*-*.tar.gz`
152− # cabal check...
88+ - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
153− - (cd ${PKGDIR_attoparsec} && ${CABAL} -vnormal check)
89+ (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
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
90
160−# REGENDATA ["--tests-jobs=>=7.4","--no-benchmarks","attoparsec.cabal"]
161# EOF
91# EOF
Data/Attoparsec/ByteString/Buffer.hs+8−10
@@ -1,4 +1,4 @@
1−{-# LANGUAGE BangPatterns #-}
1+{-# LANGUAGE BangPatterns, CPP #-}
2-- |
2-- |
3-- Module : Data.Attoparsec.ByteString.Buffer
3-- Module : Data.Attoparsec.ByteString.Buffer
4-- Copyright : Bryan O'Sullivan 2007-2015
4-- Copyright : Bryan O'Sullivan 2007-2015
@@ -57,8 +57,9 @@ import Control.Exception (assert)
57import Data.ByteString.Internal (ByteString(..), memcpy, nullForeignPtr)
57import Data.ByteString.Internal (ByteString(..), memcpy, nullForeignPtr)
58import Data.Attoparsec.Internal.Fhthagn (inlinePerformIO)
58import Data.Attoparsec.Internal.Fhthagn (inlinePerformIO)
59import Data.List (foldl1')
59import Data.List (foldl1')
60−import Data.Monoid as Mon (Monoid(..))
60+#if !MIN_VERSION_base(4,8,0)
61−import Data.Semigroup (Semigroup(..))
61+import Data.Monoid (Monoid(..))
62+#endif
62import Data.Word (Word8)
63import Data.Word (Word8)
63import Foreign.ForeignPtr (ForeignPtr, withForeignPtr)
64import Foreign.ForeignPtr (ForeignPtr, withForeignPtr)
64import Foreign.Ptr (castPtr, plusPtr)
65import Foreign.Ptr (castPtr, plusPtr)
@@ -87,17 +88,14 @@ buffer (PS fp off len) = Buf fp off len len 0
87unbuffer :: Buffer -> ByteString
88unbuffer :: Buffer -> ByteString
88unbuffer (Buf fp off len _ _) = PS fp off len
89unbuffer (Buf fp off len _ _) = PS fp off len
89
90
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−
95instance Monoid Buffer where
91instance Monoid Buffer where
96 mempty = Buf nullForeignPtr 0 0 0 0
92 mempty = Buf nullForeignPtr 0 0 0 0
97
93
98− mappend = (<>)
94+ mappend (Buf _ _ _ 0 _) b = b
95+ mappend a (Buf _ _ _ 0 _) = a
96+ mappend buf (Buf fp off len _ _) = append buf fp off len
99
97
100− mconcat [] = Mon.mempty
98+ mconcat [] = mempty
101 mconcat xs = foldl1' mappend xs
99 mconcat xs = foldl1' mappend xs
102
100
103pappend :: Buffer -> ByteString -> Buffer
101pappend :: Buffer -> ByteString -> Buffer
Data/Attoparsec/Internal/Types.hs+27−37
@@ -1,4 +1,4 @@
1−{-# LANGUAGE CPP, BangPatterns, GeneralizedNewtypeDeriving, OverloadedStrings,
1+{-# LANGUAGE BangPatterns, CPP, GeneralizedNewtypeDeriving, OverloadedStrings,
2 Rank2Types, RecordWildCards, TypeFamilies #-}
2 Rank2Types, RecordWildCards, TypeFamilies #-}
3-- |
3-- |
4-- Module : Data.Attoparsec.Internal.Types
4-- Module : Data.Attoparsec.Internal.Types
@@ -25,13 +25,13 @@ module Data.Attoparsec.Internal.Types
25 , Chunk(..)
25 , Chunk(..)
26 ) where
26 ) where
27
27
28+#if !MIN_VERSION_base(4,8,0)
28−import Control.Applicative as App (Applicative(..), (<$>))
29+import Control.Applicative (Applicative(..), (<$>))
30+import Data.Monoid (Monoid(..))
31+#endif
29import Control.Applicative (Alternative(..))
32import Control.Applicative (Alternative(..))
30import Control.DeepSeq (NFData(rnf))
33import Control.DeepSeq (NFData(rnf))
31import Control.Monad (MonadPlus(..))
34import Control.Monad (MonadPlus(..))
32−import qualified Control.Monad.Fail as Fail (MonadFail(..))
33−import Data.Monoid as Mon (Monoid(..))
34−import Data.Semigroup (Semigroup(..))
35import Data.Word (Word8)
35import Data.Word (Word8)
36import Data.ByteString (ByteString)
36import Data.ByteString (ByteString)
37import qualified Data.ByteString as BS
37import qualified Data.ByteString as BS
@@ -39,7 +39,7 @@ import Data.ByteString.Internal (w2c)
39import Data.Text (Text)
39import Data.Text (Text)
40import qualified Data.Text as Text
40import qualified Data.Text as Text
41import Data.Text.Unsafe (Iter(..))
41import Data.Text.Unsafe (Iter(..))
42−import Prelude hiding (succ)
42+import Prelude hiding (getChar, succ)
43import qualified Data.Attoparsec.ByteString.Buffer as B
43import qualified Data.Attoparsec.ByteString.Buffer as B
44import qualified Data.Attoparsec.Text.Buffer as T
44import qualified Data.Attoparsec.Text.Buffer as T
45
45
@@ -127,21 +127,17 @@ type Success i t a r = t -> Pos -> More -> a -> IResult i r
127data More = Complete | Incomplete
127data More = Complete | Incomplete
128 deriving (Eq, Show)
128 deriving (Eq, Show)
129
129
130−instance Semigroup More where
130+instance Monoid More where
131− c@Complete <> _ = c
131+ mappend c@Complete _ = c
132− _ <> m = m
132+ mappend _ m = m
133−
134−instance Mon.Monoid More where
135− mappend = (<>)
136− mempty = Incomplete
133+ mempty = Incomplete
137
134
138instance Monad (Parser i) where
135instance Monad (Parser i) where
139−#if !(MIN_VERSION_base(4,13,0))
136+ fail err = Parser $ \t pos more lose _succ -> lose t pos more [] msg
140− fail = Fail.fail
137+ where msg = "Failed reading: " ++ err
141 {-# INLINE fail #-}
138 {-# INLINE fail #-}
142−#endif
143
139
144− return = App.pure
140+ return v = Parser $ \t pos more _lose succ -> succ t pos more v
145 {-# INLINE return #-}
141 {-# INLINE return #-}
146
142
147 m >>= k = Parser $ \t !pos more lose succ ->
143 m >>= k = Parser $ \t !pos more lose succ ->
@@ -149,15 +145,6 @@ instance Monad (Parser i) where
149 in runParser m t pos more lose succ'
145 in runParser m t pos more lose succ'
150 {-# INLINE (>>=) #-}
146 {-# INLINE (>>=) #-}
151
147
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−
161plus :: Parser i a -> Parser i a -> Parser i a
148plus :: Parser i a -> Parser i a -> Parser i a
162plus f g = Parser $ \t pos more lose succ ->
149plus f g = Parser $ \t pos more lose succ ->
163 let lose' t' _pos' more' _ctx _msg = runParser g t' pos more' lose succ
150 let lose' t' _pos' more' _ctx _msg = runParser g t' pos more' lose succ
@@ -182,23 +169,23 @@ apP d e = do
182{-# INLINE apP #-}
169{-# INLINE apP #-}
183
170
184instance Applicative (Parser i) where
171instance Applicative (Parser i) where
185− pure v = Parser $ \t !pos more _lose succ -> succ t pos more v
172+ pure = return
186 {-# INLINE pure #-}
173 {-# INLINE pure #-}
187 (<*>) = apP
174 (<*>) = apP
188 {-# INLINE (<*>) #-}
175 {-# INLINE (<*>) #-}
189− m *> k = m >>= \_ -> k
176+
177+ -- These definitions are equal to the defaults, but this
178+ -- way the optimizer doesn't have to work so hard to figure
179+ -- that out.
180+ (*>) = (>>)
190 {-# INLINE (*>) #-}
181 {-# INLINE (*>) #-}
191− x <* y = x >>= \a -> y >> pure a
182+ x <* y = x >>= \a -> y >> return a
192 {-# INLINE (<*) #-}
183 {-# INLINE (<*) #-}
193
184
194−instance Semigroup (Parser i a) where
195− (<>) = plus
196− {-# INLINE (<>) #-}
197−
198instance Monoid (Parser i a) where
185instance Monoid (Parser i a) where
199 mempty = fail "mempty"
186 mempty = fail "mempty"
200 {-# INLINE mempty #-}
187 {-# INLINE mempty #-}
201− mappend = (<>)
188+ mappend = plus
202 {-# INLINE mappend #-}
189 {-# INLINE mappend #-}
203
190
204instance Alternative (Parser i) where
191instance Alternative (Parser i) where
@@ -209,9 +196,8 @@ instance Alternative (Parser i) where
209 {-# INLINE (<|>) #-}
196 {-# INLINE (<|>) #-}
210
197
211 many v = many_v
198 many v = many_v
212− where
213− many_v = some_v <|> pure []
199+ where many_v = some_v <|> pure []
214− some_v = (:) <$> v <*> many_v
200+ some_v = (:) <$> v <*> many_v
215 {-# INLINE many #-}
201 {-# INLINE many #-}
216
202
217 some v = some_v
203 some v = some_v
@@ -220,6 +206,10 @@ instance Alternative (Parser i) where
220 some_v = (:) <$> v <*> many_v
206 some_v = (:) <$> v <*> many_v
221 {-# INLINE some #-}
207 {-# INLINE some #-}
222
208
209+(<>) :: (Monoid m) => m -> m -> m
210+(<>) = mappend
211+{-# INLINE (<>) #-}
212+
223-- | A common interface for input chunks.
213-- | A common interface for input chunks.
224class Monoid c => Chunk c where
214class Monoid c => Chunk c where
225 type ChunkElem c
215 type ChunkElem c
Data/Attoparsec/Text/Buffer.hs+9−11
@@ -40,8 +40,9 @@ module Data.Attoparsec.Text.Buffer
40import Control.Exception (assert)
40import Control.Exception (assert)
41import Data.Bits (shiftR)
41import Data.Bits (shiftR)
42import Data.List (foldl1')
42import Data.List (foldl1')
43−import Data.Monoid as Mon (Monoid(..))
43+#if !MIN_VERSION_base(4,8,0)
44−import Data.Semigroup (Semigroup(..))
44+import Data.Monoid (Monoid(..))
45+#endif
45import Data.Text ()
46import Data.Text ()
46import Data.Text.Internal (Text(..))
47import Data.Text.Internal (Text(..))
47import Data.Text.Internal.Encoding.Utf16 (chr2)
48import Data.Text.Internal.Encoding.Utf16 (chr2)
@@ -79,20 +80,17 @@ unbufferAt s (Buf arr off len _ _) =
79 assert (s >= 0 && s <= len) $
80 assert (s >= 0 && s <= len) $
80 Text arr (off+s) (len-s)
81 Text arr (off+s) (len-s)
81
82
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−
88instance Monoid Buffer where
83instance Monoid Buffer where
89 mempty = Buf A.empty 0 0 0 0
84 mempty = Buf A.empty 0 0 0 0
90 {-# INLINE mempty #-}
85 {-# INLINE mempty #-}
91
86
92− mappend = (<>)
87+ mappend (Buf _ _ _ 0 _) b = b
88+ mappend a (Buf _ _ _ 0 _) = a
89+ mappend buf (Buf arr off len _ _) = append buf arr off len
90+ {-# INLINE mappend #-}
93
91
94− mconcat [] = Mon.mempty
92+ mconcat [] = mempty
95− mconcat xs = foldl1' (<>) xs
93+ mconcat xs = foldl1' mappend xs
96
94
97pappend :: Buffer -> Text -> Buffer
95pappend :: Buffer -> Text -> Buffer
98pappend (Buf _ _ _ 0 _) t = buffer t
96pappend (Buf _ _ _ 0 _) t = buffer t
Data/Attoparsec/Text/Internal.hs+17−15
@@ -1,4 +1,4 @@
1−{-# LANGUAGE BangPatterns, FlexibleInstances, GADTs, OverloadedStrings,
1+{-# LANGUAGE BangPatterns, CPP, FlexibleInstances, GADTs, OverloadedStrings,
2 Rank2Types, RecordWildCards, TypeFamilies, TypeSynonymInstances #-}
2 Rank2Types, RecordWildCards, TypeFamilies, TypeSynonymInstances #-}
3{-# OPTIONS_GHC -fno-warn-orphans #-}
3{-# OPTIONS_GHC -fno-warn-orphans #-}
4-- |
4-- |
@@ -65,14 +65,17 @@ module Data.Attoparsec.Text.Internal
65 , atEnd
65 , atEnd
66 ) where
66 ) where
67
67
68+#if !MIN_VERSION_base(4,8,0)
68−import Control.Applicative ((<|>), (<$>), pure, (*>))
69+import Control.Applicative ((<$>))
70+#endif
71+import Control.Applicative ((<|>))
69import Control.Monad (when)
72import Control.Monad (when)
70import Data.Attoparsec.Combinator ((<?>))
73import Data.Attoparsec.Combinator ((<?>))
71import Data.Attoparsec.Internal
74import Data.Attoparsec.Internal
72import Data.Attoparsec.Internal.Types hiding (Parser, Failure, Success)
75import Data.Attoparsec.Internal.Types hiding (Parser, Failure, Success)
73import qualified Data.Attoparsec.Text.Buffer as Buf
76import qualified Data.Attoparsec.Text.Buffer as Buf
74import Data.Attoparsec.Text.Buffer (Buffer, buffer)
77import Data.Attoparsec.Text.Buffer (Buffer, buffer)
75−import Data.Char (isAsciiUpper, isAsciiLower, toUpper, toLower)
78+import Data.Char (chr, ord)
76import Data.List (intercalate)
79import Data.List (intercalate)
77import Data.String (IsString(..))
80import Data.String (IsString(..))
78import Data.Text.Internal (Text(..))
81import Data.Text.Internal (Text(..))
@@ -222,16 +225,15 @@ stringCI s = go 0
222
225
223-- | Satisfy a literal string, ignoring case for characters in the ASCII range.
226-- | Satisfy a literal string, ignoring case for characters in the ASCII range.
224asciiCI :: Text -> Parser Text
227asciiCI :: Text -> Parser Text
225−asciiCI s = fmap fst $ match $ T.foldr ((*>) . asciiCharCI) (pure ()) s
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
226{-# INLINE asciiCI #-}
235{-# INLINE asciiCI #-}
227
236
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−
235-- | Skip past input for as long as the predicate returns 'True'.
237-- | Skip past input for as long as the predicate returns 'True'.
236skipWhile :: (Char -> Bool) -> Parser ()
238skipWhile :: (Char -> Bool) -> Parser ()
237skipWhile p = go
239skipWhile p = go
@@ -308,7 +310,7 @@ takeLazyText :: Parser L.Text
308takeLazyText = L.fromChunks `fmap` takeRest
310takeLazyText = L.fromChunks `fmap` takeRest
309
311
310data Scan s = Continue s
312data Scan s = Continue s
311− | Finished s {-# UNPACK #-} !Int Text
313+ | Finished {-# UNPACK #-} !Int Text
312
314
313scan_ :: (s -> [Text] -> Parser r) -> s -> (s -> Char -> Maybe s) -> Parser r
315scan_ :: (s -> [Text] -> Parser r) -> s -> (s -> Char -> Maybe s) -> Parser r
314scan_ f s0 p = go [] s0
316scan_ f s0 p = go [] s0
@@ -317,7 +319,7 @@ scan_ f s0 p = go [] s0
317 case T.uncons t of
319 case T.uncons t of
318 Just (c,t') -> case p s c of
320 Just (c,t') -> case p s c of
319 Just s' -> scanner s' (n+1) t'
321 Just s' -> scanner s' (n+1) t'
320− Nothing -> Finished s n t
322+ Nothing -> Finished n t
321 Nothing -> Continue s
323 Nothing -> Continue s
322 go acc s = do
324 go acc s = do
323 input <- get
325 input <- get
@@ -326,8 +328,8 @@ scan_ f s0 p = go [] s0
326 if continue
328 if continue
327 then go (input : acc) s'
329 then go (input : acc) s'
328 else f s' (input : acc)
330 else f s' (input : acc)
329− Finished s' n t -> do advance (size input - size t)
331+ Finished n t -> do advance (size input - size t)
330− f s' (T.take n input : acc)
332+ f s (T.take n input : acc)
331{-# INLINE scan_ #-}
333{-# INLINE scan_ #-}
332
334
333-- | A stateful scanner. The predicate consumes and transforms a
335-- | A stateful scanner. The predicate consumes and transforms a
Data/Attoparsec/Zepto.hs+8−17
@@ -38,17 +38,18 @@ module Data.Attoparsec.Zepto
38
38
39import Control.Applicative
39import Control.Applicative
40import Control.Monad (MonadPlus(..), ap)
40import Control.Monad (MonadPlus(..), ap)
41−import qualified Control.Monad.Fail as Fail
42import Control.Monad.IO.Class (MonadIO(..))
41import Control.Monad.IO.Class (MonadIO(..))
43import Data.ByteString (ByteString)
42import Data.ByteString (ByteString)
44import Data.Functor.Identity (Identity(runIdentity))
43import Data.Functor.Identity (Identity(runIdentity))
45−import Data.Monoid as Mon (Monoid(..))
46−import Data.Semigroup (Semigroup(..))
47import Data.Word (Word8)
44import Data.Word (Word8)
48import Prelude hiding (take, takeWhile)
45import Prelude hiding (take, takeWhile)
49import qualified Data.ByteString as B
46import qualified Data.ByteString as B
50import qualified Data.ByteString.Unsafe as B
47import qualified Data.ByteString.Unsafe as B
51
48
49+#if !MIN_VERSION_base(4,8,0)
50+import Data.Monoid (Monoid(..))
51+#endif
52+
52newtype S = S {
53newtype S = S {
53 input :: ByteString
54 input :: ByteString
54 }
55 }
@@ -82,7 +83,7 @@ instance MonadIO m => MonadIO (ZeptoT m) where
82 {-# INLINE liftIO #-}
83 {-# INLINE liftIO #-}
83
84
84instance Monad m => Monad (ZeptoT m) where
85instance Monad m => Monad (ZeptoT m) where
85− return = pure
86+ return a = Parser $ \s -> return (OK a s)
86 {-# INLINE return #-}
87 {-# INLINE return #-}
87
88
88 m >>= k = Parser $ \s -> do
89 m >>= k = Parser $ \s -> do
@@ -92,12 +93,6 @@ instance Monad m => Monad (ZeptoT m) where
92 Fail err -> return (Fail err)
93 Fail err -> return (Fail err)
93 {-# INLINE (>>=) #-}
94 {-# INLINE (>>=) #-}
94
95
95−#if !(MIN_VERSION_base(4,13,0))
96− fail = Fail.fail
97− {-# INLINE fail #-}
98−#endif
99−
100−instance Monad m => Fail.MonadFail (ZeptoT m) where
101 fail msg = Parser $ \_ -> return (Fail msg)
96 fail msg = Parser $ \_ -> return (Fail msg)
102 {-# INLINE fail #-}
97 {-# INLINE fail #-}
103
98
@@ -113,7 +108,7 @@ instance Monad m => MonadPlus (ZeptoT m) where
113 {-# INLINE mplus #-}
108 {-# INLINE mplus #-}
114
109
115instance (Monad m) => Applicative (ZeptoT m) where
110instance (Monad m) => Applicative (ZeptoT m) where
116− pure a = Parser $ \s -> return (OK a s)
111+ pure = return
117 {-# INLINE pure #-}
112 {-# INLINE pure #-}
118 (<*>) = ap
113 (<*>) = ap
119 {-# INLINE (<*>) #-}
114 {-# INLINE (<*>) #-}
@@ -142,14 +137,10 @@ parseT p bs = do
142 Fail err -> return (Left err)
137 Fail err -> return (Left err)
143{-# INLINE parseT #-}
138{-# INLINE parseT #-}
144
139
145−instance Monad m => Semigroup (ZeptoT m a) where
146− (<>) = mplus
147− {-# INLINE (<>) #-}
148−
149−instance Monad m => Mon.Monoid (ZeptoT m a) where
140+instance Monad m => Monoid (ZeptoT m a) where
150 mempty = fail "mempty"
141 mempty = fail "mempty"
151 {-# INLINE mempty #-}
142 {-# INLINE mempty #-}
152− mappend = (<>)
143+ mappend = mplus
153 {-# INLINE mappend #-}
144 {-# INLINE mappend #-}
154
145
155instance Monad m => Alternative (ZeptoT m) where
146instance Monad m => Alternative (ZeptoT m) where
attoparsec.cabal+9−43
@@ -1,13 +1,12 @@
1name: attoparsec
1name: attoparsec
2−version: 0.13.2.2
2+version: 0.13.0.2
3−x-revision: 3
4license: BSD3
3license: BSD3
5license-file: LICENSE
4license-file: LICENSE
6category: Text, Parsing
5category: Text, Parsing
7author: Bryan O'Sullivan <bos@serpentine.com>
6author: 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>
9stability: experimental
8stability: 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.1, GHC == 7.2.1, GHC == 7.4.2, GHC ==7.6.3, GHC ==7.8.4, GHC ==7.10.3
11synopsis: Fast combinator parsing for bytestrings and text
10synopsis: Fast combinator parsing for bytestrings and text
12cabal-version: >= 1.8
11cabal-version: >= 1.8
13homepage: https://github.com/bos/attoparsec
12homepage: https://github.com/bos/attoparsec
@@ -40,22 +39,17 @@ Flag developer
40
39
41library
40library
42 build-depends: array,
41 build-depends: array,
43− base >= 4.3 && < 5,
42+ base >= 4.2 && < 5,
44 bytestring,
43 bytestring,
45 containers,
44 containers,
46 deepseq,
45 deepseq,
47 scientific >= 0.3.1 && < 0.4,
46 scientific >= 0.3.1 && < 0.4,
48− transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.6,
47+ transformers,
49 text >= 1.1.1.3
48 text >= 1.1.1.3
50 if impl(ghc < 7.4)
49 if impl(ghc < 7.4)
51 build-depends:
50 build-depends:
52 bytestring < 0.10.4.0
51 bytestring < 0.10.4.0
53
52
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−
59 exposed-modules: Data.Attoparsec
53 exposed-modules: Data.Attoparsec
60 Data.Attoparsec.ByteString
54 Data.Attoparsec.ByteString
61 Data.Attoparsec.ByteString.Char8
55 Data.Attoparsec.ByteString.Char8
@@ -99,24 +93,6 @@ test-suite tests
99 QC.Text.FastSet
93 QC.Text.FastSet
100 QC.Text.Regressions
94 QC.Text.Regressions
101
95
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
119−
120 ghc-options:
96 ghc-options:
121 -Wall -threaded -rtsopts
97 -Wall -threaded -rtsopts
122
98
@@ -125,23 +101,18 @@ test-suite tests
125
101
126 build-depends:
102 build-depends:
127 array,
103 array,
128− base,
104+ base >= 4 && < 5,
129 bytestring,
105 bytestring,
130 deepseq >= 1.1,
106 deepseq >= 1.1,
131− QuickCheck >= 2.13.2 && < 2.14,
107+ QuickCheck >= 2.7,
132 quickcheck-unicode,
108 quickcheck-unicode,
133 scientific,
109 scientific,
134 tasty >= 0.11,
110 tasty >= 0.11,
135 tasty-quickcheck >= 0.8,
111 tasty-quickcheck >= 0.8,
136 text,
112 text,
137− transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.6,
113+ transformers,
138 vector
114 vector
139
115
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−
145benchmark benchmarks
116benchmark benchmarks
146 type: exitcode-stdio-1.0
117 type: exitcode-stdio-1.0
147 hs-source-dirs: benchmarks benchmarks/warp-3.0.1.1 .
118 hs-source-dirs: benchmarks benchmarks/warp-3.0.1.1 .
@@ -179,15 +150,10 @@ benchmark benchmarks
179 parsec >= 3.1.2,
150 parsec >= 3.1.2,
180 scientific,
151 scientific,
181 text >= 1.1.1.0,
152 text >= 1.1.1.0,
182− transformers >= 0.2 && (< 0.4 || >= 0.4.1.0) && < 0.6,
153+ transformers,
183 unordered-containers,
154 unordered-containers,
184 vector
155 vector
185
156
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−
191source-repository head
157source-repository head
192 type: git
158 type: git
193 location: https://github.com/bos/attoparsec
159 location: https://github.com/bos/attoparsec
benchmarks/HeadersByteString.hs+1−10
@@ -9,15 +9,6 @@ import qualified Data.Attoparsec.ByteString.Char8 as B
9import qualified Data.Attoparsec.ByteString.Lazy as BL
9import qualified Data.Attoparsec.ByteString.Lazy as BL
10import qualified Data.ByteString.Char8 as B
10import qualified Data.ByteString.Char8 as B
11
11
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−
21headers :: IO Benchmark
12headers :: IO Benchmark
22headers = do
13headers = do
23 req <- B.readFile =<< pathTo "http-request.txt"
14 req <- B.readFile =<< pathTo "http-request.txt"
@@ -27,7 +18,7 @@ headers = do
27 return $ bgroup "headers" [
18 return $ bgroup "headers" [
28 bgroup "B" [
19 bgroup "B" [
29 bench "request" $ nf (B.parseOnly request) req
20 bench "request" $ nf (B.parseOnly request) req
30− , bench "warp" $ nfIO (parseHeaderLines (B.split '\n' req))
21+ , bench "warp" $ nfIO (parseHeaderLines [req])
31 , bench "response" $ nf (B.parseOnly response) resp
22 , bench "response" $ nf (B.parseOnly response) resp
32 ]
23 ]
33 , bgroup "BL" [
24 , bgroup "BL" [
benchmarks/HeadersByteString/Atto.hs+1−9
@@ -15,16 +15,8 @@ import qualified Data.ByteString.Char8 as B
15instance NFData HttpVersion where
15instance NFData HttpVersion where
16 rnf !_ = ()
16 rnf !_ = ()
17
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−
26header = do
18header = do
27− name <- B.takeWhile1 isHeaderChar <* B.char ':' <* B.skipSpace
19+ name <- B.takeWhile1 (B.inClass "a-zA-Z0-9_-") <* B.char ':' <* B.skipSpace
28 body <- bodyLine
20 body <- bodyLine
29 return (name, body)
21 return (name, body)
30
22
benchmarks/http-request.txt+8−3
@@ -1,9 +1,14 @@
1GET / HTTP/1.1
1GET / HTTP/1.1
2Host: twitter.com
2Host: 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
4Accept-Encoding: gzip,deflate,sdch
5Accept-Encoding: gzip,deflate,sdch
5Accept-Language: en-GB,en-US;q=0.8,en;q=0.6
6Accept-Language: en-GB,en-US;q=0.8,en;q=0.6
6Cache-Control: max-age=0
7Cache-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+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)
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
12+ AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.86
13+ Safari/537.36
9
14
benchmarks/http-response.txt+4−2
@@ -3,8 +3,10 @@ Date: Fri, 09 May 2014 04:24:57 GMT
3Expires: -1
3Expires: -1
4Cache-Control: private, max-age=0
4Cache-Control: private, max-age=0
5Content-Type: text/html; charset=ISO-8859-1
5Content-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
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
7−Set-Cookie: NID=67=-WlfaDG6VSEPk7abAjrK98HBSoCD2ID6JKkUR95tEumzDmg7Fc8pSQ8; expires=Sat, 08-Nov-2014 04:24:57 GMT; path=/; domain=.google.com; HttpOnly
8+Set-Cookie: NID=67=-WlfaDG6VSEPk7abAjrK98HBSoCD2ID6JKkUR95tEumzDmg7Fc8pSQ8;
9+ expires=Sat, 08-Nov-2014 04:24:57 GMT; path=/; domain=.google.com; HttpOnly
8P3P: CP="This is not a P3P policy! See http://www.google.com/support/accounts/bin/answer.py?hl=en&answer=151657 for more info."
10P3P: CP="This is not a P3P policy! See http://www.google.com/support/accounts/bin/answer.py?hl=en&answer=151657 for more info."
9Server: gws
11Server: gws
10X-XSS-Protection: 1; mode=block
12X-XSS-Protection: 1; mode=block
changelog.md−15
@@ -1,18 +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−
160.13.0.2
10.13.0.2
17
2
18* Restore the fast specialised character set implementation for Text
3* Restore the fast specialised character set implementation for Text
tests/QC/ByteString.hs+2−4
@@ -26,11 +26,9 @@ import qualified Data.ByteString.Lazy.Char8 as L8
26satisfy :: Word8 -> L.ByteString -> Property
26satisfy :: Word8 -> L.ByteString -> Property
27satisfy w s = parseBS (P.satisfy (<=w)) (L.cons w s) === Just w
27satisfy w s = parseBS (P.satisfy (<=w)) (L.cons w s) === Just w
28
28
29−satisfyWith :: Word8 -> L.ByteString -> Property
29+satisfyWith :: Char -> L.ByteString -> Property
30−satisfyWith w s = parseBS (P.satisfyWith (chr . fromIntegral) (<=c))
30+satisfyWith c s = parseBS (P.satisfyWith (chr . fromIntegral) (<=c))
31 (L.cons (fromIntegral (ord c)) s) === Just c
31 (L.cons (fromIntegral (ord c)) s) === Just c
32− where
33− c = chr (fromIntegral w)
34
32
35word8 :: Word8 -> L.ByteString -> Property
33word8 :: Word8 -> L.ByteString -> Property
36word8 w s = parseBS (P.word8 w) (L.cons w s) === Just w
34word8 w s = parseBS (P.word8 w) (L.cons w s) === Just w
tests/QC/Text.hs+3−11
@@ -6,7 +6,6 @@ module QC.Text (tests) where
6import Control.Applicative ((<*>), (<$>))
6import Control.Applicative ((<*>), (<$>))
7#endif
7#endif
8import Data.Int (Int64)
8import Data.Int (Int64)
9−import Data.Word (Word8)
10import Prelude hiding (take, takeWhile)
9import Prelude hiding (take, takeWhile)
11import QC.Common (liftOp, parseT)
10import QC.Common (liftOp, parseT)
12import qualified QC.Text.FastSet as FastSet
11import qualified QC.Text.FastSet as FastSet
@@ -17,10 +16,8 @@ import Test.QuickCheck
17import qualified Data.Attoparsec.Text as P
16import qualified Data.Attoparsec.Text as P
18import qualified Data.Attoparsec.Text.Lazy as PL
17import qualified Data.Attoparsec.Text.Lazy as PL
19import qualified Data.Attoparsec.Text.FastSet as S
18import qualified Data.Attoparsec.Text.FastSet as S
20−import qualified Data.ByteString as BS
21import qualified Data.Char as Char
19import qualified Data.Char as Char
22import qualified Data.Text as T
20import qualified Data.Text as T
23−import qualified Data.Text.Encoding as TE
24import qualified Data.Text.Lazy as L
21import qualified Data.Text.Lazy as L
25
22
26-- Basic byte-level combinators.
23-- Basic byte-level combinators.
@@ -73,12 +70,9 @@ strings s t u =
73 === Just t'
70 === Just t'
74 where t' = toStrict t
71 where t' = toStrict t
75
72
76−-- | Note: "simple, and efficient" works for well formed input...
77−-- i.e. e.g. Latin1 texts
78−stringCI :: [Word8] -> Property
73+stringCI :: T.Text -> Property
79−stringCI ws = P.parseOnly (P.stringCI fs) s === Right s
74+stringCI s = P.parseOnly (P.stringCI fs) s === Right s
80 where fs = T.toCaseFold s
75 where fs = T.toCaseFold s
81− s = TE.decodeLatin1 (BS.pack ws)
82
76
83asciiCI :: T.Text -> Gen Bool
77asciiCI :: T.Text -> Gen Bool
84asciiCI x =
78asciiCI x =
@@ -156,9 +150,7 @@ endOfLine s =
156 (c, fst <$> L.uncons s') === ('\r', Just '\n')
150 (c, fst <$> L.uncons s') === ('\r', Just '\n')
157
151
158scan :: L.Text -> Positive Int64 -> Property
152scan :: 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)
153+scan s (Positive k) = parseT p s === Just (toStrict $ L.take k s)
162 where p = P.scan k $ \ n _ ->
154 where p = P.scan k $ \ n _ ->
163 if n > 0 then let !n' = n - 1 in Just n' else Nothing
155 if n > 0 then let !n' = n - 1 in Just n' else Nothing
164
156